refactor: use path type stack to handle child paths

rudderlabs · May 22, 2024 · a2af49f · a2af49f
1 parent 3b90cc9
commit a2af49f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/src/parser.ts b/src/parser.ts
@@ -46,12 +46,15 @@ export class JsonTemplateParser {
 
   private options?: EngineOptions;
 
+  private pathTypesStack: PathType[];
+
   // indicates currently how many loops being parsed
   private loopCount = 0;
 
   constructor(lexer: JsonTemplateLexer, options?: EngineOptions) {
     this.lexer = lexer;
     this.options = options;
+    this.pathTypesStack = [];
   }
 
   parse(): Expression {
@@ -289,6 +292,13 @@ export class JsonTemplateParser {
     }
   }
 
+  private getCurrentPathType(): PathType | undefined {
+    if (this.pathTypesStack.length > 0) {
+      return this.pathTypesStack[this.pathTypesStack.length - 1];
+    }
+    return undefined;
+  }
+
   private parsePathType(): PathType {
     if (this.lexer.matchSimplePath()) {
       this.lexer.ignoreTokens(1);
@@ -302,11 +312,13 @@ export class JsonTemplateParser {
       this.lexer.ignoreTokens(1);
       return PathType.JSON;
     }
-    return this.options?.defaultPathType ?? PathType.RICH;
+
+    return this.getCurrentPathType() ?? this.options?.defaultPathType ?? PathType.RICH;
   }
 
   private parsePath(options?: { root?: Expression }): PathExpression | Expression {
     const pathType = this.parsePathType();
+    this.pathTypesStack.push(pathType);
     const expr: PathExpression = {
       type: SyntaxType.PATH,
       root: this.parsePathRoot(pathType, options?.root),
@@ -317,6 +329,7 @@ export class JsonTemplateParser {
       expr.pathType = PathType.SIMPLE;
       return expr;
     }
+    this.pathTypesStack.pop();
     return JsonTemplateParser.updatePathExpr(expr);
   }
 

diff --git a/test/scenarios/paths/data.ts b/test/scenarios/paths/data.ts
@@ -73,6 +73,7 @@ export const data: Scenario[] = [
     templatePath: 'json_path.jt',
     input: {
       foo: 'bar',
+      min: 1,
       items: [
         {
           a: 1,

diff --git a/test/scenarios/paths/json_path.jt b/test/scenarios/paths/json_path.jt
@@ -1,6 +1,6 @@
 [
     ~j $.foo,
     ~j $.items[*],
-    ~j $.items[?(@.a>1)],
+    ~j $.items[?(@.a>$.min)],
     ~j $.items.(@.a + @.b)
 ]