@jay-framework/compiler-jay-html 0.7.0 → 0.8.0

package/dist/index.js

@@ -10394,7 +10394,8 @@ function renderInterface(aType) {
       genInterface += Object.keys(aType.props).map((prop) => {
         let childType = aType.props[prop];
         if (childType instanceof JayImportedType) {
-          return `  ${prop}: ${childType.name}`;
+          const optional = childType.isOptional ? "?" : "";
+          return `  ${prop}${optional}: ${childType.name}`;
         } else if (isObjectType$1(childType)) {
           childInterfaces.push(renderInterface(childType));
           return `  ${prop}: ${childType.name}`;
@@ -11281,7 +11282,8 @@ ${indent.curr}return ${childElement.rendered}}, '${trackBy}')`,
       `${indent.firstLine}${asyncType.name}${resolvedGenericTypes}(${getPromiseFragment.rendered}, () => ${childElement.rendered.trim()})`,
       childElement.imports.plus(asyncType.import),
       [...getPromiseFragment.validations, ...childElement.validations],
-      childElement.refs
+      childElement.refs,
+      [...getPromiseFragment.recursiveRegions, ...childElement.recursiveRegions]
     );
   }
   function renderNestedComponent(htmlElement, newContext) {
@@ -11341,12 +11343,13 @@ ${indent.curr}return ${childElement.rendered}}, '${trackBy}')`,
           indent
         });
         const accessorFunction = `(${variables.currentVar}: ${variables.currentType.name}) => ${accessorExpr.render().rendered}`;
+        const nestedChildElement = nestRefs(accessorExpr.terms, childElement);
         return new RenderFragment(
-          `${indent.firstLine}withData(${accessorFunction}, () => ${childElement.rendered})`,
-          childElement.imports.plus(Import.withData).plus(accessorExpr.render().imports),
-          [...accessorExpr.validations, ...childElement.validations],
-          childElement.refs,
-          childElement.recursiveRegions
+          `${indent.firstLine}withData(${accessorFunction}, () => ${nestedChildElement.rendered})`,
+          nestedChildElement.imports.plus(Import.withData).plus(accessorExpr.render().imports),
+          [...accessorExpr.validations, ...nestedChildElement.validations],
+          nestedChildElement.refs,
+          nestedChildElement.recursiveRegions
         );
       } else if (isRecurse(htmlElement)) {
         const refAttr = htmlElement.getAttribute("ref");
@@ -15968,6 +15971,12 @@ function validateRecursivePath(referencePath, rootData, currentPath) {
   const traversedPath = ["data"];
   for (let i = 1; i < pathParts.length; i++) {
     const part = pathParts[i];
+    if (Array.isArray(currentData)) {
+      if (currentData.length === 0) {
+        return `Cannot navigate through empty array at path "$/` + traversedPath.join("/") + `"`;
+      }
+      currentData = currentData[0];
+    }
     if (!currentData || typeof currentData !== "object" || !(part in currentData)) {
       const availableKeys = currentData && typeof currentData === "object" ? Object.keys(currentData) : [];
       return `Property "${part}" not found at path "$/` + traversedPath.join("/") + `"` + (availableKeys.length > 0 ? `. Available properties: ${availableKeys.join(", ")}` : "");
@@ -16090,7 +16099,10 @@ function parseTypes(jayYaml, validations, baseElementName, imports, headlessImpo
       // Pass root data for recursive reference validation
     );
     const headlessImportedTypes = Object.fromEntries(
-      headlessImports.map((_) => [_.key, new JayImportedType(_.rootType.name, _.rootType)])
+      headlessImports.map((_) => [
+        _.key,
+        new JayImportedType(_.rootType.name, _.rootType, true)
+      ])
     );
     const finalType = new JayObjectType(resolvedType.name, {
       ...headlessImportedTypes,

package/package.json

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