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

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

@@ -38622,9 +38622,12 @@ class ASTCompiler {
     cleanup() {
         this.ast = this.cAst = this.stmts = this.cStmts = this.declarations = this.pipes = this.pipeNameVsIsPureMap = undefined;
     }
-    compile() {
+    compile(defOnly) {
         this.extendCtxWithLocals();
         this.addReturnStmt(this.build(this.ast));
+        if (defOnly) {
+            return { fnBody: this.fnBody(), fnArgs: this.fnArgs(), pipes: this.pipes };
+        }
         const fn = new Function(this.fnArgs(), this.fnBody());
         let boundFn;
         if (this.exprType === ExpressionType$1.Binding) {
@@ -38649,7 +38652,7 @@ var ExpressionType$1;
     ExpressionType$$1[ExpressionType$$1["Binding"] = 0] = "Binding";
     ExpressionType$$1[ExpressionType$$1["Action"] = 1] = "Action";
 })(ExpressionType$1 || (ExpressionType$1 = {}));
-function $parseExpr(expr) {
+function $parseExpr(expr, defOnly) {
     if (!pipeProvider) {
         console.log('set pipe provider');
         return noop$1$1;
@@ -38668,51 +38671,60 @@ function $parseExpr(expr) {
     if (fn) {
         return fn;
     }
-    const parser = new Parser$1(new Lexer);
-    const ast = parser.parseBinding(expr, '', 0);
     let boundFn;
-    if (ast.errors.length) {
-        fn = noop$1$1;
-        boundFn = fn;
+    if (!defOnly) {
+        boundFn = getFnForBindExpr(expr);
     }
-    else {
-        const pipeNameVsIsPureMap = pipeProvider.getPipeNameVsIsPureMap();
-        const astCompiler = new ASTCompiler(ast.ast, ExpressionType$1.Binding, pipeNameVsIsPureMap);
-        fn = astCompiler.compile();
-        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);
+    // 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;
+        }
+        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 $parseEvent(expr) {
+function $parseEvent(expr, defOnly) {
     if (!isString$1(expr)) {
         return noop$1$1;
     }
@@ -38724,16 +38736,76 @@ function $parseEvent(expr) {
     if (fn) {
         return fn;
     }
-    const parser = new Parser$1(new Lexer);
-    const ast = parser.parseAction(expr, '', 0);
-    if (ast.errors.length) {
-        return noop$1$1;
+    if (!defOnly) {
+        fn = getFnForEventExpr(expr);
+    }
+    // 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;
+        }
+        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();
     eventFnCache.set(expr, fn);
     return fn;
 }
+const fnNameMap = new Map();
+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 || [];
+    if (exprType === ExpressionType$1.Binding) {
+        fn = fn.bind(undefined, plus, minus, isDef, getPurePipeVal);
+    }
+    else {
+        fn = fn.bind(undefined, plus, minus, isDef);
+    }
+    if (usedPipes.length) {
+        const pipeArgs = [];
+        let hasPurePipe = false;
+        for (const [pipeName] of 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);
+                }
+                if (pipeInfo.pure) {
+                    purePipes.set(pipeName, pipeInstance);
+                }
+            }
+            pipeArgs.push(pipeInstance);
+        }
+        pipeArgs.unshift(hasPurePipe ? new Map() : undefined);
+        fn = fn.bind(undefined, ...pipeArgs);
+    }
+    else {
+        if (exprType === ExpressionType$1.Binding) {
+            fn = fn.bind(undefined, undefined);
+        }
+    }
+    return fn;
+};
+const getFnForBindExpr = (expr) => {
+    return fnExecutor(expr, ExpressionType$1.Binding);
+};
+const getFnForEventExpr = (expr) => {
+    return fnExecutor(expr, ExpressionType$1.Action);
+};
 
 const registry = new Map();
 const watchIdGenerator = new IDGenerator('watch-id-');
@@ -38868,6 +38940,7 @@ var Operation;
     Operation["IS_BOUND_TO_LOCALE"] = "isBoundToLocale";
     Operation["GET_DEFAULT_LOCALE"] = "getDefaultLocale";
     Operation["CANCEL"] = "cancel";
+    Operation["SET_PAGINATION"] = "setPagination";
 })(Operation || (Operation = {}));
 const DataSource = {
     Operation
@@ -39627,7 +39700,8 @@ const setSessionStorageItem = (key, value) => {
  * @param key string
  */
 const getSessionStorageItem = key => {
-    let item = window.sessionStorage.getItem(_WM_APP_PROJECT.id);
+    // sanity check for this to work with ng-codegen
+    let item = window && window.sessionStorage && window.sessionStorage.getItem(_WM_APP_PROJECT.id);
     if (item) {
         item = JSON.parse(item);
         return item[key];
@@ -39851,6 +39925,7 @@ const processFilterExpBindNode = (context, filterExpressions) => {
     const filter$ = new Subject();
     const bindFilExpObj = (obj, targetNodeKey) => {
         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;
@@ -40094,6 +40169,7 @@ const triggerItemAction = (scope, item) => {
     const linkTarget = item.target;
     if (itemAction) {
         if (!scope.itemActionFn) {
+            //[Todo-CSP]: This will not work as function will be dynamic
             scope.itemActionFn = $parseEvent(itemAction);
         }
         scope.itemActionFn(scope.userDefinedExecutionContext, Object.create(item));
@@ -41205,6 +41281,16 @@ class PaginationService {
      */
     updateFieldsOnPagination(parent, newVal) {
         let fieldDefs = parent.widgetType === 'wm-table' ? parent.gridData : parent.fieldDefs;
+        // remove the deleted row from the list
+        if (parent.widgetType === 'wm-table' && (parent.gridOptions.isNavTypeScrollOrOndemand()) && parent.gridOptions.deletedRowIndex !== -1) {
+            fieldDefs.splice(parent.gridOptions.deletedRowIndex, 1);
+            parent.gridOptions.setDeletedRowIndex(-1);
+        }
+        // reset fieldDefs if last action performed is search or sort
+        if (parent.widgetType === 'wm-table' && (parent.gridOptions.isNavTypeScrollOrOndemand()) && (parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.SEARCH_OR_SORT || parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.FILTER_CRITERIA)) {
+            fieldDefs = [];
+            parent.gridOptions.setCurrentPage(1);
+        }
         let currentPage = parent.currentPage;
         const dataNavigator = parent.dataNavigator;
         const pagesize = parent.pagesize;
@@ -41225,11 +41311,11 @@ class PaginationService {
                     newVal = [];
                 }
                 else if (dataNavigator.dataSize < currentPage * pagesize) {
-                    // if number of elements added to datanavigator is less than  product of currentpage and pagesize we only add elements extra elements added
+                    // if number of elements added to dataNavigator is less than  product of currentPage and pageSize we only add elements extra elements added
                     itemsLength = dataNavigator.dataSize - fieldDefs.length;
                 }
                 else {
-                    // if number of elements added to datanavigator is greater than  product of currentpage and pagesize we add elements the extra elements in newVal
+                    // if number of elements added to dataNavigator is greater than  product of currentPage and pageSize we add elements the extra elements in newVal
                     itemsLength = currentPage * pagesize - fieldDefs.length;
                     currentPage++;
                 }
@@ -41242,9 +41328,36 @@ class PaginationService {
             }
             newVal = itemsToPush;
         }
-        fieldDefs = [...fieldDefs, ...newVal];
+        // Add unique records to fieldDefs
+        if (parent.widgetType === 'wm-table' && (parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.DELETE || parent.gridOptions.lastActionPerformed === parent.gridOptions.ACTIONS.EDIT)) {
+            fieldDefs = this.getUniqueRecordsInFieldDef(fieldDefs, newVal);
+        }
+        else {
+            fieldDefs = [...fieldDefs, ...newVal];
+        }
         return [fieldDefs, currentPage];
     }
+    // Add the unique records to fieldDefs
+    getUniqueRecordsInFieldDef(fieldDefs, newVal) {
+        let flag = false;
+        if (!fieldDefs.length) {
+            fieldDefs = newVal;
+        }
+        else {
+            newVal.forEach(function (newObj) {
+                flag = false;
+                fieldDefs.forEach(function (obj) {
+                    if (_.isEqual(newObj, obj)) {
+                        flag = true;
+                    }
+                });
+                if (flag === false) {
+                    fieldDefs.push(newObj);
+                }
+            });
+        }
+        return fieldDefs;
+    }
     /**
      * @description
      * This function registers scroll events on the scrollable el, if the page doesn't have a scroll el then wheel event is registered on the requested node
@@ -41287,6 +41400,9 @@ class PaginationService {
                 let scrollTop;
                 // scrollingElement is undefined for IE, safari. use body as target Element
                 target = target === document ? (target.scrollingElement || document.body) : target;
+                if (parent.widgetType === 'wm-table' && parent.gridOptions.isNavTypeScrollOrOndemand()) {
+                    evt.stopPropagation();
+                }
                 clientHeight = target.clientHeight;
                 totalHeight = target.scrollHeight;
                 scrollTop = target === document.body ? $(window).scrollTop() : target.scrollTop;
@@ -41301,6 +41417,9 @@ class PaginationService {
         else {
             // if there is no scrollable element register wheel event on ul element
             $rootEl.on('wheel.scroll_evt', e => {
+                if (parent.widgetType === 'wm-table' && parent.gridOptions.isNavTypeScrollOrOndemand()) {
+                    e.stopPropagation();
+                }
                 if (e.originalEvent.deltaY > 0) {
                     $rootEl.off('wheel.scroll_evt');
                     this.debouncedFetchNextDatasetOnScroll(dataNavigator, debounceNum, parent)();
@@ -41766,7 +41885,7 @@ const getRequiredProviders = (nodeDef, providers, nodeAttrs) => {
         }
     });
 };
-const ɵ11 = getRequiredProviders;
+const ɵ11$1 = getRequiredProviders;
 const DIMENSION_PROPS = ['padding', 'borderwidth', 'margin'];
 const SEPARATOR = ' ', UNSET = 'unset';
 const setDimensionProp = (cssObj, key, nv) => {
@@ -42381,7 +42500,7 @@ var search_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$1m = 'div';
 register('wm-tree', () => {
     return {
-        pre: attrs => `<${tagName$1m} wmTree redrawable ${getAttrMarkup(attrs)}>`,
+        pre: attrs => `<${tagName$1m} wmTree ${getAttrMarkup(attrs)}>`,
         post: () => `</${tagName$1m}>`
     };
 });
@@ -44793,10 +44912,21 @@ var video_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1 = 'div';
+const SPACING_KEY = 'parentLinearLayout.spacing';
 register('wm-linearlayout', () => {
     return {
-        pre: attrs => `<${tagName$1} wmLinearLayout ${getAttrMarkup(attrs)}>`,
-        post: () => `</${tagName$1}>`
+        requires: ['wm-linearlayout'],
+        pre: (attrs, shared, provider) => {
+            let spacing = attrs.get('spacing');
+            attrs.set('spacing', (!spacing || spacing === '0') && provider ? provider.get(SPACING_KEY) : spacing);
+            return `<${tagName$1} wmLinearLayout ${getAttrMarkup(attrs)}>`;
+        },
+        post: () => `</${tagName$1}>`,
+        provide: (attrs, shared) => {
+            const provider = new Map();
+            provider.set(SPACING_KEY, attrs.get('spacing'));
+            return provider;
+        }
     };
 });
 var linearLayout_build = () => { };
@@ -44943,7 +45073,7 @@ exports.transpile = transpile;
 exports.ɵ0 = ɵ0$h;
 exports.ɵ1 = ɵ1$5;
 exports.ɵ10 = ɵ10$1;
-exports.ɵ11 = ɵ11;
+exports.ɵ11 = ɵ11$1;
 exports.ɵ12 = ɵ12;
 exports.ɵ13 = ɵ13;
 exports.ɵ14 = ɵ14;

angular-codegen/package.json

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

angular-codegen/src/codegen-cli.js

@@ -1 +1 @@
-const codegen=require("./codegen"),{setCodegenPath:setCodegenPath}=require("./wm-utils"),{initTemplates:initTemplates}=require("./handlebar-helpers"),create=async(e,a,t)=>{await codegen.createAppSkeleton(e,a,t)},generate=async(e,a,t,n)=>{await codegen.generateSources(e,a,t,n)},generateCodegenAngularApp=async(e,a,t,n,g)=>{setCodegenPath(g),initTemplates(),await create(e,a,g),await generate(e,a,t,n)},generatePage=async(e,a,t,n)=>{setCodegenPath(n),initTemplates(),await codegen.generatePage(e,a,t)};module.exports={create:create,generateCodegenAngularApp:generateCodegenAngularApp,generatePage:generatePage};
+const codegen=require("./codegen"),{setCodegenPath:setCodegenPath,initExpressionParser:initExpressionParser}=require("./wm-utils"),{initTemplates:initTemplates}=require("./handlebar-helpers"),create=async(e,a,n)=>{await codegen.createAppSkeleton(e,a,n)},generate=async(e,a,n,t)=>{await codegen.generateSources(e,a,n,t)},generateCodegenAngularApp=async(e,a,n,t,r)=>{setCodegenPath(r),initTemplates(),initExpressionParser(),await create(e,a,r),await generate(e,a,n,t)},generatePage=async(e,a,n,t)=>{setCodegenPath(t),initTemplates(),initExpressionParser(),await codegen.generatePage(e,a,n)};module.exports={create:create,generateCodegenAngularApp:generateCodegenAngularApp,generatePage:generatePage};

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

@@ -0,0 +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};

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

@@ -1 +1 @@
-const{getHandlebarTemplate:getHandlebarTemplate,safeString:safeString}=require("./handlebar-helpers"),{readFile:readFile,writeFile:writeFile,getAppVariablesFilePath:getAppVariablesFilePath}=require("./wm-utils"),generateAppVariables=async(e,a)=>{const r=getHandlebarTemplate("component-variables")({variables:safeString(await readFile(getAppVariablesFilePath(e),"utf8")||"{}")});await writeFile(`${a}/src/app/app.component.variables.ts`,r)};module.exports={generateAppVariables:generateAppVariables};
+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};

angular-codegen/src/gen-components.js

@@ -1 +1 @@
-const{createDir:createDir,writeFile:writeFile,isPrefabProject:isPrefabProject,getPagesDirPath:getPagesDirPath,formatContents:formatContents,getComponentName:getComponentName,getComponentModuleName:getComponentModuleName,getPrefabPagesDirPath:getPrefabPagesDirPath}=require("./wm-utils"),fs=require("fs"),cheerio=require("cheerio"),{getPageContents:getPageContents}=require("./pages-util"),{getHandlebarTemplate:getHandlebarTemplate,safeString:safeString}=require("./handlebar-helpers"),writeComponentHtmlFile=async(e,t,a)=>{const n=`${a}/${e}.component.html`;await writeFile(n,t.string)},writeComponentCssFile=async(e,t,a)=>{const n=`${a}/${e}.component.css`;await writeFile(n,t.string)},writeComponentVariablesFile=async(e,t,a,n)=>{let r=getHandlebarTemplate(e)({variables:a});await writeFile(`${n}/${t}.component.variables.ts`,formatContents(r))},writeComponentJsFile=async(e,t,a,n)=>{const r=getHandlebarTemplate(e)({jsContent:a});await writeFile(`${n}/${t}.component.script.js`,formatContents(r,"javascript"))},writeComponentTsFile=async(e,t,a,n)=>{let r=getHandlebarTemplate(e)({name:t,prefabName:a,componentName:getComponentName(t)});await writeFile(`${n}/${t}.component.ts`,r)},writePagePartialModuleTsFile=async(e,t,a,n,r,o,i=!1,s)=>{let m=getHandlebarTemplate(e)({name:t,componentName:getComponentName(t),moduleName:getComponentModuleName(t),requiredPartials:n,requiredPrefabs:r,requiredWMComponents:o,hasCustomElement:i,insidePrefab:!!s});await writeFile(`${a}/${t}.module.ts`,m)},writePrefabModuleTsFile=async(e,t,a,n=!1,r)=>{let o=getHandlebarTemplate("prefab-module-ts")({name:e,componentName:getComponentName(e),moduleName:getComponentModuleName(e),requiredPartials:r,requiredWMComponents:a,hasCustomElement:n});await writeFile(`${t}/${e}.module.ts`,o)},generateComponent=async(e,t,a,n,r,o)=>{await createDir(e,{recursive:!0});const{markup:i,styles:s,variables:m,script:l}=n;return Promise.all([writeComponentHtmlFile(t,safeString(i),e),writeComponentCssFile(t,safeString(s),e),writeComponentVariablesFile("component-variables",t,safeString(m),e),writeComponentJsFile(o,t,safeString(l),e),writeComponentTsFile(r,t,a,e)])},findRequiredPartials=e=>{const t={};return e("[partialContainer]").map((t,a)=>e(a).attr("content")).toArray().map(e=>({type:"PARTIAL",name:e.trim()})).filter(e=>!t[e.name]&&(t[e.name]=!0))},findRequiredPrefabs=e=>{const t={};return e("[wmPrefab]").map((t,a)=>e(a).attr("prefabname")).toArray().map(e=>({type:"PREFAB",name:e.trim()})).filter(e=>!t[e.name]&&(t[e.name]=!0))},generatePagePartialComponent=async(e,t,a,n,r,o,i)=>{let s,m,l,p;if("PAGE"===n?(p=`${r}/src/app/pages/${a}`,s="page-component-ts",m="page-component-script",l="page-module-ts"):(p=o?`${r}/partials/${a}`:`${r}/src/app/partials/${a}`,s="partial-component-ts",m="partial-component-script",l="partial-module-ts"),fs.existsSync(`${p}/${a}.component.ts`))return;let g=`${e}/${a}`;o&&(g=`${getPrefabPagesDirPath(i,o)}/${a}`);const c=await getPageContents(t,g,`${a}`,a,n);try{const n=cheerio.load(c.markup),g=findRequiredPartials(n),P=findRequiredPrefabs(n);for(const a of g)await generatePagePartialComponent(e,t,a.name,a.type,r,o,i);await generateComponent(p,a,void 0,c,s,m),await writePagePartialModuleTsFile(l,a,p,g,P,c.requiredWMComponents,c.hasCustomElement,o)}catch(e){throw console.log("failed in "+a),e}},generateComponents=async(e,t,a,n,r,o)=>{const i=getPagesDirPath(e);for(const a of n.keys()){const n="__self__"===a?`${i}/Main`:`${getPrefabPagesDirPath(e,a)}/Main`,m=await getPageContents(t,n,"Main",a,"PREFAB"),l=`${r}/src/app/prefabs/${a}`,p=cheerio.load(m.markup),g=findRequiredPartials(p);await generateComponent(l,a,a,m,"prefab-component-ts","prefab-component-script");const c=o[a];for(var s=0;s<c.length;s++)await generatePagePartialComponent(i,t,c[s].name,c[s].type,l,a,e);await writePrefabModuleTsFile(a,l,m.requiredWMComponents,m.hasCustomElement,g)}if(!isPrefabProject(t))for(let n of a)await generatePagePartialComponent(i,t,n.name,n.type,r,n.prefabName,e)};module.exports={generateComponents:generateComponents,generatePagePartialComponent:generatePagePartialComponent};
+const{createDir:createDir,writeFile:writeFile,isPrefabProject:isPrefabProject,getPagesDirPath:getPagesDirPath,formatContents:formatContents,getComponentName:getComponentName,getComponentModuleName:getComponentModuleName,getPrefabPagesDirPath:getPrefabPagesDirPath}=require("./wm-utils"),fs=require("fs"),cheerio=require("cheerio"),{getPageContents:getPageContents}=require("./pages-util"),{getHandlebarTemplate:getHandlebarTemplate,safeString:safeString}=require("./handlebar-helpers"),writeComponentHtmlFile=async(e,t,a)=>{const n=`${a}/${e}.component.html`;await writeFile(n,t.string)},writeComponentCssFile=async(e,t,a)=>{const n=`${a}/${e}.component.css`;await writeFile(n,t.string)},writeComponentVariablesFile=async(e,t,a,n)=>{let r=getHandlebarTemplate(e)({variables:a});await writeFile(`${n}/${t}.component.variables.ts`,formatContents(r))},writeComponentJsFile=async(e,t,a,n)=>{const r=getHandlebarTemplate(e)({jsContent:a});await writeFile(`${n}/${t}.component.script.js`,formatContents(r,"javascript"))},writeComponentExpressionsFile=async(e,t,a,n)=>{const r=getHandlebarTemplate(e)({expressions:a});await writeFile(`${n}/${t}.component.expressions.ts`,formatContents(r,"javascript"))},writeComponentTsFile=async(e,t,a,n)=>{let r=getHandlebarTemplate(e)({name:t,prefabName:a,componentName:getComponentName(t)});await writeFile(`${n}/${t}.component.ts`,r)},writePagePartialModuleTsFile=async(e,t,a,n,r,o,i=!1,s)=>{let m=getHandlebarTemplate(e)({name:t,componentName:getComponentName(t),moduleName:getComponentModuleName(t),requiredPartials:n,requiredPrefabs:r,requiredWMComponents:o,hasCustomElement:i,insidePrefab:!!s});await writeFile(`${a}/${t}.module.ts`,m)},writePrefabModuleTsFile=async(e,t,a,n=!1,r)=>{let o=getHandlebarTemplate("prefab-module-ts")({name:e,componentName:getComponentName(e),moduleName:getComponentModuleName(e),requiredPartials:r,requiredWMComponents:a,hasCustomElement:n});await writeFile(`${t}/${e}.module.ts`,o)},generateComponent=async(e,t,a,n,r,o)=>{await createDir(e,{recursive:!0});const{markup:i,styles:s,variables:m,script:p,expressions:l}=n;return Promise.all([writeComponentHtmlFile(t,safeString(i),e),writeComponentCssFile(t,safeString(s),e),writeComponentVariablesFile("component-variables",t,safeString(m),e),writeComponentJsFile(o,t,safeString(p),e),writeComponentExpressionsFile("component-expressions",t,safeString(l),e),writeComponentTsFile(r,t,a,e)])},findRequiredPartials=e=>{const t={};return e("[partialContainer]").map((t,a)=>e(a).attr("content")).toArray().map(e=>({type:"PARTIAL",name:e.trim()})).filter(e=>!t[e.name]&&(t[e.name]=!0))},findRequiredPrefabs=e=>{const t={};return e("[wmPrefab]").map((t,a)=>e(a).attr("prefabname")).toArray().map(e=>({type:"PREFAB",name:e.trim()})).filter(e=>!t[e.name]&&(t[e.name]=!0))},generatePagePartialComponent=async(e,t,a,n,r,o,i)=>{let s,m,p,l;if("PAGE"===n?(l=`${r}/src/app/pages/${a}`,s="page-component-ts",m="page-component-script",p="page-module-ts"):(l=o?`${r}/partials/${a}`:`${r}/src/app/partials/${a}`,s="partial-component-ts",m="partial-component-script",p="partial-module-ts"),fs.existsSync(`${l}/${a}.component.ts`))return;let g=`${e}/${a}`;o&&(g=`${getPrefabPagesDirPath(i,o)}/${a}`);const c=await getPageContents(t,g,`${a}`,a,n);try{const n=cheerio.load(c.markup),g=findRequiredPartials(n),P=findRequiredPrefabs(n);for(const a of g)await generatePagePartialComponent(e,t,a.name,a.type,r,o,i);await generateComponent(l,a,void 0,c,s,m),await writePagePartialModuleTsFile(p,a,l,g,P,c.requiredWMComponents,c.hasCustomElement,o)}catch(e){throw console.log("failed in "+a),e}},generateComponents=async(e,t,a,n,r,o)=>{const i=getPagesDirPath(e);for(const a of n.keys()){const m="__self__"===a?`${i}/Main`:`${getPrefabPagesDirPath(e,a)}/Main`,p=await getPageContents(t,m,"Main",a,"PREFAB",n.get(a)),l=`${r}/src/app/prefabs/${a}`,g=cheerio.load(p.markup),c=findRequiredPartials(g);await generateComponent(l,a,a,p,"prefab-component-ts","prefab-component-script");const P=o[a];for(var s=0;s<P.length;s++)await generatePagePartialComponent(i,t,P[s].name,P[s].type,l,a,e);await writePrefabModuleTsFile(a,l,p.requiredWMComponents,p.hasCustomElement,c)}if(!isPrefabProject(t))for(let n of a)await generatePagePartialComponent(i,t,n.name,n.type,r,n.prefabName,e)};module.exports={generateComponents:generateComponents,generatePagePartialComponent:generatePagePartialComponent};

angular-codegen/src/handlebar-helpers.js

@@ -1 +1 @@
-const Handlebars=require("handlebars"),fs=require("fs"),{getComponentName:getComponentName,isPrefabProject:isPrefabProject,getComponentModuleName:getComponentModuleName,getCodegenPath:getCodegenPath}=require("./wm-utils"),getPageRouteInfo=(e,t)=>{let n,a;if(null!==e){n="[AuthGuard]";for(const r of e)if(r.urlPattern.startsWith("/pages/")){r.urlPattern.split("/")[2]===t&&("Role"===r.permission?(n="[RoleGuard]",r.roles&&(a=JSON.stringify(r.roles))):"PermitAll"===r.permission&&(n=void 0))}}return`{\n        path: '${t}',\n        pathMatch: 'full',\n        loadChildren: () => import('./pages/${t}/${t}.module').then(m => m.${getComponentModuleName(t)}),\n        ${n?`canActivate: ${n},`:""}\n        data : {\n            ${a?`allowedRoles: ${a},`:""}\n            pageName: '${t}'\n        }\n    }`};Handlebars.registerHelper("PageComponentsImportStmts",(e,t)=>{if(isPrefabProject(e))return"";const n=t.filter(e=>"PAGE"===e.type).map(e=>`import { ${getComponentName(e.name)} } from './pages/${e.name}/${e.name}.component';`).join("\n");return safeString(n)}),Handlebars.registerHelper("WMComponentsImportStmts",(e=[])=>{const t=e.map(e=>`import { ${e.name} as ${e.as||"WM_"+e.name} } from '${e.from}';`).join("\n");return safeString(t)}),Handlebars.registerHelper("PartialModuleImportStmts",e=>{const t=e.filter(e=>"PARTIAL"===e.type).map(e=>`import { ${getComponentModuleName(e.name)} as Partial${getComponentModuleName(e.name)}} from '../../partials/${e.name}/${e.name}.module';`).join("\n");return safeString(t)}),Handlebars.registerHelper("PrefabPartialModuleImportStmts",e=>{const t=e.filter(e=>"PARTIAL"===e.type).map(e=>`import { ${getComponentModuleName(e.name)} as Partial${getComponentModuleName(e.name)}} from './partials/${e.name}/${e.name}.module';`).join("\n");return safeString(t)}),Handlebars.registerHelper("PartialModuleStmts",e=>{const t=e.filter(e=>"PARTIAL"===e.type).map(e=>"Partial"+getComponentModuleName(e.name)).join(",\n\t");return safeString(t)}),Handlebars.registerHelper("PrefabModuleImportStmts",e=>{const t=e.filter(e=>"PREFAB"===e.type).map(e=>`import { ${getComponentModuleName(e.name)} as Prefab${getComponentModuleName(e.name)} } from '../../prefabs/${e.name}/${e.name}.module';`).join("\n");return safeString(t)}),Handlebars.registerHelper("PrefabModuleStmts",e=>{const t=e.filter(e=>"PREFAB"===e.type).map(e=>"Prefab"+getComponentModuleName(e.name)).join(",\n\t");return safeString(t)}),Handlebars.registerHelper("WMComponentModuleStmts",e=>{const t=e.map(e=>`${e.as||"WM_"+e.name}${e.forRoot?".forRoot()":""}`).join(",\n\t");return safeString(t)}),Handlebars.registerHelper("PartialComponentsImportStmts",e=>{const t=e.filter(e=>"PAGE"!==e.type).map(e=>`import { ${getComponentName(e.name)} } from './partials/${e.name}/${e.name}.component';`).join("\n");return safeString(t)}),Handlebars.registerHelper("PrefabComponentsImportStmts",e=>{const t=[];for(const[n]of e.entries())t.push(`import { MainComponent as ${n}Component } from './prefabs/${n}/Main/Main.component';`);return safeString(t.join("\n"))}),Handlebars.registerHelper("RegisterComponents",(e,t,n)=>{let a=[];for(const[e]of n.entries())a.push(`ComponentRefProviderService.registerComponentRef('${e}', ComponentType.PREFAB, ${e}Component, null);`);return safeString(a.join("\n"))}),Handlebars.registerHelper("ComponentDeclarations",(e,t,n)=>{let a=[];for(const[e]of n.entries())a.push(`${e}Component`);return safeString(a.join(",\n\t"))}),Handlebars.registerHelper("RegisterPrefabConfig",e=>{const t=[];for(const[n,a]of e.entries())t.push(`registerPrefabConfig('${n}', ${a})`);return safeString(t.join("\n"))}),Handlebars.registerHelper("DefineHomePage",e=>isPrefabProject(e)?"prefab-preview":e.homePage),Handlebars.registerHelper("ImportPrefabPreviewComponent",e=>isPrefabProject(e)?safeString('import { PrefabPreviewComponent } from "@wm/runtime/base";'):""),Handlebars.registerHelper("DefineAppRoutes",(e,t,n)=>{const a=t.filter(e=>"PAGE"===e.type).map(e=>getPageRouteInfo(n,e.name));let r="";return r=isPrefabProject(e)?"{\n            path: 'prefab-preview',\n            resolve: appDependenciesResolve,\n            component: PrefabPreviewComponent\n        }":`{\n            path: '',\n            resolve: appDependenciesResolve,\n            children: [\n                ${a.join(",\n")}\n            ]\n        }`,safeString(`[\n        {\n            path: '',\n            pathMatch: 'full',\n            component: EmptyPageComponent,\n            resolve: appDependenciesResolve\n        },\n        ${r},\n        {\n            path: "**",\n            canActivate: [PageNotFoundGaurd],\n            component: EmptyPageComponent\n        }\n    ]`)}),Handlebars.registerHelper("DefinePrefabModules",e=>`{ ${e} }`),Handlebars.registerHelper("DefinePartialModules",e=>`{ ${e} }`),Handlebars.registerHelper("DefinePrefabPartialModules",e=>`{ ${e} }`);const templates=new Map,initTemplates=()=>{const e=getCodegenPath()+"/templates/";templates.set("app-module-ts",Handlebars.compile(fs.readFileSync(e+"app.module.ts.hbs","utf-8"))),templates.set("app-codegen-module",Handlebars.compile(fs.readFileSync(e+"app-codegen.module.ts.hbs","utf-8"))),templates.set("app-prefabs-module",Handlebars.compile(fs.readFileSync(e+"app-prefabs.module.ts.hbs","utf-8"))),templates.set("prefab-config",Handlebars.compile(fs.readFileSync(e+"prefab/prefab-config.ts.hbs","utf-8"))),templates.set("app-routes",Handlebars.compile(fs.readFileSync(e+"app-routes.ts.hbs","utf-8"))),templates.set("lazy-module-routes",Handlebars.compile(fs.readFileSync(e+"lazy-module-routes.ts.hbs","utf-8"))),templates.set("wm-project-properties",Handlebars.compile(fs.readFileSync(e+"wm-project-properties.ts.hbs","utf-8"))),templates.set("component-variables",Handlebars.compile(fs.readFileSync(e+"component.variables.ts.hbs","utf-8"))),templates.set("app-component-script",Handlebars.compile(fs.readFileSync(e+"app.component.script.js.hbs","utf-8"))),templates.set("page-component-ts",Handlebars.compile(fs.readFileSync(e+"page/page.component.ts.hbs","utf-8"))),templates.set("page-component-script",Handlebars.compile(fs.readFileSync(e+"page/page.component.script.js.hbs","utf-8"))),templates.set("page-module-ts",Handlebars.compile(fs.readFileSync(e+"page/page.module.ts.hbs","utf-8"))),templates.set("partial-component-ts",Handlebars.compile(fs.readFileSync(e+"partial/partial.component.ts.hbs","utf-8"))),templates.set("partial-component-script",Handlebars.compile(fs.readFileSync(e+"partial/partial.component.script.js.hbs","utf-8"))),templates.set("partial-module-ts",Handlebars.compile(fs.readFileSync(e+"partial/partial.module.ts.hbs","utf-8"))),templates.set("prefab-component-ts",Handlebars.compile(fs.readFileSync(e+"prefab/prefab.component.ts.hbs","utf-8"))),templates.set("prefab-module-ts",Handlebars.compile(fs.readFileSync(e+"prefab/prefab.module.ts.hbs","utf-8"))),templates.set("prefab-component-script",Handlebars.compile(fs.readFileSync(e+"prefab/prefab.component.script.js.hbs","utf-8")))},getHandlebarTemplate=e=>templates.get(e),safeString=e=>new Handlebars.SafeString(e);module.exports={getHandlebarTemplate:getHandlebarTemplate,safeString:safeString,initTemplates:initTemplates};
+const Handlebars=require("handlebars"),fs=require("fs"),{getComponentName:getComponentName,isPrefabProject:isPrefabProject,getComponentModuleName:getComponentModuleName,getCodegenPath:getCodegenPath}=require("./wm-utils"),getPageRouteInfo=(e,t)=>{let n,a;if(null!==e){n="[AuthGuard]";for(const r of e)if(r.urlPattern.startsWith("/pages/")){r.urlPattern.split("/")[2]===t&&("Role"===r.permission?(n="[RoleGuard]",r.roles&&(a=JSON.stringify(r.roles))):"PermitAll"===r.permission&&(n=void 0))}}return`{\n        path: '${t}',\n        pathMatch: 'full',\n        loadChildren: () => import('./pages/${t}/${t}.module').then(m => m.${getComponentModuleName(t)}),\n        ${n?`canActivate: ${n},`:""}\n        data : {\n            ${a?`allowedRoles: ${a},`:""}\n            pageName: '${t}'\n        }\n    }`};Handlebars.registerHelper("PageComponentsImportStmts",(e,t)=>{if(isPrefabProject(e))return"";const n=t.filter(e=>"PAGE"===e.type).map(e=>`import { ${getComponentName(e.name)} } from './pages/${e.name}/${e.name}.component';`).join("\n");return safeString(n)}),Handlebars.registerHelper("WMComponentsImportStmts",(e=[])=>{const t=e.map(e=>`import { ${e.name} as ${e.as||"WM_"+e.name} } from '${e.from}';`).join("\n");return safeString(t)}),Handlebars.registerHelper("PartialModuleImportStmts",e=>{const t=e.filter(e=>"PARTIAL"===e.type).map(e=>`import { ${getComponentModuleName(e.name)} as Partial${getComponentModuleName(e.name)}} from '../../partials/${e.name}/${e.name}.module';`).join("\n");return safeString(t)}),Handlebars.registerHelper("PrefabPartialModuleImportStmts",e=>{const t=e.filter(e=>"PARTIAL"===e.type).map(e=>`import { ${getComponentModuleName(e.name)} as Partial${getComponentModuleName(e.name)}} from './partials/${e.name}/${e.name}.module';`).join("\n");return safeString(t)}),Handlebars.registerHelper("PartialModuleStmts",e=>{const t=e.filter(e=>"PARTIAL"===e.type).map(e=>"Partial"+getComponentModuleName(e.name)).join(",\n\t");return safeString(t)}),Handlebars.registerHelper("PrefabModuleImportStmts",e=>{const t=e.filter(e=>"PREFAB"===e.type).map(e=>`import { ${getComponentModuleName(e.name)} as Prefab${getComponentModuleName(e.name)} } from '../../prefabs/${e.name}/${e.name}.module';`).join("\n");return safeString(t)}),Handlebars.registerHelper("PrefabModuleStmts",e=>{const t=e.filter(e=>"PREFAB"===e.type).map(e=>"Prefab"+getComponentModuleName(e.name)).join(",\n\t");return safeString(t)}),Handlebars.registerHelper("WMComponentModuleStmts",e=>{const t=e.map(e=>`${e.as||"WM_"+e.name}${e.forRoot?".forRoot()":""}`).join(",\n\t");return safeString(t)}),Handlebars.registerHelper("PartialComponentsImportStmts",e=>{const t=e.filter(e=>"PAGE"!==e.type).map(e=>`import { ${getComponentName(e.name)} } from './partials/${e.name}/${e.name}.component';`).join("\n");return safeString(t)}),Handlebars.registerHelper("PrefabComponentsImportStmts",e=>{const t=[];for(const[n]of e.entries())t.push(`import { MainComponent as ${n}Component } from './prefabs/${n}/Main/Main.component';`);return safeString(t.join("\n"))}),Handlebars.registerHelper("RegisterComponents",(e,t,n)=>{let a=[];for(const[e]of n.entries())a.push(`ComponentRefProviderService.registerComponentRef('${e}', ComponentType.PREFAB, ${e}Component, null);`);return safeString(a.join("\n"))}),Handlebars.registerHelper("ComponentDeclarations",(e,t,n)=>{let a=[];for(const[e]of n.entries())a.push(`${e}Component`);return safeString(a.join(",\n\t"))}),Handlebars.registerHelper("RegisterPrefabConfig",e=>{const t=[];for(const[n,a]of e.entries())t.push(`registerPrefabConfig('${n}', ${a})`);return safeString(t.join("\n"))}),Handlebars.registerHelper("DefineHomePage",e=>isPrefabProject(e)?"prefab-preview":e.homePage),Handlebars.registerHelper("ImportPrefabPreviewComponent",e=>isPrefabProject(e)?safeString('import { PrefabPreviewComponent } from "@wm/runtime/base";'):""),Handlebars.registerHelper("DefineAppRoutes",(e,t,n)=>{const a=t.filter(e=>"PAGE"===e.type).map(e=>getPageRouteInfo(n,e.name));let r="";return r=isPrefabProject(e)?"{\n            path: 'prefab-preview',\n            resolve: appDependenciesResolve,\n            component: PrefabPreviewComponent\n        }":`{\n            path: '',\n            resolve: appDependenciesResolve,\n            children: [\n                ${a.join(",\n")}\n            ]\n        }`,safeString(`[\n        {\n            path: '',\n            pathMatch: 'full',\n            component: EmptyPageComponent,\n            resolve: appDependenciesResolve\n        },\n        ${r},\n        {\n            path: "**",\n            canActivate: [PageNotFoundGaurd],\n            component: EmptyPageComponent\n        }\n    ]`)}),Handlebars.registerHelper("DefinePrefabModules",e=>`{ ${e} }`),Handlebars.registerHelper("DefinePartialModules",e=>`{ ${e} }`),Handlebars.registerHelper("DefinePrefabPartialModules",e=>`{ ${e} }`);const templates=new Map,initTemplates=()=>{const e=getCodegenPath()+"/templates/";templates.set("app-module-ts",Handlebars.compile(fs.readFileSync(e+"app.module.ts.hbs","utf-8"))),templates.set("app-codegen-module",Handlebars.compile(fs.readFileSync(e+"app-codegen.module.ts.hbs","utf-8"))),templates.set("app-prefabs-module",Handlebars.compile(fs.readFileSync(e+"app-prefabs.module.ts.hbs","utf-8"))),templates.set("prefab-config",Handlebars.compile(fs.readFileSync(e+"prefab/prefab-config.ts.hbs","utf-8"))),templates.set("app-routes",Handlebars.compile(fs.readFileSync(e+"app-routes.ts.hbs","utf-8"))),templates.set("lazy-module-routes",Handlebars.compile(fs.readFileSync(e+"lazy-module-routes.ts.hbs","utf-8"))),templates.set("wm-project-properties",Handlebars.compile(fs.readFileSync(e+"wm-project-properties.ts.hbs","utf-8"))),templates.set("component-variables",Handlebars.compile(fs.readFileSync(e+"component.variables.ts.hbs","utf-8"))),templates.set("component-expressions",Handlebars.compile(fs.readFileSync(e+"component.expressions.ts.hbs","utf-8"))),templates.set("app-component-script",Handlebars.compile(fs.readFileSync(e+"app.component.script.js.hbs","utf-8"))),templates.set("page-component-ts",Handlebars.compile(fs.readFileSync(e+"page/page.component.ts.hbs","utf-8"))),templates.set("page-component-script",Handlebars.compile(fs.readFileSync(e+"page/page.component.script.js.hbs","utf-8"))),templates.set("page-module-ts",Handlebars.compile(fs.readFileSync(e+"page/page.module.ts.hbs","utf-8"))),templates.set("partial-component-ts",Handlebars.compile(fs.readFileSync(e+"partial/partial.component.ts.hbs","utf-8"))),templates.set("partial-component-script",Handlebars.compile(fs.readFileSync(e+"partial/partial.component.script.js.hbs","utf-8"))),templates.set("partial-module-ts",Handlebars.compile(fs.readFileSync(e+"partial/partial.module.ts.hbs","utf-8"))),templates.set("prefab-component-ts",Handlebars.compile(fs.readFileSync(e+"prefab/prefab.component.ts.hbs","utf-8"))),templates.set("prefab-module-ts",Handlebars.compile(fs.readFileSync(e+"prefab/prefab.module.ts.hbs","utf-8"))),templates.set("prefab-component-script",Handlebars.compile(fs.readFileSync(e+"prefab/prefab.component.script.js.hbs","utf-8"))),templates.set("expr-vs-fn",Handlebars.compile(fs.readFileSync(e+"expr-vs-fn.hbs","utf-8")))},getHandlebarTemplate=e=>templates.get(e),safeString=e=>new Handlebars.SafeString(e);module.exports={getHandlebarTemplate:getHandlebarTemplate,safeString:safeString,initTemplates:initTemplates};

angular-codegen/src/pages-util.js

@@ -1 +1 @@
-global.$=require("jquery"),global._=require("lodash"),global._WM_APP_PROPERTIES={};const cheerio=require("cheerio"),{readFile:readFile,isMobileProject:isMobileProject}=require("./wm-utils"),nodePolyfill=require("node-window-polyfill").register(!1),getRequiredScripts=e=>{const t={wmCalendar:["./node_modules/fullcalendar/dist/fullcalendar.min.js"],wmChart:["./node_modules/d3/d3.min.js","./node_modules/@wavemaker.com/nvd3/build/nv.d3.min.js"],wmChips:["./node_modules/jquery-ui/ui/widgets/sortable.js"],wmList:["./node_modules/jquery-ui/ui/widgets/droppable.js","./node_modules/jquery-ui/ui/widgets/sortable.js"],wmRichtexteditor:["./node_modules/summernote/dist/summernote-lite.min.js"],wmTable:[global._WM_PACKAGE_PATH+"/scripts/datatable/datatable.js","./node_modules/jquery-ui/ui/widgets/resizable.js"]};let r=[];return _.each(t,(t,o)=>{e("["+o+"]").length>0&&(r=r.concat(t))}),r=r.map(e=>e.replace(/^(\.\/)/,"").replace(/\//g,"-")),_.uniq(r)},includesCustomElement=e=>{return cheerio.load(e)('[html-custom-element="true"]').length},getPageContents=async(e,t,r,o,i)=>{try{const l=`${t}/${r}`,s=await readFile(`${l}.html`,"utf8"),a=await readFile(`${l}.js`,"utf8"),n=await readFile(`${l}.css`,"utf8"),d=await readFile(`${l}.variables.json`,"utf8");let u;global._WM_APP_PROPERTIES=e,window=window||{},window._WM_APP_PROPERTIES=e;const m=(u=isMobileProject(e)?require("../dependencies/transpilation-mobile.cjs"):require("../dependencies/transpilation-web.cjs")).transpile(s),c=cheerio.load(m.markup),p=getRequiredScripts(c);return p.length>0&&(m.markup=m.markup.replace(">",` scripts-to-load="${p.join(",")}">`)),{markup:m.markup,script:a,styles:u.scopeComponentStyles(o,i,n),variables:d,requiredWMComponents:m.requiredWMComponents.filter(t=>!t.platformType||t.platformType===e.platformType),hasCustomElement:includesCustomElement(s)}}catch(e){throw console.error(`error occurred in transpilation of ${r}`,e),e}};module.exports={getPageContents:getPageContents};
+global.$=require("jquery"),global._=require("lodash"),global._WM_APP_PROPERTIES={};const cheerio=require("cheerio"),{generatePageExpressions:generatePageExpressions}=require("./expr-parser-utils"),{readFile:readFile,isMobileProject:isMobileProject}=require("./wm-utils"),nodePolyfill=require("node-window-polyfill").register(!1),getRequiredScripts=e=>{const r={wmCalendar:["./node_modules/fullcalendar/dist/fullcalendar.min.js"],wmChart:["./node_modules/d3/d3.min.js","./node_modules/@wavemaker.com/nvd3/build/nv.d3.min.js"],wmChips:["./node_modules/jquery-ui/ui/widgets/sortable.js"],wmList:["./node_modules/jquery-ui/ui/widgets/droppable.js","./node_modules/jquery-ui/ui/widgets/sortable.js"],wmRichtexteditor:["./node_modules/summernote/dist/summernote-lite.min.js"],wmTable:[global._WM_PACKAGE_PATH+"/scripts/datatable/datatable.js","./node_modules/jquery-ui/ui/widgets/resizable.js"]};let t=[];return _.each(r,(r,s)=>{e("["+s+"]").length>0&&(t=t.concat(r))}),t=t.map(e=>e.replace(/^(\.\/)/,"").replace(/\//g,"-")),_.uniq(t)},includesCustomElement=e=>{return cheerio.load(e)('[html-custom-element="true"]').length},getPageContents=async(e,r,t,s,i,o)=>{try{const l=`${r}/${t}`,a=await readFile(`${l}.html`,"utf8"),n=await readFile(`${l}.js`,"utf8"),u=await readFile(`${l}.css`,"utf8"),d=await readFile(`${l}.variables.json`,"utf8");let m;global._WM_APP_PROPERTIES=e,window=window||{},window._WM_APP_PROPERTIES=e;const p=(m=isMobileProject(e)?require("../dependencies/transpilation-mobile.cjs"):require("../dependencies/transpilation-web.cjs")).transpile(a),c=cheerio.load(p.markup),g=getRequiredScripts(c);return g.length>0&&(p.markup=p.markup.replace(">",` scripts-to-load="${g.join(",")}">`)),{markup:p.markup,script:n,styles:m.scopeComponentStyles(s,i,u),variables:d,expressions:generatePageExpressions(p.markup,d,o),requiredWMComponents:p.requiredWMComponents.filter(r=>!r.platformType||r.platformType===e.platformType),hasCustomElement:includesCustomElement(a)}}catch(e){throw console.error(`error occurred in transpilation of ${t}`,e),e}};module.exports={getPageContents:getPageContents};

angular-codegen/src/wm-utils.js

@@ -1 +1 @@
-const util=require("util"),fs=require("fs"),rimraf=require("rimraf"),decodeUriComponent=require("decode-uri-component"),upperFirst=require("lodash/upperFirst"),tar=require("tar-fs"),prettier=require("prettier"),js_beautify=require("js-beautify"),path=require("path"),stat=util.promisify(fs.stat),createDir=util.promisify(fs.mkdir),createReadStream=util.promisify(fs.createReadStream),readFile=util.promisify(fs.readFile),writeFile=util.promisify(fs.writeFile),readDir=util.promisify(fs.readdir),rename=util.promisify(fs.rename),searchFileByName=(e,t,r)=>{if(!fs.existsSync(e))return;fs.readdirSync(e).forEach(a=>{const i=path.join(e,a);fs.lstatSync(i).isDirectory()?searchFileByName(i,t,r):t.test(i)&&r(i)})},deleteResource=async e=>stat(e).then(()=>new Promise((t,r)=>{rimraf(e,()=>t())}),()=>Promise.resolve()),getComponentName=e=>`${upperFirst(e)}Component`,getComponentModuleName=e=>`${upperFirst(e)}Module`,decodeURIComponent=e=>decodeUriComponent(e.replace(/\+/g," ")),createTar=(e,t)=>new Promise((r,a)=>{tar.pack(e).pipe(fs.createWriteStream(t)).on("finish",r)}),extractTar=(e,t)=>new Promise((r,a)=>{fs.createReadStream(e).pipe(tar.extract(t)).on("finish",r)}),getWebAppPath=e=>`${e}/src/main/webapp`,getPagesDirPath=e=>`${getWebAppPath(e)}/pages`,getPagesConfigPath=e=>`${getWebAppPath(e)}/pages/pages-config.json`,getPrefabsDirPath=e=>`${getWebAppPath(e)}/WEB-INF/prefabs`,getPrefabConfigPath=(e,t)=>`${getPrefabsDirPath(e)}/${t}/webapp/config.json`,getPrefabPagesDirPath=(e,t)=>`${getPrefabsDirPath(e)}/${t}/webapp/pages`,getSecurityConfigPath=e=>`${e}/services/securityService/designtime/intercept-urls.json`,getRolesConfigPath=e=>`${e}/services/securityService/designtime/roles.json`,getAuthInfoFilePath=e=>`${e}/services/securityService/designtime/auth-info.json`,getAppJsFilePath=e=>`${getWebAppPath(e)}/app.js`,getAppVariablesFilePath=e=>`${getWebAppPath(e)}/app.variables.json`,getWmProjectPropertiesFilePath=e=>`${e}/.wmproject.properties`,getIndexHtmlPath=e=>`${getWebAppPath(e)}/index.html`;let codegenPath="./node_modules/@wavemaker/angular-codegen";const setCodegenPath=e=>{e&&(codegenPath=e)},getCodegenPath=()=>codegenPath,formatContents=(e="",t)=>"javascript"===t?js_beautify(e,{}):prettier.format(e,{semi:!1,parser:"typescript",tabWidth:4}),isMobileProject=e=>"MOBILE"===e.platformType,isPrefabProject=e=>"PREFAB"===e.type,readFileSync=(e,t)=>{let r=fs.readFileSync(e);return t?JSON.parse(r):r};module.exports={stat:stat,createDir:createDir,createReadStream:createReadStream,readFile:readFile,writeFile:writeFile,deleteResource:deleteResource,getComponentName:getComponentName,getComponentModuleName:getComponentModuleName,decodeURIComponent:decodeURIComponent,createTar:createTar,extractTar:extractTar,readDir:readDir,rename:rename,searchFileByName:searchFileByName,getWebAppPath:getWebAppPath,getPagesDirPath:getPagesDirPath,getPagesConfigPath:getPagesConfigPath,getPrefabsDirPath:getPrefabsDirPath,getPrefabConfigPath:getPrefabConfigPath,getPrefabPagesDirPath:getPrefabPagesDirPath,getSecurityConfigPath:getSecurityConfigPath,getRolesConfigPath:getRolesConfigPath,getAuthInfoFilePath:getAuthInfoFilePath,getAppJsFilePath:getAppJsFilePath,getAppVariablesFilePath:getAppVariablesFilePath,getWmProjectPropertiesFilePath:getWmProjectPropertiesFilePath,getIndexHtmlPath:getIndexHtmlPath,formatContents:formatContents,isMobileProject:isMobileProject,isPrefabProject:isPrefabProject,readFileSync:readFileSync,getCodegenPath:getCodegenPath,setCodegenPath:setCodegenPath};
+const util=require("util"),fs=require("fs"),rimraf=require("rimraf"),decodeUriComponent=require("decode-uri-component"),upperFirst=require("lodash/upperFirst"),tar=require("tar-fs"),prettier=require("prettier"),js_beautify=require("js-beautify"),path=require("path"),stat=util.promisify(fs.stat),createDir=util.promisify(fs.mkdir),createReadStream=util.promisify(fs.createReadStream),readFile=util.promisify(fs.readFile),writeFile=util.promisify(fs.writeFile),readDir=util.promisify(fs.readdir),rename=util.promisify(fs.rename),searchFileByName=(e,t,r)=>{if(!fs.existsSync(e))return;fs.readdirSync(e).forEach(a=>{const i=path.join(e,a);fs.lstatSync(i).isDirectory()?searchFileByName(i,t,r):t.test(i)&&r(i)})},deleteResource=async e=>stat(e).then(()=>new Promise((t,r)=>{rimraf(e,()=>t())}),()=>Promise.resolve()),getComponentName=e=>`${upperFirst(e)}Component`,getComponentModuleName=e=>`${upperFirst(e)}Module`,decodeURIComponent=e=>decodeUriComponent(e.replace(/\+/g," ")),createTar=(e,t)=>new Promise((r,a)=>{tar.pack(e).pipe(fs.createWriteStream(t)).on("finish",r)}),extractTar=(e,t)=>new Promise((r,a)=>{fs.createReadStream(e).pipe(tar.extract(t)).on("finish",r)}),getWebAppPath=e=>`${e}/src/main/webapp`,getPagesDirPath=e=>`${getWebAppPath(e)}/pages`,getPagesConfigPath=e=>`${getWebAppPath(e)}/pages/pages-config.json`,getPrefabsDirPath=e=>`${getWebAppPath(e)}/WEB-INF/prefabs`,getPrefabConfigPath=(e,t)=>`${getPrefabsDirPath(e)}/${t}/webapp/config.json`,getPrefabPagesDirPath=(e,t)=>`${getPrefabsDirPath(e)}/${t}/webapp/pages`,getSecurityConfigPath=e=>`${e}/services/securityService/designtime/intercept-urls.json`,getRolesConfigPath=e=>`${e}/services/securityService/designtime/roles.json`,getAuthInfoFilePath=e=>`${e}/services/securityService/designtime/auth-info.json`,getAppJsFilePath=e=>`${getWebAppPath(e)}/app.js`,getAppVariablesFilePath=e=>`${getWebAppPath(e)}/app.variables.json`,getWmProjectPropertiesFilePath=e=>`${e}/.wmproject.properties`,getIndexHtmlPath=e=>`${getWebAppPath(e)}/index.html`;let codegenPath="./node_modules/@wavemaker/angular-codegen";const setCodegenPath=e=>{e&&(codegenPath=e)},getCodegenPath=()=>codegenPath,formatContents=(e="",t)=>"javascript"===t?js_beautify(e,{}):prettier.format(e,{semi:!1,parser:"typescript",tabWidth:4}),isMobileProject=e=>"MOBILE"===e.platformType,isPrefabProject=e=>"PREFAB"===e.type,readFileSync=(e,t)=>{let r=fs.readFileSync(e);return t?JSON.parse(r):r},initExpressionParser=()=>{const e=require("../dependencies/expression-parser.cjs"),t=require("../dependencies/pipe-provider.cjs");e.setPipeProvider(new t.PipeProvider({},{get:()=>{}},{}))};module.exports={stat:stat,createDir:createDir,createReadStream:createReadStream,readFile:readFile,writeFile:writeFile,deleteResource:deleteResource,getComponentName:getComponentName,getComponentModuleName:getComponentModuleName,decodeURIComponent:decodeURIComponent,createTar:createTar,extractTar:extractTar,readDir:readDir,rename:rename,searchFileByName:searchFileByName,getWebAppPath:getWebAppPath,getPagesDirPath:getPagesDirPath,getPagesConfigPath:getPagesConfigPath,getPrefabsDirPath:getPrefabsDirPath,getPrefabConfigPath:getPrefabConfigPath,getPrefabPagesDirPath:getPrefabPagesDirPath,getSecurityConfigPath:getSecurityConfigPath,getRolesConfigPath:getRolesConfigPath,getAuthInfoFilePath:getAuthInfoFilePath,getAppJsFilePath:getAppJsFilePath,getAppVariablesFilePath:getAppVariablesFilePath,getWmProjectPropertiesFilePath:getWmProjectPropertiesFilePath,getIndexHtmlPath:getIndexHtmlPath,formatContents:formatContents,isMobileProject:isMobileProject,isPrefabProject:isPrefabProject,readFileSync:readFileSync,getCodegenPath:getCodegenPath,setCodegenPath:setCodegenPath,initExpressionParser:initExpressionParser};

angular-codegen/templates/app.component.script.js.hbs

@@ -1,3 +1,8 @@
+import { expressionData } from './app.component.expressions'
+
 export const initScript = (App, Utils, Injector) => {
     {{ jsContent }}
-}
+
+    // register binding expression functions
+    App.registerExpressions(expressionData);
+}

angular-codegen/templates/component.expressions.ts.hbs

@@ -0,0 +1,3 @@
+export const expressionData = {
+{{expressions}}
+};

angular-codegen/templates/expr-vs-fn.hbs

@@ -0,0 +1,3 @@
+"{{expr}}": [function({{fnArgs}}){
+    {{fnBody}}
+},[{{fnPipes}}]]

angular-codegen/templates/page/page.component.ts.hbs

@@ -4,6 +4,7 @@ import { UserDefinedExecutionContext } from '@wm/core';
 
 import { initScript } from './{{name}}.component.script';
 import { getVariables } from './{{name}}.component.variables';
+import { expressionData } from './{{name}}.component.expressions';
 
 import { BasePageComponent } from '@wm/runtime/base';
 
@@ -36,4 +37,9 @@ export class {{componentName}} extends BasePageComponent {
     evalUserScript(Page, App, Utils) {
         initScript(Page, App, Utils);
     }
-}
+
+    getExpressions() {
+        return expressionData;
+    }
+
+}

angular-codegen/templates/partial/partial.component.ts.hbs

@@ -4,6 +4,7 @@ import { UserDefinedExecutionContext } from '@wm/core';
 
 import { initScript } from './{{name}}.component.script';
 import { getVariables } from './{{name}}.component.variables';
+import { expressionData } from './{{name}}.component.expressions';
 
 import { BasePartialComponent } from '@wm/runtime/base';
 
@@ -36,4 +37,9 @@ export class {{componentName}} extends BasePartialComponent {
     evalUserScript(Partial, App, Utils) {
         initScript(Partial, App, Utils);
     }
+
+    getExpressions() {
+        return expressionData;
+    }
+
 }

angular-codegen/templates/prefab/prefab.component.ts.hbs

@@ -4,6 +4,7 @@ import { UserDefinedExecutionContext } from '@wm/core';
 
 import { initScript } from './{{name}}.component.script';
 import { getVariables } from './{{name}}.component.variables';
+import { expressionData } from './{{name}}.component.expressions';
 
 import { BasePrefabComponent } from '@wm/runtime/base';
 
@@ -36,4 +37,9 @@ export class {{componentName}} extends BasePrefabComponent {
     evalUserScript(Prefab, App, Utils) {
         initScript(Prefab, App, Utils);
     }
+
+    getExpressions() {
+        return expressionData;
+    }
+
 }