merge intermediate node declaration

babel · May 9, 2022 · 2600b5a · 2600b5a
1 parent fbadf00
commit 2600b5a
Show file tree

Hide file tree

Showing 2 changed files with 832 additions and 955 deletions.
diff --git a/packages/babel-types/scripts/generators/builders.js b/packages/babel-types/scripts/generators/builders.js
@@ -117,16 +117,16 @@ import type * as t from "../..";
 
     output += `${
       formatedBuilderNameLocal === formatedBuilderName ? "export " : ""
-    }function ${formatedBuilderNameLocal}(${defArgs.join(
-      ", "
-    )}) {\n  const node: t.${type} = {\n${objectFields
+    }function ${formatedBuilderNameLocal}(${defArgs.join(", ")}): t.${type} {`;
+
+    const nodeObjectExpression = `{\n${objectFields
       .map(([k, v]) => (k === v ? `    ${k},` : `    ${k}: ${v},`))
-      .join("\n")}  };`;
+      .join("\n")}\n  }`;
 
     if (builderNames.length > 0) {
-      output += `\n  return validateNode(node);`;
+      output += `\n  return validateNode<t.${type}>(${nodeObjectExpression});`;
     } else {
-      output += `\n  return node;`;
+      output += `\n  return ${nodeObjectExpression};`;
     }
     output += `\n}\n`;