@jay-framework/compiler-jay-html 0.6.6 → 0.6.7

package/dist/index.d.ts

@@ -26,6 +26,8 @@ interface JayHtmlSourceFile extends CompilerSourceFile {
     namespaces: JayHtmlNamespace[];
     headlessImports: JayHeadlessImports[];
     headLinks: JayHtmlHeadLink[];
+    css?: string;
+    filename?: string;
 }
 
 declare function generateElementDefinitionFile(parsedFile: WithValidations<JayHtmlSourceFile>): WithValidations<string>;

package/dist/index.js

@@ -14,8 +14,9 @@ const yaml = require("js-yaml");
 const changeCase = require("change-case");
 const pluralize = require("pluralize");
 const path = require("path");
+const fs = require("fs/promises");
 const compilerAnalyzeExportedTypes = require("@jay-framework/compiler-analyze-exported-types");
-const fs = require("node:fs");
+const fs$1 = require("node:fs");
 function peg$subclass(child, parent) {
   function ctor() {
     this.constructor = child;
@@ -5128,6 +5129,12 @@ function renderHeadLinksArray(headLinks) {
   }).join(", ");
   return `[${linksCode}]`;
 }
+function generateCssImport(jayFile) {
+  if (!jayFile.css || !jayFile.filename) {
+    return "";
+  }
+  return `import './${jayFile.filename}.css';`;
+}
 function renderFunctionImplementation$1(types, rootBodyElement, importStatements, baseElementName, namespaces, headlessImports, importerMode, headLinks = []) {
   const variables = new Variables(types);
   const { importedSymbols, importedSandboxedSymbols } = processImportedComponents(importStatements);
@@ -5363,6 +5370,7 @@ function generateElementDefinitionFile(parsedFile) {
       compilerShared.RuntimeMode.WorkerTrusted,
       jayFile.headLinks
     );
+    const cssImport = generateCssImport(jayFile);
     return [
       renderImports$1(
         renderedImplementation.imports.plus(compilerShared.Import.jayElement),
@@ -5370,6 +5378,7 @@ function generateElementDefinitionFile(parsedFile) {
         jayFile.imports,
         compilerShared.RuntimeMode.MainTrusted
       ),
+      cssImport,
       types,
       renderedRefs,
       renderedElement,
@@ -5389,6 +5398,7 @@ function generateElementFile(jayFile, importerMode) {
     importerMode,
     jayFile.headLinks
   );
+  const cssImport = generateCssImport(jayFile);
   const renderedFile = [
     renderImports$1(
       renderedImplementation.imports.plus(compilerShared.Import.element).plus(compilerShared.Import.jayElement),
@@ -5396,6 +5406,7 @@ function generateElementFile(jayFile, importerMode) {
       jayFile.imports,
       importerMode
     ),
+    cssImport,
     types,
     renderedRefs,
     renderedElement,
@@ -6399,9 +6410,16 @@ async function parseHeadlessImports(elements, validations, filePath, importResol
 function normalizeFilename(filename) {
   return filename.replace(".jay-html", "");
 }
-function parseHeadLinks(root) {
+function parseHeadLinks(root, excludeCssLinks = false) {
   const allLinks = root.querySelectorAll("head link");
-  return allLinks.filter((link) => link.getAttribute("rel") !== "import").map((link) => {
+  return allLinks.filter((link) => {
+    const rel = link.getAttribute("rel");
+    if (rel === "import")
+      return false;
+    if (excludeCssLinks && rel === "stylesheet")
+      return false;
+    return true;
+  }).map((link) => {
     const attributes = { ...link.attributes };
     const rel = attributes.rel || "";
     const href = attributes.href || "";
@@ -6414,6 +6432,40 @@ function parseHeadLinks(root) {
     };
   });
 }
+async function extractCss(root, filePath) {
+  const cssParts = [];
+  const validations = [];
+  const styleLinks = root.querySelectorAll('head link[rel="stylesheet"]');
+  for (const link of styleLinks) {
+    const href = link.getAttribute("href");
+    if (href) {
+      if (href.startsWith("http://") || href.startsWith("https://") || href.startsWith("//")) {
+        continue;
+      }
+      if (filePath) {
+        try {
+          const cssFilePath = path.resolve(filePath, href);
+          const cssContent = await fs.readFile(cssFilePath, "utf-8");
+          cssParts.push(`/* External CSS: ${href} */
+${cssContent}`);
+        } catch (error) {
+          validations.push(`CSS file not found or unreadable: ${href}`);
+        }
+      } else {
+        cssParts.push(`/* External CSS: ${href} */`);
+      }
+    }
+  }
+  const styleTags = root.querySelectorAll("head style, style");
+  for (const style of styleTags) {
+    const cssContent = style.text.trim();
+    if (cssContent) {
+      cssParts.push(cssContent);
+    }
+  }
+  const css = cssParts.length > 0 ? cssParts.join("\n\n") : void 0;
+  return new compilerShared.WithValidations(css, validations);
+}
 async function parseJayFile(html, filename, filePath, options, linkedContractResolver) {
   const normalizedFileName = normalizeFilename(filename);
   const baseElementName = changeCase.capitalCase(normalizedFileName, { delimiter: "" });
@@ -6441,7 +6493,10 @@ async function parseJayFile(html, filename, filePath, options, linkedContractRes
     ...headfullImports,
     ...headlessImports.flatMap((_) => _.contractLinks)
   ];
-  const headLinks = parseHeadLinks(root);
+  const cssResult = await extractCss(root, filePath);
+  const excludeCssLinks = !!filePath;
+  const headLinks = parseHeadLinks(root, excludeCssLinks);
+  validations.push(...cssResult.validations);
   if (validations.length > 0)
     return new compilerShared.WithValidations(void 0, validations);
   let body = root.querySelector("body");
@@ -6458,7 +6513,9 @@ async function parseJayFile(html, filename, filePath, options, linkedContractRes
       baseElementName,
       namespaces,
       headlessImports,
-      headLinks
+      headLinks,
+      css: cssResult.val,
+      filename: normalizedFileName
     },
     validations
   );
@@ -6474,7 +6531,7 @@ const JAY_IMPORT_RESOLVER = {
     return compilerAnalyzeExportedTypes.analyzeExportedTypes(fullPath, options);
   },
   loadContract(fullPath) {
-    const content = fs.readFileSync(fullPath).toString();
+    const content = fs$1.readFileSync(fullPath).toString();
     return parseContract(content, fullPath);
   },
   resolveLink(importingModuleDir, link) {

package/package.json

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