@builder.io/mitosis 0.3.21 → 0.4.0

package/dist/src/generators/angular/index.js

@@ -799,7 +799,7 @@ var componentToAngular = function (userOptions) {
         };
         var angularCoreImports = __spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray(__spreadArray([], (outputs.length ? ['Output', 'EventEmitter'] : []), true), (((_f = options === null || options === void 0 ? void 0 : options.experimental) === null || _f === void 0 ? void 0 : _f.inject) ? ['Inject', 'forwardRef'] : []), true), [
             'Component'
-        ], false), (domRefs.size || dynamicComponents.size ? ['ViewChild', 'ElementRef'] : []), true), (props.size ? ['Input'] : []), true), (dynamicComponents.size ? ['ViewChild', 'TemplateRef'] : []), true), (((_g = json.hooks.onUpdate) === null || _g === void 0 ? void 0 : _g.length) && options.typescript ? ['SimpleChanges'] : []), true).join(', ');
+        ], false), (domRefs.size || dynamicComponents.size ? ['ViewChild', 'ElementRef'] : []), true), (props.size ? ['Input'] : []), true), (dynamicComponents.size ? ['ViewContainerRef', 'TemplateRef'] : []), true), (((_g = json.hooks.onUpdate) === null || _g === void 0 ? void 0 : _g.length) && options.typescript ? ['SimpleChanges'] : []), true).join(', ');
         var str = (0, dedent_1.dedent)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n    import { ", " } from '@angular/core';\n    ", "\n\n    ", "\n    ", "\n    ", "\n\n    @Component({\n      ", "\n    })\n    export default class ", " {\n      ", "\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n      \n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n      ", "\n\n      ", "\n\n      ", "\n\n    }\n  "], ["\n    import { ", " } from '@angular/core';\n    ", "\n\n    ", "\n    ", "\n    ", "\n\n    @Component({\n      ", "\n    })\n    export default class ", " {\n      ", "\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n      \n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n\n      ", "\n      ", "\n\n      ", "\n\n      ", "\n\n    }\n  "])), angularCoreImports, options.standalone ? "import { CommonModule } from '@angular/common';" : '', json.types ? json.types.join('\n') : '', getPropsDefinition({ json: json }), (0, render_imports_1.renderPreComponent)({
             explicitImportFileExtension: options.explicitImportFileExtension,
             component: json,

package/dist/src/generators/builder.js

@@ -243,7 +243,7 @@ var componentToBuilder = function (options) {
             data: {
                 httpRequests: (_c = (_b = component === null || component === void 0 ? void 0 : component.meta) === null || _b === void 0 ? void 0 : _b.useMetadata) === null || _c === void 0 ? void 0 : _c.httpRequests,
                 jsCode: tryFormat((0, dedent_1.dedent)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n        ", "\n\n        ", "\n        \n        ", "\n      "], ["\n        ", "\n\n        ", "\n        \n        ", "\n      "])), !(0, has_props_1.hasProps)(component) ? '' : "var props = state;", !hasState ? '' : "Object.assign(state, ".concat((0, get_state_object_string_1.getStateObjectStringFromComponent)(component), ");"), (0, on_mount_1.stringifySingleScopeOnMount)(component))),
-                tsCode: tryFormat((0, dedent_1.dedent)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n        ", "\n\n        ", "\n\n        ", "\n      "], ["\n        ", "\n\n        ", "\n\n        ", "\n      "])), !(0, has_props_1.hasProps)(component) ? '' : "var props = state;", !hasState ? '' : "useState(".concat((0, get_state_object_string_1.getStateObjectStringFromComponent)(component), ");"), !component.hooks.onMount.length
+                tsCode: tryFormat((0, dedent_1.dedent)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n        ", "\n\n        ", "\n\n        ", "\n      "], ["\n        ", "\n\n        ", "\n\n        ", "\n      "])), !(0, has_props_1.hasProps)(component) ? '' : "var props = state;", !hasState ? '' : "useStore(".concat((0, get_state_object_string_1.getStateObjectStringFromComponent)(component), ");"), !component.hooks.onMount.length
                     ? ''
                     : "onMount(() => {\n                ".concat((0, on_mount_1.stringifySingleScopeOnMount)(component), "\n              })"))),
                 blocks: component.children

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

@@ -17,7 +17,7 @@ type BuilderToMitosisOptions = {
 export declare const builderElementToMitosisNode: (block: BuilderElement, options: BuilderToMitosisOptions, _internalOptions?: InternalOptions) => MitosisNode;
 export declare const getMetaFromBlock: (block: BuilderElement, options: BuilderToMitosisOptions) => {};
 /**
- * Take Builder custom jsCode and extract the contents of the useState hook
+ * Take Builder custom jsCode and extract the contents of the useStore hook
  * and return it as a JS object along with the inputted code with the hook
  * code extracted
  */

package/dist/src/parsers/builder/builder.js

@@ -339,7 +339,7 @@ var componentMappers = __assign(__assign({ Symbol: function (block, options) {
         var css = getCssFromBlock(block);
         var styleString = getStyleStringFromBlock(block, options);
         var actionBindings = getActionBindingsFromBlock(block, options);
-        var blockBindings = __assign(__assign({}, mapBuilderBindingsToMitosisBindingWithCode((_b = block.code) === null || _b === void 0 ? void 0 : _b.bindings)), mapBuilderBindingsToMitosisBindingWithCode(block.bindings));
+        var blockBindings = __assign(__assign({}, mapBuilderBindingsToMitosisBindingWithCode(block.bindings)), mapBuilderBindingsToMitosisBindingWithCode((_b = block.code) === null || _b === void 0 ? void 0 : _b.bindings));
         var bindings = __assign(__assign(__assign(__assign({}, (0, lodash_1.omitBy)(blockBindings, function (value, key) {
             if (key === 'component.options.text') {
                 return true;
@@ -369,9 +369,11 @@ var componentMappers = __assign(__assign({ Symbol: function (block, options) {
             });
         }
         var text = block.component.options.text;
-        var innerProperties = (_a = {},
-            _a[options.preserveTextBlocks ? 'innerHTML' : '_text'] = text,
-            _a);
+        var innerProperties = innerBindings._text
+            ? {}
+            : (_a = {},
+                _a[options.preserveTextBlocks ? 'innerHTML' : '_text'] = text,
+                _a);
         if (options.preserveTextBlocks) {
             return (0, create_mitosis_node_1.createMitosisNode)({
                 name: block.tagName || 'div',
@@ -643,10 +645,10 @@ var getHooks = function (content) {
     var code = convertExportDefaultToReturn(((_a = content.data) === null || _a === void 0 ? void 0 : _a.tsCode) || ((_b = content.data) === null || _b === void 0 ? void 0 : _b.jsCode) || '');
     try {
         return (0, jsx_1.parseJsx)("\n    export default function TemporaryComponent() {\n      ".concat(
-        // Mitosis parser looks for useState to be a variable assignment,
+        // Mitosis parser looks for useStore to be a variable assignment,
         // but in Builder that's not how it works. For now do a replace to
         // easily resuse the same parsing code as this is the only difference
-        code.replace("useState(", "var state = useState("), "\n    }"));
+        code.replace("useStore(", "var state = useStore("), "\n    }"));
     }
     catch (err) {
         console.warn('Could not parse js code as a Mitosis component body', err, code);
@@ -654,7 +656,7 @@ var getHooks = function (content) {
     }
 };
 /**
- * Take Builder custom jsCode and extract the contents of the useState hook
+ * Take Builder custom jsCode and extract the contents of the useStore hook
  * and return it as a JS object along with the inputted code with the hook
  * code extracted
  */
@@ -667,9 +669,9 @@ function extractStateHook(code) {
         var statement = body[i];
         if (types.isExpressionStatement(statement)) {
             var expression = statement.expression;
-            // Check for useState
+            // Check for useStore
             if (types.isCallExpression(expression)) {
-                if (types.isIdentifier(expression.callee) && expression.callee.name === 'useState') {
+                if (types.isIdentifier(expression.callee) && expression.callee.name === 'useStore') {
                     var arg = expression.arguments[0];
                     if (types.isObjectExpression(arg)) {
                         state = (0, state_1.parseStateObjectToMitosisState)(arg);

package/package.json

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