@wavemaker/angular-app 11.14.1-6.6324 → 11.14.1-8.6337

package/dependencies/pipe-provider.cjs.js

@@ -147299,11 +147299,11 @@ const CURRENCY_INFO = {
     }
 };
 
-const $RAF$1$1 = window.requestAnimationFrame;
+const $RAF$1 = window.requestAnimationFrame;
 const $RAFQueue$1 = [];
 const invokeLater$1 = fn => {
     if (!$RAFQueue$1.length) {
-        $RAF$1$1(() => {
+        $RAF$1(() => {
             $RAFQueue$1.forEach(f => f());
             $RAFQueue$1.length = 0;
         });
@@ -147845,70 +147845,223 @@ const getFnForEventExpr$1 = (expr) => {
     return fnExecutor$1(expr, ExpressionType$2.Action);
 };
 
+// Constants
+const WIDGET_ID_REGEX$1 = /^(widget-[^_]+)/;
+const WIDGET_PROPERTY_REGEX$1 = /^widget-[^_]+_(.+)$/;
+const ARRAY_INDEX_PLACEHOLDER$1 = '[$i]';
+const ARRAY_INDEX_ZERO$1 = '[0]';
 const registry$1 = new Map();
 const watchIdGenerator$1 = new IDGenerator$1('watch-id-');
-const FIRST_TIME_WATCH$1 = {};
-Object.freeze(FIRST_TIME_WATCH$1);
+const FIRST_TIME_WATCH$1 = Object.freeze({});
+/**
+ * Extracts widget ID from identifier (e.g., "widget-id23_eventsource" -> "widget-id23")
+ */
+const getWidgetId$1 = (identifier) => {
+    if (!identifier || typeof identifier !== 'string') {
+        return null;
+    }
+    const match = identifier.match(WIDGET_ID_REGEX$1);
+    return match ? match[1] : null;
+};
+/**
+ * Extracts property name from identifier (e.g., "widget-id23_eventsource" -> "eventsource")
+ */
+const getPropertyName$1 = (identifier) => {
+    if (!identifier || typeof identifier !== 'string') {
+        return identifier;
+    }
+    const match = identifier.match(WIDGET_PROPERTY_REGEX$1);
+    return match ? match[1] : identifier;
+};
+/**
+ * Array consumer wrapper for array-based expressions
+ */
 const arrayConsumer$1 = (listenerFn, restExpr, newVal, oldVal) => {
-    let data = newVal, formattedData;
-    if (isArray$1(data)) {
-        formattedData = data.map(function (datum) {
-            return findValueOf$1(datum, restExpr);
-        });
-        // If resulting structure is an array of array, flatten it
-        if (isArray$1(formattedData[0])) {
-            formattedData = flatten$2(formattedData);
-        }
-        listenerFn(formattedData, oldVal);
+    if (!isArray$1(newVal)) {
+        return;
     }
+    let formattedData = newVal.map(datum => findValueOf$1(datum, restExpr));
+    // Flatten if result is array of arrays
+    if (isArray$1(formattedData[0])) {
+        formattedData = flatten$2(formattedData);
+    }
+    listenerFn(formattedData, oldVal);
 };
-const getUpdatedWatcInfo$1 = (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$1 = (expr, acceptsArray, listener) => {
+    const regex = /\[\$i\]/g;
     if (!acceptsArray) {
         return {
-            'expr': expr.replace(regex, $0),
-            'listener': listener
+            expr: expr.replace(regex, ARRAY_INDEX_ZERO$1),
+            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$1.bind(undefined, listener, restExpr);
-    }
+    const lastIndex = expr.lastIndexOf(ARRAY_INDEX_PLACEHOLDER$1);
+    const baseExpr = expr.substring(0, lastIndex).replace(ARRAY_INDEX_PLACEHOLDER$1, ARRAY_INDEX_ZERO$1);
+    const restExpr = expr.substring(lastIndex + 5);
+    const arrayConsumerFn = restExpr
+        ? arrayConsumer$1.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$1 = [
+    "row.getProperty('investment')",
+    "row.getProperty('factsheetLink')",
+    "row.getProperty('isRebalanceEligible')"
+];
+const isStaticExpression$1 = (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$1.includes(trimmedExpr)) {
+        return true;
+    }
+    return false;
+};
+/**
+ * Gets the scope type from the scope object
+ */
+const getScopeType$1 = ($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$1 = ($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$1 = (expr, $scope, $locals, listener, identifier = watchIdGenerator$1.nextUid(), doNotClone = false, config = {}, isMuted) => {
-    if (expr.indexOf('[$i]') !== -1) {
-        let watchInfo = getUpdatedWatcInfo$1(expr, config && (config.arrayType || config.isList), listener);
+    // Handle array expressions
+    if (expr.includes(ARRAY_INDEX_PLACEHOLDER$1)) {
+        const watchInfo = getUpdatedWatchInfo$1(expr, config.arrayType || config.isList || false, listener);
         expr = watchInfo.expr;
         listener = watchInfo.listener;
     }
+    // Handle static expressions
+    if (isStaticExpression$1(expr)) {
+        try {
+            const fn = $parseExpr$1(expr);
+            const staticValue = fn($scope, $locals);
+            listener(staticValue, FIRST_TIME_WATCH$1);
+        }
+        catch (e) {
+            console.warn(`Error evaluating static expression '${expr}':`, e);
+            listener(undefined, FIRST_TIME_WATCH$1);
+        }
+        return () => { }; // No-op unsubscribe
+    }
     const fn = $parseExpr$1();
-    registry$1.set(identifier, {
-        fn: fn.bind(expr, $scope, $locals),
+    const scopeType = getScopeType$1($scope);
+    const scopeName = getScopeName$1($scope, scopeType);
+    const destroyFn = () => $unwatch$1(identifier);
+    const watchInfo = {
+        fn: fn.bind(null, $scope, $locals),
         listener,
         expr,
         last: FIRST_TIME_WATCH$1,
         doNotClone,
-        isMuted: isMuted
-    });
-    return () => $unwatch$1(identifier);
+        isMuted,
+        scopeType,
+        scopeName,
+        destroyFn
+    };
+    // Store in registry
+    const widgetId = getWidgetId$1(identifier);
+    if (widgetId) {
+        const propertyName = getPropertyName$1(identifier);
+        if (!registry$1.has(widgetId)) {
+            registry$1.set(widgetId, {});
+        }
+        const widgetGroup = registry$1.get(widgetId);
+        widgetGroup[propertyName] = watchInfo;
+    }
+    else {
+        registry$1.set(identifier, watchInfo);
+    }
+    return destroyFn;
+};
+/**
+ * Unwatches a single identifier
+ */
+const $unwatch$1 = (identifier) => {
+    const widgetId = getWidgetId$1(identifier);
+    if (widgetId) {
+        const propertyName = getPropertyName$1(identifier);
+        const widgetGroup = registry$1.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$1.delete(widgetId);
+                }
+                return true;
+            }
+        }
+    }
+    // Fallback to direct lookup
+    if (registry$1.has(identifier)) {
+        registry$1.delete(identifier);
+        return true;
+    }
+    return false;
 };
-const $unwatch$1 = identifier => registry$1.delete(identifier);
-window.watchRegistry = registry$1;
 const $appDigest$1 = (() => {
-    return (force) => {
+    return (force = false) => {
         {
             return;
         }
     };
 })();
+// Export registry for debugging
+window.watchRegistry = registry$1;
 
 var ComponentType$1;
 (function (ComponentType) {
@@ -202914,11 +203067,11 @@ var DEFAULT_FORMATS;
     DEFAULT_FORMATS["DATE_TIME"] = "yyyy-MM-dd HH:mm:ss";
 })(DEFAULT_FORMATS || (DEFAULT_FORMATS = {}));
 
-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;
         });
@@ -203460,70 +203613,223 @@ 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(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(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 destroyFn = () => $unwatch(identifier);
+    const watchInfo = {
+        fn: fn.bind(null, $scope, $locals),
         listener,
         expr,
         last: FIRST_TIME_WATCH,
         doNotClone,
-        isMuted: isMuted
-    });
-    return () => $unwatch(identifier);
+        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;
 };
-const $unwatch = identifier => registry.delete(identifier);
-window.watchRegistry = registry;
 const $appDigest = (() => {
-    return (force) => {
+    return (force = false) => {
         {
             return;
         }
     };
 })();
+// Export registry for debugging
+window.watchRegistry = registry;
 
 var ComponentType;
 (function (ComponentType) {

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;
         });
@@ -100253,70 +100253,223 @@ 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 destroyFn = () => $unwatch(identifier);
+    const watchInfo = {
+        fn: fn.bind(null, $scope, $locals),
         listener,
         expr,
         last: FIRST_TIME_WATCH,
         doNotClone,
-        isMuted: isMuted
-    });
-    return () => $unwatch(identifier);
+        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;
 };
-const $unwatch = identifier => registry.delete(identifier);
-window.watchRegistry = registry;
 const $appDigest = (() => {
-    return (force) => {
+    return (force = false) => {
         {
             return;
         }
     };
 })();
+// Export registry for debugging
+window.watchRegistry = registry;
 
 var ComponentType;
 (function (ComponentType) {

package/dependency-report.html

@@ -69,7 +69,7 @@
 <body>
     <div class="header">
         <h1>Angular Project Dependencies Report</h1>
-        <p class="timestamp">Generated on: 12/3/2025, 12:06:47 PM</p>
+        <p class="timestamp">Generated on: 12/5/2025, 4:54:28 PM</p>
     </div>
 
     <div class="section">

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "11.14.1-6.6324",
+    "version": "11.14.1-8.6337",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-app",
-            "version": "11.14.1-6.6324",
+            "version": "11.14.1-8.6337",
             "dependencies": {
                 "@angular/animations": "18.2.13",
                 "@angular/common": "18.2.13",
@@ -23,12 +23,12 @@
                 "@fullcalendar/list": "6.1.18",
                 "@fullcalendar/timegrid": "6.1.18",
                 "@metrichor/jmespath": "0.3.1",
-                "@wavemaker/app-ng-runtime": "11.14.1-6.6324",
-                "@wavemaker/custom-widgets-m3": "11.14.1-6.6324",
+                "@wavemaker/app-ng-runtime": "11.14.1-8.6337",
+                "@wavemaker/custom-widgets-m3": "11.14.1-8.6337",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.14.1-6.6324",
+                "@wavemaker/foundation-css": "11.14.1-8.6337",
                 "@wavemaker/nvd3": "1.8.15",
-                "@wavemaker/variables": "11.14.1-6.6324",
+                "@wavemaker/variables": "11.14.1-8.6337",
                 "@ztree/ztree_v3": "3.5.48",
                 "acorn": "^8.15.0",
                 "angular-imask": "7.6.1",
@@ -568,12 +568,12 @@
             }
         },
         "node_modules/@angular-devkit/schematics": {
-            "version": "20.3.12",
-            "integrity": "sha512-JqJ1u59y+Ud51k/8MHYzSP+aQOeC2PJBaDmMnvqfWVaIt6n3x4gc/VtuhqhpJ0SKulbFuOWgAfI6QbPFrgUYQQ==",
+            "version": "20.3.13",
+            "integrity": "sha512-hdMKY4rUTko8xqeWYGnwwDYDomkeOoLsYsP6SdaHWK7hpGvzWsT6Q/aIv8J8NrCYkLu+M+5nLiKOooweUZu3GQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-devkit/core": "20.3.12",
+                "@angular-devkit/core": "20.3.13",
                 "jsonc-parser": "3.3.1",
                 "magic-string": "0.30.17",
                 "ora": "8.2.0",
@@ -586,8 +586,8 @@
             }
         },
         "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
-            "version": "20.3.12",
-            "integrity": "sha512-ReFxd/UOoVDr3+kIUjmYILQZF89qg62POdY7a7OqBH7plmInFlYVSEDouJvGqj3LVCPiqTk2ZOSChbhS/eLxXA==",
+            "version": "20.3.13",
+            "integrity": "sha512-/D84T1Caxll3I2sRihPDR9UaWBhF50M+tAX15PdP6uSh/TxwAlLl9p7Rm1bD0mPjPercqaEKA+h9a9qLP16hug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -794,12 +794,12 @@
             }
         },
         "node_modules/@angular-eslint/builder/node_modules/@angular-devkit/architect": {
-            "version": "0.2003.12",
-            "integrity": "sha512-5H40lAFF4CKY32C4HOp6bTlOF1f4WsGCwe7FjFQp9A+T7yoCBiHpIWt2JKTwV4sBoTKVDZOnuf0GG+UVKjQT4A==",
+            "version": "0.2003.13",
+            "integrity": "sha512-JyH6Af6PNC1IHJToColFk1RaXDU87mpPjz7M5sWDfn8bC+KBipw6dSdRkCEuw0D9HY1lZkC9EBV9k9GhpvHjCQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-devkit/core": "20.3.12",
+                "@angular-devkit/core": "20.3.13",
                 "rxjs": "7.8.2"
             },
             "engines": {
@@ -809,8 +809,8 @@
             }
         },
         "node_modules/@angular-eslint/builder/node_modules/@angular-devkit/core": {
-            "version": "20.3.12",
-            "integrity": "sha512-ReFxd/UOoVDr3+kIUjmYILQZF89qg62POdY7a7OqBH7plmInFlYVSEDouJvGqj3LVCPiqTk2ZOSChbhS/eLxXA==",
+            "version": "20.3.13",
+            "integrity": "sha512-/D84T1Caxll3I2sRihPDR9UaWBhF50M+tAX15PdP6uSh/TxwAlLl9p7Rm1bD0mPjPercqaEKA+h9a9qLP16hug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -913,8 +913,8 @@
             }
         },
         "node_modules/@angular-eslint/schematics/node_modules/@angular-devkit/core": {
-            "version": "20.3.12",
-            "integrity": "sha512-ReFxd/UOoVDr3+kIUjmYILQZF89qg62POdY7a7OqBH7plmInFlYVSEDouJvGqj3LVCPiqTk2ZOSChbhS/eLxXA==",
+            "version": "20.3.13",
+            "integrity": "sha512-/D84T1Caxll3I2sRihPDR9UaWBhF50M+tAX15PdP6uSh/TxwAlLl9p7Rm1bD0mPjPercqaEKA+h9a9qLP16hug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -8693,8 +8693,8 @@
             }
         },
         "node_modules/@wavemaker/app-ng-runtime": {
-            "version": "11.14.1-6.6324",
-            "integrity": "sha512-5KsrfmMmR/CSwHJhSpqRjZXCK5v3K8ym14EtTVqLS2HlnNTRWF29rpHLPaCSCTnteo7jtOYTW4cCsD5ivOFfkg==",
+            "version": "11.14.1-8.6337",
+            "integrity": "sha512-MxNZBps4dQ2jCvnDSgvjUYP35oWNx85tgN94ulgnYWKm50ud4skWs+Bgds7nqpzgAF67zZyMi1gwiu5b03lOlA==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -8702,8 +8702,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.14.1-6.6324",
-            "integrity": "sha512-k354qE5DvPViKkwkFQppikn+T/RjkpyGrMfcM9phITLINb1Yz2aJZqlUwlN9nY4mewZHLihxDyKzZe83pRGChQ==",
+            "version": "11.14.1-8.6337",
+            "integrity": "sha512-WvAvdZJZ3hCuEA2maP/BLY7ToGUfFYXD8mUzjMrA8fp4Mdb4VyzQvZJh2XZLjPCo9CU78JoMGzFK97jwWKYnrQ==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -8716,8 +8716,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.14.1-6.6324",
-            "integrity": "sha512-CDLgFjC9jvd7/uRzs03SVxFA9FN9mmL1bzREzepWxTVxIG99tO0d5+pR4ibvIUhx1GDQg7tFzZygMa2pZ+sBGA==",
+            "version": "11.14.1-8.6337",
+            "integrity": "sha512-WkE64qSCQmeIAG8L0Qsqn3mTY2sSQxuoFbftMcuk67G57zuVdVfDIuMwO4DwxZYp5lOvOOQ+xGKwM69BC8xtUA==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -8732,8 +8732,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.14.1-6.6324",
-            "integrity": "sha512-BHVnNHaBFnvWGgek5ewCMgQMZcs+7l6DjnG5/YjcnCL+Tj0sNCtAwfzj73DbcArGifQyGsku+0krYvnt3YeAXA==",
+            "version": "11.14.1-8.6337",
+            "integrity": "sha512-zOj4+VktLFY8mm/qIPh+PwK9TEVG0sglfrVM3bUE9l2iU3ei8ldd7E9AikSV1O/UWOYWAvbM9PMmQ9M9LCxOaA==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -9551,8 +9551,8 @@
             "license": "MIT"
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.8.32",
-            "integrity": "sha512-OPz5aBThlyLFgxyhdwf/s2+8ab3OvT7AdTNvKHBwpXomIYeXqpUUuT8LrdtxZSsWJ4R4CU1un4XGh5Ez3nlTpw==",
+            "version": "2.9.2",
+            "integrity": "sha512-PxSsosKQjI38iXkmb3d0Y32efqyA0uW4s41u4IVBsLlWLhCiYNpH/AfNOVWRqCQBlD8TFJTz6OUWNd4DFJCnmw==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -9697,8 +9697,8 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.28.0",
-            "integrity": "sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==",
+            "version": "4.28.1",
+            "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
             "dev": true,
             "funding": [
                 {
@@ -9716,11 +9716,11 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "baseline-browser-mapping": "^2.8.25",
-                "caniuse-lite": "^1.0.30001754",
-                "electron-to-chromium": "^1.5.249",
+                "baseline-browser-mapping": "^2.9.0",
+                "caniuse-lite": "^1.0.30001759",
+                "electron-to-chromium": "^1.5.263",
                 "node-releases": "^2.0.27",
-                "update-browserslist-db": "^1.1.4"
+                "update-browserslist-db": "^1.2.0"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -9967,8 +9967,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001757",
-            "integrity": "sha512-r0nnL/I28Zi/yjk1el6ilj27tKcdjLsNqAOZr0yVjWPrSQyHgKI2INaEWw21bAQSv2LXRt1XuCS/GomNpWOxsQ==",
+            "version": "1.0.30001759",
+            "integrity": "sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==",
             "dev": true,
             "funding": [
                 {
@@ -11696,8 +11696,8 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.263",
-            "integrity": "sha512-DrqJ11Knd+lo+dv+lltvfMDLU27g14LMdH2b0O3Pio4uk0x+z7OR+JrmyacTPN2M8w3BrZ7/RTwG3R9B7irPlg==",
+            "version": "1.5.265",
+            "integrity": "sha512-B7IkLR1/AE+9jR2LtVF/1/6PFhY5TlnEHnlrKmGk7PvkJibg5jr+mLXLLzq3QYl6PA1T/vLDthQPqIPAlS/PPA==",
             "dev": true,
             "license": "ISC"
         },
@@ -22305,8 +22305,8 @@
             }
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.1.4",
-            "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
+            "version": "1.2.2",
+            "integrity": "sha512-E85pfNzMQ9jpKkA7+TJAi4TJN+tBCuWh5rUcS/sv6cFi+1q9LYDwDI5dpUL0u/73EElyQ8d3TEaeW4sPedBqYA==",
             "dev": true,
             "funding": [
                 {

package/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "11.14.1-6.6324",
+    "version": "11.14.1-8.6337",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "@wavemaker/angular-app",
-            "version": "11.14.1-6.6324",
+            "version": "11.14.1-8.6337",
             "dependencies": {
                 "@angular/animations": "18.2.13",
                 "@angular/common": "18.2.13",
@@ -23,12 +23,12 @@
                 "@fullcalendar/list": "6.1.18",
                 "@fullcalendar/timegrid": "6.1.18",
                 "@metrichor/jmespath": "0.3.1",
-                "@wavemaker/app-ng-runtime": "11.14.1-6.6324",
-                "@wavemaker/custom-widgets-m3": "11.14.1-6.6324",
+                "@wavemaker/app-ng-runtime": "11.14.1-8.6337",
+                "@wavemaker/custom-widgets-m3": "11.14.1-8.6337",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "11.14.1-6.6324",
+                "@wavemaker/foundation-css": "11.14.1-8.6337",
                 "@wavemaker/nvd3": "1.8.15",
-                "@wavemaker/variables": "11.14.1-6.6324",
+                "@wavemaker/variables": "11.14.1-8.6337",
                 "@ztree/ztree_v3": "3.5.48",
                 "acorn": "^8.15.0",
                 "angular-imask": "7.6.1",
@@ -568,12 +568,12 @@
             }
         },
         "node_modules/@angular-devkit/schematics": {
-            "version": "20.3.12",
-            "integrity": "sha512-JqJ1u59y+Ud51k/8MHYzSP+aQOeC2PJBaDmMnvqfWVaIt6n3x4gc/VtuhqhpJ0SKulbFuOWgAfI6QbPFrgUYQQ==",
+            "version": "20.3.13",
+            "integrity": "sha512-hdMKY4rUTko8xqeWYGnwwDYDomkeOoLsYsP6SdaHWK7hpGvzWsT6Q/aIv8J8NrCYkLu+M+5nLiKOooweUZu3GQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-devkit/core": "20.3.12",
+                "@angular-devkit/core": "20.3.13",
                 "jsonc-parser": "3.3.1",
                 "magic-string": "0.30.17",
                 "ora": "8.2.0",
@@ -586,8 +586,8 @@
             }
         },
         "node_modules/@angular-devkit/schematics/node_modules/@angular-devkit/core": {
-            "version": "20.3.12",
-            "integrity": "sha512-ReFxd/UOoVDr3+kIUjmYILQZF89qg62POdY7a7OqBH7plmInFlYVSEDouJvGqj3LVCPiqTk2ZOSChbhS/eLxXA==",
+            "version": "20.3.13",
+            "integrity": "sha512-/D84T1Caxll3I2sRihPDR9UaWBhF50M+tAX15PdP6uSh/TxwAlLl9p7Rm1bD0mPjPercqaEKA+h9a9qLP16hug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -794,12 +794,12 @@
             }
         },
         "node_modules/@angular-eslint/builder/node_modules/@angular-devkit/architect": {
-            "version": "0.2003.12",
-            "integrity": "sha512-5H40lAFF4CKY32C4HOp6bTlOF1f4WsGCwe7FjFQp9A+T7yoCBiHpIWt2JKTwV4sBoTKVDZOnuf0GG+UVKjQT4A==",
+            "version": "0.2003.13",
+            "integrity": "sha512-JyH6Af6PNC1IHJToColFk1RaXDU87mpPjz7M5sWDfn8bC+KBipw6dSdRkCEuw0D9HY1lZkC9EBV9k9GhpvHjCQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@angular-devkit/core": "20.3.12",
+                "@angular-devkit/core": "20.3.13",
                 "rxjs": "7.8.2"
             },
             "engines": {
@@ -809,8 +809,8 @@
             }
         },
         "node_modules/@angular-eslint/builder/node_modules/@angular-devkit/core": {
-            "version": "20.3.12",
-            "integrity": "sha512-ReFxd/UOoVDr3+kIUjmYILQZF89qg62POdY7a7OqBH7plmInFlYVSEDouJvGqj3LVCPiqTk2ZOSChbhS/eLxXA==",
+            "version": "20.3.13",
+            "integrity": "sha512-/D84T1Caxll3I2sRihPDR9UaWBhF50M+tAX15PdP6uSh/TxwAlLl9p7Rm1bD0mPjPercqaEKA+h9a9qLP16hug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -913,8 +913,8 @@
             }
         },
         "node_modules/@angular-eslint/schematics/node_modules/@angular-devkit/core": {
-            "version": "20.3.12",
-            "integrity": "sha512-ReFxd/UOoVDr3+kIUjmYILQZF89qg62POdY7a7OqBH7plmInFlYVSEDouJvGqj3LVCPiqTk2ZOSChbhS/eLxXA==",
+            "version": "20.3.13",
+            "integrity": "sha512-/D84T1Caxll3I2sRihPDR9UaWBhF50M+tAX15PdP6uSh/TxwAlLl9p7Rm1bD0mPjPercqaEKA+h9a9qLP16hug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -8693,8 +8693,8 @@
             }
         },
         "node_modules/@wavemaker/app-ng-runtime": {
-            "version": "11.14.1-6.6324",
-            "integrity": "sha512-5KsrfmMmR/CSwHJhSpqRjZXCK5v3K8ym14EtTVqLS2HlnNTRWF29rpHLPaCSCTnteo7jtOYTW4cCsD5ivOFfkg==",
+            "version": "11.14.1-8.6337",
+            "integrity": "sha512-MxNZBps4dQ2jCvnDSgvjUYP35oWNx85tgN94ulgnYWKm50ud4skWs+Bgds7nqpzgAF67zZyMi1gwiu5b03lOlA==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.16.1",
@@ -8702,8 +8702,8 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "11.14.1-6.6324",
-            "integrity": "sha512-k354qE5DvPViKkwkFQppikn+T/RjkpyGrMfcM9phITLINb1Yz2aJZqlUwlN9nY4mewZHLihxDyKzZe83pRGChQ==",
+            "version": "11.14.1-8.6337",
+            "integrity": "sha512-WvAvdZJZ3hCuEA2maP/BLY7ToGUfFYXD8mUzjMrA8fp4Mdb4VyzQvZJh2XZLjPCo9CU78JoMGzFK97jwWKYnrQ==",
             "license": "ISC"
         },
         "node_modules/@wavemaker/focus-trap": {
@@ -8716,8 +8716,8 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "11.14.1-6.6324",
-            "integrity": "sha512-CDLgFjC9jvd7/uRzs03SVxFA9FN9mmL1bzREzepWxTVxIG99tO0d5+pR4ibvIUhx1GDQg7tFzZygMa2pZ+sBGA==",
+            "version": "11.14.1-8.6337",
+            "integrity": "sha512-WkE64qSCQmeIAG8L0Qsqn3mTY2sSQxuoFbftMcuk67G57zuVdVfDIuMwO4DwxZYp5lOvOOQ+xGKwM69BC8xtUA==",
             "license": "ISC",
             "dependencies": {
                 "chroma-js": "^3.1.2"
@@ -8732,8 +8732,8 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "11.14.1-6.6324",
-            "integrity": "sha512-BHVnNHaBFnvWGgek5ewCMgQMZcs+7l6DjnG5/YjcnCL+Tj0sNCtAwfzj73DbcArGifQyGsku+0krYvnt3YeAXA==",
+            "version": "11.14.1-8.6337",
+            "integrity": "sha512-zOj4+VktLFY8mm/qIPh+PwK9TEVG0sglfrVM3bUE9l2iU3ei8ldd7E9AikSV1O/UWOYWAvbM9PMmQ9M9LCxOaA==",
             "license": "ISC",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
@@ -9551,8 +9551,8 @@
             "license": "MIT"
         },
         "node_modules/baseline-browser-mapping": {
-            "version": "2.8.32",
-            "integrity": "sha512-OPz5aBThlyLFgxyhdwf/s2+8ab3OvT7AdTNvKHBwpXomIYeXqpUUuT8LrdtxZSsWJ4R4CU1un4XGh5Ez3nlTpw==",
+            "version": "2.9.2",
+            "integrity": "sha512-PxSsosKQjI38iXkmb3d0Y32efqyA0uW4s41u4IVBsLlWLhCiYNpH/AfNOVWRqCQBlD8TFJTz6OUWNd4DFJCnmw==",
             "dev": true,
             "license": "Apache-2.0",
             "bin": {
@@ -9697,8 +9697,8 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.28.0",
-            "integrity": "sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==",
+            "version": "4.28.1",
+            "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==",
             "dev": true,
             "funding": [
                 {
@@ -9716,11 +9716,11 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "baseline-browser-mapping": "^2.8.25",
-                "caniuse-lite": "^1.0.30001754",
-                "electron-to-chromium": "^1.5.249",
+                "baseline-browser-mapping": "^2.9.0",
+                "caniuse-lite": "^1.0.30001759",
+                "electron-to-chromium": "^1.5.263",
                 "node-releases": "^2.0.27",
-                "update-browserslist-db": "^1.1.4"
+                "update-browserslist-db": "^1.2.0"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -9967,8 +9967,8 @@
             }
         },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001757",
-            "integrity": "sha512-r0nnL/I28Zi/yjk1el6ilj27tKcdjLsNqAOZr0yVjWPrSQyHgKI2INaEWw21bAQSv2LXRt1XuCS/GomNpWOxsQ==",
+            "version": "1.0.30001759",
+            "integrity": "sha512-Pzfx9fOKoKvevQf8oCXoyNRQ5QyxJj+3O0Rqx2V5oxT61KGx8+n6hV/IUyJeifUci2clnmmKVpvtiqRzgiWjSw==",
             "dev": true,
             "funding": [
                 {
@@ -11696,8 +11696,8 @@
             "license": "MIT"
         },
         "node_modules/electron-to-chromium": {
-            "version": "1.5.263",
-            "integrity": "sha512-DrqJ11Knd+lo+dv+lltvfMDLU27g14LMdH2b0O3Pio4uk0x+z7OR+JrmyacTPN2M8w3BrZ7/RTwG3R9B7irPlg==",
+            "version": "1.5.265",
+            "integrity": "sha512-B7IkLR1/AE+9jR2LtVF/1/6PFhY5TlnEHnlrKmGk7PvkJibg5jr+mLXLLzq3QYl6PA1T/vLDthQPqIPAlS/PPA==",
             "dev": true,
             "license": "ISC"
         },
@@ -22305,8 +22305,8 @@
             }
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.1.4",
-            "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
+            "version": "1.2.2",
+            "integrity": "sha512-E85pfNzMQ9jpKkA7+TJAi4TJN+tBCuWh5rUcS/sv6cFi+1q9LYDwDI5dpUL0u/73EElyQ8d3TEaeW4sPedBqYA==",
             "dev": true,
             "funding": [
                 {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-app",
-    "version": "11.14.1-6.6324",
+    "version": "11.14.1-8.6337",
     "scripts": {
         "ng": "ng",
         "start": "./node_modules/.bin/ng serve",
@@ -36,11 +36,11 @@
         "@fullcalendar/list": "6.1.18",
         "@fullcalendar/timegrid": "6.1.18",
         "@metrichor/jmespath": "0.3.1",
-        "@wavemaker/custom-widgets-m3": "11.14.1-6.6324",
+        "@wavemaker/custom-widgets-m3": "11.14.1-8.6337",
         "@wavemaker/focus-trap": "1.0.1",
-        "@wavemaker/foundation-css": "11.14.1-6.6324",
+        "@wavemaker/foundation-css": "11.14.1-8.6337",
         "@wavemaker/nvd3": "1.8.15",
-        "@wavemaker/variables": "11.14.1-6.6324",
+        "@wavemaker/variables": "11.14.1-8.6337",
         "@ztree/ztree_v3": "3.5.48",
         "acorn": "^8.15.0",
         "angular-imask": "7.6.1",
@@ -62,7 +62,7 @@
         "tslib": "2.8.1",
         "x2js": "3.4.4",
         "zone.js": "0.15.1",
-        "@wavemaker/app-ng-runtime": "11.14.1-6.6324"
+        "@wavemaker/app-ng-runtime": "11.14.1-8.6337"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",