@fontmin-rs/wasm 0.1.0-beta.4 → 0.1.0-rc.2

package/dist/index.mjs

@@ -255,10 +255,20 @@ async function optimizeBrowser(config) {
 	let assets = config.assets.map(formatAsset);
 	for (const plugin of config.plugins ?? []) {
 		if (plugin.name === "glyph") {
-			assets = await Promise.all(assets.map(async (asset) => asset.format === "ttf" ? {
-				...asset,
-				contents: await subsetTtf(asset.contents, optionsOf(plugin))
-			} : asset));
+			const options = optionsOf(plugin);
+			const subsetAssets = [];
+			for (const asset of assets) {
+				if (asset.format !== "ttf") {
+					subsetAssets.push(asset);
+					continue;
+				}
+				const subsetAsset = {
+					...asset,
+					contents: await subsetTtf(asset.contents, options)
+				};
+				subsetAssets.push(...options.clone === true ? [asset, subsetAsset] : [subsetAsset]);
+			}
+			assets = subsetAssets;
 			continue;
 		}
 		if (plugin.name === "unicodeSlices") {
@@ -316,11 +326,12 @@ async function optimizeBrowser(config) {
 			if (icons.length > 0) {
 				const options = optionsOf(plugin);
 				const fontName = options.fontName ?? "iconfont";
-				assets.push({
+				const ttfAsset = {
 					contents: await svgsToTtf(icons, options),
 					fileName: `${toKebabCase(fontName)}.ttf`,
 					format: "ttf"
-				});
+				};
+				assets = options.clone === true ? [...assets, ttfAsset] : [...assets.filter((asset) => asset.format !== "svg"), ttfAsset];
 			}
 			continue;
 		}
@@ -348,16 +359,18 @@ async function optimizeBrowser(config) {
 			assets = [...transformed, ...emitted];
 			continue;
 		}
-		if (plugin.name === "otf2ttf" && optionsOf(plugin).clone === false) {
-			assets = await Promise.all(assets.map(async (asset) => await convert(asset, plugin) ?? asset));
-			continue;
-		}
+		const clone = optionsOf(plugin).clone !== false;
+		const convertedAssets = [];
 		const additions = [];
 		for (const asset of assets) {
-			const converted = await convert(asset, plugin);
-			if (converted !== void 0) additions.push(converted);
+			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 = [...assets, ...additions];
+		assets = [...convertedAssets, ...additions];
 	}
 	return assets;
 }
@@ -383,7 +396,7 @@ function converted(asset, format, contents) {
 function formatAsset(asset) {
 	return {
 		...asset,
-		format: formatOf(asset.fileName)
+		format: asset.format ?? formatOf(asset.fileName)
 	};
 }
 function formatOf(fileName) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fontmin-rs/wasm",
-  "version": "0.1.0-beta.4",
+  "version": "0.1.0-rc.2",
   "description": "Browser WASM runtime for fontmin-rs.",
   "license": "MIT",
   "repository": {