@takumi-rs/wasm 2.0.0-beta.8 → 2.0.0-rc.0

package/bundlers/bun.mjs

@@ -1,9 +1,9 @@
-import * as wasm from "../dist/export";
+import * as wasm from "../dist/export.mjs";
 import wasmPath from "../pkg/takumi_wasm_bg.wasm";
 
 const wasmBytes = await Bun.file(new URL(wasmPath, import.meta.url)).arrayBuffer();
 
 wasm.initSync({ module: wasmBytes });
 
-export * from "../dist/export";
+export * from "../dist/export.mjs";
 export default wasm.default;

package/bundlers/node.mjs

@@ -1,9 +1,9 @@
 import { readFileSync } from "node:fs";
-import * as wasm from "../dist/export";
+import * as wasm from "../dist/export.mjs";
 
 const wasmBytes = readFileSync(new URL("../pkg/takumi_wasm_bg.wasm", import.meta.url));
 
 wasm.initSync({ module: wasmBytes });
 
-export * from "../dist/export";
+export * from "../dist/export.mjs";
 export default wasm.default;

package/dist/export.cjs

@@ -23,21 +23,6 @@ var Renderer$1 = class {
 		wasm.__wbg_renderer_free(ptr, 0);
 	}
 	/**
-	* Encodes a precomputed frame sequence into an animated image buffer.
-	* @param {AnimationFrameSource[]} frames
-	* @param {EncodeFramesOptions} options
-	* @returns {Uint8Array}
-	*/
-	encodeFrames(frames, options) {
-		const ptr0 = passArrayJsValueToWasm0(frames, wasm.__wbindgen_malloc);
-		const len0 = WASM_VECTOR_LEN;
-		const ret = wasm.renderer_encodeFrames(this.__wbg_ptr, ptr0, len0, options);
-		if (ret[3]) throw takeFromExternrefTable0(ret[2]);
-		var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-		wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
-		return v2;
-	}
-	/**
 	* Measures a node tree and returns layout information.
 	* @param {Node} node
 	* @param {RenderOptions | null} [options]
@@ -152,10 +137,10 @@ function __wbg_get_imports() {
 		__proto__: null,
 		"./takumi_wasm_bg.js": {
 			__proto__: null,
-			__wbg_Error_fdd633d4bb5dd76a: function(arg0, arg1) {
+			__wbg_Error_92b29b0548f8b746: function(arg0, arg1) {
 				return Error(getStringFromWasm0(arg0, arg1));
 			},
-			__wbg_Number_c4bdf66bb78f7977: function(arg0) {
+			__wbg_Number_9a4e0ecb0fa16705: function(arg0) {
 				return Number(arg0);
 			},
 			__wbg_String_8564e559799eccda: function(arg0, arg1) {
@@ -164,55 +149,55 @@ function __wbg_get_imports() {
 				getDataViewMemory0().setInt32(arg0 + 4, len1, true);
 				getDataViewMemory0().setInt32(arg0 + 0, ptr1, true);
 			},
-			__wbg___wbindgen_bigint_get_as_i64_d9e915702856f831: function(arg0, arg1) {
+			__wbg___wbindgen_bigint_get_as_i64_d968e41184ae354f: function(arg0, arg1) {
 				const v = arg1;
 				const ret = typeof v === "bigint" ? v : void 0;
 				getDataViewMemory0().setBigInt64(arg0 + 8, isLikeNone(ret) ? BigInt(0) : ret, true);
 				getDataViewMemory0().setInt32(arg0 + 0, !isLikeNone(ret), true);
 			},
-			__wbg___wbindgen_boolean_get_edaed31a367ce1bd: function(arg0) {
+			__wbg___wbindgen_boolean_get_fa956cfa2d1bd751: function(arg0) {
 				const v = arg0;
 				const ret = typeof v === "boolean" ? v : void 0;
 				return isLikeNone(ret) ? 16777215 : ret ? 1 : 0;
 			},
-			__wbg___wbindgen_debug_string_8a447059637473e2: function(arg0, arg1) {
+			__wbg___wbindgen_debug_string_c25d447a39f5578f: function(arg0, arg1) {
 				const ptr1 = passStringToWasm0(debugString(arg1), wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
 				const len1 = WASM_VECTOR_LEN;
 				getDataViewMemory0().setInt32(arg0 + 4, len1, true);
 				getDataViewMemory0().setInt32(arg0 + 0, ptr1, true);
 			},
-			__wbg___wbindgen_in_4990f46af709e33c: function(arg0, arg1) {
+			__wbg___wbindgen_in_aca499c5de7ff5e5: function(arg0, arg1) {
 				return arg0 in arg1;
 			},
-			__wbg___wbindgen_is_bigint_90b5ccfe67c78460: function(arg0) {
+			__wbg___wbindgen_is_bigint_2f76dc55065b4273: function(arg0) {
 				return typeof arg0 === "bigint";
 			},
-			__wbg___wbindgen_is_function_acc5528be2b923f2: function(arg0) {
+			__wbg___wbindgen_is_function_1ff95bcc5517c252: function(arg0) {
 				return typeof arg0 === "function";
 			},
-			__wbg___wbindgen_is_object_0beba4a1980d3eea: function(arg0) {
+			__wbg___wbindgen_is_object_a27215656b807791: function(arg0) {
 				const val = arg0;
 				return typeof val === "object" && val !== null;
 			},
-			__wbg___wbindgen_is_string_1fca8072260dd261: function(arg0) {
+			__wbg___wbindgen_is_string_ea5e6cc2e4141dfe: function(arg0) {
 				return typeof arg0 === "string";
 			},
-			__wbg___wbindgen_is_undefined_721f8decd50c87a3: function(arg0) {
+			__wbg___wbindgen_is_undefined_c05833b95a3cf397: function(arg0) {
 				return arg0 === void 0;
 			},
-			__wbg___wbindgen_jsval_eq_4e8c38722cb8ff51: function(arg0, arg1) {
+			__wbg___wbindgen_jsval_eq_e659fcf7b0e32763: function(arg0, arg1) {
 				return arg0 === arg1;
 			},
-			__wbg___wbindgen_jsval_loose_eq_4b9aba9e5b3c4582: function(arg0, arg1) {
+			__wbg___wbindgen_jsval_loose_eq_db4c3b15f63fc170: function(arg0, arg1) {
 				return arg0 == arg1;
 			},
-			__wbg___wbindgen_number_get_1cc01dd708740256: function(arg0, arg1) {
+			__wbg___wbindgen_number_get_394265ed1e1b84ee: function(arg0, arg1) {
 				const obj = arg1;
 				const ret = typeof obj === "number" ? obj : void 0;
 				getDataViewMemory0().setFloat64(arg0 + 8, isLikeNone(ret) ? 0 : ret, true);
 				getDataViewMemory0().setInt32(arg0 + 0, !isLikeNone(ret), true);
 			},
-			__wbg___wbindgen_string_get_71bb4348194e31f0: function(arg0, arg1) {
+			__wbg___wbindgen_string_get_b0ca35b86a603356: function(arg0, arg1) {
 				const obj = arg1;
 				const ret = typeof obj === "string" ? obj : void 0;
 				var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -220,35 +205,35 @@ function __wbg_get_imports() {
 				getDataViewMemory0().setInt32(arg0 + 4, len1, true);
 				getDataViewMemory0().setInt32(arg0 + 0, ptr1, true);
 			},
-			__wbg___wbindgen_throw_ea4887a5f8f9a9db: function(arg0, arg1) {
+			__wbg___wbindgen_throw_344f42d3211c4765: function(arg0, arg1) {
 				throw new Error(getStringFromWasm0(arg0, arg1));
 			},
-			__wbg_call_8e98ed2f3c86c4b5: function() {
+			__wbg_call_8a2dd23819f8a60a: function() {
 				return handleError(function(arg0, arg1) {
 					return arg0.call(arg1);
 				}, arguments);
 			},
-			__wbg_done_b62d4a7d2286852a: function(arg0) {
+			__wbg_done_89b2b13e91a60321: function(arg0) {
 				return arg0.done;
 			},
-			__wbg_entries_c261c3fa1f281256: function(arg0) {
+			__wbg_entries_015dc610cd81ede0: function(arg0) {
 				return Object.entries(arg0);
 			},
-			__wbg_get_197a3fe98f169e38: function(arg0, arg1) {
+			__wbg_get_507a50627bffa49b: function(arg0, arg1) {
 				return arg0[arg1 >>> 0];
 			},
-			__wbg_get_9a29be2cb383ed9a: function() {
+			__wbg_get_c7eb1f358a7654df: function() {
 				return handleError(function(arg0, arg1) {
 					return Reflect.get(arg0, arg1);
 				}, arguments);
 			},
-			__wbg_get_unchecked_54a4374c38e08460: function(arg0, arg1) {
+			__wbg_get_unchecked_6e0ad6d2a41b06f6: function(arg0, arg1) {
 				return arg0[arg1 >>> 0];
 			},
 			__wbg_get_with_ref_key_6412cf3094599694: function(arg0, arg1) {
 				return arg0[arg1];
 			},
-			__wbg_instanceof_ArrayBuffer_2a7bb09fee70c2da: function(arg0) {
+			__wbg_instanceof_ArrayBuffer_4480b9e0068a8adb: function(arg0) {
 				let result;
 				try {
 					result = arg0 instanceof ArrayBuffer;
@@ -257,7 +242,7 @@ function __wbg_get_imports() {
 				}
 				return result;
 			},
-			__wbg_instanceof_Map_afa18d5840c04c15: function(arg0) {
+			__wbg_instanceof_Map_e5b5e3db98422fcc: function(arg0) {
 				let result;
 				try {
 					result = arg0 instanceof Map;
@@ -266,7 +251,7 @@ function __wbg_get_imports() {
 				}
 				return result;
 			},
-			__wbg_instanceof_Uint8Array_f080092dc70f5d58: function(arg0) {
+			__wbg_instanceof_Uint8Array_309b927aaf7a3fc7: function(arg0) {
 				let result;
 				try {
 					result = arg0 instanceof Uint8Array;
@@ -275,51 +260,51 @@ function __wbg_get_imports() {
 				}
 				return result;
 			},
-			__wbg_isArray_145a34fd0a38d37b: function(arg0) {
+			__wbg_isArray_0677c962b281d01a: function(arg0) {
 				return Array.isArray(arg0);
 			},
-			__wbg_isSafeInteger_a3389a198582f5f6: function(arg0) {
+			__wbg_isSafeInteger_04f36e4056f1b851: function(arg0) {
 				return Number.isSafeInteger(arg0);
 			},
-			__wbg_iterator_cc47ba25a2be735a: function() {
+			__wbg_iterator_6f722e4a93058b71: function() {
 				return Symbol.iterator;
 			},
-			__wbg_length_589238bdcf171f0e: function(arg0) {
+			__wbg_length_1f0964f4a5e2c6d8: function(arg0) {
 				return arg0.length;
 			},
-			__wbg_length_c6054974c0a6cdb9: function(arg0) {
+			__wbg_length_370319915dc99107: function(arg0) {
 				return arg0.length;
 			},
-			__wbg_new_2e117a478906f062: function() {
-				return /* @__PURE__ */ new Object();
-			},
-			__wbg_new_36e147a8ced3c6e0: function() {
+			__wbg_new_32b398fb48b6d94a: function() {
 				return new Array();
 			},
-			__wbg_new_81880fb5002cb255: function(arg0) {
+			__wbg_new_b667d279fd5aa943: function(arg0, arg1) {
+				return new Error(getStringFromWasm0(arg0, arg1));
+			},
+			__wbg_new_cd45aabdf6073e84: function(arg0) {
 				return new Uint8Array(arg0);
 			},
-			__wbg_new_e66a4b7758dd2e5c: function(arg0, arg1) {
-				return new Error(getStringFromWasm0(arg0, arg1));
+			__wbg_new_da52cf8fe3429cb2: function() {
+				return /* @__PURE__ */ new Object();
+			},
+			__wbg_next_6dbf2c0ac8cde20f: function(arg0) {
+				return arg0.next;
 			},
-			__wbg_next_0c4066e251d2eff9: function() {
+			__wbg_next_71f2aa1cb3d1e37e: function() {
 				return handleError(function(arg0) {
 					return arg0.next();
 				}, arguments);
 			},
-			__wbg_next_402fa10b59ab20c3: function(arg0) {
-				return arg0.next;
-			},
-			__wbg_prototypesetcall_d721637c7ca66eb8: function(arg0, arg1, arg2) {
+			__wbg_prototypesetcall_4770620bbe4688a0: function(arg0, arg1, arg2) {
 				Uint8Array.prototype.set.call(getArrayU8FromWasm0(arg0, arg1), arg2);
 			},
 			__wbg_set_6be42768c690e380: function(arg0, arg1, arg2) {
 				arg0[arg1] = arg2;
 			},
-			__wbg_set_dc601f4a69da0bc2: function(arg0, arg1, arg2) {
+			__wbg_set_8a16b38e4805b298: function(arg0, arg1, arg2) {
 				arg0[arg1 >>> 0] = arg2;
 			},
-			__wbg_value_49f783bb59765962: function(arg0) {
+			__wbg_value_a5d5488a9589444a: function(arg0) {
 				return arg0.value;
 			},
 			__wbindgen_cast_0000000000000001: function(arg0) {
@@ -334,11 +319,6 @@ function __wbg_get_imports() {
 			__wbindgen_cast_0000000000000004: function(arg0) {
 				return BigInt.asUintN(64, arg0);
 			},
-			__wbindgen_cast_0000000000000005: function(arg0, arg1) {
-				var v0 = getArrayJsValueFromWasm0(arg0, arg1).slice();
-				wasm.__wbindgen_free(arg0, arg1 * 4, 4);
-				return v0;
-			},
 			__wbindgen_init_externref_table: function() {
 				const table = wasm.__wbindgen_externrefs;
 				const offset = table.grow(4);
@@ -394,14 +374,6 @@ function debugString(val) {
 	if (val instanceof Error) return `${val.name}: ${val.message}\n${val.stack}`;
 	return className;
 }
-function getArrayJsValueFromWasm0(ptr, len) {
-	ptr = ptr >>> 0;
-	const mem = getDataViewMemory0();
-	const result = [];
-	for (let i = ptr; i < ptr + 4 * len; i += 4) result.push(wasm.__wbindgen_externrefs.get(mem.getUint32(i, true)));
-	wasm.__externref_drop_slice(ptr, len);
-	return result;
-}
 function getArrayU8FromWasm0(ptr, len) {
 	ptr = ptr >>> 0;
 	return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
@@ -430,15 +402,6 @@ function handleError(f, args) {
 function isLikeNone(x) {
 	return x === void 0 || x === null;
 }
-function passArrayJsValueToWasm0(array, malloc) {
-	const ptr = malloc(array.length * 4, 4) >>> 0;
-	for (let i = 0; i < array.length; i++) {
-		const add = addToExternrefTable0(array[i]);
-		getDataViewMemory0().setUint32(ptr + 4 * i, add, true);
-	}
-	WASM_VECTOR_LEN = array.length;
-	return ptr;
-}
 function passStringToWasm0(arg, malloc, realloc) {
 	if (realloc === void 0) {
 		const buf = cachedTextEncoder.encode(arg);
@@ -654,31 +617,17 @@ var Renderer = class {
 			fontFamilies: fontFamilies ?? registeredFamilies
 		});
 	}
-	async encodeFrames(frames, options) {
-		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,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
-		});
-	}
 	free() {
 		this.inner.free();
 	}
 	async registerFont(font) {
-		const key = createFontKey(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(font);
-		const register = (data) => this.inner.registerFont(isBuffer(font) ? data : {
-			...font,
+		const extracted = extractFontBuffer(loader);
+		const register = (data) => this.inner.registerFont(isBuffer(loader) ? data : {
+			...loader,
 			data
 		});
 		if (isBuffer(extracted)) {

package/dist/export.d.cts

@@ -105,35 +105,6 @@ type RenderAnimationOptions$1 = {
    */
   fontFamilies?: string[];
 };
-type EncodeFramesOptions$1 = {
-  width: number;
-  height: number;
-  format?: "webp" | "apng" | "gif";
-  /**
-   * The quality of WebP format (0-100). Ignored for APNG and GIF.
-   */
-  quality?: number;
-  /**
-   * Images keyed by `src`, each carrying raw bytes. Provided up front and used
-   * in place of fetching external `src` URLs during rendering.
-   */
-  images?: ImageSource[];
-  drawDebugBorder?: boolean;
-  /**
-   * CSS stylesheets to apply before rendering.
-   */
-  stylesheets?: string[];
-  /**
-   * Defines the ratio resolution of the image to the physical pixels.
-   * @default 1.0
-   */
-  devicePixelRatio?: number;
-  /**
-   * Per-render font stack: ordered family names used as the fallback chain.
-   * Defaults to all registered families in registration order.
-   */
-  fontFamilies?: string[];
-};
 type FontDetails = {
   name?: string;
   data: ByteBuf;
@@ -184,10 +155,6 @@ type MeasuredNode = {
   children: MeasuredNode[];
   runs: MeasuredTextRun[];
 };
-type AnimationFrameSource = {
-  node: Node$1;
-  durationMs: number;
-};
 type AnimationSceneSource = {
   node: Node$1;
   durationMs: number;
@@ -196,7 +163,6 @@ type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Modul
 interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly __wbg_renderer_free: (a: number, b: number) => void;
-  readonly renderer_encodeFrames: (a: number, b: number, c: number, d: any) => [number, number, number, number];
   readonly renderer_measure: (a: number, b: any, c: number) => [number, number, number];
   readonly renderer_new: () => [number, number, number];
   readonly renderer_registerFont: (a: number, b: any) => [number, number, number];
@@ -209,9 +175,8 @@ interface InitOutput {
   readonly __wbindgen_exn_store: (a: number) => void;
   readonly __externref_table_alloc: () => number;
   readonly __wbindgen_externrefs: WebAssembly.Table;
-  readonly __externref_drop_slice: (a: number, b: number) => void;
-  readonly __wbindgen_free: (a: number, b: number, c: number) => void;
   readonly __externref_table_dealloc: (a: number) => void;
+  readonly __wbindgen_free: (a: number, b: number, c: number) => void;
   readonly __wbindgen_start: () => void;
 }
 type SyncInitInput = BufferSource | WebAssembly.Module;
@@ -239,7 +204,11 @@ declare function __wbg_init(module_or_path?: {
 } | InitInput | Promise<InitInput>): Promise<InitOutput>;
 //#endregion
 //#region src/export.d.ts
-type FontLoader = Font | (Omit<FontDetails, "data"> & {
+/**
+ * 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][];
 } & ({
@@ -289,11 +258,6 @@ type RenderAnimationOptions = Omit<RenderAnimationOptions$1, "images" | "format"
   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[]; /** Register only the `fonts` subsets the content renders. @default true */
-  subset?: boolean;
-};
 type SvgRenderOptions = Omit<SvgRenderOptions$1, "images"> & {
   fonts?: FontLoader[];
   images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
@@ -312,9 +276,8 @@ declare class Renderer {
   renderSvg(node: Node, options?: SvgRenderOptions): Promise<string>;
   measure(node: Node, options?: RenderOptions): Promise<MeasuredNode>;
   renderAnimation(options: RenderAnimationOptions): Promise<Uint8Array<ArrayBufferLike>>;
-  encodeFrames(frames: AnimationFrameSource[], options: EncodeFramesOptions): Promise<Uint8Array<ArrayBufferLike>>;
   free(): void;
   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 };
+export { AnimationOutputFormatOptions, AnimationSceneSource, ByteBuf, ContainerNode, 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

@@ -105,35 +105,6 @@ type RenderAnimationOptions$1 = {
    */
   fontFamilies?: string[];
 };
-type EncodeFramesOptions$1 = {
-  width: number;
-  height: number;
-  format?: "webp" | "apng" | "gif";
-  /**
-   * The quality of WebP format (0-100). Ignored for APNG and GIF.
-   */
-  quality?: number;
-  /**
-   * Images keyed by `src`, each carrying raw bytes. Provided up front and used
-   * in place of fetching external `src` URLs during rendering.
-   */
-  images?: ImageSource[];
-  drawDebugBorder?: boolean;
-  /**
-   * CSS stylesheets to apply before rendering.
-   */
-  stylesheets?: string[];
-  /**
-   * Defines the ratio resolution of the image to the physical pixels.
-   * @default 1.0
-   */
-  devicePixelRatio?: number;
-  /**
-   * Per-render font stack: ordered family names used as the fallback chain.
-   * Defaults to all registered families in registration order.
-   */
-  fontFamilies?: string[];
-};
 type FontDetails = {
   name?: string;
   data: ByteBuf;
@@ -184,10 +155,6 @@ type MeasuredNode = {
   children: MeasuredNode[];
   runs: MeasuredTextRun[];
 };
-type AnimationFrameSource = {
-  node: Node$1;
-  durationMs: number;
-};
 type AnimationSceneSource = {
   node: Node$1;
   durationMs: number;
@@ -196,7 +163,6 @@ type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Modul
 interface InitOutput {
   readonly memory: WebAssembly.Memory;
   readonly __wbg_renderer_free: (a: number, b: number) => void;
-  readonly renderer_encodeFrames: (a: number, b: number, c: number, d: any) => [number, number, number, number];
   readonly renderer_measure: (a: number, b: any, c: number) => [number, number, number];
   readonly renderer_new: () => [number, number, number];
   readonly renderer_registerFont: (a: number, b: any) => [number, number, number];
@@ -209,9 +175,8 @@ interface InitOutput {
   readonly __wbindgen_exn_store: (a: number) => void;
   readonly __externref_table_alloc: () => number;
   readonly __wbindgen_externrefs: WebAssembly.Table;
-  readonly __externref_drop_slice: (a: number, b: number) => void;
-  readonly __wbindgen_free: (a: number, b: number, c: number) => void;
   readonly __externref_table_dealloc: (a: number) => void;
+  readonly __wbindgen_free: (a: number, b: number, c: number) => void;
   readonly __wbindgen_start: () => void;
 }
 type SyncInitInput = BufferSource | WebAssembly.Module;
@@ -239,7 +204,11 @@ declare function __wbg_init(module_or_path?: {
 } | InitInput | Promise<InitInput>): Promise<InitOutput>;
 //#endregion
 //#region src/export.d.ts
-type FontLoader = Font | (Omit<FontDetails, "data"> & {
+/**
+ * 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][];
 } & ({
@@ -289,11 +258,6 @@ type RenderAnimationOptions = Omit<RenderAnimationOptions$1, "images" | "format"
   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[]; /** Register only the `fonts` subsets the content renders. @default true */
-  subset?: boolean;
-};
 type SvgRenderOptions = Omit<SvgRenderOptions$1, "images"> & {
   fonts?: FontLoader[];
   images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
@@ -312,9 +276,8 @@ declare class Renderer {
   renderSvg(node: Node, options?: SvgRenderOptions): Promise<string>;
   measure(node: Node, options?: RenderOptions): Promise<MeasuredNode>;
   renderAnimation(options: RenderAnimationOptions): Promise<Uint8Array<ArrayBufferLike>>;
-  encodeFrames(frames: AnimationFrameSource[], options: EncodeFramesOptions): Promise<Uint8Array<ArrayBufferLike>>;
   free(): void;
   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 };
+export { AnimationOutputFormatOptions, AnimationSceneSource, ByteBuf, ContainerNode, 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, pickFonts } from "@takumi-rs/helpers";
+import { extractResourceUrls, fontFromUrl, pickFonts } from "@takumi-rs/helpers";
 //#region pkg/takumi_wasm.js
 /**
 * The main renderer for Takumi image rendering engine.
@@ -19,21 +19,6 @@ var Renderer$1 = class {
 		wasm.__wbg_renderer_free(ptr, 0);
 	}
 	/**
-	* Encodes a precomputed frame sequence into an animated image buffer.
-	* @param {AnimationFrameSource[]} frames
-	* @param {EncodeFramesOptions} options
-	* @returns {Uint8Array}
-	*/
-	encodeFrames(frames, options) {
-		const ptr0 = passArrayJsValueToWasm0(frames, wasm.__wbindgen_malloc);
-		const len0 = WASM_VECTOR_LEN;
-		const ret = wasm.renderer_encodeFrames(this.__wbg_ptr, ptr0, len0, options);
-		if (ret[3]) throw takeFromExternrefTable0(ret[2]);
-		var v2 = getArrayU8FromWasm0(ret[0], ret[1]).slice();
-		wasm.__wbindgen_free(ret[0], ret[1] * 1, 1);
-		return v2;
-	}
-	/**
 	* Measures a node tree and returns layout information.
 	* @param {Node} node
 	* @param {RenderOptions | null} [options]
@@ -148,10 +133,10 @@ function __wbg_get_imports() {
 		__proto__: null,
 		"./takumi_wasm_bg.js": {
 			__proto__: null,
-			__wbg_Error_fdd633d4bb5dd76a: function(arg0, arg1) {
+			__wbg_Error_92b29b0548f8b746: function(arg0, arg1) {
 				return Error(getStringFromWasm0(arg0, arg1));
 			},
-			__wbg_Number_c4bdf66bb78f7977: function(arg0) {
+			__wbg_Number_9a4e0ecb0fa16705: function(arg0) {
 				return Number(arg0);
 			},
 			__wbg_String_8564e559799eccda: function(arg0, arg1) {
@@ -160,55 +145,55 @@ function __wbg_get_imports() {
 				getDataViewMemory0().setInt32(arg0 + 4, len1, true);
 				getDataViewMemory0().setInt32(arg0 + 0, ptr1, true);
 			},
-			__wbg___wbindgen_bigint_get_as_i64_d9e915702856f831: function(arg0, arg1) {
+			__wbg___wbindgen_bigint_get_as_i64_d968e41184ae354f: function(arg0, arg1) {
 				const v = arg1;
 				const ret = typeof v === "bigint" ? v : void 0;
 				getDataViewMemory0().setBigInt64(arg0 + 8, isLikeNone(ret) ? BigInt(0) : ret, true);
 				getDataViewMemory0().setInt32(arg0 + 0, !isLikeNone(ret), true);
 			},
-			__wbg___wbindgen_boolean_get_edaed31a367ce1bd: function(arg0) {
+			__wbg___wbindgen_boolean_get_fa956cfa2d1bd751: function(arg0) {
 				const v = arg0;
 				const ret = typeof v === "boolean" ? v : void 0;
 				return isLikeNone(ret) ? 16777215 : ret ? 1 : 0;
 			},
-			__wbg___wbindgen_debug_string_8a447059637473e2: function(arg0, arg1) {
+			__wbg___wbindgen_debug_string_c25d447a39f5578f: function(arg0, arg1) {
 				const ptr1 = passStringToWasm0(debugString(arg1), wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
 				const len1 = WASM_VECTOR_LEN;
 				getDataViewMemory0().setInt32(arg0 + 4, len1, true);
 				getDataViewMemory0().setInt32(arg0 + 0, ptr1, true);
 			},
-			__wbg___wbindgen_in_4990f46af709e33c: function(arg0, arg1) {
+			__wbg___wbindgen_in_aca499c5de7ff5e5: function(arg0, arg1) {
 				return arg0 in arg1;
 			},
-			__wbg___wbindgen_is_bigint_90b5ccfe67c78460: function(arg0) {
+			__wbg___wbindgen_is_bigint_2f76dc55065b4273: function(arg0) {
 				return typeof arg0 === "bigint";
 			},
-			__wbg___wbindgen_is_function_acc5528be2b923f2: function(arg0) {
+			__wbg___wbindgen_is_function_1ff95bcc5517c252: function(arg0) {
 				return typeof arg0 === "function";
 			},
-			__wbg___wbindgen_is_object_0beba4a1980d3eea: function(arg0) {
+			__wbg___wbindgen_is_object_a27215656b807791: function(arg0) {
 				const val = arg0;
 				return typeof val === "object" && val !== null;
 			},
-			__wbg___wbindgen_is_string_1fca8072260dd261: function(arg0) {
+			__wbg___wbindgen_is_string_ea5e6cc2e4141dfe: function(arg0) {
 				return typeof arg0 === "string";
 			},
-			__wbg___wbindgen_is_undefined_721f8decd50c87a3: function(arg0) {
+			__wbg___wbindgen_is_undefined_c05833b95a3cf397: function(arg0) {
 				return arg0 === void 0;
 			},
-			__wbg___wbindgen_jsval_eq_4e8c38722cb8ff51: function(arg0, arg1) {
+			__wbg___wbindgen_jsval_eq_e659fcf7b0e32763: function(arg0, arg1) {
 				return arg0 === arg1;
 			},
-			__wbg___wbindgen_jsval_loose_eq_4b9aba9e5b3c4582: function(arg0, arg1) {
+			__wbg___wbindgen_jsval_loose_eq_db4c3b15f63fc170: function(arg0, arg1) {
 				return arg0 == arg1;
 			},
-			__wbg___wbindgen_number_get_1cc01dd708740256: function(arg0, arg1) {
+			__wbg___wbindgen_number_get_394265ed1e1b84ee: function(arg0, arg1) {
 				const obj = arg1;
 				const ret = typeof obj === "number" ? obj : void 0;
 				getDataViewMemory0().setFloat64(arg0 + 8, isLikeNone(ret) ? 0 : ret, true);
 				getDataViewMemory0().setInt32(arg0 + 0, !isLikeNone(ret), true);
 			},
-			__wbg___wbindgen_string_get_71bb4348194e31f0: function(arg0, arg1) {
+			__wbg___wbindgen_string_get_b0ca35b86a603356: function(arg0, arg1) {
 				const obj = arg1;
 				const ret = typeof obj === "string" ? obj : void 0;
 				var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_malloc, wasm.__wbindgen_realloc);
@@ -216,35 +201,35 @@ function __wbg_get_imports() {
 				getDataViewMemory0().setInt32(arg0 + 4, len1, true);
 				getDataViewMemory0().setInt32(arg0 + 0, ptr1, true);
 			},
-			__wbg___wbindgen_throw_ea4887a5f8f9a9db: function(arg0, arg1) {
+			__wbg___wbindgen_throw_344f42d3211c4765: function(arg0, arg1) {
 				throw new Error(getStringFromWasm0(arg0, arg1));
 			},
-			__wbg_call_8e98ed2f3c86c4b5: function() {
+			__wbg_call_8a2dd23819f8a60a: function() {
 				return handleError(function(arg0, arg1) {
 					return arg0.call(arg1);
 				}, arguments);
 			},
-			__wbg_done_b62d4a7d2286852a: function(arg0) {
+			__wbg_done_89b2b13e91a60321: function(arg0) {
 				return arg0.done;
 			},
-			__wbg_entries_c261c3fa1f281256: function(arg0) {
+			__wbg_entries_015dc610cd81ede0: function(arg0) {
 				return Object.entries(arg0);
 			},
-			__wbg_get_197a3fe98f169e38: function(arg0, arg1) {
+			__wbg_get_507a50627bffa49b: function(arg0, arg1) {
 				return arg0[arg1 >>> 0];
 			},
-			__wbg_get_9a29be2cb383ed9a: function() {
+			__wbg_get_c7eb1f358a7654df: function() {
 				return handleError(function(arg0, arg1) {
 					return Reflect.get(arg0, arg1);
 				}, arguments);
 			},
-			__wbg_get_unchecked_54a4374c38e08460: function(arg0, arg1) {
+			__wbg_get_unchecked_6e0ad6d2a41b06f6: function(arg0, arg1) {
 				return arg0[arg1 >>> 0];
 			},
 			__wbg_get_with_ref_key_6412cf3094599694: function(arg0, arg1) {
 				return arg0[arg1];
 			},
-			__wbg_instanceof_ArrayBuffer_2a7bb09fee70c2da: function(arg0) {
+			__wbg_instanceof_ArrayBuffer_4480b9e0068a8adb: function(arg0) {
 				let result;
 				try {
 					result = arg0 instanceof ArrayBuffer;
@@ -253,7 +238,7 @@ function __wbg_get_imports() {
 				}
 				return result;
 			},
-			__wbg_instanceof_Map_afa18d5840c04c15: function(arg0) {
+			__wbg_instanceof_Map_e5b5e3db98422fcc: function(arg0) {
 				let result;
 				try {
 					result = arg0 instanceof Map;
@@ -262,7 +247,7 @@ function __wbg_get_imports() {
 				}
 				return result;
 			},
-			__wbg_instanceof_Uint8Array_f080092dc70f5d58: function(arg0) {
+			__wbg_instanceof_Uint8Array_309b927aaf7a3fc7: function(arg0) {
 				let result;
 				try {
 					result = arg0 instanceof Uint8Array;
@@ -271,51 +256,51 @@ function __wbg_get_imports() {
 				}
 				return result;
 			},
-			__wbg_isArray_145a34fd0a38d37b: function(arg0) {
+			__wbg_isArray_0677c962b281d01a: function(arg0) {
 				return Array.isArray(arg0);
 			},
-			__wbg_isSafeInteger_a3389a198582f5f6: function(arg0) {
+			__wbg_isSafeInteger_04f36e4056f1b851: function(arg0) {
 				return Number.isSafeInteger(arg0);
 			},
-			__wbg_iterator_cc47ba25a2be735a: function() {
+			__wbg_iterator_6f722e4a93058b71: function() {
 				return Symbol.iterator;
 			},
-			__wbg_length_589238bdcf171f0e: function(arg0) {
+			__wbg_length_1f0964f4a5e2c6d8: function(arg0) {
 				return arg0.length;
 			},
-			__wbg_length_c6054974c0a6cdb9: function(arg0) {
+			__wbg_length_370319915dc99107: function(arg0) {
 				return arg0.length;
 			},
-			__wbg_new_2e117a478906f062: function() {
-				return /* @__PURE__ */ new Object();
-			},
-			__wbg_new_36e147a8ced3c6e0: function() {
+			__wbg_new_32b398fb48b6d94a: function() {
 				return new Array();
 			},
-			__wbg_new_81880fb5002cb255: function(arg0) {
+			__wbg_new_b667d279fd5aa943: function(arg0, arg1) {
+				return new Error(getStringFromWasm0(arg0, arg1));
+			},
+			__wbg_new_cd45aabdf6073e84: function(arg0) {
 				return new Uint8Array(arg0);
 			},
-			__wbg_new_e66a4b7758dd2e5c: function(arg0, arg1) {
-				return new Error(getStringFromWasm0(arg0, arg1));
+			__wbg_new_da52cf8fe3429cb2: function() {
+				return /* @__PURE__ */ new Object();
+			},
+			__wbg_next_6dbf2c0ac8cde20f: function(arg0) {
+				return arg0.next;
 			},
-			__wbg_next_0c4066e251d2eff9: function() {
+			__wbg_next_71f2aa1cb3d1e37e: function() {
 				return handleError(function(arg0) {
 					return arg0.next();
 				}, arguments);
 			},
-			__wbg_next_402fa10b59ab20c3: function(arg0) {
-				return arg0.next;
-			},
-			__wbg_prototypesetcall_d721637c7ca66eb8: function(arg0, arg1, arg2) {
+			__wbg_prototypesetcall_4770620bbe4688a0: function(arg0, arg1, arg2) {
 				Uint8Array.prototype.set.call(getArrayU8FromWasm0(arg0, arg1), arg2);
 			},
 			__wbg_set_6be42768c690e380: function(arg0, arg1, arg2) {
 				arg0[arg1] = arg2;
 			},
-			__wbg_set_dc601f4a69da0bc2: function(arg0, arg1, arg2) {
+			__wbg_set_8a16b38e4805b298: function(arg0, arg1, arg2) {
 				arg0[arg1 >>> 0] = arg2;
 			},
-			__wbg_value_49f783bb59765962: function(arg0) {
+			__wbg_value_a5d5488a9589444a: function(arg0) {
 				return arg0.value;
 			},
 			__wbindgen_cast_0000000000000001: function(arg0) {
@@ -330,11 +315,6 @@ function __wbg_get_imports() {
 			__wbindgen_cast_0000000000000004: function(arg0) {
 				return BigInt.asUintN(64, arg0);
 			},
-			__wbindgen_cast_0000000000000005: function(arg0, arg1) {
-				var v0 = getArrayJsValueFromWasm0(arg0, arg1).slice();
-				wasm.__wbindgen_free(arg0, arg1 * 4, 4);
-				return v0;
-			},
 			__wbindgen_init_externref_table: function() {
 				const table = wasm.__wbindgen_externrefs;
 				const offset = table.grow(4);
@@ -390,14 +370,6 @@ function debugString(val) {
 	if (val instanceof Error) return `${val.name}: ${val.message}\n${val.stack}`;
 	return className;
 }
-function getArrayJsValueFromWasm0(ptr, len) {
-	ptr = ptr >>> 0;
-	const mem = getDataViewMemory0();
-	const result = [];
-	for (let i = ptr; i < ptr + 4 * len; i += 4) result.push(wasm.__wbindgen_externrefs.get(mem.getUint32(i, true)));
-	wasm.__externref_drop_slice(ptr, len);
-	return result;
-}
 function getArrayU8FromWasm0(ptr, len) {
 	ptr = ptr >>> 0;
 	return getUint8ArrayMemory0().subarray(ptr / 1, ptr / 1 + len);
@@ -426,15 +398,6 @@ function handleError(f, args) {
 function isLikeNone(x) {
 	return x === void 0 || x === null;
 }
-function passArrayJsValueToWasm0(array, malloc) {
-	const ptr = malloc(array.length * 4, 4) >>> 0;
-	for (let i = 0; i < array.length; i++) {
-		const add = addToExternrefTable0(array[i]);
-		getDataViewMemory0().setUint32(ptr + 4 * i, add, true);
-	}
-	WASM_VECTOR_LEN = array.length;
-	return ptr;
-}
 function passStringToWasm0(arg, malloc, realloc) {
 	if (realloc === void 0) {
 		const buf = cachedTextEncoder.encode(arg);
@@ -650,31 +613,17 @@ var Renderer = class {
 			fontFamilies: fontFamilies ?? registeredFamilies
 		});
 	}
-	async encodeFrames(frames, options) {
-		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,
-			images: resolvedImages,
-			fontFamilies: fontFamilies ?? registeredFamilies
-		});
-	}
 	free() {
 		this.inner.free();
 	}
 	async registerFont(font) {
-		const key = createFontKey(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(font);
-		const register = (data) => this.inner.registerFont(isBuffer(font) ? data : {
-			...font,
+		const extracted = extractFontBuffer(loader);
+		const register = (data) => this.inner.registerFont(isBuffer(loader) ? data : {
+			...loader,
 			data
 		});
 		if (isBuffer(extracted)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takumi-rs/wasm",
-  "version": "2.0.0-beta.8",
+  "version": "2.0.0-rc.0",
   "keywords": [
     "css",
     "image",
@@ -61,20 +61,47 @@
       }
     },
     "./auto": {
-      "types": "./bundlers/type.d.ts",
-      "bun": "./bundlers/bun.mjs",
-      "workerd": "./bundlers/workerd.js",
-      "unwasm": "./bundlers/next.mjs",
-      "module": "./bundlers/vite.mjs",
-      "node": "./bundlers/node.mjs",
-      "default": "./bundlers/vite.mjs"
+      "bun": {
+        "types": "./bundlers/bun.d.ts",
+        "default": "./bundlers/bun.mjs"
+      },
+      "workerd": {
+        "types": "./bundlers/wasm-module.d.ts",
+        "default": "./bundlers/workerd.js"
+      },
+      "edge-light": {
+        "types": "./bundlers/wasm-module.d.ts",
+        "default": "./bundlers/next.mjs"
+      },
+      "unwasm": {
+        "types": "./bundlers/wasm-module.d.ts",
+        "default": "./bundlers/next.mjs"
+      },
+      "module": {
+        "types": "./bundlers/vite.d.ts",
+        "default": "./bundlers/vite.mjs"
+      },
+      "node": {
+        "require": {
+          "types": "./bundlers/node.d.cts",
+          "default": "./bundlers/node.cjs"
+        },
+        "default": {
+          "types": "./bundlers/node.d.ts",
+          "default": "./bundlers/node.mjs"
+        }
+      },
+      "default": {
+        "types": "./bundlers/wasm-module.d.ts",
+        "default": "./bundlers/vite.mjs"
+      }
     },
     "./takumi_wasm_bg.wasm": {
       "types": "./pkg/takumi_wasm_bg.wasm.d.ts",
       "default": "./pkg/takumi_wasm_bg.wasm"
     },
     "./next": {
-      "types": "./bundlers/next.d.ts",
+      "types": "./bundlers/wasm-module.d.ts",
       "default": "./bundlers/next.mjs"
     },
     "./vite": {
@@ -83,19 +110,22 @@
     }
   },
   "scripts": {
-    "build": "wasm-pack build --no-pack --release --out-dir pkg --target web && bun build:js && bun scripts/patch-generated-loader.ts",
+    "build": "wasm-pack build --no-pack --release --out-dir pkg --target web && bun build:js",
     "build:js": "tsdown",
-    "build:debug": "wasm-pack build --no-pack --dev --out-dir pkg --target web && bun build:js && bun scripts/patch-generated-loader.ts",
+    "build:debug": "wasm-pack build --no-pack --dev --out-dir pkg --target web && bun build:js",
     "publish-lint": "attw --pack . && publint --strict ."
   },
   "dependencies": {
-    "@takumi-rs/helpers": "2.0.0-beta.8"
+    "@takumi-rs/helpers": "2.0.0-rc.0",
+    "csstype": "^3.2.3"
   },
   "devDependencies": {
     "@types/bun": "^1.3.14",
-    "csstype": "^3.2.3",
     "tsdown": "^0.22.3",
     "unrun": "^0.3.1"
   },
+  "engines": {
+    "node": ">=18"
+  },
   "readme": "README.md"
 }

package/pkg/takumi_wasm_bg.wasm.d.ts

@@ -2,7 +2,6 @@
 /* eslint-disable */
 export const memory: WebAssembly.Memory;
 export const __wbg_renderer_free: (a: number, b: number) => void;
-export const renderer_encodeFrames: (a: number, b: number, c: number, d: any) => [number, number, number, number];
 export const renderer_measure: (a: number, b: any, c: number) => [number, number, number];
 export const renderer_new: () => [number, number, number];
 export const renderer_registerFont: (a: number, b: any) => [number, number, number];
@@ -15,7 +14,6 @@ export const __wbindgen_realloc: (a: number, b: number, c: number, d: number) =>
 export const __wbindgen_exn_store: (a: number) => void;
 export const __externref_table_alloc: () => number;
 export const __wbindgen_externrefs: WebAssembly.Table;
-export const __externref_drop_slice: (a: number, b: number) => void;
-export const __wbindgen_free: (a: number, b: number, c: number) => void;
 export const __externref_table_dealloc: (a: number) => void;
+export const __wbindgen_free: (a: number, b: number, c: number) => void;
 export const __wbindgen_start: () => void;

package/bundlers/type.d.ts

@@ -1,3 +0,0 @@
-declare const wasmModule: WebAssembly.Module;
-
-export default wasmModule;