@jxsuite/compiler 0.29.0 → 0.30.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/compiler",
-  "version": "0.29.0",
+  "version": "0.30.1",
   "description": "Jx static HTML compiler, island detector, and site builder",
   "license": "MIT",
   "repository": {
@@ -42,14 +42,14 @@
     "upgrade": "bunx npm-check-updates -u && bun install"
   },
   "dependencies": {
-    "@apidevtools/json-schema-ref-parser": "^15.3.6",
-    "@jxsuite/parser": "^0.29.0",
-    "@jxsuite/runtime": "^0.29.0",
-    "@jxsuite/schema": "^0.29.0",
-    "sharp": "^0.35.1"
+    "@apidevtools/json-schema-ref-parser": "^15.4.0",
+    "@jxsuite/parser": "^0.30.1",
+    "@jxsuite/runtime": "^0.30.1",
+    "@jxsuite/schema": "^0.30.1",
+    "sharp": "^0.35.2"
   },
   "devDependencies": {
-    "@happy-dom/global-registrator": "^20.10.2",
+    "@happy-dom/global-registrator": "^20.10.6",
     "@types/mdast": "^4.0.4"
   }
 }

package/src/cli.ts

@@ -9,11 +9,16 @@
 
 import { resolve } from "node:path";
 
-const args = process.argv.slice(2);
-const [command] = args;
+// 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
+// (it never resumes on Windows), so the build step would silently never run. `ready` lets the
+// In-process CLI harness await the same sequence.
+async function main() {
+  const args = process.argv.slice(2);
+  const [command] = args;
 
-if (!command || command === "--help" || command === "-h") {
-  console.log(`Usage: jx <command> [options]
+  if (!command || command === "--help" || command === "-h") {
+    console.log(`Usage: jx <command> [options]
 
 Commands:
   build [root]   Build a Jx site to dist/
@@ -21,39 +26,43 @@ Commands:
 Options:
   --verbose      Print detailed build progress
   --no-clean     Don't clean outDir before building`);
-  process.exit(0);
-}
+    process.exit(0);
+  }
 
-if (command === "build") {
-  const rest = args.slice(1);
-  const flags = new Set(rest.filter((a) => a.startsWith("--")));
-  const positional = rest.find((a) => !a.startsWith("--"));
+  if (command === "build") {
+    const rest = args.slice(1);
+    const flags = new Set(rest.filter((a) => a.startsWith("--")));
+    const positional = rest.find((a) => !a.startsWith("--"));
 
-  const projectRoot = resolve(positional ?? ".");
-  const verbose = flags.has("--verbose");
-  const clean = !flags.has("--no-clean");
+    const projectRoot = resolve(positional ?? ".");
+    const verbose = flags.has("--verbose");
+    const clean = !flags.has("--no-clean");
 
-  console.log(`Building site from ${projectRoot}...`);
+    console.log(`Building site from ${projectRoot}...`);
 
-  try {
-    const { buildSite } = await import("./site/site-build.ts");
-    const result = await buildSite(projectRoot, { clean, verbose });
+    try {
+      const { buildSite } = await import("./site/site-build.ts");
+      const result = await buildSite(projectRoot, { clean, verbose });
 
-    if (result.errors.length > 0) {
-      console.error(`\nBuild completed with ${result.errors.length} error(s):`);
-      for (const err of result.errors) {
-        console.error(`  - ${err}`);
+      if (result.errors.length > 0) {
+        console.error(`\nBuild completed with ${result.errors.length} error(s):`);
+        for (const err of result.errors) {
+          console.error(`  - ${err}`);
+        }
+        process.exit(1);
       }
+
+      console.log(`\nDone: ${result.routes} routes → ${result.files} files`);
+    } catch (error) {
+      const err = error as Error;
+      console.error(`Build failed: ${err.message}`);
       process.exit(1);
     }
-
-    console.log(`\nDone: ${result.routes} routes → ${result.files} files`);
-  } catch (error) {
-    const err = error as Error;
-    console.error(`Build failed: ${err.message}`);
+  } else {
+    console.error(`Unknown command: ${command}\nRun "jx --help" for usage.`);
     process.exit(1);
   }
-} else {
-  console.error(`Unknown command: ${command}\nRun "jx --help" for usage.`);
-  process.exit(1);
 }
+
+// oxlint-disable-next-line unicorn/prefer-top-level-await
+export const ready = main();

package/src/compile-cli.ts

@@ -1,12 +1,20 @@
 #!/usr/bin/env node
 import { runCli } from "./compiler.ts";
 
-const [src, out] = process.argv.slice(2);
-if (src) {
-  try {
-    await runCli(src, out);
-  } catch (error) {
-    console.error(error);
-    process.exit(1);
+// Body wrapped in an async function rather than a top-level await: Bun's test runtime drops the
+// Continuation after a dynamically-imported module's top-level await (it never resumes on Windows),
+// Which would skip the error handling. `ready` lets the in-process CLI harness await the sequence.
+async function main() {
+  const [src, out] = process.argv.slice(2);
+  if (src) {
+    try {
+      await runCli(src, out);
+    } catch (error) {
+      console.error(error);
+      process.exit(1);
+    }
   }
 }
+
+// oxlint-disable-next-line unicorn/prefer-top-level-await
+export const ready = main();

package/src/shared.ts

@@ -1024,7 +1024,7 @@ function _walkServerEntries(
 
 // ─── Component pre-rendering ─────────────────────────────────────────────────
 
-const SELF_CLOSING = new Set<string>([
+export const SELF_CLOSING = new Set<string>([
   "input",
   "br",
   "hr",

package/src/site/image-optimizer.ts

@@ -43,6 +43,13 @@ export interface ImageConfig {
 }
 
 type SharpModule = typeof SharpNS;
+/**
+ * Accepted output-format type, derived from the Sharp instance's own toFormat signature. Reaching
+ * into the `SharpNS.FormatEnum` namespace instead is fragile: sharp ships as `export = sharp`, so
+ * whether a default type-import exposes the merged namespace depends on esModuleInterop resolution
+ * (differs local vs CI).
+ */
+type SharpFormat = Parameters<ReturnType<SharpModule>["toFormat"]>[0];
 
 let _sharp: SharpModule | null = null;
 
@@ -175,7 +182,7 @@ export async function processImage(srcPath: string, cacheImgDir: string, config:
       const quality = config.quality[format as keyof ImageConfig["quality"]] ?? 80;
       const task = sharp(srcPath)
         .resize(width)
-        .toFormat(format as keyof SharpNS.FormatEnum, { quality })
+        .toFormat(format as SharpFormat, { quality })
         .toFile(absolutePath)
         .then(() => {});
 

package/src/site/site-build.ts

@@ -17,7 +17,7 @@ import {
   rmSync,
   writeFileSync,
 } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { basename, dirname, join, resolve } from "node:path";
 import { isMappedArray, isRef } from "@jxsuite/schema/guards";
 import { loadProjectConfig } from "./site-loader.ts";
 import { discoverPages, expandDynamicRoutes, readPageDocument } from "./pages-discovery.ts";
@@ -158,7 +158,11 @@ export async function buildSite(
           formats: formatRegistry,
         });
         for (const f of result.files) {
-          const outName = f.path.includes("/") ? (f.path.split("/").pop() as string) : f.path;
+          // Reduce the emitted path (an absolute source path with .json swapped to .js) to a bare
+          // Filename for the dist/components/ output. basename handles both / and \ — a
+          // Forward-slash-only split left the full drive path on Windows, so resolve() then wrote
+          // The sidecar back into the source tree instead of dist.
+          const outName = basename(f.path);
           writeFileSync(resolve(componentOutDir, outName), f.content, "utf8");
           if (f.tagName) {
             compiledComponentTags.push(f.tagName);

package/src/targets/compile-static.ts

@@ -12,6 +12,7 @@ import {
   escapeHtml,
   isNodeDynamic,
   resolveStaticValue,
+  SELF_CLOSING,
 } from "../shared.ts";
 import { emitElementModule } from "./compile-element.ts";
 import type { JxDocument, JxMutableNode, JxStyle } from "@jxsuite/schema/types";
@@ -143,6 +144,13 @@ function compileNode(
 
   const tag = def.tagName ?? "div";
   const attrs = buildAttrs(def, nextContext.scope);
+
+  // Void elements (br, hr, img, …) have no closing tag.
+  // Emitting `<br></br>` makes HTML parsers read `</br>` as a second `<br>`.
+  if (SELF_CLOSING.has(tag)) {
+    return `<${tag}${attrs}>`;
+  }
+
   const inner = buildInnerWithIslands(def, raw, nextContext, islands);
 
   return `<${tag}${attrs}>${inner}</${tag}>`;