@wavemaker/angular-codegen 11.2.0-next.141067 → 11.2.0-next.141069

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

@@ -5959,6 +5959,26 @@
         "yarn": "^1.22.19"
       }
     },
+    "@wavemaker/variables": {
+      "version": "11.2.0-next.141069",
+      "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-11.2.0-next.141069.tgz",
+      "integrity": "sha512-MEKf4Mx5jM8qdPS+uEvMU0Do0vtwmDjXOoaZ4MF/swdHONBPu7AoMdSDdJMeRivk1OixMZfjnslGDiOHB5V+ZQ==",
+      "requires": {
+        "@metrichor/jmespath": "^0.3.1",
+        "lodash": "^4.17.21",
+        "x2js": "^3.4.3"
+      },
+      "dependencies": {
+        "x2js": {
+          "version": "3.4.4",
+          "resolved": "https://registry.npmjs.org/x2js/-/x2js-3.4.4.tgz",
+          "integrity": "sha512-yG/ThaBCgnsa3aoMPAe7QwDpcyU4D70hjXC4Y1lZSfD/Tgd0MpE19FnZZRAjekryw0c8cffpOt9zsPEiqktO6Q==",
+          "requires": {
+            "@xmldom/xmldom": "^0.8.3"
+          }
+        }
+      }
+    },
     "@webassemblyjs/ast": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
@@ -6159,6 +6179,11 @@
         "@xtuc/long": "4.2.2"
       }
     },
+    "@xmldom/xmldom": {
+      "version": "0.8.6",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.6.tgz",
+      "integrity": "sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg=="
+    },
     "@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",

angular-codegen/angular-app/package.json

@@ -47,6 +47,7 @@
         "@metrichor/jmespath": "^0.3.1",
         "@wavemaker.com/nvd3": "1.0.0",
         "@wavemaker/focus-trap": "^1.0.0",
+        "@wavemaker/variables": "11.2.0-next.141069",
         "angular-imask": "6.0.4",
         "angular2-websocket": "0.9.7",
         "core-js": "2.5.4",
@@ -70,7 +71,7 @@
         "tslib": "^2.0.0",
         "x2js": "3.2.6",
         "zone.js": "~0.11.4",
-        "@wavemaker/app-ng-runtime": "11.2.0-next.141067"
+        "@wavemaker/app-ng-runtime": "11.2.0-next.141069"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "0.8.5",

angular-codegen/angular-app/tsconfig.json

@@ -37,6 +37,9 @@
             "@wm/core": [
                 "node_modules/@wavemaker/app-ng-runtime/core"
             ],
+            "@wavemaker/variables": [
+                "node_modules/@wavemaker/variables/"
+            ],
             "@wm/components/base": [
                 "node_modules/@wavemaker/app-ng-runtime/components/base"
             ],

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

@@ -46638,41 +46638,42 @@ const validateDataSourceCtx = (ds, ctx) => {
  * @param name name of the variable
  * @param context scope of the variable
  */
-const processFilterExpBindNode = (context, filterExpressions) => {
+const processFilterExpBindNode = (context, filterExpressions, variable) => {
     const destroyFn = context.registerDestroyListener ? context.registerDestroyListener.bind(context) : _.noop;
     const filter$ = new Subject();
     const bindFilExpObj = (obj, targetNodeKey) => {
+        const listener = (newVal, oldVal) => {
+            if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
+                return;
+            }
+            // Skip cloning for blob column
+            if (!_.includes(['blob', 'file'], obj.type)) {
+                newVal = getClonedObject(newVal);
+            }
+            // backward compatibility: where we are allowing the user to bind complete object
+            if (obj.target === 'dataBinding') {
+                // remove the existing databinding element
+                filterExpressions.rules = [];
+                // now add all the returned values
+                _.forEach(newVal, function (value, target) {
+                    filterExpressions.rules.push({
+                        'target': target,
+                        'value': value,
+                        'matchMode': obj.matchMode || 'startignorecase',
+                        'required': false,
+                        'type': ''
+                    });
+                });
+            }
+            else {
+                // setting value to the root node
+                obj[targetNodeKey] = newVal;
+            }
+            filter$.next({ filterExpressions, newVal });
+        };
         if (stringStartsWith(obj[targetNodeKey], 'bind:')) {
             // [Todo-CSP]: needs a check, where is this used
-            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, (newVal, oldVal) => {
-                if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
-                    return;
-                }
-                // Skip cloning for blob column
-                if (!_.includes(['blob', 'file'], obj.type)) {
-                    newVal = getClonedObject(newVal);
-                }
-                // backward compatibility: where we are allowing the user to bind complete object
-                if (obj.target === 'dataBinding') {
-                    // remove the existing databinding element
-                    filterExpressions.rules = [];
-                    // now add all the returned values
-                    _.forEach(newVal, function (value, target) {
-                        filterExpressions.rules.push({
-                            'target': target,
-                            'value': value,
-                            'matchMode': obj.matchMode || 'startignorecase',
-                            'required': false,
-                            'type': ''
-                        });
-                    });
-                }
-                else {
-                    // setting value to the root node
-                    obj[targetNodeKey] = newVal;
-                }
-                filter$.next({ filterExpressions, newVal });
-            }, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
+            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, variable ? variable.invokeOnFiltertExpressionChange.bind(variable, obj, targetNodeKey) : listener, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
         }
     };
     const traverseFilterExpressions = expressions => {

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

@@ -42716,41 +42716,42 @@ const validateDataSourceCtx = (ds, ctx) => {
  * @param name name of the variable
  * @param context scope of the variable
  */
-const processFilterExpBindNode = (context, filterExpressions) => {
+const processFilterExpBindNode = (context, filterExpressions, variable) => {
     const destroyFn = context.registerDestroyListener ? context.registerDestroyListener.bind(context) : _.noop;
     const filter$ = new Subject();
     const bindFilExpObj = (obj, targetNodeKey) => {
+        const listener = (newVal, oldVal) => {
+            if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
+                return;
+            }
+            // Skip cloning for blob column
+            if (!_.includes(['blob', 'file'], obj.type)) {
+                newVal = getClonedObject(newVal);
+            }
+            // backward compatibility: where we are allowing the user to bind complete object
+            if (obj.target === 'dataBinding') {
+                // remove the existing databinding element
+                filterExpressions.rules = [];
+                // now add all the returned values
+                _.forEach(newVal, function (value, target) {
+                    filterExpressions.rules.push({
+                        'target': target,
+                        'value': value,
+                        'matchMode': obj.matchMode || 'startignorecase',
+                        'required': false,
+                        'type': ''
+                    });
+                });
+            }
+            else {
+                // setting value to the root node
+                obj[targetNodeKey] = newVal;
+            }
+            filter$.next({ filterExpressions, newVal });
+        };
         if (stringStartsWith(obj[targetNodeKey], 'bind:')) {
             // [Todo-CSP]: needs a check, where is this used
-            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, (newVal, oldVal) => {
-                if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
-                    return;
-                }
-                // Skip cloning for blob column
-                if (!_.includes(['blob', 'file'], obj.type)) {
-                    newVal = getClonedObject(newVal);
-                }
-                // backward compatibility: where we are allowing the user to bind complete object
-                if (obj.target === 'dataBinding') {
-                    // remove the existing databinding element
-                    filterExpressions.rules = [];
-                    // now add all the returned values
-                    _.forEach(newVal, function (value, target) {
-                        filterExpressions.rules.push({
-                            'target': target,
-                            'value': value,
-                            'matchMode': obj.matchMode || 'startignorecase',
-                            'required': false,
-                            'type': ''
-                        });
-                    });
-                }
-                else {
-                    // setting value to the root node
-                    obj[targetNodeKey] = newVal;
-                }
-                filter$.next({ filterExpressions, newVal });
-            }, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
+            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, variable ? variable.invokeOnFiltertExpressionChange.bind(variable, obj, targetNodeKey) : listener, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
         }
     };
     const traverseFilterExpressions = expressions => {
@@ -44976,14 +44977,14 @@ const scopeComponentStyles = (componentName, componentType, styles = '') => {
 
 const carouselTagName = 'carousel';
 const dataSetKey$5 = 'dataset';
-const idGen$q = new IDGenerator('wm_carousel_ref_');
+const idGen$s = new IDGenerator('wm_carousel_ref_');
 const isDynamicCarousel = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 const ɵ0$d$1 = isDynamicCarousel;
 register('wm-carousel', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the carousel
-            const counter = idGen$q.nextUid();
+            const counter = idGen$s.nextUid();
             shared.set('carousel_ref', counter);
             return `<div class="app-carousel carousel"><${carouselTagName} wmCarousel #${counter}="wmCarousel"  ${getAttrMarkup(attrs)} interval="0" [ngClass]="${counter}.navigationClass">`;
         },
@@ -45084,12 +45085,12 @@ var marquee_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1A = 'a';
-const idGen$p = new IDGenerator('wm_anchor');
+const idGen$r = new IDGenerator('wm_anchor');
 register('wm-anchor', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$p.nextUid();
-            return `<${tagName$1A} wmAnchor #${counter}="wmAnchor" role="link" data-identifier="anchor" [attr.aria-label]="${counter}.hint || ${counter}.caption || 'Link'" ${getAttrMarkup(attrs)}>`;
+            const counter = idGen$r.nextUid();
+            return `<${tagName$1A} wmAnchor #${counter}="wmAnchor" role="link" data-identifier="anchor" [attr.aria-label]="${counter}.hint || ${counter}.caption" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1A}>`
     };
@@ -45116,11 +45117,11 @@ var audio_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1y = 'div';
-const idGen$o = new IDGenerator('wm_html');
+const idGen$q = new IDGenerator('wm_html');
 register('wm-html', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$o.nextUid();
+            const counter = idGen$q.nextUid();
             return `<${tagName$1y} wmHtml #${counter}="wmHtml" [attr.aria-label]="${counter}.hint || 'HTML content'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1y}>`
@@ -45162,10 +45163,12 @@ var iframe_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1v = 'label';
+const idGen$p = new IDGenerator('wm_label');
 register('wm-label', () => {
     return {
         pre: (attrs) => {
-            return `<${tagName$1v} wmLabel ${getAttrMarkup(attrs)}>`;
+            const counter = idGen$p.nextUid();
+            return `<${tagName$1v} wmLabel #${counter}="wmLabel" [attr.aria-label]="${counter}.hint" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1v}>`
     };
@@ -45178,11 +45181,11 @@ var label_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1u = 'img';
-const idGen$n = new IDGenerator('wm_picture');
+const idGen$o = new IDGenerator('wm_picture');
 register('wm-picture', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$n.nextUid();
+            const counter = idGen$o.nextUid();
             return `<${tagName$1u} wmPicture #${counter}="wmPicture" alt="image" wmImageCache="${attrs.get('offline') || 'true'}" [attr.aria-label]="${counter}.hint || 'Image'" ${getAttrMarkup(attrs)}>`;
         }
     };
@@ -45195,11 +45198,11 @@ var picture_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1t = 'div';
-const idGen$m = new IDGenerator('wm_spinner');
+const idGen$n = new IDGenerator('wm_spinner');
 register('wm-spinner', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$m.nextUid();
+            const counter = idGen$n.nextUid();
             return `<${tagName$1t} wmSpinner #${counter}="wmSpinner" role="alert" [attr.aria-label]="${counter}.hint || 'Loading...'" aria-live="assertive" aria-busy="true" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1t}>`
@@ -45272,11 +45275,11 @@ var progressCircle_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1q = 'div';
-const idGen$l = new IDGenerator('wm_richtexteditor');
+const idGen$m = new IDGenerator('wm_richtexteditor');
 register('wm-richtexteditor', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$l.nextUid();
+            const counter = idGen$m.nextUid();
             return `<${tagName$1q} wmRichTextEditor #${counter}="wmRichTextEditor" role="textbox" [attr.aria-label]="${counter}.hint || 'Richtext editor'" ${getFormMarkupAttr(attrs)}>`;
         },
         post: () => `</${tagName$1q}>`
@@ -45389,14 +45392,14 @@ var chart_build$1 = /*#__PURE__*/Object.freeze({
 
 const tagName$1i = 'div';
 const dataSetKey$4 = 'dataset';
-const idGen$k = new IDGenerator('wm_accordion_ref_');
+const idGen$l = new IDGenerator('wm_accordion_ref_');
 const isDynamicAccordion = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 const ɵ0$b$1 = isDynamicAccordion;
 register('wm-accordion', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the accordion
-            const counter = idGen$k.nextUid();
+            const counter = idGen$l.nextUid();
             shared.set('accordion_ref', counter);
             return `<${tagName$1i} wmAccordion #${counter}="wmAccordion" role="tablist" aria-multiselectable="true" ${getAttrMarkup(attrs)}>`;
         },
@@ -45433,9 +45436,13 @@ var accordion_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1h = 'div';
+const idGen$k = new IDGenerator('wm_accordionpane');
 register('wm-accordionpane', () => {
     return {
-        pre: attrs => `<${tagName$1h} wmAccordionPane partialContainer wm-navigable-element="true" role="tab" ${getAttrMarkup(attrs)}>`,
+        pre: (attrs) => {
+            const counter = idGen$k.nextUid();
+            return `<${tagName$1h} #${counter}="wmAccordionPane" [attr.aria-expanded]="${counter}.isActive" wmAccordionPane partialContainer wm-navigable-element="true" role="tab" ${getAttrMarkup(attrs)}>`;
+        },
         post: () => `</${tagName$1h}>`
     };
 });
@@ -46344,7 +46351,7 @@ register('wm-button', () => {
     return {
         pre: (attrs) => {
             const counter = idGen$c.nextUid();
-            return `<${tagName$P} wmButton #${counter}="wmButton" [attr.aria-label]="${counter}.hint || ${counter}.caption || 'Button'" ${getAttrMarkup(attrs)}>`;
+            return `<${tagName$P} wmButton #${counter}="wmButton" [attr.aria-label]="${counter}.hint || ${counter}.caption" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$P}>`
     };

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

@@ -42716,41 +42716,42 @@ const validateDataSourceCtx = (ds, ctx) => {
  * @param name name of the variable
  * @param context scope of the variable
  */
-const processFilterExpBindNode = (context, filterExpressions) => {
+const processFilterExpBindNode = (context, filterExpressions, variable) => {
     const destroyFn = context.registerDestroyListener ? context.registerDestroyListener.bind(context) : _.noop;
     const filter$ = new Subject();
     const bindFilExpObj = (obj, targetNodeKey) => {
+        const listener = (newVal, oldVal) => {
+            if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
+                return;
+            }
+            // Skip cloning for blob column
+            if (!_.includes(['blob', 'file'], obj.type)) {
+                newVal = getClonedObject(newVal);
+            }
+            // backward compatibility: where we are allowing the user to bind complete object
+            if (obj.target === 'dataBinding') {
+                // remove the existing databinding element
+                filterExpressions.rules = [];
+                // now add all the returned values
+                _.forEach(newVal, function (value, target) {
+                    filterExpressions.rules.push({
+                        'target': target,
+                        'value': value,
+                        'matchMode': obj.matchMode || 'startignorecase',
+                        'required': false,
+                        'type': ''
+                    });
+                });
+            }
+            else {
+                // setting value to the root node
+                obj[targetNodeKey] = newVal;
+            }
+            filter$.next({ filterExpressions, newVal });
+        };
         if (stringStartsWith(obj[targetNodeKey], 'bind:')) {
             // [Todo-CSP]: needs a check, where is this used
-            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, (newVal, oldVal) => {
-                if ((newVal === oldVal && _.isUndefined(newVal)) || (_.isUndefined(newVal) && !_.isUndefined(oldVal))) {
-                    return;
-                }
-                // Skip cloning for blob column
-                if (!_.includes(['blob', 'file'], obj.type)) {
-                    newVal = getClonedObject(newVal);
-                }
-                // backward compatibility: where we are allowing the user to bind complete object
-                if (obj.target === 'dataBinding') {
-                    // remove the existing databinding element
-                    filterExpressions.rules = [];
-                    // now add all the returned values
-                    _.forEach(newVal, function (value, target) {
-                        filterExpressions.rules.push({
-                            'target': target,
-                            'value': value,
-                            'matchMode': obj.matchMode || 'startignorecase',
-                            'required': false,
-                            'type': ''
-                        });
-                    });
-                }
-                else {
-                    // setting value to the root node
-                    obj[targetNodeKey] = newVal;
-                }
-                filter$.next({ filterExpressions, newVal });
-            }, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
+            destroyFn($watch(obj[targetNodeKey].replace('bind:', ''), context, {}, variable ? variable.invokeOnFiltertExpressionChange.bind(variable, obj, targetNodeKey) : listener, undefined, false, { arrayType: _.includes(['in', 'notin'], obj.matchMode) }));
         }
     };
     const traverseFilterExpressions = expressions => {
@@ -44976,14 +44977,14 @@ const scopeComponentStyles = (componentName, componentType, styles = '') => {
 
 const carouselTagName = 'carousel';
 const dataSetKey$5 = 'dataset';
-const idGen$q = new IDGenerator('wm_carousel_ref_');
+const idGen$s = new IDGenerator('wm_carousel_ref_');
 const isDynamicCarousel = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 const ɵ0$d$1 = isDynamicCarousel;
 register('wm-carousel', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the carousel
-            const counter = idGen$q.nextUid();
+            const counter = idGen$s.nextUid();
             shared.set('carousel_ref', counter);
             return `<div class="app-carousel carousel"><${carouselTagName} wmCarousel #${counter}="wmCarousel"  ${getAttrMarkup(attrs)} interval="0" [ngClass]="${counter}.navigationClass">`;
         },
@@ -45084,12 +45085,12 @@ var marquee_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1A = 'a';
-const idGen$p = new IDGenerator('wm_anchor');
+const idGen$r = new IDGenerator('wm_anchor');
 register('wm-anchor', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$p.nextUid();
-            return `<${tagName$1A} wmAnchor #${counter}="wmAnchor" role="link" data-identifier="anchor" [attr.aria-label]="${counter}.hint || ${counter}.caption || 'Link'" ${getAttrMarkup(attrs)}>`;
+            const counter = idGen$r.nextUid();
+            return `<${tagName$1A} wmAnchor #${counter}="wmAnchor" role="link" data-identifier="anchor" [attr.aria-label]="${counter}.hint || ${counter}.caption" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1A}>`
     };
@@ -45116,11 +45117,11 @@ var audio_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1y = 'div';
-const idGen$o = new IDGenerator('wm_html');
+const idGen$q = new IDGenerator('wm_html');
 register('wm-html', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$o.nextUid();
+            const counter = idGen$q.nextUid();
             return `<${tagName$1y} wmHtml #${counter}="wmHtml" [attr.aria-label]="${counter}.hint || 'HTML content'" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1y}>`
@@ -45162,10 +45163,12 @@ var iframe_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1v = 'label';
+const idGen$p = new IDGenerator('wm_label');
 register('wm-label', () => {
     return {
         pre: (attrs) => {
-            return `<${tagName$1v} wmLabel ${getAttrMarkup(attrs)}>`;
+            const counter = idGen$p.nextUid();
+            return `<${tagName$1v} wmLabel #${counter}="wmLabel" [attr.aria-label]="${counter}.hint" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1v}>`
     };
@@ -45178,11 +45181,11 @@ var label_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1u = 'img';
-const idGen$n = new IDGenerator('wm_picture');
+const idGen$o = new IDGenerator('wm_picture');
 register('wm-picture', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$n.nextUid();
+            const counter = idGen$o.nextUid();
             return `<${tagName$1u} wmPicture #${counter}="wmPicture" alt="image" wmImageCache="${attrs.get('offline') || 'true'}" [attr.aria-label]="${counter}.hint || 'Image'" ${getAttrMarkup(attrs)}>`;
         }
     };
@@ -45195,11 +45198,11 @@ var picture_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1t = 'div';
-const idGen$m = new IDGenerator('wm_spinner');
+const idGen$n = new IDGenerator('wm_spinner');
 register('wm-spinner', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$m.nextUid();
+            const counter = idGen$n.nextUid();
             return `<${tagName$1t} wmSpinner #${counter}="wmSpinner" role="alert" [attr.aria-label]="${counter}.hint || 'Loading...'" aria-live="assertive" aria-busy="true" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$1t}>`
@@ -45272,11 +45275,11 @@ var progressCircle_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1q = 'div';
-const idGen$l = new IDGenerator('wm_richtexteditor');
+const idGen$m = new IDGenerator('wm_richtexteditor');
 register('wm-richtexteditor', () => {
     return {
         pre: (attrs) => {
-            const counter = idGen$l.nextUid();
+            const counter = idGen$m.nextUid();
             return `<${tagName$1q} wmRichTextEditor #${counter}="wmRichTextEditor" role="textbox" [attr.aria-label]="${counter}.hint || 'Richtext editor'" ${getFormMarkupAttr(attrs)}>`;
         },
         post: () => `</${tagName$1q}>`
@@ -45389,14 +45392,14 @@ var chart_build$1 = /*#__PURE__*/Object.freeze({
 
 const tagName$1i = 'div';
 const dataSetKey$4 = 'dataset';
-const idGen$k = new IDGenerator('wm_accordion_ref_');
+const idGen$l = new IDGenerator('wm_accordion_ref_');
 const isDynamicAccordion = node => node.attrs.find(attr => attr.name === 'type' && attr.value === 'dynamic');
 const ɵ0$b$1 = isDynamicAccordion;
 register('wm-accordion', () => {
     return {
         pre: (attrs, shared) => {
             // generating unique Id for the accordion
-            const counter = idGen$k.nextUid();
+            const counter = idGen$l.nextUid();
             shared.set('accordion_ref', counter);
             return `<${tagName$1i} wmAccordion #${counter}="wmAccordion" role="tablist" aria-multiselectable="true" ${getAttrMarkup(attrs)}>`;
         },
@@ -45433,9 +45436,13 @@ var accordion_build$1 = /*#__PURE__*/Object.freeze({
 });
 
 const tagName$1h = 'div';
+const idGen$k = new IDGenerator('wm_accordionpane');
 register('wm-accordionpane', () => {
     return {
-        pre: attrs => `<${tagName$1h} wmAccordionPane partialContainer wm-navigable-element="true" role="tab" ${getAttrMarkup(attrs)}>`,
+        pre: (attrs) => {
+            const counter = idGen$k.nextUid();
+            return `<${tagName$1h} #${counter}="wmAccordionPane" [attr.aria-expanded]="${counter}.isActive" wmAccordionPane partialContainer wm-navigable-element="true" role="tab" ${getAttrMarkup(attrs)}>`;
+        },
         post: () => `</${tagName$1h}>`
     };
 });
@@ -46344,7 +46351,7 @@ register('wm-button', () => {
     return {
         pre: (attrs) => {
             const counter = idGen$c.nextUid();
-            return `<${tagName$P} wmButton #${counter}="wmButton" [attr.aria-label]="${counter}.hint || ${counter}.caption || 'Button'" ${getAttrMarkup(attrs)}>`;
+            return `<${tagName$P} wmButton #${counter}="wmButton" [attr.aria-label]="${counter}.hint || ${counter}.caption" ${getAttrMarkup(attrs)}>`;
         },
         post: () => `</${tagName$P}>`
     };

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.2.0-next.141067",
+    "version": "11.2.0-next.141069",
     "description": "",
     "main": "index.js",
     "scripts": {