@fontmin-rs/wasm 1.1.0 → 1.2.0-rc.2

package/dist/{fontmin_wasm_core-C2e3XISU.mjs → fontmin_wasm_core-B5DVVyeB.mjs}

@@ -101,10 +101,10 @@ function __wbg_get_imports() {
 		__proto__: null,
 		"./fontmin_wasm_core_bg.js": {
 			__proto__: null,
-			__wbg_Error_92b29b0548f8b746: function(arg0, arg1) {
+			__wbg_Error_408e67f47ca7b58b: function(arg0, arg1) {
 				return addHeapObject(Error(getStringFromWasm0(arg0, arg1)));
 			},
-			__wbg_Number_9a4e0ecb0fa16705: function(arg0) {
+			__wbg_Number_3890faa6d3ff057d: function(arg0) {
 				return Number(getObject(arg0));
 			},
 			__wbg_String_8564e559799eccda: function(arg0, arg1) {
@@ -113,55 +113,55 @@ function __wbg_get_imports() {
 				getDataViewMemory0().setInt32(arg0 + 4, len1, true);
 				getDataViewMemory0().setInt32(arg0 + 0, ptr1, true);
 			},
-			__wbg___wbindgen_bigint_get_as_i64_d968e41184ae354f: function(arg0, arg1) {
+			__wbg___wbindgen_bigint_get_as_i64_c4ecf48528083721: function(arg0, arg1) {
 				const v = getObject(arg1);
 				const ret = typeof v === "bigint" ? v : void 0;
 				getDataViewMemory0().setBigInt64(arg0 + 8, isLikeNone(ret) ? BigInt(0) : ret, true);
 				getDataViewMemory0().setInt32(arg0 + 0, !isLikeNone(ret), true);
 			},
-			__wbg___wbindgen_boolean_get_fa956cfa2d1bd751: function(arg0) {
+			__wbg___wbindgen_boolean_get_c9c83ebd41b34df3: function(arg0) {
 				const v = getObject(arg0);
 				const ret = typeof v === "boolean" ? v : void 0;
 				return isLikeNone(ret) ? 16777215 : ret ? 1 : 0;
 			},
-			__wbg___wbindgen_debug_string_c25d447a39f5578f: function(arg0, arg1) {
+			__wbg___wbindgen_debug_string_a57024b9c6e4a48b: function(arg0, arg1) {
 				const ptr1 = passStringToWasm0(debugString(getObject(arg1)), wasm.__wbindgen_export, wasm.__wbindgen_export2);
 				const len1 = WASM_VECTOR_LEN;
 				getDataViewMemory0().setInt32(arg0 + 4, len1, true);
 				getDataViewMemory0().setInt32(arg0 + 0, ptr1, true);
 			},
-			__wbg___wbindgen_in_aca499c5de7ff5e5: function(arg0, arg1) {
+			__wbg___wbindgen_in_ac983077f137f2e6: function(arg0, arg1) {
 				return getObject(arg0) in getObject(arg1);
 			},
-			__wbg___wbindgen_is_bigint_2f76dc55065b4273: function(arg0) {
+			__wbg___wbindgen_is_bigint_8ffbbef442139384: function(arg0) {
 				return typeof getObject(arg0) === "bigint";
 			},
-			__wbg___wbindgen_is_function_1ff95bcc5517c252: function(arg0) {
+			__wbg___wbindgen_is_function_5e4570eb24ffa122: function(arg0) {
 				return typeof getObject(arg0) === "function";
 			},
-			__wbg___wbindgen_is_object_a27215656b807791: function(arg0) {
+			__wbg___wbindgen_is_object_a2790eb24c211ea0: function(arg0) {
 				const val = getObject(arg0);
 				return typeof val === "object" && val !== null;
 			},
-			__wbg___wbindgen_is_string_ea5e6cc2e4141dfe: function(arg0) {
+			__wbg___wbindgen_is_string_e6f02f0ea5f20a32: function(arg0) {
 				return typeof getObject(arg0) === "string";
 			},
-			__wbg___wbindgen_is_undefined_c05833b95a3cf397: function(arg0) {
+			__wbg___wbindgen_is_undefined_6cff064c44e0d823: function(arg0) {
 				return getObject(arg0) === void 0;
 			},
-			__wbg___wbindgen_jsval_eq_e659fcf7b0e32763: function(arg0, arg1) {
+			__wbg___wbindgen_jsval_eq_0a18949a61670320: function(arg0, arg1) {
 				return getObject(arg0) === getObject(arg1);
 			},
-			__wbg___wbindgen_jsval_loose_eq_db4c3b15f63fc170: function(arg0, arg1) {
+			__wbg___wbindgen_jsval_loose_eq_acf2776254a8d832: function(arg0, arg1) {
 				return getObject(arg0) == getObject(arg1);
 			},
-			__wbg___wbindgen_number_get_394265ed1e1b84ee: function(arg0, arg1) {
+			__wbg___wbindgen_number_get_136b9679cab35cfb: function(arg0, arg1) {
 				const obj = getObject(arg1);
 				const ret = typeof obj === "number" ? obj : void 0;
 				getDataViewMemory0().setFloat64(arg0 + 8, isLikeNone(ret) ? 0 : ret, true);
 				getDataViewMemory0().setInt32(arg0 + 0, !isLikeNone(ret), true);
 			},
-			__wbg___wbindgen_string_get_b0ca35b86a603356: function(arg0, arg1) {
+			__wbg___wbindgen_string_get_d154f1e671052120: function(arg0, arg1) {
 				const obj = getObject(arg1);
 				const ret = typeof obj === "string" ? obj : void 0;
 				var ptr1 = isLikeNone(ret) ? 0 : passStringToWasm0(ret, wasm.__wbindgen_export, wasm.__wbindgen_export2);
@@ -169,30 +169,30 @@ function __wbg_get_imports() {
 				getDataViewMemory0().setInt32(arg0 + 4, len1, true);
 				getDataViewMemory0().setInt32(arg0 + 0, ptr1, true);
 			},
-			__wbg___wbindgen_throw_344f42d3211c4765: function(arg0, arg1) {
+			__wbg___wbindgen_throw_bb96b2010945f0bc: function(arg0, arg1) {
 				throw new Error(getStringFromWasm0(arg0, arg1));
 			},
-			__wbg_call_8a2dd23819f8a60a: function() {
+			__wbg_call_1c5886ab9c57d1c7: function() {
 				return handleError(function(arg0, arg1) {
 					return addHeapObject(getObject(arg0).call(getObject(arg1)));
 				}, arguments);
 			},
-			__wbg_done_89b2b13e91a60321: function(arg0) {
+			__wbg_done_669171204c3dcae2: function(arg0) {
 				return getObject(arg0).done;
 			},
-			__wbg_entries_015dc610cd81ede0: function(arg0) {
+			__wbg_entries_7774d489e1da5f4f: function(arg0) {
 				return addHeapObject(Object.entries(getObject(arg0)));
 			},
-			__wbg_get_507a50627bffa49b: function(arg0, arg1) {
+			__wbg_get_c0c8f8d7da0c03dd: function(arg0, arg1) {
 				const ret = getObject(arg0)[arg1 >>> 0];
 				return addHeapObject(ret);
 			},
-			__wbg_get_c7eb1f358a7654df: function() {
+			__wbg_get_d173c0308df22d37: function() {
 				return handleError(function(arg0, arg1) {
 					return addHeapObject(Reflect.get(getObject(arg0), getObject(arg1)));
 				}, arguments);
 			},
-			__wbg_get_unchecked_6e0ad6d2a41b06f6: function(arg0, arg1) {
+			__wbg_get_unchecked_e20b893aeafc3fca: function(arg0, arg1) {
 				const ret = getObject(arg0)[arg1 >>> 0];
 				return addHeapObject(ret);
 			},
@@ -200,7 +200,7 @@ function __wbg_get_imports() {
 				const ret = getObject(arg0)[getObject(arg1)];
 				return addHeapObject(ret);
 			},
-			__wbg_instanceof_ArrayBuffer_4480b9e0068a8adb: function(arg0) {
+			__wbg_instanceof_ArrayBuffer_993d02d2d254cad1: function(arg0) {
 				let result;
 				try {
 					result = getObject(arg0) instanceof ArrayBuffer;
@@ -209,7 +209,7 @@ function __wbg_get_imports() {
 				}
 				return result;
 			},
-			__wbg_instanceof_Map_e5b5e3db98422fcc: function(arg0) {
+			__wbg_instanceof_Map_9a4d6ead180ae3a9: function(arg0) {
 				let result;
 				try {
 					result = getObject(arg0) instanceof Map;
@@ -218,7 +218,7 @@ function __wbg_get_imports() {
 				}
 				return result;
 			},
-			__wbg_instanceof_Uint8Array_309b927aaf7a3fc7: function(arg0) {
+			__wbg_instanceof_Uint8Array_f935dbb0aa7cdeed: function(arg0) {
 				let result;
 				try {
 					result = getObject(arg0) instanceof Uint8Array;
@@ -227,56 +227,56 @@ function __wbg_get_imports() {
 				}
 				return result;
 			},
-			__wbg_isArray_0677c962b281d01a: function(arg0) {
+			__wbg_isArray_6339f732981044bf: function(arg0) {
 				return Array.isArray(getObject(arg0));
 			},
-			__wbg_isSafeInteger_04f36e4056f1b851: function(arg0) {
+			__wbg_isSafeInteger_f3d6cd19ccfe4512: function(arg0) {
 				return Number.isSafeInteger(getObject(arg0));
 			},
-			__wbg_iterator_6f722e4a93058b71: function() {
+			__wbg_iterator_5cebbb86e33c6dd6: function() {
 				const ret = Symbol.iterator;
 				return addHeapObject(ret);
 			},
-			__wbg_length_1f0964f4a5e2c6d8: function(arg0) {
+			__wbg_length_36bd29c6848c2144: function(arg0) {
 				return getObject(arg0).length;
 			},
-			__wbg_length_370319915dc99107: function(arg0) {
+			__wbg_length_ecfa2c63d3d0d82c: function(arg0) {
 				return getObject(arg0).length;
 			},
-			__wbg_new_32b398fb48b6d94a: function() {
+			__wbg_new_116be93542d39019: function() {
 				return addHeapObject(new Array());
 			},
-			__wbg_new_7796ffc7ed656783: function() {
-				return addHeapObject(/* @__PURE__ */ new Map());
-			},
-			__wbg_new_cd45aabdf6073e84: function(arg0) {
+			__wbg_new_77cc4f4f472aeb81: function(arg0) {
 				return addHeapObject(new Uint8Array(getObject(arg0)));
 			},
-			__wbg_new_da52cf8fe3429cb2: function() {
-				return addHeapObject(/* @__PURE__ */ new Object());
+			__wbg_new_cdf041679ded4c5f: function() {
+				return addHeapObject(/* @__PURE__ */ new Map());
 			},
-			__wbg_next_6dbf2c0ac8cde20f: function(arg0) {
-				const ret = getObject(arg0).next;
-				return addHeapObject(ret);
+			__wbg_new_ebe3e0f6837f0879: function() {
+				return addHeapObject(/* @__PURE__ */ new Object());
 			},
-			__wbg_next_71f2aa1cb3d1e37e: function() {
+			__wbg_next_42cf16ee0dafc9e2: function() {
 				return handleError(function(arg0) {
 					return addHeapObject(getObject(arg0).next());
 				}, arguments);
 			},
-			__wbg_prototypesetcall_4770620bbe4688a0: function(arg0, arg1, arg2) {
+			__wbg_next_8f26b64fa5e9f64b: function(arg0) {
+				const ret = getObject(arg0).next;
+				return addHeapObject(ret);
+			},
+			__wbg_prototypesetcall_de8e0d9553586985: function(arg0, arg1, arg2) {
 				Uint8Array.prototype.set.call(getArrayU8FromWasm0(arg0, arg1), getObject(arg2));
 			},
-			__wbg_set_575dd786d51585f8: function(arg0, arg1, arg2) {
+			__wbg_set_014226dfeca53178: function(arg0, arg1, arg2) {
 				return addHeapObject(getObject(arg0).set(getObject(arg1), getObject(arg2)));
 			},
 			__wbg_set_6be42768c690e380: function(arg0, arg1, arg2) {
 				getObject(arg0)[takeObject(arg1)] = takeObject(arg2);
 			},
-			__wbg_set_8a16b38e4805b298: function(arg0, arg1, arg2) {
+			__wbg_set_a80955eb93b145c6: function(arg0, arg1, arg2) {
 				getObject(arg0)[arg1 >>> 0] = takeObject(arg2);
 			},
-			__wbg_value_a5d5488a9589444a: function(arg0) {
+			__wbg_value_1e2369fab29b420e: function(arg0) {
 				const ret = getObject(arg0).value;
 				return addHeapObject(ret);
 			},
@@ -457,10 +457,11 @@ function __wbg_finalize_init(instance, module) {
 }
 async function __wbg_load(module, imports) {
 	if (typeof Response === "function" && module instanceof Response) {
+		if (!module.ok) throw new Error(`failed to fetch Wasm: ${module.status} ${module.statusText} fetching '${module.url}'`);
 		if (typeof WebAssembly.instantiateStreaming === "function") try {
 			return await WebAssembly.instantiateStreaming(module, imports);
 		} catch (e) {
-			if (module.ok && expectedResponseType(module.type) && module.headers.get("Content-Type") !== "application/wasm") console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
+			if (expectedResponseType(module.type) && module.headers.get("Content-Type") !== "application/wasm") console.warn("`WebAssembly.instantiateStreaming` failed because your server does not serve Wasm with `application/wasm` MIME type. Falling back to `WebAssembly.instantiate` which is slower. Original error:\n", e);
 			else throw e;
 		}
 		const bytes = await module.arrayBuffer();
@@ -484,16 +485,20 @@ async function __wbg_load(module, imports) {
 }
 function initSync(module) {
 	if (wasm !== void 0) return wasm;
-	if (module !== void 0) if (Object.getPrototypeOf(module) === Object.prototype) ({module} = module);
-	else console.warn("using deprecated parameters for `initSync()`; pass a single object instead");
+	if (module !== void 0) {
+		if (Object.getPrototypeOf(module) === Object.prototype) ({module} = module);
+		else console.warn("using deprecated parameters for `initSync()`; pass a single object instead");
+	}
 	const imports = __wbg_get_imports();
 	if (!(module instanceof WebAssembly.Module)) module = new WebAssembly.Module(module);
 	return __wbg_finalize_init(new WebAssembly.Instance(module, imports), module);
 }
 async function __wbg_init(module_or_path) {
 	if (wasm !== void 0) return wasm;
-	if (module_or_path !== void 0) if (Object.getPrototypeOf(module_or_path) === Object.prototype) ({module_or_path} = module_or_path);
-	else console.warn("using deprecated parameters for the initialization function; pass a single object instead");
+	if (module_or_path !== void 0) {
+		if (Object.getPrototypeOf(module_or_path) === Object.prototype) ({module_or_path} = module_or_path);
+		else console.warn("using deprecated parameters for the initialization function; pass a single object instead");
+	}
 	if (module_or_path === void 0) module_or_path = new URL("fontmin_wasm_core_bg.wasm", import.meta.url);
 	const imports = __wbg_get_imports();
 	if (typeof module_or_path === "string" || typeof Request === "function" && module_or_path instanceof Request || typeof URL === "function" && module_or_path instanceof URL) module_or_path = fetch(module_or_path);

package/dist/index.mjs

@@ -23,7 +23,7 @@ async function initWasm(input) {
 	}
 }
 async function initializeWasm(input) {
-	const module = await import("./fontmin_wasm_core-C2e3XISU.mjs");
+	const module = await import("./fontmin_wasm_core-B5DVVyeB.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;
@@ -63,9 +63,17 @@ function createFontminDiagnostics(operationName) {
 			throw normalizeFontminDiagnostic(error);
 		}
 	}
+	async function withFontminDiagnosticsAsync(operation) {
+		try {
+			return await operation();
+		} catch (error) {
+			throw normalizeFontminDiagnostic(error);
+		}
+	}
 	return {
 		normalizeFontminDiagnostic,
-		withFontminDiagnostics
+		withFontminDiagnostics,
+		withFontminDiagnosticsAsync
 	};
 }
 //#endregion
@@ -73,6 +81,30 @@ function createFontminDiagnostics(operationName) {
 const { normalizeFontminDiagnostic, withFontminDiagnostics } = createFontminDiagnostics("fontmin-rs WASM operation");
 //#endregion
 //#region ../../packages/fontmin/src/runtime-neutral/optimize-policy.ts
+async function mapWithConcurrency(inputs, concurrency, transform) {
+	if (!Number.isInteger(concurrency) || concurrency < 1) throw new TypeError("parallel thread count must be a positive integer");
+	if (inputs.length === 0) return [];
+	const outputs = [];
+	const failures = [];
+	let nextIndex = 0;
+	const worker = async () => {
+		while (failures.length === 0) {
+			const index = nextIndex;
+			nextIndex += 1;
+			if (index >= inputs.length) return;
+			const input = inputs[index];
+			try {
+				outputs[index] = await transform(input, index);
+			} catch (error) {
+				failures.push(error);
+			}
+		}
+	};
+	const workerCount = Math.min(concurrency, inputs.length);
+	await Promise.all(Array.from({ length: workerCount }, () => worker()));
+	if (failures.length > 0) throw failures[0];
+	return outputs;
+}
 const FONT_CONVERSIONS = [
 	{
 		inputFormat: "otf",
@@ -105,38 +137,36 @@ const FONT_CONVERSIONS = [
 		outputFormat: "woff2"
 	}
 ];
-async function applyAssetTransform(assets, transform, context, normalize) {
-	const transformedAssets = [];
-	for (const asset of assets) {
+async function applyAssetTransform(assets, transform, context, normalize, concurrency = 1) {
+	return (await mapWithConcurrency(assets, concurrency, async (asset) => {
 		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) {
+		if (result === void 0) return [asset];
+		if (Array.isArray(result)) return result.map((asset) => normalize(asset));
+		if (result === null) return [];
+		return [normalize(result)];
+	})).flat();
+}
+async function applyAssetConversion(assets, clone, convert, concurrency = 1) {
+	const converted = await mapWithConcurrency(assets, concurrency, async (asset) => ({
+		asset,
+		convertedAsset: await convert(asset)
+	}));
 	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);
-	}
+	for (const { asset, convertedAsset } of converted) 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) {
+async function applyFontConversion(assets, pluginName, clone, formatOf, convert, concurrency = 1) {
 	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);
+	return applyAssetConversion(assets, clone, (asset) => formatOf(asset) === conversion.inputFormat ? convert(asset, conversion) : void 0, concurrency);
 }
-async function flatMapAssets(assets, transform) {
-	const transformedAssets = [];
-	for (const asset of assets) transformedAssets.push(...await transform(asset));
-	return transformedAssets;
+async function flatMapAssets(assets, transform, concurrency = 1) {
+	return (await mapWithConcurrency(assets, concurrency, transform)).flat();
 }
 function missingGlyphWarning(report) {
 	if (report.missing.length === 0) return;
@@ -293,7 +323,7 @@ function coverageOptions(options) {
 }
 //#endregion
 //#region ../../packages/fontmin/src/runtime-neutral/auto-delivery.ts
-const DEFAULT_TARGET_BYTES = 100 * 1024;
+const DEFAULT_TARGET_BYTES = 102400;
 const DEFAULT_TOLERANCE = .15;
 const DEFAULT_MAX_SLICES = 32;
 const GROUPS = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fontmin-rs/wasm",
-  "version": "1.1.0",
+  "version": "1.2.0-rc.2",
   "description": "Browser WASM runtime for fontmin-rs.",
   "license": "MIT",
   "repository": {
@@ -25,10 +25,10 @@
   },
   "devDependencies": {
     "@ntnyq/tsconfig": "^3.1.0",
-    "playwright": "^1.61.1",
-    "tsdown": "^0.22.12",
+    "playwright": "^1.62.1",
+    "tsdown": "^0.22.14",
     "typescript": "^7.0.2",
-    "vitest": "^4.1.10"
+    "vitest": "^4.1.11"
   },
   "scripts": {
     "build": "pnpm run build:wasm && pnpm run build:js",