@fontmin-rs/wasm 0.1.0-beta.1 → 0.1.0-beta.3

package/dist/index.d.mts

@@ -5,10 +5,31 @@ 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
+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";
+  readonly code: FontminDiagnosticCode;
+  constructor(code: FontminDiagnosticCode, message: string, options?: ErrorOptions);
+}
+//#endregion
 //#region types.d.ts
 type FontFormat = 'ttf' | 'otf' | 'woff' | 'woff2' | 'eot' | 'svg' | 'css' | 'unknown';
 type OutputFormat = 'ttf' | 'woff' | 'woff2' | 'eot' | 'svg' | 'css';
 type LayoutSubsetMode = 'drop' | 'conservative' | 'preserve';
+type MissingGlyphPolicy = 'ignore' | 'warn' | 'error';
+interface CoverageOptions {
+  basicText?: boolean;
+  text?: string;
+  unicodeRanges?: string[];
+  unicodes?: number[];
+}
+interface CoverageReport {
+  coveragePercent: number;
+  missing: number[];
+  requested: number[];
+  supported: number[];
+}
 interface FontMetadata {
   ascender: number;
   descender: number;
@@ -25,15 +46,12 @@ interface FontInfo {
   metadata: FontMetadata;
   size: number;
 }
-interface SubsetOptions {
-  basicText?: boolean;
+interface SubsetOptions extends CoverageOptions {
   keepNotdef?: boolean;
   layout?: LayoutSubsetMode;
+  missingGlyphs?: MissingGlyphPolicy;
   preserveHinting?: boolean;
-  text?: string;
   trim?: boolean;
-  unicodeRanges?: string[];
-  unicodes?: number[];
 }
 interface WoffOptions {
   compressionLevel?: number;
@@ -96,6 +114,7 @@ interface CssOptions {
 //#endregion
 //#region src/native.d.ts
 declare function subsetTtf(input: Uint8Array, options?: SubsetOptions): Promise<Uint8Array>;
+declare function analyzeCoverage(input: Uint8Array, options?: CoverageOptions): Promise<CoverageReport>;
 declare function ttfToWoff(input: Uint8Array, options?: WoffOptions): Promise<Uint8Array>;
 declare function woffToTtf(input: Uint8Array): Promise<Uint8Array>;
 declare function ttfToWoff2(input: Uint8Array, options?: Ttf2Woff2Options): Promise<Uint8Array>;
@@ -193,4 +212,4 @@ interface BrowserOptimizeConfig {
 }
 declare function optimizeBrowser(config: BrowserOptimizeConfig): Promise<BrowserAsset[]>;
 //#endregion
-export { type BrowserAsset, type BrowserOptimizeConfig, type BrowserPlugin, type BrowserPluginContext, type CssFontSource, type CssGlyph, type CssOptions, type DeliverySlice, type DeliverySlicesOptions, type FontFormat, type FontInfo, type FontMetadata, type FontminCompatPresetOptions, type GlyphOptions, type LayoutSubsetMode, type MaybePromise, type ModernWebOptions, type Otf2TtfOptions, type Otf2TtfPluginOptions, type OutputFormat, type SubsetOptions, type Svg2TtfOptions, type Svg2TtfPluginOptions, type SvgIcon, type Svgs2TtfOptions, type Svgs2TtfPluginOptions, type Ttf2EotOptions, type Ttf2EotPluginOptions, type Ttf2SvgOptions, type Ttf2SvgPluginOptions, type Ttf2Woff2Options, type Ttf2Woff2PluginOptions, type Ttf2WoffPluginOptions, type WoffOptions, css, deliverySlices, eotToTtf, fontminCompatPreset, generateFontFaceCss, glyph, initWasm, inspect, isWasmInitialized, modernWeb, optimizeBrowser, otf2ttf, otfToTtf, subsetTtf, svg2ttf, svgFontToTtf, svgs2ttf, svgsToTtf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2, ttfToEot, ttfToSvg, ttfToWoff, ttfToWoff2, validateWoff2, woff2ToTtf, woffToTtf };
+export { type BrowserAsset, type BrowserOptimizeConfig, type BrowserPlugin, type BrowserPluginContext, type CoverageOptions, type CoverageReport, type CssFontSource, type CssGlyph, type CssOptions, type DeliverySlice, type DeliverySlicesOptions, type FontFormat, type FontInfo, type FontMetadata, type FontminCompatPresetOptions, type FontminDiagnosticCode, FontminDiagnosticError, type GlyphOptions, type LayoutSubsetMode, type MaybePromise, type MissingGlyphPolicy, type ModernWebOptions, type Otf2TtfOptions, type Otf2TtfPluginOptions, type OutputFormat, type SubsetOptions, type Svg2TtfOptions, type Svg2TtfPluginOptions, type SvgIcon, type Svgs2TtfOptions, type Svgs2TtfPluginOptions, type Ttf2EotOptions, type Ttf2EotPluginOptions, type Ttf2SvgOptions, type Ttf2SvgPluginOptions, type Ttf2Woff2Options, type Ttf2Woff2PluginOptions, type Ttf2WoffPluginOptions, type WoffOptions, analyzeCoverage, css, deliverySlices, eotToTtf, fontminCompatPreset, generateFontFaceCss, glyph, initWasm, inspect, isWasmInitialized, modernWeb, optimizeBrowser, otf2ttf, otfToTtf, subsetTtf, svg2ttf, svgFontToTtf, svgs2ttf, svgsToTtf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2, ttfToEot, ttfToSvg, ttfToWoff, ttfToWoff2, validateWoff2, woff2ToTtf, woffToTtf };

package/dist/index.mjs

@@ -9,28 +9,74 @@ function assertWasmInitialized() {
 }
 async function getWasmModule() {
 	assertWasmInitialized();
-	return initialization;
+	const module = initialization;
+	if (module === void 0) throw new Error("fontmin-rs WASM runtime initialization is unavailable");
+	return module;
 }
 async function initWasm(input) {
-	initialization ??= import("./fontmin_wasm_core-Cn_EVAE9.mjs").then(async (module) => {
-		await module.default(input === void 0 ? void 0 : { module_or_path: input });
-		if (module.runtime_name() !== "fontmin-rs") throw new Error("fontmin-rs WASM runtime did not initialize correctly");
-		initialized = true;
-		return module;
-	});
+	initialization ??= initializeWasm(input);
 	await initialization;
 }
+async function initializeWasm(input) {
+	const module = await import("./fontmin_wasm_core-Cn_EVAE9.mjs");
+	await module.default(input === void 0 ? void 0 : { module_or_path: input });
+	if (module.runtime_name() !== "fontmin-rs") throw new Error("fontmin-rs WASM runtime did not initialize correctly");
+	initialized = true;
+	return module;
+}
+//#endregion
+//#region src/diagnostics.ts
+const bridgeDiagnosticPattern = /^\[(?<code>fontmin::[a-z_]+)\] (?<message>[\s\S]+)$/u;
+var FontminDiagnosticError = class extends Error {
+	name = "FontminDiagnosticError";
+	code;
+	constructor(code, message, options) {
+		super(message, options);
+		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 });
+	}
+	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);
+	}
+}
 //#endregion
 //#region src/native.ts
 function bytes(value) {
 	return new Uint8Array(value);
 }
 async function binary(operation, input, options = {}) {
-	return bytes((await getWasmModule()).transform(operation, input, options));
+	const wasm = await getWasmModule();
+	return withFontminDiagnostics(() => bytes(wasm.transform(operation, input, options)));
 }
 async function subsetTtf(input, options = {}) {
+	if ((options.missingGlyphs ?? "warn") === "warn") {
+		const warning = missingGlyphWarning(await analyzeCoverage(input, coverageOptions(options)));
+		if (warning !== void 0) console.warn(warning);
+	}
 	return binary("subsetTtf", input, options);
 }
+async function analyzeCoverage(input, options = {}) {
+	const wasm = await getWasmModule();
+	return withFontminDiagnostics(() => wasm.transform("analyzeCoverage", input, options));
+}
 async function ttfToWoff(input, options = {}) {
 	return binary("ttfToWoff", input, options);
 }
@@ -44,7 +90,8 @@ async function woff2ToTtf(input) {
 	return binary("woff2ToTtf", input);
 }
 async function validateWoff2(input) {
-	(await getWasmModule()).transform("validateWoff2", input, {});
+	const wasm = await getWasmModule();
+	withFontminDiagnostics(() => wasm.transform("validateWoff2", input, {}));
 }
 async function ttfToEot(input, options = {}) {
 	return binary("ttfToEot", input, options);
@@ -53,22 +100,41 @@ async function eotToTtf(input) {
 	return binary("eotToTtf", input);
 }
 async function ttfToSvg(input, options = {}) {
-	return (await getWasmModule()).transform("ttfToSvg", input, options);
+	const wasm = await getWasmModule();
+	return withFontminDiagnostics(() => wasm.transform("ttfToSvg", input, options));
 }
 async function svgFontToTtf(input, options = {}) {
-	return bytes((await getWasmModule()).transform_text("svgFontToTtf", input, options));
+	const wasm = await getWasmModule();
+	return withFontminDiagnostics(() => bytes(wasm.transform_text("svgFontToTtf", input, options)));
 }
 async function svgsToTtf(inputs, options = {}) {
-	return bytes((await getWasmModule()).transform_icons(inputs, options));
+	const wasm = await getWasmModule();
+	return withFontminDiagnostics(() => bytes(wasm.transform_icons(inputs, options)));
 }
 async function otfToTtf(input, options = {}) {
 	return binary("otfToTtf", input, options);
 }
 async function inspect(input) {
-	return (await getWasmModule()).transform("inspect", input, {});
+	const wasm = await getWasmModule();
+	return withFontminDiagnostics(() => wasm.transform("inspect", input, {}));
 }
 async function generateFontFaceCss(sources, options = {}) {
-	return (await getWasmModule()).generate_css(sources, options);
+	const wasm = await getWasmModule();
+	return withFontminDiagnostics(() => wasm.generate_css(sources, options));
+}
+function coverageOptions(options) {
+	const coverage = {};
+	if (options.basicText !== void 0) coverage.basicText = options.basicText;
+	if (options.text !== void 0) coverage.text = options.text;
+	if (options.unicodeRanges !== void 0) coverage.unicodeRanges = options.unicodeRanges;
+	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
@@ -83,6 +149,7 @@ function glyph(options = {}) {
 		basicText: false,
 		keepNotdef: true,
 		layout: "conservative",
+		missingGlyphs: "warn",
 		preserveHinting: false,
 		trim: true,
 		unicodes: [],
@@ -204,7 +271,10 @@ async function optimizeBrowser(config) {
 				}
 				for (const slice of slices) slicedAssets.push({
 					...asset,
-					contents: await subsetTtf(asset.contents, { unicodeRanges: slice.unicodeRanges }),
+					contents: await subsetTtf(asset.contents, {
+						missingGlyphs: "ignore",
+						unicodeRanges: slice.unicodeRanges
+					}),
 					fileName: appendFileNameSuffix(asset.fileName, slice.name),
 					unicodeRanges: slice.unicodeRanges
 				});
@@ -273,9 +343,9 @@ async function optimizeBrowser(config) {
 				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(formatAsset));
+				else transformed.push(...(Array.isArray(result) ? result : [result]).map((asset) => formatAsset(asset)));
 			}
-			assets = transformed.concat(emitted);
+			assets = [...transformed, ...emitted];
 			continue;
 		}
 		if (plugin.name === "otf2ttf" && optionsOf(plugin).clone === false) {
@@ -287,7 +357,7 @@ async function optimizeBrowser(config) {
 			const converted = await convert(asset, plugin);
 			if (converted !== void 0) additions.push(converted);
 		}
-		assets = assets.concat(additions);
+		assets = [...assets, ...additions];
 	}
 	return assets;
 }
@@ -323,11 +393,11 @@ function replaceExtension(fileName, extension) {
 	return `${fileName.replace(/\.[^.]+$/u, "")}.${extension}`;
 }
 function appendFileNameSuffix(fileName, suffix) {
-	const extension = fileName.match(/(\.[^.]+)$/u)?.[1] ?? "";
+	const extension = fileName.match(/(?<extension>\.[^.]+)$/u)?.groups?.["extension"] ?? "";
 	return `${extension === "" ? fileName : fileName.slice(0, -extension.length)}-${suffix}${extension}`;
 }
 function toKebabCase(value) {
-	return value.trim().replaceAll(/([a-z])([A-Z])/gu, "$1-$2").replaceAll(/\s+/gu, "-").toLowerCase();
+	return value.trim().replaceAll(/(?<lower>[a-z])(?<upper>[A-Z])/gu, "$<lower>-$<upper>").replaceAll(/\s+/gu, "-").toLowerCase();
 }
 //#endregion
-export { css, deliverySlices, eotToTtf, fontminCompatPreset, generateFontFaceCss, glyph, initWasm, inspect, isWasmInitialized, modernWeb, optimizeBrowser, otf2ttf, otfToTtf, subsetTtf, svg2ttf, svgFontToTtf, svgs2ttf, svgsToTtf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2, ttfToEot, ttfToSvg, ttfToWoff, ttfToWoff2, validateWoff2, woff2ToTtf, woffToTtf };
+export { FontminDiagnosticError, analyzeCoverage, css, deliverySlices, eotToTtf, fontminCompatPreset, generateFontFaceCss, glyph, initWasm, inspect, isWasmInitialized, modernWeb, optimizeBrowser, otf2ttf, otfToTtf, subsetTtf, svg2ttf, svgFontToTtf, svgs2ttf, svgsToTtf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2, ttfToEot, ttfToSvg, ttfToWoff, ttfToWoff2, validateWoff2, woff2ToTtf, woffToTtf };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fontmin-rs/wasm",
-  "version": "0.1.0-beta.1",
+  "version": "0.1.0-beta.3",
   "description": "Browser WASM runtime for fontmin-rs.",
   "license": "MIT",
   "repository": {
@@ -26,7 +26,7 @@
   "devDependencies": {
     "@ntnyq/tsconfig": "^3.1.0",
     "playwright": "^1.61.1",
-    "tsdown": "^0.22.8",
+    "tsdown": "^0.22.12",
     "typescript": "^7.0.2",
     "vitest": "^4.1.10"
   },