Merge pull request #2189 from IDEMSInternational/refactor/data-pipe-s…

…pec-filter-constants

Refactor/data pipe spec filter constants

packages/shared/src/models/dataPipe/operators/filter.spec.ts

@@ -32,4 +32,11 @@ describe("Filter", () => {
     const outputIDs = output.column("first_name").values;
     expect(outputIDs).toEqual(["Ada"]);
   });
+  it("Ignores context variables that do not appear in condition string", () => {
+    // Passing a function to evaluator would throw error if not ignored
+    const testDf = new DataFrame([{ first_name: "Ada", invalid: new Function() }]);
+    const output = new filter(testDf, ["first_name === 'Ada'"]).apply();
+    const outputIDs = output.column("first_name").values;
+    expect(outputIDs).toEqual(["Ada"]);
+  });
 });

packages/shared/src/models/dataPipe/operators/filter.ts

@@ -23,8 +23,8 @@ class FilterOperator extends BaseOperator {
 
   public satisfiesFilters(row: any) {
     const evaluator = new JSEvaluator();
-    evaluator.setGlobalContext({ constants: row });
     return this.filterConditions.every((condition) => {
+      evaluator.setGlobalContext({ constants: this.generateEvaluatorConstants(condition, row) });
       try {
         /**
          * row fields can be accessed both from global and local context, e.g.
@@ -39,6 +39,20 @@ class FilterOperator extends BaseOperator {
       }
     });
   }
+
+  /**
+   * Create a list of all key-value pairs of row data whose keys appear within condition string
+   * This reduces the complexity of later JS evaluation
+   **/
+  private generateEvaluatorConstants(condition: string, row: Record<string, any>) {
+    const constants: Record<string, any> = {};
+    for (const [key, value] of Object.entries(row)) {
+      if (condition.includes(key)) {
+        constants[key] = value;
+      }
+    }
+    return constants;
+  }
 }
 
 class FilterAnyOperator extends FilterOperator {