chocola 2.0.0-next.10 → 2.0.0-next.12

package/package.json

@@ -1,43 +1,56 @@
-{
-  "name": "chocola",
-  "version": "2.0.0-next.10",
-  "description": "The sweetest way to build the web",
-  "keywords": [
-    "web",
-    "app",
-    "pipeline",
-    "framework",
-    "gui",
-    "components",
-    "ui"
-  ],
-  "homepage": "https://chocolaframework.web.app/",
-  "bugs": {
-    "url": "https://github.com/chocolajs/chocola/issues"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/chocolajs/chocola.git"
-  },
-  "license": "MIT",
-  "author": "SadGabi",
-  "type": "module",
-  "main": "index.js",
-  "funding": {
-    "type": "github",
-    "url": "https://github.com/sponsors/chocolajs"
-  },
-  "scripts": {
-    "test": "node --test \"tests/**/*.test.js\"",
-    "bench": "node bench/index.js",
-    "bench:csv": "node bench/index.js --csv"
-  },
-  "exports": {
-    "./compiler": "./compiler/index.js",
-    "./dev": "./dev/index.js",
-    "./server": "./server/index.js"
-  },
-  "dependencies": {
-    "linkedom": "^0.18.13"
-  }
-}
+{
+  "name": "chocola",
+  "version": "2.0.0-next.12",
+  "description": "The sweetest way to build the web",
+  "keywords": [
+    "web",
+    "app",
+    "pipeline",
+    "framework",
+    "gui",
+    "components",
+    "ui"
+  ],
+  "homepage": "https://chocolaframework.web.app/",
+  "bugs": {
+    "url": "https://github.com/chocolajs/chocola/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/chocolajs/chocola.git"
+  },
+  "license": "MIT",
+  "author": "SadGabi",
+  "type": "module",
+  "main": "compiler/index.js",
+  "funding": {
+    "type": "github",
+    "url": "https://github.com/sponsors/chocolajs"
+  },
+  "scripts": {
+    "test": "node --test \"tests/**/*.test.js\"",
+    "bench": "node bench/index.js",
+    "bench:csv": "node bench/index.js --csv"
+  },
+  "exports": {
+    ".": {
+      "import": "./compiler/index.js",
+      "require": "./compiler/index.js"
+    },
+    "./compiler": "./compiler/index.js",
+    "./compiler/*": "./compiler/*",
+    "./runtime": "./runtime/index.js",
+    "./parser": "./parser/index.js",
+    "./parser/*": "./parser/*"
+  },
+  "files": [
+    "compiler/",
+    "parser/",
+    "runtime/",
+    "utils.js"
+  ],
+  "dependencies": {
+    "acorn": "^8.18.0",
+    "linkedom": "^0.18.13"
+  }
+}

package/parser/component.js

@@ -1,4 +1,8 @@
-export function extractPropsDefaults(script) {
+import { parseScript } from "./script.js";
+
+// --- Legacy regex-based implementations (fallback) ---
+
+function legacyExtractPropsDefaults(script) {
   if (!script) return [];
   const propsRegex = /export\s+let\s+([a-zA-Z_$][0-9a-zA-Z_$]*)\s*(?:=\s*([^;]+))?;/g;
   let props = [];
@@ -9,7 +13,7 @@ export function extractPropsDefaults(script) {
   return props;
 }
 
-export function extractRuntime(script, compName) {
+function legacyExtractRuntime(script, compName) {
   const startRegex = /(?:async\s+)?function\s+\$runtime\(([^)]*)\)\s*\{/;
   const match = script.match(startRegex);
   if (!match) return null;
@@ -47,7 +51,7 @@ export function extractRuntime(script, compName) {
   throw new Error(`${compName} $runtime function has unclosed curly braces`);
 }
 
-export function extractTopLevelVariables(script) {
+function legacyExtractTopLevelVariables(script) {
   if (!script) return [];
   const vars = [];
   let i = 0;
@@ -94,7 +98,7 @@ export function extractTopLevelVariables(script) {
 
     if (depth === 0 && parenDepth === 0 && bracketDepth === 0) {
       const rest = script.slice(i);
-      const m = rest.match(/^(let|const)\s+([a-zA-Z_$][0-9a-zA-Z_$]*)\s*/);
+      const m = rest.match(/^(let|const|var)\s+([a-zA-Z_$][0-9a-zA-Z_$]*)\s*/);
       if (m) {
         const keyword = m[1];
         const before = script.slice(0, i).trimEnd();
@@ -186,7 +190,7 @@ function findDeclaratorEnd(script, start) {
   return i;
 }
 
-export function extractTopLevelFunctions(script, excludeName) {
+function legacyExtractTopLevelFunctions(script, excludeName) {
   const funcs = [];
   let i = 0;
   let depth = 0;
@@ -266,3 +270,71 @@ export function extractTopLevelFunctions(script, excludeName) {
 
   return funcs;
 }
+
+// --- New AST-backed wrappers (Step A) ---
+
+export function extractPropsDefaults(script) {
+  if (!script) return [];
+  const parsed = parseScript(script);
+  if (parsed.ast) {
+    // Use AST-derived props; map to legacy shape
+    return parsed.props.map((p) => ({ name: p.name, defaultValue: p.defaultValue }));
+  }
+  return legacyExtractPropsDefaults(script);
+}
+
+export function extractRuntime(script, compName) {
+  if (!script) return null;
+  const parsed = parseScript(script);
+  if (parsed.ast) {
+    return parsed.runtime;
+  }
+  return legacyExtractRuntime(script, compName);
+}
+
+export function extractTopLevelVariables(script) {
+  if (!script) return [];
+  const parsed = parseScript(script);
+  if (parsed.ast) {
+    const vars = [];
+    for (const v of parsed.topVars) {
+      if (v.isDestructuring) {
+        // Expand destructuring per binding name for back-compat
+        // e.g., const {a,b}=obj -> two entries with same initializer
+        for (const n of v.names) {
+          if (n === "self" || n === "ctx") continue;
+          vars.push({ keyword: v.keyword, name: n, value: v.value });
+        }
+      } else {
+        vars.push({ keyword: v.keyword, name: v.name, value: v.value });
+      }
+    }
+    return vars;
+  }
+  return legacyExtractTopLevelVariables(script);
+}
+
+export function extractTopLevelFunctions(script, excludeName) {
+  if (!script) return [];
+  const parsed = parseScript(script);
+  if (parsed.ast) {
+    if (excludeName === "$runtime") {
+      return parsed.topFuncs;
+    }
+    // Generic exclude
+    const filtered = [];
+    for (const src of parsed.topFuncs) {
+      const m = src.match(/^(?:async\s+)?function\s+([a-zA-Z_$][0-9a-zA-Z_$]*)/);
+      if (m && m[1] === excludeName) continue;
+      filtered.push(src);
+    }
+    // If excludeName is null/undefined, return all except $runtime handled above
+    // Need to also exclude $runtime if caller passed different name? For safety include all non-excluded
+    if (!excludeName) {
+      // parsed.topFuncs already excludes $runtime, so return as is
+      return parsed.topFuncs;
+    }
+    return filtered;
+  }
+  return legacyExtractTopLevelFunctions(script, excludeName);
+}

package/parser/index.js

@@ -1,4 +1,5 @@
 export { extractPropsDefaults, extractRuntime, extractTopLevelFunctions, extractTopLevelVariables } from "./component.js";
+export { parseScript, extractBindingNames, computeReachable } from "./script.js";
 export { extractCtxFromEl, hasMountIf, getMountIf, removeMountIf } from "./context.js";
 export { reservedAttrs, getLineNumber, validateChainStructure, applyConditionalToElement, interpolateNode } from "./template.js";
 export { scopeCss } from "./css.js";