fontmin-rs 0.1.0 → 0.1.1

package/README.md

@@ -3,13 +3,10 @@
 Fast font subsetting and conversion tooling powered by Rust, with CLI, Node.js,
 and browser WASM APIs.
 
-> `fontmin-rs` is in the `0.1.0` release-candidate cycle. Install the `rc`
-> dist-tag until the first stable release.
-
 ## Install
 
 ```sh
-pnpm add fontmin-rs@rc
+pnpm add fontmin-rs
 ```
 
 ## Quick start

package/bin/fontmin-rs.mjs

@@ -53,7 +53,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'
+const FONTMIN_VERSION = '0.1.1'
 const DEFAULT_CACHE_DIR = 'node_modules/.cache/fontmin-rs'
 let emitWarnings = true
 let temporaryFileCounter = 0
@@ -276,6 +276,12 @@ async function runBuildCommand(args) {
   const noOriginal = readFlag(args, ['--no-original'])
   readFlag(args, ['-d', '--deflate-woff'])
   const cssGlyph = readFlag(args, ['--css-glyph'])
+  const cssUnicodeRanges = parseUnicodeRanges(
+    readOptions(args, ['--css-unicode-range']),
+  )
+  const deliverySlices = parseDeliverySlices(
+    readOptions(args, ['--delivery-slice']),
+  )
   const outDir = readOption(args, ['-o', '--out-dir'])
   const formats = readOption(args, ['--formats'])
   const preset = readOption(args, ['--preset'])
@@ -302,6 +308,8 @@ async function runBuildCommand(args) {
         formats,
         inputs: [...args],
         cacheOverride,
+        cssUnicodeRanges,
+        deliverySlices,
         outDir,
         variationCoordinates,
       })
@@ -312,6 +320,8 @@ async function runBuildCommand(args) {
       basicText,
       cacheOverride,
       cssGlyph,
+      cssUnicodeRanges,
+      deliverySlices,
       fontFamily,
       fontPath,
       formats,
@@ -334,6 +344,8 @@ async function runBuildCommand(args) {
         fontPath,
         formats,
         cacheOverride,
+        cssUnicodeRanges,
+        deliverySlices,
         outDir,
         variationCoordinates,
       })
@@ -344,6 +356,8 @@ async function runBuildCommand(args) {
       basicText,
       cacheOverride,
       cssGlyph,
+      cssUnicodeRanges,
+      deliverySlices,
       fontFamily,
       fontPath,
       formats,
@@ -382,6 +396,7 @@ async function runBuildCommand(args) {
       [],
       {},
       cacheOptions,
+      cssUnicodeRanges,
     )
     return
   }
@@ -407,6 +422,8 @@ async function runBuildCommand(args) {
       basicText,
       cacheOptions,
       cssGlyph,
+      cssUnicodeRanges,
+      deliverySlices,
       fontFamily,
       fontPath,
       outputFormats,
@@ -423,6 +440,8 @@ async function buildDirectInput(
     basicText,
     cacheOptions,
     cssGlyph,
+    cssUnicodeRanges,
+    deliverySlices,
     fontFamily,
     fontPath,
     outputFormats,
@@ -441,6 +460,8 @@ async function buildDirectInput(
         options: {
           basicText,
           cssGlyph,
+          cssUnicodeRanges,
+          deliverySlices,
           fontFamily,
           fontPath,
           outputFormats,
@@ -471,19 +492,35 @@ async function buildDirectInput(
           unicodes: subsetOptions.unicodes,
         })
   const cssGlyphs = cssGlyph ? cssGlyphsFromSubset(subsetOptions) : []
+  const fontSources =
+    deliverySlices.length === 0
+      ? [{ baseName, contents: source }]
+      : deliverySlices.map(slice => ({
+          baseName: `${baseName}-${slice.name}`,
+          contents: subsetTtf(source, {
+            missingGlyphs: 'ignore',
+            unicodeRanges: slice.unicodeRanges,
+          }),
+          unicodeRanges: slice.unicodeRanges,
+        }))
   const cssSources = []
   const outputs = []
 
-  for (const format of outputFormats.filter(format => format !== 'css')) {
-    const fileName = `${baseName}.${format}`
-    const output = convertFont(source, format)
+  for (const fontSource of fontSources) {
+    for (const format of outputFormats.filter(format => format !== 'css')) {
+      const fileName = `${fontSource.baseName}.${format}`
+      const output = convertFont(fontSource.contents, format)
 
-    outputs.push({ contents: output, fileName })
-    cssSources.push({
-      ...(cssGlyphs.length > 0 && { glyphs: cssGlyphs }),
-      fileName,
-      format,
-    })
+      outputs.push({ contents: output, fileName })
+      cssSources.push({
+        ...(cssGlyphs.length > 0 && { glyphs: cssGlyphs }),
+        ...(fontSource.unicodeRanges !== undefined && {
+          unicodeRanges: fontSource.unicodeRanges,
+        }),
+        fileName,
+        format,
+      })
+    }
   }
 
   if (outputFormats.includes('css')) {
@@ -497,9 +534,10 @@ async function buildDirectInput(
           fontFamily: fontFamily ?? baseName,
           fontPath: fontPath ?? './',
           glyph: cssGlyph,
+          unicodeRanges: cssUnicodeRanges,
         }),
       ),
-      fileName: `${baseName}.css`,
+      fileName: `${fontSources[0].baseName}.css`,
     })
   }
 
@@ -530,6 +568,7 @@ async function buildIconfontCommand(
   outputs = [],
   css = {},
   cacheOptions = normalizeCacheOptions(undefined, process.cwd()),
+  cssUnicodeRanges = css.unicodeRanges ?? [],
 ) {
   if (inputs.length === 0) {
     throw new Error('build requires at least one input font')
@@ -602,6 +641,7 @@ async function buildIconfontCommand(
             glyph: true,
             iconPrefix: css.iconPrefix,
             local: css.local,
+            unicodeRanges: cssUnicodeRanges,
           },
         ),
       ),
@@ -622,6 +662,8 @@ async function buildConfigCommand(
     basicText,
     cacheOverride,
     cssGlyph,
+    cssUnicodeRanges = [],
+    deliverySlices = [],
     fontFamily,
     fontPath,
     formats,
@@ -659,14 +701,25 @@ async function buildConfigCommand(
 
   const inputPaths = await expandInputPaths(inputs, cwd)
 
-  if (fontFamily !== undefined || fontPath !== undefined || cssGlyph === true) {
+  if (
+    fontFamily !== undefined ||
+    fontPath !== undefined ||
+    cssGlyph === true ||
+    cssUnicodeRanges.length > 0
+  ) {
     config.css = {
       ...config.css,
       ...(cssGlyph === true && { glyph: true }),
+      ...(cssUnicodeRanges.length > 0 && {
+        unicodeRanges: cssUnicodeRanges,
+      }),
       ...(fontFamily !== undefined && { fontFamily }),
       ...(fontPath !== undefined && { fontPath }),
     }
   }
+  if (deliverySlices.length > 0) {
+    config.delivery = { slices: deliverySlices }
+  }
 
   applySubsetOverrides(config, { basicText, subsetOptions })
 
@@ -693,6 +746,8 @@ async function buildIconfontConfigCommand(
   configPath,
   {
     cacheOverride,
+    cssUnicodeRanges = [],
+    deliverySlices = [],
     fontFamily,
     fontPath,
     formats,
@@ -718,6 +773,13 @@ async function buildIconfontConfigCommand(
   const css = config.css ?? {}
   const cacheOptions = normalizeCacheOptions(config.cache, cwd, cacheOverride)
 
+  if (cssUnicodeRanges.length > 0) {
+    css.unicodeRanges = cssUnicodeRanges
+  }
+  if (deliverySlices.length > 0) {
+    config.delivery = { slices: deliverySlices }
+  }
+
   if (config.clean === true) {
     await cleanOutputDirectory(cwd, outDir, [resolvedConfigPath, ...inputs])
   }
@@ -730,6 +792,7 @@ async function buildIconfontConfigCommand(
     config.outputs ?? [],
     css,
     cacheOptions,
+    css.unicodeRanges,
   )
 }
 
@@ -806,6 +869,7 @@ async function buildConfigInput(
   const ttfContents = convertFont(contents, 'ttf', { variationCoordinates })
   const subset = await resolveSubsetTextFile(config.subset ?? {}, cwd)
   const unicodes = subset.unicodes ?? []
+  const deliverySlices = normalizeDeliverySlices(config.delivery?.slices ?? [])
   const cacheKey = cacheOptions.enabled
     ? cacheKeyForBuildInput({
         contents,
@@ -813,6 +877,7 @@ async function buildConfigInput(
         kind: 'config',
         options: {
           css: config.css,
+          deliverySlices,
           outputFormats,
           outputs: config.outputs,
           subset,
@@ -844,21 +909,41 @@ async function buildConfigInput(
   const baseName = basename(input, extname(input))
   const css = config.css ?? {}
   const cssGlyphs = css.glyph === true ? cssGlyphsFromSubset(subset) : []
+  const fontSources =
+    deliverySlices.length === 0
+      ? [{ baseName, contents: source }]
+      : deliverySlices.map(slice => ({
+          baseName: `${baseName}-${slice.name}`,
+          contents: subsetTtf(source, {
+            missingGlyphs: 'ignore',
+            unicodeRanges: slice.unicodeRanges,
+          }),
+          unicodeRanges: slice.unicodeRanges,
+        }))
   const cssSources = []
   const outputs = config.outputs ?? []
   const buildOutputs = []
 
-  for (const format of outputFormats.filter(format => format !== 'css')) {
-    const fileName = outputFileName(outputs, format, `${baseName}.${format}`)
-    const output = convertFont(source, format)
-
-    buildOutputs.push({ contents: output, fileName })
-    cssSources.push({
-      ...(css.base64 === true && { contents: output }),
-      ...(cssGlyphs.length > 0 && { glyphs: cssGlyphs }),
-      fileName,
-      format,
-    })
+  for (const fontSource of fontSources) {
+    for (const format of outputFormats.filter(format => format !== 'css')) {
+      const fileName = outputFileName(
+        outputs,
+        format,
+        `${fontSource.baseName}.${format}`,
+      )
+      const output = convertFont(fontSource.contents, format)
+
+      buildOutputs.push({ contents: output, fileName })
+      cssSources.push({
+        ...(css.base64 === true && { contents: output }),
+        ...(cssGlyphs.length > 0 && { glyphs: cssGlyphs }),
+        ...(fontSource.unicodeRanges !== undefined && {
+          unicodeRanges: fontSource.unicodeRanges,
+        }),
+        fileName,
+        format,
+      })
+    }
   }
 
   if (outputFormats.includes('css')) {
@@ -884,6 +969,7 @@ async function buildConfigInput(
           glyph: css.glyph,
           iconPrefix: css.iconPrefix,
           local: css.local,
+          unicodeRanges: css.unicodeRanges,
         }),
       ),
       fileName: cssFileName,
@@ -1556,6 +1642,97 @@ function filterOriginalOutput(formats, noOriginal) {
   return noOriginal ? formats.filter(format => format !== 'ttf') : formats
 }
 
+function parseUnicodeRanges(values) {
+  return values.map(value => parseUnicodeRange(value))
+}
+
+function formatUnicodeEndpoint(codePoint) {
+  return codePoint.toString(16).toUpperCase().padStart(4, '0')
+}
+
+function parseUnicodeRange(value) {
+  const match =
+    /^u\+(?<start>[0-9a-f]{1,6})(?:-(?<end>[0-9a-f]{1,6}))?$/iu.exec(value)
+
+  if (match?.groups === undefined) {
+    throw new Error(`invalid Unicode range: ${value}`)
+  }
+
+  const start = Number.parseInt(match.groups.start, 16)
+  const end = Number.parseInt(match.groups.end ?? match.groups.start, 16)
+
+  if (start > end || end > 0x10_ff_ff || (start <= 0xdf_ff && end >= 0xd8_00)) {
+    throw new Error(`invalid Unicode range: ${value}`)
+  }
+
+  return start === end
+    ? `U+${formatUnicodeEndpoint(start)}`
+    : `U+${formatUnicodeEndpoint(start)}-${formatUnicodeEndpoint(end)}`
+}
+
+function parseDeliverySlices(values) {
+  const slices = []
+
+  for (const value of values) {
+    const separator = value.indexOf(':')
+
+    if (separator === -1) {
+      throw new Error(`delivery slice must use NAME:RANGE[,RANGE...]: ${value}`)
+    }
+
+    const name = value.slice(0, separator)
+    const unicodeRanges = value.slice(separator + 1).split(',')
+    const existing = slices.find(slice => slice.name === name)
+
+    if (existing === undefined) {
+      slices.push({ name, unicodeRanges })
+    } else {
+      existing.unicodeRanges.push(...unicodeRanges)
+    }
+  }
+
+  return normalizeDeliverySlices(slices)
+}
+
+function normalizeDeliverySlices(values) {
+  if (!Array.isArray(values)) {
+    throw new TypeError('delivery slices must be an array')
+  }
+
+  const names = new Set()
+
+  return values.map((value, index) => {
+    if (typeof value !== 'object' || value === null || Array.isArray(value)) {
+      throw new Error(`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(`invalid delivery slice name: ${name}`)
+    }
+    if (names.has(name)) {
+      throw new Error(`duplicate delivery slice name: ${name}`)
+    }
+    if (!Array.isArray(unicodeRanges) || unicodeRanges.length === 0) {
+      throw new Error(
+        `delivery slice \`${name}\` requires at least one Unicode range`,
+      )
+    }
+
+    names.add(name)
+
+    return {
+      name,
+      unicodeRanges: parseUnicodeRanges(unicodeRanges),
+    }
+  })
+}
+
 function parseUnicodes(value) {
   if (value === undefined) {
     return []
@@ -1818,13 +1995,12 @@ async function writeOutput(output, contents) {
 
 function usage(stream) {
   stream.write(`Usage:
-  fontmin-rs subset <input.ttf> -o <output.ttf> (-t|--text <text> | --text-file <file> | --unicodes <list> | -b|--basic-text) [--missing-glyphs <ignore|warn|error>]
-  fontmin-rs coverage <input> (-t|--text <text> | --text-file <file> | --unicodes <list> | -b|--basic-text) [--json]
-  fontmin-rs convert <input> -f <ttf|woff|woff2|eot|svg> -o <output> [--variation <TAG=VALUE>]...
-  fontmin-rs build <input> -o <out-dir> --formats <ttf,woff,woff2,eot,svg,css> [-t|--text <text>] [--text-file <file>] [--unicodes <list>] [--variation <TAG=VALUE>]... [-b|--basic-text] [-d|--deflate-woff] [-T|--show-time] [--silent] [--no-original] [--cache|--no-cache]
-  fontmin-rs build <input> -o <out-dir> --preset <compat|modern-web|iconfont> [-t|--text <text>] [--text-file <file>] [--unicodes <list>] [--variation <TAG=VALUE>]... [-b|--basic-text] [-d|--deflate-woff] [-T|--show-time] [--silent] [--no-original] [--cache|--no-cache]
-  fontmin-rs bench <input.ttf> [-t|--text <text>] [--text-file <file>] [--unicodes <list>] [-b|--basic-text] [--json]
-  fontmin-rs inspect <input.ttf> [--json]
+  fontmin-rs subset <INPUT> -o|--output <OUTPUT> (-t|--text <TEXT> | --text-file <FILE> | --unicodes <LIST> | -b|--basic-text) [--missing-glyphs <ignore|warn|error>]
+  fontmin-rs coverage <INPUT> (-t|--text <TEXT> | --text-file <FILE> | --unicodes <LIST> | -b|--basic-text) [--json]
+  fontmin-rs convert <INPUT> -f|--format <ttf|woff|woff2|eot|svg> -o|--output <OUTPUT> [--variation <TAG=VALUE>]...
+  fontmin-rs build <INPUT...> [-c|--config <CONFIG>] [-o|--out-dir <OUT_DIR>] [-t|--text <TEXT>] [--text-file <FILE>] [--unicodes <LIST>] [-b|--basic-text] [--missing-glyphs <ignore|warn|error>] [-d|--deflate-woff] [-T|--show-time] [--silent] [--cache] [--no-cache] [--css-glyph] [--css-unicode-range <RANGE>]... [--delivery-slice <NAME:RANGE[,RANGE...]>]... [--variation <TAG=VALUE>]... [--formats <FORMATS>] [--preset <compat|modern-web|iconfont>] [--no-original] [--font-family <FONT_FAMILY>] [--font-path <FONT_PATH>]
+  fontmin-rs bench <INPUT> [-t|--text <TEXT>] [--text-file <FILE>] [--unicodes <LIST>] [-b|--basic-text] [--json]
+  fontmin-rs inspect <INPUT> [--json]
   fontmin-rs init
   fontmin-rs doctor
 `)

package/dist/{compat-BxDug9v3.mjs → compat-BzwWTy_g.mjs}

@@ -512,7 +512,7 @@ function assertWasmOptionSupported(operation, name, value) {
 //#endregion
 //#region src/optimize.ts
 const CACHE_SCHEMA_VERSION = "v1";
-const FONTMIN_VERSION = "0.1.0";
+const FONTMIN_VERSION = "0.1.1";
 const DEFAULT_CACHE_DIR = "node_modules/.cache/fontmin-rs";
 const DEFAULT_SVG_ICON_START_UNICODE = 57345;
 const CSS_GLYPHS_META_KEY = "cssGlyphs";
@@ -1044,7 +1044,7 @@ async function runSvgs2Ttf(assets, options, runtime) {
 	const nonSvgAssets = assets.filter((asset) => asset.format !== "svg");
 	const firstSvg = svgAssets[0];
 	if (firstSvg === void 0) return assets;
-	const fontName = typeof options["fontName"] === "string" ? options["fontName"] : basenameWithoutExtension(firstSvg.path);
+	const fontName = typeof options["fontName"] === "string" ? options["fontName"] : "iconfont";
 	const icons = svgAssets.map((asset, index) => svgIconFromAsset(asset, index));
 	const cssGlyphs = cssGlyphsFromSvgIcons(icons, typeof options["startUnicode"] === "number" ? options["startUnicode"] : DEFAULT_SVG_ICON_START_UNICODE);
 	const ttfAsset = {

package/dist/compat.mjs

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

package/dist/index.mjs

@@ -1,4 +1,4 @@
-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-BxDug9v3.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-BzwWTy_g.mjs";
 import { css, definePlugin, deliverySlices, glyph, modernWeb, otf2ttf, svg2ttf, svgs2ttf, ttf2eot, ttf2svg, ttf2woff, ttf2woff2 } from "./plugins.mjs";
 import { fontminCompatPreset } from "./presets.mjs";
 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",
+  "version": "0.1.1",
   "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"
+    "@fontmin-rs/wasm": "0.1.1"
   },
   "devDependencies": {
     "@ntnyq/tsconfig": "^3.1.0",
@@ -70,7 +70,7 @@
     "vitest": "^4.1.10"
   },
   "optionalDependencies": {
-    "@fontmin-rs/binding": "0.1.0"
+    "@fontmin-rs/binding": "0.1.1"
   },
   "engines": {
     "node": ">=22.0.0"