@nowline/export-png 0.5.0 → 0.6.0

package/dist/index.d.ts

@@ -9,10 +9,14 @@ export interface PngOptions {
     background?: string;
     /** Pre-resolved font pair. If absent, the exporter calls `resolveFonts()`. */
     fonts?: ResolvedFontPair;
-    /** Resvg-js options bag for advanced overrides. Use sparingly. */
-    resvgOptions?: Record<string, unknown>;
 }
-/** Test seam: drop the cached WASM module so isolated tests start fresh. */
-export declare function _resetResvgModule(): void;
+/**
+ * Initialize the resvg WASM module with the provided bytes. The kernel calls
+ * this with `await host.loadWasm()` before the first PNG export. Idempotent:
+ * subsequent calls with the same wasm bytes are no-ops.
+ */
+export declare function initPngWasm(wasm: ArrayBuffer | Uint8Array): Promise<void>;
+/** Test seam: reset WASM initialization state between isolated tests. */
+export declare function _resetPngWasm(): void;
 export declare function exportPng(inputs: ExportInputs, svg: string, options?: PngOptions): Promise<Uint8Array>;
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAG3E,MAAM,WAAW,UAAU;IACvB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8EAA8E;IAC9E,KAAK,CAAC,EAAE,gBAAgB,CAAC;IACzB,kEAAkE;IAClE,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1C;AAWD,4EAA4E;AAC5E,wBAAgB,iBAAiB,IAAI,IAAI,CAExC;AAED,wBAAsB,SAAS,CAC3B,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,UAAe,GACzB,OAAO,CAAC,UAAU,CAAC,CAkCrB"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAgBA,OAAO,KAAK,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAE3E,MAAM,WAAW,UAAU;IACvB,6EAA6E;IAC7E,KAAK,CAAC,EAAE,MAAM,CAAC;IACf;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,8EAA8E;IAC9E,KAAK,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAOD;;;;GAIG;AACH,wBAAsB,WAAW,CAAC,IAAI,EAAE,WAAW,GAAG,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC,CAW/E;AA4BD,yEAAyE;AACzE,wBAAgB,aAAa,IAAI,IAAI,CAGpC;AA4BD,wBAAsB,SAAS,CAC3B,MAAM,EAAE,YAAY,EACpB,GAAG,EAAE,MAAM,EACX,OAAO,GAAE,UAAe,GACzB,OAAO,CAAC,UAAU,CAAC,CAqCrB"}

package/dist/index.js

@@ -1,57 +1,75 @@
-// PNG exporter — rasterizes the renderer SVG via resvg-js (WASM).
+// PNG exporter — rasterizes the renderer SVG via @resvg/resvg-wasm.
 //
-// Spec: specs/handoffs/m2c.md § 3 "PNG — rasterized SVG via resvg-js (WASM)".
+// Full replace of the old native @resvg/resvg-js dependency. The WASM build
+// is browser-capable, loads system fonts optionally (we always use
+// custom fontBuffers for determinism), and avoids native .node addons.
 //
 // Determinism contract:
-//   - `loadSystemFonts: false` — only the resolved fonts the caller hands in
-//     are visible to resvg, so identical input → identical bytes regardless
-//     of host machine.
-//   - Fonts come from the @nowline/export-core resolver; we pass them as
-//     `fontBuffers` (Uint8Array, supported since resvg-js 2.5.0).
-//   - The WASM module is loaded lazily on first call.
-import { resolveFonts } from '@nowline/export-core';
-let resvgModule;
-async function getResvgModule() {
-    if (!resvgModule) {
-        resvgModule = await import('@resvg/resvg-js');
+//   - fontBuffers: only the resolved fonts the caller hands in are visible to
+//     resvg, so identical inputs → identical bytes regardless of host machine.
+//   - Fonts come from the @nowline/export-core resolver; passed as Uint8Array[].
+//   - WASM module is initialized lazily on first call; initPngWasm() lets the
+//     caller supply the bytes (HostEnv.loadWasm() path); auto-init falls back
+//     to loading index_bg.wasm from the package's node_modules (Node only).
+//
+// Spec: specs/export-determinism.md — full replace (plan s4).
+// ---- WASM initialization ----------------------------------------------------
+let wasmReady = false;
+let wasmInitializing;
+/**
+ * Initialize the resvg WASM module with the provided bytes. The kernel calls
+ * this with `await host.loadWasm()` before the first PNG export. Idempotent:
+ * subsequent calls with the same wasm bytes are no-ops.
+ */
+export async function initPngWasm(wasm) {
+    if (wasmReady)
+        return;
+    const bytes = wasm instanceof Uint8Array ? wasm.buffer : wasm;
+    if (!wasmInitializing) {
+        wasmInitializing = (async () => {
+            const { initWasm } = await import('@resvg/resvg-wasm');
+            await initWasm(bytes);
+            wasmReady = true;
+        })();
     }
-    return resvgModule;
-}
-/** Test seam: drop the cached WASM module so isolated tests start fresh. */
-export function _resetResvgModule() {
-    resvgModule = undefined;
+    await wasmInitializing;
 }
-export async function exportPng(inputs, svg, options = {}) {
-    const scale = options.scale ?? 2;
-    if (!Number.isFinite(scale) || scale <= 0) {
-        throw new Error(`exportPng: invalid scale ${scale}; expected a positive number`);
+/**
+ * Ensure the WASM module is initialized. If initPngWasm() was not called
+ * explicitly, auto-loads index_bg.wasm from @resvg/resvg-wasm's Node package
+ * (Node.js / non-compiled use — tests and development). Under bun compile the
+ * kernel always calls initPngWasm() via HostEnv.loadWasm() so this path is not
+ * reached in production binaries.
+ */
+async function ensureWasmInitialized() {
+    if (wasmReady)
+        return;
+    if (!wasmInitializing) {
+        wasmInitializing = (async () => {
+            const { createRequire } = await import('node:module');
+            const { readFile } = await import('node:fs/promises');
+            const { dirname } = await import('node:path');
+            const req = createRequire(import.meta.url);
+            const entry = req.resolve('@resvg/resvg-wasm');
+            const wasmPath = `${dirname(entry)}/index_bg.wasm`;
+            const wasmBytes = await readFile(wasmPath);
+            const { initWasm } = await import('@resvg/resvg-wasm');
+            await initWasm(wasmBytes.buffer);
+            wasmReady = true;
+        })();
     }
-    const background = options.background ?? inputs.model.backgroundColor;
-    const fontPair = options.fonts ?? (await resolveFontsFor(inputs));
-    const fontBuffers = [bufferOf(fontPair.sans.bytes), bufferOf(fontPair.mono.bytes)];
-    // Workaround: in resvg-js 2.6.2, supplying `font.fontBuffers` silently
-    // disables `fitTo` (zoom / width / height / dpi). To honour `--scale` we
-    // multiply the root <svg width=…> / <svg height=…> attributes ourselves
-    // before handing the SVG to resvg. The internal viewBox stays the same,
-    // so vector geometry is preserved — only the rasterized pixel grid grows.
-    const scaledSvg = scale === 1 ? svg : scaleRootSvgDimensions(svg, scale);
-    const resvgOpts = {
-        background,
-        font: {
-            loadSystemFonts: false,
-            fontBuffers,
-            defaultFontFamily: fontPair.sans.name,
-            sansSerifFamily: fontPair.sans.name,
-            monospaceFamily: fontPair.mono.name,
-        },
-        ...(options.resvgOptions ?? {}),
-    };
-    const { Resvg } = await getResvgModule();
-    const resvg = new Resvg(scaledSvg, resvgOpts);
-    const png = resvg.render();
-    const bytes = png.asPng();
-    return new Uint8Array(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+    await wasmInitializing;
 }
+/** Test seam: reset WASM initialization state between isolated tests. */
+export function _resetPngWasm() {
+    wasmReady = false;
+    wasmInitializing = undefined;
+}
+// ---- Scale workaround -------------------------------------------------------
+//
+// @resvg/resvg-wasm (like resvg-js ≤ 2.6.x) silently disables fitTo when
+// fontBuffers are supplied. Pre-multiply root <svg width/height> by scale so
+// the rasterized grid grows while preserving vector geometry.
 const ROOT_SVG_RE = /<svg\b([^>]*)>/i;
 const WIDTH_RE = /\bwidth="([\d.]+)(px)?"/i;
 const HEIGHT_RE = /\bheight="([\d.]+)(px)?"/i;
@@ -70,11 +88,41 @@ function scaleRootSvgDimensions(svg, scale) {
     nextAttrs = nextAttrs.replace(HEIGHT_RE, `height="${newHeight}"`);
     return svg.replace(ROOT_SVG_RE, `<svg${nextAttrs}>`);
 }
+// ---- Public API -------------------------------------------------------------
+export async function exportPng(inputs, svg, options = {}) {
+    const scale = options.scale ?? 2;
+    if (!Number.isFinite(scale) || scale <= 0) {
+        throw new Error(`exportPng: invalid scale ${scale}; expected a positive number`);
+    }
+    await ensureWasmInitialized();
+    const background = options.background ?? inputs.model.backgroundColor;
+    const fontPair = options.fonts ?? (await resolveFontsFor(inputs));
+    const sansBytes = new Uint8Array(fontPair.sans.bytes.buffer, fontPair.sans.bytes.byteOffset, fontPair.sans.bytes.byteLength);
+    const monoBytes = new Uint8Array(fontPair.mono.bytes.buffer, fontPair.mono.bytes.byteOffset, fontPair.mono.bytes.byteLength);
+    const scaledSvg = scale === 1 ? svg : scaleRootSvgDimensions(svg, scale);
+    const { Resvg } = await import('@resvg/resvg-wasm');
+    const resvg = new Resvg(scaledSvg, {
+        background,
+        font: {
+            fontBuffers: [sansBytes, monoBytes],
+            defaultFontFamily: fontPair.sans.name,
+            sansSerifFamily: fontPair.sans.name,
+            monospaceFamily: fontPair.mono.name,
+        },
+    });
+    const rendered = resvg.render();
+    const bytes = rendered.asPng();
+    return new Uint8Array(bytes.buffer, bytes.byteOffset, bytes.byteLength);
+}
 async function resolveFontsFor(_inputs) {
+    // Imported lazily (not at module top) so the static module graph of
+    // @nowline/export-png stays free of `node:fs` — the font resolver pulls it
+    // in. Canonical callers (the kernel, the CLI) always pass `options.fonts`,
+    // so this fallback never runs there; keeping the import dynamic lets the
+    // package bundle for the browser (the determinism gate's headless leg and
+    // the Free/Pro web apps) without a Node-builtin polyfill.
+    const { resolveFonts } = await import('@nowline/export-core');
     const result = await resolveFonts();
     return { sans: result.sans, mono: result.mono };
 }
-function bufferOf(bytes) {
-    return Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength);
-}
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nowline/export-png",
-  "version": "0.5.0",
-  "description": "Nowline PNG exporter — rasterizes the renderer SVG via resvg-js (WASM)",
+  "version": "0.6.0",
+  "description": "Nowline PNG exporter — rasterizes the renderer SVG via @resvg/resvg-wasm",
   "license": "Apache-2.0",
   "engines": {
     "node": ">=22",
@@ -21,17 +21,17 @@
     "src/"
   ],
   "dependencies": {
-    "@resvg/resvg-js": "^2.6.2",
-    "@nowline/export-core": "0.5.0"
+    "@resvg/resvg-wasm": "^2.6.2",
+    "@nowline/export-core": "0.6.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.1",
     "langium": "~4.2.4",
     "typescript": "^6.0.3",
     "vitest": "^4.1.7",
-    "@nowline/core": "0.5.0",
-    "@nowline/renderer": "0.5.0",
-    "@nowline/layout": "0.5.0"
+    "@nowline/core": "0.6.0",
+    "@nowline/layout": "0.6.0",
+    "@nowline/renderer": "0.6.0"
   },
   "scripts": {
     "build": "tsc -b tsconfig.json",

package/src/index.ts

@@ -1,17 +1,20 @@
-// PNG exporter — rasterizes the renderer SVG via resvg-js (WASM).
+// PNG exporter — rasterizes the renderer SVG via @resvg/resvg-wasm.
 //
-// Spec: specs/handoffs/m2c.md § 3 "PNG — rasterized SVG via resvg-js (WASM)".
+// Full replace of the old native @resvg/resvg-js dependency. The WASM build
+// is browser-capable, loads system fonts optionally (we always use
+// custom fontBuffers for determinism), and avoids native .node addons.
 //
 // Determinism contract:
-//   - `loadSystemFonts: false` — only the resolved fonts the caller hands in
-//     are visible to resvg, so identical input → identical bytes regardless
-//     of host machine.
-//   - Fonts come from the @nowline/export-core resolver; we pass them as
-//     `fontBuffers` (Uint8Array, supported since resvg-js 2.5.0).
-//   - The WASM module is loaded lazily on first call.
+//   - fontBuffers: only the resolved fonts the caller hands in are visible to
+//     resvg, so identical inputs → identical bytes regardless of host machine.
+//   - Fonts come from the @nowline/export-core resolver; passed as Uint8Array[].
+//   - WASM module is initialized lazily on first call; initPngWasm() lets the
+//     caller supply the bytes (HostEnv.loadWasm() path); auto-init falls back
+//     to loading index_bg.wasm from the package's node_modules (Node only).
+//
+// Spec: specs/export-determinism.md — full replace (plan s4).
 
 import type { ExportInputs, ResolvedFontPair } from '@nowline/export-core';
-import { resolveFonts } from '@nowline/export-core';
 
 export interface PngOptions {
     /** Pixel-density multiplier. 1 (native), 1.5, 2, or 3 typical. Default 2. */
@@ -23,24 +26,89 @@ export interface PngOptions {
     background?: string;
     /** Pre-resolved font pair. If absent, the exporter calls `resolveFonts()`. */
     fonts?: ResolvedFontPair;
-    /** Resvg-js options bag for advanced overrides. Use sparingly. */
-    resvgOptions?: Record<string, unknown>;
 }
 
-let resvgModule: typeof import('@resvg/resvg-js') | undefined;
+// ---- WASM initialization ----------------------------------------------------
+
+let wasmReady = false;
+let wasmInitializing: Promise<void> | undefined;
 
-async function getResvgModule(): Promise<typeof import('@resvg/resvg-js')> {
-    if (!resvgModule) {
-        resvgModule = await import('@resvg/resvg-js');
+/**
+ * Initialize the resvg WASM module with the provided bytes. The kernel calls
+ * this with `await host.loadWasm()` before the first PNG export. Idempotent:
+ * subsequent calls with the same wasm bytes are no-ops.
+ */
+export async function initPngWasm(wasm: ArrayBuffer | Uint8Array): Promise<void> {
+    if (wasmReady) return;
+    const bytes = wasm instanceof Uint8Array ? wasm.buffer : wasm;
+    if (!wasmInitializing) {
+        wasmInitializing = (async () => {
+            const { initWasm } = await import('@resvg/resvg-wasm');
+            await initWasm(bytes as ArrayBuffer);
+            wasmReady = true;
+        })();
     }
-    return resvgModule;
+    await wasmInitializing;
+}
+
+/**
+ * Ensure the WASM module is initialized. If initPngWasm() was not called
+ * explicitly, auto-loads index_bg.wasm from @resvg/resvg-wasm's Node package
+ * (Node.js / non-compiled use — tests and development). Under bun compile the
+ * kernel always calls initPngWasm() via HostEnv.loadWasm() so this path is not
+ * reached in production binaries.
+ */
+async function ensureWasmInitialized(): Promise<void> {
+    if (wasmReady) return;
+    if (!wasmInitializing) {
+        wasmInitializing = (async () => {
+            const { createRequire } = await import('node:module');
+            const { readFile } = await import('node:fs/promises');
+            const { dirname } = await import('node:path');
+            const req = createRequire(import.meta.url);
+            const entry = req.resolve('@resvg/resvg-wasm');
+            const wasmPath = `${dirname(entry)}/index_bg.wasm`;
+            const wasmBytes = await readFile(wasmPath);
+            const { initWasm } = await import('@resvg/resvg-wasm');
+            await initWasm(wasmBytes.buffer as ArrayBuffer);
+            wasmReady = true;
+        })();
+    }
+    await wasmInitializing;
+}
+
+/** Test seam: reset WASM initialization state between isolated tests. */
+export function _resetPngWasm(): void {
+    wasmReady = false;
+    wasmInitializing = undefined;
 }
 
-/** Test seam: drop the cached WASM module so isolated tests start fresh. */
-export function _resetResvgModule(): void {
-    resvgModule = undefined;
+// ---- Scale workaround -------------------------------------------------------
+//
+// @resvg/resvg-wasm (like resvg-js ≤ 2.6.x) silently disables fitTo when
+// fontBuffers are supplied. Pre-multiply root <svg width/height> by scale so
+// the rasterized grid grows while preserving vector geometry.
+
+const ROOT_SVG_RE = /<svg\b([^>]*)>/i;
+const WIDTH_RE = /\bwidth="([\d.]+)(px)?"/i;
+const HEIGHT_RE = /\bheight="([\d.]+)(px)?"/i;
+
+function scaleRootSvgDimensions(svg: string, scale: number): string {
+    const match = ROOT_SVG_RE.exec(svg);
+    if (!match) return svg;
+    const attrs = match[1];
+    const widthMatch = WIDTH_RE.exec(attrs);
+    const heightMatch = HEIGHT_RE.exec(attrs);
+    if (!widthMatch || !heightMatch) return svg;
+    const newWidth = Number(widthMatch[1]) * scale;
+    const newHeight = Number(heightMatch[1]) * scale;
+    let nextAttrs = attrs.replace(WIDTH_RE, `width="${newWidth}"`);
+    nextAttrs = nextAttrs.replace(HEIGHT_RE, `height="${newHeight}"`);
+    return svg.replace(ROOT_SVG_RE, `<svg${nextAttrs}>`);
 }
 
+// ---- Public API -------------------------------------------------------------
+
 export async function exportPng(
     inputs: ExportInputs,
     svg: string,
@@ -50,60 +118,48 @@ export async function exportPng(
     if (!Number.isFinite(scale) || scale <= 0) {
         throw new Error(`exportPng: invalid scale ${scale}; expected a positive number`);
     }
-    const background = options.background ?? inputs.model.backgroundColor;
 
+    await ensureWasmInitialized();
+
+    const background = options.background ?? inputs.model.backgroundColor;
     const fontPair = options.fonts ?? (await resolveFontsFor(inputs));
-    const fontBuffers = [bufferOf(fontPair.sans.bytes), bufferOf(fontPair.mono.bytes)];
 
-    // Workaround: in resvg-js 2.6.2, supplying `font.fontBuffers` silently
-    // disables `fitTo` (zoom / width / height / dpi). To honour `--scale` we
-    // multiply the root <svg width=…> / <svg height=…> attributes ourselves
-    // before handing the SVG to resvg. The internal viewBox stays the same,
-    // so vector geometry is preserved — only the rasterized pixel grid grows.
+    const sansBytes = new Uint8Array(
+        fontPair.sans.bytes.buffer,
+        fontPair.sans.bytes.byteOffset,
+        fontPair.sans.bytes.byteLength,
+    );
+    const monoBytes = new Uint8Array(
+        fontPair.mono.bytes.buffer,
+        fontPair.mono.bytes.byteOffset,
+        fontPair.mono.bytes.byteLength,
+    );
+
     const scaledSvg = scale === 1 ? svg : scaleRootSvgDimensions(svg, scale);
 
-    const resvgOpts = {
+    const { Resvg } = await import('@resvg/resvg-wasm');
+    const resvg = new Resvg(scaledSvg, {
         background,
         font: {
-            loadSystemFonts: false,
-            fontBuffers,
+            fontBuffers: [sansBytes, monoBytes],
             defaultFontFamily: fontPair.sans.name,
             sansSerifFamily: fontPair.sans.name,
             monospaceFamily: fontPair.mono.name,
         },
-        ...(options.resvgOptions ?? {}),
-    };
-
-    const { Resvg } = await getResvgModule();
-    const resvg = new Resvg(scaledSvg, resvgOpts);
-    const png = resvg.render();
-    const bytes = png.asPng();
+    });
+    const rendered = resvg.render();
+    const bytes = rendered.asPng();
     return new Uint8Array(bytes.buffer, bytes.byteOffset, bytes.byteLength);
 }
 
-const ROOT_SVG_RE = /<svg\b([^>]*)>/i;
-const WIDTH_RE = /\bwidth="([\d.]+)(px)?"/i;
-const HEIGHT_RE = /\bheight="([\d.]+)(px)?"/i;
-
-function scaleRootSvgDimensions(svg: string, scale: number): string {
-    const match = ROOT_SVG_RE.exec(svg);
-    if (!match) return svg;
-    const attrs = match[1];
-    const widthMatch = WIDTH_RE.exec(attrs);
-    const heightMatch = HEIGHT_RE.exec(attrs);
-    if (!widthMatch || !heightMatch) return svg;
-    const newWidth = Number(widthMatch[1]) * scale;
-    const newHeight = Number(heightMatch[1]) * scale;
-    let nextAttrs = attrs.replace(WIDTH_RE, `width="${newWidth}"`);
-    nextAttrs = nextAttrs.replace(HEIGHT_RE, `height="${newHeight}"`);
-    return svg.replace(ROOT_SVG_RE, `<svg${nextAttrs}>`);
-}
-
 async function resolveFontsFor(_inputs: ExportInputs): Promise<ResolvedFontPair> {
+    // Imported lazily (not at module top) so the static module graph of
+    // @nowline/export-png stays free of `node:fs` — the font resolver pulls it
+    // in. Canonical callers (the kernel, the CLI) always pass `options.fonts`,
+    // so this fallback never runs there; keeping the import dynamic lets the
+    // package bundle for the browser (the determinism gate's headless leg and
+    // the Free/Pro web apps) without a Node-builtin polyfill.
+    const { resolveFonts } = await import('@nowline/export-core');
     const result = await resolveFonts();
     return { sans: result.sans, mono: result.mono };
 }
-
-function bufferOf(bytes: Uint8Array): Buffer {
-    return Buffer.from(bytes.buffer, bytes.byteOffset, bytes.byteLength);
-}