@jxsuite/compiler 5.1.2 → 5.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/compiler",
-  "version": "5.1.2",
+  "version": "5.1.3",
   "description": "Jx static HTML compiler, island detector, and site builder",
   "license": "MIT",
   "repository": {
@@ -45,18 +45,18 @@
     "upgrade": "bun update --latest && bun install"
   },
   "dependencies": {
-    "@apidevtools/json-schema-ref-parser": "^16.0.3",
+    "@apidevtools/json-schema-ref-parser": "^16.0.5",
     "@jxsuite/create": "^1.3.14",
     "@jxsuite/runtime": "^4.1.0",
     "@jxsuite/schema": "^3.0.0",
     "@jxsuite/site": "^2.0.4",
-    "@vue/reactivity": "3.5.43",
+    "@vue/reactivity": "3.5.44",
     "esbuild": "^0.28.2",
     "lit-html": "^3.3.3",
     "sharp": "^0.35.5"
   },
   "devDependencies": {
-    "@happy-dom/global-registrator": "^20.14.6",
+    "@happy-dom/global-registrator": "^21.0.3",
     "@jxsuite/connector": "^0.6.2",
     "@jxsuite/parser": "^2.0.1",
     "@types/mdast": "^4.0.4"

package/src/cli.ts

@@ -9,6 +9,8 @@
  */
 
 import { relative, resolve } from "node:path";
+import { errorMessage } from "@jxsuite/schema/parse";
+import type { DbPushOptions } from "./site/db-push.ts";
 
 // The CLI body runs inside an async function rather than via top-level await: when a test pulls this
 // Entry in with a dynamic import(), Bun's test runtime drops the continuation after a top-level await
@@ -77,10 +79,11 @@ Options:
     const dryRun = flags.has("--dry-run");
     try {
       const { dbPush } = await import("./site/db-push.ts");
-      const { results, bindingsPatched, wranglerPath } = await dbPush(projectRoot, {
-        dryRun,
-        ...(connectionArg === undefined ? {} : { connection: connectionArg }),
-      });
+      const pushOptions: DbPushOptions = { dryRun };
+      if (connectionArg !== undefined) {
+        pushOptions.connection = connectionArg;
+      }
+      const { results, bindingsPatched, wranglerPath } = await dbPush(projectRoot, pushOptions);
       for (const result of results) {
         const mode = result.applied ? "applied" : "dry-run";
         console.log(
@@ -98,8 +101,7 @@ Options:
         console.log(`Updated bindings in ${relative(projectRoot, wranglerPath)}`);
       }
     } catch (error) {
-      const err = error as Error;
-      console.error(`db push failed: ${err.message}`);
+      console.error(`db push failed: ${errorMessage(error)}`);
       process.exit(1);
     }
     return;
@@ -125,8 +127,7 @@ Options:
 
       console.log(`\nDone: ${result.routes} routes → ${result.files} files`);
     } catch (error) {
-      const err = error as Error;
-      console.error(`Build failed: ${err.message}`);
+      console.error(`Build failed: ${errorMessage(error)}`);
       process.exit(1);
     }
   } else if (command === "dev") {
@@ -134,8 +135,7 @@ Options:
       const { runDev } = await import("./site/dev-command.ts");
       runDev(projectRoot, portArg);
     } catch (error) {
-      const err = error as Error;
-      console.error(err.message);
+      console.error(errorMessage(error));
       process.exit(1);
     }
   } else if (command === "preview") {
@@ -156,8 +156,7 @@ Options:
       console.log(`Wrote ${relative(projectRoot, projectSchemaPath)}`);
       console.log(`Wrote ${relative(projectRoot, documentSchemaPath)}`);
     } catch (error) {
-      const err = error as Error;
-      console.error(`Schema generation failed: ${err.message}`);
+      console.error(`Schema generation failed: ${errorMessage(error)}`);
       process.exit(1);
     }
   } else if (command === "validate") {
@@ -180,8 +179,7 @@ Options:
         process.exit(1);
       }
     } catch (error) {
-      const err = error as Error;
-      console.error(`Validation failed: ${err.message}`);
+      console.error(`Validation failed: ${errorMessage(error)}`);
       process.exit(1);
     }
   } else {

package/src/compiler.ts

@@ -1,16 +1,17 @@
 /**
  * Jx-compiler.js — Compiler orchestrator
- * @version 3.0.0
- * @license MIT
  *
  * Routes Jx documents to the appropriate compilation target:
- *   - Fully static         → compile-static.js  (plain HTML/CSS, zero JS)
- *   - Custom element (-)   → compile-element.js  (lit-html web component)
- *   - Dynamic (standard)   → compile-client.js   (pre-rendered HTML + reactive bindings)
- *   - Server               → compile-server.js   (Hono server handler)
  *
- * Usage (CLI):
- *   bun packages/compiler/src/compile-cli.js <source.json> [output.html]
+ * - Fully static → compile-static.js (plain HTML/CSS, zero JS)
+ * - Custom element (-) → compile-element.js (lit-html web component)
+ * - Dynamic (standard) → compile-client.js (pre-rendered HTML + reactive bindings)
+ * - Server → compile-server.js (Hono server handler)
+ *
+ * Usage (CLI): `bun packages/compiler/src/compile-cli.js <source.json> [output.html]`
+ *
+ * @license MIT
+ * @version 3.0.0
  */
 
 import { readFileSync } from "node:fs";
@@ -27,7 +28,7 @@ import { compileServer } from "./targets/compile-server.ts";
 import { emitElementModule } from "./targets/compile-element.ts";
 import { compileStaticPage } from "./targets/compile-static.ts";
 import { compileClient } from "./targets/compile-client.ts";
-import { isClassDef } from "@jxsuite/schema/guards";
+import { isClassDef, isString } from "@jxsuite/schema/guards";
 import { parseJxDocument } from "@jxsuite/schema/parse";
 import type { JxDocument, JxStyle } from "@jxsuite/schema/types";
 import type { FormatRegistry } from "@jxsuite/schema/format-registry";
@@ -53,7 +54,17 @@ export interface CompileOptions {
    * true). The site pipeline disables this and injects via the merged <head> instead.
    */
   prePaintScheme?: boolean;
-  [key: string]: unknown;
+  /**
+   * The page language the site pipeline passes alongside the other options. No compile target reads
+   * it today: the document's own `lang` is what reaches the emitted markup.
+   */
+  lang?: string;
+}
+
+/** The page-target options {@link compile} forwards only when its caller set them. */
+interface PageTargetOverrides {
+  prePaintScheme?: false;
+  rewriteSrc?: (specifier: string) => string;
 }
 
 /**
@@ -78,20 +89,19 @@ export async function compile(sourcePath: string | JxDocument, opts: CompileOpti
   } = opts;
 
   let raw: JxDocument;
-  if (typeof sourcePath === "string") {
+  if (isString(sourcePath)) {
     const source = readFileSync(sourcePath, "utf8");
     if (sourcePath.endsWith(".json")) {
       raw = parseJxDocument(source, sourcePath);
     } else {
       const { extname } = await import("node:path");
       const ext = extname(sourcePath).toLowerCase();
-      const entry = opts.formats?.byExtension?.(ext, "parse");
+      const entry = opts.formats?.byExtension(ext, "parse");
       if (!entry) {
         const { unknownFormatError } = await import("./site/format-host.ts");
         throw unknownFormatError(sourcePath, ext);
       }
-      // Format plugins contractually parse source text into a Jx document.
-      raw = (await entry.call("parse", source)) as JxDocument;
+      raw = await entry.parseDocument(source);
     }
   } else {
     raw = sourcePath;
@@ -100,11 +110,10 @@ export async function compile(sourcePath: string | JxDocument, opts: CompileOpti
   // Route 0: .class.json schema-defined class → JS class module
   if (isClassDef(raw)) {
     const { compileClassJson } = await import("./targets/compile-class.js");
-    const jsContent = compileClassJson(raw, opts);
-    const outputPath =
-      typeof sourcePath === "string"
-        ? sourcePath.replace(/\.class\.json$/, ".js")
-        : `${raw.title}.js`;
+    const jsContent = compileClassJson(raw);
+    const outputPath = isString(sourcePath)
+      ? sourcePath.replace(/\.class\.json$/, ".js")
+      : `${raw.title}.js`;
     return { files: [{ content: jsContent, path: outputPath }], html: "" };
   }
 
@@ -114,8 +123,7 @@ export async function compile(sourcePath: string | JxDocument, opts: CompileOpti
       litHtmlSrc,
       projectStyle,
       reactivitySrc,
-      ...(opts.prePaintScheme === false ? { prePaintScheme: false } : {}),
-      ...(opts.rewriteSrc ? { rewriteSrc: opts.rewriteSrc } : {}),
+      ...pageTargetOverrides(opts),
       title,
     });
   }
@@ -162,12 +170,26 @@ export async function compile(sourcePath: string | JxDocument, opts: CompileOpti
     litHtmlSrc,
     projectStyle,
     reactivitySrc,
-    ...(opts.prePaintScheme === false ? { prePaintScheme: false } : {}),
-    ...(opts.rewriteSrc ? { rewriteSrc: opts.rewriteSrc } : {}),
+    ...pageTargetOverrides(opts),
     title,
   });
 }
 
+/**
+ * The `prePaintScheme` and `rewriteSrc` options a page target receives, each present only when the
+ * caller set it, so the target's own default applies otherwise.
+ */
+function pageTargetOverrides(opts: CompileOptions): PageTargetOverrides {
+  const overrides: PageTargetOverrides = {};
+  if (opts.prePaintScheme === false) {
+    overrides.prePaintScheme = false;
+  }
+  if (opts.rewriteSrc) {
+    overrides.rewriteSrc = opts.rewriteSrc;
+  }
+  return overrides;
+}
+
 // ─── CLI ──────────────────────────────────────────────────────────────────────
 
 /**

package/src/shadow.ts

@@ -23,11 +23,9 @@ export type ShadowMode = "open" | "closed";
 /** A value `$shadow` or `defaults.shadow` may carry. */
 export type ShadowSetting = ShadowMode | false;
 
-function asSetting(value: unknown): ShadowSetting | undefined {
-  if (value === false || value === "open" || value === "closed") {
-    return value;
-  }
-  return undefined;
+/** Whether a document value is one of the settings `$shadow` / `defaults.shadow` may carry. */
+function isShadowSetting(value: unknown): value is ShadowSetting {
+  return value === false || value === "open" || value === "closed";
 }
 
 /**
@@ -44,9 +42,12 @@ export function resolveShadowMode(
   doc: JxDocument | JxElement | null | undefined,
   defaults?: ProjectConfig["defaults"],
 ): ShadowMode | null {
-  const own = asSetting((doc as { $shadow?: unknown } | null | undefined)?.$shadow);
-  const setting = own ?? asSetting(defaults?.shadow) ?? false;
-  return setting === false ? null : setting;
+  const own = doc?.$shadow;
+  if (isShadowSetting(own)) {
+    return own === false ? null : own;
+  }
+  const projectDefault = defaults?.shadow;
+  return isShadowSetting(projectDefault) && projectDefault !== false ? projectDefault : null;
 }
 
 /**