fix: object mappings nested filters

rudderlabs · Jun 14, 2024 · 3eafe0b · 3eafe0b
1 parent 8f3df1e
commit 3eafe0b
Show file tree

Hide file tree

Showing 9 changed files with 95 additions and 78 deletions.
diff --git a/.husky/pre-commit b/.husky/pre-commit
@@ -2,4 +2,5 @@
 . "$(dirname -- "$0")/_/husky.sh"
 
 npm test
-npx lint-staged
+npm run lint:check
+npm run lint-staged
diff --git a/package.json b/package.json
@@ -59,6 +59,7 @@
     "lint:check": "eslint . || exit 1",
     "format": "prettier --write '**/*.ts' '**/*.js' '**/*.json'",
     "lint": "npm run format && npm run lint:fix",
+    "lint-staged": "lint-staged",
     "prepare": "husky install",
     "jest:scenarios": "jest e2e.test.ts --verbose",
     "test:scenario": "jest test/scenario.test.ts --verbose",

diff --git a/src/engine.ts b/src/engine.ts
@@ -40,11 +40,13 @@ export class JsonTemplateEngine {
     mappings: FlatMappingPaths[],
     options?: EngineOptions,
   ): Expression {
-    const flatMappingAST = mappings.map((mapping) => ({
-      ...mapping,
-      inputExpr: JsonTemplateEngine.parse(mapping.input, options).statements[0],
-      outputExpr: JsonTemplateEngine.parse(mapping.output, options).statements[0],
-    }));
+    const flatMappingAST = mappings
+      .filter((mapping) => mapping.skip !== true)
+      .map((mapping) => ({
+        ...mapping,
+        inputExpr: JsonTemplateEngine.parse(mapping.input, options).statements[0],
+        outputExpr: JsonTemplateEngine.parse(mapping.output, options).statements[0],
+      }));
     return convertToObjectMapping(flatMappingAST);
   }
 

diff --git a/src/types.ts b/src/types.ts
@@ -277,6 +277,7 @@ export interface ThrowExpression extends Expression {
 
 export type FlatMappingPaths = {
   description?: string;
+  skip?: boolean;
   input: string;
   output: string;
 };

diff --git a/src/utils/converter.ts b/src/utils/converter.ts
@@ -147,24 +147,29 @@ function handleNextPart(
   partNum: number,
   currentOutputPropAST: ObjectPropExpression,
 ): Expression {
-  const nextOutputPart = flatMapping.outputExpr.parts[partNum];
-  if (nextOutputPart.filter?.type === SyntaxType.ALL_FILTER_EXPR) {
-    return processAllFilter(flatMapping.inputExpr, currentOutputPropAST);
-  }
-  if (nextOutputPart.filter?.type === SyntaxType.ARRAY_INDEX_FILTER_EXPR) {
-    return processArrayIndexFilter(
-      currentOutputPropAST,
-      nextOutputPart.filter as IndexFilterExpression,
-    );
-  }
-  if (isWildcardSelector(nextOutputPart)) {
-    return processWildCardSelector(
-      flatMapping,
-      currentOutputPropAST,
-      partNum === flatMapping.outputExpr.parts.length - 1,
-    );
+  let objectExpr = currentOutputPropAST.value;
+  let newPartNum = partNum;
+  while (newPartNum < flatMapping.outputExpr.parts.length) {
+    const nextOutputPart = flatMapping.outputExpr.parts[newPartNum];
+    if (nextOutputPart.filter?.type === SyntaxType.ALL_FILTER_EXPR) {
+      objectExpr = processAllFilter(flatMapping.inputExpr, currentOutputPropAST);
+    } else if (nextOutputPart.filter?.type === SyntaxType.ARRAY_INDEX_FILTER_EXPR) {
+      objectExpr = processArrayIndexFilter(
+        currentOutputPropAST,
+        nextOutputPart.filter as IndexFilterExpression,
+      );
+    } else if (isWildcardSelector(nextOutputPart)) {
+      objectExpr = processWildCardSelector(
+        flatMapping,
+        currentOutputPropAST,
+        newPartNum === flatMapping.outputExpr.parts.length - 1,
+      );
+    } else {
+      break;
+    }
+    newPartNum++;
   }
-  return currentOutputPropAST.value;
+  return objectExpr;
 }
 
 function processFlatMappingPart(

diff --git a/test/scenario.test.ts b/test/scenario.test.ts
@@ -19,14 +19,11 @@ describe(`${scenarioName}:`, () => {
   const scenarioDir = join(__dirname, 'scenarios', scenarioName);
   const scenarios = ScenarioUtils.extractScenarios(scenarioDir);
   const scenario: Scenario = scenarios[index] || scenarios[0];
-  it(`Scenario ${index}: ${Scenario.getTemplatePath(scenario)}`, async () => {
+  const templatePath = Scenario.getTemplatePath(scenario);
+  it(`Scenario ${index}: ${templatePath}`, async () => {
     let result;
     try {
-      console.log(
-        `Executing scenario: ${scenarioName}, test: ${index}, template: ${
-          scenario.templatePath || 'template.jt'
-        }`,
-      );
+      console.log(`Executing scenario: ${scenarioName}, test: ${index}, template: ${templatePath}`);
       result = await ScenarioUtils.evaluateScenario(scenarioDir, scenario);
       expect(result).toEqual(scenario.output);
     } catch (error: any) {

diff --git a/test/scenarios/mappings/data.ts b/test/scenarios/mappings/data.ts
@@ -239,14 +239,18 @@ export const data: Scenario[] = [
         name: 'John Doe',
         age: 30,
       },
-      traits2: {
-        name: {
-          value: 'John Doe',
+      traits2: [
+        {
+          name: {
+            value: 'John Doe',
+          },
         },
-        age: {
-          value: 30,
+        {
+          age: {
+            value: 30,
+          },
         },
-      },
+      ],
     },
     output: {
       properties1: {
@@ -257,10 +261,14 @@ export const data: Scenario[] = [
           value: 30,
         },
       },
-      properties2: {
-        name: 'John Doe',
-        age: 30,
-      },
+      properties2: [
+        {
+          name: 'John Doe',
+        },
+        {
+          age: 30,
+        },
+      ],
     },
   },
   {

diff --git a/test/scenarios/mappings/object_mappings.json b/test/scenarios/mappings/object_mappings.json
@@ -4,7 +4,7 @@
     "output": "$.properties1.*.value"
   },
   {
-    "input": "$.traits2.*.value",
-    "output": "$.properties2.*"
+    "input": "$.traits2[*].*.value",
+    "output": "$.properties2[*].*"
   }
 ]
diff --git a/test/test_engine.ts b/test/test_engine.ts
@@ -242,40 +242,42 @@ const address = {
 //   ),
 // );
 
-console.log(
-  JsonTemplateEngine.evaluateAsSync(
-    [
-      {
-        description: 'Copies properties of a to root level in the output',
-        input: '$.a',
-        output: '$',
-      },
-      {
-        description: 'Combines first and last name in the output',
-        input: "$.b[*].(@.firstName + ' ' + @.lastName)",
-        output: '$.items[*].name',
-      },
-      {
-        input: "'buzz'",
-        output: '$.fizz',
-      },
-    ],
-    { defaultPathType: PathType.JSON },
-    {
-      a: {
-        foo: 1,
-        bar: 2,
-      },
-      b: [
-        {
-          firstName: 'foo',
-          lastName: 'bar',
-        },
-        {
-          firstName: 'fizz',
-          lastName: 'buzz',
-        },
-      ],
-    },
-  ),
-);
+// console.log(
+//   JsonTemplateEngine.evaluateAsSync(
+//     [
+//       {
+//         description: 'Copies properties of a to root level in the output',
+//         input: '$.a',
+//         output: '$',
+//       },
+//       {
+//         description: 'Combines first and last name in the output',
+//         input: "$.b[*].(@.firstName + ' ' + @.lastName)",
+//         output: '$.items[*].name',
+//       },
+//       {
+//         input: "'buzz'",
+//         output: '$.fizz',
+//       },
+//     ],
+//     { defaultPathType: PathType.JSON },
+//     {
+//       a: {
+//         foo: 1,
+//         bar: 2,
+//       },
+//       b: [
+//         {
+//           firstName: 'foo',
+//           lastName: 'bar',
+//         },
+//         {
+//           firstName: 'fizz',
+//           lastName: 'buzz',
+//         },
+//       ],
+//     },
+//   ),
+// );
+
+console.log(JsonTemplateEngine.reverseTranslate(JsonTemplateEngine.parse('$.traits.*')));