@wavemaker/angular-codegen 11.14.1-rc.6310 → 11.14.2-rc.6311

package/dependencies/transpilation-web.cjs.js

@@ -99707,11 +99707,11 @@ const getRowActionAttrs = attrs => {
     return tmpl;
 };
 
-const $RAF$1 = window.requestAnimationFrame;
+const $RAF = window.requestAnimationFrame;
 const $RAFQueue = [];
 const invokeLater = fn => {
     if (!$RAFQueue.length) {
-        $RAF$1(() => {
+        $RAF(() => {
             $RAFQueue.forEach(f => f());
             $RAFQueue.length = 0;
         });
@@ -99719,7 +99719,23 @@ const invokeLater = fn => {
     $RAFQueue.push(fn);
 };
 const setAttr = (node, attrName, val, sync) => {
-    const task = () => node instanceof Element && node.setAttribute(attrName, val);
+    const task = () => {
+        if (node instanceof Element) {
+            // Handle tabindex specifically - ensure it's a valid string representation
+            if (attrName === 'tabindex') {
+                // Convert to string, handling 0, null, undefined, and NaN
+                if (val === null || val === undefined || (typeof val === 'number' && isNaN(val))) {
+                    node.removeAttribute(attrName);
+                }
+                else {
+                    node.setAttribute(attrName, String(val));
+                }
+            }
+            else {
+                node.setAttribute(attrName, val);
+            }
+        }
+    };
     invokeLater(task);
 };
 
@@ -100253,70 +100269,220 @@ 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(FIRST_TIME_WATCH);
+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 arrayConsumer = (listenerFn, restExpr, newVal, oldVal) => {
-    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);
+    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);
     }
+    listenerFn(formattedData, oldVal);
 };
-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]';
+/**
+ * Updates watch info for array expressions
+ */
+const getUpdatedWatchInfo = (expr, acceptsArray, listener) => {
+    const regex = /\[\$i\]/g;
     if (!acceptsArray) {
         return {
-            'expr': expr.replace(regex, $0),
-            'listener': listener
+            expr: expr.replace(regex, ARRAY_INDEX_ZERO),
+            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);
-    }
+    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;
     return {
-        'expr': _expr,
-        'listener': arrayConsumerFn
+        expr: baseExpr,
+        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) => {
-    if (expr.indexOf('[$i]') !== -1) {
-        let watchInfo = getUpdatedWatcInfo(expr, config && (config.arrayType || config.isList), listener);
+    // Handle array expressions
+    if (expr.includes(ARRAY_INDEX_PLACEHOLDER)) {
+        const watchInfo = getUpdatedWatchInfo(expr, config.arrayType || config.isList || false, 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();
-    registry.set(identifier, {
-        fn: fn.bind(expr, $scope, $locals),
+    const scopeType = getScopeType($scope);
+    const scopeName = getScopeName($scope, scopeType);
+    const watchInfo = {
+        fn: fn.bind(null, $scope, $locals),
         listener,
         expr,
         last: FIRST_TIME_WATCH,
         doNotClone,
-        isMuted: isMuted
-    });
+        isMuted,
+        scopeType,
+        scopeName
+    };
+    // 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 () => $unwatch(identifier);
 };
-const $unwatch = identifier => registry.delete(identifier);
-window.watchRegistry = registry;
+/**
+ * Unwatches a single identifier
+ */
+const $unwatch = (identifier) => {
+    const widgetId = getWidgetId(identifier);
+    if (widgetId) {
+        const propertyName = getPropertyName(identifier);
+        const widgetGroup = registry.get(widgetId);
+        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;
+};
 const $appDigest = (() => {
-    return (force) => {
+    return (force = false) => {
         {
             return;
         }
     };
 })();
+// Export registry for debugging
+window.watchRegistry = registry;
 
 var ComponentType;
 (function (ComponentType) {
@@ -100387,6 +100553,7 @@ const REGEX = {
     SUPPORTED_AUDIO_FORMAT: /\.(mp3|ogg|webm|wma|3gp|wav|m4a)$/i,
     SUPPORTED_VIDEO_FORMAT: /\.(mp4|ogg|webm|wmv|mpeg|mpg|avi|mov)$/i,
     VALID_WEB_URL: /^(http[s]?:\/\/)(www\.){0,1}[a-zA-Z0-9=:?\/\.\-]+(\.[a-zA-Z]{2,5}[\.]{0,1})?/,
+    VALID_IMAGE_URL: /^(https?|blob|data|file|ftp):/i,
     REPLACE_PATTERN: /\$\{([^\}]+)\}/g,
     DATA_URL: /^\s*data:([a-z]+\/[a-z0-9-+.]+(;[a-z-]+=[a-z0-9-]+)?)?(;base64)?,([a-z0-9!$&',()*+;=\-._~:@\/?%\s]*)\s*$/i,
     ISO_DATE_FORMAT: /(\d{4}-\d{2}-\d{2})T(\d{2}:\d{2}:\d{2})(\.\d+)?([+-]\d{2}:?\d{2}|Z)$/
@@ -100609,6 +100776,9 @@ const isVideoFile = (fileName) => {
 const isValidWebURL = (url) => {
     return (REGEX.VALID_WEB_URL).test(url);
 };
+const isValidImageUrl = (url) => {
+    return (REGEX.VALID_IMAGE_URL).test(url?.trim());
+};
 /*This function returns the url to the resource after checking the validity of url*/
 const getResourceURL = (urlString) => {
     return urlString;
@@ -101862,6 +102032,7 @@ var Utils = /*#__PURE__*/Object.freeze({
     isPageable: isPageable,
     isSafari: isSafari,
     isTablet: isTablet,
+    isValidImageUrl: isValidImageUrl,
     isValidWebURL: isValidWebURL,
     isVideoFile: isVideoFile,
     loadScript: loadScript,
@@ -101955,7 +102126,10 @@ class EventNotifier {
         return noop;
     }
     destroy() {
-        this._subject.complete();
+        this._subject.next(null); // optional
+        this._subject.complete(); // clears all observers
+        this._isInitialized = false;
+        this._eventsBeforeInit = [];
     }
 }
 let MINIMUM_TAB_WIDTH = 768;
@@ -101970,9 +102144,11 @@ class Viewport {
         this.isTabletType = false;
         this._eventNotifier = new EventNotifier(true);
         this.setScreenType();
-        window.addEventListener("resize" /* ViewportEvent.RESIZE */, this.resizeFn.bind(this));
-        const query = window.matchMedia('(orientation: portrait)');
-        if (query.matches) {
+        // MEMORY LEAK FIX: Store bound function reference for proper removal
+        this.boundResizeFn = this.resizeFn.bind(this);
+        window.addEventListener("resize" /* ViewportEvent.RESIZE */, this.boundResizeFn);
+        this.mediaQuery = window.matchMedia('(orientation: portrait)');
+        if (this.mediaQuery.matches) {
             this.orientation.isPortrait = true;
         }
         else {
@@ -101980,8 +102156,10 @@ class Viewport {
         }
         // Add a media query change listener
         // addEventListener is not supported ios browser
-        if (query.addEventListener) {
-            query.addEventListener('change', $event => this.orientationChange($event, !$event.matches));
+        if (this.mediaQuery.addEventListener) {
+            // MEMORY LEAK FIX: Store bound function reference for proper removal
+            this.boundOrientationChange = ($event) => this.orientationChange($event, !$event.matches);
+            this.mediaQuery.addEventListener('change', this.boundOrientationChange);
         }
     }
     update(selectedViewPort) {
@@ -102008,14 +102186,14 @@ class Viewport {
         return this._eventNotifier.subscribe(eventName, callback);
     }
     notify(eventName, ...data) {
-        this._eventNotifier.notify.apply(this._eventNotifier, arguments);
+        this._eventNotifier.notify(eventName, ...data);
     }
     setScreenType() {
         const $el = document.querySelector('.wm-app');
         this.screenWidth = $el.clientWidth;
         this.screenHeight = $el.clientHeight;
-        this.screenWidth < this.screenHeight ? this.screenWidth : this.screenHeight;
-        this.screenWidth > this.screenHeight ? this.screenWidth : this.screenHeight;
+        // const minValue = this.screenWidth < this.screenHeight ? this.screenWidth : this.screenHeight;
+        // const maxValue = this.screenWidth > this.screenHeight ? this.screenWidth : this.screenHeight;
         this.isTabletType = false;
         this.isMobileType = false;
         if (get$1(this.selectedViewPort, 'deviceCategory')) {
@@ -102047,7 +102225,17 @@ class Viewport {
     }
     ngOnDestroy() {
         this._eventNotifier.destroy();
-        window.removeEventListener('resize', this.resizeFn);
+        // MEMORY LEAK FIX: Remove resize event listener using stored bound function reference
+        if (this.boundResizeFn) {
+            window.removeEventListener('resize', this.boundResizeFn);
+            this.boundResizeFn = null;
+        }
+        // MEMORY LEAK FIX: Remove media query orientation change listener
+        if (this.mediaQuery && this.boundOrientationChange && this.mediaQuery.removeEventListener) {
+            this.mediaQuery.removeEventListener('change', this.boundOrientationChange);
+            this.boundOrientationChange = null;
+        }
+        this.mediaQuery = null;
     }
     static { this.ɵfac = ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: Viewport, deps: [], target: FactoryTarget.Injectable }); }
     static { this.ɵprov = ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "18.2.13", ngImport: i0, type: Viewport, providedIn: 'root' }); }

package/npm-shrinkwrap.json

@@ -1,15 +1,15 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.14.1-rc.6310",
+    "version": "11.14.2-rc.6311",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-codegen",
-            "version": "11.14.1-rc.6310",
+            "version": "11.14.2-rc.6311",
             "license": "ISC",
             "dependencies": {
-                "@wavemaker/angular-app": "11.14.1-rc.6310",
+                "@wavemaker/angular-app": "11.14.2-rc.6311",
                 "archiver": "^7.0.1",
                 "cheerio": "1.0.0-rc.12",
                 "decode-uri-component": "^0.2.0",
@@ -1376,8 +1376,8 @@
             "license": "MIT"
         },
         "node_modules/@wavemaker/angular-app": {
-            "version": "11.14.1-rc.6310",
-            "integrity": "sha512-xP9z6X2g/Rfx+Z9wQLBoS2XBXkwKU+4j3+sQ8wvfDAkF8EGCG/cKhdsd1YtLNc49xOb59ml0XkKv0o5mBEErnQ==",
+            "version": "11.14.2-rc.6311",
+            "integrity": "sha512-UNvj5jg1muOFtZOnEW/Ay18CPpXnqW313X0E1dAQnJHouFG4RCdl4+PL4C2lf/uxa8QEqQzPzMsR+fZYwZ8Pog==",
             "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-rc.6310",
-                "@wavemaker/custom-widgets-m3": "11.14.1-rc.6310",
+                "@wavemaker/app-ng-runtime": "11.14.2-rc.6311",
+                "@wavemaker/custom-widgets-m3": "11.14.2-rc.6311",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.14.1-rc.6310",
-                "@wavemaker/nvd3": "1.8.15",
-                "@wavemaker/variables": "11.14.1-rc.6310",
+                "@wavemaker/foundation-css": "11.14.2-rc.6311",
+                "@wavemaker/nvd3": "1.8.16",
+                "@wavemaker/variables": "11.14.2-rc.6311",
                 "@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-rc.6310",
-            "integrity": "sha512-H6McDXrmDtn3Q16ew+fM97AvEbDWyX7t6I3T8IypL0J63n8uImC95wKV2jE4iTxfWV6p1xk1Pa2FCCNY0kLjNA==",
+            "version": "11.14.2-rc.6311",
+            "integrity": "sha512-fyq/aZwUwWxGORiKJxjmGB1d7uxbnb5jQ51kg9IiLFJfEReRy4juS/dOjaof+FfOoQON2x72GKqAYARn1LsnpQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -1443,8 +1443,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.14.1-rc.6310",
-            "integrity": "sha512-351zEsWdVUJb8kv4pyLcihqgwNXpnvG04isvGFn5ruqLOcLyDb7REqoB/iUfElaPZIz0Pf06gY38Mtbs5HmISQ==",
+            "version": "11.14.2-rc.6311",
+            "integrity": "sha512-JBab4nvAW3oeF4BFBHEhLVhAoQ2G9DLBvt2gns5mpePHFQHi6SadYQDtjJBISZEks4JaoWhy1G05jwFDK52dzw==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -1457,24 +1457,24 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.14.1-rc.6310",
-            "integrity": "sha512-sblAVGWQevEme9RUY2M40dm46I00LKLE2rt0dIuvBuDWBL38hOKXHm4C3hjmRiU18EHhbNtGpmyjZfacTvy7Eg==",
+            "version": "11.14.2-rc.6311",
+            "integrity": "sha512-RZPYwWipSso46C6Uk9w1tDOgUIE5Vvu+dNxTLTslEXp1IOip8BWQ7EnDIErHeyZxrEeQHN1ESTIZN3SyxDnTOA==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
             }
         },
         "node_modules/@wavemaker/nvd3": {
-            "version": "1.8.15",
-            "integrity": "sha512-ufRoz09lG1vAMfc+Qc0TC912m/bTmzQYTCJpaQ0T525i6J3+tjmT7dLbTLxRlA1KTsRFRHTaLi410R8RCYMjRg==",
+            "version": "1.8.16",
+            "integrity": "sha512-gzgcW3Gr3MYUpYqbhWXVlUq8NhWpBFCz/QKF+Ekvi6pUjTHDLfe264HgiyrPs0PbCPsqN7Z/cFNbQTYJZC+fzQ==",
             "license": "Apache-2.0",
             "peerDependencies": {
                 "d3": "7.8.5"
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.14.1-rc.6310",
-            "integrity": "sha512-6amX71uz0OHwubljIREUtuf9xvf0ATqmI+AqKVlDqtEmfaRKvPY9qEYvvirXaCZY8G22Iy4aAXsZvN+5Dk47ug==",
+            "version": "11.14.2-rc.6311",
+            "integrity": "sha512-krkf2FYiiDVooQHcSnZ3nzIgZUxh6eIbF/WKgjyM2VZ9xC7By6q6+8cycXyqBgzTCciL00pXIETQe3joEueg8w==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",

package/package-lock.json

@@ -1,15 +1,15 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.14.1-rc.6310",
+    "version": "11.14.2-rc.6311",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-codegen",
-            "version": "11.14.1-rc.6310",
+            "version": "11.14.2-rc.6311",
             "license": "ISC",
             "dependencies": {
-                "@wavemaker/angular-app": "11.14.1-rc.6310",
+                "@wavemaker/angular-app": "11.14.2-rc.6311",
                 "archiver": "^7.0.1",
                 "cheerio": "1.0.0-rc.12",
                 "decode-uri-component": "^0.2.0",
@@ -1376,8 +1376,8 @@
             "license": "MIT"
         },
         "node_modules/@wavemaker/angular-app": {
-            "version": "11.14.1-rc.6310",
-            "integrity": "sha512-xP9z6X2g/Rfx+Z9wQLBoS2XBXkwKU+4j3+sQ8wvfDAkF8EGCG/cKhdsd1YtLNc49xOb59ml0XkKv0o5mBEErnQ==",
+            "version": "11.14.2-rc.6311",
+            "integrity": "sha512-UNvj5jg1muOFtZOnEW/Ay18CPpXnqW313X0E1dAQnJHouFG4RCdl4+PL4C2lf/uxa8QEqQzPzMsR+fZYwZ8Pog==",
             "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-rc.6310",
-                "@wavemaker/custom-widgets-m3": "11.14.1-rc.6310",
+                "@wavemaker/app-ng-runtime": "11.14.2-rc.6311",
+                "@wavemaker/custom-widgets-m3": "11.14.2-rc.6311",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.14.1-rc.6310",
-                "@wavemaker/nvd3": "1.8.15",
-                "@wavemaker/variables": "11.14.1-rc.6310",
+                "@wavemaker/foundation-css": "11.14.2-rc.6311",
+                "@wavemaker/nvd3": "1.8.16",
+                "@wavemaker/variables": "11.14.2-rc.6311",
                 "@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-rc.6310",
-            "integrity": "sha512-H6McDXrmDtn3Q16ew+fM97AvEbDWyX7t6I3T8IypL0J63n8uImC95wKV2jE4iTxfWV6p1xk1Pa2FCCNY0kLjNA==",
+            "version": "11.14.2-rc.6311",
+            "integrity": "sha512-fyq/aZwUwWxGORiKJxjmGB1d7uxbnb5jQ51kg9IiLFJfEReRy4juS/dOjaof+FfOoQON2x72GKqAYARn1LsnpQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -1443,8 +1443,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.14.1-rc.6310",
-            "integrity": "sha512-351zEsWdVUJb8kv4pyLcihqgwNXpnvG04isvGFn5ruqLOcLyDb7REqoB/iUfElaPZIz0Pf06gY38Mtbs5HmISQ==",
+            "version": "11.14.2-rc.6311",
+            "integrity": "sha512-JBab4nvAW3oeF4BFBHEhLVhAoQ2G9DLBvt2gns5mpePHFQHi6SadYQDtjJBISZEks4JaoWhy1G05jwFDK52dzw==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -1457,24 +1457,24 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.14.1-rc.6310",
-            "integrity": "sha512-sblAVGWQevEme9RUY2M40dm46I00LKLE2rt0dIuvBuDWBL38hOKXHm4C3hjmRiU18EHhbNtGpmyjZfacTvy7Eg==",
+            "version": "11.14.2-rc.6311",
+            "integrity": "sha512-RZPYwWipSso46C6Uk9w1tDOgUIE5Vvu+dNxTLTslEXp1IOip8BWQ7EnDIErHeyZxrEeQHN1ESTIZN3SyxDnTOA==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
             }
         },
         "node_modules/@wavemaker/nvd3": {
-            "version": "1.8.15",
-            "integrity": "sha512-ufRoz09lG1vAMfc+Qc0TC912m/bTmzQYTCJpaQ0T525i6J3+tjmT7dLbTLxRlA1KTsRFRHTaLi410R8RCYMjRg==",
+            "version": "1.8.16",
+            "integrity": "sha512-gzgcW3Gr3MYUpYqbhWXVlUq8NhWpBFCz/QKF+Ekvi6pUjTHDLfe264HgiyrPs0PbCPsqN7Z/cFNbQTYJZC+fzQ==",
             "license": "Apache-2.0",
             "peerDependencies": {
                 "d3": "7.8.5"
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.14.1-rc.6310",
-            "integrity": "sha512-6amX71uz0OHwubljIREUtuf9xvf0ATqmI+AqKVlDqtEmfaRKvPY9qEYvvirXaCZY8G22Iy4aAXsZvN+5Dk47ug==",
+            "version": "11.14.2-rc.6311",
+            "integrity": "sha512-krkf2FYiiDVooQHcSnZ3nzIgZUxh6eIbF/WKgjyM2VZ9xC7By6q6+8cycXyqBgzTCciL00pXIETQe3joEueg8w==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",

package/package.json

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

package/src/gen-app-override-css.js

@@ -1 +1 @@
-const path=require("path"),fs=require("fs"),{downloadNPMPackage:downloadNPMPackage}=require("../download-packages"),{isPrismProject:isPrismProject,DESIGN_TOKENS_DIR_NAME:DESIGN_TOKENS_DIR_NAME,OVERRIDE_TOKENS_PATH:OVERRIDE_TOKENS_PATH,APP_OVERRIDE_CSS_PATH:APP_OVERRIDE_CSS_PATH}=require("./wm-utils"),{getLegacyWmProjectProperties:getLegacyWmProjectProperties}=require("./project-meta"),groupFilesByMode=e=>{const s={default:[]};return fs.readdirSync(e).forEach(o=>{const t=path.join(e,o),r=fs.statSync(t);if(r.isDirectory()){const e=groupFilesByMode(t);for(const o in e)s[o]||(s[o]=[]),s[o].push(...e[o])}else if(r.isFile()&&".json"===path.extname(t)){const e=o.match(/\.([^.]+)\.json$/);if(e){const o=e[1];s[o]||(s[o]=[]),s[o].push(t)}else s.default.push(t)}}),s},generateModeConfigs=(e,s,o,t)=>{const r=o&&o.name||"css/variables",n=t&&t.name||"css/variables",i=[];for(const o in e){const t=e[o].flatMap(e=>{const o=e.replace(s+"/","");return[{destination:o.replace(/\.json$/,".css"),options:{outputReferences:!0,selector:":root"},format:r,filter:function(s){var o;const t=e=>e?e.replace(/\\/g,"/"):e;o=t(o=s["@"]&&s["@"].filePath?s["@"].filePath:s.filePath),e=t(e);var r=o&&-1!==o.indexOf("overrides")||s.filePath&&-1!==s.filePath.indexOf("overrides"),n=o&&(e.includes(o)||e.includes(t(s.filePath)))&&!s.path.includes("appearances")&&!s.path.includes("states");return r&&n}},{destination:o.replace(/\.json$/,"variant.css"),options:{outputReferences:!0,selector:":root"},format:n,filter:s=>{let o;const t=(o=s["@"]&&s["@"].filePath?s["@"].filePath:s.filePath)&&-1!==o.indexOf("overrides"),r=o&&(e.includes(o)||e.includes(s.filePath))&&(s.path.includes("appearances")||s.path.includes("states"));return t&&r}}]});i.push({mode:o,files:t})}return i},accessFile=e=>{const s=path.dirname(e);fs.existsSync(s)||(fs.mkdirSync(s,{recursive:!0}),console.log(`Directory created: ${s}`)),fs.access(e,fs.constants.F_OK,s=>{if(s){console.log(`${e} does not exist. Creating file...`);const s=JSON.stringify({});fs.writeFile(e,s,s=>{if(s)throw s;console.log(`${e} was created successfully.`)})}})};async function setupSymlink(e,s){try{await fs.promises.mkdir(path.dirname(s),{recursive:!0});try{fs.existsSync(s)&&await fs.promises.unlink(s)}catch(e){console.error("Error removing existing symlink:",e)}const o="win32"===process.platform?"junction":"dir";await fs.promises.symlink(e,s,o),console.log("Symlink created successfully at:",s)}catch(e){console.error("Error creating symlink:",s,e)}}const getStyleDictionaryConfig=(e,s,o,t)=>{t.endsWith("/")||(t+="/");let r="";return{log:{verbosity:"verbose"},source:[r="default"===o?`${t}/src/main/webapp/${OVERRIDE_TOKENS_PATH}/**/!(*.*).json`:`${t}/src/main/webapp/${OVERRIDE_TOKENS_PATH}/**/*.${o}.json`],include:[path.join(s,"**","!(*.dark|*.light).json"),path.join(t,"src","main","webapp",OVERRIDE_TOKENS_PATH,"global","**","*.json")],platforms:{css:{transformGroup:"css",prefix:"--wm",files:e}}}};async function removeSymlink(e){const s=path.resolve(e);try{fs.lstatSync(s).isSymbolicLink()?(await fs.promises.unlink(s),console.log("Symlink removed successfully:",s)):console.warn("Not a symlink, skipping unlink:",s)}catch(e){console.error("Error during symlink removal:",e)}}async function getCustomFormatters(e,s){try{const o=await import(`${e}/node_modules/style-dictionary/lib/utils/index.js`),{usesReferences:t,getReferences:r}=o,n=await import(`${s}/node_modules/@wavemaker/foundation-css/src/utils/style-dictionary-utils.js`),{cssVarCalcMixFormatter:i,componentVariantsFormatter:a}=n,c="web";return{cssVarCalcMixFormatter:i(t,r),componentVariantsFormatter:a(t,r,c)}}catch(e){return console.error("Failed to load CssVarCalcMixFormatter:",e),null}}function processCSSFiles(e,s){for(const{destination:o}of e)try{if(o.endsWith(".css")&&fs.existsSync(o)){const e=fs.readFileSync(o,"utf-8"),t=/(:root\s*\{[^}]*\})/,r=path.basename(o).split(".");let n=e;if(3===r.length&&"light"!==r[1]){const o=r[0],t=r[1];s+=(n=e.replace(/:root/g,`:root[${o}='${t}']`))+"\n"}else{const o=s.match(t),r=e.match(t);if(o&&r){const e=o[1],t=r[1].replace(/:root\s*\{|\}/g,"").trim(),n=e.replace("}",`\n${t}\n}`);s=s.replace(e,n)}else s+=n+"\n"}fs.unlink(o,()=>{})}}catch(e){console.error(`\nStyle dictionary, Error processing file ${o}:`,e)}return s}const generateOverrideCSS=async(e,s,o)=>{e=e||{};const t=await getLegacyWmProjectProperties(s);if(isPrismProject(t)&&(e.generateOverrideCSS||"angular"===e.buildType)){const t=path.join(s+"/src/main/webapp/",OVERRIDE_TOKENS_PATH),r=s+`/src/main/webapp/${APP_OVERRIDE_CSS_PATH}`;if(accessFile(r),fs.existsSync(t)){console.log("CODEGEN ANGULAR APP: generating override css...");let n={scope:"",name:"style-dictionary",version:"4.1.0",packageJsonFile:"",successMsg:"STYLE DICTIONARY SUCCESS",infoMsg:"STYLE DICTIONARY PACKAGE : ",skipPackageVersion:!1};n.baseDir=o;const i=await downloadNPMPackage(n);let a={scope:"@wavemaker",name:"foundation-css",version:e.runtimeUIVersion,packageJsonFile:"",successMsg:"Foundation-CSS SUCCESS",infoMsg:"Foundation-CSS PACKAGE : "};a.baseDir=o;const c=await downloadNPMPackage(a);console.log("FOUNDATION_CSS_PATH",c,"SourceDir",s),await(async()=>{const e=await import(`${i}/node_modules/style-dictionary/lib/StyleDictionary.js`).then(e=>e.default),o=path.join(c,"/node_modules/@wavemaker/foundation-css/src/tokens/web"),{cssVarCalcMixFormatter:n,componentVariantsFormatter:a}=await getCustomFormatters(i,c);n&&a||(n||console.error("cssVarCalcMixFormatter failed to load."),a||console.error("cssVariantFormatter failed to load.")),n&&e.registerFormat(n),a&&e.registerFormat(a);const l=path.resolve(s,"src","main","webapp",DESIGN_TOKENS_DIR_NAME,"temp-tokens"),d=groupFilesByMode(t),f=generateModeConfigs(d,s,n,a);let m="";try{console.log("\nSetting up foundation tokens symlink..."),await setupSymlink(o,l);for(const{mode:o,files:t}of f){console.log(`\nBuilding CSS for mode: ${o}...`);try{const n=getStyleDictionaryConfig(t,l,o,s);console.log(n,o);const i=new e(n);await i.buildPlatform("css"),console.log(`Style Dictionary build completed for mode: ${o}`),m=processCSSFiles(t,m),fs.writeFileSync(r,m),console.log(`CSS overrides generated successfully for mode: ${o}`)}catch(e){console.error(`Error during Style Dictionary build for mode: ${o}`,e)}}console.log("CODEGEN ANGULAR APP: generating overrides success !")}catch(e){console.error("Error setting up symlink or processing modes:",e)}finally{await removeSymlink(l)}})()}}};module.exports={generateOverrideCSS:generateOverrideCSS};
+const path=require("path"),fs=require("fs"),{downloadNPMPackage:downloadNPMPackage}=require("../download-packages"),{isPrismProject:isPrismProject,DESIGN_TOKENS_DIR_NAME:DESIGN_TOKENS_DIR_NAME,OVERRIDE_TOKENS_PATH:OVERRIDE_TOKENS_PATH,APP_OVERRIDE_CSS_PATH:APP_OVERRIDE_CSS_PATH}=require("./wm-utils"),{getLegacyWmProjectProperties:getLegacyWmProjectProperties}=require("./project-meta"),groupFilesByMode=e=>{const s={default:[]};return fs.readdirSync(e).forEach(o=>{const t=path.join(e,o),r=fs.statSync(t);if(r.isDirectory()){const e=groupFilesByMode(t);for(const o in e)s[o]||(s[o]=[]),s[o].push(...e[o])}else if(r.isFile()&&".json"===path.extname(t)){const e=o.match(/\.([^.]+)\.json$/);if(e){const o=e[1];s[o]||(s[o]=[]),s[o].push(t)}else s.default.push(t)}}),s},generateModeConfigs=(e,s,o,t)=>{const r=o&&o.name||"css/variables",n=t&&t.name||"css/variables",i=[];for(const o in e){const t=e[o].flatMap(e=>{const o=e.replace(s+"/","");return[{destination:o.replace(/\.json$/,".css"),options:{outputReferences:!0,selector:":root"},format:r,filter:function(s){var o;const t=e=>e?e.replace(/\\/g,"/"):e;o=t(o=s["@"]&&s["@"].filePath?s["@"].filePath:s.filePath),e=t(e);var r=o&&-1!==o.indexOf("overrides")||s.filePath&&-1!==s.filePath.indexOf("overrides"),n=o&&(e.includes(o)||e.includes(t(s.filePath)))&&!s.path.includes("appearances")&&!s.path.includes("states");return r&&n}},{destination:o.replace(/\.json$/,"variant.css"),options:{outputReferences:!0,selector:":root"},format:n,filter:s=>{let o;const t=(o=s["@"]&&s["@"].filePath?s["@"].filePath:s.filePath)&&-1!==o.indexOf("overrides"),r=o&&(e.includes(o)||e.includes(s.filePath))&&(s.path.includes("appearances")||s.path.includes("states"));return t&&r}}]});i.push({mode:o,files:t})}return i},accessFile=e=>{const s=path.dirname(e);fs.existsSync(s)||(fs.mkdirSync(s,{recursive:!0}),console.log(`Directory created: ${s}`)),fs.access(e,fs.constants.F_OK,s=>{if(s){console.log(`${e} does not exist. Creating file...`);const s=JSON.stringify({});fs.writeFile(e,s,s=>{if(s)throw s;console.log(`${e} was created successfully.`)})}})};async function setupSymlink(e,s){try{await fs.promises.mkdir(path.dirname(s),{recursive:!0});try{fs.existsSync(s)&&await fs.promises.unlink(s)}catch(e){console.error("Error removing existing symlink:",e)}const o="win32"===process.platform?"junction":"dir";await fs.promises.symlink(e,s,o),console.log("Symlink created successfully at:",s)}catch(e){console.error("Error creating symlink:",s,e)}}const getStyleDictionaryConfig=(e,s,o,t)=>{t.endsWith("/")||(t+="/");let r="";return{log:{verbosity:"verbose"},source:[r="default"===o?`${t}/src/main/webapp/${OVERRIDE_TOKENS_PATH}/**/!(*.*).json`:`${t}/src/main/webapp/${OVERRIDE_TOKENS_PATH}/**/*.${o}.json`],include:[`${s.replace(/\\/g,"/")}/**/!(*.dark|*.light).json`,`${t.replace(/\\/g,"/")}/src/main/webapp/${OVERRIDE_TOKENS_PATH}/global/**/*.json`],platforms:{css:{transformGroup:"css",prefix:"--wm",files:e}}}};async function removeSymlink(e){const s=path.resolve(e);try{fs.lstatSync(s).isSymbolicLink()?(await fs.promises.unlink(s),console.log("Symlink removed successfully:",s)):console.warn("Not a symlink, skipping unlink:",s)}catch(e){console.error("Error during symlink removal:",e)}}async function getCustomFormatters(e,s){try{const o=await import(`${e}/node_modules/style-dictionary/lib/utils/index.js`),{usesReferences:t,getReferences:r}=o,n=await import(`${s}/node_modules/@wavemaker/foundation-css/src/utils/style-dictionary-utils.js`),{cssVarCalcMixFormatter:i,componentVariantsFormatter:a}=n,c="web";return{cssVarCalcMixFormatter:i(t,r),componentVariantsFormatter:a(t,r,c)}}catch(e){return console.error("Failed to load CssVarCalcMixFormatter:",e),null}}function processCSSFiles(e,s){for(const{destination:o}of e)try{if(o.endsWith(".css")&&fs.existsSync(o)){const e=fs.readFileSync(o,"utf-8"),t=/(:root\s*\{[^}]*\})/,r=path.basename(o).split(".");let n=e;if(3===r.length&&"light"!==r[1]){const o=r[0],t=r[1];s+=(n=e.replace(/:root/g,`:root[${o}='${t}']`))+"\n"}else{const o=s.match(t),r=e.match(t);if(o&&r){const e=o[1],t=r[1].replace(/:root\s*\{|\}/g,"").trim(),n=e.replace("}",`\n${t}\n}`);s=s.replace(e,n)}else s+=n+"\n"}fs.unlink(o,()=>{})}}catch(e){console.error(`\nStyle dictionary, Error processing file ${o}:`,e)}return s}const generateOverrideCSS=async(e,s,o)=>{e=e||{};const t=await getLegacyWmProjectProperties(s);if(isPrismProject(t)){const t=path.join(s+"/src/main/webapp/",OVERRIDE_TOKENS_PATH),r=s+`/src/main/webapp/${APP_OVERRIDE_CSS_PATH}`;if(accessFile(r),fs.existsSync(t)){console.log("CODEGEN ANGULAR APP: generating override css...");let n={scope:"",name:"style-dictionary",version:"4.1.0",packageJsonFile:"",successMsg:"STYLE DICTIONARY SUCCESS",infoMsg:"STYLE DICTIONARY PACKAGE : ",skipPackageVersion:!1};n.baseDir=o;const i=await downloadNPMPackage(n);let a={scope:"@wavemaker",name:"foundation-css",version:e.runtimeUIVersion,packageJsonFile:"",successMsg:"Foundation-CSS SUCCESS",infoMsg:"Foundation-CSS PACKAGE : "};a.baseDir=o;const c=await downloadNPMPackage(a);console.log("FOUNDATION_CSS_PATH",c,"SourceDir",s),await(async()=>{const e=await import(`${i}/node_modules/style-dictionary/lib/StyleDictionary.js`).then(e=>e.default),o=path.join(c,"/node_modules/@wavemaker/foundation-css/src/tokens/web"),{cssVarCalcMixFormatter:n,componentVariantsFormatter:a}=await getCustomFormatters(i,c);n&&a||(n||console.error("cssVarCalcMixFormatter failed to load."),a||console.error("cssVariantFormatter failed to load.")),n&&e.registerFormat(n),a&&e.registerFormat(a);const l=path.resolve(s,"src","main","webapp",DESIGN_TOKENS_DIR_NAME,"temp-tokens"),d=groupFilesByMode(t),f=generateModeConfigs(d,s,n,a);let m="";try{console.log("\nSetting up foundation tokens symlink..."),await setupSymlink(o,l);for(const{mode:o,files:t}of f){console.log(`\nBuilding CSS for mode: ${o}...`);try{const n=getStyleDictionaryConfig(t,l,o,s);console.log(n,o);const i=new e(n);await i.buildPlatform("css"),console.log(`Style Dictionary build completed for mode: ${o}`),m=processCSSFiles(t,m),fs.writeFileSync(r,m),console.log(`CSS overrides generated successfully for mode: ${o}`)}catch(e){console.error(`Error during Style Dictionary build for mode: ${o}`,e)}}console.log("CODEGEN ANGULAR APP: generating overrides success !")}catch(e){console.error("Error setting up symlink or processing modes:",e)}finally{await removeSymlink(l)}})()}}};module.exports={generateOverrideCSS:generateOverrideCSS};