@wavemaker/angular-codegen 12.0.0-next.142016 → 12.0.0-next.28533

{angular-codegen → package}/templates/layout/layout.component.ts.hbs

@@ -1,10 +1,23 @@
 import { Component, Injector, ViewEncapsulation } from '@angular/core';
-
 import { UserDefinedExecutionContext } from '@wm/core';
-import { SpaPageDirective } from "@wm/components/page";
 import { BaseLayoutComponent } from '@wm/runtime/base';
-
 import { expressionData } from './{{name}}.component.expressions';
+import { CommonModule as NgCommonModule } from '@angular/common';
+import { RouterOutletDirective } from '@wm/components/page';
+import { RouterModule } from '@angular/router';
+{{WMComponentsImportStmts requiredWMComponents}}
+
+{{PartialModuleImportStmts requiredPartials}}
+
+const requiredComponentModules = [
+    {{WMComponentModuleStmts requiredWMComponents}},
+    RouterOutletDirective
+];
+
+const requiredPartialModules = [
+    {{PartialModuleStmts requiredPartials}}
+];
+
 
 @Component({
     selector: 'app-page-{{name}}',
@@ -15,7 +28,17 @@ import { expressionData } from './{{name}}.component.expressions';
             provide: UserDefinedExecutionContext,
             useExisting: {{componentName}}
         }
-    ]
+    ],
+    standalone: true,
+    imports: [
+        ...requiredComponentModules,
+        ...requiredPartialModules,
+        NgCommonModule,
+        RouterModule
+    ],
+    {{#if hasCustomElement}}
+    schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    {{/if}}
 })
 export class {{componentName}} extends BaseLayoutComponent {
     layoutName = '{{name}}';

package/templates/page/page.component.ts.hbs

@@ -0,0 +1,74 @@
+import { Component, ViewEncapsulation, NO_ERRORS_SCHEMA } from '@angular/core';
+import { UserDefinedExecutionContext } from '@wm/core';
+import { initScript } from './{{name}}.component.script';
+import { getVariables } from './{{name}}.component.variables';
+import { expressionData } from './{{name}}.component.expressions';
+import { CommonModule } from '@angular/common';
+import { {{#if enableSpa}}BaseSpaPageComponent{{else}}BasePageComponent{{/if}} } from '@wm/runtime/base';
+
+{{WMComponentsImportStmts requiredWMComponents}}
+{{WMCustomComponentsImportStmts requireCustomComponents}}
+{{PartialModuleImportStmts requiredPartials}}
+
+{{#if requireCustomComponents}}
+import { initCustomWidgetConfig } from '../../customwidgets/customwidget-config';
+initCustomWidgetConfig();
+{{/if}}
+
+const requiredComponentModules = [
+    {{WMComponentModuleStmts requiredWMComponents}}
+];
+
+const requiredCustomWidgetComponents= [
+    {{WMCustomComponentStmts requireCustomComponents}}
+]
+
+const requiredPartialModules: any[] = [
+    {{PartialModuleStmts requiredPartials}}
+];
+
+@Component({
+    selector: 'app-page-{{name}}',
+    templateUrl: './{{name}}.component.html',
+    styleUrls: ['./{{name}}.component.css'],
+    encapsulation: ViewEncapsulation.None,
+    providers: [
+        {
+            provide: UserDefinedExecutionContext,
+            useExisting: {{componentName}}
+        }
+    ],
+    standalone: true,
+    imports: [
+        ...requiredComponentModules,
+        ...requiredPartialModules,
+        ...requiredCustomWidgetComponents, 
+        CommonModule,
+    ],
+    {{#if hasCustomElement}}
+    schemas: [CUSTOM_ELEMENTS_SCHEMA, NO_ERRORS_SCHEMA],
+    {{/if}}
+})
+export class {{componentName}} extends {{#if enableSpa}}BaseSpaPageComponent{{else}}BasePageComponent{{/if}} {
+
+    override pageName = '{{name}}';
+    [key: string]: any;
+
+    constructor() {
+        super();
+        super.init();
+    }
+
+    getVariables() {
+        return getVariables();
+    }
+
+    evalUserScript(Page, App, Utils) {
+        initScript(Page, App, Utils);
+    }
+
+    getExpressions() {
+        return expressionData;
+    }
+
+}

{angular-codegen → package}/templates/page/page.module.ts.hbs

@@ -4,6 +4,12 @@ import { Routes, RouterModule } from '@angular/router';
 
 import { RuntimeBaseModule, CanDeactivateNgPageGuard } from '@wm/runtime/base';
 {{WMComponentsImportStmts requiredWMComponents}}
+{{WMCustomComponentsImportStmts requireCustomComponents}}
+ {{#if
+    requireCustomComponents}}
+import { initCustomWidgetConfig } from '../../customwidgets/customwidget-config';
+initCustomWidgetConfig();
+{{/if}}
 
 import { AppCodeGenModule } from '../../app-codegen.module';
 
@@ -17,7 +23,7 @@ const routes: Routes = [
     {
         path: '',
         component: {{componentName}},
-        canDeactivate: [(component) => inject(CanDeactivateNgPageGuard).canDeactivate(component)]
+        canDeactivate: [(component, currentRoute, currentState, nextState) => inject(CanDeactivateNgPageGuard).canDeactivate(component, currentRoute, currentState, nextState)]
     }
 ];
 
@@ -25,6 +31,10 @@ const requiredComponentModules = [
     {{WMComponentModuleStmts requiredWMComponents}}
 ];
 
+const requiredCustomWidgetComponents= [
+    {{WMCustomComponentStmts requireCustomComponents}}
+]
+
 const requiredPartialModules: any[] = [
     {{PartialModuleStmts requiredPartials}}
 ];
@@ -34,6 +44,7 @@ const requiredPartialModules: any[] = [
     imports: [
         ...requiredComponentModules,
         ...requiredPartialModules,
+        ...requiredCustomWidgetComponents,
         RouterModule.forChild(routes),
         NgCommonModule,
         AppCodeGenModule,

{angular-codegen → package}/templates/partial/partial.component.ts.hbs

@@ -1,12 +1,21 @@
 import { Component, Injector, Optional, ViewEncapsulation } from '@angular/core';
-
 import { UserDefinedExecutionContext } from '@wm/core';
-
 import { initScript } from './{{name}}.component.script';
 import { getVariables } from './{{name}}.component.variables';
 import { expressionData } from './{{name}}.component.expressions';
-
 import { AppRef, BasePartialComponent } from '@wm/runtime/base';
+import { CommonModule } from '@angular/common';
+{{WMComponentsImportStmts requiredWMComponents}}
+{{PartialModuleImportStmts requiredPartials}}
+
+const requiredComponentModules = [
+    {{WMComponentModuleStmts requiredWMComponents}}
+];
+
+const requiredPartialModules: any[] = [
+    {{PartialModuleStmts requiredPartials}}
+];
+
 
 @Component({
     selector: 'app-partial-{{name}}',
@@ -18,7 +27,13 @@ import { AppRef, BasePartialComponent } from '@wm/runtime/base';
             provide: UserDefinedExecutionContext,
             useExisting: {{componentName}}
         }
-    ]
+    ],
+    standalone: true,
+    imports: [
+        ...requiredComponentModules,
+        ...requiredPartialModules, 
+        CommonModule
+    ],
 })
 export class {{componentName}} extends BasePartialComponent {
 

{angular-codegen → package}/templates/prefab/prefab.component.ts.hbs

@@ -1,12 +1,20 @@
-import { Component, Injector, ViewEncapsulation } from '@angular/core';
-
+import { Component, Injector, ViewEncapsulation, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { CommonModule as NgCommonModule } from '@angular/common';
 import { UserDefinedExecutionContext } from '@wm/core';
-
 import { initScript } from './{{name}}.component.script';
 import { getVariables } from './{{name}}.component.variables';
 import { expressionData } from './{{name}}.component.expressions';
-
 import { BasePrefabComponent } from '@wm/runtime/base';
+{{WMComponentsImportStmts requiredWMComponents}}
+{{PrefabPartialModuleImportStmts requiredPartials}}
+
+const requiredComponentModules = [
+    {{WMComponentModuleStmts requiredWMComponents}}
+];
+
+const requiredPartialModules = [
+    {{PartialModuleStmts requiredPartials}}
+];
 
 @Component({
     selector: 'app-prefab-{{prefabName}}',
@@ -18,7 +26,16 @@ import { BasePrefabComponent } from '@wm/runtime/base';
             provide: UserDefinedExecutionContext,
             useExisting: {{componentName}}
         }
-    ]
+    ],
+    standalone: true,
+    imports: [
+        ...requiredComponentModules,
+        ...requiredPartialModules,
+        NgCommonModule
+    ],
+    {{#if hasCustomElement}}
+    schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    {{/if}}
 })
 export class {{componentName}} extends BasePrefabComponent {
 

angular-codegen/angular-app/package.json

@@ -1,136 +0,0 @@
-{
-    "name": "wavemaker-ng-runtime-new",
-    "version": "0.0.0",
-    "scripts": {
-        "ng": "ng",
-        "start": "./node_modules/.bin/ng serve",
-        "build": "node build-scripts/build.js",
-        "post-build": "node build-scripts/post-build.js",
-        "test": "jest --no-cache",
-        "test:watch": "jest --watch",
-        "test:coverage": "jest --coverage  && node jest-code-coverage-report.js",
-        "test-prod": "jest --no-cache --no-color --ci --silent 2>&1 | sed 's/\\x1b\\[[0-9;]*m//g' > karma-test-report.txt",
-        "lint": "eslint src/",
-        "e2e": "./node_modules/.bin/ng e2e",
-        "optimizecss": "gulp --gulpfile build-scripts/optimize-css.gulpfile.js",
-        "owasp": "owasp-dependency-check --project \"wavemaker-ng-runtime\" -f \"ALL\""
-    },
-    "private": true,
-    "dependencies": {
-        "@angular/animations": "17.3.11",
-        "@angular/common": "17.3.11",
-        "@angular/compiler": "17.3.11",
-        "@angular/core": "17.3.11",
-        "@angular/forms": "17.3.11",
-        "@angular/platform-browser": "17.3.11",
-        "@angular/platform-browser-dynamic": "17.3.11",
-        "@angular/router": "17.3.11",
-        "@angular/service-worker": "17.3.11",
-        "@awesome-cordova-plugins/app-version": "5.39.1",
-        "@awesome-cordova-plugins/barcode-scanner": "5.39.1",
-        "@awesome-cordova-plugins/calendar": "5.39.1",
-        "@awesome-cordova-plugins/camera": "5.39.1",
-        "@awesome-cordova-plugins/core": "5.39.1",
-        "@awesome-cordova-plugins/device": "5.39.1",
-        "@awesome-cordova-plugins/diagnostic": "5.39.1",
-        "@awesome-cordova-plugins/file": "5.39.1",
-        "@awesome-cordova-plugins/file-opener": "5.39.1",
-        "@awesome-cordova-plugins/geolocation": "5.39.1",
-        "@awesome-cordova-plugins/location-accuracy": "5.39.1",
-        "@awesome-cordova-plugins/media-capture": "5.39.1",
-        "@awesome-cordova-plugins/network": "5.39.1",
-        "@awesome-cordova-plugins/sqlite": "5.39.1",
-        "@awesome-cordova-plugins/vibration": "5.39.1",
-        "@babel/runtime": "7.14.8",
-        "@metrichor/jmespath": "0.3.1",
-        "@wavemaker/focus-trap": "1.0.1",
-        "@wavemaker/nvd3": "1.8.12",
-        "@wavemaker/variables": "12.0.0-next.142016",
-        "@ztree/ztree_v3": "3.5.48",
-        "angular-imask": "^7.6.1",
-        "angular2-websocket": "0.9.7",
-        "core-js": "3.35.1",
-        "d3": "7.8.5",
-        "fullcalendar": "5.3.1",
-        "hammerjs": "2.0.8",
-        "iscroll": "5.2.0",
-        "jquery": "3.7.1",
-        "jquery-ui": "1.13.3",
-        "js-cookie": "2.2.0",
-        "jssha": "3.1.2",
-        "lodash-es": "4.17.21",
-        "ng-circle-progress": "1.7.1",
-        "ngx-bootstrap": "9.0.0",
-        "ngx-color-picker": "16.0.0",
-        "ngx-toastr": "17.0.2",
-        "rxjs": "6.6.0",
-        "rxjs-compat": "6.4.0",
-        "summernote": "0.8.20",
-        "ts-jest": "29.1.1",
-        "tslib": "2.4.1",
-        "x2js": "3.4.4",
-        "zone.js": "0.14.7",
-        "@wavemaker/app-ng-runtime": "12.0.0-next.142016"
-    },
-    "devDependencies": {
-        "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",
-        "@angular-builders/custom-webpack": "17.0.2",
-        "@angular-devkit/build-angular": "17.3.8",
-        "@angular-eslint/builder": "16.2.0",
-        "@angular-eslint/eslint-plugin": "16.2.0",
-        "@angular-eslint/eslint-plugin-template": "16.2.0",
-        "@angular-eslint/schematics": "16.2.0",
-        "@angular-eslint/template-parser": "16.2.0",
-        "@angular/cli": "17.3.8",
-        "@angular/compiler-cli": "17.3.11",
-        "@angular/language-service": "17.3.11",
-        "@babel/plugin-transform-runtime": "^7.14.5",
-        "@compodoc/compodoc": "^1.1.25",
-        "@rollup/plugin-alias": "4.0.2",
-        "@rollup/plugin-commonjs": "24.0.0",
-        "@rollup/plugin-multi-entry": "6.0.0",
-        "@rollup/plugin-node-resolve": "15.0.1",
-        "@types/jest": "^29.5.12",
-        "@types/jquery": "3.3.22",
-        "@types/lodash-es": "4.17.12",
-        "@types/node": "12.11.1",
-        "@types/sizzle": "^2.3.3",
-        "@typescript-eslint/eslint-plugin": "6.15.0",
-        "@typescript-eslint/parser": "6.15.0",
-        "babel-loader": "^9.1.2",
-        "cheerio": "1.0.0-rc.12",
-        "codelyzer": "5.1.2",
-        "compression-webpack-plugin": "10.0.0",
-        "eslint": "^8.45.0",
-        "fs": "0.0.1-security",
-        "fs-extra": "7.0.1",
-        "jest": "^29.7.0",
-        "jest-canvas-mock": "^2.5.2",
-        "jest-preset-angular": "^14.1.0",
-        "moment": "2.29.4",
-        "moment-timezone": "^0.5.34",
-        "ng-packagr": "17.3.0",
-        "npm-run-all": "4.1.5",
-        "owasp-dependency-check": "0.0.23",
-        "rimraf": "2.6.3",
-        "rollup": "4.9.5",
-        "rollup-plugin-includepaths": "0.2.3",
-        "sonarqube-scanner": "4.0.1",
-        "terser": "^5.15.1",
-        "ts-node": "7.0.1",
-        "tslint": "~6.1.0",
-        "typescript": "5.4.5",
-        "util": "0.11.1",
-        "yargs": "^17.3.1"
-    },
-    "optionalDependencies": {
-        "@rollup/rollup-darwin-arm64": "4.9.5",
-        "@rollup/rollup-linux-x64-gnu": "4.9.5",
-        "@rollup/rollup-win32-x64": "4.9.5"
-    },
-    "engines": {
-        "node": ">=18.16.1",
-        "npm": ">=9.5.1"
-    },
-    "engineStrict": true
-}

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

@@ -1,11 +0,0 @@
-
-// this file will be generated from the wavemaker application sources
-
-import { NgModule } from '@angular/core';
-
-@NgModule({})
-export class AppCodeGenModule {
-
-}
-
-export const xsrfHeaderName = 'X-WM-XSRF-TOKEN';

angular-codegen/angular-app/src/app/lazy-load-scripts.resolve.ts

@@ -1,20 +0,0 @@
-import { Injectable } from '@angular/core';
-import { isMobileApp, ScriptLoaderService } from '@wm/core';
-
-
-@Injectable()
-export class LazyLoadScriptsResolve {
-
-    constructor(private scriptLoaderService: ScriptLoaderService) {}
-
-    async resolve() {
-        const scriptsToLoad = [];
-        if(isMobileApp()) {
-            scriptsToLoad.push('node_modules-hammerjs-hammer.min.js');
-            scriptsToLoad.push('node_modules-iscroll-build-iscroll.js');
-        }
-        if (scriptsToLoad.length > 0) {
-            await this.scriptLoaderService.load(...scriptsToLoad);
-        }
-    }
-}