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

package/dist/export.cjs

@@ -3,6 +3,7 @@ Object.defineProperties(exports, {
 	[Symbol.toStringTag]: { value: "Module" }
 });
 let _takumi_rs_helpers = require("@takumi-rs/helpers");
+let _takumi_rs_helpers_renderer = require("@takumi-rs/helpers/renderer");
 //#region pkg/takumi_wasm.js
 /**
 * The main renderer for Takumi image rendering engine.
@@ -517,142 +518,83 @@ async function __wbg_init(module_or_path) {
 }
 //#endregion
 //#region src/export.ts
-async function resolveImageLoaders(images) {
-	const { sources = [], cache } = Array.isArray(images) ? { sources: images } : images;
-	const bySrc = /* @__PURE__ */ new Map();
-	for (const image of sources) bySrc.set(image.src, image);
-	return Promise.all([...bySrc.values()].map(async ({ src, data, cache: own }) => ({
-		src,
-		data: typeof data === "function" ? await data() : data,
-		cache: own ?? cache
-	})));
-}
 var Renderer = class {
-	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))];
-	}
+	fonts = new _takumi_rs_helpers_renderer.FontRegistry((font) => this.inner.registerFont(font));
 	async render(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts && (0, _takumi_rs_helpers.subsetFonts)({
+		const { fonts, fontFamilies, signal, images, ...rest } = options ?? {};
+		signal?.throwIfAborted();
+		const resolved = await this.fonts.resolveResources(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
 			source: node
-		}));
-		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
+		}), images, fontFamilies);
+		signal?.throwIfAborted();
 		return this.inner.render(node, {
 			...rest,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
+			...resolved
 		});
 	}
 	async renderAsDataUrl(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts && (0, _takumi_rs_helpers.subsetFonts)({
+		const { fonts, fontFamilies, signal, images, ...rest } = options ?? {};
+		signal?.throwIfAborted();
+		const resolved = await this.fonts.resolveResources(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
 			source: node
-		}));
-		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
+		}), images, fontFamilies);
+		signal?.throwIfAborted();
 		return this.inner.renderAsDataUrl(node, {
 			...rest,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
+			...resolved
 		});
 	}
 	async renderSvg(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts && (0, _takumi_rs_helpers.subsetFonts)({
+		const { fonts, fontFamilies, signal, images, ...rest } = options ?? {};
+		signal?.throwIfAborted();
+		const resolved = await this.fonts.resolveResources(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
 			source: node
-		}));
-		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
+		}), images, fontFamilies);
+		signal?.throwIfAborted();
 		return this.inner.renderSvg(node, {
 			...rest,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
+			...resolved
 		});
 	}
 	async measure(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts && (0, _takumi_rs_helpers.subsetFonts)({
+		const { fonts, fontFamilies, signal, images, ...rest } = options ?? {};
+		signal?.throwIfAborted();
+		const resolved = await this.fonts.resolveResources(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
 			source: node
-		}));
-		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
+		}), images, fontFamilies);
+		signal?.throwIfAborted();
 		return this.inner.measure(node, {
 			...rest,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
+			...resolved
 		});
 	}
 	async renderAnimation(options) {
-		const { fonts, fontFamilies, images, ...rest } = options;
+		const { fonts, fontFamilies, signal, images, ...rest } = options;
+		signal?.throwIfAborted();
 		const nodes = options.scenes.map((scene) => scene.node);
-		const registeredFamilies = await this.prepareFonts(fonts && (0, _takumi_rs_helpers.subsetFonts)({
+		const resolved = await this.fonts.resolveResources(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
 			source: nodes
-		}));
-		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
+		}), images, fontFamilies);
+		signal?.throwIfAborted();
 		return this.inner.renderAnimation({
 			...rest,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
+			...resolved
 		});
 	}
+	registerFont(font) {
+		return this.fonts.register(font);
+	}
+	/** Releases the underlying wasm renderer's memory. */
 	free() {
 		this.inner.free();
 	}
-	async registerFont(font) {
-		const loader = typeof font === "string" ? (0, _takumi_rs_helpers.fontFromUrl)(font) : font;
-		const key = createFontKey(loader);
-		const cached = this.getFont(key);
-		if (cached) return cached;
-		const extracted = extractFontBuffer(loader);
-		const register = (data) => this.inner.registerFont(isBuffer(loader) ? data : {
-			...loader,
-			data
-		});
-		if (isBuffer(extracted)) {
-			const binded = register(extracted);
-			this.setFont(key, Promise.resolve(binded));
-			return binded;
-		}
-		const promise = extracted.then(register).catch((error) => {
-			this.deleteFont(key);
-			throw error;
-		});
-		this.setFont(key, promise);
-		return promise;
-	}
 };
-function extractFontBuffer(font) {
-	if (isBuffer(font)) return font;
-	if (typeof font.data !== "function") return font.data;
-	return font.data();
-}
-function createFontKey(font) {
-	if (isBuffer(font)) return font;
-	if ("key" in font && font.key) return font.key;
-	if (typeof font.data === "function") return `${font.name ?? ""}:${font.weight ?? ""}:${font.style ?? ""}`;
-	return font.data;
-}
-function isBuffer(data) {
-	return data instanceof Uint8Array || data instanceof ArrayBuffer || typeof Buffer !== "undefined" && Buffer.isBuffer(data);
-}
 //#endregion
 exports.Renderer = Renderer;
 exports.default = __wbg_init;

package/dist/export.d.cts

@@ -1,5 +1,6 @@
 import { ContainerNode, ImageNode, Node, Node as Node$1, NodeMetadata, TextNode } from "@takumi-rs/helpers";
 import { Properties } from "csstype";
+import { AnimationOutputFormatOptions, AnimationOutputFormatOptions as AnimationOutputFormatOptions$1, FontLoader, FontLoader as FontLoader$1, ImageLoader, ImagesInput, ImagesInput as ImagesInput$1, OutputFormatOptions, OutputFormatOptions as OutputFormatOptions$1 } from "@takumi-rs/helpers/renderer";
 
 //#region pkg/takumi_wasm.d.ts
 type ByteBuf = Uint8Array | ArrayBuffer | Buffer;
@@ -12,6 +13,14 @@ type KeyframesRuleList = {
   }[];
 }[];
 type Keyframes = KeyframesMap | KeyframesRuleList;
+/** Output format for static images. */
+type OutputFormat = "png" | "jpeg" | "webp" | "ico" | "raw";
+/** Output format for animated images. */
+type AnimationOutputFormat = "webp" | "apng" | "gif";
+/** The output dithering algorithm. */
+type DitheringAlgorithm = "none" | "ordered-bayer" | "floyd-steinberg";
+/** Cache policy for a decoded image. Defaults to `"auto"`. */
+type ImageCacheMode = "auto" | "none";
 type RenderOptions$1 = {
   /**
    * The width of the image. If not provided, the width will be automatically calculated based on the content.
@@ -25,11 +34,17 @@ type RenderOptions$1 = {
    * The format of the image.
    * @default "png"
    */
-  format?: "png" | "jpeg" | "webp" | "ico" | "raw";
+  format?: OutputFormat;
   /**
-   * The quality of JPEG format (0-100).
+   * The quality of lossy formats (0-100). For JPEG; on wasm, WebP is always
+   * lossless so this is ignored for WebP.
    */
   quality?: number;
+  /**
+   * Encode WebP losslessly. On wasm, WebP is always lossless, so this is
+   * accepted for parity with the native backend but has no effect.
+   */
+  lossless?: boolean;
   /**
    * Images keyed by `src`, each carrying raw bytes. Provided up front and used
    * in place of fetching external `src` URLs during rendering.
@@ -60,26 +75,33 @@ type RenderOptions$1 = {
    * The output dithering algorithm.
    * @default "none"
    */
-  dithering?: "none" | "ordered-bayer" | "floyd-steinberg";
+  dithering?: DitheringAlgorithm;
   /**
    * Per-render font stack: ordered family names used as the fallback chain.
    * Defaults to all registered families in registration order.
    */
-  fontFamilies?: string[];
+  fontFamilies?: string[]; /** Default BCP-47 language applied to the root, inherited by nodes without their own lang. */
+  lang?: string;
 };
 /**
  * SVG is a vector format, so the raster-only knobs do not apply.
  */
-type SvgRenderOptions$1 = Omit<RenderOptions$1, "format" | "quality" | "drawDebugBorder" | "devicePixelRatio" | "dithering">;
+type SvgRenderOptions$1 = Omit<RenderOptions$1, "format" | "quality" | "lossless" | "drawDebugBorder" | "devicePixelRatio" | "dithering">;
 type RenderAnimationOptions$1 = {
   scenes: AnimationScene[];
   width: number;
   height: number;
-  format?: "webp" | "apng" | "gif";
+  format?: AnimationOutputFormat;
   /**
-   * The quality of WebP format (0-100). Ignored for APNG and GIF.
+   * The quality of lossy WebP (0-100). Ignored for APNG and GIF; on wasm, WebP
+   * is always lossless so this is ignored for WebP too.
    */
   quality?: number;
+  /**
+   * Encode WebP losslessly. On wasm, animated WebP is always lossless, so this
+   * is accepted for parity with the native backend but has no effect.
+   */
+  lossless?: boolean;
   /**
    * Images keyed by `src`, each carrying raw bytes. Provided up front and used
    * in place of fetching external `src` URLs during rendering.
@@ -103,7 +125,8 @@ type RenderAnimationOptions$1 = {
    * Per-render font stack: ordered family names used as the fallback chain.
    * Defaults to all registered families in registration order.
    */
-  fontFamilies?: string[];
+  fontFamilies?: string[]; /** Default BCP-47 language applied to the root, inherited by nodes without their own lang. */
+  lang?: string;
 };
 type FontDetails = {
   name?: string;
@@ -120,7 +143,7 @@ type FontDetails = {
 type ImageSource = {
   src: string;
   data: ByteBuf; /** Cache policy for the decoded image. Defaults to `"auto"`. */
-  cache?: "auto" | "none";
+  cache?: ImageCacheMode;
 };
 type KeyframeRule = {
   offsets: number[];
@@ -204,82 +227,32 @@ declare function __wbg_init(module_or_path?: {
 } | InitInput | Promise<InitInput>): Promise<InitOutput>;
 //#endregion
 //#region src/export.d.ts
-/**
- * A font to register. Either a URL string (fetched on demand, with name/weight/style read from the
- * file), raw bytes, or a descriptor with a lazy `data()` loader.
- */
-type FontLoader = string | Font | (Omit<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;
-} | {
-  name: string;
-}));
-type ImageLoaderData = ImageSource["data"];
-type ImageLoader = Omit<ImageSource, "data"> & {
-  data: ImageLoaderData | (() => ImageLoaderData | Promise<ImageLoaderData>);
-};
-/** Images for a render: pre-fetched entries, or a group with a decode-cache default. */
-type ImagesInput = ImageLoader[] | {
-  /** Pre-fetched entries, same as the array form. */sources?: ImageLoader[]; /** Decode-cache default for every image this render; a source's own `cache` wins. */
-  cache?: NonNullable<ImageLoader["cache"]>;
-};
-/**
- * Output format. Format-specific options live on the variant that supports them,
- * so `quality` cannot be paired with a lossless format. On wasm, WebP is always
- * lossless (lossy WebP is native-only).
- */
-type OutputFormatOptions = {
-  format?: "png";
-} | {
-  format: "jpeg";
-  quality?: number;
-} | {
-  format: "webp";
-} | {
-  format: "ico";
-} | {
-  format: "raw";
-};
-type RenderOptions = Omit<RenderOptions$1, "images" | "format" | "quality"> & OutputFormatOptions & {
-  fonts?: FontLoader[];
-  images?: ImagesInput;
-};
-/**
- * Animation output format. On wasm, WebP animation is always lossless (lossy
- * WebP is native-only).
- */
-type AnimationOutputFormatOptions = {
-  format?: "webp";
-} | {
-  format: "apng";
-} | {
-  format: "gif";
+type RenderOptions = Omit<RenderOptions$1, "images" | "format" | "quality" | "lossless"> & OutputFormatOptions$1 & {
+  fonts?: FontLoader$1[];
+  signal?: AbortSignal;
+  images?: ImagesInput$1;
 };
-type RenderAnimationOptions = Omit<RenderAnimationOptions$1, "images" | "format"> & AnimationOutputFormatOptions & {
-  fonts?: FontLoader[];
-  images?: ImagesInput;
+type RenderAnimationOptions = Omit<RenderAnimationOptions$1, "images" | "format" | "quality" | "lossless"> & AnimationOutputFormatOptions$1 & {
+  fonts?: FontLoader$1[];
+  signal?: AbortSignal;
+  images?: ImagesInput$1;
 };
 type SvgRenderOptions = Omit<SvgRenderOptions$1, "images"> & {
-  fonts?: FontLoader[];
-  images?: ImagesInput;
+  fonts?: FontLoader$1[];
+  signal?: AbortSignal;
+  images?: ImagesInput$1;
 };
 declare class Renderer {
-  private fontsByKey;
-  private fontsByData;
   private inner;
-  private getFont;
-  private setFont;
-  private deleteFont;
-  private prepareFonts;
+  private fonts;
   render(node: Node, options?: RenderOptions): Promise<Uint8Array<ArrayBufferLike>>;
   renderAsDataUrl(node: Node, options?: RenderOptions): Promise<string>;
   renderSvg(node: Node, options?: SvgRenderOptions): Promise<string>;
   measure(node: Node, options?: RenderOptions): Promise<MeasuredNode>;
   renderAnimation(options: RenderAnimationOptions): Promise<Uint8Array<ArrayBufferLike>>;
+  registerFont(font: FontLoader$1): any;
+  /** Releases the underlying wasm renderer's memory. */
   free(): void;
-  registerFont(font: FontLoader): Promise<RegisteredFamily[]>;
 }
 //#endregion
-export { AnimationOutputFormatOptions, AnimationScene, ByteBuf, ContainerNode, Font, FontDetails, FontLoader, ImageLoader, ImageNode, ImageSource, ImagesInput, 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, initSync };
+export { AnimationOutputFormat, type AnimationOutputFormatOptions, AnimationScene, ByteBuf, ContainerNode, DitheringAlgorithm, Font, FontDetails, type FontLoader, ImageCacheMode, type ImageLoader, ImageNode, ImageSource, type ImagesInput, InitInput, InitOutput, KeyframeRule, Keyframes, KeyframesMap, KeyframesRule, KeyframesRuleList, MeasuredNode, MeasuredTextRun, type Node, NodeMetadata, OutputFormat, type OutputFormatOptions, RegisteredFace, RegisteredFamily, RenderAnimationOptions, RenderOptions, Renderer, SvgRenderOptions, SyncInitInput, TextNode, __wbg_init as default, initSync };

package/dist/export.d.mts

@@ -1,4 +1,5 @@
 import { ContainerNode, ImageNode, Node, Node as Node$1, NodeMetadata, TextNode } from "@takumi-rs/helpers";
+import { AnimationOutputFormatOptions, AnimationOutputFormatOptions as AnimationOutputFormatOptions$1, FontLoader, FontLoader as FontLoader$1, ImageLoader, ImagesInput, ImagesInput as ImagesInput$1, OutputFormatOptions, OutputFormatOptions as OutputFormatOptions$1 } from "@takumi-rs/helpers/renderer";
 import { Properties } from "csstype";
 
 //#region pkg/takumi_wasm.d.ts
@@ -12,6 +13,14 @@ type KeyframesRuleList = {
   }[];
 }[];
 type Keyframes = KeyframesMap | KeyframesRuleList;
+/** Output format for static images. */
+type OutputFormat = "png" | "jpeg" | "webp" | "ico" | "raw";
+/** Output format for animated images. */
+type AnimationOutputFormat = "webp" | "apng" | "gif";
+/** The output dithering algorithm. */
+type DitheringAlgorithm = "none" | "ordered-bayer" | "floyd-steinberg";
+/** Cache policy for a decoded image. Defaults to `"auto"`. */
+type ImageCacheMode = "auto" | "none";
 type RenderOptions$1 = {
   /**
    * The width of the image. If not provided, the width will be automatically calculated based on the content.
@@ -25,11 +34,17 @@ type RenderOptions$1 = {
    * The format of the image.
    * @default "png"
    */
-  format?: "png" | "jpeg" | "webp" | "ico" | "raw";
+  format?: OutputFormat;
   /**
-   * The quality of JPEG format (0-100).
+   * The quality of lossy formats (0-100). For JPEG; on wasm, WebP is always
+   * lossless so this is ignored for WebP.
    */
   quality?: number;
+  /**
+   * Encode WebP losslessly. On wasm, WebP is always lossless, so this is
+   * accepted for parity with the native backend but has no effect.
+   */
+  lossless?: boolean;
   /**
    * Images keyed by `src`, each carrying raw bytes. Provided up front and used
    * in place of fetching external `src` URLs during rendering.
@@ -60,26 +75,33 @@ type RenderOptions$1 = {
    * The output dithering algorithm.
    * @default "none"
    */
-  dithering?: "none" | "ordered-bayer" | "floyd-steinberg";
+  dithering?: DitheringAlgorithm;
   /**
    * Per-render font stack: ordered family names used as the fallback chain.
    * Defaults to all registered families in registration order.
    */
-  fontFamilies?: string[];
+  fontFamilies?: string[]; /** Default BCP-47 language applied to the root, inherited by nodes without their own lang. */
+  lang?: string;
 };
 /**
  * SVG is a vector format, so the raster-only knobs do not apply.
  */
-type SvgRenderOptions$1 = Omit<RenderOptions$1, "format" | "quality" | "drawDebugBorder" | "devicePixelRatio" | "dithering">;
+type SvgRenderOptions$1 = Omit<RenderOptions$1, "format" | "quality" | "lossless" | "drawDebugBorder" | "devicePixelRatio" | "dithering">;
 type RenderAnimationOptions$1 = {
   scenes: AnimationScene[];
   width: number;
   height: number;
-  format?: "webp" | "apng" | "gif";
+  format?: AnimationOutputFormat;
   /**
-   * The quality of WebP format (0-100). Ignored for APNG and GIF.
+   * The quality of lossy WebP (0-100). Ignored for APNG and GIF; on wasm, WebP
+   * is always lossless so this is ignored for WebP too.
    */
   quality?: number;
+  /**
+   * Encode WebP losslessly. On wasm, animated WebP is always lossless, so this
+   * is accepted for parity with the native backend but has no effect.
+   */
+  lossless?: boolean;
   /**
    * Images keyed by `src`, each carrying raw bytes. Provided up front and used
    * in place of fetching external `src` URLs during rendering.
@@ -103,7 +125,8 @@ type RenderAnimationOptions$1 = {
    * Per-render font stack: ordered family names used as the fallback chain.
    * Defaults to all registered families in registration order.
    */
-  fontFamilies?: string[];
+  fontFamilies?: string[]; /** Default BCP-47 language applied to the root, inherited by nodes without their own lang. */
+  lang?: string;
 };
 type FontDetails = {
   name?: string;
@@ -120,7 +143,7 @@ type FontDetails = {
 type ImageSource = {
   src: string;
   data: ByteBuf; /** Cache policy for the decoded image. Defaults to `"auto"`. */
-  cache?: "auto" | "none";
+  cache?: ImageCacheMode;
 };
 type KeyframeRule = {
   offsets: number[];
@@ -204,82 +227,32 @@ declare function __wbg_init(module_or_path?: {
 } | InitInput | Promise<InitInput>): Promise<InitOutput>;
 //#endregion
 //#region src/export.d.ts
-/**
- * A font to register. Either a URL string (fetched on demand, with name/weight/style read from the
- * file), raw bytes, or a descriptor with a lazy `data()` loader.
- */
-type FontLoader = string | Font | (Omit<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;
-} | {
-  name: string;
-}));
-type ImageLoaderData = ImageSource["data"];
-type ImageLoader = Omit<ImageSource, "data"> & {
-  data: ImageLoaderData | (() => ImageLoaderData | Promise<ImageLoaderData>);
-};
-/** Images for a render: pre-fetched entries, or a group with a decode-cache default. */
-type ImagesInput = ImageLoader[] | {
-  /** Pre-fetched entries, same as the array form. */sources?: ImageLoader[]; /** Decode-cache default for every image this render; a source's own `cache` wins. */
-  cache?: NonNullable<ImageLoader["cache"]>;
-};
-/**
- * Output format. Format-specific options live on the variant that supports them,
- * so `quality` cannot be paired with a lossless format. On wasm, WebP is always
- * lossless (lossy WebP is native-only).
- */
-type OutputFormatOptions = {
-  format?: "png";
-} | {
-  format: "jpeg";
-  quality?: number;
-} | {
-  format: "webp";
-} | {
-  format: "ico";
-} | {
-  format: "raw";
-};
-type RenderOptions = Omit<RenderOptions$1, "images" | "format" | "quality"> & OutputFormatOptions & {
-  fonts?: FontLoader[];
-  images?: ImagesInput;
-};
-/**
- * Animation output format. On wasm, WebP animation is always lossless (lossy
- * WebP is native-only).
- */
-type AnimationOutputFormatOptions = {
-  format?: "webp";
-} | {
-  format: "apng";
-} | {
-  format: "gif";
+type RenderOptions = Omit<RenderOptions$1, "images" | "format" | "quality" | "lossless"> & OutputFormatOptions$1 & {
+  fonts?: FontLoader$1[];
+  signal?: AbortSignal;
+  images?: ImagesInput$1;
 };
-type RenderAnimationOptions = Omit<RenderAnimationOptions$1, "images" | "format"> & AnimationOutputFormatOptions & {
-  fonts?: FontLoader[];
-  images?: ImagesInput;
+type RenderAnimationOptions = Omit<RenderAnimationOptions$1, "images" | "format" | "quality" | "lossless"> & AnimationOutputFormatOptions$1 & {
+  fonts?: FontLoader$1[];
+  signal?: AbortSignal;
+  images?: ImagesInput$1;
 };
 type SvgRenderOptions = Omit<SvgRenderOptions$1, "images"> & {
-  fonts?: FontLoader[];
-  images?: ImagesInput;
+  fonts?: FontLoader$1[];
+  signal?: AbortSignal;
+  images?: ImagesInput$1;
 };
 declare class Renderer {
-  private fontsByKey;
-  private fontsByData;
   private inner;
-  private getFont;
-  private setFont;
-  private deleteFont;
-  private prepareFonts;
+  private fonts;
   render(node: Node, options?: RenderOptions): Promise<Uint8Array<ArrayBufferLike>>;
   renderAsDataUrl(node: Node, options?: RenderOptions): Promise<string>;
   renderSvg(node: Node, options?: SvgRenderOptions): Promise<string>;
   measure(node: Node, options?: RenderOptions): Promise<MeasuredNode>;
   renderAnimation(options: RenderAnimationOptions): Promise<Uint8Array<ArrayBufferLike>>;
+  registerFont(font: FontLoader$1): any;
+  /** Releases the underlying wasm renderer's memory. */
   free(): void;
-  registerFont(font: FontLoader): Promise<RegisteredFamily[]>;
 }
 //#endregion
-export { AnimationOutputFormatOptions, AnimationScene, ByteBuf, ContainerNode, Font, FontDetails, FontLoader, ImageLoader, ImageNode, ImageSource, ImagesInput, 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, initSync };
+export { AnimationOutputFormat, type AnimationOutputFormatOptions, AnimationScene, ByteBuf, ContainerNode, DitheringAlgorithm, Font, FontDetails, type FontLoader, ImageCacheMode, type ImageLoader, ImageNode, ImageSource, type ImagesInput, InitInput, InitOutput, KeyframeRule, Keyframes, KeyframesMap, KeyframesRule, KeyframesRuleList, MeasuredNode, MeasuredTextRun, type Node, NodeMetadata, OutputFormat, type OutputFormatOptions, RegisteredFace, RegisteredFamily, RenderAnimationOptions, RenderOptions, Renderer, SvgRenderOptions, SyncInitInput, TextNode, __wbg_init as default, initSync };

package/dist/export.mjs

@@ -1,4 +1,5 @@
-import { fontFromUrl, subsetFonts } from "@takumi-rs/helpers";
+import { subsetFonts } from "@takumi-rs/helpers";
+import { FontRegistry } from "@takumi-rs/helpers/renderer";
 //#region pkg/takumi_wasm.js
 /**
 * The main renderer for Takumi image rendering engine.
@@ -513,141 +514,82 @@ async function __wbg_init(module_or_path) {
 }
 //#endregion
 //#region src/export.ts
-async function resolveImageLoaders(images) {
-	const { sources = [], cache } = Array.isArray(images) ? { sources: images } : images;
-	const bySrc = /* @__PURE__ */ new Map();
-	for (const image of sources) bySrc.set(image.src, image);
-	return Promise.all([...bySrc.values()].map(async ({ src, data, cache: own }) => ({
-		src,
-		data: typeof data === "function" ? await data() : data,
-		cache: own ?? cache
-	})));
-}
 var Renderer = class {
-	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))];
-	}
+	fonts = new FontRegistry((font) => this.inner.registerFont(font));
 	async render(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts && subsetFonts({
+		const { fonts, fontFamilies, signal, images, ...rest } = options ?? {};
+		signal?.throwIfAborted();
+		const resolved = await this.fonts.resolveResources(fonts && subsetFonts({
 			fonts,
 			source: node
-		}));
-		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
+		}), images, fontFamilies);
+		signal?.throwIfAborted();
 		return this.inner.render(node, {
 			...rest,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
+			...resolved
 		});
 	}
 	async renderAsDataUrl(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts && subsetFonts({
+		const { fonts, fontFamilies, signal, images, ...rest } = options ?? {};
+		signal?.throwIfAborted();
+		const resolved = await this.fonts.resolveResources(fonts && subsetFonts({
 			fonts,
 			source: node
-		}));
-		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
+		}), images, fontFamilies);
+		signal?.throwIfAborted();
 		return this.inner.renderAsDataUrl(node, {
 			...rest,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
+			...resolved
 		});
 	}
 	async renderSvg(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts && subsetFonts({
+		const { fonts, fontFamilies, signal, images, ...rest } = options ?? {};
+		signal?.throwIfAborted();
+		const resolved = await this.fonts.resolveResources(fonts && subsetFonts({
 			fonts,
 			source: node
-		}));
-		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
+		}), images, fontFamilies);
+		signal?.throwIfAborted();
 		return this.inner.renderSvg(node, {
 			...rest,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
+			...resolved
 		});
 	}
 	async measure(node, options) {
-		const { fonts, fontFamilies, images, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(fonts && subsetFonts({
+		const { fonts, fontFamilies, signal, images, ...rest } = options ?? {};
+		signal?.throwIfAborted();
+		const resolved = await this.fonts.resolveResources(fonts && subsetFonts({
 			fonts,
 			source: node
-		}));
-		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
+		}), images, fontFamilies);
+		signal?.throwIfAborted();
 		return this.inner.measure(node, {
 			...rest,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
+			...resolved
 		});
 	}
 	async renderAnimation(options) {
-		const { fonts, fontFamilies, images, ...rest } = options;
+		const { fonts, fontFamilies, signal, images, ...rest } = options;
+		signal?.throwIfAborted();
 		const nodes = options.scenes.map((scene) => scene.node);
-		const registeredFamilies = await this.prepareFonts(fonts && subsetFonts({
+		const resolved = await this.fonts.resolveResources(fonts && subsetFonts({
 			fonts,
 			source: nodes
-		}));
-		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
+		}), images, fontFamilies);
+		signal?.throwIfAborted();
 		return this.inner.renderAnimation({
 			...rest,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
+			...resolved
 		});
 	}
+	registerFont(font) {
+		return this.fonts.register(font);
+	}
+	/** Releases the underlying wasm renderer's memory. */
 	free() {
 		this.inner.free();
 	}
-	async registerFont(font) {
-		const loader = typeof font === "string" ? fontFromUrl(font) : font;
-		const key = createFontKey(loader);
-		const cached = this.getFont(key);
-		if (cached) return cached;
-		const extracted = extractFontBuffer(loader);
-		const register = (data) => this.inner.registerFont(isBuffer(loader) ? data : {
-			...loader,
-			data
-		});
-		if (isBuffer(extracted)) {
-			const binded = register(extracted);
-			this.setFont(key, Promise.resolve(binded));
-			return binded;
-		}
-		const promise = extracted.then(register).catch((error) => {
-			this.deleteFont(key);
-			throw error;
-		});
-		this.setFont(key, promise);
-		return promise;
-	}
 };
-function extractFontBuffer(font) {
-	if (isBuffer(font)) return font;
-	if (typeof font.data !== "function") return font.data;
-	return font.data();
-}
-function createFontKey(font) {
-	if (isBuffer(font)) return font;
-	if ("key" in font && font.key) return font.key;
-	if (typeof font.data === "function") return `${font.name ?? ""}:${font.weight ?? ""}:${font.style ?? ""}`;
-	return font.data;
-}
-function isBuffer(data) {
-	return data instanceof Uint8Array || data instanceof ArrayBuffer || typeof Buffer !== "undefined" && Buffer.isBuffer(data);
-}
 //#endregion
 export { Renderer, __wbg_init as default, initSync };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takumi-rs/wasm",
-  "version": "2.0.0-rc.4",
+  "version": "2.0.0-rc.6",
   "keywords": [
     "css",
     "image",
@@ -116,7 +116,7 @@
     "publish-lint": "attw --pack . && publint --strict ."
   },
   "dependencies": {
-    "@takumi-rs/helpers": "2.0.0-rc.1",
+    "@takumi-rs/helpers": "2.0.0-rc.6",
     "csstype": "^3.2.3"
   },
   "devDependencies": {