satoru-render 1.0.9 → 1.0.10

package/dist/workers-parent.js

@@ -250,14 +250,18 @@ let LogLevel = /* @__PURE__ */ function(LogLevel) {
 }({});
 //#endregion
 //#region src/core.ts
+const emojiUrl = "https://cdn.jsdelivr.net/npm/@fontsource/noto-color-emoji/files/noto-color-emoji-emoji-400-normal.woff2";
 const DEFAULT_FONT_MAP = {
 	"sans-serif": "https://fonts.googleapis.com/css2?family=Noto+Sans+JP",
 	serif: "https://fonts.googleapis.com/css2?family=Noto+Serif+JP",
 	monospace: "https://fonts.googleapis.com/css2?family=M+PLUS+1+Code",
 	cursive: "https://fonts.googleapis.com/css2?family=Yuji+Syuku",
 	fantasy: "https://fonts.googleapis.com/css2?family=Reggae+One",
-	emoji: "https://cdn.jsdelivr.net/npm/@fontsource/noto-color-emoji/files/noto-color-emoji-emoji-400-normal.woff2",
-	"Noto Color Emoji": "https://cdn.jsdelivr.net/npm/@fontsource/noto-color-emoji/files/noto-color-emoji-emoji-400-normal.woff2"
+	"Noto Color Emoji": emojiUrl,
+	emoji: emojiUrl,
+	"Noto Emoji": emojiUrl,
+	notocoloremoji: emojiUrl,
+	notoemoji: emojiUrl
 };
 /**
 * Parse unicode-range string into an array of [start, end] codepoint ranges.
@@ -455,6 +459,15 @@ var SatoruBase = class {
 	async destroyInstance(inst) {
 		(await this.getModule()).destroy_instance(inst);
 	}
+	async loadFont(name, data) {
+		const mod = await this.getModule();
+		const inst = mod.create_instance();
+		try {
+			mod.load_font(inst, name, data);
+		} finally {
+			mod.destroy_instance(inst);
+		}
+	}
 	async loadFallbackFont(data) {
 		const mod = await this.getModule();
 		const inst = mod.create_instance();
@@ -528,10 +541,6 @@ var SatoruBase = class {
 		const instancePtr = mod.create_instance();
 		mod.set_font_map(instancePtr, this.currentFontMap);
 		try {
-			if (fonts) for (const f of fonts) mod.load_font(instancePtr, f.name, f.data);
-			if (options.fallbackFonts) for (const data of options.fallbackFonts) mod.load_fallback_font(instancePtr, data);
-			if (images) for (const img of images) mod.load_image(instancePtr, img.name, img.url, img.width ?? 0, img.height ?? 0);
-			if (css) mod.scan_css(instancePtr, css);
 			const defaultResolver = (r) => this.resolveDefaultResource(r, baseUrl, options.userAgent);
 			const resolver = options.resolveResource ? async (r) => {
 				return await options.resolveResource(r, defaultResolver);
@@ -547,6 +556,20 @@ var SatoruBase = class {
 				}
 				return result;
 			};
+			if (this.currentFontMap["notocoloremoji"]) {
+				const emojiUrl = this.currentFontMap["notocoloremoji"];
+				const res = await cachedResolver({
+					type: "font",
+					url: emojiUrl,
+					name: "notocoloremoji"
+				});
+				if (res && res instanceof Uint8Array) mod.load_font(instancePtr, "notocoloremoji", res);
+				else if (res && "fonts" in res) for (const f of res.fonts) mod.load_font(instancePtr, "notocoloremoji", f.data);
+			}
+			if (fonts) for (const f of fonts) mod.load_font(instancePtr, f.name, f.data);
+			if (options.fallbackFonts) for (const data of options.fallbackFonts) mod.load_fallback_font(instancePtr, data);
+			if (images) for (const img of images) mod.load_image(instancePtr, img.name, img.url, img.width ?? 0, img.height ?? 0);
+			if (css) mod.scan_css(instancePtr, css);
 			const loadResourceData = (r, uint8) => {
 				if (r.type === "image" && typeof createImageBitmap !== "undefined" && typeof OffscreenCanvas !== "undefined") return (async () => {
 					try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "satoru-render",
-  "version": "1.0.9",
+  "version": "1.0.10",
   "description": "High-fidelity HTML/CSS to SVG/PNG/PDF converter running in WebAssembly",
   "type": "module",
   "main": "./dist/index.js",