chore: Refactor AST traversal to use generators

Signed-off-by: Roberto Raggi <[email protected]>

Author: robertoraggi

packages/cxx-frontend/src/ASTCursor.ts

@@ -158,16 +158,15 @@ export class ASTCursor {
   /**
    * Pre-order traversal of the AST.
    *
-   * @param accept The function to call for each node.
+   * @returns A generator that yields the nodes in pre-order.
    */
-  preVisit(accept: (args: AcceptArgs) => void | boolean) {
+  *preVisit() {
     let done = false;
     let depth = 0;
 
     while (!done) {
       do {
-        if (accept({ node: this.node, slot: this.slot, depth }) === true)
-          return;
+        yield { node: this.node, slot: this.slot, depth };
         ++depth;
       } while (this.gotoFirstChild());
 

packages/cxx-storybook/src/SyntaxTree.tsx

@@ -73,8 +73,8 @@ export function SyntaxTree({ parser, cursorPosition }: SyntaxTreeProps) {
 
     const ast = parser?.getAST();
 
-    ast?.walk().preVisit(({ node, slot, depth: level }) => {
-      if (!(node instanceof AST)) return;
+    for (const { node, slot, depth: level } of ast?.walk().preVisit() ?? []) {
+      if (!(node instanceof AST)) continue;
 
       const kind = ASTKind[node.getKind()];
 
@@ -93,7 +93,7 @@ export function SyntaxTree({ parser, cursorPosition }: SyntaxTreeProps) {
       const handle = node.getHandle();
 
       nodes.push({ description, slot, handle, level });
-    });
+    }
     setNodes(nodes);
   }, [parser]);
 

templates/cxx-browser-esm-vite/src/main.ts

@@ -50,9 +50,9 @@ async function main() {
 
   const ast = parser.getAST();
 
-  ast?.walk().preVisit(({ node, depth }) => {
+  for (const { node, depth } of ast?.walk().preVisit() ?? []) {
     if (!(node instanceof AST)) {
-      return;
+      continue;
     }
 
     const nodeWithAttributes: AST & Partial<Attributes> = node;
@@ -77,7 +77,7 @@ async function main() {
     }
 
     rows.push(description);
-  });
+  }
 
   parser.dispose();
 

templates/cxx-parse-esm/index.js

@@ -61,13 +61,13 @@ async function main() {
 
   const ast = parser.getAST();
 
-  ast?.walk().preVisit(({ node, slot, depth }) => {
-    if (!node instanceof AST) return;
+  for (const { node, slot, depth } of ast?.walk().preVisit() ?? []) {
+    if ((!node) instanceof AST) continue;
     const ind = " ".repeat(depth * 2);
     const kind = ASTKind[node.getKind()];
     const member = slot !== undefined ? `${ASTSlot[slot]}: ` : "";
     console.log(`${ind}- ${member}${kind}`);
-  });
+  }
 
   parser.dispose();
 }

templates/cxx-parse/index.js

@@ -55,13 +55,13 @@ async function main() {
 
   const ast = parser.getAST();
 
-  ast?.walk().preVisit(({ node, slot, depth }) => {
-    if (!node instanceof AST) return;
+  for (const { node, slot, depth } of ast?.walk().preVisit() ?? []) {
+    if ((!node) instanceof AST) continue;
     const ind = " ".repeat(depth * 2);
     const kind = ASTKind[node.getKind()];
     const member = slot !== undefined ? `${ASTSlot[slot]}: ` : "";
     console.log(`${ind}- ${member}${kind}`);
-  });
+  }
 
   parser.dispose();
 }