@wavemaker/angular-codegen 11.7.0-next.139431 → 11.7.0-next.139432

angular-codegen/angular-app/src/setup-jest.js

@@ -0,0 +1,121 @@
+import "jest-preset-angular/setup-jest";
+import { ToastrModule } from 'ngx-toastr';
+import { TestBed } from '@angular/core/testing';
+import _ from 'lodash-es';
+import 'jest-canvas-mock';
+
+// Mock global objects if necessary
+global.jQuery = require("jquery");
+global.$ = global.jQuery;
+global._ = _;
+
+
+global.moment = require("moment");
+
+class IntersectionObserver {
+    constructor(callback, options) {
+
+    }
+
+    observe(element) {
+
+    }
+
+    unobserve() {
+        return null;
+    }
+
+    disconnect() {
+        return null;
+    }
+}
+global.IntersectionObserver = IntersectionObserver;
+// jest.setup.js
+
+// Mock MSCSSMatrix
+class MockMSCSSMatrix {
+    constructor() {
+        // Initialize with default values or any necessary properties
+    }
+
+    // Add any methods that your tests might call
+    setMatrixValue(value) {
+        // Mock implementation of setMatrixValue
+    }
+
+    multiply(matrix) {
+        // Mock implementation of multiply
+        return this;
+    }
+
+    // Add other methods as needed
+}
+
+// Attach the mock to the global scope
+global.MSCSSMatrix = MockMSCSSMatrix;
+
+import "jquery-ui/ui/disable-selection.js";
+import "jquery-ui/ui/version.js";
+import "jquery-ui/ui/widget.js";
+import "jquery-ui/ui/scroll-parent.js";
+import "jquery-ui/ui/plugin.js";
+import "jquery-ui/ui/data.js";
+import "jquery-ui/ui/widgets/mouse.js";
+import "jquery-ui/ui/widgets/resizable.js";
+import "jquery-ui/ui/widgets/sortable.js";
+import "jquery-ui/ui/widgets/draggable.js";
+import "jquery-ui/ui/widgets/droppable.js";
+import "libraries/scripts/jquery.ui.touch-punch/jquery.ui.touch-punch.min.js";
+import "moment-timezone/builds/moment-timezone.min.js";
+import "hammerjs/hammer.min.js";
+import "iscroll/build/iscroll.js";
+import "tabbable/dist/index.umd.min.js";
+import "@wavemaker/focus-trap/dist/focus-trap.umd.min.js";
+import "x2js"
+
+
+
+beforeEach(() => {
+  TestBed.configureTestingModule({
+    imports : [
+      ToastrModule.forRoot(),
+    ],
+  })
+  Object.defineProperties(window, {
+    location: {
+      writable: true,
+      value: {
+        reload: jest.fn(),
+      },
+    },
+  });
+});
+
+// jest.setup.js
+Object.defineProperty(global.HTMLMediaElement.prototype, 'load', {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value: jest.fn(),
+});
+
+Object.defineProperty(global.HTMLMediaElement.prototype, 'play', {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value: jest.fn().mockResolvedValue(),
+});
+
+Object.defineProperty(global.HTMLMediaElement.prototype, 'pause', {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value: jest.fn(),
+});
+
+Object.defineProperty(global.HTMLMediaElement.prototype, 'addTextTrack', {
+    configurable: true,
+    enumerable: true,
+    writable: true,
+    value: jest.fn(),
+});

angular-codegen/angular-app/tsconfig.json

@@ -2,22 +2,19 @@
     "compileOnSave": false,
     "compilerOptions": {
         "baseUrl": "./",
-        "downlevelIteration": true,
         "outDir": "./dist/out-tsc",
-        "sourceMap": true,
+        "downlevelIteration": true,
         "declaration": false,
-        "target": "es2022",
-        "module": "es2020",
-        "moduleResolution": "node",
+        "sourceMap": true,
         "emitDecoratorMetadata": true,
         "experimentalDecorators": true,
+        "esModuleInterop": true,
+        "moduleResolution": "node",
+        "target": "ES2022",
+        "module": "ES2022",
         "typeRoots": [
             "node_modules/@types"
         ],
-        "lib": [
-            "es2018",
-            "dom"
-        ],
         "paths": {
             "rxjs/observable/throw": [
                 "node_modules/rxjs-compat/_esm2015/observable/throw"
@@ -35,31 +32,31 @@
                 "node_modules/@wavemaker/app-ng-runtime/mobile-build-task"
             ],
             "@wm/core": [
-                "node_modules/@wavemaker/app-ng-runtime/core"
+                "node_modules/@wavemaker/app-ng-runtime/core/index.d.ts"
             ],
             "@wavemaker/variables": [
                 "node_modules/@wavemaker/variables/"
             ],
             "@wm/components/base": [
-                "node_modules/@wavemaker/app-ng-runtime/components/base"
+                "node_modules/@wavemaker/app-ng-runtime/components/base/public_api.d.ts"
             ],
             "@wm/components/basic": [
-                "node_modules/@wavemaker/app-ng-runtime/components/basic/default"
+                "node_modules/@wavemaker/app-ng-runtime/components/basic/default/index.d.ts"
             ],
             "@wm/components/input": [
-                "node_modules/@wavemaker/app-ng-runtime/components/input/default"
+                "node_modules/@wavemaker/app-ng-runtime/components/input/default/index.d.ts"
             ],
             "@wm/components/page": [
-                "node_modules/@wavemaker/app-ng-runtime/components/page/default"
+                "node_modules/@wavemaker/app-ng-runtime/components/page/default/index.d.ts"
             ],
             "@wm/mobile/components/basic": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/components/basic/default"
+                "node_modules/@wavemaker/app-ng-runtime/mobile/components/basic/default/index.d.ts"
             ],
             "@wm/mobile/components/page": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/components/page/default"
+                "node_modules/@wavemaker/app-ng-runtime/mobile/components/page/default/index.d.ts"
             ],
             "@wm/components/dialogs": [
-                "node_modules/@wavemaker/app-ng-runtime/components/dialogs/default"
+                "node_modules/@wavemaker/app-ng-runtime/components/dialogs/default/index.d.ts"
             ],
             "@wm/mobile/components/*": [
                 "node_modules/@wavemaker/app-ng-runtime/mobile/components/*"
@@ -68,53 +65,67 @@
                 "node_modules/@wavemaker/app-ng-runtime/components/*"
             ],
             "@wm/transpiler": [
-                "node_modules/@wavemaker/app-ng-runtime/transpiler"
+                "node_modules/@wavemaker/app-ng-runtime/transpiler/index.d.ts"
             ],
             "@wm/security": [
-                "node_modules/@wavemaker/app-ng-runtime/security"
+                "node_modules/@wavemaker/app-ng-runtime/security/index.d.ts"
             ],
             "@swipey": [
-                "node_modules/@wavemaker/app-ng-runtime/swipey"
+                "node_modules/@wavemaker/app-ng-runtime/swipey/index.d.ts"
             ],
             "@wm/http": [
-                "node_modules/@wavemaker/app-ng-runtime/http"
+                "node_modules/@wavemaker/app-ng-runtime/http/index.d.ts"
             ],
             "@wm/oAuth": [
-                "node_modules/@wavemaker/app-ng-runtime/oAuth"
+                "node_modules/@wavemaker/app-ng-runtime/oAuth/index.d.ts"
             ],
             "@wm/variables": [
-                "node_modules/@wavemaker/app-ng-runtime/variables"
+                "node_modules/@wavemaker/app-ng-runtime/variables/index.d.ts"
             ],
             "@wm/mobile/core": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/core"
+                "node_modules/@wavemaker/app-ng-runtime/mobile/core/index.d.ts"
             ],
             "@wm/mobile/components": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/components"
+                "node_modules/@wavemaker/app-ng-runtime/mobile/components/index.d.ts"
             ],
             "@wm/mobile/offline": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/offline"
+                "node_modules/@wavemaker/app-ng-runtime/mobile/offline/index.d.ts"
             ],
             "@wm/mobile/variables": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/variables"
+                "node_modules/@wavemaker/app-ng-runtime/mobile/variables/index.d.ts"
             ],
             "@wm/runtime/base": [
-                "node_modules/@wavemaker/app-ng-runtime/runtime/base"
+                "node_modules/@wavemaker/app-ng-runtime/runtime/base/index.d.ts"
             ],
             "@wm/runtime/dynamic": [
-                "node_modules/@wavemaker/app-ng-runtime/runtime/dynamic"
+                "node_modules/@wavemaker/app-ng-runtime/runtime/dynamic/index.d.ts"
             ],
             "@wm/mobile/runtime": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/runtime"
+                "node_modules/@wavemaker/app-ng-runtime/mobile/runtime/index.d.ts"
             ],
             "@wm/mobile/runtime/dynamic": [
-                "node_modules/@wavemaker/app-ng-runtime/mobile/runtime-dynamic"
+                "node_modules/@wavemaker/app-ng-runtime/mobile/runtime-dynamic/index.d.ts"
             ]
         },
-        "useDefineForClassFields": false
+        "lib": [
+            "es2020",
+            "dom"
+        ],
+        "useDefineForClassFields": false,
+        "resolveJsonModule": true
     },
     "angularCompilerOptions": {
         "compilationMode": "full",
         "strictMetadataEmit": false,
-        "fullTemplateTypeCheck": false
+        "fullTemplateTypeCheck": false,
+        "extendedDiagnostics": {
+            "checks": {
+                "optionalChainNotNullable": "suppress"
+            }
+        },
+        "enableI18nLegacyMessageIdFormat": false,
+        "strictInjectionParameters": false,
+        "strictInputAccessModifiers": false,
+        "trace": true
     }
 }

angular-codegen/angular-app/wm-custom-webpack.config.js

@@ -1,5 +1,64 @@
 const CompressionPlugin = require(`compression-webpack-plugin`);
 const path = require(`path`);
+const {ConcatSource} = require("webpack-sources");
+
+class ModifyCssAssetUrlsPlugin {
+    apply(compiler) {
+        compiler.hooks.compilation.tap('ModifyCssAssetUrlsPlugin', compilation => {
+            compilation.hooks.optimizeAssets.tapAsync('ModifyCssAssetUrlsPlugin', (assets, callback) => {
+                let publicPath = compilation.options.output.publicPath;
+                let isResourceWithDeployUrl = false;
+                for (const assetName in assets) {
+                    if (!assets.hasOwnProperty(assetName)) continue;
+
+                    const asset = assets[assetName];
+                    if (asset.sourceAndMap) {
+                        const sourceAndMap = asset.sourceAndMap();
+                        let updatedSource = sourceAndMap.source;
+                        // Handle potential non-string source (e.g., convert to string)
+                        if (typeof updatedSource !== 'string') {
+                            updatedSource = updatedSource.toString('utf-8');
+                        }
+                        let modifiedSource = updatedSource.replace(/url\((.*?)\)/g, (match, url) => {
+                            isResourceWithDeployUrl = true;
+
+                            let qUrl = url.slice(1, -1);
+
+                            if (!qUrl.startsWith(publicPath)) {
+                                return match;
+                            } else {
+                                const newUrl = this.modifyUrl(publicPath, qUrl);
+                                let urlString = `url('${newUrl}')`;
+                                return urlString;
+                            }
+
+                        });
+                        if (isResourceWithDeployUrl) {
+                            isResourceWithDeployUrl = false;
+                            assets[assetName] = new ConcatSource(modifiedSource);
+                        }
+                    }
+                }
+                callback(null, assets);
+            });
+        });
+    }
+
+    modifyUrl(publicPath, url) {
+        let qUrl = url;
+        let resourceName = qUrl;
+        try {
+            const parsedUrl = new URL(qUrl);
+            resourceName = parsedUrl.pathname.split('/').pop();
+        } catch (e) {
+            //this is relative url
+            let parts = qUrl.split('/');
+            resourceName = parts[parts.length - 1];
+        }
+        let newUrl = `ng-bundle/${resourceName}`;
+        return newUrl;
+    }
+};
 
 module.exports = {
     resolve:{
@@ -8,6 +67,7 @@ module.exports = {
         }
     },
     plugins:[
+        new ModifyCssAssetUrlsPlugin(),
         new CompressionPlugin({
             test: /\.(js|css|html|svg|txt|eot|otf|ttf|gif)$/,
             filename: "[name].gzip[ext]",

angular-codegen/build-angular-app.js

@@ -25,9 +25,16 @@ const updateDeployUrl = (args) => {
     const deployParam = buildArgs.find(i => i.startsWith("--deploy-url="));
     if(!deployParam) {
         buildArgs.push("--deploy-url=ng-bundle/");
+    } else {
+        buildArgs.filter((param, index) => {
+            if (param.includes('--deploy-url=_cdnUrl_')) {
+                buildArgs[index] = "--deploy-url=_cdnUrl_/ng-bundle/"
+                return true;
+            }
+        });
     }
     buildArgs.push(args.nodeVMArgs);
-    return ngBuildParams = buildArgs.join(" ");
+    return buildArgs.join(" ");
 };
 
 /**