@wavemaker/angular-codegen 11.0.1-next.139250 → 11.0.1-next.139254

angular-codegen/angular-app/package.json

@@ -68,7 +68,7 @@
         "tslib": "^2.0.0",
         "x2js": "3.2.6",
         "zone.js": "~0.10.3",
-        "@wavemaker/app-ng-runtime": "11.0.1-next.139250"
+        "@wavemaker/app-ng-runtime": "11.0.1-next.139254"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "0.8.5",

angular-codegen/dependencies/expression-parser.cjs.js

@@ -17619,9 +17619,15 @@ function $parseExpr(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!boundFn) {
-        // If CSP enabled, avoid multiple browser errors. [What do we say to death, NOT TODAY!]
+        // If CSP enabled, function def not found from the generated fn expressions for the page.
+        // Handle bind expressions used internally inside WM components. e.g. wmAnchor used inside nav.comp.html
         if (isCSPEnabled()) {
-            boundFn = noop;
+            boundFn = function (ctx, locals) {
+                // handle internal bindings for wm widgets used inside a component
+                let _ctx = Object.assign({}, locals);
+                Object.setPrototypeOf(_ctx, ctx);
+                return _.get(_ctx, expr);
+            };
         }
         else {
             const parser = new Parser$1(new Lexer);
@@ -17672,6 +17678,23 @@ function $parseExpr(expr, defOnly) {
     exprFnCache.set(expr, boundFn);
     return boundFn;
 }
+function simpleFunctionEvaluator(expr, ctx, locals) {
+    let _ctx = Object.assign({}, locals);
+    Object.setPrototypeOf(_ctx, ctx);
+    let parts = expr.split('(');
+    let fnName = parts[0];
+    let computedFn = _.get(ctx, fnName);
+    if (computedFn) {
+        let args = parts[1].replace(')', '');
+        args = args.split(',');
+        let computedArgs = [];
+        args.forEach((arg) => {
+            arg = arg && arg.trim();
+            computedArgs.push(_.get(_ctx, arg));
+        });
+        return computedFn.bind(_ctx)(...computedArgs);
+    }
+}
 function $parseEvent(expr, defOnly) {
     if (!isString(expr)) {
         return noop;
@@ -17690,7 +17713,7 @@ function $parseEvent(expr, defOnly) {
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!fn) {
         if (isCSPEnabled()) {
-            fn = noop;
+            fn = simpleFunctionEvaluator.bind(undefined, expr);
         }
         else {
             const parser = new Parser$1(new Lexer);
@@ -17714,7 +17737,6 @@ const getFnByExpr = (expr) => fnNameMap.get(expr);
 const fnExecutor = (expr, exprType) => {
     let fn = getFnByExpr(expr);
     if (!fn) {
-        console.warn("didn't find fn for the expr: ", expr, ". Falling back to runtime evaluation");
         return;
     }
     const usedPipes = fn.usedPipes || [];

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

@@ -42703,9 +42703,15 @@ function $parseExpr(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!boundFn) {
-        // If CSP enabled, avoid multiple browser errors. [What do we say to death, NOT TODAY!]
+        // If CSP enabled, function def not found from the generated fn expressions for the page.
+        // Handle bind expressions used internally inside WM components. e.g. wmAnchor used inside nav.comp.html
         if (isCSPEnabled()) {
-            boundFn = noop$1$1;
+            boundFn = function (ctx, locals) {
+                // handle internal bindings for wm widgets used inside a component
+                let _ctx = Object.assign({}, locals);
+                Object.setPrototypeOf(_ctx, ctx);
+                return _.get(_ctx, expr);
+            };
         }
         else {
             const parser = new Parser$1(new Lexer);
@@ -42756,6 +42762,23 @@ function $parseExpr(expr, defOnly) {
     exprFnCache.set(expr, boundFn);
     return boundFn;
 }
+function simpleFunctionEvaluator(expr, ctx, locals) {
+    let _ctx = Object.assign({}, locals);
+    Object.setPrototypeOf(_ctx, ctx);
+    let parts = expr.split('(');
+    let fnName = parts[0];
+    let computedFn = _.get(ctx, fnName);
+    if (computedFn) {
+        let args = parts[1].replace(')', '');
+        args = args.split(',');
+        let computedArgs = [];
+        args.forEach((arg) => {
+            arg = arg && arg.trim();
+            computedArgs.push(_.get(_ctx, arg));
+        });
+        return computedFn.bind(_ctx)(...computedArgs);
+    }
+}
 function $parseEvent(expr, defOnly) {
     if (!isString$1(expr)) {
         return noop$1$1;
@@ -42774,7 +42797,7 @@ function $parseEvent(expr, defOnly) {
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!fn) {
         if (isCSPEnabled()) {
-            fn = noop$1$1;
+            fn = simpleFunctionEvaluator.bind(undefined, expr);
         }
         else {
             const parser = new Parser$1(new Lexer);
@@ -42794,7 +42817,6 @@ const getFnByExpr = (expr) => fnNameMap.get(expr);
 const fnExecutor = (expr, exprType) => {
     let fn = getFnByExpr(expr);
     if (!fn) {
-        console.warn("didn't find fn for the expr: ", expr, ". Falling back to runtime evaluation");
         return;
     }
     const usedPipes = fn.usedPipes || [];

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

@@ -38691,9 +38691,15 @@ function $parseExpr(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!boundFn) {
-        // If CSP enabled, avoid multiple browser errors. [What do we say to death, NOT TODAY!]
+        // If CSP enabled, function def not found from the generated fn expressions for the page.
+        // Handle bind expressions used internally inside WM components. e.g. wmAnchor used inside nav.comp.html
         if (isCSPEnabled()) {
-            boundFn = noop$1$1;
+            boundFn = function (ctx, locals) {
+                // handle internal bindings for wm widgets used inside a component
+                let _ctx = Object.assign({}, locals);
+                Object.setPrototypeOf(_ctx, ctx);
+                return _.get(_ctx, expr);
+            };
         }
         else {
             const parser = new Parser$1(new Lexer);
@@ -38744,6 +38750,23 @@ function $parseExpr(expr, defOnly) {
     exprFnCache.set(expr, boundFn);
     return boundFn;
 }
+function simpleFunctionEvaluator(expr, ctx, locals) {
+    let _ctx = Object.assign({}, locals);
+    Object.setPrototypeOf(_ctx, ctx);
+    let parts = expr.split('(');
+    let fnName = parts[0];
+    let computedFn = _.get(ctx, fnName);
+    if (computedFn) {
+        let args = parts[1].replace(')', '');
+        args = args.split(',');
+        let computedArgs = [];
+        args.forEach((arg) => {
+            arg = arg && arg.trim();
+            computedArgs.push(_.get(_ctx, arg));
+        });
+        return computedFn.bind(_ctx)(...computedArgs);
+    }
+}
 function $parseEvent(expr, defOnly) {
     if (!isString$1(expr)) {
         return noop$1$1;
@@ -38762,7 +38785,7 @@ function $parseEvent(expr, defOnly) {
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!fn) {
         if (isCSPEnabled()) {
-            fn = noop$1$1;
+            fn = simpleFunctionEvaluator.bind(undefined, expr);
         }
         else {
             const parser = new Parser$1(new Lexer);
@@ -38782,7 +38805,6 @@ const getFnByExpr = (expr) => fnNameMap.get(expr);
 const fnExecutor = (expr, exprType) => {
     let fn = getFnByExpr(expr);
     if (!fn) {
-        console.warn("didn't find fn for the expr: ", expr, ". Falling back to runtime evaluation");
         return;
     }
     const usedPipes = fn.usedPipes || [];

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

@@ -38691,9 +38691,15 @@ function $parseExpr(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!boundFn) {
-        // If CSP enabled, avoid multiple browser errors. [What do we say to death, NOT TODAY!]
+        // If CSP enabled, function def not found from the generated fn expressions for the page.
+        // Handle bind expressions used internally inside WM components. e.g. wmAnchor used inside nav.comp.html
         if (isCSPEnabled()) {
-            boundFn = noop$1$1;
+            boundFn = function (ctx, locals) {
+                // handle internal bindings for wm widgets used inside a component
+                let _ctx = Object.assign({}, locals);
+                Object.setPrototypeOf(_ctx, ctx);
+                return _.get(_ctx, expr);
+            };
         }
         else {
             const parser = new Parser$1(new Lexer);
@@ -38744,6 +38750,23 @@ function $parseExpr(expr, defOnly) {
     exprFnCache.set(expr, boundFn);
     return boundFn;
 }
+function simpleFunctionEvaluator(expr, ctx, locals) {
+    let _ctx = Object.assign({}, locals);
+    Object.setPrototypeOf(_ctx, ctx);
+    let parts = expr.split('(');
+    let fnName = parts[0];
+    let computedFn = _.get(ctx, fnName);
+    if (computedFn) {
+        let args = parts[1].replace(')', '');
+        args = args.split(',');
+        let computedArgs = [];
+        args.forEach((arg) => {
+            arg = arg && arg.trim();
+            computedArgs.push(_.get(_ctx, arg));
+        });
+        return computedFn.bind(_ctx)(...computedArgs);
+    }
+}
 function $parseEvent(expr, defOnly) {
     if (!isString$1(expr)) {
         return noop$1$1;
@@ -38762,7 +38785,7 @@ function $parseEvent(expr, defOnly) {
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!fn) {
         if (isCSPEnabled()) {
-            fn = noop$1$1;
+            fn = simpleFunctionEvaluator.bind(undefined, expr);
         }
         else {
             const parser = new Parser$1(new Lexer);
@@ -38782,7 +38805,6 @@ const getFnByExpr = (expr) => fnNameMap.get(expr);
 const fnExecutor = (expr, exprType) => {
     let fn = getFnByExpr(expr);
     if (!fn) {
-        console.warn("didn't find fn for the expr: ", expr, ". Falling back to runtime evaluation");
         return;
     }
     const usedPipes = fn.usedPipes || [];

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.0.1-next.139250",
+    "version": "11.0.1-next.139254",
     "description": "",
     "main": "index.js",
     "scripts": {

angular-codegen/src/expr-parser-utils.js

@@ -1 +1 @@
-const{getHandlebarTemplate:getHandlebarTemplate,safeString:safeString}=require("./handlebar-helpers"),cheerio=require("cheerio");let processedPageExpr=[];const isDisplayExpressionAttr=e=>{return["displayexpression","displaylabel","displayimagesrc","nodelabel","nodeicon","nodechildren","nodeid","itemid","itemlabel","itemicon","itemaction","itembadge","itemchildren","itemlink","itemtarget","userrole","isactive"].includes(e)},checkIsCustomPipeExpression=function(e){let r=e.match(/(custom(\s*:))/g);return r&&r.length},updateBindExpressionForDisplayexpression=e=>{let r,t,n,i,s,a,o,l,p,d="";for(checkIsCustomPipeExpression(e)&&(e+=": __1"),e=e.replace(/\$\[data\[\$i\]/g,"$[__1"),n=0;n<e.length;n++)if(r=e[n],t=e[n+1],"$"===r&&"["===t){for(a=1,p=!1,o=!1,i=n+2;i<e.length;i++)if(" "!==(s=e[i])&&(p||(o='"'===e[i]||"'"===e[i],p=!0),"["===s?a++:"]"===s&&a--,!a)){l=e.substring(n+2,i),d+=o?"__1["+l+"]":l;break}n=i}else d+=r;return d},updateArrTypeExpr=(e,r,t)=>{let n=/\[\$i\]/g;return isArrayTypeProperty(r,t)?e.substr(0,e.lastIndexOf("[$i]")).replace("[$i]","[0]"):e.replace(n,"[0]")},isArrayTypeProperty=(e,r)=>{const t=r?r.attribs:{};return["dataset","dataoptions","customcolors"].includes(e)||"datavalue"===e&&void 0!==t.wmcheckbox||"selecteditem"===e&&void 0!==t.wmtable||"selecteditem"===e&&void 0!==t.wmlist||"datavalue"===e&&t.wmselect&&t.multiple},getFnForExpr=(e,r)=>{let t=(r=r||{}).isEvent,n=r.widgetNode,i=r.prop;if(t||-1===e.indexOf("[$i]")||(e=updateArrTypeExpr(e,i,n)),processedPageExpr.includes(e))return"";processedPageExpr.push(e);let s,a="";const o=require("../dependencies/expression-parser.cjs");s=t?o.$parseEvent(e,!0):o.$parseExpr(e,!0);const l=safeString(s.fnArgs),p=safeString(s.fnBody),d=s.pipes||[];d.forEach((e,r)=>{a+="["+e.reduce((e,r)=>"'"+e+"','"+r+"'")+"]"+(r<d.length?",":"")}),a=safeString(a);const c=safeString(e.replace(/"/g,'\\"'));return getHandlebarTemplate("expr-vs-fn")({expr:c,fnArgs:l,fnBody:p,fnPipes:a})+","},getExprForBinding=e=>{let r="";return"string"==typeof e&&e.startsWith("bind:")&&(r=getFnForExpr(e.replace("bind:",""))),r},generateFilterExprBindings=e=>{let r="";return e.rules&&_.forEach(e.rules,(e,t)=>{e.rules?r+=generateFilterExprBindings(e):("between"===e.matchMode&&(r+=getExprForBinding(e.secondvalue)),r+=getExprForBinding(e.value))}),r},getCRUDVariableExpressions=e=>{let r=e.dataBinding||{},t="";for(let e in r){(r[e]||[]).forEach(e=>{t+=getExprForBinding(e.value)})}return t},generateVariableExpressions=e=>{let r="";e=JSON.parse(e);const t=["onBefore","onBeforeUpdate","onResult","onBeforeOpen","onOpen","onBeforeMessageSend","onMessageReceive","onProgress","onError","onBeforeDatasetReady","onCanUpdate","onClick","onHide","onOk","onCancel","onBeforeClose","onClose","onTimerFire","onSuccess","onOnline","onOffline"];for(const n in e){const i=e[n];if("wm.LiveVariable"===i.category&&"read"===i.operation)r+=generateFilterExprBindings(i.filterExpressions);else if("wm.CrudVariable"===i.category)r+=getCRUDVariableExpressions(i);else{(i.dataBinding||[]).forEach(e=>{r+=getExprForBinding(e.value)})}t.forEach(e=>{i[e]&&(r+=getFnForExpr(i[e],{isEvent:!0}))})}return r},generateExtraWidgetBindings=(e,r)=>{let t="";switch(r){case"wmalertdialog":t+=getFnForExpr("oktext");break;case"wmconfirmdialog":t+=getFnForExpr("oktext"),t+=getFnForExpr("canceltext");break;case"wmtable":t+=e.attribs.rowngclass?getFnForExpr(e.attribs.rowngclass):"";break;case"wmtablecolumn":t+=e.attribs["col-ng-class"]?getFnForExpr(e.attribs["col-ng-class"]):""}return t},isActionTypeNode=e=>["wmtableaction","wmtablerowaction","wmformaction"].some(r=>void 0!==e.attribs[r]),generatePageExpressions=(e,r,t)=>{let n,i,s="";const a=cheerio.load(e);if(processedPageExpr.length=0,a("*").each((e,r)=>{for(let e in r.attribs)e.endsWith(".bind")?(i=e.replace(".bind",""),n=r.attribs[e],isDisplayExpressionAttr(i)&&(n=updateBindExpressionForDisplayexpression(n),console.log("++++++++displayexpressoin binding updated",n)),s+=getFnForExpr(n,{prop:i,widgetNode:r})):e.endsWith(".event")?(i=e.replace(".event",""),n=r.attribs[e],s+=getFnForExpr(n,{isEvent:!0})):"displayexpression"===e?(n=r.attribs[e],s+=getFnForExpr(n)):"action"===e&&isActionTypeNode(r)&&(n=r.attribs[e],console.warn("<<<<<<<<found action node",n),s+=getFnForExpr(n));["wmalertdialog","wmconfirmdialog","wmtable","wmtablecolumn"].forEach(e=>{void 0!==r.attribs[e]&&(s+=generateExtraWidgetBindings(r,e))})}),s+=generateVariableExpressions(r),t){const e=(t=JSON.parse(t.toString())).properties||{};Object.keys(e).forEach(r=>{let t=e[r];"string"==typeof t.value&&t.value.startsWith("bind:")&&(s+=getFnForExpr(t.value.replace("bind:","")))})}return s};module.exports={generatePageExpressions:generatePageExpressions,generateVariableExpressions:generateVariableExpressions};
+const{getHandlebarTemplate:getHandlebarTemplate,safeString:safeString}=require("./handlebar-helpers"),cheerio=require("cheerio");let processedPageExpr=[];const isDisplayExpressionAttr=e=>{return["displayexpression","displaylabel","displayimagesrc","nodelabel","nodeicon","nodechildren","nodeid","itemid","itemlabel","itemicon","itemaction","itembadge","itemchildren","itemlink","itemtarget","userrole","isactive"].includes(e)},checkIsCustomPipeExpression=function(e){let r=e.match(/(custom(\s*:))/g);return r&&r.length},updateBindExpressionForDisplayexpression=e=>{let r,t,n,i,s,a,o,l,p,d="";for(checkIsCustomPipeExpression(e)&&(e+=": __1"),e=e.replace(/\$\[data\[\$i\]/g,"$[__1"),n=0;n<e.length;n++)if(r=e[n],t=e[n+1],"$"===r&&"["===t){for(a=1,p=!1,o=!1,i=n+2;i<e.length;i++)if(" "!==(s=e[i])&&(p||(o='"'===e[i]||"'"===e[i],p=!0),"["===s?a++:"]"===s&&a--,!a)){l=e.substring(n+2,i),d+=o?"__1["+l+"]":l;break}n=i}else d+=r;return d},updateArrTypeExpr=(e,r,t)=>{let n=/\[\$i\]/g;return isArrayTypeProperty(r,t)?e.substr(0,e.lastIndexOf("[$i]")).replace("[$i]","[0]"):e.replace(n,"[0]")},isArrayTypeProperty=(e,r)=>{const t=r?r.attribs:{};return["dataset","dataoptions","customcolors"].includes(e)||"datavalue"===e&&void 0!==t.wmcheckbox||"selecteditem"===e&&void 0!==t.wmtable||"selecteditem"===e&&void 0!==t.wmlist||"datavalue"===e&&t.wmselect&&t.multiple},getFnForExpr=(e,r)=>{if(!e)return"";let t=(r=r||{}).isEvent,n=r.widgetNode,i=r.prop;if(t||-1===e.indexOf("[$i]")||(e=updateArrTypeExpr(e,i,n)),processedPageExpr.includes(e))return"";processedPageExpr.push(e);let s,a="";const o=require("../dependencies/expression-parser.cjs");s=t?o.$parseEvent(e,!0):o.$parseExpr(e,!0);const l=safeString(s.fnArgs),p=safeString(s.fnBody),d=s.pipes||[];d.forEach((e,r)=>{a+="["+e.reduce((e,r)=>"'"+e+"','"+r+"'")+"]"+(r<d.length?",":"")}),a=safeString(a);const c=safeString(e.replace(/"/g,'\\"').replace(/\n/g,"\\n"));return getHandlebarTemplate("expr-vs-fn")({expr:c,fnArgs:l,fnBody:p,fnPipes:a})+","},getExprForBinding=e=>{let r="";return"string"==typeof e&&e.startsWith("bind:")&&(r=getFnForExpr(e.replace("bind:",""))),r},generateFilterExprBindings=e=>{let r="";return e.rules&&_.forEach(e.rules,(e,t)=>{e.rules?r+=generateFilterExprBindings(e):("between"===e.matchMode&&(r+=getExprForBinding(e.secondvalue)),r+=getExprForBinding(e.value))}),r},getCRUDVariableExpressions=e=>{let r=e.dataBinding||{},t="";for(let e in r){(r[e]||[]).forEach(e=>{t+=getExprForBinding(e.value)})}return t},generateVariableExpressions=e=>{let r="";e=JSON.parse(e);const t=["onBefore","onBeforeUpdate","onResult","onBeforeOpen","onOpen","onBeforeMessageSend","onMessageReceive","onProgress","onError","onBeforeDatasetReady","onCanUpdate","onClick","onHide","onOk","onCancel","onBeforeClose","onClose","onTimerFire","onSuccess","onOnline","onOffline"];for(const n in e){const i=e[n];if("wm.LiveVariable"===i.category&&"read"===i.operation)r+=generateFilterExprBindings(i.filterExpressions);else if("wm.CrudVariable"===i.category)r+=getCRUDVariableExpressions(i);else{(i.dataBinding||[]).forEach(e=>{r+=getExprForBinding(e.value)})}t.forEach(e=>{i[e]&&(r+=getFnForExpr(i[e],{isEvent:!0}))})}return r},generateExtraWidgetBindings=(e,r)=>{let t="";switch(r){case"wmalertdialog":t+=getFnForExpr("oktext");break;case"wmconfirmdialog":t+=getFnForExpr("oktext"),t+=getFnForExpr("canceltext");break;case"wmtable":t+=e.attribs.rowngclass?getFnForExpr(e.attribs.rowngclass):"";break;case"wmtablecolumn":t+=e.attribs["col-ng-class"]?getFnForExpr(e.attribs["col-ng-class"]):""}return t},isActionTypeNode=e=>["wmtableaction","wmtablerowaction","wmformaction"].some(r=>void 0!==e.attribs[r]),generatePageExpressions=(e,r,t)=>{let n,i,s="";const a=cheerio.load(e);if(processedPageExpr.length=0,a("*").each((e,r)=>{for(let e in r.attribs)e.endsWith(".bind")?(i=e.replace(".bind",""),n=r.attribs[e],isDisplayExpressionAttr(i)&&(n=updateBindExpressionForDisplayexpression(n),console.log("++++++++displayexpressoin binding updated",n)),s+=getFnForExpr(n,{prop:i,widgetNode:r})):e.endsWith(".event")?(i=e.replace(".event",""),n=r.attribs[e],s+=getFnForExpr(n,{isEvent:!0})):"displayexpression"===e?(n=r.attribs[e],s+=getFnForExpr(n)):"action"===e&&isActionTypeNode(r)&&(n=r.attribs[e],console.warn("<<<<<<<<found action node",n),s+=getFnForExpr(n));["wmalertdialog","wmconfirmdialog","wmtable","wmtablecolumn"].forEach(e=>{void 0!==r.attribs[e]&&(s+=generateExtraWidgetBindings(r,e))})}),s+=generateVariableExpressions(r),t){const e=(t=JSON.parse(t.toString())).properties||{};Object.keys(e).forEach(r=>{let t=e[r];"string"==typeof t.value&&t.value.startsWith("bind:")&&(s+=getFnForExpr(t.value.replace("bind:","")))})}return s};module.exports={generatePageExpressions:generatePageExpressions,generateVariableExpressions:generateVariableExpressions};