@builder.io/mitosis 0.12.0 → 0.12.1

package/dist/src/generators/angular/helpers/format.d.ts

@@ -1 +1 @@
-export declare const tryFormat: (str: string, parser: string) => string;
+export declare const tryFormat: (str: string, parser: string, htmlWhitespaceSensitivity?: 'css' | 'strict' | 'ignore') => string;

package/dist/src/generators/angular/helpers/format.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.tryFormat = void 0;
 const standalone_1 = require("prettier/standalone");
-const tryFormat = (str, parser) => {
+const tryFormat = (str, parser, htmlWhitespaceSensitivity = 'css') => {
     try {
         return (0, standalone_1.format)(str, {
             parser,
@@ -13,7 +13,7 @@ const tryFormat = (str, parser) => {
                 require('prettier/parser-html'),
                 require('prettier/parser-babel'),
             ],
-            htmlWhitespaceSensitivity: 'ignore',
+            htmlWhitespaceSensitivity,
         });
     }
     catch (err) {

package/dist/src/generators/angular/signals/component.js

@@ -6,13 +6,13 @@ const format_1 = require("../../../generators/angular/helpers/format");
 const get_outputs_1 = require("../../../generators/angular/helpers/get-outputs");
 const get_refs_1 = require("../../../generators/angular/helpers/get-refs");
 const get_styles_1 = require("../../../generators/angular/helpers/get-styles");
+const hooks_1 = require("../../../generators/angular/helpers/hooks");
 const blocks_1 = require("../../../generators/angular/signals/blocks");
 const helpers_2 = require("../../../generators/angular/signals/helpers");
 const get_computed_1 = require("../../../generators/angular/signals/helpers/get-computed");
 const get_inputs_1 = require("../../../generators/angular/signals/helpers/get-inputs");
 const get_code_processor_plugins_1 = require("../../../generators/angular/signals/plugins/get-code-processor-plugins");
 const types_1 = require("../../../generators/angular/types");
-const on_mount_1 = require("../../../generators/helpers/on-mount");
 const dedent_1 = require("../../../helpers/dedent");
 const event_handlers_1 = require("../../../helpers/event-handlers");
 const fast_clone_1 = require("../../../helpers/fast-clone");
@@ -97,15 +97,6 @@ const componentToAngularSignals = (userOptions = {}) => {
         if (shouldUseSanitizer) {
             injectables.push('protected sanitizer: DomSanitizer');
         }
-        if (json.hooks.onMount.length > 0) {
-            json.compileContext.angular.hooks.ngAfterViewInit = {
-                code: `
-        if (typeof window !== 'undefined') {
-          ${(0, on_mount_1.stringifySingleScopeOnMount)(json)}
-        }
-        `,
-            };
-        }
         // HTML
         let template = json.children
             .map((item) => {
@@ -125,7 +116,8 @@ const componentToAngularSignals = (userOptions = {}) => {
         })
             .join('\n');
         if (options.prettier !== false) {
-            template = (0, format_1.tryFormat)(template, 'html');
+            // We need to use 'strict' mode for Angular otherwise it could add spaces around some content
+            template = (0, format_1.tryFormat)(template, 'html', 'strict');
         }
         const { components: dynamicComponents, dynamicTemplate } = (0, helpers_1.traverseToGetAllDynamicComponents)(json, options, {
             childComponents,
@@ -215,6 +207,10 @@ Please add a initial value for every state property even if it's \`undefined\`.`
             domRefs.size !== 0 ||
             ((_y = (_x = (_w = (_v = json.compileContext) === null || _v === void 0 ? void 0 : _v.angular) === null || _w === void 0 ? void 0 : _w.extra) === null || _x === void 0 ? void 0 : _x.spreadRefs) === null || _y === void 0 ? void 0 : _y.length) > 0;
         // Imports
+        const emptyOnMount = (0, is_hook_empty_1.isHookEmpty)(json.hooks.onMount);
+        const emptyOnUnMount = (0, is_hook_empty_1.isHookEmpty)(json.hooks.onUnMount);
+        const AfterViewInit = Boolean(!emptyOnMount || withAttributePassing);
+        const OnDestroy = !emptyOnUnMount;
         const coreImports = (0, helpers_2.getAngularCoreImportsAsString)({
             refs: domRefs.size !== 0,
             input: props.length !== 0,
@@ -224,11 +220,25 @@ Please add a initial value for every state property even if it's \`undefined\`.`
             signal: dataString.length !== 0 || hasDynamicComponents,
             computed: gettersString.length !== 0,
             onPush,
+            AfterViewInit,
+            OnDestroy,
             viewChild: importsViewChild,
             viewContainerRef: hasDynamicComponents,
             templateRef: hasDynamicComponents,
             renderer: usesRenderer2,
         });
+        // Hooks
+        if (!emptyOnMount) {
+            (0, hooks_1.addCodeNgAfterViewInit)(json, json.hooks.onMount.map((onMount) => onMount.code).join('\n'));
+        }
+        // Angular interfaces
+        const angularInterfaces = [];
+        if (AfterViewInit) {
+            angularInterfaces.push('AfterViewInit');
+        }
+        if (OnDestroy) {
+            angularInterfaces.push('OnDestroy');
+        }
         let str = (0, dedent_1.dedent) `
         import { ${coreImports} } from '@angular/core';
         import { CommonModule } from '@angular/common';
@@ -260,7 +270,7 @@ Please add a initial value for every state property even if it's \`undefined\`.`
             .map(([k, v]) => `${k}: ${v}`)
             .join(',')}
         })
-        export ${options.defaultExportComponents ? 'default ' : ''}class ${json.name} {   
+        export ${options.defaultExportComponents ? 'default ' : ''}class ${json.name} ${angularInterfaces.length ? ` implements ${angularInterfaces.join(',')}` : ''} {   
           ${(0, lodash_1.uniq)(json.compileContext.angular.extra.importCalls)
             .map((importCall) => `protected readonly ${importCall} = ${importCall};`)
             .join('\n')}
@@ -336,17 +346,19 @@ Please add a initial value for every state property even if it's \`undefined\`.`
                 .filter(([_, value]) => !(0, is_hook_empty_1.isHookEmpty)(value))
                 .map(([key, value]) => {
                 return `${key}() {
+                    if (typeof window !== 'undefined') {
                 ${value.code}
+                }
               }`;
             })
                 .join('\n')
             : ''}
     
-          ${json.hooks.onUnMount
-            ? `ngOnDestroy() {
+          ${emptyOnUnMount
+            ? ''
+            : `ngOnDestroy() {
                   ${((_10 = json.hooks.onUnMount) === null || _10 === void 0 ? void 0 : _10.code) || ''}
-                }`
-            : ''}
+                }`}
     
         }
       `;

package/dist/src/generators/angular/signals/helpers/index.d.ts

@@ -1,9 +1,11 @@
-export declare const getAngularCoreImportsAsString: ({ refs, output, input, model, onPush, effect, signal, computed, viewChild, viewContainerRef, templateRef, renderer, }: {
+export declare const getAngularCoreImportsAsString: ({ refs, output, input, model, onPush, effect, signal, AfterViewInit, OnDestroy, computed, viewChild, viewContainerRef, templateRef, renderer, }: {
     refs: boolean;
     output: boolean;
     input: boolean;
     model: boolean;
     onPush: boolean;
+    AfterViewInit: boolean;
+    OnDestroy: boolean;
     effect: boolean;
     signal: boolean;
     computed: boolean;

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

@@ -1,14 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAngularCoreImportsAsString = void 0;
-const getAngularCoreImportsAsString = ({ refs, output, input, model, onPush, effect, signal, computed, viewChild, viewContainerRef, templateRef, renderer, }) => {
+const getAngularCoreImportsAsString = ({ refs, output, input, model, onPush, effect, signal, AfterViewInit, OnDestroy, computed, viewChild, viewContainerRef, templateRef, renderer, }) => {
     const angularCoreImports = {
         Component: true,
         viewChild: refs || viewChild,
         ElementRef: refs || viewChild,
         ViewContainerRef: viewContainerRef,
         TemplateRef: templateRef,
-        Renderer2: !!renderer,
+        Renderer2: renderer,
         model,
         output,
         input,
@@ -16,6 +16,8 @@ const getAngularCoreImportsAsString = ({ refs, output, input, model, onPush, eff
         signal,
         computed,
         ChangeDetectionStrategy: onPush,
+        OnDestroy,
+        AfterViewInit,
         InputSignal: input,
         ModelSignal: model,
     };

package/package.json

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