@fontmin-rs/wasm 1.0.0 → 1.0.1

package/dist/index.d.mts

@@ -5,7 +5,11 @@ type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Modul
 declare function isWasmInitialized(): boolean;
 declare function initWasm(input?: InitInput): Promise<void>;
 //#endregion
-//#region src/diagnostics.d.ts
+//#region ../../packages/fontmin/src/runtime-neutral/diagnostics.d.ts
+/**
+ * Normalizes Rust bridge diagnostics without depending on a concrete runtime.
+ * Native and WASM adapters use this module to expose the same error contract.
+ */
 type FontminDiagnosticCode = 'fontmin::config' | 'fontmin::convert_failed' | 'fontmin::invalid_font' | 'fontmin::io' | 'fontmin::missing_glyph' | 'fontmin::napi_bridge_failed' | 'fontmin::plugin_failed' | 'fontmin::unsupported_format';
 declare class FontminDiagnosticError extends Error {
   readonly name = "FontminDiagnosticError";

package/dist/index.mjs

@@ -14,8 +14,13 @@ async function getWasmModule() {
 	return module;
 }
 async function initWasm(input) {
-	initialization ??= initializeWasm(input);
-	await initialization;
+	const attempt = initialization ??= initializeWasm(input);
+	try {
+		await attempt;
+	} catch (error) {
+		if (initialization === attempt) initialization = void 0;
+		throw error;
+	}
 }
 async function initializeWasm(input) {
 	const module = await import("./fontmin_wasm_core-C2e3XISU.mjs");
@@ -25,7 +30,7 @@ async function initializeWasm(input) {
 	return module;
 }
 //#endregion
-//#region src/diagnostics.ts
+//#region ../../packages/fontmin/src/runtime-neutral/diagnostics.ts
 const bridgeDiagnosticPattern = /^\[(?<code>fontmin::[a-z_]+)\] (?<message>[\s\S]+)$/u;
 var FontminDiagnosticError = class extends Error {
 	name = "FontminDiagnosticError";
@@ -35,27 +40,129 @@ var FontminDiagnosticError = class extends Error {
 		this.code = code;
 	}
 };
-function normalizeFontminDiagnostic(error) {
-	let message;
-	if (error instanceof Error) message = error.message;
-	else if (typeof error === "string") message = error;
-	const match = message?.match(bridgeDiagnosticPattern);
-	if (match === null || match === void 0) {
-		if (error instanceof Error) return error;
-		if (typeof error === "string") return new Error(error, { cause: error });
-		return new Error("fontmin-rs WASM operation failed", { cause: error });
+function createFontminDiagnostics(operationName) {
+	function normalizeFontminDiagnostic(error) {
+		let message;
+		if (error instanceof Error) message = error.message;
+		else if (typeof error === "string") message = error;
+		const match = message?.match(bridgeDiagnosticPattern);
+		if (match === null || match === void 0) {
+			if (error instanceof Error) return error;
+			if (typeof error === "string") return new Error(error, { cause: error });
+			return new Error(`${operationName} failed`, { cause: error });
+		}
+		const code = match.groups?.["code"];
+		const diagnosticMessage = match.groups?.["message"];
+		if (code === void 0 || diagnosticMessage === void 0) return new Error(`${operationName} returned an invalid diagnostic`, { cause: error });
+		return new FontminDiagnosticError(code, diagnosticMessage, { cause: error });
 	}
-	const code = match.groups?.["code"];
-	const diagnosticMessage = match.groups?.["message"];
-	if (code === void 0 || diagnosticMessage === void 0) return new Error("fontmin-rs WASM operation returned an invalid diagnostic", { cause: error });
-	return new FontminDiagnosticError(code, diagnosticMessage, { cause: error });
+	function withFontminDiagnostics(operation) {
+		try {
+			return operation();
+		} catch (error) {
+			throw normalizeFontminDiagnostic(error);
+		}
+	}
+	return {
+		normalizeFontminDiagnostic,
+		withFontminDiagnostics
+	};
 }
-function withFontminDiagnostics(operation) {
-	try {
-		return operation();
-	} catch (error) {
-		throw normalizeFontminDiagnostic(error);
+//#endregion
+//#region src/diagnostics.ts
+const { normalizeFontminDiagnostic, withFontminDiagnostics } = createFontminDiagnostics("fontmin-rs WASM operation");
+//#endregion
+//#region ../../packages/fontmin/src/runtime-neutral/optimize-policy.ts
+const FONT_CONVERSIONS = [
+	{
+		inputFormat: "otf",
+		name: "otf2ttf",
+		outputFormat: "ttf"
+	},
+	{
+		inputFormat: "svg",
+		name: "svg2ttf",
+		outputFormat: "ttf"
+	},
+	{
+		inputFormat: "ttf",
+		name: "ttf2eot",
+		outputFormat: "eot"
+	},
+	{
+		inputFormat: "ttf",
+		name: "ttf2svg",
+		outputFormat: "svg"
+	},
+	{
+		inputFormat: "ttf",
+		name: "ttf2woff",
+		outputFormat: "woff"
+	},
+	{
+		inputFormat: "ttf",
+		name: "ttf2woff2",
+		outputFormat: "woff2"
 	}
+];
+async function applyAssetTransform(assets, transform, context, normalize) {
+	const transformedAssets = [];
+	for (const asset of assets) {
+		const result = await transform(asset, context);
+		if (result === void 0) transformedAssets.push(asset);
+		else if (Array.isArray(result)) transformedAssets.push(...result.map((asset) => normalize(asset)));
+		else if (result !== null) transformedAssets.push(normalize(result));
+	}
+	return transformedAssets;
+}
+async function applyAssetConversion(assets, clone, convert) {
+	const primaryAssets = [];
+	const clonedAssets = [];
+	for (const asset of assets) {
+		const convertedAsset = await convert(asset);
+		if (convertedAsset === void 0) primaryAssets.push(asset);
+		else if (clone) {
+			primaryAssets.push(asset);
+			clonedAssets.push(convertedAsset);
+		} else primaryAssets.push(convertedAsset);
+	}
+	return clone ? [...primaryAssets, ...clonedAssets] : primaryAssets;
+}
+async function applyFontConversion(assets, pluginName, clone, formatOf, convert) {
+	const conversion = FONT_CONVERSIONS.find((candidate) => candidate.name === pluginName);
+	if (conversion === void 0) return;
+	return applyAssetConversion(assets, clone, (asset) => formatOf(asset) === conversion.inputFormat ? convert(asset, conversion) : void 0);
+}
+async function flatMapAssets(assets, transform) {
+	const transformedAssets = [];
+	for (const asset of assets) transformedAssets.push(...await transform(asset));
+	return transformedAssets;
+}
+function missingGlyphWarning(report) {
+	if (report.missing.length === 0) return;
+	const visible = report.missing.slice(0, 16).map((codePoint) => `U+${codePoint.toString(16).toUpperCase().padStart(4, "0")}`).join(", ");
+	const remaining = report.missing.length - 16;
+	return `missing glyphs for requested Unicode code points: ${visible}${remaining > 0 ? `, and ${remaining} more` : ""}`;
+}
+function normalizeDeliverySlices$1(values, options = {}) {
+	if (!Array.isArray(values)) throw new TypeError("unicode delivery slices must be an array");
+	if (values.length === 0) {
+		if (options.allowEmpty === true) return [];
+		throw new Error("unicode delivery slices must not be empty");
+	}
+	const names = /* @__PURE__ */ new Set();
+	return values.map((value, index) => {
+		if (typeof value !== "object" || value === null || Array.isArray(value)) throw new Error(`unicode delivery slice ${index + 1} must be an object`);
+		const { name, unicodeRanges } = value;
+		if (typeof name !== "string" || name.length === 0 || !/^[A-Za-z0-9_-]+$/u.test(name)) throw new Error(`unicode delivery slice ${index + 1} must have a name containing only letters, digits, hyphens, or underscores`);
+		if (names.has(name)) throw new Error(`unicode delivery slice name is duplicated: ${name}`);
+		if (!Array.isArray(unicodeRanges) || unicodeRanges.length === 0 || unicodeRanges.some((range) => typeof range !== "string" || range.length === 0)) throw new Error(`unicode delivery slice ${name} must include at least one Unicode range`);
+		names.add(name);
+		return {
+			name,
+			unicodeRanges: [...unicodeRanges]
+		};
+	});
 }
 //#endregion
 //#region src/native.ts
@@ -130,12 +237,6 @@ function coverageOptions(options) {
 	if (options.unicodes !== void 0) coverage.unicodes = options.unicodes;
 	return coverage;
 }
-function missingGlyphWarning(report) {
-	if (report.missing.length === 0) return;
-	const visible = report.missing.slice(0, 16).map((codepoint) => `U+${codepoint.toString(16).toUpperCase().padStart(4, "0")}`).join(", ");
-	const remaining = report.missing.length - 16;
-	return `missing glyphs for requested Unicode code points: ${visible}${remaining > 0 ? `, and ${remaining} more` : ""}`;
-}
 //#endregion
 //#region src/plugins.ts
 function plugin(name, options) {
@@ -163,21 +264,7 @@ function deliverySlices(slices) {
 	})) });
 }
 function normalizeDeliverySlices(options) {
-	const values = options.slices;
-	if (!Array.isArray(values) || values.length === 0) throw new Error("unicode delivery slices must not be empty");
-	const names = /* @__PURE__ */ new Set();
-	return values.map((value, index) => {
-		if (typeof value !== "object" || value === null || Array.isArray(value)) throw new Error(`unicode delivery slice ${index + 1} must be an object`);
-		const { name, unicodeRanges } = value;
-		if (typeof name !== "string" || name.length === 0 || !/^[A-Za-z0-9_-]+$/u.test(name)) throw new Error(`unicode delivery slice ${index + 1} must have a name containing only letters, digits, hyphens, or underscores`);
-		if (names.has(name)) throw new Error(`unicode delivery slice name is duplicated: ${name}`);
-		if (!Array.isArray(unicodeRanges) || unicodeRanges.length === 0 || unicodeRanges.some((range) => typeof range !== "string" || range.length === 0)) throw new Error(`unicode delivery slice ${name} must include at least one Unicode range`);
-		names.add(name);
-		return {
-			name,
-			unicodeRanges: [...unicodeRanges]
-		};
-	});
+	return normalizeDeliverySlices$1(options.slices);
 }
 function ttf2woff(options = {}) {
 	return plugin("ttf2woff", options);
@@ -256,30 +343,21 @@ async function optimizeBrowser(config) {
 	for (const plugin of config.plugins ?? []) {
 		if (plugin.name === "glyph") {
 			const options = optionsOf(plugin);
-			const subsetAssets = [];
-			for (const asset of assets) {
-				if (asset.format !== "ttf") {
-					subsetAssets.push(asset);
-					continue;
-				}
+			assets = await flatMapAssets(assets, async (asset) => {
+				if (asset.format !== "ttf") return [asset];
 				const subsetAsset = {
 					...asset,
 					contents: await subsetTtf(asset.contents, options)
 				};
-				subsetAssets.push(...options.clone === true ? [asset, subsetAsset] : [subsetAsset]);
-			}
-			assets = subsetAssets;
+				return options.clone === true ? [asset, subsetAsset] : [subsetAsset];
+			});
 			continue;
 		}
 		if (plugin.name === "unicodeSlices") {
 			const slices = normalizeDeliverySlices(optionsOf(plugin));
-			const slicedAssets = [];
-			for (const asset of assets) {
-				if (asset.format !== "ttf") {
-					slicedAssets.push(asset);
-					continue;
-				}
-				for (const slice of slices) slicedAssets.push({
+			assets = await flatMapAssets(assets, async (asset) => {
+				if (asset.format !== "ttf") return [asset];
+				return Promise.all(slices.map(async (slice) => ({
 					...asset,
 					contents: await subsetTtf(asset.contents, {
 						missingGlyphs: "ignore",
@@ -287,12 +365,12 @@ async function optimizeBrowser(config) {
 					}),
 					fileName: appendFileNameSuffix(asset.fileName, slice.name),
 					unicodeRanges: slice.unicodeRanges
-				});
-			}
-			assets = slicedAssets;
+				})));
+			});
 			continue;
 		}
 		if (plugin.name === "css") {
+			const options = optionsOf(plugin);
 			const css = await generateFontFaceCss(assets.filter((asset) => [
 				"eot",
 				"svg",
@@ -309,11 +387,17 @@ async function optimizeBrowser(config) {
 					...source,
 					unicodeRanges: asset.unicodeRanges
 				};
-			}), optionsOf(plugin));
-			const firstFont = assets.find((asset) => asset.format === "ttf");
+			}), options);
+			const firstFont = assets.find((asset) => [
+				"eot",
+				"svg",
+				"ttf",
+				"woff",
+				"woff2"
+			].includes(asset.format ?? ""));
 			if (firstFont !== void 0) assets.push({
 				contents: new TextEncoder().encode(css),
-				fileName: replaceExtension(firstFont.fileName, "css"),
+				fileName: replaceExtension(firstFont.fileName, options.target ?? "css"),
 				format: "css"
 			});
 			continue;
@@ -349,38 +433,22 @@ async function optimizeBrowser(config) {
 					});
 				}
 			};
-			const transformed = [];
-			for (const asset of assets) {
-				const result = await plugin.transform(asset, context);
-				if (result === null) continue;
-				if (result === void 0) transformed.push(asset);
-				else transformed.push(...(Array.isArray(result) ? result : [result]).map((asset) => formatAsset(asset)));
-			}
-			assets = [...transformed, ...emitted];
+			assets = [...await applyAssetTransform(assets, plugin.transform, context, formatAsset), ...emitted];
 			continue;
 		}
 		const clone = optionsOf(plugin).clone !== false;
-		const convertedAssets = [];
-		const additions = [];
-		for (const asset of assets) {
-			const convertedAsset = await convert(asset, plugin);
-			if (convertedAsset === void 0) convertedAssets.push(asset);
-			else if (clone) {
-				convertedAssets.push(asset);
-				additions.push(convertedAsset);
-			} else convertedAssets.push(convertedAsset);
-		}
-		assets = [...convertedAssets, ...additions];
+		const convertedAssets = await applyFontConversion(assets, plugin.name, clone, (asset) => asset.format, (asset, conversion) => convert(asset, plugin, conversion));
+		if (convertedAssets !== void 0) assets = convertedAssets;
 	}
 	return assets;
 }
-async function convert(asset, plugin) {
-	if (plugin.name === "ttf2woff" && asset.format === "ttf") return converted(asset, "woff", await ttfToWoff(asset.contents, optionsOf(plugin)));
-	if (plugin.name === "ttf2woff2" && asset.format === "ttf") return converted(asset, "woff2", await ttfToWoff2(asset.contents, optionsOf(plugin)));
-	if (plugin.name === "ttf2eot" && asset.format === "ttf") return converted(asset, "eot", await ttfToEot(asset.contents, optionsOf(plugin)));
-	if (plugin.name === "ttf2svg" && asset.format === "ttf") return converted(asset, "svg", new TextEncoder().encode(await ttfToSvg(asset.contents, optionsOf(plugin))));
-	if (plugin.name === "otf2ttf" && asset.format === "otf") return converted(asset, "ttf", await otfToTtf(asset.contents, optionsOf(plugin)));
-	if (plugin.name === "svg2ttf" && asset.format === "svg") return converted(asset, "ttf", await svgFontToTtf(new TextDecoder().decode(asset.contents), optionsOf(plugin)));
+async function convert(asset, plugin, conversion) {
+	if (conversion.name === "ttf2woff") return converted(asset, conversion.outputFormat, await ttfToWoff(asset.contents, optionsOf(plugin)));
+	if (conversion.name === "ttf2woff2") return converted(asset, conversion.outputFormat, await ttfToWoff2(asset.contents, optionsOf(plugin)));
+	if (conversion.name === "ttf2eot") return converted(asset, conversion.outputFormat, await ttfToEot(asset.contents, optionsOf(plugin)));
+	if (conversion.name === "ttf2svg") return converted(asset, conversion.outputFormat, new TextEncoder().encode(await ttfToSvg(asset.contents, optionsOf(plugin))));
+	if (conversion.name === "otf2ttf") return converted(asset, conversion.outputFormat, await otfToTtf(asset.contents, optionsOf(plugin)));
+	return converted(asset, conversion.outputFormat, await svgFontToTtf(new TextDecoder().decode(asset.contents), optionsOf(plugin)));
 }
 function optionsOf(plugin) {
 	return plugin.options ?? {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fontmin-rs/wasm",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Browser WASM runtime for fontmin-rs.",
   "license": "MIT",
   "repository": {