@wavemaker/angular-codegen 11.14.1-8.6337 → 11.14.1-9.6343

package/dependencies/transpilation-web.cjs.js

@@ -99707,11 +99707,11 @@ const getRowActionAttrs = attrs => {
     return tmpl;
 };
 
-const $RAF = window.requestAnimationFrame;
+const $RAF$1 = window.requestAnimationFrame;
 const $RAFQueue = [];
 const invokeLater = fn => {
     if (!$RAFQueue.length) {
-        $RAF(() => {
+        $RAF$1(() => {
             $RAFQueue.forEach(f => f());
             $RAFQueue.length = 0;
         });
@@ -100253,223 +100253,70 @@ const getFnForEventExpr = (expr) => {
     return fnExecutor(expr, ExpressionType.Action);
 };
 
-// Constants
-const WIDGET_ID_REGEX = /^(widget-[^_]+)/;
-const WIDGET_PROPERTY_REGEX = /^widget-[^_]+_(.+)$/;
-const ARRAY_INDEX_PLACEHOLDER = '[$i]';
-const ARRAY_INDEX_ZERO = '[0]';
 const registry = new Map();
 const watchIdGenerator = new IDGenerator('watch-id-');
-const FIRST_TIME_WATCH = Object.freeze({});
-/**
- * Extracts widget ID from identifier (e.g., "widget-id23_eventsource" -> "widget-id23")
- */
-const getWidgetId = (identifier) => {
-    if (!identifier || typeof identifier !== 'string') {
-        return null;
-    }
-    const match = identifier.match(WIDGET_ID_REGEX);
-    return match ? match[1] : null;
-};
-/**
- * Extracts property name from identifier (e.g., "widget-id23_eventsource" -> "eventsource")
- */
-const getPropertyName = (identifier) => {
-    if (!identifier || typeof identifier !== 'string') {
-        return identifier;
-    }
-    const match = identifier.match(WIDGET_PROPERTY_REGEX);
-    return match ? match[1] : identifier;
-};
-/**
- * Array consumer wrapper for array-based expressions
- */
+const FIRST_TIME_WATCH = {};
+Object.freeze(FIRST_TIME_WATCH);
 const arrayConsumer = (listenerFn, restExpr, newVal, oldVal) => {
-    if (!isArray(newVal)) {
-        return;
-    }
-    let formattedData = newVal.map(datum => findValueOf(datum, restExpr));
-    // Flatten if result is array of arrays
-    if (isArray(formattedData[0])) {
-        formattedData = flatten$1(formattedData);
+    let data = newVal, formattedData;
+    if (isArray(data)) {
+        formattedData = data.map(function (datum) {
+            return findValueOf(datum, restExpr);
+        });
+        // If resulting structure is an array of array, flatten it
+        if (isArray(formattedData[0])) {
+            formattedData = flatten$1(formattedData);
+        }
+        listenerFn(formattedData, oldVal);
     }
-    listenerFn(formattedData, oldVal);
 };
-/**
- * Updates watch info for array expressions
- */
-const getUpdatedWatchInfo = (expr, acceptsArray, listener) => {
-    const regex = /\[\$i\]/g;
+const getUpdatedWatcInfo = (expr, acceptsArray, listener) => {
+    // listener doesn't accept array
+    // replace all `[$i]` with `[0]` and return the expression
+    let regex = /\[\$i\]/g, $I = '[$i]', $0 = '[0]';
     if (!acceptsArray) {
         return {
-            expr: expr.replace(regex, ARRAY_INDEX_ZERO),
-            listener
+            'expr': expr.replace(regex, $0),
+            'listener': listener
         };
     }
-    const lastIndex = expr.lastIndexOf(ARRAY_INDEX_PLACEHOLDER);
-    const baseExpr = expr.substring(0, lastIndex).replace(ARRAY_INDEX_PLACEHOLDER, ARRAY_INDEX_ZERO);
-    const restExpr = expr.substring(lastIndex + 5);
-    const arrayConsumerFn = restExpr
-        ? arrayConsumer.bind(undefined, listener, restExpr)
-        : listener;
+    // listener accepts array
+    // replace all except the last `[$i]` with `[0]` and return the expression.
+    var index = expr.lastIndexOf($I), _expr = expr.substr(0, index).replace($I, $0), restExpr = expr.substr(index + 5), arrayConsumerFn = listener;
+    if (restExpr) {
+        arrayConsumerFn = arrayConsumer.bind(undefined, listener, restExpr);
+    }
     return {
-        expr: baseExpr,
-        listener: arrayConsumerFn
+        'expr': _expr,
+        'listener': arrayConsumerFn
     };
 };
-/**
- * Determines if an expression is static (doesn't need to be watched)
- */
-const STATIC_EXPRESSION_NAMES = [
-    "row.getProperty('investment')",
-    "row.getProperty('factsheetLink')",
-    "row.getProperty('isRebalanceEligible')"
-];
-const isStaticExpression = (expr) => {
-    if (typeof expr !== 'string') {
-        return false;
-    }
-    const trimmedExpr = expr.trim();
-    // Expressions that always evaluate to localization strings
-    // if (trimmedExpr.includes('appLocale')) {
-    //     return true;
-    // }
-    // Hard-coded static expression names
-    if (STATIC_EXPRESSION_NAMES.includes(trimmedExpr)) {
-        return true;
-    }
-    return false;
-};
-/**
- * Gets the scope type from the scope object
- */
-const getScopeType = ($scope) => {
-    if (!$scope) {
-        return null;
-    }
-    if ($scope.pageName)
-        return 'Page';
-    if ($scope.prefabName)
-        return 'Prefab';
-    if ($scope.partialName)
-        return 'Partial';
-    // Check for App scope
-    if ($scope.Variables !== undefined &&
-        $scope.Actions !== undefined &&
-        !$scope.pageName &&
-        !$scope.prefabName &&
-        !$scope.partialName) {
-        return 'App';
-    }
-    if ($scope.constructor?.name === 'AppRef') {
-        return 'App';
-    }
-    return null;
-};
-/**
- * Gets scope name based on scope type
- */
-const getScopeName = ($scope, scopeType) => {
-    if (!scopeType || !$scope) {
-        return null;
-    }
-    switch (scopeType) {
-        case 'Prefab': return $scope.prefabName || null;
-        case 'Partial': return $scope.partialName || null;
-        case 'Page': return $scope.pageName || null;
-        default: return null;
-    }
-};
-/**
- * Main watch function
- */
 const $watch = (expr, $scope, $locals, listener, identifier = watchIdGenerator.nextUid(), doNotClone = false, config = {}, isMuted) => {
-    // Handle array expressions
-    if (expr.includes(ARRAY_INDEX_PLACEHOLDER)) {
-        const watchInfo = getUpdatedWatchInfo(expr, config.arrayType || config.isList || false, listener);
+    if (expr.indexOf('[$i]') !== -1) {
+        let watchInfo = getUpdatedWatcInfo(expr, config && (config.arrayType || config.isList), listener);
         expr = watchInfo.expr;
         listener = watchInfo.listener;
     }
-    // Handle static expressions
-    if (isStaticExpression(expr)) {
-        try {
-            const fn = $parseExpr(expr);
-            const staticValue = fn($scope, $locals);
-            listener(staticValue, FIRST_TIME_WATCH);
-        }
-        catch (e) {
-            console.warn(`Error evaluating static expression '${expr}':`, e);
-            listener(undefined, FIRST_TIME_WATCH);
-        }
-        return () => { }; // No-op unsubscribe
-    }
     const fn = $parseExpr();
-    const scopeType = getScopeType($scope);
-    const scopeName = getScopeName($scope, scopeType);
-    const destroyFn = () => $unwatch(identifier);
-    const watchInfo = {
-        fn: fn.bind(null, $scope, $locals),
+    registry.set(identifier, {
+        fn: fn.bind(expr, $scope, $locals),
         listener,
         expr,
         last: FIRST_TIME_WATCH,
         doNotClone,
-        isMuted,
-        scopeType,
-        scopeName,
-        destroyFn
-    };
-    // Store in registry
-    const widgetId = getWidgetId(identifier);
-    if (widgetId) {
-        const propertyName = getPropertyName(identifier);
-        if (!registry.has(widgetId)) {
-            registry.set(widgetId, {});
-        }
-        const widgetGroup = registry.get(widgetId);
-        widgetGroup[propertyName] = watchInfo;
-    }
-    else {
-        registry.set(identifier, watchInfo);
-    }
-    return destroyFn;
-};
-/**
- * Unwatches a single identifier
- */
-const $unwatch = (identifier) => {
-    const widgetId = getWidgetId(identifier);
-    if (widgetId) {
-        const propertyName = getPropertyName(identifier);
-        const widgetGroup = registry.get(widgetId);
-        //@ts-ignore
-        if (widgetGroup && typeof widgetGroup === 'object' && !widgetGroup.fn) {
-            const watchInfo = widgetGroup[propertyName];
-            if (watchInfo) {
-                delete widgetGroup[propertyName];
-                // Clean up empty widget groups
-                if (Object.keys(widgetGroup).length === 0) {
-                    registry.delete(widgetId);
-                }
-                return true;
-            }
-        }
-    }
-    // Fallback to direct lookup
-    if (registry.has(identifier)) {
-        registry.delete(identifier);
-        return true;
-    }
-    return false;
+        isMuted: isMuted
+    });
+    return () => $unwatch(identifier);
 };
+const $unwatch = identifier => registry.delete(identifier);
+window.watchRegistry = registry;
 const $appDigest = (() => {
-    return (force = false) => {
+    return (force) => {
         {
             return;
         }
     };
 })();
-// Export registry for debugging
-window.watchRegistry = registry;
 
 var ComponentType;
 (function (ComponentType) {

package/npm-shrinkwrap.json

@@ -1,15 +1,15 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.14.1-8.6337",
+    "version": "11.14.1-9.6343",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-codegen",
-            "version": "11.14.1-8.6337",
+            "version": "11.14.1-9.6343",
             "license": "ISC",
             "dependencies": {
-                "@wavemaker/angular-app": "11.14.1-8.6337",
+                "@wavemaker/angular-app": "11.14.1-9.6343",
                 "archiver": "^7.0.1",
                 "cheerio": "1.0.0-rc.12",
                 "decode-uri-component": "^0.2.0",
@@ -1340,8 +1340,8 @@
             }
         },
         "node_modules/@types/node": {
-            "version": "24.10.1",
-            "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+            "version": "24.10.2",
+            "integrity": "sha512-WOhQTZ4G8xZ1tjJTvKOpyEVSGgOTvJAfDK3FNFgELyaTpzhdgHVHeqW8V+UJvzF5BT+/B54T/1S2K6gd9c7bbA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1376,8 +1376,8 @@
             "license": "MIT"
         },
         "node_modules/@wavemaker/angular-app": {
-            "version": "11.14.1-8.6337",
-            "integrity": "sha512-YkDT0UanjWKv53CLXr8v5AMB5aB7UWLT8N59Ozt8RroeBhBD4lbNnUsYf657QogOLtPJhKkj4KjnmuHROBtemw==",
+            "version": "11.14.1-9.6343",
+            "integrity": "sha512-RgoTu71qJ1NoPuU9KVMY2HxV6cUzgznghN13Sr5PJhrjvp9diaN36b8hlQ/INFOxZ6JpAdvSbLs1g73r+vIDPQ==",
             "dependencies": {
                 "@angular/animations": "18.2.13",
                 "@angular/common": "18.2.13",
@@ -1394,12 +1394,12 @@
                 "@fullcalendar/list": "6.1.18",
                 "@fullcalendar/timegrid": "6.1.18",
                 "@metrichor/jmespath": "0.3.1",
-                "@wavemaker/app-ng-runtime": "11.14.1-8.6337",
-                "@wavemaker/custom-widgets-m3": "11.14.1-8.6337",
+                "@wavemaker/app-ng-runtime": "11.14.1-9.6343",
+                "@wavemaker/custom-widgets-m3": "11.14.1-9.6343",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.14.1-8.6337",
+                "@wavemaker/foundation-css": "11.14.1-9.6343",
                 "@wavemaker/nvd3": "1.8.15",
-                "@wavemaker/variables": "11.14.1-8.6337",
+                "@wavemaker/variables": "11.14.1-9.6343",
                 "@ztree/ztree_v3": "3.5.48",
                 "acorn": "^8.15.0",
                 "angular-imask": "7.6.1",
@@ -1434,8 +1434,8 @@
             }
         },
         "node_modules/@wavemaker/app-ng-runtime": {
-            "version": "11.14.1-8.6337",
-            "integrity": "sha512-MxNZBps4dQ2jCvnDSgvjUYP35oWNx85tgN94ulgnYWKm50ud4skWs+Bgds7nqpzgAF67zZyMi1gwiu5b03lOlA==",
+            "version": "11.14.1-9.6343",
+            "integrity": "sha512-PIq0YquVfzeEdoh9GNAjOzn19B6rsPSI7/lSKpiPzF0bqaXAh9PYpRctYP+jcBiagbAUyoGxt6acqQHmSt7g3g==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -1443,8 +1443,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.14.1-8.6337",
-            "integrity": "sha512-WvAvdZJZ3hCuEA2maP/BLY7ToGUfFYXD8mUzjMrA8fp4Mdb4VyzQvZJh2XZLjPCo9CU78JoMGzFK97jwWKYnrQ==",
+            "version": "11.14.1-9.6343",
+            "integrity": "sha512-ZJ5FNQGZcssHjfoWycMQTTVTuQjfovDiOTT8j3QJzyi65cj62Yuam5CChemlBFc2OqocR2xfSmp3rfUHdYvWVA==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -1457,8 +1457,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.14.1-8.6337",
-            "integrity": "sha512-WkE64qSCQmeIAG8L0Qsqn3mTY2sSQxuoFbftMcuk67G57zuVdVfDIuMwO4DwxZYp5lOvOOQ+xGKwM69BC8xtUA==",
+            "version": "11.14.1-9.6343",
+            "integrity": "sha512-wxX/MMY/SiSpyqvN3jg9uCYeR+R65yWdlDM54I//z3IS8kDz/G1qeLvBWFi0h58yjaBCzfPS9fkMJ6I5eHV3Ew==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -1473,8 +1473,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.14.1-8.6337",
-            "integrity": "sha512-zOj4+VktLFY8mm/qIPh+PwK9TEVG0sglfrVM3bUE9l2iU3ei8ldd7E9AikSV1O/UWOYWAvbM9PMmQ9M9LCxOaA==",
+            "version": "11.14.1-9.6343",
+            "integrity": "sha512-pDZIpSRfDR0TUrplEsVIgh7MedlElrkeHqo0TyMH2XlfmwC5pR8EOukFPUYLpQP5QnaHHy7oLopz5JNG1drnsQ==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -1909,8 +1909,8 @@
             "license": "MIT"
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.9.2",
-            "integrity": "sha512-PxSsosKQjI38iXkmb3d0Y32efqyA0uW4s41u4IVBsLlWLhCiYNpH/AfNOVWRqCQBlD8TFJTz6OUWNd4DFJCnmw==",
+            "version": "2.9.5",
+            "integrity": "sha512-D5vIoztZOq1XM54LUdttJVc96ggEsIfju2JBvht06pSzpckp3C7HReun67Bghzrtdsq9XdMGbSSB3v3GhMNmAA==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -2190,8 +2190,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001759",
-            "integrity": "sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==",
+            "version": "1.0.30001760",
+            "integrity": "sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==",
             "dev": true,
             "funding": [
                 {
@@ -3277,8 +3277,8 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.265",
-            "integrity": "sha512-B7IkLR1/AE+9jR2LtVF/1/6PFhY5TlnEHnlrKmGk7PvkJibg5jr+mLXLLzq3QYl6PA1T/vLDthQPqIPAlS/PPA==",
+            "version": "1.5.267",
+            "integrity": "sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==",
             "dev": true,
             "license": "ISC"
         },
@@ -5848,8 +5848,8 @@
             }
         },
         "node_modules/nwsapi": {
-            "version": "2.2.22",
-            "integrity": "sha512-ujSMe1OWVn55euT1ihwCI1ZcAaAU3nxUiDwfDQldc51ZXaB9m2AyOn6/jh1BLe2t/G8xd6uKG1UBF2aZJeg2SQ==",
+            "version": "2.2.23",
+            "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==",
             "dev": true,
             "license": "MIT"
         },

package/package-lock.json

@@ -1,15 +1,15 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.14.1-8.6337",
+    "version": "11.14.1-9.6343",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-codegen",
-            "version": "11.14.1-8.6337",
+            "version": "11.14.1-9.6343",
             "license": "ISC",
             "dependencies": {
-                "@wavemaker/angular-app": "11.14.1-8.6337",
+                "@wavemaker/angular-app": "11.14.1-9.6343",
                 "archiver": "^7.0.1",
                 "cheerio": "1.0.0-rc.12",
                 "decode-uri-component": "^0.2.0",
@@ -1340,8 +1340,8 @@
             }
         },
         "node_modules/@types/node": {
-            "version": "24.10.1",
-            "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==",
+            "version": "24.10.2",
+            "integrity": "sha512-WOhQTZ4G8xZ1tjJTvKOpyEVSGgOTvJAfDK3FNFgELyaTpzhdgHVHeqW8V+UJvzF5BT+/B54T/1S2K6gd9c7bbA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -1376,8 +1376,8 @@
             "license": "MIT"
         },
         "node_modules/@wavemaker/angular-app": {
-            "version": "11.14.1-8.6337",
-            "integrity": "sha512-YkDT0UanjWKv53CLXr8v5AMB5aB7UWLT8N59Ozt8RroeBhBD4lbNnUsYf657QogOLtPJhKkj4KjnmuHROBtemw==",
+            "version": "11.14.1-9.6343",
+            "integrity": "sha512-RgoTu71qJ1NoPuU9KVMY2HxV6cUzgznghN13Sr5PJhrjvp9diaN36b8hlQ/INFOxZ6JpAdvSbLs1g73r+vIDPQ==",
             "dependencies": {
                 "@angular/animations": "18.2.13",
                 "@angular/common": "18.2.13",
@@ -1394,12 +1394,12 @@
                 "@fullcalendar/list": "6.1.18",
                 "@fullcalendar/timegrid": "6.1.18",
                 "@metrichor/jmespath": "0.3.1",
-                "@wavemaker/app-ng-runtime": "11.14.1-8.6337",
-                "@wavemaker/custom-widgets-m3": "11.14.1-8.6337",
+                "@wavemaker/app-ng-runtime": "11.14.1-9.6343",
+                "@wavemaker/custom-widgets-m3": "11.14.1-9.6343",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.14.1-8.6337",
+                "@wavemaker/foundation-css": "11.14.1-9.6343",
                 "@wavemaker/nvd3": "1.8.15",
-                "@wavemaker/variables": "11.14.1-8.6337",
+                "@wavemaker/variables": "11.14.1-9.6343",
                 "@ztree/ztree_v3": "3.5.48",
                 "acorn": "^8.15.0",
                 "angular-imask": "7.6.1",
@@ -1434,8 +1434,8 @@
             }
         },
         "node_modules/@wavemaker/app-ng-runtime": {
-            "version": "11.14.1-8.6337",
-            "integrity": "sha512-MxNZBps4dQ2jCvnDSgvjUYP35oWNx85tgN94ulgnYWKm50ud4skWs+Bgds7nqpzgAF67zZyMi1gwiu5b03lOlA==",
+            "version": "11.14.1-9.6343",
+            "integrity": "sha512-PIq0YquVfzeEdoh9GNAjOzn19B6rsPSI7/lSKpiPzF0bqaXAh9PYpRctYP+jcBiagbAUyoGxt6acqQHmSt7g3g==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -1443,8 +1443,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.14.1-8.6337",
-            "integrity": "sha512-WvAvdZJZ3hCuEA2maP/BLY7ToGUfFYXD8mUzjMrA8fp4Mdb4VyzQvZJh2XZLjPCo9CU78JoMGzFK97jwWKYnrQ==",
+            "version": "11.14.1-9.6343",
+            "integrity": "sha512-ZJ5FNQGZcssHjfoWycMQTTVTuQjfovDiOTT8j3QJzyi65cj62Yuam5CChemlBFc2OqocR2xfSmp3rfUHdYvWVA==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -1457,8 +1457,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.14.1-8.6337",
-            "integrity": "sha512-WkE64qSCQmeIAG8L0Qsqn3mTY2sSQxuoFbftMcuk67G57zuVdVfDIuMwO4DwxZYp5lOvOOQ+xGKwM69BC8xtUA==",
+            "version": "11.14.1-9.6343",
+            "integrity": "sha512-wxX/MMY/SiSpyqvN3jg9uCYeR+R65yWdlDM54I//z3IS8kDz/G1qeLvBWFi0h58yjaBCzfPS9fkMJ6I5eHV3Ew==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -1473,8 +1473,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.14.1-8.6337",
-            "integrity": "sha512-zOj4+VktLFY8mm/qIPh+PwK9TEVG0sglfrVM3bUE9l2iU3ei8ldd7E9AikSV1O/UWOYWAvbM9PMmQ9M9LCxOaA==",
+            "version": "11.14.1-9.6343",
+            "integrity": "sha512-pDZIpSRfDR0TUrplEsVIgh7MedlElrkeHqo0TyMH2XlfmwC5pR8EOukFPUYLpQP5QnaHHy7oLopz5JNG1drnsQ==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -1909,8 +1909,8 @@
             "license": "MIT"
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.9.2",
-            "integrity": "sha512-PxSsosKQjI38iXkmb3d0Y32efqyA0uW4s41u4IVBsLlWLhCiYNpH/AfNOVWRqCQBlD8TFJTz6OUWNd4DFJCnmw==",
+            "version": "2.9.5",
+            "integrity": "sha512-D5vIoztZOq1XM54LUdttJVc96ggEsIfju2JBvht06pSzpckp3C7HReun67Bghzrtdsq9XdMGbSSB3v3GhMNmAA==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -2190,8 +2190,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001759",
-            "integrity": "sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==",
+            "version": "1.0.30001760",
+            "integrity": "sha512-7AAMPcueWELt1p3mi13HR/LHH0TJLT11cnwDJEs3xA4+CK/PLKeO9Kl1oru24htkyUKtkGCvAx4ohB0Ttry8Dw==",
             "dev": true,
             "funding": [
                 {
@@ -3277,8 +3277,8 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.265",
-            "integrity": "sha512-B7IkLR1/AE+9jR2LtVF/1/6PFhY5TlnEHnlrKmGk7PvkJibg5jr+mLXLLzq3QYl6PA1T/vLDthQPqIPAlS/PPA==",
+            "version": "1.5.267",
+            "integrity": "sha512-0Drusm6MVRXSOJpGbaSVgcQsuB4hEkMpHXaVstcPmhu5LIedxs1xNK/nIxmQIU/RPC0+1/o0AVZfBTkTNJOdUw==",
             "dev": true,
             "license": "ISC"
         },
@@ -5848,8 +5848,8 @@
             }
         },
         "node_modules/nwsapi": {
-            "version": "2.2.22",
-            "integrity": "sha512-ujSMe1OWVn55euT1ihwCI1ZcAaAU3nxUiDwfDQldc51ZXaB9m2AyOn6/jh1BLe2t/G8xd6uKG1UBF2aZJeg2SQ==",
+            "version": "2.2.23",
+            "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==",
             "dev": true,
             "license": "MIT"
         },

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.14.1-8.6337",
+    "version": "11.14.1-9.6343",
     "description": "",
     "main": "index.js",
     "scripts": {
@@ -15,7 +15,7 @@
         ".npmrc"
     ],
     "dependencies": {
-        "@wavemaker/angular-app": "11.14.1-8.6337",
+        "@wavemaker/angular-app": "11.14.1-9.6343",
         "archiver": "^7.0.1",
         "cheerio": "1.0.0-rc.12",
         "decode-uri-component": "^0.2.0",

package/src/codegen.js

@@ -1 +1 @@
-global._WM_APP_PROPERTIES={},global._WM_PACKAGE_PATH="./libraries",global.$=require("jquery"),global._=require("lodash");const cheerio=require("cheerio"),{deleteResource:deleteResource,getIndexHtmlPath:getIndexHtmlPath,getPagesDirPath:getPagesDirPath,readFile:readFile,searchFileByName:searchFileByName,writeFile:writeFile,readFileSync:readFileSync}=require("./wm-utils"),{createAppSkeleton:createApp}=require("./gen-app-skeleton"),{generateCodeGenModule:generateCodeGenModule,generateAppConfig:generateAppConfig}=require("./gen-app-codegen-module"),{generatePrefabConfigFile:generatePrefabConfigFile}=require("./gen-prefabs"),{generateAppRoutes:generateAppRoutes}=require("./gen-app-routes"),{generateAppJS:generateAppJS}=require("./gen-app-js"),{generateAppVariables:generateAppVariables}=require("./gen-app-variables"),{getWmProjectProperties:getWmProjectProperties,getThemesConfigProperties:getThemesConfigProperties,getSecurityConfig:getSecurityConfig,getAuthInfoConfig:getAuthInfoConfig,getLayoutsConfig:getLayoutsConfig,getPagesConfig:getPagesConfig,getPrefabConfigsUsedInApp:getPrefabConfigsUsedInApp,getPrefabPartialsConfig:getPrefabPartialsConfig}=require("./project-meta"),{generateTSConfig:generateTSConfig}=require("./gen-tsconfig"),{generateComponents:generateComponents,generatePagePartialComponent:generatePagePartialComponent}=require("./gen-components"),{generateWmProjectProperties:generateWmProjectProperties}=require("./gen-wm-project-properties"),{generateWmProjectPropertiesFromTarget:generateWmProjectPropertiesFromTarget,generateFontConfig:generateFontConfig,generateFavicon:generateFavicon,generateServiceDefs:generateServiceDefs,generateEslintConfig:generateEslintConfig}=require("./copy-utils"),{generateIndexHtml:generateIndexHtml}=require("./gen-index-html"),{updateAngularJSON:updateAngularJSON}=require("./update-angular-json"),{generatePwaFiles:generatePwaFiles}=require("./gen-pwa-files"),{generateLazyModuleRoutes:generateLazyModuleRoutes}=require("./gen-lazy-module-routes"),{createIntermediateAppSkeleton:createIntermediateAppSkeleton,generateLayoutsAndPages:generateLayoutsAndPages}=require("./gen-layouts"),getMarkupFiles=async e=>{const a=[];return searchFileByName(e+"/src/app",/\.html$/,e=>{a.push(e)}),a},isDynamicComponentUsedInMarkup=async e=>{const a=await readFile(e,"utf8");return cheerio.load(a)("form[wmForm][metadata],form[wmForm][metadata\\.bind],div[wmTable]:not(:has(*))").length>0},isDynamicComponentUsedInApp=async e=>{const a=await getMarkupFiles(e);return(await Promise.all(a.map(e=>isDynamicComponentUsedInMarkup(e)))).find(e=>e)},cleanPackageJSON=async(e,a)=>{const t=`${e}/package.json`;let r=readFileSync(t,!0);["@ampproject/rollup-plugin-closure-compiler","rollup","rollup-plugin-alias","rollup-plugin-commonjs","rollup-plugin-includepaths","rollup-plugin-multi-entry","rollup-plugin-node-resolve"].forEach(e=>{delete r.devDependencies[e]}),a||delete r.dependencies["@angular/service-worker"],await writeFile(t,JSON.stringify(r,null,4))},generateIntermediateApp=async(e,a)=>{console.time("create-intermediate-app"),await createIntermediateAppSkeleton(e,a),await generateLayoutsAndPages(a),console.timeEnd("create-intermediate-app")},generateSources=async(e,a,t,r,n,o,i)=>{console.time("generate app-sources"),await Promise.all([deleteResource(`${a}/src/app/layouts`),deleteResource(`${a}/src/app/pages`),deleteResource(`${a}/src/app/partials`),deleteResource(`${a}/src/app/prefabs`),deleteResource(`${a}/src/app/customwidgets`)]);const g=readFileSync(`${a}/angular.json`);global._WM_PACKAGE_PATH=g.includes("./node_modules/@wavemaker/app-ng-runtime/")?"./node_modules/@wavemaker/app-ng-runtime":"./libraries";const p=await getWmProjectProperties(e),s=await getThemesConfigProperties(e,p),l=await getSecurityConfig(e),c=await getAuthInfoConfig(e);let u;o&&(u=await getLayoutsConfig(e));const m=await getPagesConfig(e),d=await getPrefabConfigsUsedInApp(p,e);let P={};for(const a of d.keys())P[a]=await getPrefabPartialsConfig(e,a);await Promise.all([generateIndexHtml(e,a,p,t,r,i),generateWmProjectProperties(p,a),generateWmProjectPropertiesFromTarget(e,a),generateFontConfig(e,a),generateEslintConfig(e,a),generateFavicon(e,a),generateServiceDefs(e,a),generateAppRoutes(e,p,u,m,l,a,o,null!==l),generateLazyModuleRoutes(m,d,P,a),generatePrefabConfigFile(d,a),generateTSConfig(p,a),generateAppJS(e,a),generateAppVariables(e,a,n),generateComponents(e,p,u,m,l,d,a,P,n,o)]);const f=await isDynamicComponentUsedInApp(a),C={aot:!f,buildOptimizer:!f};await generateAppConfig(a,r,c,o,null!==l),await updateAngularJSON(e,a,p,s,m,d,t,C,P,r),await cleanPackageJSON(a,r),r&&await generatePwaFiles(e,a,p),console.timeEnd("generate app-sources")},createAppSkeleton=async(e,a,t,r)=>{console.time("create-angular-app"),await createApp(e,a,t,r),console.timeEnd("create-angular-app")},generatePage=async(e,a,t,r)=>{console.time("generate page",t);const n=getPagesDirPath(e),o=await getWmProjectProperties(e),i=await getPagesConfig(e),g=_.find(i,{name:t}),p="PAGE"===g.type?"pages":"partials";await deleteResource(`${a}/src/app/${p}/${t}`),await generatePagePartialComponent(n,o,g.name,g.type,a,void 0,void 0,r),console.timeEnd("generate page",t)};module.exports={generateIntermediateApp:generateIntermediateApp,generateSources:generateSources,createAppSkeleton:createAppSkeleton,generatePage:generatePage};
+global._WM_APP_PROPERTIES={},global._WM_PACKAGE_PATH="./libraries",global.$=require("jquery"),global._=require("lodash");const cheerio=require("cheerio"),{deleteResource:deleteResource,getIndexHtmlPath:getIndexHtmlPath,getPagesDirPath:getPagesDirPath,readFile:readFile,searchFileByName:searchFileByName,writeFile:writeFile,readFileSync:readFileSync}=require("./wm-utils"),{createAppSkeleton:createApp}=require("./gen-app-skeleton"),{generateCodeGenModule:generateCodeGenModule,generateAppConfig:generateAppConfig}=require("./gen-app-codegen-module"),{generatePrefabConfigFile:generatePrefabConfigFile}=require("./gen-prefabs"),{generateAppRoutes:generateAppRoutes}=require("./gen-app-routes"),{generateAppJS:generateAppJS}=require("./gen-app-js"),{generateAppVariables:generateAppVariables}=require("./gen-app-variables"),{getWmProjectProperties:getWmProjectProperties,getThemesConfigProperties:getThemesConfigProperties,getSecurityConfig:getSecurityConfig,getAuthInfoConfig:getAuthInfoConfig,getLayoutsConfig:getLayoutsConfig,getPagesConfig:getPagesConfig,getPrefabConfigsUsedInApp:getPrefabConfigsUsedInApp,getPrefabPartialsConfig:getPrefabPartialsConfig}=require("./project-meta"),{generateTSConfig:generateTSConfig}=require("./gen-tsconfig"),{generateComponents:generateComponents,generatePagePartialComponent:generatePagePartialComponent}=require("./gen-components"),{generateWmProjectProperties:generateWmProjectProperties}=require("./gen-wm-project-properties"),{generateWmProjectPropertiesFromTarget:generateWmProjectPropertiesFromTarget,generateFontConfig:generateFontConfig,generateFavicon:generateFavicon,generateServiceDefs:generateServiceDefs,generateEslintConfig:generateEslintConfig}=require("./copy-utils"),{generateIndexHtml:generateIndexHtml}=require("./gen-index-html"),{updateAngularJSON:updateAngularJSON}=require("./update-angular-json"),{generatePwaFiles:generatePwaFiles}=require("./gen-pwa-files"),{generateLazyModuleRoutes:generateLazyModuleRoutes}=require("./gen-lazy-module-routes"),{createIntermediateAppSkeleton:createIntermediateAppSkeleton,generateLayoutsAndPages:generateLayoutsAndPages}=require("./gen-layouts"),getMarkupFiles=async e=>{const a=[];return searchFileByName(e+"/src/app",/\.html$/,e=>{a.push(e)}),a},isDynamicComponentUsedInMarkup=async e=>{const a=await readFile(e,"utf8");return cheerio.load(a)("form[wmForm][metadata],form[wmForm][metadata\\.bind],div[wmTable]:not(:has(*))").length>0},isDynamicComponentUsedInApp=async e=>{const a=await getMarkupFiles(e);return(await Promise.all(a.map(e=>isDynamicComponentUsedInMarkup(e)))).find(e=>e)},cleanPackageJSON=async(e,a)=>{const t=`${e}/package.json`;let r=readFileSync(t,!0);["@ampproject/rollup-plugin-closure-compiler","rollup","rollup-plugin-alias","rollup-plugin-commonjs","rollup-plugin-includepaths","rollup-plugin-multi-entry","rollup-plugin-node-resolve"].forEach(e=>{delete r.devDependencies[e]}),a||delete r.dependencies["@angular/service-worker"],await writeFile(t,JSON.stringify(r,null,4))},generateIntermediateApp=async(e,a)=>{console.time("create-intermediate-app"),await createIntermediateAppSkeleton(e,a),await generateLayoutsAndPages(a),console.timeEnd("create-intermediate-app")},generateSources=async(e,a,t,r,n,o,i)=>{console.time("generate app-sources"),await Promise.all([deleteResource(`${a}/src/app/layouts`),deleteResource(`${a}/src/app/pages`),deleteResource(`${a}/src/app/partials`),deleteResource(`${a}/src/app/prefabs`),deleteResource(`${a}/src/app/customwidgets`)]);const g=readFileSync(`${a}/angular.json`);global._WM_PACKAGE_PATH=g.includes("./node_modules/@wavemaker/app-ng-runtime/")?"./node_modules/@wavemaker/app-ng-runtime":"./libraries";const p=await getWmProjectProperties(e),s=await getThemesConfigProperties(e,p),l=await getSecurityConfig(e),c=await getAuthInfoConfig(e);let u;o&&(u=await getLayoutsConfig(e));const m=await getPagesConfig(e),d=await getPrefabConfigsUsedInApp(p,e);let P={};for(const a of d.keys())P[a]=await getPrefabPartialsConfig(e,a);await Promise.all([generateIndexHtml(e,a,p,t,r,i),generateWmProjectProperties(p,a),generateWmProjectPropertiesFromTarget(e,a),generateFontConfig(e,a),generateEslintConfig(e,a),generateFavicon(e,a),generateServiceDefs(e,a),generateAppRoutes(e,p,u,m,l,a,o,null!==l),generateLazyModuleRoutes(m,d,P,a),generatePrefabConfigFile(d,a),generateTSConfig(p,a),generateAppJS(e,a),generateAppVariables(e,a,n),generateComponents(e,p,u,m,l,d,a,P,n,o)]);const f=await isDynamicComponentUsedInApp(a),C={aot:!f,buildOptimizer:!f};await generateAppConfig(a,r,c,o,null!==l,n),await updateAngularJSON(e,a,p,s,m,d,t,C,P,r),await cleanPackageJSON(a,r),r&&await generatePwaFiles(e,a,p),console.timeEnd("generate app-sources")},createAppSkeleton=async(e,a,t,r)=>{console.time("create-angular-app"),await createApp(e,a,t,r),console.timeEnd("create-angular-app")},generatePage=async(e,a,t,r)=>{console.time("generate page",t);const n=getPagesDirPath(e),o=await getWmProjectProperties(e),i=await getPagesConfig(e),g=_.find(i,{name:t}),p="PAGE"===g.type?"pages":"partials";await deleteResource(`${a}/src/app/${p}/${t}`),await generatePagePartialComponent(n,o,g.name,g.type,a,void 0,void 0,r),console.timeEnd("generate page",t)};module.exports={generateIntermediateApp:generateIntermediateApp,generateSources:generateSources,createAppSkeleton:createAppSkeleton,generatePage:generatePage};

package/src/gen-app-codegen-module.js

@@ -1 +1 @@
-const _get=require("lodash/get"),{writeFile:writeFile,isMobileProject:isMobileProject}=require("./wm-utils"),{getHandlebarTemplate:getHandlebarTemplate}=require("./handlebar-helpers"),generateCodeGenModule=async(e,a,r,t,n)=>{const o=getHandlebarTemplate("app-codegen-module")({wmProjectProperties:e,pagesConfig:a,prefabConfigMap:r,xsrfTokenHeaderName:_get(t,"csrfConfig.headerName","X-WM-XSRF-TOKEN")});await writeFile(`${n}/src/app/app-codegen.module.ts`,o)},generateAppConfig=async(e,a,r,t,n)=>{const o=getHandlebarTemplate("app-config-ts")({isPwa:a,xsrfTokenHeaderName:_get(r,"csrfConfig.headerName","X-WM-XSRF-TOKEN"),enableSpa:t,enableSecurity:n});await writeFile(`${e}/src/app/app.config.ts`,o)};module.exports={generateCodeGenModule:generateCodeGenModule,generateAppConfig:generateAppConfig};
+const _get=require("lodash/get"),{writeFile:writeFile,isMobileProject:isMobileProject}=require("./wm-utils"),{getHandlebarTemplate:getHandlebarTemplate}=require("./handlebar-helpers"),generateCodeGenModule=async(e,a,r,t,n)=>{const o=getHandlebarTemplate("app-codegen-module")({wmProjectProperties:e,pagesConfig:a,prefabConfigMap:r,xsrfTokenHeaderName:_get(t,"csrfConfig.headerName","X-WM-XSRF-TOKEN")});await writeFile(`${n}/src/app/app-codegen.module.ts`,o)},generateAppConfig=async(e,a,r,t,n,o)=>{const i=getHandlebarTemplate("app-config-ts")({isPwa:a,xsrfTokenHeaderName:_get(r,"csrfConfig.headerName","X-WM-XSRF-TOKEN"),enableSpa:t,enableSecurity:n,isCSP:o});await writeFile(`${e}/src/app/app.config.ts`,i)};module.exports={generateCodeGenModule:generateCodeGenModule,generateAppConfig:generateAppConfig};

package/templates/app.config.ts.hbs

@@ -66,7 +66,13 @@ import { initPrefabConfig } from "./prefabs/prefab-config";
 {{#if isPwa}}
 import { ServiceWorkerModule } from "@angular/service-worker";
 import { environment } from "../environments/environment";
-{{/if}} 
+{{/if}}
+{{#if isCSP}}
+import { ɵSharedStylesHost } from '@angular/platform-browser';
+import { ɵDomRendererFactory2 } from "@angular/platform-browser";
+import { WMDomSharedStylesHost } from "@wm/runtime/base";
+import { WMDomRendererFactory2 } from "@wm/runtime/base";
+{{/if}}
 
 const wmModules = [
     importProvidersFrom(
@@ -168,6 +174,10 @@ export const appConfig: ApplicationConfig = {
         { provide: AbstractNavigationService, useClass: NavigationServiceImpl },
         { provide: AbstractToasterService, useClass: ToasterServiceImpl },
         { provide: DynamicComponentRefProvider, useClass: DynamicComponentRefProviderService, },
+        {{#if isCSP}}
+        { provide: ɵSharedStylesHost, useClass: WMDomSharedStylesHost },
+        { provide: ɵDomRendererFactory2, useClass: WMDomRendererFactory2 },
+        {{/if}}
         PageDirective,
         AppManagerService,
         DatePipe,