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

package/dist/index.d.cts

@@ -223,6 +223,8 @@ interface JayHtmlSourceFile extends CompilerSourceFile {
      */
     clientTrackByMap?: Record<string, string>;
     headMeta?: JayHtmlHeadMeta;
+    /** Per-page validation overrides from <script type="application/jay-validations">. */
+    validationOverrides?: Record<string, Record<string, boolean>>;
     scripts?: JayHtmlScript[];
 }
 

package/dist/index.js

@@ -19162,7 +19162,7 @@ function injectHeadfullFSTemplatesRecursive(fsElements, body, sourceDir, importR
     }
   }
 }
-async function parseHeadfullFSImports(elements, validations, filePath, importResolver, body, projectRoot, visited = /* @__PURE__ */ new Set(), sourceDir) {
+async function parseHeadfullFSImports(elements, validations, filePath, importResolver, body, projectRoot, visited = /* @__PURE__ */ new Set(), sourceDir, pageLinkedCssPaths) {
   const headlessImports = [];
   const cssParts = [];
   const linkedCssFiles = [];
@@ -19272,10 +19272,11 @@ async function parseHeadfullFSImports(elements, validations, filePath, importRes
       continue;
     }
     const componentDir = jayHtmlResult.componentDir;
-    const componentCssResult = await extractCss(jayHtmlRoot, componentDir);
+    const componentCssResult = await extractCss(jayHtmlRoot, componentDir, pageLinkedCssPaths);
     validations.push(...componentCssResult.validations);
     if (componentCssResult.val?.css) {
-      cssParts.push(componentCssResult.val.css);
+      cssParts.push(`/* Component: ${contractName} */
+${componentCssResult.val.css}`);
     }
     if (componentCssResult.val?.linkedCssFiles) {
       linkedCssFiles.push(...componentCssResult.val.linkedCssFiles);
@@ -19319,7 +19320,9 @@ async function parseHeadfullFSImports(elements, validations, filePath, importRes
         importResolver,
         jayHtmlBody,
         projectRoot,
-        visited
+        visited,
+        void 0,
+        pageLinkedCssPaths
       );
       headlessImports.push(...nestedResult.headlessImports);
       if (nestedResult.css) {
@@ -19557,6 +19560,25 @@ function parseHeadMeta(root) {
   }
   return { title, meta, links };
 }
+function parseValidationOverrides(root) {
+  const el = root.querySelector('script[type="application/jay-validations"]');
+  if (!el) return void 0;
+  const text2 = el.textContent?.trim();
+  if (!text2) return void 0;
+  try {
+    const parsed = yaml.load(text2);
+    if (!parsed || typeof parsed !== "object") return void 0;
+    const result = {};
+    for (const [key, value] of Object.entries(parsed)) {
+      if (value && typeof value === "object") {
+        result[key] = value;
+      }
+    }
+    return Object.keys(result).length > 0 ? result : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function resolveNestedCssImports(css, cssDir, visited) {
   if (!css.includes("@import")) return css;
   const seen = visited ?? /* @__PURE__ */ new Set();
@@ -19574,7 +19596,7 @@ ${resolveNestedCssImports(imported, path.dirname(resolved), seen)}`;
     }
   });
 }
-async function extractCss(root, filePath) {
+async function extractCss(root, filePath, skipPaths) {
   const cssParts = [];
   const validations = [];
   const linkedCssFiles = [];
@@ -19588,6 +19610,7 @@ async function extractCss(root, filePath) {
       if (filePath) {
         const cssFilePath = path.resolve(filePath, href);
         linkedCssFiles.push(cssFilePath);
+        if (skipPaths?.has(cssFilePath)) continue;
         try {
           const cssContent = await fs$1.readFile(cssFilePath, "utf-8");
           const resolvedCss = resolveNestedCssImports(
@@ -19700,6 +19723,13 @@ async function parseJayFile(html2, filename, filePath, options, linkedContractRe
     validations.push(`jay file must have exactly a body tag`);
     return new WithValidations(void 0, validations);
   }
+  const pageLinkedCssPaths = /* @__PURE__ */ new Set();
+  for (const link of root.querySelectorAll('head link[rel="stylesheet"]')) {
+    const href = link.getAttribute("href");
+    if (href && !href.startsWith("http://") && !href.startsWith("https://") && !href.startsWith("//")) {
+      pageLinkedCssPaths.add(path.resolve(filePath, href));
+    }
+  }
   const headfullFSResult = await parseHeadfullFSImports(
     fsHeadfullElements,
     validations,
@@ -19709,7 +19739,8 @@ async function parseJayFile(html2, filename, filePath, options, linkedContractRe
     projectRoot,
     void 0,
     // visited
-    sourceDir
+    sourceDir,
+    pageLinkedCssPaths
   );
   const headlessImports = await parseHeadlessImports(
     root.querySelectorAll('script[type="application/jay-headless"]'),
@@ -19744,6 +19775,7 @@ async function parseJayFile(html2, filename, filePath, options, linkedContractRe
   const excludeCssLinks = !!filePath;
   const headLinks = parseHeadLinks(root, excludeCssLinks);
   const headMeta = parseHeadMeta(root);
+  const validationOverrides = parseValidationOverrides(root);
   const scripts = validateAndCollectScripts(root, validations);
   validations.push(...cssResult.validations);
   if (validations.length > 0) return new WithValidations(void 0, validations);
@@ -19783,6 +19815,7 @@ async function parseJayFile(html2, filename, filePath, options, linkedContractRe
       serverTrackByMap: Object.keys(serverTrackByMap).length > 0 ? serverTrackByMap : void 0,
       clientTrackByMap: Object.keys(clientTrackByMap).length > 0 ? clientTrackByMap : void 0,
       headMeta,
+      validationOverrides,
       scripts: scripts.length > 0 ? scripts : void 0
     },
     validations

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jay-framework/compiler-jay-html",
-  "version": "0.24.1",
+  "version": "0.24.2",
   "description": "",
   "license": "Apache-2.0",
   "main": "dist/index.js",
@@ -34,12 +34,12 @@
   },
   "author": "",
   "dependencies": {
-    "@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",
+    "@jay-framework/compiler-analyze-exported-types": "^0.24.2",
+    "@jay-framework/compiler-shared": "^0.24.2",
+    "@jay-framework/component": "^0.24.2",
+    "@jay-framework/logger": "^0.24.2",
+    "@jay-framework/runtime": "^0.24.2",
+    "@jay-framework/secure": "^0.24.2",
     "@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.24.1",
-    "@jay-framework/dev-environment": "^0.24.1",
+    "@jay-framework/4-react": "^0.24.2",
+    "@jay-framework/dev-environment": "^0.24.2",
     "@testing-library/jest-dom": "^6.2.0",
     "@types/js-beautify": "^1",
     "@types/node": "^20.11.5",