@wavemaker/angular-codegen 11.0.0-next.71007 → 11.0.0-next.71016

angular-codegen/angular-app/package.json

@@ -18,15 +18,15 @@
     },
     "private": true,
     "dependencies": {
-        "@angular/animations": "10.2.5",
-        "@angular/common": "10.2.5",
-        "@angular/compiler": "10.2.5",
-        "@angular/core": "10.2.5",
-        "@angular/forms": "10.2.5",
-        "@angular/platform-browser": "10.2.5",
-        "@angular/platform-browser-dynamic": "10.2.5",
-        "@angular/router": "10.2.5",
-        "@angular/service-worker": "10.2.5",
+        "@angular/animations": "11.2.14",
+        "@angular/common": "11.2.14",
+        "@angular/compiler": "11.2.14",
+        "@angular/core": "11.2.14",
+        "@angular/forms": "11.2.14",
+        "@angular/platform-browser": "11.2.14",
+        "@angular/platform-browser-dynamic": "11.2.14",
+        "@angular/router": "11.2.14",
+        "@angular/service-worker": "11.2.14",
         "@babel/runtime": "^7.14.8",
         "@ionic-native/app-version": "4.10.0",
         "@ionic-native/barcode-scanner": "4.10.0",
@@ -68,16 +68,15 @@
         "tslib": "^2.0.0",
         "x2js": "3.2.6",
         "zone.js": "~0.10.3",
-        "@wavemaker/app-ng-runtime": "11.0.0-next.71007"
+        "@wavemaker/app-ng-runtime": "11.0.0-next.71016"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "0.8.5",
-        "@angular-builders/custom-webpack": "9.2.0",
-        "@angular-devkit/build-angular": "0.1002.3",
-        "@angular-devkit/build-ng-packagr": "0.1002.3",
-        "@angular/cli": "10.2.3",
-        "@angular/compiler-cli": "10.2.5",
-        "@angular/language-service": "10.2.5",
+        "@angular-builders/custom-webpack": "11.1.1",
+        "@angular-devkit/build-angular": "0.1102.15",
+        "@angular/cli": "11.2.15",
+        "@angular/compiler-cli": "11.2.14",
+        "@angular/language-service": "11.2.14",
         "@babel/plugin-transform-runtime": "^7.14.5",
         "@compodoc/compodoc": "1.1.11",
         "@types/jasmine": "2.8.8",
@@ -103,7 +102,7 @@
         "karma-jasmine-html-reporter": "^1.5.0",
         "karma-mocha-reporter": "2.2.5",
         "moment": "2.24.0",
-        "ng-packagr": "^10.1.2",
+        "ng-packagr": "11.2.4",
         "npm-run-all": "4.1.5",
         "rimraf": "2.6.3",
         "rollup": "0.65.2",
@@ -114,7 +113,7 @@
         "rollup-plugin-node-resolve": "3.4.0",
         "ts-node": "7.0.1",
         "tslint": "~6.1.0",
-        "typescript": "3.9.10",
+        "typescript": "4.1.6",
         "util": "0.11.1"
     }
 }

angular-codegen/angular-app/src/framework/services/lazy-component-ref-provider.service.ts

@@ -1,55 +1,55 @@
 import {
     Injectable,
-    NgModuleFactoryLoader,
     NgModuleRef,
     Type,
     Injector,
-    SystemJsNgModuleLoader,
-    Inject,
-    NgModuleFactory
+    Compiler,
+    NgModuleFactory,
 } from '@angular/core';
 import { PartialRefProvider } from '@wm/core';
 import { ComponentType } from '@wm/runtime/base';
-
+import { partialLazyModules, prefabLazyModules, prefabPartialLazyModules } from '../util/lazy-module-routes';
 
 type ModuleWithRoot = Type<any> & { rootComponent: Type<any> };
+type Options = {
+    prefab: string
+};
 
 @Injectable({
     providedIn: 'root'
 })
 export class LazyComponentRefProviderService extends PartialRefProvider {
     private moduleRef: NgModuleRef<any>;
-    constructor(
-        @Inject(NgModuleFactoryLoader) private loader: SystemJsNgModuleLoader,
-        private injector: Injector
-    ) {
+    
+    constructor(private injector: Injector, private compiler: Compiler) {
         super();
     }
-    private getModulePath(componentName: string, componentType: ComponentType, options?: any): string {
-        if (componentName.length > 0) {
-            if (componentType === ComponentType.PARTIAL && options && options.prefab) {
-                return `src/app/prefabs/${options.prefab}/partials/${componentName}/${componentName}.module#${componentName
-                    .charAt(0)
-                    .toUpperCase()}${componentName.slice(1)}Module`;
-            }
-            if (componentType === ComponentType.PARTIAL) {
-                return `src/app/partials/${componentName}/${componentName}.module#${componentName
-                    .charAt(0)
-                    .toUpperCase()}${componentName.slice(1)}Module`;
-            } else if (componentType === ComponentType.PREFAB) {
-                return `src/app/prefabs/${componentName}/${componentName}.module#${componentName
-                    .charAt(0)
-                    .toUpperCase()}${componentName.slice(1)}Module`;
-            }
+
+    private getLazyModule(componentName: string, componentType: ComponentType, options?: Options) {
+        if (componentType === ComponentType.PARTIAL && options && options.prefab) {
+           return prefabPartialLazyModules[`${options.prefab}_${componentName}`];
+        }
+        if (componentType === ComponentType.PARTIAL) {
+            return partialLazyModules[componentName];
+        }
+        if (componentType === ComponentType.PREFAB) {
+            return prefabLazyModules[componentName];
+        }
+    }
+
+    private async getModuleFactory(moduleOrFactory: NgModuleFactory<any> | Type<any>): Promise<NgModuleFactory<any>> {
+        if (moduleOrFactory instanceof NgModuleFactory) {
+            return moduleOrFactory;
+        } else {
+            return this.compiler.compileModuleAsync(moduleOrFactory);
         }
-        return null;
     }
-    public async getComponentFactoryRef(componentName: string, componentType: ComponentType, options?: {}) {
-        let moduleFactory: NgModuleFactory<any>;
+
+    public async getComponentFactoryRef(componentName: string, componentType: ComponentType, options?: Options) {
         try {
-            moduleFactory = await this.loader.load(
-                this.getModulePath(componentName, componentType, options)
-            );
+            const moduleOrFactory = await this.getLazyModule(componentName, componentType, options).loadChildren();
+            const moduleFactory = await this.getModuleFactory(moduleOrFactory);
+
             this.moduleRef = moduleFactory.create(this.injector);
             const rootComponent = (moduleFactory.moduleType as ModuleWithRoot)
                 .rootComponent;

angular-codegen/angular-app/src/framework/util/lazy-module-routes.ts

@@ -0,0 +1,4 @@
+// These three objects will be initialized in the code generation phase.
+export const prefabLazyModules = {};
+export const partialLazyModules = {};
+export const prefabPartialLazyModules = {};

angular-codegen/angular-app/src/main.ts

@@ -15,7 +15,7 @@ if (environment.production) {
 }
 
 document.addEventListener('DOMContentLoaded', () => {
-    new Promise( resolve => {
+    new Promise<Event | void>( resolve => {
         if (isSpotcues) {
             initSpotCues().then(resolve);
         } else if (window['cordova']) {

angular-codegen/angular-app/tsconfig.json

@@ -19,6 +19,15 @@
             "dom"
         ],
         "paths": {
+            "rxjs/observable/throw": [
+                "node_modules/rxjs-compat/_esm2015/observable/throw"
+            ],
+            "rxjs/observable/*": [
+                "node_modules/rxjs-compat/_esm2015/observable/*"
+            ],
+            "rxjs/Observable": [
+                "node_modules/rxjs-compat/_esm2015/Observable"
+            ],
             "@wm/build-task": [
                 "node_modules/@wavemaker/app-ng-runtime/build-task/"
             ],

angular-codegen/angular-app/tsconfig.web-app.json

@@ -19,6 +19,15 @@
             "dom"
         ],
         "paths": {
+            "rxjs/observable/throw": [
+                "node_modules/rxjs-compat/_esm2015/observable/throw"
+            ],
+            "rxjs/observable/*": [
+                "node_modules/rxjs-compat/_esm2015/observable/*"
+            ],
+            "rxjs/Observable": [
+                "node_modules/rxjs-compat/_esm2015/Observable"
+            ],
             "@wm/build-task": [
                 "node_modules/@wavemaker/app-ng-runtime/build-task/"
             ],