@builder.io/mitosis 0.5.14 → 0.5.16

package/dist/src/generators/builder/generator.js

@@ -151,46 +151,29 @@ const componentMappers = {
                     if (value.type === 'single' && value.bindingType === 'function') {
                         try {
                             const code = value.code;
-                            const processedLines = [];
-                            let stopProcessing = false;
-                            const newLocal = (0, parsers_1.parseCode)(code);
-                            const lines = newLocal.length === 1 && newLocal[0].type === 'BlockStatement'
-                                ? newLocal[0].body
-                                : newLocal;
-                            const appendSemicolonIfNeeded = (code) => code.endsWith(';') ? code : code + ';';
-                            for (const line of lines) {
-                                const generatedLine = appendSemicolonIfNeeded((0, generator_1.default)(line).code);
-                                if (stopProcessing) {
-                                    processedLines.push(generatedLine);
-                                    continue;
-                                }
-                                /**
-                                 * Check if this statement re-declares our `target` variable, i.e.
-                                 * if there is a variable in this function shadowing the `target` variable.
-                                 */
-                                let hasTargetDeclaration = false;
-                                core_1.types.traverse(line, {
-                                    enter(path) {
-                                        if (hasTargetDeclaration) {
-                                            return;
-                                        }
-                                        if (core_1.types.isVariableDeclarator(path) &&
-                                            core_1.types.isIdentifier(path.id) &&
-                                            path.id.name === target) {
-                                            hasTargetDeclaration = true;
-                                        }
-                                    },
-                                });
-                                if (hasTargetDeclaration) {
-                                    stopProcessing = true;
-                                    processedLines.push(generatedLine);
-                                }
-                                else {
-                                    // Replace identifiers in this statement
-                                    processedLines.push(appendSemicolonIfNeeded(replaceIndexNode(generatedLine)));
-                                }
-                            }
-                            thing.bindings[key].code = '{' + processedLines.join('\n') + '}';
+                            const programNode = (0, parsers_1.parseCodeToAst)(code);
+                            if (!programNode)
+                                continue;
+                            (0, core_1.traverse)(programNode, {
+                                Program(path) {
+                                    if (path.scope.hasBinding(target))
+                                        return;
+                                    const x = {
+                                        id: core_1.types.identifier(target),
+                                        init: core_1.types.identifier('PLACEHOLDER'),
+                                    };
+                                    path.scope.push(x);
+                                    path.scope.rename(target, 'state.$index');
+                                    path.traverse({
+                                        VariableDeclaration(p) {
+                                            if (p.node.declarations.length === 1 && p.node.declarations[0].id === x.id) {
+                                                p.remove();
+                                            }
+                                        },
+                                    });
+                                },
+                            });
+                            thing.bindings[key].code = (0, generator_1.default)(programNode).code;
                         }
                         catch (error) {
                             console.error('Error processing function binding. Falling back to simple replacement.', error);

package/dist/src/helpers/parsers.d.ts

@@ -1,4 +1,5 @@
 import * as babel from '@babel/core';
+export declare function parseCodeToAst(code: string): babel.ParseResult | null;
 export declare function parseCode(code: string): babel.types.Statement[];
 export declare const isCodeBodyExpression: (body: babel.types.Statement[]) => boolean;
 /**

package/dist/src/helpers/parsers.js

@@ -26,25 +26,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isCodeBodyIdentifier = exports.isExpression = exports.isCodeBodyExpression = exports.parseCode = void 0;
+exports.isCodeBodyIdentifier = exports.isExpression = exports.isCodeBodyExpression = exports.parseCode = exports.parseCodeToAst = void 0;
 const babel = __importStar(require("@babel/core"));
 const plugin_syntax_decorators_1 = __importDefault(require("@babel/plugin-syntax-decorators"));
 const plugin_syntax_typescript_1 = __importDefault(require("@babel/plugin-syntax-typescript"));
 const preset_typescript_1 = __importDefault(require("@babel/preset-typescript"));
-function parseCode(code) {
-    const ast = babel.parse(code, {
+function parseCodeToAst(code) {
+    return babel.parse(code, {
         presets: [[preset_typescript_1.default, { isTSX: true, allExtensions: true }]],
         plugins: [
             [plugin_syntax_typescript_1.default, { isTSX: true }],
             [plugin_syntax_decorators_1.default, { legacy: true }],
         ],
     });
-    const body = babel.types.isFile(ast)
-        ? ast.program.body
-        : babel.types.isProgram(ast)
-            ? ast.body
-            : [];
-    return body;
+}
+exports.parseCodeToAst = parseCodeToAst;
+function parseCode(code) {
+    const ast = parseCodeToAst(code);
+    return babel.types.isFile(ast) ? ast.program.body : babel.types.isProgram(ast) ? ast.body : [];
 }
 exports.parseCode = parseCode;
 const isCodeBodyExpression = (body) => body.length == 1 &&

package/package.json

@@ -22,7 +22,7 @@
     "name": "Builder.io",
     "url": "https://www.builder.io"
   },
-  "version": "0.5.14",
+  "version": "0.5.16",
   "homepage": "https://github.com/BuilderIO/mitosis",
   "main": "./dist/src/index.js",
   "exports": {