@wavemaker/angular-codegen 11.0.0-next.139404 → 11.0.0-next.139405

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

@@ -128,28 +128,49 @@ const addScriptForWMStylesPath = () => {
             </script>`);
 }
 
+/**
+ * Read the console arguments and prepare the key value pairs.
+ * @returns Object console arguments as key value pairs
+ */
+const getArgs = (customArgs) => {
+    const args = {};
+    let arguments = customArgs || process.argv;
+    arguments.slice(2, process.argv.length)
+        .forEach(arg => {
+            if (arg.slice(0, 2) === '--') {
+                const longArg = arg.split('=');
+                const longArgFlag = longArg[0].slice(2, longArg[0].length);
+                const longArgValue = longArg.length > 2 ? longArg.slice(1, longArg.length).join('=') : longArg[1];
+                args[longArgFlag] = longArgValue;
+            }
+        });
+    return args;
+}
+
+const args = getArgs();
+
 // Files that are moved out of ng-bundle and hence not to be updated.
 const SKIP_UPDATE = ['index.html', 'manifest.json'];
-// Suffix to be appended to all file names except the ones to skip.
-const SUFFIX = './ng-bundle';
 
 /**
  * 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 {object} updatedFileNames a map from old filenames to new filenames
  * @returns {string} an updated file path
  */
-const getUpdatedFileName = (url, updatedFileNames) => {
+const getUpdatedFileName = (deployUrl, url, updatedFileNames) => {
     const absUrl = url.substring(1); // remove leading '/'
     if (SKIP_UPDATE.includes(absUrl)) {
-        return `.${url}`;
+        return absUrl;
     }
+
     if (absUrl in updatedFileNames) {
-        return `${SUFFIX}/${updatedFileNames[absUrl]}` // add the leading '/' back
+        return `${deployUrl}/${updatedFileNames[absUrl]}` // add the leading '/' back
     }
-    return `${SUFFIX}${url}`;
+    return `${deployUrl}${url}`;
 }
 
 /**
@@ -168,34 +189,58 @@ const getUpdatedFileHashes = (url, oldHash, updatedFileHashes) => {
     return oldHash;
 }
 
+/**
+ * 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'
+ */
+const getIconPath = (iconPath) => {
+    var index = iconPath.indexOf("/", iconPath.indexOf("/") + 1);
+    return iconPath.substring(index + 1);
+}
+
 /**
  * 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}
  */
-const updatePwaAssets = (updatedFileNames, updatedFileHashes) => {
+const updatePwaAssets = (deployUrl, updatedFileNames, updatedFileHashes) => {
+    const ngswPath = './dist/ngsw.json';
+    const manifestPath = './dist/manifest.json';
+
     // copy service worker and its config to root directory
     fs.copyFileSync('./dist/ng-bundle/ngsw-worker.js', './dist/ngsw-worker.js');
-    fs.copyFileSync('./dist/ng-bundle/ngsw.json', './dist/ngsw.json');
-    fs.copyFileSync('./dist/ng-bundle/manifest.json', './dist/manifest.json');
+    fs.copyFileSync('./dist/ng-bundle/wmsw-worker.js', './dist/wmsw-worker.js');
+    fs.copyFileSync('./dist/ng-bundle/ngsw.json', ngswPath);
+    fs.copyFileSync('./dist/ng-bundle/manifest.json', manifestPath);
+
+    // update the icons url in manifest.json
+    const manifest = JSON.parse(fs.readFileSync(manifestPath).toString());
+    const updatedManifest = {
+        ...manifest,
+        icons: manifest.icons.map(icon => ({ ...icon, src: `${deployUrl}/${getIconPath(icon.src)}` })),
+    }
+    const manifestContent = JSON.stringify(updatedManifest, null, 4);
+    fs.writeFileSync(manifestPath, manifestContent);
+    updatedFileHashes['manifest.json'] = generateSha1(manifestContent);
 
     // edit service worker config to include ./ng-bundle to the path of files to be cached
     // also update the urls to files whose names are modified to include file hash (wm-styles)
-    const fileName = './dist/ngsw.json';
-    const ngswData = JSON.parse(fs.readFileSync(fileName).toString());
-
+    const ngswData = JSON.parse(fs.readFileSync(ngswPath).toString());
     ngswData.assetGroups = ngswData.assetGroups.map(group => ({
         ...group,
-        urls: group.urls.map(url => getUpdatedFileName(url, updatedFileNames))
+        urls: group.urls.map(url => getUpdatedFileName(deployUrl, url, updatedFileNames))
     }));
     ngswData.hashTable = Object.keys(ngswData.hashTable).reduce((prev, current) => ({
         ...prev,
-        [getUpdatedFileName(current, updatedFileNames)]: getUpdatedFileHashes(current, ngswData.hashTable[current], updatedFileHashes),
-    }), { });
+        [getUpdatedFileName(deployUrl, current, updatedFileNames)]: getUpdatedFileHashes(current, ngswData.hashTable[current], updatedFileHashes),
+    }), {});
 
     const ngswContent = JSON.stringify(ngswData, null, 4);
-    fs.writeFileSync(fileName, ngswContent);
+    fs.writeFileSync(ngswPath, ngswContent);
 }
 
 /**
@@ -213,10 +258,11 @@ const generateSha1 = (content) => {
     try {
         const angularJson = require(`${process.cwd()}/angular.json`);
         const build = angularJson['projects']['angular-app']['architect']['build'];
-        let deployUrl = build['options']['deployUrl'];
+        let deployUrl = args['deploy-url'] || build['options']['deployUrl'];
         if (deployUrl.endsWith('/')) {
-            deployUrl = deployUrl.substr(0, deployUrl.length - 1);
+            deployUrl = deployUrl.slice(0, deployUrl.length - 1);
         }
+
         fs.copyFileSync('./dist/ng-bundle/index.html', './dist/index.html');
         const contents = await readFile(`./dist/index.html`, `utf8`);
         $ = cheerio.load(contents);
@@ -243,8 +289,8 @@ const generateSha1 = (content) => {
         }
         // if service worker is enabled the app is a PWA
         const serviceWorkerEnabled = build['configurations']['production']['serviceWorker'];
-        const updatedFilenames = { }
-        const updatedFileHashes = { }
+        const updatedFilenames = {}
+        const updatedFileHashes = {}
 
         if (isMobileProject) {
             await addMobileSpecificStyles(deployUrl);
@@ -273,7 +319,7 @@ const generateSha1 = (content) => {
         if (serviceWorkerEnabled) {
             // re-generate hash for index.html since its been modified
             updatedFileHashes['index.html'] = generateSha1(htmlContent);
-            updatePwaAssets(updatedFilenames, updatedFileHashes);
+            updatePwaAssets(deployUrl, updatedFilenames, updatedFileHashes);
         }
     } catch (e) {
         console.error(`Error in Post ng build Script | ${e}`);

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

angular-codegen/build-angular-app.js

@@ -17,7 +17,14 @@ const { downloadNPMPackage } = require('./download-packages');
 
 const { executeSyncCmd, args, MSG_NG_RUNTIME_LOG, MSG_NG_RUNTIME_SUCCESS } = require('./build-util');
 
-
+/**
+ * @TODO: This is a temporary workaround to extract deploy-url from 'ngBuildParams', need to be replaced in future.
+ */
+const getDeployUrl = (ngBuildParams) => {
+    let buildArgs = ngBuildParams.split(' ');
+    const deployParam = buildArgs.find(i => i.startsWith("--deploy-url="));
+    return deployParam ? deployParam.split("=")[1] : 'ng-bundle/';
+};
 
 /**
  * Download the app runtime package
@@ -34,27 +41,26 @@ const init = () => {
         infoMsg: MSG_NG_RUNTIME_LOG
 
     }
-       
+
     try {
         // Symlink to reuse the existing node_modules
-        if(args.optimizeUIBuild === 'true') {
+        if (args.optimizeUIBuild === 'true') {
             // Download app-ng-runtime node modules
             let pathNGRuntimePackage = downloadNPMPackage(packageInfo);
             fs.symlinkSync(pathNGRuntimePackage + '/node_modules', args.appTarget + '/node_modules', 'dir');
         } else {
             fs.copyFileSync(packageInfo.packageJsonFile, args.appTarget + '/package.json');
-            executeSyncCmd('cd ' + args.appTarget + ' && npm install', null, MSG_NG_RUNTIME_LOG);  
+            executeSyncCmd('cd ' + args.appTarget + ' && npm install', null, MSG_NG_RUNTIME_LOG);
         }
     } catch (err) {
         console.log(MSG_NG_RUNTIME_LOG + 'FAILED the symlink for the node_modules', err);
         process.exit(err.code || err.pid);
     }
 
+    const deployUrl = getDeployUrl(args.ngBuildParams);
     const NG_BUILD_MSG = 'NG BUILD MIGHT HAVE FAILED WITH HEAP OUT OF MEMORY, RE-EXECUTE THE BUILD BY INCREASING THE MAX-OLD-SPACE-SIZE ARGUMENT VALUE FOR BUILD.UI.NODE.ARGS PROPERTY IN DEPLOYMENT PROFILE';
     // Generating the angular build and post build process.
-    executeSyncCmd('cd ' + args.appTarget + ' && node ' + args.nodeVMArgs + ' ' + './node_modules/@angular/cli/bin/ng build ' + args.ngBuildParams + ' && node build-scripts/post-build.js', null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
-
-
+    executeSyncCmd('cd ' + args.appTarget + ' && node ' + args.nodeVMArgs + ' ' + './node_modules/@angular/cli/bin/ng build ' + args.ngBuildParams + ' && node build-scripts/post-build.js --deploy-url=' + deployUrl, null, MSG_NG_RUNTIME_LOG, false, NG_BUILD_MSG);
 }
 
 init();

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

@@ -40192,14 +40192,14 @@ const scopeComponentStyles = (componentName, componentType, styles = '') => {
 
 const carouselTagName = 'carousel';
 const dataSetKey$5 = 'dataset';
-const idGen$p = new IDGenerator('wm_carousel_ref_');
+const idGen$q = new IDGenerator('wm_carousel_ref_');
 const isDynamicCarousel = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 const ɵ0$c$1 = isDynamicCarousel;
 register('wm-carousel', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the carousel
-            const counter = idGen$p.nextUid();
+            const counter = idGen$q.nextUid();
             shared.set('carousel_ref', counter);
             return `<div class="app-carousel carousel"><${carouselTagName} wmCarousel #${counter}="wmCarousel"  ${getAttrMarkup(attrs)} interval="0" [ngClass]="${counter}.navigationClass">`;
         },
@@ -40300,11 +40300,11 @@ var marquee_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1w = 'a';
-const idGen$o = new IDGenerator('wm_anchor');
+const idGen$p = new IDGenerator('wm_anchor');
 register('wm-anchor', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$o.nextUid();
+            const counter = idGen$p.nextUid();
             return `<${tagName$1w} wmAnchor #${counter}="wmAnchor" role="link" data-identifier="anchor" [attr.aria-label]="${counter}.hint || ${counter}.caption || 'Link'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1w}>`
@@ -40332,11 +40332,11 @@ var audio_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1u = 'div';
-const idGen$n = new IDGenerator('wm_html');
+const idGen$o = new IDGenerator('wm_html');
 register('wm-html', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$n.nextUid();
+            const counter = idGen$o.nextUid();
             return `<${tagName$1u} wmHtml #${counter}="wmHtml" [attr.aria-label]="${counter}.hint || 'HTML content'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1u}>`
@@ -40378,11 +40378,11 @@ var iframe_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1r = 'label';
-const idGen$m = new IDGenerator('wm_label');
+const idGen$n = new IDGenerator('wm_label');
 register('wm-label', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$m.nextUid();
+            const counter = idGen$n.nextUid();
             return `<${tagName$1r} wmLabel #${counter}="wmLabel" [attr.aria-label]="${counter}.hint || 'Label text'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1r}>`
@@ -40396,11 +40396,11 @@ var label_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1q = 'img';
-const idGen$l = new IDGenerator('wm_picture');
+const idGen$m = new IDGenerator('wm_picture');
 register('wm-picture', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$l.nextUid();
+            const counter = idGen$m.nextUid();
             return `<${tagName$1q} wmPicture #${counter}="wmPicture" alt="image" wmImageCache="${attrs.get('offline') || 'true'}" [attr.aria-label]="${counter}.hint || 'Image'" ${getAttrMarkup(attrs)}>`;
         }
     };
@@ -40413,11 +40413,11 @@ var picture_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1p = 'div';
-const idGen$k = new IDGenerator('wm_spinner');
+const idGen$l = new IDGenerator('wm_spinner');
 register('wm-spinner', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$k.nextUid();
+            const counter = idGen$l.nextUid();
             return `<${tagName$1p} wmSpinner #${counter}="wmSpinner" role="alert" [attr.aria-label]="${counter}.hint || 'Loading...'" aria-live="assertive" aria-busy="true" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1p}>`
@@ -40490,11 +40490,11 @@ var progressCircle_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1m = 'div';
-const idGen$j = new IDGenerator('wm_richtexteditor');
+const idGen$k = new IDGenerator('wm_richtexteditor');
 register('wm-richtexteditor', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$j.nextUid();
+            const counter = idGen$k.nextUid();
             return `<${tagName$1m} wmRichTextEditor #${counter}="wmRichTextEditor" role="textbox" [attr.aria-label]="${counter}.hint || 'Richtext editor'" ${getFormMarkupAttr(attrs)}>`;
         },
         post: () => `</${tagName$1m}>`
@@ -40607,14 +40607,14 @@ var chart_build$1 = /*#__PURE__*/Object.freeze({
 
 const tagName$1e = 'div';
 const dataSetKey$4 = 'dataset';
-const idGen$i = new IDGenerator('wm_accordion_ref_');
+const idGen$j = new IDGenerator('wm_accordion_ref_');
 const isDynamicAccordion = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 const ɵ0$a$1 = isDynamicAccordion;
 register('wm-accordion', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the accordion
-            const counter = idGen$i.nextUid();
+            const counter = idGen$j.nextUid();
             shared.set('accordion_ref', counter);
             return `<${tagName$1e} wmAccordion #${counter}="wmAccordion" role="tablist" aria-multiselectable="true" ${getAttrMarkup(attrs)}>`;
         },
@@ -40721,11 +40721,11 @@ var layoutGrid_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$18 = 'div';
-const idGen$h = new IDGenerator('wm_panel');
+const idGen$i = new IDGenerator('wm_panel');
 register('wm-panel', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$h.nextUid();
+            const counter = idGen$i.nextUid();
             return `<${tagName$18} wmPanel #${counter}="wmPanel" partialContainer [attr.aria-label]="${counter}.hint || 'Panel'" wm-navigable-element="true" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$18}>`
@@ -40800,14 +40800,14 @@ var repeatTemplate_build$1 = /*#__PURE__*/Object.freeze({
 
 const tagName$15 = 'div';
 const dataSetKey$3 = 'dataset';
-const idGen$g = new IDGenerator('wm_tabs_ref_');
+const idGen$h = new IDGenerator('wm_tabs_ref_');
 const isDynamicTabs = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 const ɵ0$9$1 = isDynamicTabs;
 register('wm-tabs', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the tabs
-            const counter = idGen$g.nextUid();
+            const counter = idGen$h.nextUid();
             shared.set('tabs_ref', counter);
             return `<${tagName$15} wmTabs #${counter}="wmTabs" ${getAttrMarkup(attrs)}>`;
         },
@@ -40886,11 +40886,11 @@ var wizard_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$11 = 'form';
-const idGen$f = new IDGenerator('wizard_step_id_');
+const idGen$g = new IDGenerator('wizard_step_id_');
 register('wm-wizardstep', () => {
     return {
         pre: attrs => {
-            const counter = idGen$f.nextUid();
+            const counter = idGen$g.nextUid();
             return `<${tagName$11} wmWizardStep #${counter}="wmWizardStep" ${getAttrMarkup(attrs)}>
                        <ng-template [ngIf]="${counter}.isInitialized">`;
         },
@@ -40905,11 +40905,11 @@ var wizardStep_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$10 = 'button';
-const idGen$e = new IDGenerator('wm_barcodescanner');
+const idGen$f = new IDGenerator('wm_barcodescanner');
 register('wm-barcodescanner', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$e.nextUid();
+            const counter = idGen$f.nextUid();
             return `<${tagName$10} wmBarcodescanner #${counter}="wmBarcodescanner" [attr.aria-label]="${counter}.hint || 'Barcode scanner'"  ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$10}>`
@@ -40923,11 +40923,11 @@ var barcodeScanner_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$$ = 'button';
-const idGen$d = new IDGenerator('wm_camera');
+const idGen$e = new IDGenerator('wm_camera');
 register('wm-camera', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$d.nextUid();
+            const counter = idGen$e.nextUid();
             return `<${tagName$$} type='button' wmCamera #${counter}="wmCamera" [attr.aria-label]="${counter}.hint || 'Camera'"  ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$$}>`
@@ -40985,7 +40985,7 @@ var dialogFooter_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$X = 'div';
 register('wm-dialog', () => {
     return {
-        pre: attrs => `<${tagName$X} wmDialog ${getAttrMarkup(attrs)} wm-navigable-element="true"><ng-template #dialogBody>`,
+        pre: attrs => `<${tagName$X} wmDialog ${getAttrMarkup(attrs)} aria-modal="true" role="dialog" wm-navigable-element="true"><ng-template #dialogBody>`,
         post: () => `</ng-template></${tagName$X}>`
     };
 });
@@ -41144,7 +41144,7 @@ const getEditModeWidget = colDef => {
 };
 
 const tagName$T = 'div';
-const idGen$c = new IDGenerator('formfield_');
+const idGen$d = new IDGenerator('formfield_');
 const getEventsTemplate = (attrs) => {
     const eventAttrs = new Map();
     if (!attrs.has('focus.event')) {
@@ -41249,7 +41249,7 @@ const registerFormField = (isFormField) => {
     return {
         requires: ['wm-form', 'wm-liveform', 'wm-livefilter', 'wm-list'],
         pre: (attrs, shared, parentForm, parentLiveForm, parentFilter, parentList) => {
-            const counter = idGen$c.nextUid();
+            const counter = idGen$d.nextUid();
             const parent = parentForm || parentLiveForm || parentFilter;
             const pCounter = (parent && parent.get('form_reference')) || 'form';
             const widgetType = attrs.get('widget') || FormWidgetType.TEXT;
@@ -41334,7 +41334,7 @@ var formAction_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$R = 'form';
-const idGen$b = new IDGenerator('form_');
+const idGen$c = new IDGenerator('form_');
 const formWidgets$1 = new Set([
     'wm-text',
     'wm-textarea',
@@ -41404,7 +41404,7 @@ const buildTask = (directiveAttr = '') => {
             let tmpl;
             let dialogId;
             const role = parentLoginWidget && parentLoginWidget.get('isLogin') ? 'app-login' : '';
-            const counter = idGen$b.nextUid();
+            const counter = idGen$c.nextUid();
             const dependsOn = attrs.get('dependson') ? `dependson="${attrs.get('dependson')}"` : '';
             const classProp = attrs.get('formlayout') === 'page' ? 'app-device-liveform panel liveform-inline' : '';
             const dialogAttributes = ['title', 'title.bind', 'iconclass', 'iconclass.bind', 'width'];
@@ -41557,11 +41557,11 @@ var buttonGroup_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$L = 'button';
-const idGen$a = new IDGenerator('wm_button');
+const idGen$b = new IDGenerator('wm_button');
 register('wm-button', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$a.nextUid();
+            const counter = idGen$b.nextUid();
             return `<${tagName$L} wmButton #${counter}="wmButton" [attr.aria-label]="${counter}.hint || ${counter}.caption || 'Button'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$L}>`
@@ -41659,11 +41659,11 @@ var select_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$E = 'div';
-const idGen$9 = new IDGenerator('wm_switch');
+const idGen$a = new IDGenerator('wm_switch');
 register('wm-switch', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$9.nextUid();
+            const counter = idGen$a.nextUid();
             return `<${tagName$E} wmSwitch #${counter}="wmSwitch" [attr.aria-label]="${counter}.hint || 'Switch button'" ${getFormMarkupAttr(attrs)} ${getNgModelAttr(attrs)}>`;
         },
         post: () => `</${tagName$E}>`
@@ -41943,11 +41943,11 @@ var list_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$t = 'div';
-const idGen$8 = new IDGenerator('liveform_dialog_id_');
+const idGen$9 = new IDGenerator('liveform_dialog_id_');
 register('wm-livetable', () => {
     return {
         pre: (attrs, shared) => {
-            const counter = idGen$8.nextUid();
+            const counter = idGen$9.nextUid();
             shared.set('counter', counter);
             return `<${tagName$t} wmLiveTable role="table" ${getAttrMarkup(attrs)} dialogid="${counter}">`;
         },
@@ -41967,9 +41967,13 @@ var liveTable_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$s = 'p';
+const idGen$8 = new IDGenerator('wm_message');
 register('wm-message', () => {
     return {
-        pre: attrs => `<${tagName$s} wmMessage aria-label="Notification Alerts" ${getAttrMarkup(attrs)}>`,
+        pre: (attrs) => {
+            const counter = idGen$8.nextUid();
+            return `<${tagName$s} wmMessage tabindex="0" #${counter}="wmMessage" ${getAttrMarkup(attrs)}>`;
+        },
         post: () => `</${tagName$s}>`
     };
 });
@@ -42380,7 +42384,7 @@ var partialParam_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$8 = 'section';
 register('wm-prefab', () => {
     return {
-        pre: attrs => `<${tagName$8} wmPrefab data-role="perfab" ${getAttrMarkup(attrs)}>`,
+        pre: attrs => `<${tagName$8} wmPrefab redrawable data-role="perfab" ${getAttrMarkup(attrs)}>`,
         post: () => `</${tagName$8}>`
     };
 });
@@ -42870,6 +42874,11 @@ register('wm-table', () => {
                 });
                 assignColumnIndex(node.children);
                 shared.set('isdynamictable', isColumnsPresent ? 'false' : 'true');
+                // If table have row expansion enabled, set isrowexpansionenabled to true
+                const isRowsPresent = node.children.some(childNode => {
+                    return childNode.name === 'wm-table-row';
+                });
+                shared.set('isrowexpansionenabled', isRowsPresent ? 'true' : 'false');
             }
             else {
                 shared.set('isdynamictable', 'true');
@@ -42889,6 +42898,7 @@ register('wm-table', () => {
             const counter = idGen.nextUid();
             shared.set('counter', counter);
             attrs.set('isdynamictable', shared.get('isdynamictable'));
+            attrs.set('isrowexpansionenabled', shared.get('isrowexpansionenabled'));
             attrs.set('table_reference', counter);
             return `<${tagName$1} wmTable="${counter}" wmTableFilterSort wmTableCUD #${counter} data-identifier="table" role="table" ${getAttrMarkup(attrs)}>`;
         },

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

@@ -40192,14 +40192,14 @@ const scopeComponentStyles = (componentName, componentType, styles = '') => {
 
 const carouselTagName = 'carousel';
 const dataSetKey$5 = 'dataset';
-const idGen$p = new IDGenerator('wm_carousel_ref_');
+const idGen$q = new IDGenerator('wm_carousel_ref_');
 const isDynamicCarousel = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 const ɵ0$c$1 = isDynamicCarousel;
 register('wm-carousel', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the carousel
-            const counter = idGen$p.nextUid();
+            const counter = idGen$q.nextUid();
             shared.set('carousel_ref', counter);
             return `<div class="app-carousel carousel"><${carouselTagName} wmCarousel #${counter}="wmCarousel"  ${getAttrMarkup(attrs)} interval="0" [ngClass]="${counter}.navigationClass">`;
         },
@@ -40300,11 +40300,11 @@ var marquee_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1w = 'a';
-const idGen$o = new IDGenerator('wm_anchor');
+const idGen$p = new IDGenerator('wm_anchor');
 register('wm-anchor', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$o.nextUid();
+            const counter = idGen$p.nextUid();
             return `<${tagName$1w} wmAnchor #${counter}="wmAnchor" role="link" data-identifier="anchor" [attr.aria-label]="${counter}.hint || ${counter}.caption || 'Link'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1w}>`
@@ -40332,11 +40332,11 @@ var audio_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1u = 'div';
-const idGen$n = new IDGenerator('wm_html');
+const idGen$o = new IDGenerator('wm_html');
 register('wm-html', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$n.nextUid();
+            const counter = idGen$o.nextUid();
             return `<${tagName$1u} wmHtml #${counter}="wmHtml" [attr.aria-label]="${counter}.hint || 'HTML content'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1u}>`
@@ -40378,11 +40378,11 @@ var iframe_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1r = 'label';
-const idGen$m = new IDGenerator('wm_label');
+const idGen$n = new IDGenerator('wm_label');
 register('wm-label', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$m.nextUid();
+            const counter = idGen$n.nextUid();
             return `<${tagName$1r} wmLabel #${counter}="wmLabel" [attr.aria-label]="${counter}.hint || 'Label text'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1r}>`
@@ -40396,11 +40396,11 @@ var label_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1q = 'img';
-const idGen$l = new IDGenerator('wm_picture');
+const idGen$m = new IDGenerator('wm_picture');
 register('wm-picture', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$l.nextUid();
+            const counter = idGen$m.nextUid();
             return `<${tagName$1q} wmPicture #${counter}="wmPicture" alt="image" wmImageCache="${attrs.get('offline') || 'true'}" [attr.aria-label]="${counter}.hint || 'Image'" ${getAttrMarkup(attrs)}>`;
         }
     };
@@ -40413,11 +40413,11 @@ var picture_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1p = 'div';
-const idGen$k = new IDGenerator('wm_spinner');
+const idGen$l = new IDGenerator('wm_spinner');
 register('wm-spinner', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$k.nextUid();
+            const counter = idGen$l.nextUid();
             return `<${tagName$1p} wmSpinner #${counter}="wmSpinner" role="alert" [attr.aria-label]="${counter}.hint || 'Loading...'" aria-live="assertive" aria-busy="true" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1p}>`
@@ -40490,11 +40490,11 @@ var progressCircle_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1m = 'div';
-const idGen$j = new IDGenerator('wm_richtexteditor');
+const idGen$k = new IDGenerator('wm_richtexteditor');
 register('wm-richtexteditor', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$j.nextUid();
+            const counter = idGen$k.nextUid();
             return `<${tagName$1m} wmRichTextEditor #${counter}="wmRichTextEditor" role="textbox" [attr.aria-label]="${counter}.hint || 'Richtext editor'" ${getFormMarkupAttr(attrs)}>`;
         },
         post: () => `</${tagName$1m}>`
@@ -40607,14 +40607,14 @@ var chart_build$1 = /*#__PURE__*/Object.freeze({
 
 const tagName$1e = 'div';
 const dataSetKey$4 = 'dataset';
-const idGen$i = new IDGenerator('wm_accordion_ref_');
+const idGen$j = new IDGenerator('wm_accordion_ref_');
 const isDynamicAccordion = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 const ɵ0$a$1 = isDynamicAccordion;
 register('wm-accordion', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the accordion
-            const counter = idGen$i.nextUid();
+            const counter = idGen$j.nextUid();
             shared.set('accordion_ref', counter);
             return `<${tagName$1e} wmAccordion #${counter}="wmAccordion" role="tablist" aria-multiselectable="true" ${getAttrMarkup(attrs)}>`;
         },
@@ -40721,11 +40721,11 @@ var layoutGrid_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$18 = 'div';
-const idGen$h = new IDGenerator('wm_panel');
+const idGen$i = new IDGenerator('wm_panel');
 register('wm-panel', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$h.nextUid();
+            const counter = idGen$i.nextUid();
             return `<${tagName$18} wmPanel #${counter}="wmPanel" partialContainer [attr.aria-label]="${counter}.hint || 'Panel'" wm-navigable-element="true" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$18}>`
@@ -40800,14 +40800,14 @@ var repeatTemplate_build$1 = /*#__PURE__*/Object.freeze({
 
 const tagName$15 = 'div';
 const dataSetKey$3 = 'dataset';
-const idGen$g = new IDGenerator('wm_tabs_ref_');
+const idGen$h = new IDGenerator('wm_tabs_ref_');
 const isDynamicTabs = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 const ɵ0$9$1 = isDynamicTabs;
 register('wm-tabs', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the tabs
-            const counter = idGen$g.nextUid();
+            const counter = idGen$h.nextUid();
             shared.set('tabs_ref', counter);
             return `<${tagName$15} wmTabs #${counter}="wmTabs" ${getAttrMarkup(attrs)}>`;
         },
@@ -40886,11 +40886,11 @@ var wizard_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$11 = 'form';
-const idGen$f = new IDGenerator('wizard_step_id_');
+const idGen$g = new IDGenerator('wizard_step_id_');
 register('wm-wizardstep', () => {
     return {
         pre: attrs => {
-            const counter = idGen$f.nextUid();
+            const counter = idGen$g.nextUid();
             return `<${tagName$11} wmWizardStep #${counter}="wmWizardStep" ${getAttrMarkup(attrs)}>
                        <ng-template [ngIf]="${counter}.isInitialized">`;
         },
@@ -40905,11 +40905,11 @@ var wizardStep_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$10 = 'button';
-const idGen$e = new IDGenerator('wm_barcodescanner');
+const idGen$f = new IDGenerator('wm_barcodescanner');
 register('wm-barcodescanner', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$e.nextUid();
+            const counter = idGen$f.nextUid();
             return `<${tagName$10} wmBarcodescanner #${counter}="wmBarcodescanner" [attr.aria-label]="${counter}.hint || 'Barcode scanner'"  ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$10}>`
@@ -40923,11 +40923,11 @@ var barcodeScanner_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$$ = 'button';
-const idGen$d = new IDGenerator('wm_camera');
+const idGen$e = new IDGenerator('wm_camera');
 register('wm-camera', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$d.nextUid();
+            const counter = idGen$e.nextUid();
             return `<${tagName$$} type='button' wmCamera #${counter}="wmCamera" [attr.aria-label]="${counter}.hint || 'Camera'"  ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$$}>`
@@ -40985,7 +40985,7 @@ var dialogFooter_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$X = 'div';
 register('wm-dialog', () => {
     return {
-        pre: attrs => `<${tagName$X} wmDialog ${getAttrMarkup(attrs)} wm-navigable-element="true"><ng-template #dialogBody>`,
+        pre: attrs => `<${tagName$X} wmDialog ${getAttrMarkup(attrs)} aria-modal="true" role="dialog" wm-navigable-element="true"><ng-template #dialogBody>`,
         post: () => `</ng-template></${tagName$X}>`
     };
 });
@@ -41144,7 +41144,7 @@ const getEditModeWidget = colDef => {
 };
 
 const tagName$T = 'div';
-const idGen$c = new IDGenerator('formfield_');
+const idGen$d = new IDGenerator('formfield_');
 const getEventsTemplate = (attrs) => {
     const eventAttrs = new Map();
     if (!attrs.has('focus.event')) {
@@ -41249,7 +41249,7 @@ const registerFormField = (isFormField) => {
     return {
         requires: ['wm-form', 'wm-liveform', 'wm-livefilter', 'wm-list'],
         pre: (attrs, shared, parentForm, parentLiveForm, parentFilter, parentList) => {
-            const counter = idGen$c.nextUid();
+            const counter = idGen$d.nextUid();
             const parent = parentForm || parentLiveForm || parentFilter;
             const pCounter = (parent && parent.get('form_reference')) || 'form';
             const widgetType = attrs.get('widget') || FormWidgetType.TEXT;
@@ -41334,7 +41334,7 @@ var formAction_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$R = 'form';
-const idGen$b = new IDGenerator('form_');
+const idGen$c = new IDGenerator('form_');
 const formWidgets$1 = new Set([
     'wm-text',
     'wm-textarea',
@@ -41404,7 +41404,7 @@ const buildTask = (directiveAttr = '') => {
             let tmpl;
             let dialogId;
             const role = parentLoginWidget && parentLoginWidget.get('isLogin') ? 'app-login' : '';
-            const counter = idGen$b.nextUid();
+            const counter = idGen$c.nextUid();
             const dependsOn = attrs.get('dependson') ? `dependson="${attrs.get('dependson')}"` : '';
             const classProp = attrs.get('formlayout') === 'page' ? 'app-device-liveform panel liveform-inline' : '';
             const dialogAttributes = ['title', 'title.bind', 'iconclass', 'iconclass.bind', 'width'];
@@ -41557,11 +41557,11 @@ var buttonGroup_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$L = 'button';
-const idGen$a = new IDGenerator('wm_button');
+const idGen$b = new IDGenerator('wm_button');
 register('wm-button', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$a.nextUid();
+            const counter = idGen$b.nextUid();
             return `<${tagName$L} wmButton #${counter}="wmButton" [attr.aria-label]="${counter}.hint || ${counter}.caption || 'Button'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$L}>`
@@ -41659,11 +41659,11 @@ var select_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$E = 'div';
-const idGen$9 = new IDGenerator('wm_switch');
+const idGen$a = new IDGenerator('wm_switch');
 register('wm-switch', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$9.nextUid();
+            const counter = idGen$a.nextUid();
             return `<${tagName$E} wmSwitch #${counter}="wmSwitch" [attr.aria-label]="${counter}.hint || 'Switch button'" ${getFormMarkupAttr(attrs)} ${getNgModelAttr(attrs)}>`;
         },
         post: () => `</${tagName$E}>`
@@ -41943,11 +41943,11 @@ var list_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$t = 'div';
-const idGen$8 = new IDGenerator('liveform_dialog_id_');
+const idGen$9 = new IDGenerator('liveform_dialog_id_');
 register('wm-livetable', () => {
     return {
         pre: (attrs, shared) => {
-            const counter = idGen$8.nextUid();
+            const counter = idGen$9.nextUid();
             shared.set('counter', counter);
             return `<${tagName$t} wmLiveTable role="table" ${getAttrMarkup(attrs)} dialogid="${counter}">`;
         },
@@ -41967,9 +41967,13 @@ var liveTable_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$s = 'p';
+const idGen$8 = new IDGenerator('wm_message');
 register('wm-message', () => {
     return {
-        pre: attrs => `<${tagName$s} wmMessage aria-label="Notification Alerts" ${getAttrMarkup(attrs)}>`,
+        pre: (attrs) => {
+            const counter = idGen$8.nextUid();
+            return `<${tagName$s} wmMessage tabindex="0" #${counter}="wmMessage" ${getAttrMarkup(attrs)}>`;
+        },
         post: () => `</${tagName$s}>`
     };
 });
@@ -42380,7 +42384,7 @@ var partialParam_build$1 = /*#__PURE__*/Object.freeze({
 const tagName$8 = 'section';
 register('wm-prefab', () => {
     return {
-        pre: attrs => `<${tagName$8} wmPrefab data-role="perfab" ${getAttrMarkup(attrs)}>`,
+        pre: attrs => `<${tagName$8} wmPrefab redrawable data-role="perfab" ${getAttrMarkup(attrs)}>`,
         post: () => `</${tagName$8}>`
     };
 });
@@ -42870,6 +42874,11 @@ register('wm-table', () => {
                 });
                 assignColumnIndex(node.children);
                 shared.set('isdynamictable', isColumnsPresent ? 'false' : 'true');
+                // If table have row expansion enabled, set isrowexpansionenabled to true
+                const isRowsPresent = node.children.some(childNode => {
+                    return childNode.name === 'wm-table-row';
+                });
+                shared.set('isrowexpansionenabled', isRowsPresent ? 'true' : 'false');
             }
             else {
                 shared.set('isdynamictable', 'true');
@@ -42889,6 +42898,7 @@ register('wm-table', () => {
             const counter = idGen.nextUid();
             shared.set('counter', counter);
             attrs.set('isdynamictable', shared.get('isdynamictable'));
+            attrs.set('isrowexpansionenabled', shared.get('isrowexpansionenabled'));
             attrs.set('table_reference', counter);
             return `<${tagName$1} wmTable="${counter}" wmTableFilterSort wmTableCUD #${counter} data-identifier="table" role="table" ${getAttrMarkup(attrs)}>`;
         },

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.0.0-next.139404",
+    "version": "11.0.0-next.139405",
     "description": "",
     "main": "index.js",
     "scripts": {

angular-codegen/pwa-assets/wmsw-worker.js

@@ -0,0 +1,24 @@
+importScripts("./ngsw-worker.js");
+
+(function () {
+  "use strict";
+
+  self.addEventListener("notificationclick", (event) => {
+    const notificationUrl = event.notification.data?.url;
+    event.notification.close();
+    // Enumerate windows, and call window.focus(), or open a new one.
+    event.waitUntil(
+      clients.matchAll().then((matchedClients) => {
+        for (let client of matchedClients) {
+          if (!notificationUrl) {
+            return client.focus();
+          }
+          if (client.url === notificationUrl) {
+            return client.focus();
+          }
+        }
+        return clients.openWindow(notificationUrl);
+      })
+    );
+  });
+})();

angular-codegen/src/gen-pwa-files.js

@@ -1 +1 @@
-const util=require("util"),fs=require("fs"),ncp=util.promisify(require("ncp").ncp),{writeFile:writeFile,readFileSync:readFileSync,codegenPath:codegenPath}=require("./wm-utils"),PWA_ICONS=["icon-512x512.png","icon-384x384.png","icon-192x192.png","icon-152x152.png","icon-144x144.png","icon-128x128.png","icon-96x96.png","icon-72x72.png"],generatePwaFiles=async(n,s,e)=>{await copyAssets(n,s),await updateManifestJson(s,e)},copyAssets=async(n,s)=>{await ncp(codegenPath+"/pwa-assets/ngsw-config.json",`${s}/ngsw-config.json`),await ncp(codegenPath+"/pwa-assets/manifest.json",`${s}/src/manifest.json`),await copyIcons(n,s)},copyIcons=async(n,s)=>{const e=`${s}/src/assets/icons`;let a;if(fs.existsSync(e)||fs.mkdirSync(e,{recursive:!0}),fs.existsSync(`${n}/pwa-icons`))for(const[s,c]of PWA_ICONS.entries()){const t=`${n}/pwa-icons/${c}`;if(fs.existsSync(t)){if(!a)for(i=0;i<s;i++)await ncp(t,`${e}/${PWA_ICONS[i]}`);a=t,await ncp(t,`${e}/${c}`)}else a&&await ncp(a,`${e}/${c}`)}a||await ncp(`${codegenPath}/pwa-assets/icons`,e)},updateManifestJson=async(n,s)=>{const e=`${n}/src/manifest.json`;let i=readFileSync(e,!0);i.name=s.displayName,i.short_name=s.displayName,await writeFile(e,JSON.stringify(i,null,4))};module.exports={generatePwaFiles:generatePwaFiles,copyIcons:copyIcons,PWA_ICONS:PWA_ICONS};
+const util=require("util"),fs=require("fs"),ncp=util.promisify(require("ncp").ncp),{writeFile:writeFile,readFileSync:readFileSync,codegenPath:codegenPath}=require("./wm-utils"),PWA_ICONS=["icon-512x512.png","icon-384x384.png","icon-192x192.png","icon-152x152.png","icon-144x144.png","icon-128x128.png","icon-96x96.png","icon-72x72.png"],generatePwaFiles=async(s,n,e)=>{await copyAssets(s,n),await updateManifestJson(n,e)},copyAssets=async(s,n)=>{await ncp(codegenPath+"/pwa-assets/ngsw-config.json",`${n}/ngsw-config.json`),await ncp(codegenPath+"/pwa-assets/wmsw-worker.js",`${n}/src/wmsw-worker.js`),await ncp(codegenPath+"/pwa-assets/manifest.json",`${n}/src/manifest.json`),await copyIcons(s,n)},copyIcons=async(s,n)=>{const e=`${n}/src/assets/icons`;let a;if(fs.existsSync(e)||fs.mkdirSync(e,{recursive:!0}),fs.existsSync(`${s}/pwa-icons`))for(const[n,c]of PWA_ICONS.entries()){const t=`${s}/pwa-icons/${c}`;if(fs.existsSync(t)){if(!a)for(i=0;i<n;i++)await ncp(t,`${e}/${PWA_ICONS[i]}`);a=t,await ncp(t,`${e}/${c}`)}else a&&await ncp(a,`${e}/${c}`)}a||await ncp(`${codegenPath}/pwa-assets/icons`,e)},updateManifestJson=async(s,n)=>{const e=`${s}/src/manifest.json`;let i=readFileSync(e,!0);i.name=n.displayName,i.short_name=n.displayName,await writeFile(e,JSON.stringify(i,null,4))};module.exports={generatePwaFiles:generatePwaFiles,copyIcons:copyIcons,PWA_ICONS:PWA_ICONS};

angular-codegen/src/update-angular-json.js

@@ -1 +1 @@
-const cheerio=require("cheerio"),{writeFile:writeFile,readFileSync:readFileSync,readDir:readDir,isMobileProject:isMobileProject}=require("./wm-utils"),markScriptsAsLazy=e=>{const s=["./node_modules/d3/d3.min.js","./node_modules/@wavemaker.com/nvd3/build/nv.d3.min.js","./node_modules/fullcalendar/dist/fullcalendar.min.js","./node_modules/summernote/dist/summernote-lite.min.js",global._WM_PACKAGE_PATH+"/scripts/datatable/datatable.js","./node_modules/jquery-ui/ui/widgets/sortable.js","./node_modules/jquery-ui/ui/widgets/droppable.js","./node_modules/jquery-ui/ui/widgets/resizable.js","./node_modules/hammerjs/hammer.min.js","./node_modules/iscroll/build/iscroll.js"];let t=e.replace(/^(\.\/)/,"").replace(/\//g,"-");return t=t.substring(0,t.lastIndexOf(".")),t+="-NOHASH",s.includes(e)?{input:e,lazy:!0,bundleName:t}:e},setBuildCustomizations=async e=>{const s=e.projects["angular-app"].architect.build,t=s.options.scripts;s.options.scripts=t.map(e=>markScriptsAsLazy(e))},getLazyModules=(e=[],s=[],t)=>{const i=e.filter(e=>"PAGE"!=e.type).map(e=>`src/app/partials/${e.name}/${e.name}.module`);for(const e of s.keys()){i.push(`src/app/prefabs/${e}/${e}.module`);const s=t[e];for(var n=0;n<s.length;n++)i.push(`src/app/prefabs/${e}/partials/${s[n].name}/${s[n].name}.module`)}return i},addToScripts=async(e,s,t=[],i=[])=>{const n=`${s}/angular.json`;let a=readFileSync(n,!0);const o=a.projects["angular-app"].architect.build;let l=o.options.scripts;const r=`${s+"/src/app/extensions"}`,c=await readDir(r);c.length&&i.push("./src/app/extensions/"+c[0]),o.options.scripts=[...t,...l,...i],await writeFile(n,JSON.stringify(a,null,4))},updateAngularJSON=async(e,s,t,i,n,a,o,l,r)=>{const c=`${s}/angular.json`;let u=readFileSync(c,!0);const d=u.projects["angular-app"].architect.build;let p=d.options.lazyModules;p.length=0,p.push(...getLazyModules(i,n,l)),a&&a.trim().length>0&&(d.options.deployUrl=a);const m=d.options.styles;if(isMobileProject(t)){const e=m.findIndex(e=>{let s="object"==typeof e;if(s){return(s?e.input:e).includes("themes")}return!1}),s=m[e].input;m[e].bundleName="wm-android-styles",m[e].input=m[e].input.replace(new RegExp("/[a-z]*/style.css$"),`/${t.activeTheme}/android/style.css`);const i=Object.assign({},m[e]);i.input=s.replace(new RegExp("/[a-z]*/style.css$"),`/${t.activeTheme}/ios/style.css`),i.bundleName="wm-ios-styles",m.push(i);const n=m.findIndex(e=>{let s="object"==typeof e;if(s){return"src/assets/app.css"===(s?e.input:e)}return!1});m[n].bundleName="wm-android-styles";const a=Object.assign({},m[n]);a.bundleName="wm-ios-styles",m.push(a)}m.forEach((e,s)=>{let i="object"==typeof e,n=i?e.input:e;!n.includes("themes")||n.includes("/android/")||n.includes("/ios/")||(i?m[s].input=n.replace(new RegExp("/[a-z]*/style.css$"),`/${t.activeTheme}/style.css`):m[s]=n.replace(new RegExp("/[a-z]*/style.css$"),`/${t.activeTheme}/style.css`))}),await setBuildCustomizations(u);const y=d.configurations.production;if(y.aot=!1!==o.aot,y.buildOptimizer=!1!==o.buildOptimizer,r){d.options.assets.push("src/manifest.json"),y.serviceWorker=!0,y.ngswConfigPath="ngsw-config.json",delete d.options.customWebpackConfig}await writeFile(c,JSON.stringify(u,null,4))};module.exports={updateAngularJSON:updateAngularJSON,addToScripts:addToScripts};
+const cheerio=require("cheerio"),{writeFile:writeFile,readFileSync:readFileSync,readDir:readDir,isMobileProject:isMobileProject}=require("./wm-utils"),markScriptsAsLazy=e=>{const s=["./node_modules/d3/d3.min.js","./node_modules/@wavemaker.com/nvd3/build/nv.d3.min.js","./node_modules/fullcalendar/dist/fullcalendar.min.js","./node_modules/summernote/dist/summernote-lite.min.js",global._WM_PACKAGE_PATH+"/scripts/datatable/datatable.js","./node_modules/jquery-ui/ui/widgets/sortable.js","./node_modules/jquery-ui/ui/widgets/droppable.js","./node_modules/jquery-ui/ui/widgets/resizable.js","./node_modules/hammerjs/hammer.min.js","./node_modules/iscroll/build/iscroll.js"];let t=e.replace(/^(\.\/)/,"").replace(/\//g,"-");return t=t.substring(0,t.lastIndexOf(".")),t+="-NOHASH",s.includes(e)?{input:e,lazy:!0,bundleName:t}:e},setBuildCustomizations=async e=>{const s=e.projects["angular-app"].architect.build,t=s.options.scripts;s.options.scripts=t.map(e=>markScriptsAsLazy(e))},getLazyModules=(e=[],s=[],t)=>{const i=e.filter(e=>"PAGE"!=e.type).map(e=>`src/app/partials/${e.name}/${e.name}.module`);for(const e of s.keys()){i.push(`src/app/prefabs/${e}/${e}.module`);const s=t[e];for(var n=0;n<s.length;n++)i.push(`src/app/prefabs/${e}/partials/${s[n].name}/${s[n].name}.module`)}return i},addToScripts=async(e,s,t=[],i=[])=>{const n=`${s}/angular.json`;let a=readFileSync(n,!0);const o=a.projects["angular-app"].architect.build;let r=o.options.scripts;const l=`${s+"/src/app/extensions"}`,c=await readDir(l);c.length&&i.push("./src/app/extensions/"+c[0]),o.options.scripts=[...t,...r,...i],await writeFile(n,JSON.stringify(a,null,4))},updateAngularJSON=async(e,s,t,i,n,a,o,r,l)=>{const c=`${s}/angular.json`;let u=readFileSync(c,!0);const d=u.projects["angular-app"].architect.build;let p=d.options.lazyModules;p.length=0,p.push(...getLazyModules(i,n,r)),a&&a.trim().length>0&&(d.options.deployUrl=a);const m=d.options.styles;if(isMobileProject(t)){const e=m.findIndex(e=>{let s="object"==typeof e;if(s){return(s?e.input:e).includes("themes")}return!1}),s=m[e].input;m[e].bundleName="wm-android-styles",m[e].input=m[e].input.replace(new RegExp("/[a-z]*/style.css$"),`/${t.activeTheme}/android/style.css`);const i=Object.assign({},m[e]);i.input=s.replace(new RegExp("/[a-z]*/style.css$"),`/${t.activeTheme}/ios/style.css`),i.bundleName="wm-ios-styles",m.push(i);const n=m.findIndex(e=>{let s="object"==typeof e;if(s){return"src/assets/app.css"===(s?e.input:e)}return!1});m[n].bundleName="wm-android-styles";const a=Object.assign({},m[n]);a.bundleName="wm-ios-styles",m.push(a)}m.forEach((e,s)=>{let i="object"==typeof e,n=i?e.input:e;!n.includes("themes")||n.includes("/android/")||n.includes("/ios/")||(i?m[s].input=n.replace(new RegExp("/[a-z]*/style.css$"),`/${t.activeTheme}/style.css`):m[s]=n.replace(new RegExp("/[a-z]*/style.css$"),`/${t.activeTheme}/style.css`))}),await setBuildCustomizations(u);const y=d.configurations.production;if(y.aot=!1!==o.aot,y.buildOptimizer=!1!==o.buildOptimizer,l){const e=d.options.assets;e.push("src/manifest.json"),e.push("src/wmsw-worker.js"),y.serviceWorker=!0,y.ngswConfigPath="ngsw-config.json",delete d.options.customWebpackConfig}await writeFile(c,JSON.stringify(u,null,4))};module.exports={updateAngularJSON:updateAngularJSON,addToScripts:addToScripts};

angular-codegen/templates/app.module.ts.hbs

@@ -251,13 +251,13 @@ export const isPrefabInitialized = initPrefabConfig();
         AppCodeGenModule,
 
         {{#if isPwa}}
-        ServiceWorkerModule.register('ngsw-worker.js', { enabled: environment.production, registrationStrategy: 'registerImmediately' })
+        ServiceWorkerModule.register('wmsw-worker.js', { enabled: environment.production })
         {{/if}}
     ],
     providers: [
         {provide: AppJSProvider, useClass: AppJSProviderService},
         {provide: AppVariablesProvider, useClass: AppVariablesProviderService},
-         {provide: AppExtensionProvider,useClass:AppExtensionProviderService},
+        {provide: AppExtensionProvider,useClass:AppExtensionProviderService},
         {provide: ComponentRefProvider, useClass: ComponentRefProviderService},
         {provide: PartialRefProvider, useClass: ComponentRefProviderService},
         {provide: PrefabConfigProvider, useClass: PrefabConfigProviderService},