@jxsuite/compiler 0.9.0 → 0.10.2

package/src/site/site-build.js

@@ -40,7 +40,7 @@ import {
   DEFAULT_REACTIVITY_SRC,
   DEFAULT_LIT_HTML_SRC,
 } from "../shared.js";
-import { loadCollections, loadContentConfig, resolveCollectionRefs } from "./content-loader.js";
+import { loadContentTypes, loadContentConfig, resolveContentTypeRefs } from "./content-loader.js";
 import { resolvePrototypes } from "./prototype-resolver.js";
 import { compileMarkdown } from "../targets/compile-markdown.js";
 import { transformImageNodes } from "./image-transform.js";
@@ -97,20 +97,20 @@ export async function buildSite(projectRoot, options = {}) {
   const staticRoutes = discoverPages(pagesDir);
   log(`  Found ${staticRoutes.length} page(s)`);
 
-  // ── 3b. Load content collections ──────────────────────────────────────
-  log("Loading content collections...");
-  const collections = await loadCollections(projectRoot, projectConfig);
-  if (collections.size > 0) {
-    log(`  Loaded ${collections.size} collection(s): ${[...collections.keys()].join(", ")}`);
-    // Resolve cross-collection $ref references
+  // ── 3b. Load content types ─────────────────────────────────────────────
+  log("Loading content types...");
+  const contentTypes = await loadContentTypes(projectRoot, projectConfig);
+  if (contentTypes.size > 0) {
+    log(`  Loaded ${contentTypes.size} content type(s): ${[...contentTypes.keys()].join(", ")}`);
+    // Resolve cross-content-type $ref references
     const contentConfig = loadContentConfig(projectRoot, projectConfig);
     if (contentConfig) {
-      resolveCollectionRefs(collections, contentConfig.config);
+      resolveContentTypeRefs(contentTypes, contentConfig.config);
     }
   }
 
   // ── 4. Expand dynamic routes ────────────────────────────────────────────
-  const routes = await expandDynamicRoutes(staticRoutes, projectRoot, collections);
+  const routes = await expandDynamicRoutes(staticRoutes, projectRoot, contentTypes);
   log(`  ${routes.length} route(s) after expansion`);
 
   let fileCount = 0;
@@ -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) {
@@ -194,7 +194,7 @@ export async function buildSite(projectRoot, options = {}) {
         route,
         projectConfig,
         projectRoot,
-        collections,
+        contentTypes,
         imageCache,
         outDir,
         componentDefs,
@@ -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) {
@@ -339,7 +339,7 @@ export async function buildSite(projectRoot, options = {}) {
  * @param {any} route
  * @param {any} projectConfig
  * @param {string} projectRoot
- * @param {Map<string, any[]>} [collections]
+ * @param {Map<string, any[]>} [contentTypes]
  * @param {import("./image-cache.js").CacheManifest | null} [imageCache]
  * @param {string} [outDir]
  * @returns {Promise<{ html: string; files: any[]; serverHandler: string | null; doc: any }>}
@@ -348,7 +348,7 @@ async function compilePage(
   route,
   projectConfig,
   projectRoot,
-  collections = new Map(),
+  contentTypes = new Map(),
   imageCache = null,
   outDir = "",
   componentDefs = new Map(),
@@ -375,7 +375,7 @@ async function compilePage(
   delete layoutDoc._pageTitle;
 
   // Inject $site and $page context, resolve ContentCollection/ContentEntry
-  injectContext(layoutDoc, projectConfig, route, collections, projectRoot);
+  injectContext(layoutDoc, projectConfig, route, contentTypes, projectRoot);
 
   // Resolve generic $prototype entries via .class.json imports
   await resolvePrototypes(layoutDoc, route, projectRoot);
@@ -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/site/site-loader.js

@@ -25,7 +25,7 @@ const DEFAULTS = {
   $media: {},
   style: {},
   state: {},
-  collections: {},
+  contentTypes: {},
   redirects: {},
   images: {
     optimize: true,
@@ -85,7 +85,7 @@ export function loadProjectConfig(projectRoot) {
   if (raw.state) config.state = raw.state;
   if (raw.redirects) config.redirects = raw.redirects;
   if (raw.imports) config.imports = raw.imports;
-  if (raw.collections) config.collections = raw.collections;
+  if (raw.contentTypes) config.contentTypes = raw.contentTypes;
 
   return {
     config,

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
 `;
 }