chocola 2.0.0-next.4 → 2.0.0-next.5

package/compiler/dom-processor.js

@@ -39,9 +39,7 @@ export function extractContextFromElement(element) {
 }
 
 export async function serializeDOM(dom) {
-  const beautify = (await import("js-beautify")).default;
-  const finalHtml = restoreCurlyBraces(dom.serialize());
-  return beautify.html(finalHtml, { indent_size: 2 });
+  return restoreCurlyBraces(dom.serialize());
 }
 
 export async function writeHTMLOutput(html, outDirPath) {
@@ -66,6 +64,10 @@ export function appendStylesheetLink(doc, filename) {
   doc.head.appendChild(linkEl);
 }
 
+export function getScriptElements(doc) {
+  return Array.from(doc.querySelectorAll("script[src]"));
+}
+
 export function appendRuntimeScript(doc, filename) {
   const runtimeScriptEl = doc.createElement("script");
   runtimeScriptEl.type = "module";

package/compiler/index.js

@@ -1,11 +1,12 @@
 import { promises as fs } from "fs";
-import chalk from "chalk";
+import chalk from "./chalk.js";
 import { loadConfig, resolvePaths } from "./config.js";
 import {
   createDOM,
   validateAppContainer,
   getAppElements,
   getAssetLinks,
+  getScriptElements,
   appendRuntimeScript,
   appendStylesheetLink,
   serializeDOM,
@@ -14,12 +15,13 @@ import {
 } from "./dom-processor.js";
 import { processAllComponents } from "./component-processor.js";
 import { generateRuntimeScript } from "./runtime-generator.js";
-import { genRandomId, throwError, compileExpression } from "./utils.js";
+import { genRandomId, throwError, compileExpression, hasDelIfAttr, getDelIfAttr, removeDelIfAttr } from "./utils.js";
 import {
   copyStaticDir,
   getComponents,
   getSrcIndex,
   processIcons,
+  processScript,
   processStylesheet,
 } from "./pipeline.js";
 
@@ -91,6 +93,7 @@ async function loadAndDisplayComponents(srcComponentsPath) {
 
 async function processAssets(doc, rootDir, srcDir, outDirPath) {
   const { stylesheets, icons } = getAssetLinks(doc);
+  const scripts = getScriptElements(doc);
   const fileIds = [];
   let cssContents = [];
 
@@ -102,9 +105,81 @@ async function processAssets(doc, rootDir, srcDir, outDirPath) {
   for (const link of icons) {
     await processIcons(link, rootDir, srcDir, outDirPath);
   }
+
+  for (const script of scripts) {
+    await processScript(doc, script, rootDir, srcDir, outDirPath, fileIds);
+  }
   return cssContents
 }
 
+function processPageConditionals(parent) {
+  const children = [...parent.children];
+  let chainActive = false;
+  let chainRendered = false;
+
+  for (const child of children) {
+    const hasIf = child.hasAttribute("if");
+    const hasDelIf = hasDelIfAttr(child);
+    const hasElif = child.hasAttribute("elif");
+    const hasElse = child.hasAttribute("else");
+
+    if (hasElif || hasElse) {
+      if (!chainActive) continue;
+      if (chainRendered) { child.remove(); continue; }
+    }
+
+    if (hasIf) {
+      const raw = child.getAttribute("if");
+      const expr = raw.startsWith("{") ? raw.slice(1, -1) : raw;
+      const fn = compileExpression(expr, false);
+      const result = fn();
+      chainActive = true;
+      if (result) {
+        chainRendered = true;
+      } else {
+        child.remove();
+        chainRendered = false;
+      }
+      child.removeAttribute("if");
+    } else if (hasDelIf) {
+      const raw = getDelIfAttr(child);
+      const expr = raw.startsWith("{") ? raw.slice(1, -1) : raw;
+      const fn = compileExpression(expr, false);
+      const result = fn();
+      chainActive = true;
+      if (result) {
+        chainRendered = true;
+      } else {
+        child.remove();
+        chainRendered = false;
+      }
+      removeDelIfAttr(child);
+    } else if (hasElif) {
+      const raw = child.getAttribute("elif");
+      const expr = raw.startsWith("{") ? raw.slice(1, -1) : raw;
+      const fn = compileExpression(expr, false);
+      const result = fn();
+      if (result) {
+        chainRendered = true;
+      } else {
+        child.remove();
+      }
+      child.removeAttribute("elif");
+    } else if (hasElse) {
+      chainRendered = true;
+      chainActive = false;
+      child.removeAttribute("else");
+    } else {
+      chainActive = false;
+      chainRendered = false;
+    }
+
+    if (child.parentNode) {
+      processPageConditionals(child);
+    }
+  }
+}
+
 export default async function compile(rootDir, buildConfig) {
   const isHotReload = buildConfig?.isHotReload || null;
   !isHotReload && logBanner();
@@ -129,83 +204,6 @@ export default async function compile(rootDir, buildConfig) {
   const doc = dom.window.document;
   const appContainer = validateAppContainer(doc);
 
-  function hasDelIfAttr(el) {
-    return el.hasAttribute("del:if");
-  }
-  function getDelIfAttr(el) {
-    return el.getAttribute("del:if");
-  }
-  function removeDelIfAttr(el) {
-    el.removeAttribute("del:if");
-  }
-
-  function processPageConditionals(parent) {
-    const children = [...parent.children];
-    let chainActive = false;
-    let chainRendered = false;
-
-    for (const child of children) {
-      const hasIf = child.hasAttribute("if");
-      const hasDelIf = hasDelIfAttr(child);
-      const hasElif = child.hasAttribute("elif");
-      const hasElse = child.hasAttribute("else");
-
-      if (hasElif || hasElse) {
-        if (!chainActive) continue;
-        if (chainRendered) { child.remove(); continue; }
-      }
-
-      if (hasIf) {
-        const raw = child.getAttribute("if");
-        const expr = raw.startsWith("{") ? raw.slice(1, -1) : raw;
-        const fn = compileExpression(expr, false);
-        const result = fn();
-        chainActive = true;
-        if (result) {
-          chainRendered = true;
-        } else {
-          child.remove();
-          chainRendered = false;
-        }
-        child.removeAttribute("if");
-      } else if (hasDelIf) {
-        const raw = getDelIfAttr(child);
-        const expr = raw.startsWith("{") ? raw.slice(1, -1) : raw;
-        const fn = compileExpression(expr, false);
-        const result = fn();
-        chainActive = true;
-        if (result) {
-          chainRendered = true;
-        } else {
-          child.remove();
-          chainRendered = false;
-        }
-        removeDelIfAttr(child);
-      } else if (hasElif) {
-        const raw = child.getAttribute("elif");
-        const expr = raw.startsWith("{") ? raw.slice(1, -1) : raw;
-        const fn = compileExpression(expr, false);
-        const result = fn();
-        if (result) {
-          chainRendered = true;
-        } else {
-          child.remove();
-        }
-        child.removeAttribute("elif");
-      } else if (hasElse) {
-        chainRendered = true;
-        chainActive = false;
-        child.removeAttribute("else");
-      } else {
-        chainActive = false;
-        chainRendered = false;
-      }
-
-      if (child.parentNode) {
-        processPageConditionals(child);
-      }
-    }
-  }
   processPageConditionals(appContainer);
 
   const appElements = getAppElements(appContainer);

package/compiler/pipeline.js

@@ -15,22 +15,23 @@ export async function getComponents(libDir) {
       throw Error(`The specified components folder ${libDir} could not be found.`);
     }
 
-    for (const comp of components) {
-      if (!comp.endsWith(".html")) continue;
+    const reads = components
+      .filter(comp => comp.endsWith(".html"))
+      .map(async (comp) => {
+        try {
+          const compPath = path.join(libDir, comp);
+          const instance = await fs.readFile(compPath, "utf-8");
 
-      componentsLib.push(comp);
+          if (instance === "" || instance.trim().length === 0) emptyComps.push(comp);
 
-      try {
-        const compPath = path.join(libDir, comp);
-        const instance = await fs.readFile(compPath, "utf-8");
+          loadedComponents.set(comp.toLowerCase(), instance);
+          componentsLib.push(comp);
+        } catch (err) {
+          throwError(`Failed to load component "${comp}": ${err.message || err}`);
+        }
+      });
 
-        if (instance === "" || instance.trim().length === 0) emptyComps.push(comp);
-
-        loadedComponents.set(comp.toLowerCase(), instance);
-      } catch (err) {
-        throwError(`Failed to load component "${comp}": ${err.message || err}`);
-      }
-    }
+    await Promise.all(reads);
 
     return { componentsLib, loadedComponents, emptyComps };
   } catch (err) {
@@ -83,6 +84,32 @@ export async function processIcons(link, rootDir, srcDir, outDirPath) {
   }
 }
 
+export async function processScript(doc, script, rootDir, srcDir, outDirPath, fileIds) {
+  try {
+    const src = script.getAttribute("src");
+    if (src.startsWith("http://") || src.startsWith("https://")) return;
+    const scriptPath = path.join(rootDir, srcDir, src);
+    const content = await fs.readFile(scriptPath, { encoding: "utf8" });
+    const jsFileName = "js-" + genRandomId(fileIds, 6) + ".js";
+    await fs.writeFile(path.join(outDirPath, jsFileName), content);
+
+    const newScript = doc.createElement("script");
+    for (const attr of script.attributes) {
+      if (attr.name === "src") {
+        newScript.setAttribute("src", "./" + jsFileName);
+      } else {
+        newScript.setAttribute(attr.name, attr.value);
+      }
+    }
+    if (script.textContent.trim()) {
+      newScript.textContent = script.textContent;
+    }
+    script.parentNode.replaceChild(newScript, script);
+  } catch (err) {
+    throwError(`Failed to process script: ${err}`);
+  }
+}
+
 export async function copyStaticDir(srcPath, outDirPath) {
   const staticSrc = path.join(srcPath, "static");
   const staticDest = path.join(outDirPath, "static");

package/compiler/utils.js

@@ -1,13 +1,20 @@
-import fs from "fs/promises";
-import path from "path";
-import { pathToFileURL } from "url";
-import chalk from "chalk";
+import chalk from "./chalk.js";
 
 export function throwError(err) {
   console.log(chalk.red.bold("Error!"), "A fatal error has occurred:\n");
   throw new Error(err);
 }
 
+export function hasDelIfAttr(el) {
+  return el.hasAttribute("del:if");
+}
+export function getDelIfAttr(el) {
+  return el.getAttribute("del:if");
+}
+export function removeDelIfAttr(el) {
+  el.removeAttribute("del:if");
+}
+
 export function genRandomId(collection = null, length = 10, lettersOnly = false) {
   let id;
   if (lettersOnly) {
@@ -42,15 +49,6 @@ export function incrementAlfabet(letters) {
   return "a" + arr.join("");
 }
 
-export function isWebLink(str) {
-  try {
-    const url = new URL(str);
-    return url.protocol === "http:" || url.protocol === "https:";
-  } catch (e) {
-    return false;
-  }
-}
-
 const LBRACE_PH = "_%%CHOCOLA-LBRACE%%_";
 const RBRACE_PH = "_%%CHOCOLA-RBRACE%%_";
 

package/dev/index.js

@@ -1,7 +1,7 @@
 import http from "http";
 import fs from "fs";
 import path from "path";
-import chalk from "chalk";
+import chalk from "../compiler/chalk.js";
 import compile from "../compiler/index.js";
 import { loadConfig, resolvePaths } from "../compiler/config.js";
 import { getChocolaConfig } from "../utils.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chocola",
-  "version": "2.0.0-next.4",
+  "version": "2.0.0-next.5",
   "description": "The sweetest way to build the web",
   "keywords": [
     "web",
@@ -13,11 +13,11 @@
   ],
   "homepage": "https://chocolaframework.web.app/",
   "bugs": {
-    "url": "https://github.com/sad-gabi/chocola/issues"
+    "url": "https://github.com/chocolajs/chocola/issues"
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/sad-gabi/chocola.git"
+    "url": "git+https://github.com/chocolajs/chocola.git"
   },
   "license": "MIT",
   "author": "SadGabi",
@@ -25,7 +25,7 @@
   "main": "index.js",
   "funding": {
     "type": "github",
-    "url": "https://github.com/sponsors/sad-gabi"
+    "url": "https://github.com/sponsors/chocolajs"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -35,11 +35,6 @@
     "./dev": "./dev/index.js"
   },
   "dependencies": {
-    "chalk": "^5.6.2",
-    "js-beautify": "^1.15.4",
     "jsdom": "^27.4.0"
-  },
-  "devDependencies": {
-    "js-beautify": "^1.15.4"
   }
 }