@builder.io/mitosis 0.0.50-8 → 0.0.54

package/dist/src/generators/svelte.js

@@ -35,17 +35,94 @@ var plugins_1 = require("../modules/plugins");
 var is_children_1 = __importDefault(require("../helpers/is-children"));
 var strip_meta_properties_1 = require("../helpers/strip-meta-properties");
 var remove_surrounding_block_1 = require("../helpers/remove-surrounding-block");
+var getters_to_functions_1 = require("../helpers/getters-to-functions");
+var babel_transform_1 = require("../helpers/babel-transform");
+var function_1 = require("fp-ts/lib/function");
+var context_1 = require("./helpers/context");
+var html_tags_1 = require("../constants/html_tags");
 var mappers = {
-    Fragment: function (json, options) {
-        return "".concat(json.children
-            .map(function (item) { return (0, exports.blockToSvelte)(item, options); })
-            .join('\n'));
+    Fragment: function (_a) {
+        var json = _a.json, options = _a.options, parentComponent = _a.parentComponent;
+        if (json.bindings.innerHTML) {
+            return BINDINGS_MAPPER.innerHTML(json, options);
+        }
+        else if (json.children.length > 0) {
+            return "".concat(json.children
+                .map(function (item) { return (0, exports.blockToSvelte)({ json: item, options: options, parentComponent: parentComponent }); })
+                .join('\n'));
+        }
+        else {
+            return '';
+        }
+    },
+    For: function (_a) {
+        var json = _a.json, options = _a.options, parentComponent = _a.parentComponent;
+        return "\n{#each ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(json.bindings.each, {
+            includeState: options.stateType === 'variables',
+        }), " as ").concat(json.properties._forName, ", index }\n").concat(json.children
+            .map(function (item) { return (0, exports.blockToSvelte)({ json: item, options: options, parentComponent: parentComponent }); })
+            .join('\n'), "\n{/each}\n");
+    },
+    Show: function (_a) {
+        var json = _a.json, options = _a.options, parentComponent = _a.parentComponent;
+        return "\n{#if ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(json.bindings.when, {
+            includeState: options.stateType === 'variables',
+        }), " }\n").concat(json.children
+            .map(function (item) { return (0, exports.blockToSvelte)({ json: item, options: options, parentComponent: parentComponent }); })
+            .join('\n'), "\n{/if}");
+    },
+};
+var getContextCode = function (json) {
+    var contextGetters = json.context.get;
+    return Object.keys(contextGetters)
+        .map(function (key) { return "let ".concat(key, " = getContext(").concat(contextGetters[key].name, ".key);"); })
+        .join('\n');
+};
+var setContextCode = function (json) {
+    var contextSetters = json.context.set;
+    return Object.keys(contextSetters)
+        .map(function (key) {
+        var _a = contextSetters[key], value = _a.value, name = _a.name;
+        return "setContext(".concat(name, ".key, ").concat(value ? (0, get_state_object_string_1.getMemberObjectString)(value) : 'undefined', ");");
+    })
+        .join('\n');
+};
+var BINDINGS_MAPPER = {
+    innerHTML: function (json, options) {
+        return "{@html ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(json.bindings.innerHTML), "}");
     },
 };
-var blockToSvelte = function (json, options) {
+var SVELTE_SPECIAL_TAGS = {
+    COMPONENT: 'svelte:component',
+    ELEMENT: 'svelte:element',
+    SELF: 'svelte:self',
+};
+var getTagName = function (_a) {
+    var json = _a.json, parentComponent = _a.parentComponent;
+    if (parentComponent && json.name === parentComponent.name) {
+        return SVELTE_SPECIAL_TAGS.SELF;
+    }
+    var isValidHtmlTag = html_tags_1.VALID_HTML_TAGS.includes(json.name);
+    var isSpecialSvelteTag = json.name.startsWith('svelte:');
+    // Check if any import matches `json.name`
+    var hasMatchingImport = parentComponent.imports.some(function (_a) {
+        var imports = _a.imports;
+        return Object.keys(imports).some(function (name) { return name === json.name; });
+    });
+    // TO-DO: no way to decide between <svelte:component> and <svelte:element>...need to do that through metadata
+    // overrides for now
+    if (!isValidHtmlTag && !isSpecialSvelteTag && !hasMatchingImport) {
+        json.bindings.this = json.name;
+        return SVELTE_SPECIAL_TAGS.COMPONENT;
+    }
+    return json.name;
+};
+var blockToSvelte = function (_a) {
+    var json = _a.json, options = _a.options, parentComponent = _a.parentComponent;
     if (mappers[json.name]) {
-        return mappers[json.name](json, options);
+        return mappers[json.name]({ json: json, options: options, parentComponent: parentComponent });
     }
+    var tagName = getTagName({ json: json, parentComponent: parentComponent });
     if ((0, is_children_1.default)(json)) {
         return "<slot></slot>";
     }
@@ -58,63 +135,58 @@ var blockToSvelte = function (json, options) {
         }), "}");
     }
     var str = '';
-    if (json.name === 'For') {
-        str += "{#each ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(json.bindings.each, {
+    str += "<".concat(tagName, " ");
+    if (json.bindings._spread) {
+        str += "{...".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(json.bindings._spread, {
             includeState: options.stateType === 'variables',
-        }), " as ").concat(json.properties._forName, " }");
-        str += json.children.map(function (item) { return (0, exports.blockToSvelte)(item, options); }).join('\n');
-        str += "{/each}";
+        }), "}");
     }
-    else if (json.name === 'Show') {
-        str += "{#if ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(json.bindings.when, {
-            includeState: options.stateType === 'variables',
-        }), " }");
-        str += json.children.map(function (item) { return (0, exports.blockToSvelte)(item, options); }).join('\n');
-        str += "{/if}";
+    for (var key in json.properties) {
+        var value = json.properties[key];
+        str += " ".concat(key, "=\"").concat(value, "\" ");
     }
-    else {
-        str += "<".concat(json.name, " ");
-        if (json.bindings._spread) {
-            str += "{...".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(json.bindings._spread, {
-                includeState: options.stateType === 'variables',
-            }), "}");
+    for (var key in json.bindings) {
+        if (key === 'innerHTML') {
+            continue;
         }
-        for (var key in json.properties) {
-            var value = json.properties[key];
-            str += " ".concat(key, "=\"").concat(value, "\" ");
+        if (key === '_spread') {
+            continue;
         }
-        for (var key in json.bindings) {
-            if (key === '_spread') {
-                continue;
-            }
-            var value = json.bindings[key];
-            // TODO: proper babel transform to replace. Util for this
-            var useValue = (0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(value, {
-                includeState: options.stateType === 'variables',
-            });
-            if (key.startsWith('on')) {
-                var event_1 = key.replace('on', '').toLowerCase();
-                // TODO: handle quotes in event handler values
-                str += " on:".concat(event_1, "=\"{event => ").concat((0, remove_surrounding_block_1.removeSurroundingBlock)(useValue), "}\" ");
-            }
-            else if (key === 'ref') {
-                str += " bind:this={".concat(useValue, "} ");
-            }
-            else {
-                str += " ".concat(key, "={").concat(useValue, "} ");
-            }
+        var value = json.bindings[key];
+        // TODO: proper babel transform to replace. Util for this
+        var useValue = (0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(value, {
+            includeState: options.stateType === 'variables',
+        });
+        if (key.startsWith('on')) {
+            var event_1 = key.replace('on', '').toLowerCase();
+            // TODO: handle quotes in event handler values
+            str += " on:".concat(event_1, "=\"{event => ").concat((0, remove_surrounding_block_1.removeSurroundingBlock)(useValue), "}\" ");
         }
-        if (jsx_1.selfClosingTags.has(json.name)) {
-            return str + ' />';
+        else if (key === 'ref') {
+            str += " bind:this={".concat(useValue, "} ");
         }
-        str += '>';
-        if (json.children) {
-            str += json.children
-                .map(function (item) { return (0, exports.blockToSvelte)(item, options); })
-                .join('\n');
+        else {
+            str += " ".concat(key, "={").concat(useValue, "} ");
         }
-        str += "</".concat(json.name, ">");
     }
+    // if we have innerHTML, it doesn't matter whether we have closing tags or not, or children or not.
+    // we use the innerHTML content as children and don't render the self-closing tag.
+    if (json.bindings.innerHTML) {
+        str += '>';
+        str += BINDINGS_MAPPER.innerHTML(json, options);
+        str += "</".concat(tagName, ">");
+        return str;
+    }
+    if (jsx_1.selfClosingTags.has(tagName)) {
+        return str + ' />';
+    }
+    str += '>';
+    if (json.children) {
+        str += json.children
+            .map(function (item) { return (0, exports.blockToSvelte)({ json: item, options: options, parentComponent: parentComponent }); })
+            .join('\n');
+    }
+    str += "</".concat(tagName, ">");
     return str;
 };
 exports.blockToSvelte = blockToSvelte;
@@ -140,6 +212,12 @@ var useBindValue = function (json, options) {
         }
     });
 };
+/**
+ * Removes all `this.` references.
+ */
+var stripThisRefs = function (str) {
+    return str.replace(/this\.([a-zA-Z_\$0-9]+)/g, '$1');
+};
 var componentToSvelte = function (options) {
     if (options === void 0) { options = {}; }
     return function (_a) {
@@ -153,12 +231,13 @@ var componentToSvelte = function (options) {
         }
         var refs = Array.from((0, get_refs_1.getRefs)(json));
         useBindValue(json, useOptions);
+        (0, getters_to_functions_1.gettersToFunctions)(json);
         if (useOptions.plugins) {
             json = (0, plugins_1.runPostJsonPlugins)(json, useOptions.plugins);
         }
         var css = (0, collect_styles_1.collectCss)(json);
         (0, strip_meta_properties_1.stripMetaProperties)(json);
-        var dataString = (0, get_state_object_string_1.getStateObjectStringFromComponent)(json, {
+        var dataString = (0, function_1.pipe)((0, get_state_object_string_1.getStateObjectStringFromComponent)(json, {
             data: true,
             functions: false,
             getters: false,
@@ -169,63 +248,77 @@ var componentToSvelte = function (options) {
                     includeState: useOptions.stateType === 'variables',
                 });
             },
-        });
-        var getterString = (0, get_state_object_string_1.getStateObjectStringFromComponent)(json, {
+        }), babel_transform_1.babelTransformCode);
+        var getterString = (0, function_1.pipe)((0, get_state_object_string_1.getStateObjectStringFromComponent)(json, {
             data: false,
             getters: true,
             functions: false,
             format: 'variables',
             keyPrefix: '$: ',
             valueMapper: function (code) {
-                return (0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(code
+                return (0, function_1.pipe)((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(code
                     .replace(/^get ([a-zA-Z_\$0-9]+)/, '$1 = ')
                     .replace(/\)/, ') => '), {
                     includeState: useOptions.stateType === 'variables',
-                });
+                }), stripThisRefs);
             },
-        });
-        var functionsString = (0, get_state_object_string_1.getStateObjectStringFromComponent)(json, {
+        }), babel_transform_1.babelTransformCode);
+        var functionsString = (0, function_1.pipe)((0, get_state_object_string_1.getStateObjectStringFromComponent)(json, {
             data: false,
             getters: false,
             functions: true,
             format: 'variables',
             keyPrefix: 'function ',
             valueMapper: function (code) {
-                return (0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(code, {
+                return (0, function_1.pipe)((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(code, {
                     includeState: useOptions.stateType === 'variables',
-                });
+                }), stripThisRefs);
             },
-        });
+        }), babel_transform_1.babelTransformCode);
         var hasData = dataString.length > 4;
         var props = Array.from((0, get_props_1.getProps)(json));
-        var str = (0, dedent_1.default)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n    <script>\n      ", "\n      ", "\n      ", "\n      ", "\n\n      ", "\n      ", "\n\n      ", "\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n    </script>\n\n    ", "\n\n    ", "\n  "], ["\n    <script>\n      ", "\n      ", "\n      ", "\n      ", "\n\n      ", "\n      ", "\n\n      ", "\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n    </script>\n\n    ", "\n\n    ", "\n  "])), !((_b = json.hooks.onMount) === null || _b === void 0 ? void 0 : _b.code) ? '' : "import { onMount } from 'svelte'", !((_c = json.hooks.onUpdate) === null || _c === void 0 ? void 0 : _c.length)
+        var transformHookCode = function (hookCode) {
+            return (0, function_1.pipe)((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(hookCode, {
+                includeState: useOptions.stateType === 'variables',
+            }), babel_transform_1.babelTransformCode);
+        };
+        var str = (0, dedent_1.default)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n    <script>\n      ", "\n      ", "\n      ", "\n      ", "\n      ", "\n\n      ", "\n      ", "\n      \n      ", "\n      ", "\n\n      ", "\n      ", "\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n    </script>\n\n    ", "\n\n    ", "\n  "], ["\n    <script>\n      ", "\n      ", "\n      ", "\n      ", "\n      ", "\n\n      ", "\n      ", "\n      \n      ", "\n      ", "\n\n      ", "\n      ", "\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n    </script>\n\n    ", "\n\n    ", "\n  "])), !((_b = json.hooks.onMount) === null || _b === void 0 ? void 0 : _b.code) ? '' : "import { onMount } from 'svelte'", !((_c = json.hooks.onUpdate) === null || _c === void 0 ? void 0 : _c.length)
             ? ''
-            : "import { afterUpdate } from 'svelte'", !((_d = json.hooks.onUnMount) === null || _d === void 0 ? void 0 : _d.code) ? '' : "import { onDestroy } from 'svelte'", (0, render_imports_1.renderPreComponent)(json), !hasData || useOptions.stateType === 'variables'
+            : "import { afterUpdate } from 'svelte'", !((_d = json.hooks.onUnMount) === null || _d === void 0 ? void 0 : _d.code) ? '' : "import { onDestroy } from 'svelte'", (0, render_imports_1.renderPreComponent)(json, 'svelte'), (0, context_1.hasContext)(component)
+            ? 'import { getContext, setContext } from "svelte";'
+            : '', !hasData || useOptions.stateType === 'variables'
             ? ''
             : "import onChange from 'on-change'", refs
             .concat(props)
-            .map(function (name) { return "export let ".concat(name, ";"); })
-            .join('\n'), functionsString.length < 4 ? '' : functionsString, getterString.length < 4 ? '' : getterString, useOptions.stateType === 'proxies'
+            .map(function (name) {
+            if (name === 'children') {
+                return '';
+            }
+            return "export let ".concat(name, ";");
+        })
+            .join('\n'), functionsString.length < 4 ? '' : functionsString, getterString.length < 4 ? '' : getterString, getContextCode(json), setContextCode(json), useOptions.stateType === 'proxies'
             ? dataString.length < 4
                 ? ''
                 : "let state = onChange(".concat(dataString, ", () => state = state)")
             : dataString, !((_e = json.hooks.onMount) === null || _e === void 0 ? void 0 : _e.code)
             ? ''
-            : "onMount(() => { ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(json.hooks.onMount.code, {
-                includeState: useOptions.stateType === 'variables',
-            }), " });"), !((_f = json.hooks.onUpdate) === null || _f === void 0 ? void 0 : _f.length)
+            : "onMount(() => { ".concat(transformHookCode(json.hooks.onMount.code), " });"), !((_f = json.hooks.onUpdate) === null || _f === void 0 ? void 0 : _f.length)
             ? ''
             : json.hooks.onUpdate
                 .map(function (hook) {
-                return "afterUpdate(() => { ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(hook.code, {
-                    includeState: useOptions.stateType === 'variables',
-                }), " })");
+                return "afterUpdate(() => { ".concat(transformHookCode(hook.code), " })");
             })
                 .join(';'), !((_g = json.hooks.onUnMount) === null || _g === void 0 ? void 0 : _g.code)
             ? ''
-            : "onDestroy(() => { ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(json.hooks.onUnMount.code, {
-                includeState: useOptions.stateType === 'variables',
-            }), " });"), json.children.map(function (item) { return (0, exports.blockToSvelte)(item, useOptions); }).join('\n'), !css.trim().length
+            : "onDestroy(() => { ".concat(transformHookCode(json.hooks.onUnMount.code), " });"), json.children
+            .map(function (item) {
+            return (0, exports.blockToSvelte)({
+                json: item,
+                options: useOptions,
+                parentComponent: json,
+            });
+        })
+            .join('\n'), !css.trim().length
             ? ''
             : "<style>\n      ".concat(css, "\n    </style>"));
         if (useOptions.plugins) {

package/dist/src/generators/vue.js

@@ -266,7 +266,10 @@ var onUpdatePlugin = function (options) { return ({
                     .filter(function (hook) { var _a; return (_a = hook.deps) === null || _a === void 0 ? void 0 : _a.length; })
                     .forEach(function (hook, index) {
                     var _a;
-                    component.state[getOnUpdateHookName(index)] = "".concat(method_literal_prefix_1.methodLiteralPrefix, "get ").concat(getOnUpdateHookName(index), " () {\n            return `").concat((_a = hook.deps) === null || _a === void 0 ? void 0 : _a.slice(1, -1).split(',').map(function (dep) { return "${".concat(dep.trim(), "}"); }).join('|'), "`\n          }");
+                    component.state[getOnUpdateHookName(index)] = "".concat(method_literal_prefix_1.methodLiteralPrefix, "get ").concat(getOnUpdateHookName(index), " () {\n            return {\n              ").concat((_a = hook.deps) === null || _a === void 0 ? void 0 : _a.slice(1, -1).split(',').map(function (dep, k) {
+                        var val = dep.trim();
+                        return "".concat(k, ": ").concat(val);
+                    }).join(','), "\n            }\n          }");
                 });
             }
         },

package/dist/src/helpers/babel-transform copy.d.ts

@@ -0,0 +1,8 @@
+import * as babel from '@babel/core';
+declare type Visitor<ContextType = any> = {
+    [key: string]: (path: any, context: ContextType) => void;
+};
+export declare const babelTransform: <VisitorContextType = any>(code: string, visitor?: Visitor<VisitorContextType> | undefined) => babel.BabelFileResult | null;
+export declare const babelTransformCode: <VisitorContextType = any>(code: string, visitor?: Visitor<VisitorContextType> | undefined) => string;
+export declare const babelTransformExpression: <VisitorContextType = any>(code: string, visitor: Visitor<VisitorContextType>, type?: 'expression' | 'unknown' | 'block' | 'functionBody') => string;
+export {};

package/dist/src/helpers/babel-transform copy.js

@@ -0,0 +1,138 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.babelTransformExpression = exports.babelTransformCode = exports.babelTransform = void 0;
+var babel = __importStar(require("@babel/core"));
+var lodash_1 = require("lodash");
+var jsxPlugin = require('@babel/plugin-syntax-jsx');
+var tsPreset = require('@babel/preset-typescript');
+var decorators = require('@babel/plugin-syntax-decorators');
+var babelTransform = function (code, visitor) {
+    return babel.transform(code, {
+        sourceFileName: 'file.tsx',
+        configFile: false,
+        babelrc: false,
+        presets: [[tsPreset, { isTSX: true, allExtensions: true }]],
+        plugins: __spreadArray([
+            [decorators, { legacy: true }],
+            jsxPlugin
+        ], (visitor ? [function () { return ({ visitor: visitor }); }] : []), true),
+    });
+};
+exports.babelTransform = babelTransform;
+var babelTransformCode = function (code, visitor) {
+    var _a;
+    return ((_a = (0, exports.babelTransform)(code, visitor)) === null || _a === void 0 ? void 0 : _a.code) || '';
+};
+exports.babelTransformCode = babelTransformCode;
+var babelTransformExpression = function (code, visitor, type) {
+    var _a;
+    if (type === void 0) { type = 'unknown'; }
+    if (!code) {
+        return '';
+    }
+    // match for object literal like { foo: ... }
+    if (type === 'unknown' && code.trim().match(/^\s*{\s*[a-z0-9]+:/i)) {
+        type = 'expression';
+    }
+    // For Builder content
+    if (type === 'unknown' &&
+        (code.includes('return _virtual_index') ||
+            code.trim().startsWith('return ')) &&
+        !code.trim().startsWith('function')) {
+        type = 'functionBody';
+    }
+    var useCode = code;
+    if (type === 'functionBody') {
+        useCode = "function(){".concat(useCode, "}");
+    }
+    var result = type === 'expression'
+        ? null
+        : (0, lodash_1.attempt)(function () {
+            var _a;
+            var result = ((_a = (0, exports.babelTransform)(useCode, visitor)) === null || _a === void 0 ? void 0 : _a.code) || '';
+            if (type === 'functionBody') {
+                return result.replace(/^function\(\)\{/, '').replace(/\};$/, '');
+            }
+            else {
+                // Babel addes trailing semicolons, but for expressions we need those gone
+                // TODO: maybe detect if the original code ended with one, and keep it if so, for the case
+                // of appending several fragements
+                return result.replace(/;$/, '');
+            }
+        });
+    if ((0, lodash_1.isError)(result) || type === 'expression') {
+        try {
+            // If it can't, e.g. this is an expression or code fragment, modify the code below and try again
+            // Detect method fragments. These get passed sometimes and otherwise
+            // generate compile errors. They are of the form `foo() { ... }`
+            var isMethod = Boolean(!code.startsWith('function') &&
+                code.match(/^[a-z0-9]+\s*\([^\)]*\)\s*[\{:]/i));
+            if (isMethod) {
+                useCode = "function ".concat(useCode);
+            }
+            // Parse the code as an expression (instead of the default, a block) by giving it a fake variable assignment
+            // e.g. if the code parsed is { ... } babel will treat that as a block by deafult, unless processed as an expression
+            // that is an object
+            useCode = "let _ = ".concat(useCode);
+            result = (((_a = (0, exports.babelTransform)(useCode, visitor)) === null || _a === void 0 ? void 0 : _a.code) || '')
+                // Babel addes trailing semicolons, but for expressions we need those gone
+                .replace(/;$/, '')
+                // Remove our fake variable assignment
+                .replace(/let _ =\s/, '');
+            if (isMethod) {
+                result = result.replace('function', '');
+            }
+        }
+        catch (err) {
+            console.error('Error parsing code:\n', code, '\n', result);
+            try {
+                return (0, exports.babelTransformExpression)(code, visitor, 'functionBody');
+            }
+            catch (err) {
+                throw err;
+            }
+        }
+    }
+    if (type === 'functionBody') {
+        return result.replace(/^function\s*\(\)\s*\{/, '').replace(/\};?$/, '');
+    }
+    else {
+        // Babel addes trailing semicolons, but for expressions we need those gone
+        // TODO: maybe detect if the original code ended with one, and keep it if so, for the case
+        // of appending several fragements
+        return result.replace(/;$/, '');
+    }
+};
+exports.babelTransformExpression = babelTransformExpression;

package/dist/src/helpers/babel-transform.d.ts

@@ -1,8 +1,5 @@
 import * as babel from '@babel/core';
-declare type Visitor<ContextType = any> = {
-    [key: string]: (path: any, context: ContextType) => void;
-};
-export declare const babelTransform: <VisitorContextType = any>(code: string, visitor: Visitor<VisitorContextType>) => babel.BabelFileResult | null;
-export declare const babelTransformCode: <VisitorContextType = any>(code: string, visitor: Visitor<VisitorContextType>) => string;
-export declare const babelTransformExpression: <VisitorContextType = any>(code: string, visitor: Visitor<VisitorContextType>, type?: 'expression' | 'unknown' | 'block' | 'functionBody') => string;
-export {};
+import type { Visitor } from '@babel/traverse';
+export declare const babelTransform: <VisitorContextType = any>(code: string, visitor?: babel.Visitor<VisitorContextType> | undefined) => babel.BabelFileResult | null;
+export declare const babelTransformCode: <VisitorContextType = any>(code: string, visitor?: babel.Visitor<VisitorContextType> | undefined) => string;
+export declare const babelTransformExpression: <VisitorContextType = any>(code: string, visitor: babel.Visitor<VisitorContextType>, type?: 'expression' | 'unknown' | 'block' | 'functionBody') => string;

package/dist/src/helpers/babel-transform.js

@@ -22,6 +22,15 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.babelTransformExpression = exports.babelTransformCode = exports.babelTransform = void 0;
 var babel = __importStar(require("@babel/core"));
@@ -35,7 +44,10 @@ var babelTransform = function (code, visitor) {
         configFile: false,
         babelrc: false,
         presets: [[tsPreset, { isTSX: true, allExtensions: true }]],
-        plugins: [[decorators, { legacy: true }], jsxPlugin, function () { return ({ visitor: visitor }); }],
+        plugins: __spreadArray([
+            [decorators, { legacy: true }],
+            jsxPlugin
+        ], (visitor ? [function () { return ({ visitor: visitor }); }] : []), true),
     });
 };
 exports.babelTransform = babelTransform;

package/dist/src/helpers/babel-transform.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/helpers/babel-transform.test.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var babel_transform_1 = require("./babel-transform");
+test('babelTransform', function () {
+    var code = "\nconst symbol = symbol;\n\nif (symbol) {\n  getContent({\n    apiKey: builderContext.apiKey!,\n  }).then(response => {\n    content = response;\n  });\n}\n";
+    expect((0, babel_transform_1.babelTransformCode)(code)).toMatchSnapshot();
+});

package/dist/src/helpers/generic-format.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/src/helpers/generic-format.test.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var globals_1 = require("@jest/globals");
+var generic_format_1 = require("./generic-format");
+(0, globals_1.test)('Can generic format sloppy Swift code', function () {
+    var code = "\n  import SwiftUI\n  import JavaScriptCore\n  \n  struct MyComponent: View {\n    \n      @State private var updateIndex = 0\n      private var context = JSContext()\n  \n      func eval(expression: String) -> JSValue! {\n        return context?.evaluateScript(expression)\n      }\n  \n      init() {\n        let jsSource = \"\"\"\n            const state = { name: \"Steve\" };\n  \n        \"\"\"\n        context?.evaluateScript(jsSource)\n      }\n    \n  \n    var body: some View {\n      VStack {\n        Text(String(updateIndex)).hidden()\n        VStack(){\n        Foo(\n          bar: baz\n          )\n  TextField(){}\n  Text(\"Hello\")\n  Text(eval(expression: \"\"\"state.name\"\"\"))\n  Text(\"! I can run in React, Vue, Solid, or Liquid!\")}\n      }\n    }\n  }\n  ";
+    (0, globals_1.expect)((0, generic_format_1.format)(code)).toMatchSnapshot();
+});

package/dist/src/helpers/get-state-object-string.js

@@ -71,6 +71,7 @@ var getMemberObjectString = function (object, options) {
 exports.getMemberObjectString = getMemberObjectString;
 var getStateObjectStringFromComponent = function (component, options) {
     if (options === void 0) { options = {}; }
-    return (0, exports.getMemberObjectString)(component.state, options);
+    var stateObjectStr = (0, exports.getMemberObjectString)(component.state, options);
+    return stateObjectStr;
 };
 exports.getStateObjectStringFromComponent = getStateObjectStringFromComponent;

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

@@ -0,0 +1,8 @@
+import * as babel from '@babel/core';
+export declare function parseCode(code: string): babel.types.Statement[];
+export declare const isCodeBodyExpression: (body: babel.types.Statement[]) => boolean;
+/**
+ * Returns `true` if the `code` is a valid expression. (vs a statement)
+ */
+export declare function isExpression(code: string): boolean;
+export declare const isCodeBodyIdentifier: (body: babel.types.Statement[]) => boolean;