Some fixes

Created childCtx for parent d-nodes

Author: croqaz

src/parser.ts

@@ -274,7 +274,7 @@ export default class AST {
    * Recursively adds dot-notation paths to tag nodes in the AST.
    * Raw text nodes are ignored.
    */
-  private static addPaths(nodes: ParseToken[], currentPath = ''): void {
+  static addPaths(nodes: ParseToken[], currentPath = ''): void {
     for (const [index, node] of nodes.entries()) {
       // Only add paths to single or double tags, not raw text
       if (node.name && (node.single || node.double)) {

src/runtime.ts

@@ -158,6 +158,9 @@ export default class Runtime {
     return true; // Indicate that the file was changed
   }
 
+  /**
+   * Evaluate all tags in the AST and return the final text.
+   */
   async evaluateAll(customCtx: Record<string, any> = {}): Promise<string> {
     if (this.state.running) {
       // Should I return an error here?
@@ -190,6 +193,10 @@ export default class Runtime {
     return text;
   }
 
+  /**
+   * Evaluate a specific tag and its children.
+   * This is a lower-level method, use `evaluateAll` for the whole AST.
+   */
   async evaluateTag(tag: T.ParseToken, customCtx: Record<string, any> = {}): Promise<void> {
     if (!tag.name) {
       return; // Raw text or invalid tag
@@ -260,6 +267,9 @@ export default class Runtime {
         const children = new AST(this.config).parse(result);
         if (children.length) {
           tag.children = children;
+          // Sync indexes and paths after parsing children
+          this.ast.syncIndexes();
+          AST.addPaths(this.ast.nodes);
         }
       }
     }
@@ -286,7 +296,8 @@ export default class Runtime {
       // a separate variable scope for the children
       // At this point, the parent props are interpolated
       if (evalChildren) {
-        const childrenCtx = deepClone(customCtx);
+        // The children scope is also saved in the parent tag
+        (tag as T.DoubleTag).childCtx = deepClone(customCtx);
         for (const c of tag.children) {
           if (c.name && (c.single || c.double)) {
             c.parent = { name: tag.name, index: tag.index, params: tag.params, rawText: '' };
@@ -302,7 +313,7 @@ export default class Runtime {
             }
           }
 
-          await this.evaluateTag(c, childrenCtx);
+          await this.evaluateTag(c, (tag as T.DoubleTag).childCtx);
         }
       }
     }

src/types.ts

@@ -48,6 +48,7 @@ export type DoubleTag = {
   firstTagText: string;
   secondTagText: string;
   children?: ParseToken[];
+  childCtx?: Record<string, any>;
   params?: Record<string, any>;
   rawParams?: Record<string, string>;
   parent?: ParseToken;

test/evaluate.test.ts

@@ -23,6 +23,7 @@ test('simple evaluate', async () => {
     path: '1',
     firstTagText: '<main>',
     secondTagText: '</main>',
+    childCtx: {},
     children: [
       {
         rawText: '9',
@@ -58,19 +59,22 @@ test('evaluate custom tags', async () => {
     t1: (_s, _a, meta) => {
       expect(meta.node.children.length).toBe(5);
       expect(meta.node.parent).toEqual({});
+      expect(meta.node.childCtx).toEqual({ t4: 23 });
       meta.node.params.x = 'x';
       return meta.node;
     },
     t2: (_s, _a, meta) => {
       expect(meta.node.children.length).toBe(3);
       expect(meta.node.parent.name).toBe('t1');
+      expect(meta.node.childCtx).toEqual({ t3: 12 });
       meta.node.params = { z: 'z' };
       return meta.node;
     },
     t3: (_s, _a, meta) => {
       expect(meta.node.rawText).toBe('<t3 "a" b=1 />');
       expect(meta.node.parent.name).toBe('t2');
       meta.node.params.b = 2;
+      meta.globalCtx.t3 = 12;
       return meta.node;
     },
     t4: (_s, _a, meta) => {
@@ -79,6 +83,7 @@ test('evaluate custom tags', async () => {
       expect(meta.node.parent.name).toBe('t1');
       meta.node.params.d = true;
       meta.node.params.e = 'e';
+      meta.globalCtx.t4 = 23;
       return meta.node;
     },
   });