@wavemaker/angular-codegen 11.2.0-next.140404 → 11.2.0-next.140751

angular-codegen/angular-app/angular.json

@@ -82,7 +82,9 @@
                             "./node_modules/hammerjs/hammer.min.js",
                             "./node_modules/iscroll/build/iscroll.js",
                             "./node_modules/js-cookie/src/js.cookie.js",
-                            "./node_modules/jssha/dist/sha256.js"
+                            "./node_modules/jssha/dist/sha256.js",
+                            "./node_modules/tabbable/dist/index.min.js",
+                            "./node_modules/@wavemaker/focus-trap/dist/focus-trap.min.js"
                         ]
                     },
                     "configurations": {
@@ -177,7 +179,9 @@
                             "./node_modules/hammerjs/hammer.min.js",
                             "./node_modules/iscroll/build/iscroll.js",
                             "./node_modules/js-cookie/src/js.cookie.js",
-                            "./node_modules/jssha/dist/sha256.js"
+                            "./node_modules/jssha/dist/sha256.js",
+                            "./node_modules/tabbable/dist/index.min.js",
+                            "./node_modules/@wavemaker/focus-trap/dist/focus-trap.min.js"
                         ],
                         "aot": false,
                         "vendorChunk": true,

angular-codegen/angular-app/package-lock.json

@@ -5950,24 +5950,13 @@
       "resolved": "https://registry.npmjs.org/@wavemaker.com/nvd3/-/nvd3-1.0.0.tgz",
       "integrity": "sha512-KwdblvQbf0k51JYt1SJIhhkoQflWsOfgb6MVT9I/kDFpGmm5Z71PXOTNwOGnBFvuqGH6AJVQoM7StE0IK6OmXQ=="
     },
-    "@wavemaker/variables": {
-      "version": "11.2.0-next.140404",
-      "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.2.0-next.140404.tgz",
-      "integrity": "sha512-pubCyxYgoDlU9xxJsT8ynt/D4QeVX8P0wqh9cYPG2AkpT9SRkfdIMv8o+XgL72qHZ4isoOnbaYsRKBKiYvTRcw==",
+    "@wavemaker/focus-trap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@wavemaker/focus-trap/-/focus-trap-1.0.0.tgz",
+      "integrity": "sha512-ZGQxxL2gdF07h+1nyOzK0jO9QAduv74vBHH42GMV4uHjQvPfuWClwXQEtyBukkX5EXAuOLZNc5X4AWSvOsz0eA==",
       "requires": {
-        "@metrichor/jmespath": "^0.3.1",
-        "lodash": "^4.17.21",
-        "x2js": "^3.4.3"
-      },
-      "dependencies": {
-        "x2js": {
-          "version": "3.4.4",
-          "resolved": "https://registry.npmjs.org/x2js/-/x2js-3.4.4.tgz",
-          "integrity": "sha512-yG/ThaBCgnsa3aoMPAe7QwDpcyU4D70hjXC4Y1lZSfD/Tgd0MpE19FnZZRAjekryw0c8cffpOt9zsPEiqktO6Q==",
-          "requires": {
-            "@xmldom/xmldom": "^0.8.3"
-          }
-        }
+        "tabbable": "^6.0.1",
+        "yarn": "^1.22.19"
       }
     },
     "@webassemblyjs/ast": {
@@ -6170,11 +6159,6 @@
         "@xtuc/long": "4.2.2"
       }
     },
-    "@xmldom/xmldom": {
-      "version": "0.8.6",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.6.tgz",
-      "integrity": "sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg=="
-    },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
@@ -20375,6 +20359,11 @@
       "integrity": "sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==",
       "dev": true
     },
+    "tabbable": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.0.1.tgz",
+      "integrity": "sha512-SYJSIgeyXW7EuX1ytdneO5e8jip42oHWg9xl/o3oTYhmXusZVgiA+VlPvjIN+kHii9v90AmzTZEBcsEvuAY+TA=="
+    },
     "tapable": {
       "version": "2.2.1",
       "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz",
@@ -23175,6 +23164,11 @@
         }
       }
     },
+    "yarn": {
+      "version": "1.22.19",
+      "resolved": "https://registry.npmjs.org/yarn/-/yarn-1.22.19.tgz",
+      "integrity": "sha512-/0V5q0WbslqnwP91tirOvldvYISzaqhClxzyUKXYxs07yUILIs5jx/k6CFe8bvKSkds5w+eiOqta39Wk3WxdcQ=="
+    },
     "yauzl": {
       "version": "2.10.0",
       "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",

angular-codegen/angular-app/package.json

@@ -46,7 +46,7 @@
         "@awesome-cordova-plugins/vibration": "5.39.1",
         "@metrichor/jmespath": "^0.3.1",
         "@wavemaker.com/nvd3": "1.0.0",
-        "@wavemaker/variables": "11.2.0-next.140404",
+        "@wavemaker/focus-trap": "^1.0.0",
         "angular-imask": "6.0.4",
         "angular2-websocket": "0.9.7",
         "core-js": "2.5.4",
@@ -70,7 +70,7 @@
         "tslib": "^2.0.0",
         "x2js": "3.2.6",
         "zone.js": "~0.11.4",
-        "@wavemaker/app-ng-runtime": "11.2.0-next.140404"
+        "@wavemaker/app-ng-runtime": "11.2.0-next.140751"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "0.8.5",

angular-codegen/angular-app/tsconfig.json

@@ -37,9 +37,6 @@
             "@wm/core": [
                 "node_modules/@wavemaker/app-ng-runtime/core"
             ],
-            "@wavemaker/variables": [
-                "node_modules/@wavemaker/variables/"
-            ],
             "@wm/components/base": [
                 "node_modules/@wavemaker/app-ng-runtime/components/base"
             ],

angular-codegen/dependencies/pipe-provider.cjs.js

@@ -46638,42 +46638,41 @@ const validateDataSourceCtx = (ds, ctx) => {
  * @param name name of the variable
  * @param context scope of the variable
  */
-const processFilterExpBindNode = (context, filterExpressions, variable) => {
+const processFilterExpBindNode = (context, filterExpressions) => {
     const destroyFn = context.registerDestroyListener ? context.registerDestroyListener.bind(context) : _.noop;
     const filter$ = new Subject();
     const bindFilExpObj = (obj, targetNodeKey) => {
-        const listener = (newVal, oldVal) => {
-            if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
-                return;
-            }
-            // Skip cloning for blob column
-            if (!_.includes(['blob', 'file'], obj.type)) {
-                newVal = getClonedObject(newVal);
-            }
-            // backward compatibility: where we are allowing the user to bind complete object
-            if (obj.target === 'dataBinding') {
-                // remove the existing databinding element
-                filterExpressions.rules = [];
-                // now add all the returned values
-                _.forEach(newVal, function (value, target) {
-                    filterExpressions.rules.push({
-                        'target': target,
-                        'value': value,
-                        'matchMode': obj.matchMode || 'startignorecase',
-                        'required': false,
-                        'type': ''
-                    });
-                });
-            }
-            else {
-                // setting value to the root node
-                obj[targetNodeKey] = newVal;
-            }
-            filter$.next({ filterExpressions, newVal });
-        };
         if (stringStartsWith(obj[targetNodeKey], 'bind:')) {
             // [Todo-CSP]: needs a check, where is this used
-            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, variable ? variable.invokeOnFiltertExpressionChange.bind(variable, obj, targetNodeKey) : listener, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
+            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, (newVal, oldVal) => {
+                if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
+                    return;
+                }
+                // Skip cloning for blob column
+                if (!_.includes(['blob', 'file'], obj.type)) {
+                    newVal = getClonedObject(newVal);
+                }
+                // backward compatibility: where we are allowing the user to bind complete object
+                if (obj.target === 'dataBinding') {
+                    // remove the existing databinding element
+                    filterExpressions.rules = [];
+                    // now add all the returned values
+                    _.forEach(newVal, function (value, target) {
+                        filterExpressions.rules.push({
+                            'target': target,
+                            'value': value,
+                            'matchMode': obj.matchMode || 'startignorecase',
+                            'required': false,
+                            'type': ''
+                        });
+                    });
+                }
+                else {
+                    // setting value to the root node
+                    obj[targetNodeKey] = newVal;
+                }
+                filter$.next({ filterExpressions, newVal });
+            }, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
         }
     };
     const traverseFilterExpressions = expressions => {
@@ -69522,17 +69521,17 @@ ToDatePipe.ctorParameters = () => [
     { type: AbstractI18nService }
 ];
 class ToNumberPipe {
-    constructor(decimalPipe, i18Service) {
+    constructor(decimalPipe, i18nService) {
         this.decimalPipe = decimalPipe;
-        this.i18Service = i18Service;
+        this.i18nService = i18nService;
     }
     transform(data, fracSize) {
         if (fracSize && !String(fracSize).match(/^(\d+)?\.((\d+)(-(\d+))?)?$/)) {
             fracSize = '1.' + fracSize + '-' + fracSize;
         }
         if (!_.isNaN(+data)) {
-            const locale = this.i18Service.getwidgetLocale() ? this.i18Service.getwidgetLocale() : undefined;
-            const formattedLocale = locale ? locale['number'] : undefined;
+            const locale = this.i18nService && this.i18nService.getwidgetLocale() ? this.i18nService.getwidgetLocale() : undefined;
+            const formattedLocale = locale ? locale['number'] : null;
             return this.decimalPipe.transform(data, fracSize, formattedLocale);
         }
     }
@@ -69547,13 +69546,13 @@ ToNumberPipe.ctorParameters = () => [
     { type: AbstractI18nService, decorators: [{ type: Inject$1, args: [AbstractI18nService,] }] }
 ];
 class ToCurrencyPipe {
-    constructor(decimalPipe, i18Service) {
+    constructor(decimalPipe, i18nService) {
         this.decimalPipe = decimalPipe;
-        this.i18Service = i18Service;
+        this.i18nService = i18nService;
     }
     transform(data, currencySymbol, fracSize) {
         const _currencySymbol = (CURRENCY_INFO[currencySymbol] || {}).symbol || currencySymbol || '';
-        let _val = new ToNumberPipe(this.decimalPipe, this.i18Service).transform(data, fracSize);
+        let _val = new ToNumberPipe(this.decimalPipe, this.i18nService).transform(data, fracSize);
         const isNegativeNumber = _.startsWith(_val, '-');
         if (isNegativeNumber) {
             _val = _val.replace('-', '');

angular-codegen/dependencies/transpilation-mobile.cjs.js

@@ -42716,42 +42716,41 @@ const validateDataSourceCtx = (ds, ctx) => {
  * @param name name of the variable
  * @param context scope of the variable
  */
-const processFilterExpBindNode = (context, filterExpressions, variable) => {
+const processFilterExpBindNode = (context, filterExpressions) => {
     const destroyFn = context.registerDestroyListener ? context.registerDestroyListener.bind(context) : _.noop;
     const filter$ = new Subject();
     const bindFilExpObj = (obj, targetNodeKey) => {
-        const listener = (newVal, oldVal) => {
-            if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
-                return;
-            }
-            // Skip cloning for blob column
-            if (!_.includes(['blob', 'file'], obj.type)) {
-                newVal = getClonedObject(newVal);
-            }
-            // backward compatibility: where we are allowing the user to bind complete object
-            if (obj.target === 'dataBinding') {
-                // remove the existing databinding element
-                filterExpressions.rules = [];
-                // now add all the returned values
-                _.forEach(newVal, function (value, target) {
-                    filterExpressions.rules.push({
-                        'target': target,
-                        'value': value,
-                        'matchMode': obj.matchMode || 'startignorecase',
-                        'required': false,
-                        'type': ''
-                    });
-                });
-            }
-            else {
-                // setting value to the root node
-                obj[targetNodeKey] = newVal;
-            }
-            filter$.next({ filterExpressions, newVal });
-        };
         if (stringStartsWith(obj[targetNodeKey], 'bind:')) {
             // [Todo-CSP]: needs a check, where is this used
-            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, variable ? variable.invokeOnFiltertExpressionChange.bind(variable, obj, targetNodeKey) : listener, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
+            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, (newVal, oldVal) => {
+                if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
+                    return;
+                }
+                // Skip cloning for blob column
+                if (!_.includes(['blob', 'file'], obj.type)) {
+                    newVal = getClonedObject(newVal);
+                }
+                // backward compatibility: where we are allowing the user to bind complete object
+                if (obj.target === 'dataBinding') {
+                    // remove the existing databinding element
+                    filterExpressions.rules = [];
+                    // now add all the returned values
+                    _.forEach(newVal, function (value, target) {
+                        filterExpressions.rules.push({
+                            'target': target,
+                            'value': value,
+                            'matchMode': obj.matchMode || 'startignorecase',
+                            'required': false,
+                            'type': ''
+                        });
+                    });
+                }
+                else {
+                    // setting value to the root node
+                    obj[targetNodeKey] = newVal;
+                }
+                filter$.next({ filterExpressions, newVal });
+            }, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
         }
     };
     const traverseFilterExpressions = expressions => {

angular-codegen/dependencies/transpilation-web.cjs.js

@@ -42716,42 +42716,41 @@ const validateDataSourceCtx = (ds, ctx) => {
  * @param name name of the variable
  * @param context scope of the variable
  */
-const processFilterExpBindNode = (context, filterExpressions, variable) => {
+const processFilterExpBindNode = (context, filterExpressions) => {
     const destroyFn = context.registerDestroyListener ? context.registerDestroyListener.bind(context) : _.noop;
     const filter$ = new Subject();
     const bindFilExpObj = (obj, targetNodeKey) => {
-        const listener = (newVal, oldVal) => {
-            if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
-                return;
-            }
-            // Skip cloning for blob column
-            if (!_.includes(['blob', 'file'], obj.type)) {
-                newVal = getClonedObject(newVal);
-            }
-            // backward compatibility: where we are allowing the user to bind complete object
-            if (obj.target === 'dataBinding') {
-                // remove the existing databinding element
-                filterExpressions.rules = [];
-                // now add all the returned values
-                _.forEach(newVal, function (value, target) {
-                    filterExpressions.rules.push({
-                        'target': target,
-                        'value': value,
-                        'matchMode': obj.matchMode || 'startignorecase',
-                        'required': false,
-                        'type': ''
-                    });
-                });
-            }
-            else {
-                // setting value to the root node
-                obj[targetNodeKey] = newVal;
-            }
-            filter$.next({ filterExpressions, newVal });
-        };
         if (stringStartsWith(obj[targetNodeKey], 'bind:')) {
             // [Todo-CSP]: needs a check, where is this used
-            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, variable ? variable.invokeOnFiltertExpressionChange.bind(variable, obj, targetNodeKey) : listener, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
+            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, (newVal, oldVal) => {
+                if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
+                    return;
+                }
+                // Skip cloning for blob column
+                if (!_.includes(['blob', 'file'], obj.type)) {
+                    newVal = getClonedObject(newVal);
+                }
+                // backward compatibility: where we are allowing the user to bind complete object
+                if (obj.target === 'dataBinding') {
+                    // remove the existing databinding element
+                    filterExpressions.rules = [];
+                    // now add all the returned values
+                    _.forEach(newVal, function (value, target) {
+                        filterExpressions.rules.push({
+                            'target': target,
+                            'value': value,
+                            'matchMode': obj.matchMode || 'startignorecase',
+                            'required': false,
+                            'type': ''
+                        });
+                    });
+                }
+                else {
+                    // setting value to the root node
+                    obj[targetNodeKey] = newVal;
+                }
+                filter$.next({ filterExpressions, newVal });
+            }, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
         }
     };
     const traverseFilterExpressions = expressions => {

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.2.0-next.140404",
+    "version": "11.2.0-next.140751",
     "description": "",
     "main": "index.js",
     "scripts": {