feat: merge filters and indexes

rudderlabs · Jul 1, 2024 · 78fbe36 · 78fbe36
1 parent 4181b86
commit 78fbe36
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/src/utils/converter.ts b/src/utils/converter.ts
@@ -110,6 +110,22 @@ function addToArrayToExpression(expr: Expression) {
   };
 }
 
+function mergeObjectFilterParts(existParts: Expression[], newParts: Expression[]) {
+  for (let index = 0; index < newParts.length; index++) {
+    if (
+      newParts[index].type === SyntaxType.OBJECT_FILTER_EXPR &&
+      existParts[index].type === SyntaxType.OBJECT_FILTER_EXPR
+    ) {
+      if (newParts[index].options?.index) {
+        existParts[index].options = { ...existParts[index].options, ...newParts[index].options };
+      }
+      if (newParts[index].filter.type !== SyntaxType.ALL_FILTER_EXPR) {
+        existParts[index].filter = newParts[index].filter;
+      }
+    }
+  }
+}
+
 function handleAllFilterIndexFound(
   currentInputAST: Expression,
   currentOutputPropAST: ObjectPropExpression,
@@ -130,6 +146,8 @@ function handleAllFilterIndexFound(
       currentInputAST.root,
       matchedInputParts,
     );
+  } else {
+    mergeObjectFilterParts(currentOutputPropAST.value.parts, matchedInputParts);
   }
   currentInputAST.root = undefined;
 }
@@ -391,10 +409,7 @@ function validateMappingsForIndexVar(flatMapping: FlatMappingAST, indexVar: stri
     );
   }
   const foundIndexVar = flatMapping.inputExpr.parts.some(
-    (item) =>
-      item?.type === SyntaxType.OBJECT_FILTER_EXPR &&
-      item.filter.type === SyntaxType.ALL_FILTER_EXPR &&
-      item.options?.index === indexVar,
+    (item) => item?.type === SyntaxType.OBJECT_FILTER_EXPR && item.options?.index === indexVar,
   );
   if (!foundIndexVar) {
     throw new JsonTemplateMappingError(
@@ -426,10 +441,6 @@ function processFlatMappingParts(flatMapping: FlatMappingAST, objectExpr: Object
   }
 }
 
-function orderMappings(flatMappingASTs: FlatMappingAST[]): FlatMappingAST[] {
-  return flatMappingASTs;
-}
-
 /**
  * Convert Flat to Object Mappings
  */
@@ -438,8 +449,7 @@ export function convertToObjectMapping(
 ): ObjectExpression | PathExpression {
   const outputAST: ObjectExpression = createObjectExpression();
   let pathAST: PathExpression | undefined;
-  const orderedMappings = orderMappings(flatMappingASTs);
-  for (const flatMapping of orderedMappings) {
+  for (const flatMapping of flatMappingASTs) {
     validateMapping(flatMapping);
     let objectExpr = outputAST;
     if (flatMapping.outputExpr.parts.length > 0) {

diff --git a/test/scenarios/mappings/all_features.json b/test/scenarios/mappings/all_features.json
@@ -20,39 +20,39 @@
     "output": "$.events[0].name"
   },
   {
-    "input": "$.products[?(@.category)].name",
+    "input": "$.products[*].name",
     "output": "$.events[0].items[*].product_name"
   },
   {
-    "from": "$.products[?(@.category)].category",
+    "from": "$.products[*].category",
     "to": "$.events[0].items[*].product_category"
   },
   {
-    "input": "$.products[?(@.category)].variations[*].size",
+    "input": "$.products[*].variations[*].size",
     "output": "$.events[0].items[*].options[*].s"
   },
   {
-    "input": "$.products[?(@.category)].(@.price * @.quantity * (1 - $.discount / 100))",
+    "input": "$.products[*].(@.price * @.quantity * (1 - $.discount / 100))",
     "output": "$.events[0].items[*].value"
   },
   {
     "input": "$.products[?(@.category)].(@.price * @.quantity * (1 - $.discount / 100)).sum()",
     "output": "$.events[0].revenue"
   },
   {
-    "input": "$.products[?(@.category)].variations[*].length",
+    "input": "$.products[*].variations[*].length",
     "output": "$.events[0].items[*].options[*].l"
   },
   {
-    "input": "$.products[?(@.category)].variations[*].width",
+    "input": "$.products[*].variations[*].width",
     "output": "$.events[0].items[*].options[*].w"
   },
   {
-    "input": "$.products[?(@.category)].variations[*].color",
+    "input": "$.products[*].variations[*].color",
     "output": "$.events[0].items[*].options[*].c"
   },
   {
-    "input": "$.products[?(@.category)].variations[*].height",
+    "input": "$.products[*].variations[*].height",
     "output": "$.events[0].items[*].options[*].h"
   }
 ]