@jxsuite/compiler 0.9.0 → 0.10.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/compiler",
-  "version": "0.9.0",
+  "version": "0.10.1",
   "description": "Jx static HTML compiler, island detector, and site builder",
   "license": "MIT",
   "repository": {
@@ -37,8 +37,8 @@
   },
   "dependencies": {
     "@apidevtools/json-schema-ref-parser": "^15.3.5",
-    "@jxsuite/parser": "^0.7.0",
-    "@jxsuite/runtime": "^0.7.0",
+    "@jxsuite/parser": "^0.10.0",
+    "@jxsuite/runtime": "^0.10.0",
     "remark-gfm": "^4.0.1",
     "remark-stringify": "^11.0.0",
     "sharp": "^0.34.5",

package/src/compile-cli.js

@@ -0,0 +1,10 @@
+#!/usr/bin/env node
+import { runCli } from "./compiler.js";
+
+const [, , src, out] = process.argv;
+if (src) {
+  runCli(src, out).catch((err) => {
+    console.error(err);
+    process.exit(1);
+  });
+}

package/src/compiler.js

@@ -10,7 +10,7 @@
  *   - Server               → compile-server.js   (Hono server handler)
  *
  * Usage (CLI):
- *   bun packages/compiler/compiler.js <source.json> [output.html]
+ *   bun packages/compiler/src/compile-cli.js <source.json> [output.html]
  */
 
 import { readFileSync } from "node:fs";
@@ -132,35 +132,30 @@ export async function compile(sourcePath, opts = {}) {
 
 // ─── CLI ──────────────────────────────────────────────────────────────────────
 
-const isMainModule = process.argv[1]?.endsWith("compiler.js");
-if (isMainModule && process.argv[2]) {
-  const [, , src, out] = process.argv;
-
-  Promise.all([compile(src), compileServer(src)])
-    .then(async ([result, server]) => {
-      const { writeFileSync, mkdirSync } = await import("node:fs");
-      const { dirname, join } = await import("node:path");
-      if (out) {
-        writeFileSync(out, result.html, "utf8");
-        console.error(`Written to ${out}`);
-        const outDir = dirname(out);
-        for (const f of result.files) {
-          const filePath = join(outDir, f.path);
-          mkdirSync(dirname(filePath), { recursive: true });
-          writeFileSync(filePath, f.content, "utf8");
-          console.error(`Written to ${filePath}`);
-        }
-      } else {
-        process.stdout.write(result.html);
-      }
-      if (server && out) {
-        const serverOut = out.replace(/(\.[^.]+)?$/, "-server.js");
-        writeFileSync(serverOut, /** @type {string} */ (server), "utf8");
-        console.error(`Server handler written to ${serverOut}`);
-      }
-    })
-    .catch((/** @type {any} */ err) => {
-      console.error(err);
-      process.exit(1);
-    });
+/**
+ * @param {string} src
+ * @param {string} [out]
+ */
+export async function runCli(src, out) {
+  const [result, server] = await Promise.all([compile(src), compileServer(src)]);
+  const { writeFileSync, mkdirSync } = await import("node:fs");
+  const { dirname, join } = await import("node:path");
+  if (out) {
+    writeFileSync(out, result.html, "utf8");
+    console.error(`Written to ${out}`);
+    const outDir = dirname(out);
+    for (const f of result.files) {
+      const filePath = join(outDir, f.path);
+      mkdirSync(dirname(filePath), { recursive: true });
+      writeFileSync(filePath, f.content, "utf8");
+      console.error(`Written to ${filePath}`);
+    }
+  } else {
+    process.stdout.write(result.html);
+  }
+  if (server && out) {
+    const serverOut = out.replace(/(\.[^.]+)?$/, "-server.js");
+    writeFileSync(serverOut, /** @type {string} */ (server), "utf8");
+    console.error(`Server handler written to ${serverOut}`);
+  }
 }

package/src/site/content-loader.js

@@ -30,12 +30,13 @@ function parseCSV(csv) {
   /** @type {string[]} */
   const lines = [];
 
-  // Split into rows respecting quoted newlines
+  // Split into rows respecting quoted newlines (preserve raw characters)
   for (let i = 0; i < csv.length; i++) {
     const ch = csv[i];
     if (ch === '"') {
+      current += ch;
       if (inQuotes && csv[i + 1] === '"') {
-        current += '"';
+        current += csv[i + 1];
         i++;
       } else {
         inQuotes = !inQuotes;
@@ -155,7 +156,6 @@ function loadJSONEntries(filePath) {
       id: item.id ?? basename(filePath, ".json") + "-" + i,
       data: item,
       body: null,
-      rendered: null,
     }));
   }
   // Single object file — filename is the id
@@ -164,7 +164,6 @@ function loadJSONEntries(filePath) {
       id: raw.id ?? basename(filePath, ".json"),
       data: raw,
       body: null,
-      rendered: null,
     },
   ];
 }
@@ -192,7 +191,7 @@ function loadCSVEntries(filePath, schema) {
     }
     // Use `id` column, `sku` column, or row index as the entry ID
     const id = row.id ?? row.sku ?? String(i);
-    return { id, data: row, body: null, rendered: null };
+    return { id, data: row, body: null };
   });
 }
 

package/src/site/site-build.js

@@ -173,7 +173,7 @@ export async function buildSite(projectRoot, options = {}) {
   // ── 5b. Collect server entries from components (for site-wide bundling) ──
   /** @type {{ exportName: string; src: string }[]} */
   const siteServerEntries = [];
-  if (projectConfig.build.provider) {
+  if (projectConfig.build.adapter) {
     for (const [, doc] of componentDefs) {
       const entries = collectServerEntries(doc);
       for (const entry of entries) {
@@ -268,7 +268,7 @@ export async function buildSite(projectRoot, options = {}) {
   }
 
   // ── 6c. Generate site-wide server worker ────────────────────────────────
-  if (projectConfig.build.provider && siteServerEntries.length > 0) {
+  if (projectConfig.build.adapter) {
     log("Generating site-wide server worker...");
 
     const deduped = new Map();
@@ -277,7 +277,7 @@ export async function buildSite(projectRoot, options = {}) {
     }
 
     const workerSource = compileSiteServer([...deduped.values()], {
-      provider: projectConfig.build.provider,
+      adapter: projectConfig.build.adapter,
     });
 
     if (workerSource) {
@@ -459,7 +459,7 @@ async function compilePage(
   // Compile server handler if applicable (skip when provider bundles site-wide)
   /** @type {string | null} */
   let serverHandler = null;
-  if (!projectConfig.build.provider) {
+  if (!projectConfig.build.adapter) {
     try {
       const serverResult = await compileServer(route.sourcePath);
       if (serverResult) {

package/src/targets/compile-client.js

@@ -342,12 +342,8 @@ function buildClientNode(def, raw, context, bindings, handlers, counter) {
     const value = resolveStaticValue(source.textContent, nextContext.scope);
     inner = value == null ? "" : escapeHtml(String(value));
   } else if (source.textContent !== undefined && needsBind) {
-    try {
-      const value = resolveStaticValue(source.textContent, nextContext.scope);
-      inner = value == null ? "" : escapeHtml(String(value));
-    } catch {
-      inner = "";
-    }
+    const value = resolveStaticValue(source.textContent, nextContext.scope);
+    inner = value == null ? "" : escapeHtml(String(value));
   } else if (source.innerHTML) {
     // resolveStaticValue may return null if innerHTML contains `${` from rendered content
     // (e.g., code examples) that isn't an actual template expression. Fall back to raw value.
@@ -607,29 +603,21 @@ function emitClientModule(
   if (onEntries.length > 0) {
     lines.push("const on = {");
     for (const [key, def] of onEntries) {
-      if (def.imported) {
-        const argNames = def.args ?? ["state"];
-        const callArgs = argNames
-          .map((/** @type {string} */ a) => (a === "state" ? "state" : "e"))
-          .join(", ");
-        lines.push("  " + key + ": (e) => { " + key + "(" + callArgs + "); },");
-      } else {
-        const argNames = def.args ?? ["state"];
-        const callArgs = argNames
-          .map((/** @type {string} */ a) => (a === "state" ? "state" : "e"))
-          .join(", ");
-        lines.push(
-          "  " +
-            key +
-            ": (e) => { const fn = (" +
-            argNames.join(", ") +
-            ") => { " +
-            def.body +
-            " }; fn(" +
-            callArgs +
-            "); },",
-        );
-      }
+      const argNames = def.args ?? ["state"];
+      const callArgs = argNames
+        .map((/** @type {string} */ a) => (a === "state" ? "state" : "e"))
+        .join(", ");
+      lines.push(
+        "  " +
+          key +
+          ": (e) => { const fn = (" +
+          argNames.join(", ") +
+          ") => { " +
+          def.body +
+          " }; fn(" +
+          callArgs +
+          "); },",
+      );
     }
     lines.push("};");
   } else {

package/src/targets/compile-server.js

@@ -50,17 +50,17 @@ export default app
 
 /**
  * Generate a bundled Hono server entry from pre-collected server entries across an entire site.
- * Used when `build.provider` is set in project.json. Returns null if no entries are provided.
+ * Used when `build.adapter` is set in project.json. Returns null if no entries are provided.
  *
  * @param {{ exportName: string; src: string }[]} entries - Resolved server entries
  * @param {object} [opts]
  * @param {string} [opts.baseUrl] - Base path for server endpoints. Default is `'/_jx/server'`
- * @param {string | null} [opts.provider] - Deployment provider: `"cloudflare"`, `"node"`, `"bun"`
+ * @param {string | null} [opts.adapter] - Deployment adapter: `"cloudflare"`, `"node"`, `"bun"`
  * @returns {string | null} Complete worker/server source string, or null
  */
 export function compileSiteServer(entries, opts = {}) {
-  const { baseUrl = "/_jx/server", provider = null } = opts;
-  if (entries.length === 0) return null;
+  const { baseUrl = "/_jx/server", adapter = null } = opts;
+  if (entries.length === 0 && !adapter) return null;
 
   const imports = entries
     .map(({ exportName, src }) => `import { ${exportName} } from '${src}'`)
@@ -68,8 +68,8 @@ export function compileSiteServer(entries, opts = {}) {
 
   const routes = entries.map(({ exportName }) => buildRoute(exportName, baseUrl)).join("\n");
 
-  const providerBlock =
-    provider === "cloudflare" ? "\napp.all('*', (c) => c.env.ASSETS.fetch(c.req.raw))\n" : "\n";
+  const adapterBlock =
+    adapter === "cloudflare" ? "\napp.all('*', (c) => c.env.ASSETS.fetch(c.req.raw))\n" : "\n";
 
   return `// Generated by @jxsuite/compiler — do not edit manually
 import { Hono } from 'hono'
@@ -77,7 +77,7 @@ ${imports}
 
 const app = new Hono()
 ${routes}
-${providerBlock}
+${adapterBlock}
 export default app
 `;
 }