chocola 2.0.0-next.1 → 2.0.0-next.4

package/compiler/utils.js

@@ -3,85 +3,15 @@ import path from "path";
 import { pathToFileURL } from "url";
 import chalk from "chalk";
 
-/**
- * Throws a formatted error message and exits
- * @param {string|Error} err - Error message or Error object
- * @throws {Error}
- */
 export function throwError(err) {
   console.log(chalk.red.bold("Error!"), "A fatal error has occurred:\n");
   throw new Error(err);
 }
 
-/**
- * Loads a JavaScript module and inlines asset imports (HTML/CSS files)
- * This allows components to import external template files as strings
- * @param {import("fs").PathLike} filePath - Path to the JavaScript file
- * @returns {Promise<object>} - The imported module
- * @example
- * // Component with asset import
- * import template from "./button.html";
- * export default function Button() { return { body: template }; }
- */
-export async function loadWithAssets(filePath) {
-  let code;
-  try {
-    code = await fs.readFile(filePath, "utf8");
-  } catch (err) {
-    throwError(`Failed to read component file "${filePath}": ${err.message || err}`);
-  }
-
-  const importRegex = /import\s+(\w+)\s+from\s+["'](.+?\.(html|css))["'];?/g;
-
-  const replacements = [];
-  let match;
-  while ((match = importRegex.exec(code))) {
-    const varName = match[1];
-    const relPath = match[2];
-    const absPath = path.resolve(path.dirname(filePath), relPath);
-
-    let content;
-    try {
-      content = await fs.readFile(absPath, "utf8");
-    } catch (err) {
-      throwError(
-        `Failed to read imported file "${relPath}" (resolved to "${absPath}") ` +
-        `for variable "${varName}" in component "${filePath}": ${err.message || err}`
-      );
-    }
-
-    replacements.push({ from: match[0], to: `const ${varName} = ${JSON.stringify(content)};` });
-  }
-
-  for (const { from, to } of replacements) {
-    code = code.replace(from, to);
-  }
-
-  const dataUrl =
-    "data:text/javascript;base64," +
-    Buffer.from(code).toString("base64");
-
-  try {
-    const mod = await import(dataUrl);
-    return mod;
-  } catch (err) {
-    throwError(
-      `Failed to evaluate component "${filePath}": ${err.message || err}`
-    );
-  }
-}
-
-/**
- * Generates a random ID string
- * @param {Array} collection - Array to track used IDs (prevents duplicates)
- * @param {number} length - Desired length of the ID (default: 10)
- * @returns {string} - Unique random ID
- */
 export function genRandomId(collection = null, length = 10, lettersOnly = false) {
   let id;
   if (lettersOnly) {
-    const letters = "abcdefghijklmnopqrstuvwxyz";
-    id = Array.from({ length }, () => letters[Math.floor(Math.random() * letters.length)]).join("");
+    id = Array.from({ length }, () => ID_LETTERS[Math.floor(Math.random() * ID_LETTERS.length)]).join("");
   } else {
     id = Math.random().toString(36).substring(2, length + 2);
   }
@@ -94,23 +24,14 @@ export function genRandomId(collection = null, length = 10, lettersOnly = false)
   }
 }
 
-/**
- * Increments a letter or sequence of letters like Excel columns (a → b, z → aa)
- * @param {string} letters - Letter(s) to increment
- * @returns {string} - Incremented letter(s)
- * @example
- * incrementAlfabet("a") // "b"
- * incrementAlfabet("z") // "aa"
- */
 export function incrementAlfabet(letters) {
-  const alfabet = "abcdefghijklmnopqrstuvwxyz";
   let arr = letters.split("");
   let i = arr.length - 1;
 
   while (i >= 0) {
-    let pos = alfabet.indexOf(arr[i]);
+    let pos = arr[i].charCodeAt(0) - 97;
     if (pos < 25) {
-      arr[i] = alfabet[pos + 1];
+      arr[i] = String.fromCharCode(pos + 97 + 1);
       return arr.join("");
     } else {
       arr[i] = "a";
@@ -121,11 +42,6 @@ export function incrementAlfabet(letters) {
   return "a" + arr.join("");
 }
 
-/**
- * Checks if a string is a valid HTTP/HTTPS URL
- * @param {string} str - String to check
- * @returns {boolean} - True if valid web link, false otherwise
- */
 export function isWebLink(str) {
   try {
     const url = new URL(str);
@@ -138,26 +54,28 @@ export function isWebLink(str) {
 const LBRACE_PH = "_%%CHOCOLA-LBRACE%%_";
 const RBRACE_PH = "_%%CHOCOLA-RBRACE%%_";
 
-/**
- * Replaces HTML entities for curly braces with placeholders before JSDOM parsing.
- * This prevents JSDOM from decoding them into literal braces before binding processing.
- * @param {string} html - Raw HTML content
- * @returns {string} - HTML with curly brace entities replaced
- */
 export function protectCurlyBraces(html) {
   return html
     .replace(/&(?:lbrace|#123|#x7B);/gi, LBRACE_PH)
     .replace(/&(?:rcub|#125|#x7D);/gi, RBRACE_PH);
 }
 
-/**
- * Restores curly brace placeholders back to literal characters.
- * Called after binding processing is complete and before final output.
- * @param {string} html - Serialized HTML with placeholders
- * @returns {string} - HTML with literal curly braces restored
- */
 export function restoreCurlyBraces(html) {
   return html
     .replace(/_%%CHOCOLA-LBRACE%%_/g, "{")
     .replace(/_%%CHOCOLA-RBRACE%%_/g, "}");
 }
+
+const ID_LETTERS = "abcdefghijklmnopqrstuvwxyz";
+const compiledCache = new Map();
+export function compileExpression(expr, useCtx) {
+  const key = useCtx ? `ctx:${expr}` : `raw:${expr}`;
+  let fn = compiledCache.get(key);
+  if (!fn) {
+    fn = useCtx
+      ? new Function("ctx", `with(ctx) { return (${expr}); }`)
+      : new Function(`"use strict"; return (${expr})`);
+    compiledCache.set(key, fn);
+  }
+  return fn;
+}

package/dev/index.js

@@ -29,7 +29,6 @@ export async function serve(__rootdir) {
   else { console.warn(chalk.bold.yellow("WARNING!"), `port not defined in chocola.config.json file: using default ${__config.port} port.`) }
 
   const srcDir = paths.src;
-  const componentsDir = paths.components;
 
   let compileTimeout;
   const scheduleRecompile = () => {
@@ -51,11 +50,6 @@ export async function serve(__rootdir) {
       scheduleRecompile();
     }
   });
-  fs.watch(componentsDir, { recursive: true }, (eventType, filename) => {
-    if (filename && !filename.includes("node_modules")) {
-      scheduleRecompile();
-    }
-  });
 
   const server = http.createServer((req, res) => {
     if (req.url === "/api/hot-reload") {
@@ -174,5 +168,5 @@ app.build(__dirname);
 * @example
 * @param {PathLike} __rootdir the directory where your Chocola App is
 */
-  server(__rootdir) { serve(__rootdir) }
+  async server(__rootdir) { return serve(__rootdir) }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "chocola",
-  "version": "2.0.0-next.1",
+  "version": "2.0.0-next.4",
   "description": "The sweetest way to build the web",
   "keywords": [
     "web",
@@ -32,8 +32,7 @@
   },
   "exports": {
     "./compiler": "./compiler/index.js",
-    "./dev": "./dev/index.js",
-    "./types": "./types/index.js"
+    "./dev": "./dev/index.js"
   },
   "dependencies": {
     "chalk": "^5.6.2",

package/utils.js

@@ -2,11 +2,6 @@ import { promises as fs } from "fs";
 import path from "path";
 import { throwError } from "./compiler/utils.js";
 
-/**
- * Returns `chocola.config.json` as an object.
- * @param {import("fs").PathLike} __rootdir 
- * @returns {Object}
- */
 export async function getChocolaConfig(__rootdir) {
     try {
         const config = await fs.readFile(path.join(__rootdir, "chocola.config.json"), "utf-8");