@wavemaker/angular-codegen 12.0.0-next.45076 → 12.0.0-next.45080

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

@@ -34,11 +34,11 @@
                 "@awesome-cordova-plugins/vibration": "5.39.1",
                 "@babel/runtime": "7.14.8",
                 "@metrichor/jmespath": "0.3.1",
-                "@wavemaker/custom-widgets-m3": "12.0.0-next.45076",
+                "@wavemaker/custom-widgets-m3": "12.0.0-next.45080",
                 "@wavemaker/focus-trap": "1.0.1",
-                "@wavemaker/foundation-css": "12.0.0-next.45076",
+                "@wavemaker/foundation-css": "12.0.0-next.45080",
                 "@wavemaker/nvd3": "1.8.11",
-                "@wavemaker/variables": "12.0.0-next.45076",
+                "@wavemaker/variables": "12.0.0-next.45080",
                 "@ztree/ztree_v3": "3.5.48",
                 "angular-imask": "^7.6.1",
                 "angular2-websocket": "0.9.7",
@@ -6731,9 +6731,9 @@
             }
         },
         "node_modules/@wavemaker/custom-widgets-m3": {
-            "version": "12.0.0-next.45076",
-            "resolved": "https://registry.npmjs.org/@wavemaker/custom-widgets-m3/-/custom-widgets-m3-12.0.0-next.45076.tgz",
-            "integrity": "sha512-mUcuJNkfM6Kt+Y+QXD1yOuAooLLWAZR5q/T8jzuvmYK0P3X4BPYJk2uR3inE8OuXVS5oq7tF53mxJbqtWhev+g=="
+            "version": "12.0.0-next.45080",
+            "resolved": "https://registry.npmjs.org/@wavemaker/custom-widgets-m3/-/custom-widgets-m3-12.0.0-next.45080.tgz",
+            "integrity": "sha512-mTYuABI/oJHtqagxNHcRkCUWGV5LdTqI4J1W+Z1Xsjch4vyr1pu5Ebt9HNb0k6szWVqnzwW4vQbkUneL/cL0yw=="
         },
         "node_modules/@wavemaker/focus-trap": {
             "version": "1.0.1",
@@ -6745,9 +6745,9 @@
             }
         },
         "node_modules/@wavemaker/foundation-css": {
-            "version": "12.0.0-next.45076",
-            "resolved": "https://registry.npmjs.org/@wavemaker/foundation-css/-/foundation-css-12.0.0-next.45076.tgz",
-            "integrity": "sha512-I4/jSDNyqb0xLeIkK2XlWDdGs5AgDNxA+vqv5ZQpBhs0mn2IYV+4WSX5zD+6QCKs4xpKGaIrKq7FUMFX7ZYzWw=="
+            "version": "12.0.0-next.45080",
+            "resolved": "https://registry.npmjs.org/@wavemaker/foundation-css/-/foundation-css-12.0.0-next.45080.tgz",
+            "integrity": "sha512-vRdR8J8DRAl0gNjLXXR1pPSBIMBUkZGHWLf7mYMAIqE4j6O0uSvAzDb/40R/+qu3/oNcsb93uvolIKF01O+RqA=="
         },
         "node_modules/@wavemaker/nvd3": {
             "version": "1.8.11",
@@ -6758,9 +6758,9 @@
             }
         },
         "node_modules/@wavemaker/variables": {
-            "version": "12.0.0-next.45076",
-            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-12.0.0-next.45076.tgz",
-            "integrity": "sha512-razbg4gATfDqxduOuxKO6+D+1O8TpXCw9ZRs3hacOfR00LWGknTTLfsZs9U72Yg1/AsGqjxDOLf/6XZLoKb0aQ==",
+            "version": "12.0.0-next.45080",
+            "resolved": "https://registry.npmjs.org/@wavemaker/variables/-/variables-12.0.0-next.45080.tgz",
+            "integrity": "sha512-JlPYL3Kk9LHha31hztBEfXrWDmGMhSiFebFoWlSVwuyHEQ3+rwTpY1w6FJyJUCRto2R1Z8/etrkbAnkAGS0PLQ==",
             "dependencies": {
                 "@metrichor/jmespath": "^0.3.1",
                 "he": "^1.2.0",

angular-codegen/angular-app/package.json

@@ -45,9 +45,9 @@
         "@metrichor/jmespath": "0.3.1",
         "@wavemaker/focus-trap": "1.0.1",
         "@wavemaker/nvd3": "1.8.11",
-        "@wavemaker/foundation-css": "12.0.0-next.45076",
-        "@wavemaker/custom-widgets-m3": "12.0.0-next.45076",
-        "@wavemaker/variables": "12.0.0-next.45076",
+        "@wavemaker/foundation-css": "12.0.0-next.45080",
+        "@wavemaker/custom-widgets-m3": "12.0.0-next.45080",
+        "@wavemaker/variables": "12.0.0-next.45080",
         "@ztree/ztree_v3": "3.5.48",
         "angular-imask": "^7.6.1",
         "angular2-websocket": "0.9.7",
@@ -72,7 +72,7 @@
         "tslib": "2.4.1",
         "x2js": "3.4.4",
         "zone.js": "0.14.7",
-        "@wavemaker/app-ng-runtime": "12.0.0-next.45076"
+        "@wavemaker/app-ng-runtime": "12.0.0-next.45080"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",

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

@@ -142015,6 +142015,7 @@ var FormWidgetType$1;
     FormWidgetType["CHIPS"] = "chips";
     FormWidgetType["COLORPICKER"] = "colorpicker";
     FormWidgetType["CURRENCY"] = "currency";
+    FormWidgetType["CUSTOMWIDGET"] = "custom-widget";
     FormWidgetType["DATE"] = "date";
     FormWidgetType["DATETIME"] = "datetime";
     FormWidgetType["NUMBER"] = "number";
@@ -142032,7 +142033,6 @@ var FormWidgetType$1;
     FormWidgetType["TIMESTAMP"] = "timestamp";
     FormWidgetType["TYPEAHEAD"] = "typeahead";
     FormWidgetType["UPLOAD"] = "upload";
-    FormWidgetType["CUSTOM"] = "custom";
 })(FormWidgetType$1 || (FormWidgetType$1 = {}));
 var DataType$1;
 (function (DataType) {
@@ -201357,6 +201357,7 @@ var FormWidgetType;
     FormWidgetType["CHIPS"] = "chips";
     FormWidgetType["COLORPICKER"] = "colorpicker";
     FormWidgetType["CURRENCY"] = "currency";
+    FormWidgetType["CUSTOMWIDGET"] = "custom-widget";
     FormWidgetType["DATE"] = "date";
     FormWidgetType["DATETIME"] = "datetime";
     FormWidgetType["NUMBER"] = "number";
@@ -201374,7 +201375,6 @@ var FormWidgetType;
     FormWidgetType["TIMESTAMP"] = "timestamp";
     FormWidgetType["TYPEAHEAD"] = "typeahead";
     FormWidgetType["UPLOAD"] = "upload";
-    FormWidgetType["CUSTOM"] = "custom";
 })(FormWidgetType || (FormWidgetType = {}));
 var DataType;
 (function (DataType) {

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

@@ -86132,6 +86132,7 @@ var FormWidgetType;
     FormWidgetType["CHIPS"] = "chips";
     FormWidgetType["COLORPICKER"] = "colorpicker";
     FormWidgetType["CURRENCY"] = "currency";
+    FormWidgetType["CUSTOMWIDGET"] = "custom-widget";
     FormWidgetType["DATE"] = "date";
     FormWidgetType["DATETIME"] = "datetime";
     FormWidgetType["NUMBER"] = "number";
@@ -86149,7 +86150,6 @@ var FormWidgetType;
     FormWidgetType["TIMESTAMP"] = "timestamp";
     FormWidgetType["TYPEAHEAD"] = "typeahead";
     FormWidgetType["UPLOAD"] = "upload";
-    FormWidgetType["CUSTOM"] = "custom";
 })(FormWidgetType || (FormWidgetType = {}));
 var DataType;
 (function (DataType) {
@@ -86234,6 +86234,9 @@ const getFormWidgetTemplate = (widgetType, innerTmpl, attrs, options = {}) => {
         case FormWidgetType.CURRENCY:
             tmpl = `<div wmCurrency ${attrs.get('required') === 'true' ? 'required=true' : ''} ${updateOnTmpl} ${innerTmpl} ${showTmpl}></div>`;
             break;
+        case FormWidgetType.CUSTOMWIDGET:
+            tmpl = `<div wmWidgetContainer customWidgetContainer ${attrs.get('required') === 'true' ? 'required=true' : ''} ${updateOnTmpl} ${innerTmpl} ${showTmpl}></div>`;
+            break;
         case FormWidgetType.DATE:
             tmpl = `<div wmDate ${attrs.get('required') === 'true' ? 'required=true' : ''} dataentrymode="${attrs.get('dataentrymode')}" ${innerTmpl} ${showTmpl}></div>`;
             break;
@@ -86280,9 +86283,6 @@ const getFormWidgetTemplate = (widgetType, innerTmpl, attrs, options = {}) => {
         case FormWidgetType.TIMESTAMP:
             tmpl = `<div wmDateTime ${attrs.get('required') === 'true' ? 'required=true' : ''} dataentrymode="${attrs.get('dataentrymode')}" ${innerTmpl} role="input" ${showTmpl}></div>`;
             break;
-        case FormWidgetType.CUSTOM:
-            tmpl = `<div wmWidgetContainer customWidgetContainer ${attrs.get('required') === 'true' ? 'required=true' : ''} ${innerTmpl} ${showTmpl}></div>`;
-            break;
         case FormWidgetType.UPLOAD:
             const counter = options.counter;
             const pCounter = options.pCounter;
@@ -86320,6 +86320,8 @@ const getRequiredFormWidget = (widgetType) => {
             return 'wm-colorpicker';
         case FormWidgetType.CURRENCY:
             return 'wm-currency';
+        case FormWidgetType.CUSTOMWIDGET:
+            return 'wm-custom-widget';
         case FormWidgetType.DATE:
             return 'wm-date';
         case FormWidgetType.DATETIME:
@@ -86333,8 +86335,6 @@ const getRequiredFormWidget = (widgetType) => {
             return 'wm-richtexteditor';
         case FormWidgetType.SLIDER:
             return 'wm-slider';
-        case FormWidgetType.CUSTOM:
-            return 'wm-custom-widget';
         default:
             return 'wm-text';
     }
@@ -91500,6 +91500,13 @@ const setDefaultPlaceholder = (attrs, widgetType, index) => {
     }
 };
 const getWidgetTemplate = (attrs, options) => {
+    let customAttrs = ``;
+    if (options.widgetType === "custom-widget") {
+        for (let [key, value] of attrs) {
+            if (key.startsWith('prop-'))
+                customAttrs += key + '="' + value + '" ';
+        }
+    }
     const name = attrs.get('name');
     const customWidgetName = attrs.get('widgetname');
     const fieldName = (attrs.get('key') || name || '').trim();
@@ -91507,7 +91514,7 @@ const getWidgetTemplate = (attrs, options) => {
     const tmplRef = options.isMaxWidget ? `#formWidgetMax` : `#formWidget`;
     const widgetName = name ? (options.isMaxWidget ? `name="${name}_formWidgetMax"` : `name="${name}_formWidget"`) : '';
     const conditionalClass = `[ngClass]="${attrs.get('ngclass')}"`;
-    const defaultTmpl = `[class.hidden]="!${options.pCounter}.isUpdateMode && ${options.counter}.viewmodewidget !== 'default'" ${formControl} ${options.eventsTmpl} ${conditionalClass} ${tmplRef} ${widgetName} ${customWidgetName ? `widgetname=${customWidgetName}` : ''}`;
+    const defaultTmpl = `[class.hidden]="!${options.pCounter}.isUpdateMode && ${options.counter}.viewmodewidget !== 'default'" ${formControl} ${options.eventsTmpl} ${conditionalClass} ${tmplRef} ${widgetName} ${customWidgetName ? `widgetname=${customWidgetName} ${customAttrs}` : ''}`;
     return getFormWidgetTemplate(options.widgetType, defaultTmpl, attrs, { counter: options.counter, pCounter: options.pCounter });
 };
 const getTemplate = (attrs, widgetType, eventsTmpl, counter, pCounter, isInList) => {

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

@@ -97323,6 +97323,7 @@ var FormWidgetType;
     FormWidgetType["CHIPS"] = "chips";
     FormWidgetType["COLORPICKER"] = "colorpicker";
     FormWidgetType["CURRENCY"] = "currency";
+    FormWidgetType["CUSTOMWIDGET"] = "custom-widget";
     FormWidgetType["DATE"] = "date";
     FormWidgetType["DATETIME"] = "datetime";
     FormWidgetType["NUMBER"] = "number";
@@ -97340,7 +97341,6 @@ var FormWidgetType;
     FormWidgetType["TIMESTAMP"] = "timestamp";
     FormWidgetType["TYPEAHEAD"] = "typeahead";
     FormWidgetType["UPLOAD"] = "upload";
-    FormWidgetType["CUSTOM"] = "custom";
 })(FormWidgetType || (FormWidgetType = {}));
 var DataType;
 (function (DataType) {
@@ -97425,6 +97425,9 @@ const getFormWidgetTemplate = (widgetType, innerTmpl, attrs, options = {}) => {
         case FormWidgetType.CURRENCY:
             tmpl = `<div wmCurrency ${attrs.get('required') === 'true' ? 'required=true' : ''} ${updateOnTmpl} ${innerTmpl} ${showTmpl}></div>`;
             break;
+        case FormWidgetType.CUSTOMWIDGET:
+            tmpl = `<div wmWidgetContainer customWidgetContainer ${attrs.get('required') === 'true' ? 'required=true' : ''} ${updateOnTmpl} ${innerTmpl} ${showTmpl}></div>`;
+            break;
         case FormWidgetType.DATE:
             tmpl = `<div wmDate ${attrs.get('required') === 'true' ? 'required=true' : ''} dataentrymode="${attrs.get('dataentrymode')}" ${innerTmpl} ${showTmpl}></div>`;
             break;
@@ -97471,9 +97474,6 @@ const getFormWidgetTemplate = (widgetType, innerTmpl, attrs, options = {}) => {
         case FormWidgetType.TIMESTAMP:
             tmpl = `<div wmDateTime ${attrs.get('required') === 'true' ? 'required=true' : ''} dataentrymode="${attrs.get('dataentrymode')}" ${innerTmpl} role="input" ${showTmpl}></div>`;
             break;
-        case FormWidgetType.CUSTOM:
-            tmpl = `<div wmWidgetContainer customWidgetContainer ${attrs.get('required') === 'true' ? 'required=true' : ''} ${innerTmpl} ${showTmpl}></div>`;
-            break;
         case FormWidgetType.UPLOAD:
             const counter = options.counter;
             const pCounter = options.pCounter;
@@ -97511,6 +97511,8 @@ const getRequiredFormWidget = (widgetType) => {
             return 'wm-colorpicker';
         case FormWidgetType.CURRENCY:
             return 'wm-currency';
+        case FormWidgetType.CUSTOMWIDGET:
+            return 'wm-custom-widget';
         case FormWidgetType.DATE:
             return 'wm-date';
         case FormWidgetType.DATETIME:
@@ -97524,8 +97526,6 @@ const getRequiredFormWidget = (widgetType) => {
             return 'wm-richtexteditor';
         case FormWidgetType.SLIDER:
             return 'wm-slider';
-        case FormWidgetType.CUSTOM:
-            return 'wm-custom-widget';
         default:
             return 'wm-text';
     }
@@ -102691,6 +102691,13 @@ const setDefaultPlaceholder = (attrs, widgetType, index) => {
     }
 };
 const getWidgetTemplate = (attrs, options) => {
+    let customAttrs = ``;
+    if (options.widgetType === "custom-widget") {
+        for (let [key, value] of attrs) {
+            if (key.startsWith('prop-'))
+                customAttrs += key + '="' + value + '" ';
+        }
+    }
     const name = attrs.get('name');
     const customWidgetName = attrs.get('widgetname');
     const fieldName = (attrs.get('key') || name || '').trim();
@@ -102698,7 +102705,7 @@ const getWidgetTemplate = (attrs, options) => {
     const tmplRef = options.isMaxWidget ? `#formWidgetMax` : `#formWidget`;
     const widgetName = name ? (options.isMaxWidget ? `name="${name}_formWidgetMax"` : `name="${name}_formWidget"`) : '';
     const conditionalClass = `[ngClass]="${attrs.get('ngclass')}"`;
-    const defaultTmpl = `[class.hidden]="!${options.pCounter}.isUpdateMode && ${options.counter}.viewmodewidget !== 'default'" ${formControl} ${options.eventsTmpl} ${conditionalClass} ${tmplRef} ${widgetName} ${customWidgetName ? `widgetname=${customWidgetName}` : ''}`;
+    const defaultTmpl = `[class.hidden]="!${options.pCounter}.isUpdateMode && ${options.counter}.viewmodewidget !== 'default'" ${formControl} ${options.eventsTmpl} ${conditionalClass} ${tmplRef} ${widgetName} ${customWidgetName ? `widgetname=${customWidgetName} ${customAttrs}` : ''}`;
     return getFormWidgetTemplate(options.widgetType, defaultTmpl, attrs, { counter: options.counter, pCounter: options.pCounter });
 };
 const getTemplate = (attrs, widgetType, eventsTmpl, counter, pCounter, isInList) => {

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "12.0.0-next.45076",
+    "version": "12.0.0-next.45080",
     "description": "",
     "main": "index.js",
     "scripts": {