@wavemaker/angular-codegen 11.0.1-next.139247 → 11.0.1-next.139251

angular-codegen/angular-app/build-scripts/post-build.js

@@ -74,8 +74,8 @@ const setMobileProjectType = (angularJson) => {
 const addMobileSpecificStyles = async (deployUrl) => {
     if (isDevBuild) {
         $("body").append(
-            `<script> const WMStylesPath ="${deployUrl}/wm-android-styles.js" </script>`
-        )
+            `<script type="text/javascript" defer="true" src="${deployUrl}/wm-android-styles.js"></script>`
+        );
     }
 
     if (isProdBuild) {
@@ -92,40 +92,20 @@ const addMobileSpecificStyles = async (deployUrl) => {
     }
 }
 
-const addScriptForWMStylesPath = () => {
-    // Add print css on load
-    $("body").append(`<script>
-            (function () {
-                if (typeof WMStylesPath !== "undefined") {
-                    let styleType = WMStylesPath.split(".").pop();
-                    let styleNode;
-                    if(styleType==="css"){
-                        styleNode = document.createElement("link");
-                        styleNode.type = "text/css";
-                        styleNode.rel = "stylesheet";
-                        styleNode.href = WMStylesPath;
-                    }
-                    else if(styleType==="js"){
-                        styleNode = document.createElement("script");
-                        styleNode.type = "text/javascript";
-                        styleNode.src = WMStylesPath;
-                        styleNode.defer = true;
-                    }
-
-                    styleNode && document
-                        .getElementsByTagName("head")[0]
-                        .appendChild(styleNode);
-                }
-            })()
-            window.onload = function() {
-                 var printCssNode = document.createElement('link');
-                 printCssNode.type = 'text/css';
-                 printCssNode.rel = 'stylesheet';
-                 printCssNode.href = 'print.css';
-                 printCssNode.media = 'print';
-                 document.getElementsByTagName("head")[0].appendChild(printCssNode);
-             }
-            </script>`);
+const addScriptForWMStylesPath = (wm_styles_path) => {
+    let styleType = wm_styles_path.split(".").pop();
+    if(styleType==="css"){
+        $("head").append(
+            `<link rel="stylesheet" type="text/css" href="${wm_styles_path}"/>`
+        );
+    } else {
+        $("body").append(
+            `<script type="text/javascript" defer="true" src="${wm_styles_path}"></script>`
+        );
+    }
+    $("head").append(
+        `<link rel="stylesheet" type="text/css" media="print" href="print.css"/>`
+    );
 }
 
 /**
@@ -155,9 +135,9 @@ const SKIP_UPDATE = ['index.html', 'manifest.json'];
 /**
  * Checks if a file's name has been changed during the build process
  * and if changed, returns an updated file path.
- * 
+ *
  * @param {string} deployUrl deployment url
- * @param {string} url an absolute url to check if its filename has changed 
+ * @param {string} url an absolute url to check if its filename has changed
  * @param {object} updatedFileNames a map from old filenames to new filenames
  * @returns {string} an updated file path
  */
@@ -176,8 +156,8 @@ const getUpdatedFileName = (deployUrl, url, updatedFileNames) => {
 /**
  * Checks if a file's content has been changed during the build process
  * and if changed, returns a new hash to be updated in ngsw.json
- * 
- * @param {string} url an absolute url to check if its filename has changed 
+ *
+ * @param {string} url an absolute url to check if its filename has changed
  * @param {object} updatedFileHashes a map from filenames to file hashes
  * @returns {string} an updated file hash
  */
@@ -191,7 +171,7 @@ const getUpdatedFileHashes = (url, oldHash, updatedFileHashes) => {
 
 /**
  * Get the path of the icon without '/ng-bundle'
- * 
+ *
  * @param {string} iconPath path with '/ng-bundle'
  * @returns {string} path of the icon without '/ng-bundle'
  */
@@ -202,7 +182,7 @@ const getIconPath = (iconPath) => {
 
 /**
  * Updates name, location and content of PWA related assets.
- * 
+ *
  * @param {string} deployUrl deployment url
  * @param {object} updatedFileNames a map from old filenames to new filenames
  * @returns {void}
@@ -245,7 +225,7 @@ const updatePwaAssets = (deployUrl, updatedFileNames, updatedFileHashes) => {
 
 /**
  * Generated sha1 hash for the content supplied.
- * 
+ *
  * @param {string} content the content to be hashed
  * @returns {string} the hash value
  */
@@ -291,26 +271,23 @@ const generateSha1 = (content) => {
         const serviceWorkerEnabled = build['configurations']['production']['serviceWorker'];
         const updatedFilenames = {}
         const updatedFileHashes = {}
+        let wm_styles_path;
 
         if (isMobileProject) {
             await addMobileSpecificStyles(deployUrl);
         } else {
             if (isDevBuild) {
-                $("head").append(
-                    `<script> const WMStylesPath = "${deployUrl}/wm-styles.js" </script>`
-                )
+                wm_styles_path = `${deployUrl}/wm-styles.js`;
             } else {
                 const fileName = 'wm-styles';
                 const hash = await generateHash(`${opPath}/${fileName}.css`);
                 copyCssFiles(hash, updatedFilenames);
                 const updatedFileName = `${fileName}.${hash}.css`
-                $("head").append(
-                    `<script> const WMStylesPath = "${deployUrl}/${updatedFileName}" </script>`
-                );
+                wm_styles_path = `${deployUrl}/${updatedFileName}`;
             }
         }
 
-        addScriptForWMStylesPath();
+        addScriptForWMStylesPath(wm_styles_path);
         const htmlContent = $.html();
         await writeFile(`./dist/index.html`, htmlContent);
 

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.139247"
+        "@wavemaker/app-ng-runtime": "11.0.1-next.139251"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "0.8.5",

angular-codegen/dependencies/app.component.html

@@ -0,0 +1,22 @@
+<ng-container *ngIf="startApp">
+    <router-outlet></router-outlet>
+    <div wmContainer partialContainer content="Common" hidden class="ng-hide" *ngIf="isApplicationType"></div>
+    <app-spinner name="globalspinner" classname="global-spinner" role="alert" aria-live="assertive" [attr.aria-label]="spinner.arialabel || 'Loading'" [show]="spinner.show" [spinnermessages]="spinner.messages"></app-spinner>
+    <div wmDialog name="oAuthLoginDialog" title="Application is requesting you to sign in with"
+         close.event="closeOAuthDialog()">
+        <ng-template #dialogBody>
+            <ul class="list-items">
+                <li class="list-item" *ngFor="let provider of providersConfig">
+                    <button class="btn" (click)="provider.invoke()">{{provider.name}}</button>
+                </li>
+            </ul>
+        </ng-template>
+    </div>
+    <div wmConfirmDialog name="_app-confirm-dialog" title.bind="title" message.bind="message" oktext.bind="oktext"
+         canceltext.bind="canceltext" closable="false" iconclass.bind="iconclass"
+         escape.event="onEscape()" ok.event="onOk()" cancel.event="onCancel()" close.event="onClose()" opened.event="onOpen()"></div>
+    <div wmAppExt></div>
+    <i id="wm-mobile-display"></i>
+</ng-container>
+<!--Dummy container to create the component dynamically-->
+<ng-container #dynamicComponent></ng-container>

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

@@ -17570,6 +17570,21 @@ const nullPipe = () => {
     };
 };
 const ɵ10 = nullPipe;
+let _cspEnabled;
+const isCSPEnabled = () => {
+    if (typeof _cspEnabled !== 'undefined') {
+        return _cspEnabled;
+    }
+    try {
+        new Function();
+        _cspEnabled = false;
+    }
+    catch (e) {
+        _cspEnabled = true;
+    }
+    return _cspEnabled;
+};
+const ɵ11 = isCSPEnabled;
 let pipeProvider;
 function setPipeProvider(_pipeProvider) {
     pipeProvider = _pipeProvider;
@@ -17604,53 +17619,82 @@ function $parseExpr(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!boundFn) {
-        const parser = new Parser$1(new Lexer);
-        const ast = parser.parseBinding(expr, '', 0);
-        if (ast.errors.length) {
-            fn = noop;
-            boundFn = fn;
+        // 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 = 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 pipeNameVsIsPureMap = pipeProvider.getPipeNameVsIsPureMap();
-            const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Binding, pipeNameVsIsPureMap);
-            fn = astCompiler.compile(defOnly);
-            if (defOnly) {
-                return fn;
-            }
-            if (fn.usedPipes.length) {
-                const pipeArgs = [];
-                let hasPurePipe = false;
-                for (const [pipeName] of fn.usedPipes) {
-                    const pipeInfo = pipeProvider.meta(pipeName);
-                    let pipeInstance;
-                    if (!pipeInfo) {
-                        pipeInstance = nullPipe;
-                    }
-                    else {
-                        if (pipeInfo.pure) {
-                            hasPurePipe = true;
-                            pipeInstance = purePipes.get(pipeName);
-                        }
-                        if (!pipeInstance) {
-                            pipeInstance = pipeProvider.getInstance(pipeName);
+            const parser = new Parser$1(new Lexer);
+            const ast = parser.parseBinding(expr, '', 0);
+            if (ast.errors.length) {
+                fn = noop;
+                boundFn = fn;
+            }
+            else {
+                const pipeNameVsIsPureMap = pipeProvider.getPipeNameVsIsPureMap();
+                const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Binding, pipeNameVsIsPureMap);
+                fn = astCompiler.compile(defOnly);
+                if (defOnly) {
+                    return fn;
+                }
+                if (fn.usedPipes.length) {
+                    const pipeArgs = [];
+                    let hasPurePipe = false;
+                    for (const [pipeName] of fn.usedPipes) {
+                        const pipeInfo = pipeProvider.meta(pipeName);
+                        let pipeInstance;
+                        if (!pipeInfo) {
+                            pipeInstance = nullPipe;
                         }
-                        if (pipeInfo.pure) {
-                            purePipes.set(pipeName, pipeInstance);
+                        else {
+                            if (pipeInfo.pure) {
+                                hasPurePipe = true;
+                                pipeInstance = purePipes.get(pipeName);
+                            }
+                            if (!pipeInstance) {
+                                pipeInstance = pipeProvider.getInstance(pipeName);
+                            }
+                            if (pipeInfo.pure) {
+                                purePipes.set(pipeName, pipeInstance);
+                            }
                         }
+                        pipeArgs.push(pipeInstance);
                     }
-                    pipeArgs.push(pipeInstance);
+                    pipeArgs.unshift(hasPurePipe ? new Map() : undefined);
+                    boundFn = fn.bind(undefined, ...pipeArgs);
+                }
+                else {
+                    boundFn = fn.bind(undefined, undefined);
                 }
-                pipeArgs.unshift(hasPurePipe ? new Map() : undefined);
-                boundFn = fn.bind(undefined, ...pipeArgs);
-            }
-            else {
-                boundFn = fn.bind(undefined, undefined);
             }
         }
     }
     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;
@@ -17668,20 +17712,24 @@ function $parseEvent(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!fn) {
-        const parser = new Parser$1(new Lexer);
-        const ast = parser.parseAction(expr, '', 0);
-        if (ast.errors.length) {
-            return noop;
+        if (isCSPEnabled()) {
+            fn = simpleFunctionEvaluator.bind(undefined, expr);
+        }
+        else {
+            const parser = new Parser$1(new Lexer);
+            const ast = parser.parseAction(expr, '', 0);
+            if (ast.errors.length) {
+                return noop;
+            }
+            const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Action);
+            fn = astCompiler.compile(defOnly);
         }
-        const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Action);
-        fn = astCompiler.compile(defOnly);
     }
     eventFnCache.set(expr, fn);
     return fn;
 }
 const fnNameMap = new Map();
 const registerFnByExpr = (expr, fn, usedPipes) => {
-    console.log('registering function for: ', expr);
     fn.usedPipes = usedPipes || [];
     fnNameMap.set(expr, fn);
 };
@@ -17732,7 +17780,7 @@ const fnExecutor = (expr, exprType) => {
     }
     return fn;
 };
-const ɵ11 = fnExecutor;
+const ɵ12 = fnExecutor;
 const getFnForBindExpr = (expr) => {
     return fnExecutor(expr, ExpressionType$1.Binding);
 };
@@ -17759,3 +17807,4 @@ exports.ɵ8 = ɵ8;
 exports.ɵ9 = ɵ9;
 exports.ɵ10 = ɵ10;
 exports.ɵ11 = ɵ11;
+exports.ɵ12 = ɵ12;

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

@@ -42658,6 +42658,20 @@ const nullPipe = () => {
         transform: noop$1$1
     };
 };
+let _cspEnabled;
+const isCSPEnabled = () => {
+    if (typeof _cspEnabled !== 'undefined') {
+        return _cspEnabled;
+    }
+    try {
+        new Function();
+        _cspEnabled = false;
+    }
+    catch (e) {
+        _cspEnabled = true;
+    }
+    return _cspEnabled;
+};
 let pipeProvider;
 var ExpressionType$1;
 (function (ExpressionType$$1) {
@@ -42689,53 +42703,82 @@ function $parseExpr(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!boundFn) {
-        const parser = new Parser$1(new Lexer);
-        const ast = parser.parseBinding(expr, '', 0);
-        if (ast.errors.length) {
-            fn = noop$1$1;
-            boundFn = fn;
+        // 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 = 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 pipeNameVsIsPureMap = pipeProvider.getPipeNameVsIsPureMap();
-            const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Binding, pipeNameVsIsPureMap);
-            fn = astCompiler.compile(defOnly);
-            if (defOnly) {
-                return fn;
-            }
-            if (fn.usedPipes.length) {
-                const pipeArgs = [];
-                let hasPurePipe = false;
-                for (const [pipeName] of fn.usedPipes) {
-                    const pipeInfo = pipeProvider.meta(pipeName);
-                    let pipeInstance;
-                    if (!pipeInfo) {
-                        pipeInstance = nullPipe;
-                    }
-                    else {
-                        if (pipeInfo.pure) {
-                            hasPurePipe = true;
-                            pipeInstance = purePipes.get(pipeName);
-                        }
-                        if (!pipeInstance) {
-                            pipeInstance = pipeProvider.getInstance(pipeName);
+            const parser = new Parser$1(new Lexer);
+            const ast = parser.parseBinding(expr, '', 0);
+            if (ast.errors.length) {
+                fn = noop$1$1;
+                boundFn = fn;
+            }
+            else {
+                const pipeNameVsIsPureMap = pipeProvider.getPipeNameVsIsPureMap();
+                const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Binding, pipeNameVsIsPureMap);
+                fn = astCompiler.compile(defOnly);
+                if (defOnly) {
+                    return fn;
+                }
+                if (fn.usedPipes.length) {
+                    const pipeArgs = [];
+                    let hasPurePipe = false;
+                    for (const [pipeName] of fn.usedPipes) {
+                        const pipeInfo = pipeProvider.meta(pipeName);
+                        let pipeInstance;
+                        if (!pipeInfo) {
+                            pipeInstance = nullPipe;
                         }
-                        if (pipeInfo.pure) {
-                            purePipes.set(pipeName, pipeInstance);
+                        else {
+                            if (pipeInfo.pure) {
+                                hasPurePipe = true;
+                                pipeInstance = purePipes.get(pipeName);
+                            }
+                            if (!pipeInstance) {
+                                pipeInstance = pipeProvider.getInstance(pipeName);
+                            }
+                            if (pipeInfo.pure) {
+                                purePipes.set(pipeName, pipeInstance);
+                            }
                         }
+                        pipeArgs.push(pipeInstance);
                     }
-                    pipeArgs.push(pipeInstance);
+                    pipeArgs.unshift(hasPurePipe ? new Map() : undefined);
+                    boundFn = fn.bind(undefined, ...pipeArgs);
+                }
+                else {
+                    boundFn = fn.bind(undefined, undefined);
                 }
-                pipeArgs.unshift(hasPurePipe ? new Map() : undefined);
-                boundFn = fn.bind(undefined, ...pipeArgs);
-            }
-            else {
-                boundFn = fn.bind(undefined, undefined);
             }
         }
     }
     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;
@@ -42753,13 +42796,18 @@ function $parseEvent(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!fn) {
-        const parser = new Parser$1(new Lexer);
-        const ast = parser.parseAction(expr, '', 0);
-        if (ast.errors.length) {
-            return noop$1$1;
+        if (isCSPEnabled()) {
+            fn = simpleFunctionEvaluator.bind(undefined, expr);
+        }
+        else {
+            const parser = new Parser$1(new Lexer);
+            const ast = parser.parseAction(expr, '', 0);
+            if (ast.errors.length) {
+                return noop$1$1;
+            }
+            const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Action);
+            fn = astCompiler.compile(defOnly);
         }
-        const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Action);
-        fn = astCompiler.compile(defOnly);
     }
     eventFnCache.set(expr, fn);
     return fn;
@@ -43657,10 +43705,26 @@ const loadScript = (url, loadViaScriptTag, cacheable = false) => __awaiter$1(voi
         return Promise.resolve();
     }
     if (loadViaScriptTag) {
-        return fetchContent('text', _url, false, text => {
-            const script = document.createElement('script');
-            script.textContent = text;
-            document.head.appendChild(script);
+        return new Promise((resolve, reject) => {
+            let script = document.createElement('script');
+            script.type = 'text/javascript';
+            script.src = _url;
+            script.async = false;
+            if (script.readyState) { //IE
+                script.onreadystatechange = () => {
+                    if (script.readyState === "loaded" || script.readyState === "complete") {
+                        script.onreadystatechange = null;
+                        resolve(true);
+                    }
+                };
+            }
+            else { //Other browsers
+                script.onload = () => {
+                    resolve(true);
+                };
+            }
+            script.onerror = (error) => reject(error);
+            document.getElementsByTagName('head')[0].appendChild(script);
         });
     }
     else if (cacheable) {
@@ -43676,13 +43740,6 @@ const loadScript = (url, loadViaScriptTag, cacheable = false) => __awaiter$1(voi
             .done(response => response)
             .fail(reason => reason);
     }
-    // return fetch(_url)
-    //     .then(response => response.text())
-    //     .then(text => {
-    //         const script = document.createElement('script');
-    //         script.textContent = text;
-    //         document.head.appendChild(script);
-    //     });
 });
 const loadScripts = (urls = [], loadViaScriptTag = true) => __awaiter$1(void 0, void 0, void 0, function* () {
     for (const url of urls) {

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

@@ -38646,6 +38646,20 @@ const nullPipe = () => {
         transform: noop$1$1
     };
 };
+let _cspEnabled;
+const isCSPEnabled = () => {
+    if (typeof _cspEnabled !== 'undefined') {
+        return _cspEnabled;
+    }
+    try {
+        new Function();
+        _cspEnabled = false;
+    }
+    catch (e) {
+        _cspEnabled = true;
+    }
+    return _cspEnabled;
+};
 let pipeProvider;
 var ExpressionType$1;
 (function (ExpressionType$$1) {
@@ -38677,53 +38691,82 @@ function $parseExpr(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!boundFn) {
-        const parser = new Parser$1(new Lexer);
-        const ast = parser.parseBinding(expr, '', 0);
-        if (ast.errors.length) {
-            fn = noop$1$1;
-            boundFn = fn;
+        // 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 = 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 pipeNameVsIsPureMap = pipeProvider.getPipeNameVsIsPureMap();
-            const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Binding, pipeNameVsIsPureMap);
-            fn = astCompiler.compile(defOnly);
-            if (defOnly) {
-                return fn;
-            }
-            if (fn.usedPipes.length) {
-                const pipeArgs = [];
-                let hasPurePipe = false;
-                for (const [pipeName] of fn.usedPipes) {
-                    const pipeInfo = pipeProvider.meta(pipeName);
-                    let pipeInstance;
-                    if (!pipeInfo) {
-                        pipeInstance = nullPipe;
-                    }
-                    else {
-                        if (pipeInfo.pure) {
-                            hasPurePipe = true;
-                            pipeInstance = purePipes.get(pipeName);
-                        }
-                        if (!pipeInstance) {
-                            pipeInstance = pipeProvider.getInstance(pipeName);
+            const parser = new Parser$1(new Lexer);
+            const ast = parser.parseBinding(expr, '', 0);
+            if (ast.errors.length) {
+                fn = noop$1$1;
+                boundFn = fn;
+            }
+            else {
+                const pipeNameVsIsPureMap = pipeProvider.getPipeNameVsIsPureMap();
+                const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Binding, pipeNameVsIsPureMap);
+                fn = astCompiler.compile(defOnly);
+                if (defOnly) {
+                    return fn;
+                }
+                if (fn.usedPipes.length) {
+                    const pipeArgs = [];
+                    let hasPurePipe = false;
+                    for (const [pipeName] of fn.usedPipes) {
+                        const pipeInfo = pipeProvider.meta(pipeName);
+                        let pipeInstance;
+                        if (!pipeInfo) {
+                            pipeInstance = nullPipe;
                         }
-                        if (pipeInfo.pure) {
-                            purePipes.set(pipeName, pipeInstance);
+                        else {
+                            if (pipeInfo.pure) {
+                                hasPurePipe = true;
+                                pipeInstance = purePipes.get(pipeName);
+                            }
+                            if (!pipeInstance) {
+                                pipeInstance = pipeProvider.getInstance(pipeName);
+                            }
+                            if (pipeInfo.pure) {
+                                purePipes.set(pipeName, pipeInstance);
+                            }
                         }
+                        pipeArgs.push(pipeInstance);
                     }
-                    pipeArgs.push(pipeInstance);
+                    pipeArgs.unshift(hasPurePipe ? new Map() : undefined);
+                    boundFn = fn.bind(undefined, ...pipeArgs);
+                }
+                else {
+                    boundFn = fn.bind(undefined, undefined);
                 }
-                pipeArgs.unshift(hasPurePipe ? new Map() : undefined);
-                boundFn = fn.bind(undefined, ...pipeArgs);
-            }
-            else {
-                boundFn = fn.bind(undefined, undefined);
             }
         }
     }
     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;
@@ -38741,13 +38784,18 @@ function $parseEvent(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!fn) {
-        const parser = new Parser$1(new Lexer);
-        const ast = parser.parseAction(expr, '', 0);
-        if (ast.errors.length) {
-            return noop$1$1;
+        if (isCSPEnabled()) {
+            fn = simpleFunctionEvaluator.bind(undefined, expr);
+        }
+        else {
+            const parser = new Parser$1(new Lexer);
+            const ast = parser.parseAction(expr, '', 0);
+            if (ast.errors.length) {
+                return noop$1$1;
+            }
+            const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Action);
+            fn = astCompiler.compile(defOnly);
         }
-        const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Action);
-        fn = astCompiler.compile(defOnly);
     }
     eventFnCache.set(expr, fn);
     return fn;
@@ -39645,10 +39693,26 @@ const loadScript = (url, loadViaScriptTag, cacheable = false) => __awaiter$1(voi
         return Promise.resolve();
     }
     if (loadViaScriptTag) {
-        return fetchContent('text', _url, false, text => {
-            const script = document.createElement('script');
-            script.textContent = text;
-            document.head.appendChild(script);
+        return new Promise((resolve, reject) => {
+            let script = document.createElement('script');
+            script.type = 'text/javascript';
+            script.src = _url;
+            script.async = false;
+            if (script.readyState) { //IE
+                script.onreadystatechange = () => {
+                    if (script.readyState === "loaded" || script.readyState === "complete") {
+                        script.onreadystatechange = null;
+                        resolve(true);
+                    }
+                };
+            }
+            else { //Other browsers
+                script.onload = () => {
+                    resolve(true);
+                };
+            }
+            script.onerror = (error) => reject(error);
+            document.getElementsByTagName('head')[0].appendChild(script);
         });
     }
     else if (cacheable) {
@@ -39664,13 +39728,6 @@ const loadScript = (url, loadViaScriptTag, cacheable = false) => __awaiter$1(voi
             .done(response => response)
             .fail(reason => reason);
     }
-    // return fetch(_url)
-    //     .then(response => response.text())
-    //     .then(text => {
-    //         const script = document.createElement('script');
-    //         script.textContent = text;
-    //         document.head.appendChild(script);
-    //     });
 });
 const loadScripts = (urls = [], loadViaScriptTag = true) => __awaiter$1(void 0, void 0, void 0, function* () {
     for (const url of urls) {
@@ -41920,7 +41977,7 @@ const setDimensionProp = (cssObj, key, nv) => {
         cssObj[cssKey] = nv;
     }
 };
-const ɵ12 = setDimensionProp;
+const ɵ12$1 = setDimensionProp;
 const processDimensionAttributes = attrMap => {
     const attrKeys = Array.from(attrMap.keys());
     attrKeys.forEach((attrKey) => {
@@ -45074,7 +45131,7 @@ exports.ɵ0 = ɵ0$h;
 exports.ɵ1 = ɵ1$5;
 exports.ɵ10 = ɵ10$1;
 exports.ɵ11 = ɵ11$1;
-exports.ɵ12 = ɵ12;
+exports.ɵ12 = ɵ12$1;
 exports.ɵ13 = ɵ13;
 exports.ɵ14 = ɵ14;
 exports.ɵ2 = ɵ2$4;

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

@@ -38646,6 +38646,20 @@ const nullPipe = () => {
         transform: noop$1$1
     };
 };
+let _cspEnabled;
+const isCSPEnabled = () => {
+    if (typeof _cspEnabled !== 'undefined') {
+        return _cspEnabled;
+    }
+    try {
+        new Function();
+        _cspEnabled = false;
+    }
+    catch (e) {
+        _cspEnabled = true;
+    }
+    return _cspEnabled;
+};
 let pipeProvider;
 var ExpressionType$1;
 (function (ExpressionType$$1) {
@@ -38677,53 +38691,82 @@ function $parseExpr(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!boundFn) {
-        const parser = new Parser$1(new Lexer);
-        const ast = parser.parseBinding(expr, '', 0);
-        if (ast.errors.length) {
-            fn = noop$1$1;
-            boundFn = fn;
+        // 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 = 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 pipeNameVsIsPureMap = pipeProvider.getPipeNameVsIsPureMap();
-            const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Binding, pipeNameVsIsPureMap);
-            fn = astCompiler.compile(defOnly);
-            if (defOnly) {
-                return fn;
-            }
-            if (fn.usedPipes.length) {
-                const pipeArgs = [];
-                let hasPurePipe = false;
-                for (const [pipeName] of fn.usedPipes) {
-                    const pipeInfo = pipeProvider.meta(pipeName);
-                    let pipeInstance;
-                    if (!pipeInfo) {
-                        pipeInstance = nullPipe;
-                    }
-                    else {
-                        if (pipeInfo.pure) {
-                            hasPurePipe = true;
-                            pipeInstance = purePipes.get(pipeName);
-                        }
-                        if (!pipeInstance) {
-                            pipeInstance = pipeProvider.getInstance(pipeName);
+            const parser = new Parser$1(new Lexer);
+            const ast = parser.parseBinding(expr, '', 0);
+            if (ast.errors.length) {
+                fn = noop$1$1;
+                boundFn = fn;
+            }
+            else {
+                const pipeNameVsIsPureMap = pipeProvider.getPipeNameVsIsPureMap();
+                const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Binding, pipeNameVsIsPureMap);
+                fn = astCompiler.compile(defOnly);
+                if (defOnly) {
+                    return fn;
+                }
+                if (fn.usedPipes.length) {
+                    const pipeArgs = [];
+                    let hasPurePipe = false;
+                    for (const [pipeName] of fn.usedPipes) {
+                        const pipeInfo = pipeProvider.meta(pipeName);
+                        let pipeInstance;
+                        if (!pipeInfo) {
+                            pipeInstance = nullPipe;
                         }
-                        if (pipeInfo.pure) {
-                            purePipes.set(pipeName, pipeInstance);
+                        else {
+                            if (pipeInfo.pure) {
+                                hasPurePipe = true;
+                                pipeInstance = purePipes.get(pipeName);
+                            }
+                            if (!pipeInstance) {
+                                pipeInstance = pipeProvider.getInstance(pipeName);
+                            }
+                            if (pipeInfo.pure) {
+                                purePipes.set(pipeName, pipeInstance);
+                            }
                         }
+                        pipeArgs.push(pipeInstance);
                     }
-                    pipeArgs.push(pipeInstance);
+                    pipeArgs.unshift(hasPurePipe ? new Map() : undefined);
+                    boundFn = fn.bind(undefined, ...pipeArgs);
+                }
+                else {
+                    boundFn = fn.bind(undefined, undefined);
                 }
-                pipeArgs.unshift(hasPurePipe ? new Map() : undefined);
-                boundFn = fn.bind(undefined, ...pipeArgs);
-            }
-            else {
-                boundFn = fn.bind(undefined, undefined);
             }
         }
     }
     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;
@@ -38741,13 +38784,18 @@ function $parseEvent(expr, defOnly) {
     }
     // fallback to generate function in runtime. This will break if CSP is enabled
     if (!fn) {
-        const parser = new Parser$1(new Lexer);
-        const ast = parser.parseAction(expr, '', 0);
-        if (ast.errors.length) {
-            return noop$1$1;
+        if (isCSPEnabled()) {
+            fn = simpleFunctionEvaluator.bind(undefined, expr);
+        }
+        else {
+            const parser = new Parser$1(new Lexer);
+            const ast = parser.parseAction(expr, '', 0);
+            if (ast.errors.length) {
+                return noop$1$1;
+            }
+            const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Action);
+            fn = astCompiler.compile(defOnly);
         }
-        const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Action);
-        fn = astCompiler.compile(defOnly);
     }
     eventFnCache.set(expr, fn);
     return fn;
@@ -39645,10 +39693,26 @@ const loadScript = (url, loadViaScriptTag, cacheable = false) => __awaiter$1(voi
         return Promise.resolve();
     }
     if (loadViaScriptTag) {
-        return fetchContent('text', _url, false, text => {
-            const script = document.createElement('script');
-            script.textContent = text;
-            document.head.appendChild(script);
+        return new Promise((resolve, reject) => {
+            let script = document.createElement('script');
+            script.type = 'text/javascript';
+            script.src = _url;
+            script.async = false;
+            if (script.readyState) { //IE
+                script.onreadystatechange = () => {
+                    if (script.readyState === "loaded" || script.readyState === "complete") {
+                        script.onreadystatechange = null;
+                        resolve(true);
+                    }
+                };
+            }
+            else { //Other browsers
+                script.onload = () => {
+                    resolve(true);
+                };
+            }
+            script.onerror = (error) => reject(error);
+            document.getElementsByTagName('head')[0].appendChild(script);
         });
     }
     else if (cacheable) {
@@ -39664,13 +39728,6 @@ const loadScript = (url, loadViaScriptTag, cacheable = false) => __awaiter$1(voi
             .done(response => response)
             .fail(reason => reason);
     }
-    // return fetch(_url)
-    //     .then(response => response.text())
-    //     .then(text => {
-    //         const script = document.createElement('script');
-    //         script.textContent = text;
-    //         document.head.appendChild(script);
-    //     });
 });
 const loadScripts = (urls = [], loadViaScriptTag = true) => __awaiter$1(void 0, void 0, void 0, function* () {
     for (const url of urls) {
@@ -41920,7 +41977,7 @@ const setDimensionProp = (cssObj, key, nv) => {
         cssObj[cssKey] = nv;
     }
 };
-const ɵ12 = setDimensionProp;
+const ɵ12$1 = setDimensionProp;
 const processDimensionAttributes = attrMap => {
     const attrKeys = Array.from(attrMap.keys());
     attrKeys.forEach((attrKey) => {
@@ -45074,7 +45131,7 @@ exports.ɵ0 = ɵ0$h;
 exports.ɵ1 = ɵ1$5;
 exports.ɵ10 = ɵ10$1;
 exports.ɵ11 = ɵ11$1;
-exports.ɵ12 = ɵ12;
+exports.ɵ12 = ɵ12$1;
 exports.ɵ13 = ɵ13;
 exports.ɵ14 = ɵ14;
 exports.ɵ2 = ɵ2$4;

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.0.1-next.139247",
+    "version": "11.0.1-next.139251",
     "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,s,i,a,o,l,p,c="";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,s=n+2;s<e.length;s++)if(" "!==(i=e[s])&&(p||(o='"'===e[s]||"'"===e[s],p=!0),"["===i?a++:"]"===i&&a--,!a)){l=e.substring(n+2,s),c+=o?"__1["+l+"]":l;break}n=s}else c+=r;return c},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=e.replace(/"/g,'\\"');if(processedPageExpr.includes(e))return"";processedPageExpr.push(e);let n=(r=r||{}).isEvent,s=r.widgetNode,i=r.prop,a="";const o=require("../dependencies/expression-parser.cjs");let l;n?l=o.$parseEvent(e,!0):(-1!==e.indexOf("[$i]")&&(e=updateArrTypeExpr(e,i,s)),l=o.$parseExpr(e,!0));const p=safeString(l.fnArgs),c=safeString(l.fnBody),d=l.pipes||[];return d.forEach((e,r)=>{a+="["+e.reduce((e,r)=>"'"+e+"','"+r+"'")+"]"+(r<d.length?",":"")}),a=safeString(a),t=safeString(t),getHandlebarTemplate("expr-vs-fn")({expr:t,fnArgs:p,fnBody:c,fnPipes:a})+","},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 s=e[n];(s.dataBinding||[]).forEach(e=>{if(e.value&&e.value.startsWith("bind:")){const t=e.value.replace("bind:","");r+=getFnForExpr(t)}}),t.forEach(e=>{s[e]&&(r+=getFnForExpr(s[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,s,i="";const a=cheerio.load(e);if(processedPageExpr.length=0,a("*").each((e,r)=>{for(let e in r.attribs)e.endsWith(".bind")?(s=e.replace(".bind",""),n=r.attribs[e],isDisplayExpressionAttr(s)&&(n=updateBindExpressionForDisplayexpression(n),console.log("++++++++displayexpressoin binding updated",n)),i+=getFnForExpr(n,{prop:s,widgetNode:r})):e.endsWith(".event")?(s=e.replace(".event",""),n=r.attribs[e],i+=getFnForExpr(n,{isEvent:!0})):"displayexpression"===e?(n=r.attribs[e],i+=getFnForExpr(n)):"action"===e&&isActionTypeNode(r)&&(n=r.attribs[e],console.warn("<<<<<<<<found action node",n),i+=getFnForExpr(n));["wmalertdialog","wmconfirmdialog","wmtable","wmtablecolumn"].forEach(e=>{void 0!==r.attribs[e]&&(i+=generateExtraWidgetBindings(r,e))})}),i+=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:")&&(i+=getFnForExpr(t.value.replace("bind:","")))})}return i};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)=>{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};

angular-codegen/src/gen-app-variables.js

@@ -1 +1 @@
-const{getHandlebarTemplate:getHandlebarTemplate,safeString:safeString}=require("./handlebar-helpers"),{readFile:readFile,writeFile:writeFile,getAppVariablesFilePath:getAppVariablesFilePath,formatContents:formatContents}=require("./wm-utils"),{generateVariableExpressions:generateVariableExpressions}=require("./expr-parser-utils"),generateAppVariableExpressions=async(e,a)=>{const r=safeString(generateVariableExpressions(e)),t=getHandlebarTemplate("component-expressions")({expressions:r});await writeFile(`${a}/src/app/app.component.expressions.ts`,formatContents(t,"javascript"))},generateAppVariables=async(e,a)=>{const r=getHandlebarTemplate("component-variables");let t=await readFile(getAppVariablesFilePath(e),"utf8")||"{}";const s=r({variables:safeString(t)});await writeFile(`${a}/src/app/app.component.variables.ts`,s),await generateAppVariableExpressions(t,a)};module.exports={generateAppVariables:generateAppVariables};
+const{getHandlebarTemplate:getHandlebarTemplate,safeString:safeString}=require("./handlebar-helpers"),{readFile:readFile,writeFile:writeFile,getAppVariablesFilePath:getAppVariablesFilePath,formatContents:formatContents,getCodegenPath:getCodegenPath}=require("./wm-utils"),{generatePageExpressions:generatePageExpressions}=require("./expr-parser-utils"),generateAppVariableExpressions=async(e,a)=>{const t=await readFile(`${getCodegenPath()}/dependencies/app.component.html`,"utf-8")||"",r=safeString(generatePageExpressions(t,e)),s=getHandlebarTemplate("component-expressions")({expressions:r});await writeFile(`${a}/src/app/app.component.expressions.ts`,formatContents(s,"javascript"))},generateAppVariables=async(e,a)=>{const t=getHandlebarTemplate("component-variables");let r=await readFile(getAppVariablesFilePath(e),"utf8")||"{}";const s=t({variables:safeString(r)});await writeFile(`${a}/src/app/app.component.variables.ts`,s),await generateAppVariableExpressions(r,a)};module.exports={generateAppVariables:generateAppVariables};