@jay-framework/compiler-jay-html 0.15.1 → 0.15.3

package/dist/index.js

@@ -20554,9 +20554,25 @@ ${context.indent.firstLine}    ${createBody})`,
       itemChildNodes.map((child) => renderHydrateNode(child, itemContext)),
       ",\n"
     );
-    const adoptBody = itemContent.rendered.trim() ? `() => [
+    const itemRenderCtx = buildRenderContext(itemContext);
+    const itemAttrs = renderDynamicAttributes(element, itemRenderCtx);
+    const itemHasDynamicAttrs = itemAttrs.imports.has(Import.dynamicAttribute) || itemAttrs.imports.has(Import.dynamicProperty) || itemAttrs.imports.has(Import.booleanAttribute);
+    const itemRefFragment = renderElementRef$1(element, itemRenderCtx);
+    const needsItemAdoption = itemHasDynamicAttrs || !!itemRefFragment.rendered.trim();
+    let adoptBody;
+    if (needsItemAdoption) {
+      const refSuffix = itemRefFragment.rendered ? `, ${itemRefFragment.rendered}` : "";
+      const childrenArr = itemContent.rendered.trim() ? `[
+${itemContent.rendered},
+${indent.firstLine}        ]` : "[]";
+      adoptBody = `() => [
+${indent.firstLine}        adoptElement("", ${itemAttrs.rendered}, ${childrenArr}${refSuffix}),
+${indent.firstLine}    ]`;
+    } else {
+      adoptBody = itemContent.rendered.trim() ? `() => [
 ${itemContent.rendered},
 ${indent.firstLine}    ]` : "() => []";
+    }
     const createRenderContext = {
       ...renderContext,
       variables: forEachVariables,
@@ -20585,21 +20601,27 @@ ${indent.firstLine}    ]` : "() => []";
     );
     const forEachElementFunc = forEachNeedsDynamic ? "de" : "e";
     const forEachElementImport = forEachNeedsDynamic ? Import.dynamicElement : Import.element;
+    const createItemRef = renderElementRef$1(element, createRenderContext);
+    const createRefSuffix = createItemRef.rendered ? `, ${createItemRef.rendered}` : "";
     const createBody = `(${forEachVariables.currentVar}: ${forEachVariables.currentType.name}) => {
-${indent.firstLine}    return ${forEachElementFunc}('${element.rawTagName}', ${createAttributes.rendered}, [${createChildren.rendered}]);
+${indent.firstLine}    return ${forEachElementFunc}('${element.rawTagName}', ${createAttributes.rendered}, [${createChildren.rendered}]${createRefSuffix});
 ${indent.firstLine}    }`;
+    let allImports = Imports.for(Import.hydrateForEach).plus(forEachElementImport).plus(forEachFragment.imports).plus(itemContent.imports).plus(createChildren.imports).plus(createAttributes.imports).plus(itemAttrs.imports).plus(itemRefFragment.imports).plus(createItemRef.imports);
+    if (needsItemAdoption) {
+      allImports = allImports.plus(Import.adoptElement);
+    }
     const hydrateForEachFragment = new RenderFragment(
       `${indent.firstLine}hydrateForEach(${forEachFragment.rendered}, '${trackBy}',
 ${indent.firstLine}    ${adoptBody},
 ${indent.firstLine}    ${createBody},
 ${indent.firstLine})`,
-      Imports.for(Import.hydrateForEach).plus(forEachElementImport).plus(forEachFragment.imports).plus(itemContent.imports).plus(createChildren.imports).plus(createAttributes.imports),
+      allImports,
       [
         ...forEachFragment.validations,
         ...itemContent.validations,
         ...createChildren.validations
       ],
-      itemContent.refs
+      mergeRefsTrees(itemContent.refs, itemRefFragment.refs)
     );
     return nestRefs(forEachAccessor.terms, hydrateForEachFragment);
   }
@@ -21729,6 +21751,7 @@ function renderServerElementAsString(element, context, overrideCoordinate) {
   const coordTemplate = element.getAttribute(COORD_ATTR);
   const coordinate = coordTemplate || (needsCoordinate ? overrideCoordinate || null : null);
   const isVoid = voidElements.has(element.rawTagName.toLowerCase());
+  const closeTag = isVoid ? " />" : ">";
   const stringParts = [];
   stringParts.push(new RenderFragment(`'<${element.rawTagName}'`));
   const attrs = renderServerAttributesAsString(element, context);
@@ -21736,9 +21759,9 @@ function renderServerElementAsString(element, context, overrideCoordinate) {
     stringParts.push(attrs);
   }
   if (coordinate !== null) {
-    stringParts.push(new RenderFragment(`' jay-coordinate="${coordinate}">'`));
+    stringParts.push(new RenderFragment(`' jay-coordinate="${coordinate}"${closeTag}'`));
   } else {
-    stringParts.push(new RenderFragment(`'>'`));
+    stringParts.push(new RenderFragment(`'${closeTag}'`));
   }
   if (!isVoid) {
     if (dynamicTextFragment) {
@@ -21902,6 +21925,7 @@ function renderServerElementContent(element, context, options) {
   const needsCoordinate = options?.isRoot === true || isConditional(element) && conditionIsInteractive(element.getAttribute("if"), context.interactivePaths) || dynamicTextFragment !== null || refName !== null || hasDynamicAttributeBindings(element, variables) || hasInteractiveChildElements(childNodes) || hasMixedContentDynamicTextInteractive(childNodes, context.interactivePaths);
   const coordTemplate = needsCoordinate ? element.getAttribute(COORD_ATTR) : null;
   const isVoid = voidElements.has(element.rawTagName.toLowerCase());
+  const closeTag = isVoid ? " />" : ">";
   const parts = [];
   parts.push(w(indent, `'<${element.rawTagName}'`));
   const attrs = renderServerAttributes(element, context);
@@ -21914,12 +21938,12 @@ function renderServerElementContent(element, context, options) {
         parts.push(
           w(
             indent,
-            `' jay-coordinate="' + ${context.forEachAccumulatedPrefix} + '/${coordTemplate}">'`,
+            `' jay-coordinate="' + ${context.forEachAccumulatedPrefix} + '/${coordTemplate}"${closeTag}'`,
             Imports.for(Import.escapeAttr)
           )
         );
       } else {
-        parts.push(w(indent, `' jay-coordinate="${coordTemplate}">'`));
+        parts.push(w(indent, `' jay-coordinate="${coordTemplate}"${closeTag}'`));
       }
     } else {
       const coordExpr = compileCoordinateExpr(coordTemplate, context.varMappings);
@@ -21927,7 +21951,7 @@ function renderServerElementContent(element, context, options) {
         parts.push(
           w(
             indent,
-            `' jay-coordinate="' + ${context.forEachAncestorPrefix} + '/' + ${coordExpr} + '">'`,
+            `' jay-coordinate="' + ${context.forEachAncestorPrefix} + '/' + ${coordExpr} + '"${closeTag}'`,
             Imports.for(Import.escapeAttr)
           )
         );
@@ -21935,14 +21959,14 @@ function renderServerElementContent(element, context, options) {
         parts.push(
           w(
             indent,
-            `' jay-coordinate="' + ${coordExpr} + '">'`,
+            `' jay-coordinate="' + ${coordExpr} + '"${closeTag}'`,
             Imports.for(Import.escapeAttr)
           )
         );
       }
     }
   } else {
-    parts.push(w(indent, `'>'`));
+    parts.push(w(indent, `'${closeTag}'`));
   }
   if (isVoid)
     return mergeServerFragments(parts);

package/package.json

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