@jay-framework/compiler-jay-html 0.23.1 → 0.24.1

package/dist/index.js

@@ -14377,6 +14377,49 @@ function updateImportRefsWithTemplateConstNames(importTree, templateRefsByOrigin
     importTree?.imported?.repeatedRefsTypeName
   );
 }
+function graftTemplateOnlyRefs(importTree, templateTree, allImportRefNames) {
+  const knownNames = allImportRefNames ?? collectAllRefNames(importTree);
+  const importRefNames = new Set(importTree.refs.map((r) => r.ref));
+  const extraRefs = templateTree.refs.filter(
+    (r) => !importRefNames.has(r.ref) && !knownNames.has(r.ref)
+  );
+  let childrenChanged = false;
+  const children = { ...importTree.children };
+  for (const [key, templateChild] of Object.entries(templateTree.children)) {
+    if (!(key in children)) {
+      if (hasRefsNotIn(templateChild, knownNames)) {
+        children[key] = templateChild;
+        childrenChanged = true;
+      }
+    } else {
+      const grafted = graftTemplateOnlyRefs(children[key], templateChild, knownNames);
+      if (grafted !== children[key]) {
+        children[key] = grafted;
+        childrenChanged = true;
+      }
+    }
+  }
+  if (extraRefs.length === 0 && !childrenChanged) return importTree;
+  return mkRefsTree(
+    [...importTree.refs, ...extraRefs],
+    children,
+    importTree.repeated,
+    importTree?.imported?.refsTypeName,
+    importTree?.imported?.repeatedRefsTypeName
+  );
+}
+function hasRefsNotIn(tree, knownNames) {
+  if (tree.refs.some((r) => !knownNames.has(r.ref))) return true;
+  return Object.values(tree.children).some((c) => hasRefsNotIn(c, knownNames));
+}
+function collectAllRefNames(tree) {
+  const names = /* @__PURE__ */ new Set();
+  for (const ref of tree.refs) names.add(ref.ref);
+  for (const child of Object.values(tree.children)) {
+    for (const name of collectAllRefNames(child)) names.add(name);
+  }
+  return names;
+}
 function optimizeRefs({ rendered, imports, validations, refs, recursiveRegions }, headlessImports = []) {
   const deDuplicateRefsTree = (refs2) => {
     const mergedRefs = [];
@@ -14443,7 +14486,8 @@ function optimizeRefs({ rendered, imports, validations, refs, recursiveRegions }
     }
   }
   for (const [key, child] of Object.entries(importedRefsUpdated)) {
-    mergedChildren[key] = child;
+    const templateChild = markedAutoOnImported.children[key];
+    mergedChildren[key] = templateChild ? graftTemplateOnlyRefs(child, templateChild) : child;
   }
   const combined = mkRefsTree(
     markedAutoOnImported.refs,
@@ -19581,15 +19625,25 @@ function detectCssNameCollisions(css, validations) {
     }
     keyframeNames.add(name);
   }
-  const fontFaceNames = /* @__PURE__ */ new Set();
-  for (const match of css.matchAll(/@font-face\s*\{[^}]*font-family\s*:\s*['"]?([^;'"}\n]+)/g)) {
-    const name = match[1].trim();
-    if (fontFaceNames.has(name)) {
+  const fontFaceKeys = /* @__PURE__ */ new Set();
+  for (const match of css.matchAll(/@font-face\s*\{([^}]*)\}/g)) {
+    const block = match[1];
+    const familyMatch = block.match(/font-family\s*:\s*['"]?([^;'"\n}]+)/);
+    if (!familyMatch) {
+      continue;
+    }
+    const family = familyMatch[1].trim();
+    const weightMatch = block.match(/font-weight\s*:\s*([^;\n}]+)/);
+    const styleMatch = block.match(/font-style\s*:\s*([^;\n}]+)/);
+    const weight = weightMatch ? weightMatch[1].trim() : "normal";
+    const style = styleMatch ? styleMatch[1].trim() : "normal";
+    const key = `${family}|${weight}|${style}`;
+    if (fontFaceKeys.has(key)) {
       validations.push(
-        `@font-face "${name}" is defined multiple times. Font family names are global — rename to avoid collisions.`
+        `@font-face "${family}" (${weight}, ${style}) is defined multiple times. Font faces are global — rename to avoid collisions.`
       );
     }
-    fontFaceNames.add(name);
+    fontFaceKeys.add(key);
   }
 }
 function extractTrackByMaps(pageContract, headlessImports) {
@@ -21425,8 +21479,8 @@ function renderAttributes$1(element, { variables }) {
   let attributes2 = element.attributes;
   let renderedAttributes = [];
   Object.keys(attributes2).forEach((attrName) => {
-    let attrCanonical = attrName.toLowerCase();
-    let attrKey = attrCanonical.match(attributesRequiresQuotes$1) ? `"${attrCanonical}"` : attrCanonical;
+    const attrCanonical = attrName.toLowerCase();
+    const attrKey = attrName.match(attributesRequiresQuotes$1) ? `"${attrName}"` : attrName;
     if (isDirectiveAttribute(attrCanonical)) return;
     if (attrCanonical === "style") {
       renderedAttributes.push(renderStyleAttribute(attributes2[attrName], variables));
@@ -21462,7 +21516,7 @@ function renderDynamicAttributes(element, { variables }) {
   const renderedAttributes = [];
   Object.keys(attributes2).forEach((attrName) => {
     const attrCanonical = attrName.toLowerCase();
-    const attrKey = attrCanonical.match(attributesRequiresQuotes$1) ? `"${attrCanonical}"` : attrCanonical;
+    const attrKey = attrName.match(attributesRequiresQuotes$1) ? `"${attrName}"` : attrName;
     if (isDirectiveAttribute(attrCanonical)) return;
     if (attrCanonical === "style") {
       const styleFragment = renderStyleAttribute(attributes2[attrName], variables);
@@ -23309,12 +23363,12 @@ function renderServerAttributes(element, context) {
     const attrValue = attributes2[attrName];
     if (propertyMapping[attrCanonical]?.type === BOOLEAN_ATTRIBUTE) {
       if (attrValue === "") {
-        parts.push(w(indent, `' ${attrCanonical}'`));
+        parts.push(w(indent, `' ${attrName}'`));
       } else {
         const condExpr = parseServerCondition(attrValue, variables);
         parts.push(
           new RenderFragment(
-            `${indent.firstLine}if (${condExpr.rendered}) { w(' ${attrCanonical}'); }`
+            `${indent.firstLine}if (${condExpr.rendered}) { w(' ${attrName}'); }`
           )
         );
       }
@@ -23324,13 +23378,13 @@ function renderServerAttributes(element, context) {
         parts.push(
           w(
             indent,
-            `' ${attrCanonical}="' + escapeAttr(String(${fragment.rendered})) + '"'`,
+            `' ${attrName}="' + escapeAttr(String(${fragment.rendered})) + '"'`,
             Imports.for(Import.escapeAttr)
           )
         );
       } else {
         const escaped = escapeForJsString(attrValue);
-        parts.push(w(indent, `' ${attrCanonical}="${escaped}"'`));
+        parts.push(w(indent, `' ${attrName}="${escaped}"'`));
       }
     } else if (attrCanonical === "class") {
       const classExpr = parseClassExpression(attrValue, variables);
@@ -23373,13 +23427,13 @@ function renderServerAttributes(element, context) {
         parts.push(
           w(
             indent,
-            `' ${attrCanonical}="' + escapeAttr(String(${fragment.rendered})) + '"'`,
+            `' ${attrName}="' + escapeAttr(String(${fragment.rendered})) + '"'`,
             Imports.for(Import.escapeAttr)
           )
         );
       } else {
         const escaped = escapeForJsString(attrValue);
-        parts.push(w(indent, `' ${attrCanonical}="${escaped}"'`));
+        parts.push(w(indent, `' ${attrName}="${escaped}"'`));
       }
     }
   });
@@ -23512,20 +23566,20 @@ function renderServerAttributesAsString(element, context) {
     const attrValue = attributes2[attrName];
     if (propertyMapping[attrCanonical]?.type === BOOLEAN_ATTRIBUTE) {
       if (attrValue === "") {
-        parts.push(new RenderFragment(`' ${attrCanonical}'`));
+        parts.push(new RenderFragment(`' ${attrName}'`));
       }
     } else if (propertyMapping[attrCanonical]?.type === PROPERTY) {
       const [fragment, isDynamic] = parseServerTemplateExpression(attrValue, variables);
       if (isDynamic) {
         parts.push(
           new RenderFragment(
-            `' ${attrCanonical}="' + escapeAttr(String(${fragment.rendered})) + '"'`,
+            `' ${attrName}="' + escapeAttr(String(${fragment.rendered})) + '"'`,
             Imports.for(Import.escapeAttr)
           )
         );
       } else {
         const escaped = escapeForJsString(attrValue);
-        parts.push(new RenderFragment(`' ${attrCanonical}="${escaped}"'`));
+        parts.push(new RenderFragment(`' ${attrName}="${escaped}"'`));
       }
     } else if (attrCanonical === "class") {
       const classExpr = parseClassExpression(attrValue, variables);
@@ -23565,13 +23619,13 @@ function renderServerAttributesAsString(element, context) {
       if (isDynamic) {
         parts.push(
           new RenderFragment(
-            `' ${attrCanonical}="' + escapeAttr(String(${fragment.rendered})) + '"'`,
+            `' ${attrName}="' + escapeAttr(String(${fragment.rendered})) + '"'`,
             Imports.for(Import.escapeAttr)
           )
         );
       } else {
         const escaped = escapeForJsString(attrValue);
-        parts.push(new RenderFragment(`' ${attrCanonical}="${escaped}"'`));
+        parts.push(new RenderFragment(`' ${attrName}="${escaped}"'`));
       }
     }
   });

package/package.json

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