@turntrout/subfont 1.5.1 → 1.7.0

package/lib/unquote.js

@@ -1,10 +1,15 @@
 function unescapeCssString(str) {
   return str.replace(
     /\\([0-9a-f]{1,6})(\s?)/gi,
-    ($0, hexChars, followingWhitespace) =>
-      `${String.fromCodePoint(parseInt(hexChars, 16))}${
-        hexChars.length === 6 ? followingWhitespace : ''
-      }`
+    ($0, hexChars, followingWhitespace) => {
+      try {
+        return `${String.fromCodePoint(parseInt(hexChars, 16))}${
+          hexChars.length === 6 ? followingWhitespace : ''
+        }`;
+      } catch {
+        return $0;
+      }
+    }
   );
 }
 

package/lib/variationAxes.js

@@ -8,26 +8,11 @@ const standardVariationAxes = new Set(['wght', 'wdth', 'ital', 'slnt', 'opsz']);
 // CSS maps oblique to slnt -14.
 const DEFAULT_OBLIQUE_SLNT = -14;
 
-// When no opsz values are determined from font-size or font-variation-settings,
-// the axis is pinned to its default value rather than preserving the full range,
-// which can significantly bloat variable font subsets.
+// When no opsz values are determined from font-variation-settings, the axis is
+// pinned to its default value rather than preserving the full range, which can
+// significantly bloat variable font subsets.
 const ignoredVariationAxes = new Set();
 
-// Parse a CSS font-size value to a numeric px value.
-// Returns the number if the value is in absolute units (px, pt), NaN otherwise.
-// Relative units (em, rem, %, vw, etc.) cannot be resolved without DOM context.
-const PX_PER_PT = 4 / 3;
-function parseFontSizePx(value) {
-  if (typeof value === 'number') return value;
-  if (typeof value !== 'string') return NaN;
-  const match = value.match(/^([\d.]+)(px|pt)?$/i);
-  if (!match) return NaN;
-  const num = parseFloat(match[1]);
-  if (Number.isNaN(num) || num <= 0) return NaN;
-  const unit = (match[2] || 'px').toLowerCase();
-  return unit === 'pt' ? num * PX_PER_PT : num;
-}
-
 function clamp(value, min, max) {
   return Math.min(Math.max(value, min), max);
 }
@@ -71,7 +56,6 @@ function getVariationAxisUsage(
       fontWeights,
       fontStretches,
       fontVariationSettings,
-      fontSizes,
       props,
     } of fontUsages) {
       if (seenFontUrls.has(fontUrl)) continue;
@@ -113,18 +97,6 @@ function getVariationAxisUsage(
         );
       }
 
-      // Map font-size to the opsz axis. With font-optical-sizing: auto
-      // (the CSS default), browsers set opsz = font-size in px.
-      // Only absolute units (px, pt) can be resolved without DOM context.
-      if (fontSizes) {
-        for (const fontSize of fontSizes) {
-          const px = parseFontSizePx(fontSize);
-          if (!Number.isNaN(px)) {
-            noteUsedValue(fontUrl, 'opsz', px);
-          }
-        }
-      }
-
       for (const fontVariationSettingsValue of fontVariationSettings) {
         for (const [axisName, axisValue] of parseFontVariationSettings(
           fontVariationSettingsValue
@@ -195,7 +167,6 @@ async function getVariationAxisBounds(
 module.exports = {
   standardVariationAxes,
   ignoredVariationAxes,
-  parseFontSizePx,
   renderNumberRange,
   getVariationAxisUsage,
   getVariationAxisBounds,

package/lib/warnAboutMissingGlyphs.js

@@ -42,6 +42,41 @@ async function warnAboutMissingGlyphs(
     accumulatedFontFaceDeclarations,
   } of htmlOrSvgAssetTextsWithProps) {
     let linesAndColumns;
+    // Dedupe scans for the same missing char across different fontUsages on
+    // this page. On KaTeX-heavy pages the same symbol is often missing in
+    // several font-families, and each scan is an O(N) walk of the HTML text.
+    const charLookupCache = new Map();
+    const lookupChar = (char) => {
+      let cached = charLookupCache.get(char);
+      if (cached) return cached;
+      let firstLocation;
+      let occurrences = 0;
+      if (char.length > 0) {
+        const sourceText = htmlOrSvgAsset.text;
+        let searchIdx = 0;
+        while (true) {
+          const charIdx = sourceText.indexOf(char, searchIdx);
+          if (charIdx === -1) break;
+          occurrences++;
+          if (occurrences === 1) {
+            if (!linesAndColumns) {
+              linesAndColumns = new LinesAndColumns(sourceText);
+            }
+            const position = linesAndColumns.locationForIndex(charIdx);
+            firstLocation = `${htmlOrSvgAsset.urlOrDescription}:${
+              position.line + 1
+            }:${position.column + 1}`;
+          }
+          searchIdx = charIdx + char.length;
+        }
+      }
+      if (!firstLocation) {
+        firstLocation = `${htmlOrSvgAsset.urlOrDescription} (generated content)`;
+      }
+      cached = { firstLocation, occurrences };
+      charLookupCache.set(char, cached);
+      return cached;
+    };
     for (const fontUsage of fontUsages) {
       if (!fontUsage.subsets) continue;
       const subsetBuffer = Object.values(fontUsage.subsets)[0];
@@ -63,31 +98,7 @@ async function warnAboutMissingGlyphs(
           // Report only the first location plus a count of remaining
           // occurrences. A character like U+200B can appear thousands of
           // times on a page and per-occurrence lines drown the log.
-          let firstLocation;
-          let occurrences = 0;
-          if (char.length > 0) {
-            const sourceText = htmlOrSvgAsset.text;
-            let searchIdx = 0;
-            while (true) {
-              const charIdx = sourceText.indexOf(char, searchIdx);
-              if (charIdx === -1) break;
-              occurrences++;
-              if (occurrences === 1) {
-                if (!linesAndColumns) {
-                  linesAndColumns = new LinesAndColumns(sourceText);
-                }
-                const position = linesAndColumns.locationForIndex(charIdx);
-                firstLocation = `${htmlOrSvgAsset.urlOrDescription}:${
-                  position.line + 1
-                }:${position.column + 1}`;
-              }
-              searchIdx = charIdx + char.length;
-            }
-          }
-
-          if (!firstLocation) {
-            firstLocation = `${htmlOrSvgAsset.urlOrDescription} (generated content)`;
-          }
+          const { firstLocation, occurrences } = lookupChar(char);
 
           missingGlyphsErrors.push({
             codePoint,

package/lib/wasmQueue.js

@@ -5,10 +5,14 @@
 let queue = Promise.resolve();
 
 function enqueue(fn) {
-  return (queue = queue.then(
+  // Chain fn after the previous task settles. Both handlers wrap fn() in
+  // an arrow to avoid leaking the previous result/error as an argument.
+  // The error handler ensures a prior rejection doesn't block the queue.
+  queue = queue.then(
     () => fn(),
     () => fn()
-  ));
+  );
+  return queue;
 }
 
 module.exports = enqueue;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turntrout/subfont",
-  "version": "1.5.1",
+  "version": "1.7.0",
   "description": "Automatically subset web fonts to only the characters used on your pages. Fork of Munter/subfont with modern defaults.",
   "engines": {
     "node": ">=18.0.0"
@@ -57,12 +57,12 @@
     "jsdom": "^25.0.0",
     "lines-and-columns": "^1.1.6",
     "memoizesync": "^1.1.1",
-    "p-limit": "^3.0.0",
     "parse5": "^7.0.0",
     "postcss": "^8.3.11",
     "postcss-value-parser": "^4.0.2",
     "pretty-bytes": "^5.1.0",
     "puppeteer-core": "^24.39.1",
+    "sanitize-filename": "^1.6.4",
     "specificity": "^0.4.1",
     "urltools": "^0.4.1",
     "yargs": "^17.7.2"