piral-ng 0.14.0-beta.3157 → 0.14.0-beta.3187

package/src/SharedModule.ts

@@ -1,14 +1,62 @@
+import * as ngCore from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { NgModule } from '@angular/core';
-import { NgExtension } from './extension';
+import { NgExtension } from './NgExtension';
 import { ResourceUrlPipe } from './ResourceUrlPipe';
 
+const ngc = ngCore as any;
+const declarationsDef = [NgExtension, ResourceUrlPipe];
+const exportsDef = [NgExtension, ResourceUrlPipe];
+const importsDef = [CommonModule];
+
 @NgModule({
-  declarations: [NgExtension, ResourceUrlPipe],
+  declarations: declarationsDef,
   providers: [],
-  imports: [CommonModule],
-  exports: [NgExtension, ResourceUrlPipe],
+  imports: importsDef,
+  exports: exportsDef,
 })
 export class SharedModule {
   static props = {};
+
+  // @ts-ignore
+  static ɵfac: ngCore.ɵɵFactoryDeclaration<SharedModule, never> =
+    'ɵɵinject' in ngc ? (t: any) => new (t || SharedModule)() : undefined;
+
+  // @ts-ignore
+  static ɵmod: ngCore.ɵɵNgModuleDeclaration<
+    SharedModule,
+    [typeof NgExtension, typeof ResourceUrlPipe],
+    [typeof CommonModule],
+    [typeof NgExtension, typeof ResourceUrlPipe]
+  > =
+    'ɵɵdefineNgModule' in ngc
+      ? ngc.ɵɵdefineNgModule({
+          type: SharedModule,
+        })
+      : undefined;
+
+  // @ts-ignore
+  static ɵinj: ngCore.ɵɵInjectorDeclaration<SharedModule> =
+    'ɵɵdefineInjector' in ngc
+      ? ngc.ɵɵdefineInjector({
+          providers: [],
+          imports: [importsDef],
+        })
+      : undefined;
+}
+
+if ('ɵsetClassMetadata' in ngc) {
+  ngc.ɵsetClassMetadata(SharedModule, [
+    {
+      type: NgModule,
+      args: [
+        {
+          declarations: declarationsDef,
+          providers: [],
+          imports: importsDef,
+          exports: exportsDef,
+        },
+      ],
+    },
+  ]);
 }

package/src/bootstrap.ts

@@ -15,7 +15,8 @@ export function prepareBootstrap(moduleOrComponent: any): PrepareBootstrapResult
     return [...getModuleInstance(component), component];
   } else {
     // usually contains things like selector, template or templateUrl, changeDetection, ...
-    return [...(getModuleInstance(moduleOrComponent) || createModuleInstance(moduleOrComponent)), moduleOrComponent];
+    const result = getModuleInstance(moduleOrComponent) || createModuleInstance(moduleOrComponent);
+    return [...result, moduleOrComponent];
   }
 }
 

package/src/converter.ts

@@ -1,8 +1,8 @@
 import type { ForeignComponent, BaseComponentProps, Disposable } from 'piral-core';
 import type { NgModuleDefiner } from './types';
+import { NgExtension } from './NgExtension';
 import { enqueue } from './queue';
 import { defineModule } from './module';
-import { NgExtension } from './extension';
 import { bootstrap, prepareBootstrap } from './bootstrap';
 
 export interface NgConverterOptions {}

package/src/module.ts

@@ -1,4 +1,5 @@
 import type { NgOptions, ModuleInstanceResult } from './types';
+import * as ngCore from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { CommonModule } from '@angular/common';
 import { ApplicationRef, ComponentFactoryResolver, ComponentRef, NgModule, NgZone } from '@angular/core';
@@ -6,6 +7,8 @@ import { RoutingService } from './RoutingService';
 import { SharedModule } from './SharedModule';
 import { findComponents, getAnnotations } from './utils';
 
+const ngc = ngCore as any;
+
 interface ModuleDefinition {
   active: any;
   module: any;
@@ -19,15 +22,16 @@ function instantiateModule(moduleDef: ModuleDefinition) {
   const { module, components } = moduleDef;
   const imports = [BrowserModule, SharedModule, module];
   const props = { current: undefined };
+  const providers = [
+    RoutingService,
+    { provide: 'Props', useFactory: () => props.current, deps: [] },
+    { provide: 'piral', useFactory: () => props.current.piral, deps: [] },
+  ];
 
   @NgModule({
     imports,
     entryComponents: components,
-    providers: [
-      RoutingService,
-      { provide: 'Props', useFactory: () => props.current, deps: [] },
-      { provide: 'piral', useFactory: () => props.current.piral, deps: [] },
-    ],
+    providers,
   })
   class BootstrapModule {
     private appRef: ApplicationRef;
@@ -59,6 +63,50 @@ function instantiateModule(moduleDef: ModuleDefinition) {
         }
       }
     }
+
+    static ɵfac =
+      'ɵɵinject' in ngc
+        ? (t: any) =>
+            new (t || BootstrapModule)(
+              ngc.ɵɵinject(ComponentFactoryResolver),
+              ngc.ɵɵinject(NgZone),
+              ngc.ɵɵinject(RoutingService),
+            )
+        : undefined;
+
+    static ɵmod =
+      'ɵɵdefineNgModule' in ngc
+        ? ngc.ɵɵdefineNgModule({
+            type: BootstrapModule,
+          })
+        : undefined;
+
+    static ɵinj =
+      'ɵɵdefineInjector' in ngc
+        ? ngc.ɵɵdefineInjector({
+            providers,
+            imports: [imports],
+          })
+        : undefined;
+  }
+
+  if ('ɵsetClassMetadata' in ngc) {
+    ngc.ɵsetClassMetadata(
+      BootstrapModule,
+      [
+        {
+          type: NgModule,
+          args: [
+            {
+              entryComponents: components,
+              providers,
+              imports,
+            },
+          ],
+        },
+      ],
+      () => [{ type: ComponentFactoryResolver }, { type: NgZone }, { type: RoutingService }],
+    );
   }
 
   return BootstrapModule;
@@ -79,12 +127,47 @@ export function getModuleInstance(component: any): ModuleInstanceResult {
 }
 
 export function createModuleInstance(component: any): ModuleInstanceResult {
+  const declarations = [component];
+  const importsDef = [CommonModule];
+  const exportsDef = [component];
+
   @NgModule({
-    declarations: [component],
-    imports: [CommonModule],
-    exports: [component],
+    declarations,
+    imports: importsDef,
+    exports: exportsDef,
   })
-  class Module {}
+  class Module {
+    static ɵfac = 'ɵɵinject' in ngc ? (t: any) => new (t || Module)() : undefined;
+
+    static ɵmod =
+      'ɵɵdefineNgModule' in ngc
+        ? ngc.ɵɵdefineNgModule({
+            type: Module,
+          })
+        : undefined;
+
+    static ɵinj =
+      'ɵɵdefineInjector' in ngc
+        ? ngc.ɵɵdefineInjector({
+            imports: [importsDef],
+          })
+        : undefined;
+  }
+
+  if ('ɵsetClassMetadata' in ngc) {
+    ngc.ɵsetClassMetadata(Module, [
+      {
+        type: NgModule,
+        args: [
+          {
+            declarations,
+            imports: importsDef,
+            exports: exportsDef,
+          },
+        ],
+      },
+    ]);
+  }
 
   defineModule(Module);
   return getModuleInstance(component);

package/src/startup.ts

@@ -1,11 +1,13 @@
 import type { ComponentContext } from 'piral-core';
 import type { NgOptions } from './types';
 import { enableProdMode, NgModuleRef, NgZone } from '@angular/core';
-import { APP_BASE_HREF, VERSION } from '@angular/common';
+import { APP_BASE_HREF } from '@angular/common';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import { getNgVersion } from './utils';
 
 function getVersionHandler(versions: Record<string, () => void>) {
-  const version = `v${VERSION.major || VERSION.full.split('.')[0]}`;
+  const major = getNgVersion();
+  const version = `v${major}`;
   return versions[version];
 }
 

package/src/utils.ts

@@ -1,4 +1,4 @@
-import type { StaticProvider } from '@angular/core';
+import { VERSION, StaticProvider } from '@angular/core';
 
 export interface NgAnnotation {
   _initial?: Array<StaticProvider>;
@@ -11,6 +11,15 @@ export interface NgAnnotation {
   selector: string;
 }
 
+export function getNgVersion() {
+  return VERSION.major || VERSION.full.split('.')[0];
+}
+
+export function getMinVersion() {
+  const major = getNgVersion();
+  return `${major}.0.0`;
+}
+
 export function getAnnotations(component: any): Array<NgAnnotation> {
   let annotations = component?.__annotations__;
 
@@ -18,6 +27,14 @@ export function getAnnotations(component: any): Array<NgAnnotation> {
     annotations = (Reflect as any).getOwnMetadata('annotations', component);
   }
 
+  if (!annotations && typeof component.ɵcmp !== 'undefined') {
+    annotations = [{}];
+  }
+
+  if (!annotations && typeof component.ɵmod !== 'undefined') {
+    annotations = [component.ɵmod];
+  }
+
   return annotations || [];
 }
 
@@ -27,7 +44,7 @@ export function findComponents(exports: Array<any>): Array<any> {
   if (exports && Array.isArray(exports)) {
     for (const ex of exports) {
       const [annotation] = getAnnotations(ex);
-  
+
       if (annotation) {
         if (annotation.exports) {
           components.push(...findComponents(annotation.exports));
@@ -40,20 +57,3 @@ export function findComponents(exports: Array<any>): Array<any> {
 
   return components;
 }
-
-export function addImportRecursively(targetModule: any, importModule: any) {
-  const [annotation] = getAnnotations(targetModule);
-
-  if (annotation) {
-    const existingImports = annotation.imports || [];
-    annotation.imports = [...existingImports, importModule];
-
-    if ('ɵinj' in targetModule) {
-      targetModule.ɵinj.imports = annotation.imports;
-    }
-
-    for (const existingImport of existingImports) {
-      addImportRecursively(existingImport, importModule);
-    }
-  }
-}

package/esm/extension.d.ts

@@ -1,10 +0,0 @@
-import type { PiletApi } from 'piral-core';
-import { ElementRef } from '@angular/core';
-export declare class NgExtension {
-    private elRef;
-    private piral;
-    name: string;
-    params: object;
-    constructor(elRef: ElementRef<HTMLElement>, piral: PiletApi);
-    ngAfterContentInit(): void;
-}

package/esm/extension.js

@@ -1,32 +0,0 @@
-import { __decorate, __metadata, __param } from "tslib";
-import { Component, ElementRef, Input, Inject } from '@angular/core';
-let NgExtension = class NgExtension {
-    constructor(elRef, piral) {
-        this.elRef = elRef;
-        this.piral = piral;
-    }
-    ngAfterContentInit() {
-        this.piral.renderHtmlExtension(this.elRef.nativeElement, {
-            name: this.name,
-            params: this.params,
-        });
-    }
-};
-__decorate([
-    Input('name'),
-    __metadata("design:type", String)
-], NgExtension.prototype, "name", void 0);
-__decorate([
-    Input('params'),
-    __metadata("design:type", Object)
-], NgExtension.prototype, "params", void 0);
-NgExtension = __decorate([
-    Component({
-        selector: 'extension-component',
-        template: '',
-    }),
-    __param(1, Inject('piral')),
-    __metadata("design:paramtypes", [ElementRef, Object])
-], NgExtension);
-export { NgExtension };
-//# sourceMappingURL=extension.js.map

package/esm/extension.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":";AACA,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAMrE,IAAa,WAAW,GAAxB,MAAa,WAAW;IAItB,YAAoB,KAA8B,EAA2B,KAAe;QAAxE,UAAK,GAAL,KAAK,CAAyB;QAA2B,UAAK,GAAL,KAAK,CAAU;IAAG,CAAC;IAEhG,kBAAkB;QAChB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;YACvD,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAXgB;IAAd,KAAK,CAAC,MAAM,CAAC;;yCAAqB;AAClB;IAAhB,KAAK,CAAC,QAAQ,CAAC;;2CAAuB;AAF5B,WAAW;IAJvB,SAAS,CAAC;QACT,QAAQ,EAAE,qBAAqB;QAC/B,QAAQ,EAAE,EAAE;KACb,CAAC;IAKqD,WAAA,MAAM,CAAC,OAAO,CAAC,CAAA;qCAAzC,UAAU;GAJ1B,WAAW,CAYvB;SAZY,WAAW"}

package/lib/extension.d.ts

@@ -1,10 +0,0 @@
-import type { PiletApi } from 'piral-core';
-import { ElementRef } from '@angular/core';
-export declare class NgExtension {
-    private elRef;
-    private piral;
-    name: string;
-    params: object;
-    constructor(elRef: ElementRef<HTMLElement>, piral: PiletApi);
-    ngAfterContentInit(): void;
-}

package/lib/extension.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"extension.js","sourceRoot":"","sources":["../src/extension.ts"],"names":[],"mappings":";;;;AACA,wCAAqE;AAMrE,IAAa,WAAW,GAAxB,MAAa,WAAW;IAItB,YAAoB,KAA8B,EAA2B,KAAe;QAAxE,UAAK,GAAL,KAAK,CAAyB;QAA2B,UAAK,GAAL,KAAK,CAAU;IAAG,CAAC;IAEhG,kBAAkB;QAChB,IAAI,CAAC,KAAK,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;YACvD,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAC,CAAC;IACL,CAAC;CACF,CAAA;AAXgB;IAAd,IAAA,YAAK,EAAC,MAAM,CAAC;;yCAAqB;AAClB;IAAhB,IAAA,YAAK,EAAC,QAAQ,CAAC;;2CAAuB;AAF5B,WAAW;IAJvB,IAAA,gBAAS,EAAC;QACT,QAAQ,EAAE,qBAAqB;QAC/B,QAAQ,EAAE,EAAE;KACb,CAAC;IAKqD,wBAAA,IAAA,aAAM,EAAC,OAAO,CAAC,CAAA;kDAAzC,iBAAU;GAJ1B,WAAW,CAYvB;AAZY,kCAAW"}

package/src/extension.ts

@@ -1,20 +0,0 @@
-import type { PiletApi } from 'piral-core';
-import { Component, ElementRef, Input, Inject } from '@angular/core';
-
-@Component({
-  selector: 'extension-component',
-  template: '',
-})
-export class NgExtension {
-  @Input('name') public name: string;
-  @Input('params') public params: object;
-
-  constructor(private elRef: ElementRef<HTMLElement>, @Inject('piral') private piral: PiletApi) {}
-
-  ngAfterContentInit() {
-    this.piral.renderHtmlExtension(this.elRef.nativeElement, {
-      name: this.name,
-      params: this.params,
-    });
-  }
-}