@wavemaker/angular-codegen 11.5.0-next.24741 → 11.5.0-next.24745

angular-codegen/angular-app/angular.json

@@ -150,9 +150,9 @@
                                 }
                             ],
                             "optimization": {
-                                "scripts": true,
+                                "scripts": false,
                                 "styles": {
-                                    "minify": true,
+                                    "minify": false,
                                     "inlineCritical": false
                                 },
                                 "fonts": true

angular-codegen/angular-app/package.json

@@ -47,7 +47,7 @@
         "@metrichor/jmespath": "^0.3.1",
         "@wavemaker.com/nvd3": "1.0.0",
         "@wavemaker/focus-trap": "^1.0.0",
-        "@wavemaker/variables": "11.5.0-next.24741",
+        "@wavemaker/variables": "11.5.0-next.24745",
         "@ztree/ztree_v3": "^3.5.48",
         "angular-imask": "6.3.0",
         "angular2-websocket": "0.9.7",
@@ -72,7 +72,7 @@
         "tslib": "2.4.1",
         "x2js": "^3.4.4",
         "zone.js": "~0.11.4",
-        "@wavemaker/app-ng-runtime": "11.5.0-next.24741"
+        "@wavemaker/app-ng-runtime": "11.5.0-next.24745"
     },
     "devDependencies": {
         "@ampproject/rollup-plugin-closure-compiler": "^0.27.0",

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

@@ -95390,30 +95390,58 @@ const setListClass$1 = (scope) => {
     }
 };
 const findParent$1 = (lView, viewParentApp) => {
-    let parent = findViewParent$1(lView);
-    return parent ? parent : viewParentApp;
+    // console.log("---*************--lView--*************---", lView);
+    // console.log("---*************--viewParentApp--*************---", viewParentApp);
+    let parentObj = findViewParent$1(lView, { 'parent': {}, 'root': {} });
+    // console.log("---*************--parentObj--*************---", parentObj);
+    let finalParent = {};
+    if (parentObj['parent'] === null || parentObj['root'] === null) {
+        parentObj['root'] = viewParentApp;
+        parentObj['parent'] = {};
+    }
+    let mergFunc = function (objValue, srcValue, key) {
+        const protectedKeys = ['viewParent'];
+        if (protectedKeys.includes(key)) {
+            return objValue;
+        }
+        return srcValue;
+    };
+    if (_.isEmpty(parentObj['parent'])) {
+        finalParent = _.mergeWith(parentObj.root, parentObj.parent, mergFunc);
+    }
+    else {
+        finalParent = _.mergeWith(parentObj.parent, parentObj.root, mergFunc);
+    }
+    // console.log("---*************--finalParent--*************---", finalParent);
+    return finalParent;
 };
-const findViewParent$1 = (lView) => {
+const findViewParent$1 = (lView, parentObj) => {
     if (lView[3] === null) {
-        return lView[8];
+        parentObj['root'] = lView[8];
+        return parentObj;
     }
     let parentlView = lView[3];
-    if (typeof lView[1] === "boolean") {
-        return findViewParent$1(parentlView);
+    if (typeof lView[1] === "boolean") { // this is lContainer, not lView if this is boolean
+        return findViewParent$1(parentlView, parentObj);
     }
     let componentType = lView[1]["type"];
     if (componentType === 0 || componentType === 1) {
         let p = lView[8];
         // ts-ignore
-        if (p.hasOwnProperty("isDialogComponent")) {
-            return findViewParent$1(parentlView);
+        if (p.hasOwnProperty("isDynamicComponent") || p.hasOwnProperty("isPageComponent")) {
+            parentObj['root'] = p;
+            return parentObj;
         }
         else {
-            return p;
+            if (_.isEmpty(parentObj['parent'])) {
+                parentObj['parent'] = p;
+                // console.log(".......parentObj........", parentObj)
+            }
+            return findViewParent$1(parentlView, parentObj);
         }
     }
-    else {
-        return findViewParent$1(parentlView);
+    else { // when componentType == 2, then fetch parent again
+        return findViewParent$1(parentlView, parentObj);
     }
 };
 
@@ -122191,30 +122219,58 @@ const setListClass = (scope) => {
     }
 };
 const findParent = (lView, viewParentApp) => {
-    let parent = findViewParent(lView);
-    return parent ? parent : viewParentApp;
+    // console.log("---*************--lView--*************---", lView);
+    // console.log("---*************--viewParentApp--*************---", viewParentApp);
+    let parentObj = findViewParent(lView, { 'parent': {}, 'root': {} });
+    // console.log("---*************--parentObj--*************---", parentObj);
+    let finalParent = {};
+    if (parentObj['parent'] === null || parentObj['root'] === null) {
+        parentObj['root'] = viewParentApp;
+        parentObj['parent'] = {};
+    }
+    let mergFunc = function (objValue, srcValue, key) {
+        const protectedKeys = ['viewParent'];
+        if (protectedKeys.includes(key)) {
+            return objValue;
+        }
+        return srcValue;
+    };
+    if (_.isEmpty(parentObj['parent'])) {
+        finalParent = _.mergeWith(parentObj.root, parentObj.parent, mergFunc);
+    }
+    else {
+        finalParent = _.mergeWith(parentObj.parent, parentObj.root, mergFunc);
+    }
+    // console.log("---*************--finalParent--*************---", finalParent);
+    return finalParent;
 };
-const findViewParent = (lView) => {
+const findViewParent = (lView, parentObj) => {
     if (lView[3] === null) {
-        return lView[8];
+        parentObj['root'] = lView[8];
+        return parentObj;
     }
     let parentlView = lView[3];
-    if (typeof lView[1] === "boolean") {
-        return findViewParent(parentlView);
+    if (typeof lView[1] === "boolean") { // this is lContainer, not lView if this is boolean
+        return findViewParent(parentlView, parentObj);
     }
     let componentType = lView[1]["type"];
     if (componentType === 0 || componentType === 1) {
         let p = lView[8];
         // ts-ignore
-        if (p.hasOwnProperty("isDialogComponent")) {
-            return findViewParent(parentlView);
+        if (p.hasOwnProperty("isDynamicComponent") || p.hasOwnProperty("isPageComponent")) {
+            parentObj['root'] = p;
+            return parentObj;
         }
         else {
-            return p;
+            if (_.isEmpty(parentObj['parent'])) {
+                parentObj['parent'] = p;
+                // console.log(".......parentObj........", parentObj)
+            }
+            return findViewParent(parentlView, parentObj);
         }
     }
-    else {
-        return findViewParent(parentlView);
+    else { // when componentType == 2, then fetch parent again
+        return findViewParent(parentlView, parentObj);
     }
 };
 

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

@@ -59016,30 +59016,58 @@ const setListClass = (scope) => {
     }
 };
 const findParent = (lView, viewParentApp) => {
-    let parent = findViewParent(lView);
-    return parent ? parent : viewParentApp;
+    // console.log("---*************--lView--*************---", lView);
+    // console.log("---*************--viewParentApp--*************---", viewParentApp);
+    let parentObj = findViewParent(lView, { 'parent': {}, 'root': {} });
+    // console.log("---*************--parentObj--*************---", parentObj);
+    let finalParent = {};
+    if (parentObj['parent'] === null || parentObj['root'] === null) {
+        parentObj['root'] = viewParentApp;
+        parentObj['parent'] = {};
+    }
+    let mergFunc = function (objValue, srcValue, key) {
+        const protectedKeys = ['viewParent'];
+        if (protectedKeys.includes(key)) {
+            return objValue;
+        }
+        return srcValue;
+    };
+    if (_.isEmpty(parentObj['parent'])) {
+        finalParent = _.mergeWith(parentObj.root, parentObj.parent, mergFunc);
+    }
+    else {
+        finalParent = _.mergeWith(parentObj.parent, parentObj.root, mergFunc);
+    }
+    // console.log("---*************--finalParent--*************---", finalParent);
+    return finalParent;
 };
-const findViewParent = (lView) => {
+const findViewParent = (lView, parentObj) => {
     if (lView[3] === null) {
-        return lView[8];
+        parentObj['root'] = lView[8];
+        return parentObj;
     }
     let parentlView = lView[3];
-    if (typeof lView[1] === "boolean") {
-        return findViewParent(parentlView);
+    if (typeof lView[1] === "boolean") { // this is lContainer, not lView if this is boolean
+        return findViewParent(parentlView, parentObj);
     }
     let componentType = lView[1]["type"];
     if (componentType === 0 || componentType === 1) {
         let p = lView[8];
         // ts-ignore
-        if (p.hasOwnProperty("isDialogComponent")) {
-            return findViewParent(parentlView);
+        if (p.hasOwnProperty("isDynamicComponent") || p.hasOwnProperty("isPageComponent")) {
+            parentObj['root'] = p;
+            return parentObj;
         }
         else {
-            return p;
+            if (_.isEmpty(parentObj['parent'])) {
+                parentObj['parent'] = p;
+                // console.log(".......parentObj........", parentObj)
+            }
+            return findViewParent(parentlView, parentObj);
         }
     }
-    else {
-        return findViewParent(parentlView);
+    else { // when componentType == 2, then fetch parent again
+        return findViewParent(parentlView, parentObj);
     }
 };
 

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

@@ -59016,30 +59016,58 @@ const setListClass = (scope) => {
     }
 };
 const findParent = (lView, viewParentApp) => {
-    let parent = findViewParent(lView);
-    return parent ? parent : viewParentApp;
+    // console.log("---*************--lView--*************---", lView);
+    // console.log("---*************--viewParentApp--*************---", viewParentApp);
+    let parentObj = findViewParent(lView, { 'parent': {}, 'root': {} });
+    // console.log("---*************--parentObj--*************---", parentObj);
+    let finalParent = {};
+    if (parentObj['parent'] === null || parentObj['root'] === null) {
+        parentObj['root'] = viewParentApp;
+        parentObj['parent'] = {};
+    }
+    let mergFunc = function (objValue, srcValue, key) {
+        const protectedKeys = ['viewParent'];
+        if (protectedKeys.includes(key)) {
+            return objValue;
+        }
+        return srcValue;
+    };
+    if (_.isEmpty(parentObj['parent'])) {
+        finalParent = _.mergeWith(parentObj.root, parentObj.parent, mergFunc);
+    }
+    else {
+        finalParent = _.mergeWith(parentObj.parent, parentObj.root, mergFunc);
+    }
+    // console.log("---*************--finalParent--*************---", finalParent);
+    return finalParent;
 };
-const findViewParent = (lView) => {
+const findViewParent = (lView, parentObj) => {
     if (lView[3] === null) {
-        return lView[8];
+        parentObj['root'] = lView[8];
+        return parentObj;
     }
     let parentlView = lView[3];
-    if (typeof lView[1] === "boolean") {
-        return findViewParent(parentlView);
+    if (typeof lView[1] === "boolean") { // this is lContainer, not lView if this is boolean
+        return findViewParent(parentlView, parentObj);
     }
     let componentType = lView[1]["type"];
     if (componentType === 0 || componentType === 1) {
         let p = lView[8];
         // ts-ignore
-        if (p.hasOwnProperty("isDialogComponent")) {
-            return findViewParent(parentlView);
+        if (p.hasOwnProperty("isDynamicComponent") || p.hasOwnProperty("isPageComponent")) {
+            parentObj['root'] = p;
+            return parentObj;
         }
         else {
-            return p;
+            if (_.isEmpty(parentObj['parent'])) {
+                parentObj['parent'] = p;
+                // console.log(".......parentObj........", parentObj)
+            }
+            return findViewParent(parentlView, parentObj);
         }
     }
-    else {
-        return findViewParent(parentlView);
+    else { // when componentType == 2, then fetch parent again
+        return findViewParent(parentlView, parentObj);
     }
 };
 

angular-codegen/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@wavemaker/angular-codegen",
-    "version": "11.5.0-next.24741",
+    "version": "11.5.0-next.24745",
     "description": "",
     "main": "index.js",
     "scripts": {