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

package/dist/export.cjs

@@ -518,12 +518,13 @@ 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 images) bySrc.set(image.src, image);
-	return Promise.all([...bySrc.values()].map(async ({ src, data, cache }) => ({
+	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
+		cache: own ?? cache
 	})));
 }
 var Renderer = class {
@@ -547,11 +548,10 @@ var Renderer = class {
 		return [...new Set(families.flat().map((f) => f.name))];
 	}
 	async render(node, options) {
-		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+		const { fonts, fontFamilies, images, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
-			source: node,
-			subset
+			source: node
 		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.render(node, {
@@ -561,11 +561,10 @@ var Renderer = class {
 		});
 	}
 	async renderAsDataUrl(node, options) {
-		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+		const { fonts, fontFamilies, images, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
-			source: node,
-			subset
+			source: node
 		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderAsDataUrl(node, {
@@ -575,11 +574,10 @@ var Renderer = class {
 		});
 	}
 	async renderSvg(node, options) {
-		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+		const { fonts, fontFamilies, images, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
-			source: node,
-			subset
+			source: node
 		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderSvg(node, {
@@ -589,11 +587,10 @@ var Renderer = class {
 		});
 	}
 	async measure(node, options) {
-		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+		const { fonts, fontFamilies, images, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
-			source: node,
-			subset
+			source: node
 		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.measure(node, {
@@ -603,12 +600,11 @@ var Renderer = class {
 		});
 	}
 	async renderAnimation(options) {
-		const { fonts, fontFamilies, images, subset, ...rest } = options;
+		const { fonts, fontFamilies, images, ...rest } = options;
 		const nodes = options.scenes.map((scene) => scene.node);
-		const registeredFamilies = await this.prepareFonts((0, _takumi_rs_helpers.pickFonts)({
+		const registeredFamilies = await this.prepareFonts(fonts && (0, _takumi_rs_helpers.subsetFonts)({
 			fonts,
-			source: nodes,
-			subset
+			source: nodes
 		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderAnimation({
@@ -660,5 +656,4 @@ function isBuffer(data) {
 //#endregion
 exports.Renderer = Renderer;
 exports.default = __wbg_init;
-exports.extractResourceUrls = _takumi_rs_helpers.extractResourceUrls;
 exports.initSync = initSync;

package/dist/export.d.cts

@@ -1,4 +1,4 @@
-import { ContainerNode, ImageNode, Node, Node as Node$1, NodeMetadata, TextNode, extractResourceUrls } from "@takumi-rs/helpers";
+import { ContainerNode, ImageNode, Node, Node as Node$1, NodeMetadata, TextNode } from "@takumi-rs/helpers";
 import { Properties } from "csstype";
 
 //#region pkg/takumi_wasm.d.ts
@@ -72,7 +72,7 @@ type RenderOptions$1 = {
  */
 type SvgRenderOptions$1 = Omit<RenderOptions$1, "format" | "quality" | "drawDebugBorder" | "devicePixelRatio" | "dithering">;
 type RenderAnimationOptions$1 = {
-  scenes: AnimationSceneSource[];
+  scenes: AnimationScene[];
   width: number;
   height: number;
   format?: "webp" | "apng" | "gif";
@@ -155,7 +155,7 @@ type MeasuredNode = {
   children: MeasuredNode[];
   runs: MeasuredTextRun[];
 };
-type AnimationSceneSource = {
+type AnimationScene = {
   node: Node$1;
   durationMs: number;
 };
@@ -220,6 +220,11 @@ 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
@@ -239,8 +244,7 @@ type OutputFormatOptions = {
 };
 type RenderOptions = Omit<RenderOptions$1, "images" | "format" | "quality"> & OutputFormatOptions & {
   fonts?: FontLoader[];
-  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
-  subset?: boolean;
+  images?: ImagesInput;
 };
 /**
  * Animation output format. On wasm, WebP animation is always lossless (lossy
@@ -255,13 +259,11 @@ type AnimationOutputFormatOptions = {
 };
 type RenderAnimationOptions = Omit<RenderAnimationOptions$1, "images" | "format"> & AnimationOutputFormatOptions & {
   fonts?: FontLoader[];
-  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
-  subset?: boolean;
+  images?: ImagesInput;
 };
 type SvgRenderOptions = Omit<SvgRenderOptions$1, "images"> & {
   fonts?: FontLoader[];
-  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
-  subset?: boolean;
+  images?: ImagesInput;
 };
 declare class Renderer {
   private fontsByKey;
@@ -280,4 +282,4 @@ declare class Renderer {
   registerFont(font: FontLoader): Promise<RegisteredFamily[]>;
 }
 //#endregion
-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 };
+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 };

package/dist/export.d.mts

@@ -1,4 +1,4 @@
-import { ContainerNode, ImageNode, Node, Node as Node$1, NodeMetadata, TextNode, extractResourceUrls } from "@takumi-rs/helpers";
+import { ContainerNode, ImageNode, Node, Node as Node$1, NodeMetadata, TextNode } from "@takumi-rs/helpers";
 import { Properties } from "csstype";
 
 //#region pkg/takumi_wasm.d.ts
@@ -72,7 +72,7 @@ type RenderOptions$1 = {
  */
 type SvgRenderOptions$1 = Omit<RenderOptions$1, "format" | "quality" | "drawDebugBorder" | "devicePixelRatio" | "dithering">;
 type RenderAnimationOptions$1 = {
-  scenes: AnimationSceneSource[];
+  scenes: AnimationScene[];
   width: number;
   height: number;
   format?: "webp" | "apng" | "gif";
@@ -155,7 +155,7 @@ type MeasuredNode = {
   children: MeasuredNode[];
   runs: MeasuredTextRun[];
 };
-type AnimationSceneSource = {
+type AnimationScene = {
   node: Node$1;
   durationMs: number;
 };
@@ -220,6 +220,11 @@ 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
@@ -239,8 +244,7 @@ type OutputFormatOptions = {
 };
 type RenderOptions = Omit<RenderOptions$1, "images" | "format" | "quality"> & OutputFormatOptions & {
   fonts?: FontLoader[];
-  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
-  subset?: boolean;
+  images?: ImagesInput;
 };
 /**
  * Animation output format. On wasm, WebP animation is always lossless (lossy
@@ -255,13 +259,11 @@ type AnimationOutputFormatOptions = {
 };
 type RenderAnimationOptions = Omit<RenderAnimationOptions$1, "images" | "format"> & AnimationOutputFormatOptions & {
   fonts?: FontLoader[];
-  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
-  subset?: boolean;
+  images?: ImagesInput;
 };
 type SvgRenderOptions = Omit<SvgRenderOptions$1, "images"> & {
   fonts?: FontLoader[];
-  images?: ImageLoader[]; /** Register only the `fonts` subsets the content renders. @default true */
-  subset?: boolean;
+  images?: ImagesInput;
 };
 declare class Renderer {
   private fontsByKey;
@@ -280,4 +282,4 @@ declare class Renderer {
   registerFont(font: FontLoader): Promise<RegisteredFamily[]>;
 }
 //#endregion
-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 };
+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 };

package/dist/export.mjs

@@ -1,4 +1,4 @@
-import { extractResourceUrls, fontFromUrl, pickFonts } from "@takumi-rs/helpers";
+import { fontFromUrl, subsetFonts } from "@takumi-rs/helpers";
 //#region pkg/takumi_wasm.js
 /**
 * The main renderer for Takumi image rendering engine.
@@ -514,12 +514,13 @@ 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 images) bySrc.set(image.src, image);
-	return Promise.all([...bySrc.values()].map(async ({ src, data, cache }) => ({
+	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
+		cache: own ?? cache
 	})));
 }
 var Renderer = class {
@@ -543,11 +544,10 @@ var Renderer = class {
 		return [...new Set(families.flat().map((f) => f.name))];
 	}
 	async render(node, options) {
-		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(pickFonts({
+		const { fonts, fontFamilies, images, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(fonts && subsetFonts({
 			fonts,
-			source: node,
-			subset
+			source: node
 		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.render(node, {
@@ -557,11 +557,10 @@ var Renderer = class {
 		});
 	}
 	async renderAsDataUrl(node, options) {
-		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(pickFonts({
+		const { fonts, fontFamilies, images, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(fonts && subsetFonts({
 			fonts,
-			source: node,
-			subset
+			source: node
 		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderAsDataUrl(node, {
@@ -571,11 +570,10 @@ var Renderer = class {
 		});
 	}
 	async renderSvg(node, options) {
-		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(pickFonts({
+		const { fonts, fontFamilies, images, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(fonts && subsetFonts({
 			fonts,
-			source: node,
-			subset
+			source: node
 		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderSvg(node, {
@@ -585,11 +583,10 @@ var Renderer = class {
 		});
 	}
 	async measure(node, options) {
-		const { fonts, fontFamilies, images, subset, ...rest } = options ?? {};
-		const registeredFamilies = await this.prepareFonts(pickFonts({
+		const { fonts, fontFamilies, images, ...rest } = options ?? {};
+		const registeredFamilies = await this.prepareFonts(fonts && subsetFonts({
 			fonts,
-			source: node,
-			subset
+			source: node
 		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.measure(node, {
@@ -599,12 +596,11 @@ var Renderer = class {
 		});
 	}
 	async renderAnimation(options) {
-		const { fonts, fontFamilies, images, subset, ...rest } = options;
+		const { fonts, fontFamilies, images, ...rest } = options;
 		const nodes = options.scenes.map((scene) => scene.node);
-		const registeredFamilies = await this.prepareFonts(pickFonts({
+		const registeredFamilies = await this.prepareFonts(fonts && subsetFonts({
 			fonts,
-			source: nodes,
-			subset
+			source: nodes
 		}));
 		const resolvedImages = images ? await resolveImageLoaders(images) : void 0;
 		return this.inner.renderAnimation({
@@ -654,4 +650,4 @@ function isBuffer(data) {
 	return data instanceof Uint8Array || data instanceof ArrayBuffer || typeof Buffer !== "undefined" && Buffer.isBuffer(data);
 }
 //#endregion
-export { Renderer, __wbg_init as default, extractResourceUrls, initSync };
+export { Renderer, __wbg_init as default, initSync };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@takumi-rs/wasm",
-  "version": "2.0.0-rc.2",
+  "version": "2.0.0-rc.4",
   "keywords": [
     "css",
     "image",