@takumi-rs/wasm 2.0.0-beta.4 → 2.0.0-beta.6

package/bundlers/vite.mjs

@@ -1,18 +1,31 @@
 import url from "../pkg/takumi_wasm_bg.wasm?url";
 
+// `?url` is a browser path; map it to a file for server reads. Vite emits the asset next to the
+// importing server chunk, so resolve relative to import.meta.url, not the framework output dir.
 async function processUrl() {
   if (typeof process !== "undefined" && process.versions?.node != null) {
     const { readFile } = await import("node:fs/promises");
+    const path = decodeURIComponent(url.replace(/[?#].*$/, ""));
 
-    if (!url.startsWith("/")) {
-      return readFile(new URL(url, import.meta.url));
+    // Dev SSR serves an `/@fs/<abs-path>` URL.
+    if (path.startsWith("/@fs/")) {
+      return readFile(path.slice("/@fs".length));
     }
 
-    for (const candidate of [`../client${url}`, `../../client${url}`]) {
+    if (!path.startsWith("/")) {
+      return readFile(new URL(path, import.meta.url));
+    }
+
+    const basename = path.slice(path.lastIndexOf("/") + 1);
+    const candidates = [`./${basename}`, `../client${path}`, `../../client${path}`];
+
+    let lastError;
+    for (const candidate of candidates) {
       try {
         return await readFile(new URL(candidate, import.meta.url));
       } catch (error) {
         if (error && typeof error === "object" && "code" in error && error.code === "ENOENT") {
+          lastError = error;
           continue;
         }
 
@@ -20,7 +33,7 @@ async function processUrl() {
       }
     }
 
-    throw new Error(`Unable to locate Takumi WASM asset for SSR: ${url}`);
+    throw new Error(`Unable to locate Takumi WASM asset for SSR: ${url}`, { cause: lastError });
   }
 
   return fetch(new URL(url, import.meta.url)).then((response) => response.arrayBuffer());

package/dist/export.cjs

@@ -564,8 +564,20 @@ async function resolveImageLoaders(images) {
 	})));
 }
 var Renderer = class {
-	fontMapping = /* @__PURE__ */ new Map();
+	fontsByKey = /* @__PURE__ */ new Map();
+	fontsByData = /* @__PURE__ */ new WeakMap();
 	inner = new Renderer$1();
+	getFont(key) {
+		return typeof key === "string" ? this.fontsByKey.get(key) : this.fontsByData.get(key);
+	}
+	setFont(key, family) {
+		if (typeof key === "string") this.fontsByKey.set(key, family);
+		else this.fontsByData.set(key, family);
+	}
+	deleteFont(key) {
+		if (typeof key === "string") this.fontsByKey.delete(key);
+		else this.fontsByData.delete(key);
+	}
 	async prepareFonts(fonts) {
 		if (!fonts) return;
 		const families = await Promise.all(fonts.map(this.registerFont.bind(this)));
@@ -636,7 +648,7 @@ var Renderer = class {
 	}
 	async registerFont(font) {
 		const key = createFontKey(font);
-		const cached = this.fontMapping.get(key);
+		const cached = this.getFont(key);
 		if (cached) return cached;
 		const extracted = extractFontBuffer(font);
 		const register = (data) => this.inner.registerFont(isBuffer(font) ? data : {
@@ -645,14 +657,14 @@ var Renderer = class {
 		});
 		if (isBuffer(extracted)) {
 			const binded = register(extracted);
-			this.fontMapping.set(key, Promise.resolve(binded));
+			this.setFont(key, Promise.resolve(binded));
 			return binded;
 		}
 		const promise = extracted.then(register).catch((error) => {
-			this.fontMapping.delete(key);
+			this.deleteFont(key);
 			throw error;
 		});
-		this.fontMapping.set(key, promise);
+		this.setFont(key, promise);
 		return promise;
 	}
 };

package/dist/export.d.cts

@@ -295,8 +295,12 @@ type SvgRenderOptions = Omit<SvgRenderOptions$1, "images"> & {
   images?: ImageLoader[];
 };
 declare class Renderer {
-  private fontMapping;
+  private fontsByKey;
+  private fontsByData;
   private inner;
+  private getFont;
+  private setFont;
+  private deleteFont;
   private prepareFonts;
   render(node: Node, options?: RenderOptions): Promise<Uint8Array<ArrayBufferLike>>;
   renderAsDataUrl(node: Node, options?: RenderOptions): Promise<string>;
@@ -305,7 +309,7 @@ declare class Renderer {
   renderAnimation(options: RenderAnimationOptions): Promise<Uint8Array<ArrayBufferLike>>;
   encodeFrames(frames: AnimationFrameSource[], options: EncodeFramesOptions): Promise<Uint8Array<ArrayBufferLike>>;
   free(): void;
-  registerFont(font: FontLoader): Promise<any>;
+  registerFont(font: FontLoader): Promise<RegisteredFamily[]>;
 }
 //#endregion
 export { AnimationFrameSource, AnimationOutputFormatOptions, AnimationSceneSource, ByteBuf, ContainerNode, EncodeFramesOptions, Font, FontDetails, FontLoader, ImageLoader, ImageNode, ImageSource, InitInput, InitOutput, KeyframeRule, Keyframes, KeyframesMap, KeyframesRule, KeyframesRuleList, MeasuredNode, MeasuredTextRun, type Node, NodeMetadata, OutputFormatOptions, RegisteredFace, RegisteredFamily, RenderAnimationOptions, RenderOptions, Renderer, SvgRenderOptions, SyncInitInput, TextNode, __wbg_init as default, extractResourceUrls, initSync };

package/dist/export.d.mts

@@ -295,8 +295,12 @@ type SvgRenderOptions = Omit<SvgRenderOptions$1, "images"> & {
   images?: ImageLoader[];
 };
 declare class Renderer {
-  private fontMapping;
+  private fontsByKey;
+  private fontsByData;
   private inner;
+  private getFont;
+  private setFont;
+  private deleteFont;
   private prepareFonts;
   render(node: Node, options?: RenderOptions): Promise<Uint8Array<ArrayBufferLike>>;
   renderAsDataUrl(node: Node, options?: RenderOptions): Promise<string>;
@@ -305,7 +309,7 @@ declare class Renderer {
   renderAnimation(options: RenderAnimationOptions): Promise<Uint8Array<ArrayBufferLike>>;
   encodeFrames(frames: AnimationFrameSource[], options: EncodeFramesOptions): Promise<Uint8Array<ArrayBufferLike>>;
   free(): void;
-  registerFont(font: FontLoader): Promise<any>;
+  registerFont(font: FontLoader): Promise<RegisteredFamily[]>;
 }
 //#endregion
 export { AnimationFrameSource, AnimationOutputFormatOptions, AnimationSceneSource, ByteBuf, ContainerNode, EncodeFramesOptions, Font, FontDetails, FontLoader, ImageLoader, ImageNode, ImageSource, InitInput, InitOutput, KeyframeRule, Keyframes, KeyframesMap, KeyframesRule, KeyframesRuleList, MeasuredNode, MeasuredTextRun, type Node, NodeMetadata, OutputFormatOptions, RegisteredFace, RegisteredFamily, RenderAnimationOptions, RenderOptions, Renderer, SvgRenderOptions, SyncInitInput, TextNode, __wbg_init as default, extractResourceUrls, initSync };

package/dist/export.mjs

@@ -560,8 +560,20 @@ async function resolveImageLoaders(images) {
 	})));
 }
 var Renderer = class {
-	fontMapping = /* @__PURE__ */ new Map();
+	fontsByKey = /* @__PURE__ */ new Map();
+	fontsByData = /* @__PURE__ */ new WeakMap();
 	inner = new Renderer$1();
+	getFont(key) {
+		return typeof key === "string" ? this.fontsByKey.get(key) : this.fontsByData.get(key);
+	}
+	setFont(key, family) {
+		if (typeof key === "string") this.fontsByKey.set(key, family);
+		else this.fontsByData.set(key, family);
+	}
+	deleteFont(key) {
+		if (typeof key === "string") this.fontsByKey.delete(key);
+		else this.fontsByData.delete(key);
+	}
 	async prepareFonts(fonts) {
 		if (!fonts) return;
 		const families = await Promise.all(fonts.map(this.registerFont.bind(this)));
@@ -632,7 +644,7 @@ var Renderer = class {
 	}
 	async registerFont(font) {
 		const key = createFontKey(font);
-		const cached = this.fontMapping.get(key);
+		const cached = this.getFont(key);
 		if (cached) return cached;
 		const extracted = extractFontBuffer(font);
 		const register = (data) => this.inner.registerFont(isBuffer(font) ? data : {
@@ -641,14 +653,14 @@ var Renderer = class {
 		});
 		if (isBuffer(extracted)) {
 			const binded = register(extracted);
-			this.fontMapping.set(key, Promise.resolve(binded));
+			this.setFont(key, Promise.resolve(binded));
 			return binded;
 		}
 		const promise = extracted.then(register).catch((error) => {
-			this.fontMapping.delete(key);
+			this.deleteFont(key);
 			throw error;
 		});
-		this.fontMapping.set(key, promise);
+		this.setFont(key, promise);
 		return promise;
 	}
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takumi-rs/wasm",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.6",
   "keywords": [
     "css",
     "image",
@@ -89,7 +89,7 @@
     "publish-lint": "attw --pack . && publint --strict ."
   },
   "dependencies": {
-    "@takumi-rs/helpers": "workspace:*"
+    "@takumi-rs/helpers": "2.0.0-beta.6"
   },
   "devDependencies": {
     "@types/bun": "catalog:",