@jxsuite/compiler 1.1.0 → 1.3.0

package/src/targets/compile-element.ts

@@ -41,6 +41,12 @@ import type {
 export interface CompileElementOptions {
   /** Resolve an `$elements` ref path to its emitted JS module path. */
   resolveElementPath?: (refPath: string, currentDir: string | null) => string;
+  /**
+   * Rewrite a Function-def `$src` specifier to its served URL (bundleable specifiers → their
+   * `/assets/` bundle path). Receives the directory of the declaring document for relative
+   * specifiers. Identity when omitted.
+   */
+  rewriteSrc?: (specifier: string, docDir: string | null) => string;
   $media?: Record<string, string>;
   formats?: FormatRegistry;
   basePath?: string | null;
@@ -135,7 +141,13 @@ export async function compileElement(
     if (optsMedia) {
       doc.$media = { ...optsMedia, ...doc.$media };
     }
-    const jsContent = emitElementModule(doc, className, elementImports);
+    const { rewriteSrc } = opts;
+    const jsContent = emitElementModule(
+      doc,
+      className,
+      elementImports,
+      rewriteSrc ? (spec: string) => rewriteSrc(spec, currentDir) : undefined,
+    );
     const outputPath = filePath ? filePath.replace(/\.json$/, ".js") : `${tagName}.js`;
     files.push({ content: jsContent, path: outputPath, tagName });
   }
@@ -244,7 +256,12 @@ function extractInitialValue(def: JxMutableNode) {
  * @param {string[]} elementImports
  * @returns {string}
  */
-export function emitElementModule(doc: JxDocument, className: string, elementImports: string[]) {
+export function emitElementModule(
+  doc: JxDocument,
+  className: string,
+  elementImports: string[],
+  rewriteSrc?: (specifier: string) => string,
+) {
   const lines: string[] = ["// Generated by @jxsuite/compiler — do not edit manually"];
 
   if (doc.$id) {
@@ -269,7 +286,10 @@ export function emitElementModule(doc: JxDocument, className: string, elementImp
     }
   }
   for (const [srcPath, names] of srcImportMap) {
-    lines.push(`import { ${names.join(", ")} } from '${srcPath}';`);
+    // Bundleable specifiers (npm:…, ./relative) are rewritten to their /assets/ bundle URL;
+    // The site build bundles them after all documents compile (spec.md §12).
+    const importPath = rewriteSrc ? rewriteSrc(srcPath) : srcPath;
+    lines.push(`import { ${names.join(", ")} } from '${importPath}';`);
   }
 
   lines.push(
@@ -486,11 +506,16 @@ export function emitElementModule(doc: JxDocument, className: string, elementImp
     );
   }
   lines.push(
+    // Lifecycle: onMount (spec §16.4) — same microtask contract as the runtime
+    "    if (typeof this.state.onMount === 'function') {",
+    "      queueMicrotask(() => this.state.onMount(this.state));",
+    "    }",
     "  }",
     "",
     // DisconnectedCallback
     "  disconnectedCallback() {",
     "    if (this.#dispose) { this.#dispose(); this.#dispose = null; }",
+    "    if (typeof this.state.onUnmount === 'function') { this.state.onUnmount(this.state); }",
     "  }",
     "}",
     "",

package/src/targets/compile-static.ts

@@ -7,10 +7,12 @@
 
 import {
   buildAttrs,
+  colorSchemePrePaintScript,
   compileStyles,
   createCompileContext,
   escapeHtml,
   isNodeDynamic,
+  pureSchemeOf,
   resolveStaticValue,
   SELF_CLOSING,
 } from "../shared.ts";
@@ -31,6 +33,7 @@ export function compileStaticPage(
     reactivitySrc?: string;
     litHtmlSrc?: string;
     projectStyle?: JxStyle | null;
+    prePaintScheme?: boolean;
     [key: string]: unknown;
   },
 ) {
@@ -51,7 +54,12 @@ export function compileStaticPage(
   let moduleScripts = "";
   if (islands.length > 0) {
     for (const island of islands) {
-      const moduleContent = emitElementModule(island.def as JxDocument, island.className, []);
+      const moduleContent = emitElementModule(
+        island.def as JxDocument,
+        island.className,
+        [],
+        opts.rewriteSrc as ((specifier: string) => string) | undefined,
+      );
       files.push({
         content: moduleContent,
         path: `_islands/${island.tagName}.js`,
@@ -73,13 +81,20 @@ export function compileStaticPage(
       .join("\n  ");
   }
 
+  // Forced-scheme contract (spec §9.5): restore the persisted scheme before any styles apply
+  const prePaint =
+    opts.prePaintScheme !== false &&
+    Object.values(raw.$media ?? {}).some((q) => pureSchemeOf(String(q)) !== null)
+      ? `<script>${colorSchemePrePaintScript()}</script>\n  `
+      : "";
+
   const html = `<!DOCTYPE html>
 <html lang="en">
 <head>
   <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
   <title>${escapeHtml(title)}</title>
-  ${importMap}
+  ${prePaint}${importMap}
   ${styleBlock}
 </head>
 <body>