@jay-framework/compiler-jay-html 0.6.2 → 0.6.4

package/dist/index.js

@@ -4062,6 +4062,7 @@ class Variables {
     __publicField(this, "currentType");
     __publicField(this, "currentContext");
     __publicField(this, "parent");
+    __publicField(this, "children", {});
     __publicField(this, "depth");
     this.currentVar = depth === 0 ? "vs" : "vs" + depth;
     this.currentContext = depth === 0 ? "context" : "cx" + depth;
@@ -4086,8 +4087,16 @@ class Variables {
     });
     return new Accessor(this.currentVar, accessor, validations, curr);
   }
-  childVariableFor(resolvedForEachType) {
-    return new Variables(resolvedForEachType, this, this.depth + 1);
+  childVariableFor(accessor) {
+    const path2 = accessor.terms.join(".");
+    if (this.children[path2])
+      return this.children[path2];
+    else {
+      const resolvedForEachType = accessor.resolvedType.itemType;
+      const variables = new Variables(resolvedForEachType, this, this.depth + 1);
+      this.children[path2] = variables;
+      return variables;
+    }
   }
 }
 function doParse(expression, startRule, vars) {
@@ -5077,9 +5086,7 @@ ${indent.curr}return ${childElement.rendered}}, '${trackBy}')`,
         const paramName = forEachAccessor.rootVar;
         const paramType = variables.currentType.name;
         const forEachFragment = forEachAccessor.render().map((_) => `(${paramName}: ${paramType}) => ${_}`);
-        let forEachVariables = variables.childVariableFor(
-          forEachAccessor.resolvedType.itemType
-        );
+        let forEachVariables = variables.childVariableFor(forEachAccessor);
         let newContext = {
           ...context,
           variables: forEachVariables,
@@ -5262,9 +5269,7 @@ ${indent.firstLine}])`,
       const paramName = forEachAccessor.rootVar;
       const paramType = variables.currentType.name;
       const forEachFragment = forEachAccessor.render().map((_) => `(${paramName}: ${paramType}) => ${_}`);
-      let forEachVariables = variables.childVariableFor(
-        forEachAccessor.resolvedType.itemType
-      );
+      let forEachVariables = variables.childVariableFor(forEachAccessor);
       let childElement = renderHtmlElement(htmlElement, {
         ...context,
         variables: forEachVariables,
@@ -5709,9 +5714,7 @@ ${newContext.indent.firstLine}` : children
           return new compilerShared.RenderFragment("", compilerShared.Imports.none(), [
             `forEach directive - failed to resolve type for forEach=${forEach}`
           ]);
-        let forEachVariables = variables.childVariableFor(
-          forEachAccessor.resolvedType.itemType
-        );
+        let forEachVariables = variables.childVariableFor(forEachAccessor);
         let newContext = {
           ...renderContext,
           variables: forEachVariables,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/compiler-jay-html",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "description": "",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -27,11 +27,11 @@
   },
   "author": "",
   "dependencies": {
-    "@jay-framework/compiler-analyze-exported-types": "^0.6.2",
-    "@jay-framework/compiler-shared": "^0.6.2",
-    "@jay-framework/component": "^0.6.2",
-    "@jay-framework/runtime": "^0.6.2",
-    "@jay-framework/secure": "^0.6.2",
+    "@jay-framework/compiler-analyze-exported-types": "^0.6.4",
+    "@jay-framework/compiler-shared": "^0.6.4",
+    "@jay-framework/component": "^0.6.4",
+    "@jay-framework/runtime": "^0.6.4",
+    "@jay-framework/secure": "^0.6.4",
     "@types/js-yaml": "^4.0.9",
     "change-case": "^4.1.2",
     "js-yaml": "^4.1.0",
@@ -43,8 +43,8 @@
   },
   "devDependencies": {
     "@caiogondim/strip-margin": "^1.0.0",
-    "@jay-framework/4-react": "^0.6.2",
-    "@jay-framework/dev-environment": "^0.6.2",
+    "@jay-framework/4-react": "^0.6.4",
+    "@jay-framework/dev-environment": "^0.6.4",
     "@testing-library/jest-dom": "^6.2.0",
     "@types/js-beautify": "^1",
     "@types/node": "^20.11.5",