fontmin-rs 0.1.0-beta.2 → 0.1.0-beta.4

package/bin/fontmin-rs.mjs

@@ -32,7 +32,7 @@ const DEFAULT_CONFIG_FILES = [
 const MODULE_CONFIG_EXTENSIONS = new Set(['.ts', '.mts', '.mjs', '.cjs'])
 const INIT_CONFIG_FILE = 'fontmin.config.jsonc'
 const CACHE_SCHEMA_VERSION = 'v1'
-const FONTMIN_VERSION = '0.1.0-beta.2'
+const FONTMIN_VERSION = '0.1.0-beta.4'
 const DEFAULT_CACHE_DIR = 'node_modules/.cache/fontmin-rs'
 let emitWarnings = true
 const DEFAULT_INIT_CONFIG = `{
@@ -1232,7 +1232,8 @@ async function findConfig(cwd = process.cwd()) {
 
 async function isFile(path) {
   try {
-    return (await stat(path)).isFile()
+    const stats = await stat(path)
+    return stats.isFile()
   } catch {
     return false
   }

package/dist/{compat-B5e9im94.mjs → compat-C8pV9xb2.mjs}

@@ -57,6 +57,39 @@ function withConfigDefaults(config, configDir) {
 	};
 }
 //#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 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 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-loader.ts
 const require$1 = createRequire(import.meta.url);
 let binding;
@@ -90,8 +123,8 @@ async function initializeWasmRuntime() {
 		const wasm = await import(wasmPackageName);
 		await wasm.initWasm(bytes);
 		return wasm;
-	} catch (cause) {
-		throw new Error("fontmin-rs WASM runtime failed to initialize", { cause });
+	} catch (error) {
+		throw new Error("fontmin-rs WASM runtime failed to initialize", { cause: error });
 	}
 }
 //#endregion
@@ -153,10 +186,10 @@ function subsetTtf(input, options = {}) {
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
 	const binding = loadNativeBinding();
 	if ((options.missingGlyphs ?? "warn") === "warn") {
-		const warning = missingGlyphWarning(binding.analyzeCoverage(inputBuffer, coverageOptionsFromSubset(nativeOptions)));
+		const warning = missingGlyphWarning(withFontminDiagnostics(() => binding.analyzeCoverage(inputBuffer, coverageOptionsFromSubset(nativeOptions))));
 		if (warning !== void 0) process.emitWarning(warning, { code: "FONTMIN_MISSING_GLYPHS" });
 	}
-	return binding.subsetTtf(inputBuffer, nativeOptions);
+	return withFontminDiagnostics(() => binding.subsetTtf(inputBuffer, nativeOptions));
 }
 function resolveSubsetText(options) {
 	if (options.textFile === void 0) return options.text;
@@ -165,11 +198,11 @@ function resolveSubsetText(options) {
 }
 function analyzeCoverage(input, options = {}) {
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	return loadNativeBinding().analyzeCoverage(inputBuffer, toNativeCoverageOptions(options));
+	return withFontminDiagnostics(() => loadNativeBinding().analyzeCoverage(inputBuffer, toNativeCoverageOptions(options)));
 }
 function inspect(input) {
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	return loadNativeBinding().inspectFont(inputBuffer);
+	return withFontminDiagnostics(() => loadNativeBinding().inspectFont(inputBuffer));
 }
 function toNativeCoverageOptions(options) {
 	const nativeOptions = {};
@@ -190,33 +223,33 @@ function missingGlyphWarning(report) {
 }
 function ttfToWoff(input, options = {}) {
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	return loadNativeBinding().ttfToWoff(inputBuffer, toNativeWoffOptions(options));
+	return withFontminDiagnostics(() => loadNativeBinding().ttfToWoff(inputBuffer, toNativeWoffOptions(options)));
 }
 function woffToTtf(input) {
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	return loadNativeBinding().woffToTtf(inputBuffer);
+	return withFontminDiagnostics(() => loadNativeBinding().woffToTtf(inputBuffer));
 }
 function woff2ToTtf(input) {
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	return loadNativeBinding().woff2ToTtf(inputBuffer);
+	return withFontminDiagnostics(() => loadNativeBinding().woff2ToTtf(inputBuffer));
 }
 function eotToTtf(input) {
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	return loadNativeBinding().eotToTtf(inputBuffer);
+	return withFontminDiagnostics(() => loadNativeBinding().eotToTtf(inputBuffer));
 }
 function otfToTtf(input, options = {}) {
 	const nativeOptions = {};
 	assignDefined(nativeOptions, "preserveHinting", options.preserveHinting);
 	assignDefined(nativeOptions, "variationCoordinates", options.variationCoordinates);
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	return loadNativeBinding().otfToTtf(inputBuffer, nativeOptions);
+	return withFontminDiagnostics(() => loadNativeBinding().otfToTtf(inputBuffer, nativeOptions));
 }
 function ttfToWoff2(input, options = {}) {
 	const nativeOptions = {};
 	assertAvailableWoff2Fallback(options.fallback);
 	if (options.quality !== void 0) nativeOptions.quality = options.quality;
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	return loadNativeBinding().ttfToWoff2(inputBuffer, nativeOptions);
+	return withFontminDiagnostics(() => loadNativeBinding().ttfToWoff2(inputBuffer, nativeOptions));
 }
 async function ttfToWoff2Async(input, options = {}) {
 	if (options.fallback === "wasm") return ttfToWoff2WithWasm(input, options);
@@ -243,25 +276,25 @@ async function ttfToWoff2WithWasm(input, options) {
 }
 function validateWoff2(input) {
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	loadNativeBinding().validateWoff2(inputBuffer);
+	withFontminDiagnostics(() => loadNativeBinding().validateWoff2(inputBuffer));
 }
 function ttfToEot(input, options = {}) {
 	const nativeOptions = {};
 	if (options.version !== void 0) nativeOptions.version = options.version;
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	return loadNativeBinding().ttfToEot(inputBuffer, nativeOptions);
+	return withFontminDiagnostics(() => loadNativeBinding().ttfToEot(inputBuffer, nativeOptions));
 }
 function ttfToSvg(input, options = {}) {
 	const nativeOptions = {};
 	if (options.fontFamily !== void 0) nativeOptions.fontFamily = options.fontFamily;
 	const inputBuffer = Buffer.isBuffer(input) ? input : Buffer.from(input);
-	return loadNativeBinding().ttfToSvg(inputBuffer, nativeOptions);
+	return withFontminDiagnostics(() => loadNativeBinding().ttfToSvg(inputBuffer, nativeOptions));
 }
 function svgFontToTtf(input, options = {}) {
-	return loadNativeBinding().svgFontToTtf(input, toNativeSvg2TtfOptions(options));
+	return withFontminDiagnostics(() => loadNativeBinding().svgFontToTtf(input, toNativeSvg2TtfOptions(options)));
 }
 function svgsToTtf(inputs, options = {}) {
-	return loadNativeBinding().svgsToTtf(inputs.map((input) => toNativeSvgIcon(input)), toNativeSvgs2TtfOptions(options));
+	return withFontminDiagnostics(() => loadNativeBinding().svgsToTtf(inputs.map((input) => toNativeSvgIcon(input)), toNativeSvgs2TtfOptions(options)));
 }
 function generateFontFaceCss(sources, options = {}) {
 	const nativeSources = sources.map((source) => toNativeCssFontSource(source));
@@ -276,7 +309,7 @@ function generateFontFaceCss(sources, options = {}) {
 	if (options.fontDisplay !== void 0) nativeOptions.fontDisplay = options.fontDisplay;
 	if (options.target !== void 0) nativeOptions.target = options.target;
 	if (options.unicodeRanges !== void 0) nativeOptions.unicodeRanges = options.unicodeRanges;
-	return loadNativeBinding().generateFontFaceCss(nativeSources, nativeOptions);
+	return withFontminDiagnostics(() => loadNativeBinding().generateFontFaceCss(nativeSources, nativeOptions));
 }
 function resolveCssFontFamily(sources, fontFamily) {
 	if (typeof fontFamily === "string") return fontFamily;
@@ -296,6 +329,10 @@ function toNativeCssFontSource(source) {
 }
 //#endregion
 //#region src/optimize-runtime.ts
+const defaultRuntimeLoaders = {
+	loadNative: loadNativeRuntime,
+	loadWasm: createWasmRuntime
+};
 function resolvePipelineRuntimeMode(configured, fallbacks) {
 	if (fallbacks.includes("js")) throw new Error("WOFF2 fallback `js` is not available in this build");
 	const legacy = [...new Set(fallbacks)];
@@ -357,6 +394,10 @@ const nativeRuntime = {
 		return ttfToWoff2(input, options);
 	}
 };
+function loadNativeRuntime() {
+	loadNativeBinding();
+	return nativeRuntime;
+}
 async function createWasmRuntime(loadRuntime = loadWasmRuntime) {
 	const wasm = await loadRuntime();
 	return {
@@ -402,17 +443,10 @@ async function runWasmOperation(operation, run) {
 function assertWasmOptionSupported(operation, name, value) {
 	if (value !== void 0) throw new Error(`fontmin-rs WASM ${operation} does not support option ${name}`);
 }
-const defaultRuntimeLoaders = {
-	loadNative() {
-		loadNativeBinding();
-		return nativeRuntime;
-	},
-	loadWasm: createWasmRuntime
-};
 //#endregion
 //#region src/optimize.ts
 const CACHE_SCHEMA_VERSION = "v1";
-const FONTMIN_VERSION = "0.1.0-beta.2";
+const FONTMIN_VERSION = "0.1.0-beta.4";
 const DEFAULT_CACHE_DIR = "node_modules/.cache/fontmin-rs";
 const DEFAULT_SVG_ICON_START_UNICODE = 57345;
 const CSS_GLYPHS_META_KEY = "cssGlyphs";
@@ -424,9 +458,9 @@ const MIME_TYPES_BY_FORMAT = {
 	woff: "font/woff",
 	woff2: "font/woff2"
 };
-async function optimize(config) {
-	const cwd = config.cwd === void 0 ? process.cwd() : config.cwd;
-	config = await resolveConfigTextFile(config, cwd);
+async function optimize(unresolvedConfig) {
+	const cwd = unresolvedConfig.cwd === void 0 ? process.cwd() : unresolvedConfig.cwd;
+	const config = await resolveConfigTextFile(unresolvedConfig, cwd);
 	const plugins = sortPlugins(await resolvePluginTextFiles(pluginsFromConfig(config), cwd));
 	const legacyFallbacks = woff2FallbacksFromPlugins(plugins);
 	const runtime = createRuntimeSelector(resolvePipelineRuntimeMode(config.runtime, legacyFallbacks));
@@ -447,7 +481,7 @@ async function optimize(config) {
 		}
 		for (const plugin of plugins) if (isBuiltin(plugin, "css")) {
 			const cssAsset = await runCss(assets, plugin.native.options, await runtime.resolve());
-			if (cssAsset !== void 0) assets = assets.concat(cssAsset);
+			if (cssAsset !== void 0) assets = [...assets, cssAsset];
 		} else {
 			if (plugin.generateBundle !== void 0) await plugin.generateBundle(assets, context);
 			assets = [...assets, ...emittedAssets.splice(0)];
@@ -740,7 +774,7 @@ async function expandInputPath(input, cwd) {
 	return matches.sort((left, right) => left.localeCompare(right));
 }
 function isGlobPattern(path) {
-	return /[*?[\]{}]/.test(path);
+	return /[*?[\]{}]/u.test(path);
 }
 async function transformAssets(assets, plugin, context, runtime) {
 	if (isBuiltin(plugin, "glyph")) return flatMapAssets(assets, async (asset) => runGlyph(asset, plugin.native.options, await runtime.resolve()));
@@ -1284,4 +1318,4 @@ var FontminCompat = class {
 	}
 };
 //#endregion
-export { woff2ToTtf as _, generateFontFaceCss as a, loadConfig as b, subsetTtf as c, ttfToEot as d, ttfToSvg as f, validateWoff2 as g, ttfToWoff2Async as h, eotToTtf as i, svgFontToTtf as l, ttfToWoff2 as m, optimize as n, inspect as o, ttfToWoff as p, analyzeCoverage as r, otfToTtf as s, FontminCompat as t, svgsToTtf as u, woffToTtf as v, defineConfig as y };
+export { woff2ToTtf as _, generateFontFaceCss as a, defineConfig as b, subsetTtf as c, ttfToEot as d, ttfToSvg as f, validateWoff2 as g, ttfToWoff2Async as h, eotToTtf as i, svgFontToTtf as l, ttfToWoff2 as m, optimize as n, inspect as o, ttfToWoff as p, analyzeCoverage as r, otfToTtf as s, FontminCompat as t, svgsToTtf as u, woffToTtf as v, loadConfig as x, FontminDiagnosticError as y };

package/dist/compat.mjs

@@ -1,3 +1,3 @@
-import { t as FontminCompat } from "./compat-B5e9im94.mjs";
+import { t as FontminCompat } from "./compat-C8pV9xb2.mjs";
 import "./plugins.mjs";
 export { FontminCompat as default };

package/dist/index.d.mts

@@ -5,6 +5,14 @@ import { fontminCompatPreset } from "./presets.mjs";
 declare function defineConfig<T extends FontminConfig>(config: T): T;
 declare function loadConfig(configPath?: string): Promise<FontminConfig>;
 //#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 src/native.d.ts
 declare function subsetTtf(input: Uint8Array, options?: SubsetOptions): Buffer;
 declare function analyzeCoverage(input: Uint8Array, options?: CoverageOptions): CoverageReport;
@@ -24,6 +32,6 @@ declare function svgsToTtf(inputs: SvgIcon[], options?: Svgs2TtfOptions): Buffer
 declare function generateFontFaceCss(sources: CssFontSource[], options?: CssOptions): string;
 //#endregion
 //#region src/optimize.d.ts
-declare function optimize(config: FontminConfig): Promise<FontAsset[]>;
+declare function optimize(unresolvedConfig: FontminConfig): Promise<FontAsset[]>;
 //#endregion
-export { type AssetFormat, type CacheOptions, type ConfigOutput, type CoverageOptions, type CoverageReport, type CssFontFamily, type CssFontSource, type CssGlyph, type CssOptions, type DeliverySlice, type FontAsset, type FontFormat, type FontInfo, type FontMetadata, type FontminCompatPresetOptions, type FontminConfig, type FontminPlugin, type LayoutSubsetMode, type MaybePromise, type MissingGlyphPolicy, type ModernWebOptions, type Otf2TtfOptions, type OutputConfig, type OutputFormat, type PluginContext, type PluginDiagnostic, type RuntimeMode, type SubsetOptions, type Svg2TtfOptions, type SvgIcon, type Svgs2TtfOptions, type Ttf2EotOptions, type Ttf2SvgOptions, type Ttf2Woff2Options, type Ttf2WoffOptions, type WoffOptions, analyzeCoverage, css, FontminCompat as default, defineConfig, definePlugin, deliverySlices, eotToTtf, fontminCompatPreset, generateFontFaceCss, glyph, inspect, loadConfig, modernWeb, optimize, otf2ttf, otfToTtf, subsetTtf, svg2ttf, svgFontToTtf, svgs2ttf, svgsToTtf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2, ttfToEot, ttfToSvg, ttfToWoff, ttfToWoff2, ttfToWoff2Async, validateWoff2, woff2ToTtf, woffToTtf };
+export { type AssetFormat, type CacheOptions, type ConfigOutput, type CoverageOptions, type CoverageReport, type CssFontFamily, type CssFontSource, type CssGlyph, type CssOptions, type DeliverySlice, type FontAsset, type FontFormat, type FontInfo, type FontMetadata, type FontminCompatPresetOptions, type FontminConfig, type FontminDiagnosticCode, FontminDiagnosticError, type FontminPlugin, type LayoutSubsetMode, type MaybePromise, type MissingGlyphPolicy, type ModernWebOptions, type Otf2TtfOptions, type OutputConfig, type OutputFormat, type PluginContext, type PluginDiagnostic, type RuntimeMode, type SubsetOptions, type Svg2TtfOptions, type SvgIcon, type Svgs2TtfOptions, type Ttf2EotOptions, type Ttf2SvgOptions, type Ttf2Woff2Options, type Ttf2WoffOptions, type WoffOptions, analyzeCoverage, css, FontminCompat as default, defineConfig, definePlugin, deliverySlices, eotToTtf, fontminCompatPreset, generateFontFaceCss, glyph, inspect, loadConfig, modernWeb, optimize, otf2ttf, otfToTtf, subsetTtf, svg2ttf, svgFontToTtf, svgs2ttf, svgsToTtf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2, ttfToEot, ttfToSvg, ttfToWoff, ttfToWoff2, ttfToWoff2Async, validateWoff2, woff2ToTtf, woffToTtf };

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { _ as woff2ToTtf, a as generateFontFaceCss, b as loadConfig, c as subsetTtf, d as ttfToEot, f as ttfToSvg, g as validateWoff2, h as ttfToWoff2Async, i as eotToTtf, l as svgFontToTtf, m as ttfToWoff2, n as optimize, o as inspect, p as ttfToWoff, r as analyzeCoverage, s as otfToTtf, t as FontminCompat, u as svgsToTtf, v as woffToTtf, y as defineConfig } from "./compat-B5e9im94.mjs";
+import { _ as woff2ToTtf, a as generateFontFaceCss, b as defineConfig, c as subsetTtf, d as ttfToEot, f as ttfToSvg, g as validateWoff2, h as ttfToWoff2Async, i as eotToTtf, l as svgFontToTtf, m as ttfToWoff2, n as optimize, o as inspect, p as ttfToWoff, r as analyzeCoverage, s as otfToTtf, t as FontminCompat, u as svgsToTtf, v as woffToTtf, x as loadConfig, y as FontminDiagnosticError } from "./compat-C8pV9xb2.mjs";
 import { css, definePlugin, deliverySlices, glyph, modernWeb, otf2ttf, svg2ttf, svgs2ttf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2 } from "./plugins.mjs";
 import { fontminCompatPreset } from "./presets.mjs";
-export { analyzeCoverage, css, FontminCompat as default, defineConfig, definePlugin, deliverySlices, eotToTtf, fontminCompatPreset, generateFontFaceCss, glyph, inspect, loadConfig, modernWeb, optimize, otf2ttf, otfToTtf, subsetTtf, svg2ttf, svgFontToTtf, svgs2ttf, svgsToTtf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2, ttfToEot, ttfToSvg, ttfToWoff, ttfToWoff2, ttfToWoff2Async, validateWoff2, woff2ToTtf, woffToTtf };
+export { FontminDiagnosticError, analyzeCoverage, css, FontminCompat as default, defineConfig, definePlugin, deliverySlices, eotToTtf, fontminCompatPreset, generateFontFaceCss, glyph, inspect, loadConfig, modernWeb, optimize, otf2ttf, otfToTtf, subsetTtf, svg2ttf, svgFontToTtf, svgs2ttf, svgsToTtf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2, ttfToEot, ttfToSvg, ttfToWoff, ttfToWoff2, ttfToWoff2Async, validateWoff2, woff2ToTtf, woffToTtf };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fontmin-rs",
-  "version": "0.1.0-beta.2",
+  "version": "0.1.0-beta.4",
   "description": "Fast font subsetter and converter written in Rust with Node.js bindings.",
   "keywords": [
     "font",
@@ -58,7 +58,7 @@
   "dependencies": {
     "jsonc-parser": "^3.3.1",
     "tinyglobby": "^0.2.17",
-    "@fontmin-rs/wasm": "0.1.0-beta.2"
+    "@fontmin-rs/wasm": "0.1.0-beta.4"
   },
   "devDependencies": {
     "@ntnyq/tsconfig": "^3.1.0",
@@ -70,7 +70,10 @@
     "vitest": "^4.1.10"
   },
   "optionalDependencies": {
-    "@fontmin-rs/binding": "0.1.0-beta.2"
+    "@fontmin-rs/binding": "0.1.0-beta.4"
+  },
+  "engines": {
+    "node": ">=22.0.0"
   },
   "scripts": {
     "bench": "vitest bench --run bench",
@@ -78,7 +81,7 @@
     "dev": "tsdown --watch",
     "format": "oxfmt",
     "format:check": "oxfmt --check",
-    "lint": "oxlint",
+    "lint": "oxlint --deny-warnings",
     "pretest": "node ../../scripts/ensure-wasm.mjs",
     "test": "vitest --run",
     "test:browser": "pnpm run build && node tests/browser-load.mjs",