Handling view argument

Author: anderson-joyle

src/libraries/Microsoft.PowerFx.Core/Binding/Binder.cs

@@ -1136,7 +1136,8 @@ public void CheckPredicateUsage(CallNode node, TexlFunction func)
                 !node.Args.ChildNodes.Any(child => child is ErrorNode) &&
                 TryGetCall(node.Id, out var callInfo))
             {
-                func.ScopeInfo.CheckPredicateFields(GetUsedScopeFields(callInfo), node, GetLambdaParamNames(callInfo.ScopeNest + 1), ErrorContainer);
+                //func.ScopeInfo.CheckPredicateFields(GetUsedScopeFields(callInfo), node, GetLambdaParamNames(callInfo.ScopeNest + 1), ErrorContainer);
+                func.ScopeInfo.CheckPredicateFields(this, callInfo);
             }
         }
 

src/libraries/Microsoft.PowerFx.Core/Functions/FunctionScopeInfo.cs

@@ -217,23 +217,52 @@ public virtual bool GetScopeIdent(TexlNode[] nodes, out DName[] scopeIdents)
             return false;
         }
 
-        public virtual void CheckPredicateFields(DType fields, CallNode callNode, IEnumerable<FirstNameInfo> lambdaNames, ErrorContainer errors)
+        public virtual void CheckPredicateFields(TexlBinding binding, CallInfo callInfo)
         {
+            var fields = binding.GetUsedScopeFields(callInfo);
+            var lambdaParamNames = binding.GetLambdaParamNames(callInfo.ScopeNest + 1);
+
             if (fields == DType.Error || fields.GetAllNames(DPath.Root).Any())
             {
                 return;
             }
 
-            GetScopeIdent(callNode.Args.ChildNodes.ToArray(), out var idents);
+            GetScopeIdent(callInfo.Node.Args.ChildNodes.ToArray(), out var idents);
 
-            if (!lambdaNames.Any(lambdaName => idents.Contains(lambdaName.Name)))
+            if (!lambdaParamNames.Any(lambdaName => idents.Contains(lambdaName.Name)))
             {
-                errors.EnsureError(DocumentErrorSeverity.Warning, callNode, TexlStrings.WarnCheckPredicateUsage);
+                binding.ErrorContainer.EnsureError(DocumentErrorSeverity.Warning, callInfo.Node, TexlStrings.WarnCheckPredicateUsage);
             }
         }
     }
 
-    internal class FunctionThisGroupScopeInfo : FunctionScopeInfo
+    internal class FunctionFilterScopeInfo : FunctionScopeInfo
+    {
+        public FunctionFilterScopeInfo(TexlFunction function)
+            : base(function, checkPredicateUsage: true)
+        {
+        }
+
+        public override void CheckPredicateFields(TexlBinding binding, CallInfo callInfo)
+        {
+            // Filter can also accept a view as argument.
+            // In the event of any argN (where N > 1) is a view, the binder will validate if the view is valid or not.
+            // We check if there is any view as argument. If there is, we just skip the predicate checking.
+            foreach (var childNode in callInfo.Node.Args.ChildNodes)
+            {
+                var argType = binding.GetType(childNode);
+
+                if (argType.Kind == DKind.ViewValue)
+                {
+                    return;
+                }
+            }
+
+            base.CheckPredicateFields(binding, callInfo);
+        }
+    }
+
+    internal class FunctionThisGroupScopeInfo : FunctionScopeInfo
     {
         public static DName ThisGroup => new DName("ThisGroup");
 
@@ -278,7 +307,7 @@ public override bool CheckInput(Features features, CallNode callNode, TexlNode i
         }
     }
 
-    internal class FunctionJoinScopeInfo : FunctionScopeInfo
+    internal class FunctionJoinScopeInfo : FunctionScopeInfo
     {
         public static DName LeftRecord => new DName("LeftRecord");
 
@@ -319,37 +348,40 @@ public override bool GetScopeIdent(TexlNode[] nodes, out DName[] scopeIdents)
             {
                 scopeIdents[0] = LeftRecord;
             }
-
+
             if (nodes.Length > 1 && nodes[1] is AsNode rightAsNode)
             {
                 scopeIdents[1] = rightAsNode.Right.Name;
             }
             else
             {
                 scopeIdents[1] = RightRecord;
-            }
+            }
 
             // Returning false to indicate that the scope is not a whole scope.
-            // Meaning that the scope is a record type and we are accessing the fields directly.
+            // Meaning that the scope is a record type and we are accessing the fields directly.
             return false;
         }
 
-        public override void CheckPredicateFields(DType fields, CallNode callNode, IEnumerable<FirstNameInfo> lambdaNames, ErrorContainer errors)
+        public override void CheckPredicateFields(TexlBinding binding, CallInfo callInfo)
         {
+            var fields = binding.GetUsedScopeFields(callInfo);
+            var lambdaParamNames = binding.GetLambdaParamNames(callInfo.ScopeNest + 1);
+
             // If Join call node has less than 5 records, we are possibly looking for suggestions.
-            if (callNode.Args.ChildNodes.Count < 5 || fields == DType.Error)
+            if (callInfo.Node.Args.ChildNodes.Count < 5 || fields == DType.Error)
             {
                 return;
             }
 
-            GetScopeIdent(callNode.Args.ChildNodes.ToArray(), out var idents);
+            GetScopeIdent(callInfo.Node.Args.ChildNodes.ToArray(), out var idents);
 
             var foundIdents = new HashSet<DName>();
-            var predicate = callNode.Args.ChildNodes[2];
+            var predicate = callInfo.Node.Args.ChildNodes[2];
 
             // In the Join function, arg2 and argN > 3 are lambdas nodes.
             // We need to check if scope identifiers are used arg2 (predicate).
-            foreach (var lambda in lambdaNames)
+            foreach (var lambda in lambdaParamNames)
             {
                 var parent = lambda.Node.Parent;
 
@@ -374,7 +406,7 @@ public override void CheckPredicateFields(DType fields, CallNode callNode, IEnum
                 return;
             }
 
-            errors.EnsureError(DocumentErrorSeverity.Warning, callNode, TexlStrings.WarnCheckPredicateUsage);
+            binding.ErrorContainer.EnsureError(DocumentErrorSeverity.Warning, callInfo.Node, TexlStrings.WarnCheckPredicateUsage);
         }
     }
 }

src/libraries/Microsoft.PowerFx.Core/Texl/Builtins/Filter.cs

@@ -27,7 +27,7 @@ internal sealed class FilterFunction : FilterFunctionBase
         public FilterFunction()
             : base("Filter", TexlStrings.AboutFilter, FunctionCategories.Table, DType.EmptyTable, -2, 2, int.MaxValue, DType.EmptyTable)
         {
-            ScopeInfo = new FunctionScopeInfo(this, checkPredicateUsage: true);
+            ScopeInfo = new FunctionFilterScopeInfo(this);
         }
 
         public override IEnumerable<TexlStrings.StringGetter[]> GetSignatures()