@builder.io/mitosis 0.0.56-91 → 0.0.56-94

package/dist/src/generators/angular.js

@@ -197,9 +197,9 @@ var componentToAngular = function (options) {
     if (options === void 0) { options = {}; }
     return function (_a) {
         var _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        var component = _a.component;
+        var _component = _a.component;
         // Make a copy we can safely mutate, similar to babel's toolchain
-        var json = (0, fast_clone_1.fastClone)(component);
+        var json = (0, fast_clone_1.fastClone)(_component);
         if (options.plugins) {
             json = (0, plugins_1.runPreJsonPlugins)(json, options.plugins);
         }
@@ -215,7 +215,7 @@ var componentToAngular = function (options) {
             });
         });
         var customImports = (0, get_custom_imports_1.getCustomImports)(json);
-        var _p = component.exports, localExports = _p === void 0 ? {} : _p;
+        var _p = json.exports, localExports = _p === void 0 ? {} : _p;
         var localExportVars = Object.keys(localExports)
             .filter(function (key) { return localExports[key].usedInLocal; })
             .map(function (key) { return "".concat(key, " = ").concat(key, ";"); });
@@ -232,14 +232,14 @@ var componentToAngular = function (options) {
             }
             return "public ".concat(variableName, " : ").concat(variableType);
         });
-        var hasConstructor = Boolean(injectables.length || ((_e = component.hooks) === null || _e === void 0 ? void 0 : _e.onInit));
-        var props = (0, get_props_1.getProps)(component);
+        var hasConstructor = Boolean(injectables.length || ((_e = json.hooks) === null || _e === void 0 ? void 0 : _e.onInit));
+        var props = (0, get_props_1.getProps)(json);
         // prevent jsx props from showing up as @Input
         if (hasPropRef) {
             props.delete(forwardProp);
         }
         props.delete('children');
-        var outputVars = (0, lodash_1.uniq)(__spreadArray(__spreadArray([], metaOutputVars, true), (0, get_prop_functions_1.getPropFunctions)(component), true));
+        var outputVars = (0, lodash_1.uniq)(__spreadArray(__spreadArray([], metaOutputVars, true), (0, get_prop_functions_1.getPropFunctions)(json), true));
         // remove props for outputs
         outputVars.forEach(function (variableName) {
             props.delete(variableName);
@@ -251,7 +251,7 @@ var componentToAngular = function (options) {
             }
             return "@Output() ".concat(variableName, " = new EventEmitter()");
         });
-        var hasOnMount = Boolean((_f = component.hooks) === null || _f === void 0 ? void 0 : _f.onMount);
+        var hasOnMount = Boolean((_f = json.hooks) === null || _f === void 0 ? void 0 : _f.onMount);
         var domRefs = (0, get_refs_1.getRefs)(json);
         var jsRefs = Object.keys(json.refs).filter(function (ref) { return !domRefs.has(ref); });
         var stateVars = Object.keys((json === null || json === void 0 ? void 0 : json.state) || {});
@@ -301,7 +301,7 @@ var componentToAngular = function (options) {
                 "\n        standalone: true,\n        imports: [CommonModule".concat(componentsUsed.length ? ", ".concat(componentsUsed.join(', ')) : '', "],\n      ")
             : '', (0, lodash_1.kebabCase)(json.name || 'my-component'), (0, indent_1.indent)(template, 8).replace(/`/g, '\\`').replace(/\$\{/g, '\\${'), css.length
             ? "styles: [\n        `".concat((0, indent_1.indent)(css, 8), "`\n      ],")
-            : '', component.name, localExportVars.join('\n'), customImports.map(function (name) { return "".concat(name, " = ").concat(name); }).join('\n'), Array.from(props)
+            : '', json.name, localExportVars.join('\n'), customImports.map(function (name) { return "".concat(name, " = ").concat(name); }).join('\n'), Array.from(props)
             .filter(function (item) { return !(0, slots_1.isSlotProperty)(item) && item !== 'children'; })
             .map(function (item) {
             var propType = propsTypeRef ? "".concat(propsTypeRef, "[\"").concat(item, "\"]") : 'any';
@@ -311,8 +311,8 @@ var componentToAngular = function (options) {
             .map(function (refName) { return "@ViewChild('".concat(refName, "') ").concat(refName, ": ElementRef"); })
             .join('\n'), dataString, jsRefs
             .map(function (ref) {
-            var argument = component.refs[ref].argument;
-            var typeParameter = component.refs[ref].typeParameter;
+            var argument = json.refs[ref].argument;
+            var typeParameter = json.refs[ref].typeParameter;
             return "private _".concat(ref).concat(typeParameter ? ": ".concat(typeParameter) : '').concat(argument
                 ? " = ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(argument, {
                     replaceWith: 'this.',
@@ -325,25 +325,25 @@ var componentToAngular = function (options) {
         })
             .join('\n'), !hasConstructor
             ? ''
-            : "constructor(\n".concat(injectables.join(',\n'), ") {\n            ").concat(!((_h = component.hooks) === null || _h === void 0 ? void 0 : _h.onInit)
+            : "constructor(\n".concat(injectables.join(',\n'), ") {\n            ").concat(!((_h = json.hooks) === null || _h === void 0 ? void 0 : _h.onInit)
                 ? ''
-                : "\n              ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)((_j = component.hooks.onInit) === null || _j === void 0 ? void 0 : _j.code, {
+                : "\n              ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)((_j = json.hooks.onInit) === null || _j === void 0 ? void 0 : _j.code, {
                     replaceWith: 'this.',
                     contextVars: contextVars,
                     outputVars: outputVars,
                 }), "\n              "), "\n          }\n          "), !hasOnMount
             ? ''
-            : "ngOnInit() {\n              \n              ".concat(!((_k = component.hooks) === null || _k === void 0 ? void 0 : _k.onMount)
+            : "ngOnInit() {\n              \n              ".concat(!((_k = json.hooks) === null || _k === void 0 ? void 0 : _k.onMount)
                 ? ''
-                : "\n                ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)((_l = component.hooks.onMount) === null || _l === void 0 ? void 0 : _l.code, {
+                : "\n                ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)((_l = json.hooks.onMount) === null || _l === void 0 ? void 0 : _l.code, {
                     replaceWith: 'this.',
                     contextVars: contextVars,
                     outputVars: outputVars,
                     domRefs: Array.from(domRefs),
                     stateVars: stateVars,
-                }), "\n                "), "\n            }"), !((_m = component.hooks.onUpdate) === null || _m === void 0 ? void 0 : _m.length)
+                }), "\n                "), "\n            }"), !((_m = json.hooks.onUpdate) === null || _m === void 0 ? void 0 : _m.length)
             ? ''
-            : "ngAfterContentChecked() {\n              ".concat(component.hooks.onUpdate.reduce(function (code, hook) {
+            : "ngAfterContentChecked() {\n              ".concat(json.hooks.onUpdate.reduce(function (code, hook) {
                 code += (0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(hook.code, {
                     replaceWith: 'this.',
                     contextVars: contextVars,
@@ -352,9 +352,9 @@ var componentToAngular = function (options) {
                     stateVars: stateVars,
                 });
                 return code + '\n';
-            }, ''), "\n            }"), !component.hooks.onUnMount
+            }, ''), "\n            }"), !json.hooks.onUnMount
             ? ''
-            : "ngOnDestroy() {\n              ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(component.hooks.onUnMount.code, {
+            : "ngOnDestroy() {\n              ".concat((0, strip_state_and_props_refs_1.stripStateAndPropsRefs)(json.hooks.onUnMount.code, {
                 replaceWith: 'this.',
                 contextVars: contextVars,
                 outputVars: outputVars,

package/dist/src/generators/marko/generate.js

@@ -39,22 +39,6 @@ var lodash_1 = require("lodash");
 var hash_sum_1 = __importDefault(require("hash-sum"));
 // Having issues with this, so off for now
 var USE_MARKO_PRETTIER = false;
-/**
- * Return the names of methods and functions on state
- */
-function getStateMethodNames(json) {
-    return Object.keys(json.state).filter(function (key) {
-        var _a;
-        var type = (_a = json.state[key]) === null || _a === void 0 ? void 0 : _a.type;
-        return type === 'function' || type === 'method';
-    });
-}
-/**
- * Return the names of getter and functions on state
- */
-function getStateGetterNames(json) {
-    return Object.keys(json.state).filter(function (key) { var _a; return ((_a = json.state[key]) === null || _a === void 0 ? void 0 : _a.type) === 'getter'; });
-}
 /**
  * Return the names of properties (basic literal values) on state
  */
@@ -62,7 +46,7 @@ function getStatePropertyNames(json) {
     return Object.keys(json.state).filter(function (key) { var _a; return ((_a = json.state[key]) === null || _a === void 0 ? void 0 : _a.type) === 'property'; });
 }
 var blockToMarko = function (json, options) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     if (json.properties._text) {
         return json.properties._text;
     }
@@ -95,7 +79,7 @@ var blockToMarko = function (json, options) {
         str += " ".concat(key, "=\"").concat(value, "\" ");
     }
     for (var key in json.bindings) {
-        var _g = json.bindings[key], code = _g.code, _h = _g.arguments, cusArgs = _h === void 0 ? ['event'] : _h;
+        var _h = json.bindings[key], code = _h.code, _j = _h.arguments, cusArgs = _j === void 0 ? ['event'] : _j;
         if (key === '_spread' || key === '_forName') {
             continue;
         }
@@ -106,7 +90,7 @@ var blockToMarko = function (json, options) {
             var useKey = key === 'onChange' && json.name === 'input' ? 'onInput' : key;
             str += " ".concat((0, dash_case_1.dashCase)(useKey), "=(").concat(cusArgs.join(','), " => ").concat(processBinding(options.component, code), ") ");
         }
-        else {
+        else if (key !== 'innerHTML') {
             str += " ".concat(key, "=(").concat(processBinding(options.component, code), ") ");
         }
     }
@@ -114,6 +98,9 @@ var blockToMarko = function (json, options) {
         return str + ' />';
     }
     str += '>';
+    if ((_g = json.bindings.innerHTML) === null || _g === void 0 ? void 0 : _g.code) {
+        str += "$!{".concat(processBinding(options.component, json.bindings.innerHTML.code), "}");
+    }
     if (json.children) {
         str += json.children.map(function (item) { return blockToMarko(item, options); }).join('\n');
     }

package/dist/src/helpers/strip-state-and-props-refs.js

@@ -28,7 +28,7 @@ var stripStateAndPropsRefs = function (code, options) {
     if (outputVars.length) {
         outputVars.forEach(function (_var) {
             // determine expression edge cases onMessage( to this.onMessage.emit(
-            var regexp = '( |;|\\()(props\\.?)' + _var + '\\(';
+            var regexp = '(^|\\s|;|\\()(props\\.?)' + _var + '\\(';
             var replacer = '$1' + context + _var + '.emit(';
             newCode = newCode.replace(new RegExp(regexp, 'g'), replacer);
         });