@takumi-rs/wasm 2.0.0-beta.5 → 2.0.0-beta.7

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,16 +564,32 @@ 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)));
 		return [...new Set(families.flat().map((f) => f.name))];
 	}
 	async render(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+			fonts,
+			source: node,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.render(node, {
 			...rest,
@@ -582,8 +598,12 @@ var Renderer = class {
 		});
 	}
 	async renderAsDataUrl(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+			fonts,
+			source: node,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderAsDataUrl(node, {
 			...rest,
@@ -592,8 +612,12 @@ var Renderer = class {
 		});
 	}
 	async renderSvg(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+			fonts,
+			source: node,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderSvg(node, {
 			...rest,
@@ -602,8 +626,12 @@ var Renderer = class {
 		});
 	}
 	async measure(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+			fonts,
+			source: node,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.measure(node, {
 			...rest,
@@ -612,8 +640,13 @@ var Renderer = class {
 		});
 	}
 	async renderAnimation(options) {
-		const { fonts, fontFamilies, images, ...rest } = options;
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options;
+		const nodes = options.scenes.map((scene) => scene.node);
+		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+			fonts,
+			source: nodes,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderAnimation({
 			...rest,
@@ -622,8 +655,13 @@ var Renderer = class {
 		});
 	}
 	async encodeFrames(frames, options) {
-		const { fonts, fontFamilies, images, ...rest } = options;
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options;
+		const nodes = frames.map((frame) => frame.node);
+		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+			fonts,
+			source: nodes,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.encodeFrames(frames, {
 			...rest,
@@ -636,7 +674,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 +683,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;
 	}
 };
@@ -673,10 +711,5 @@ function isBuffer(data) {
 //#endregion
 exports.Renderer = Renderer;
 exports.default = __wbg_init;
-Object.defineProperty(exports, "extractResourceUrls", {
-	enumerable: true,
-	get: function() {
-		return _takumi_rs_helpers.extractResourceUrls;
-	}
-});
+exports.extractResourceUrls = _takumi_rs_helpers.extractResourceUrls;
 exports.initSync = initSync;

package/dist/export.d.cts

@@ -240,7 +240,8 @@ declare function __wbg_init(module_or_path?: {
 //#endregion
 //#region src/export.d.ts
 type FontLoader = Font | (Omit<FontDetails, "data"> & {
-  data: () => Promise<FontDetails["data"]> | FontDetails["data"];
+  data: () => Promise<FontDetails["data"]> | FontDetails["data"]; /** Inclusive codepoint ranges this face covers; lets `render` skip it when unused. */
+  ranges?: [number, number][];
 } & ({
   key: string;
 } | {
@@ -269,7 +270,8 @@ type OutputFormatOptions = {
 };
 type RenderOptions = Omit<RenderOptions$1, "images" | "format" | "quality"> & OutputFormatOptions & {
   fonts?: FontLoader[];
-  images?: ImageLoader[];
+  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
+  subset?: boolean;
 };
 /**
  * Animation output format. On wasm, WebP animation is always lossless (lossy
@@ -284,19 +286,26 @@ type AnimationOutputFormatOptions = {
 };
 type RenderAnimationOptions = Omit<RenderAnimationOptions$1, "images" | "format"> & AnimationOutputFormatOptions & {
   fonts?: FontLoader[];
-  images?: ImageLoader[];
+  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
+  subset?: boolean;
 };
 type EncodeFramesOptions = Omit<EncodeFramesOptions$1, "images" | "format"> & AnimationOutputFormatOptions & {
   fonts?: FontLoader[];
-  images?: ImageLoader[];
+  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
+  subset?: boolean;
 };
 type SvgRenderOptions = Omit<SvgRenderOptions$1, "images"> & {
   fonts?: FontLoader[];
-  images?: ImageLoader[];
+  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
+  subset?: boolean;
 };
 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 +314,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

@@ -240,7 +240,8 @@ declare function __wbg_init(module_or_path?: {
 //#endregion
 //#region src/export.d.ts
 type FontLoader = Font | (Omit<FontDetails, "data"> & {
-  data: () => Promise<FontDetails["data"]> | FontDetails["data"];
+  data: () => Promise<FontDetails["data"]> | FontDetails["data"]; /** Inclusive codepoint ranges this face covers; lets `render` skip it when unused. */
+  ranges?: [number, number][];
 } & ({
   key: string;
 } | {
@@ -269,7 +270,8 @@ type OutputFormatOptions = {
 };
 type RenderOptions = Omit<RenderOptions$1, "images" | "format" | "quality"> & OutputFormatOptions & {
   fonts?: FontLoader[];
-  images?: ImageLoader[];
+  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
+  subset?: boolean;
 };
 /**
  * Animation output format. On wasm, WebP animation is always lossless (lossy
@@ -284,19 +286,26 @@ type AnimationOutputFormatOptions = {
 };
 type RenderAnimationOptions = Omit<RenderAnimationOptions$1, "images" | "format"> & AnimationOutputFormatOptions & {
   fonts?: FontLoader[];
-  images?: ImageLoader[];
+  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
+  subset?: boolean;
 };
 type EncodeFramesOptions = Omit<EncodeFramesOptions$1, "images" | "format"> & AnimationOutputFormatOptions & {
   fonts?: FontLoader[];
-  images?: ImageLoader[];
+  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
+  subset?: boolean;
 };
 type SvgRenderOptions = Omit<SvgRenderOptions$1, "images"> & {
   fonts?: FontLoader[];
-  images?: ImageLoader[];
+  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
+  subset?: boolean;
 };
 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 +314,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

@@ -1,4 +1,4 @@
-import { extractResourceUrls } from "@takumi-rs/helpers";
+import { extractResourceUrls, pickFonts } from "@takumi-rs/helpers";
 //#region pkg/takumi_wasm.js
 /**
 * The main renderer for Takumi image rendering engine.
@@ -560,16 +560,32 @@ 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)));
 		return [...new Set(families.flat().map((f) => f.name))];
 	}
 	async render(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(pickFonts({
+			fonts,
+			source: node,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.render(node, {
 			...rest,
@@ -578,8 +594,12 @@ var Renderer = class {
 		});
 	}
 	async renderAsDataUrl(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(pickFonts({
+			fonts,
+			source: node,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderAsDataUrl(node, {
 			...rest,
@@ -588,8 +608,12 @@ var Renderer = class {
 		});
 	}
 	async renderSvg(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(pickFonts({
+			fonts,
+			source: node,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderSvg(node, {
 			...rest,
@@ -598,8 +622,12 @@ var Renderer = class {
 		});
 	}
 	async measure(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(pickFonts({
+			fonts,
+			source: node,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.measure(node, {
 			...rest,
@@ -608,8 +636,13 @@ var Renderer = class {
 		});
 	}
 	async renderAnimation(options) {
-		const { fonts, fontFamilies, images, ...rest } = options;
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options;
+		const nodes = options.scenes.map((scene) => scene.node);
+		const registeredFamilies = await this.prepareFonts(pickFonts({
+			fonts,
+			source: nodes,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderAnimation({
 			...rest,
@@ -618,8 +651,13 @@ var Renderer = class {
 		});
 	}
 	async encodeFrames(frames, options) {
-		const { fonts, fontFamilies, images, ...rest } = options;
-		const registeredFamilies = await this.prepareFonts(fonts);
+		const { fonts, fontFamilies, images, subset, ...rest } = options;
+		const nodes = frames.map((frame) => frame.node);
+		const registeredFamilies = await this.prepareFonts(pickFonts({
+			fonts,
+			source: nodes,
+			subset
+		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.encodeFrames(frames, {
 			...rest,
@@ -632,7 +670,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 +679,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.5",
+  "version": "2.0.0-beta.7",
   "keywords": [
     "css",
     "image",
@@ -89,13 +89,13 @@
     "publish-lint": "attw --pack . && publint --strict ."
   },
   "dependencies": {
-    "@takumi-rs/helpers": "2.0.0-beta.5"
+    "@takumi-rs/helpers": "2.0.0-beta.7"
   },
   "devDependencies": {
-    "@types/bun": "catalog:",
+    "@types/bun": "^1.3.14",
     "csstype": "^3.2.3",
-    "tsdown": "catalog:",
-    "unrun": "catalog:"
+    "tsdown": "^0.22.3",
+    "unrun": "^0.3.1"
   },
   "readme": "README.md"
 }