@wavemaker/angular-codegen 11.2.0-next.140251 → 11.2.0-next.140402

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

@@ -5950,6 +5950,26 @@
       "resolved": "https://registry.npmjs.org/@wavemaker.com/nvd3/-/nvd3-1.0.0.tgz",
       "integrity": "sha512-KwdblvQbf0k51JYt1SJIhhkoQflWsOfgb6MVT9I/kDFpGmm5Z71PXOTNwOGnBFvuqGH6AJVQoM7StE0IK6OmXQ=="
     },
+    "@wavemaker/variables": {
+      "version": "11.2.0-next.140402",
+      "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.2.0-next.140402.tgz",
+      "integrity": "sha512-mZrdL2EO7uKaeKsHRXzHtROpOrGO2leO0TEOv6wgJ80/QghayrG00ww1tF5p4FUfP2cQGq60dsqIohbR7KSydA==",
+      "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"
+          }
+        }
+      }
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -6150,6 +6170,11 @@
         "@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",

angular-codegen/angular-app/package.json

@@ -46,6 +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.140402",
         "angular-imask": "6.0.4",
         "angular2-websocket": "0.9.7",
         "core-js": "2.5.4",
@@ -69,7 +70,7 @@
         "tslib": "^2.0.0",
         "x2js": "3.2.6",
         "zone.js": "~0.11.4",
-        "@wavemaker/app-ng-runtime": "11.2.0-next.140251"
+        "@wavemaker/app-ng-runtime": "11.2.0-next.140402"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "0.8.5",

angular-codegen/angular-app/tsconfig.json

@@ -37,6 +37,9 @@
             "@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,41 +46638,42 @@ const validateDataSourceCtx = (ds, ctx) => {
  * @param name name of the variable
  * @param context scope of the variable
  */
-const processFilterExpBindNode = (context, filterExpressions) => {
+const processFilterExpBindNode = (context, filterExpressions, variable) => {
     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, {}, (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) }));
+            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, variable ? variable.invokeOnFiltertExpressionChange.bind(variable, obj, targetNodeKey) : listener, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
         }
     };
     const traverseFilterExpressions = expressions => {

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

@@ -42716,41 +42716,42 @@ const validateDataSourceCtx = (ds, ctx) => {
  * @param name name of the variable
  * @param context scope of the variable
  */
-const processFilterExpBindNode = (context, filterExpressions) => {
+const processFilterExpBindNode = (context, filterExpressions, variable) => {
     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, {}, (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) }));
+            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, variable ? variable.invokeOnFiltertExpressionChange.bind(variable, obj, targetNodeKey) : listener, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
         }
     };
     const traverseFilterExpressions = expressions => {

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

@@ -42716,41 +42716,42 @@ const validateDataSourceCtx = (ds, ctx) => {
  * @param name name of the variable
  * @param context scope of the variable
  */
-const processFilterExpBindNode = (context, filterExpressions) => {
+const processFilterExpBindNode = (context, filterExpressions, variable) => {
     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, {}, (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) }));
+            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, variable ? variable.invokeOnFiltertExpressionChange.bind(variable, obj, targetNodeKey) : listener, 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.140251",
+    "version": "11.2.0-next.140402",
     "description": "",
     "main": "index.js",
     "scripts": {