@turntrout/subfont 1.7.0 → 1.8.0

package/lib/warnAboutMissingGlyphs.js

@@ -1,155 +1,147 @@
-const LinesAndColumns = require('lines-and-columns').default;
-const getFontInfo = require('./getFontInfo');
-const unicodeRange = require('./unicodeRange');
-
-async function warnAboutMissingGlyphs(
-  htmlOrSvgAssetTextsWithProps,
-  assetGraph
-) {
-  const missingGlyphsErrors = [];
-
-  // Collect all unique subset buffers and parse them concurrently.
-  // getFontInfo internally serializes harfbuzzjs WASM calls, so
-  // Promise.all just queues them up rather than running in parallel.
-  const uniqueSubsetBuffers = new Map();
-  for (const { fontUsages } of htmlOrSvgAssetTextsWithProps) {
-    for (const fontUsage of fontUsages) {
-      if (!fontUsage.subsets) continue;
-      const subsetBuffer = Object.values(fontUsage.subsets)[0];
-      if (!uniqueSubsetBuffers.has(subsetBuffer)) {
-        uniqueSubsetBuffers.set(
-          subsetBuffer,
-          getFontInfo(subsetBuffer)
-            .then((info) => new Set(info.characterSet))
-            .catch((err) => {
-              assetGraph.warn(err);
-              return null;
-            })
-        );
-      }
-    }
-  }
-  const subsetCharSetCache = new Map();
-  await Promise.all(
-    [...uniqueSubsetBuffers.entries()].map(async ([buffer, promise]) => {
-      subsetCharSetCache.set(buffer, await promise);
-    })
-  );
-
-  for (const {
-    htmlOrSvgAsset,
-    fontUsages,
-    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);
+"use strict";
+const lines_and_columns_1 = require("lines-and-columns");
+const getFontInfo = require("./getFontInfo");
+const unicodeRange = require("./unicodeRange");
+async function warnAboutMissingGlyphs(htmlOrSvgAssetTextsWithProps, assetGraph) {
+    const missingGlyphsErrors = [];
+    // Collect all unique subset buffers and parse them concurrently.
+    // getFontInfo internally serializes harfbuzzjs WASM calls, so
+    // Promise.all just queues them up rather than running in parallel.
+    const uniqueSubsetBuffers = new Map();
+    for (const { fontUsages } of htmlOrSvgAssetTextsWithProps) {
+        for (const fontUsage of fontUsages) {
+            if (!fontUsage.subsets)
+                continue;
+            const subsetBuffer = Object.values(fontUsage.subsets)[0];
+            if (!uniqueSubsetBuffers.has(subsetBuffer)) {
+                uniqueSubsetBuffers.set(subsetBuffer, getFontInfo(subsetBuffer)
+                    .then((info) => new Set(info.characterSet))
+                    // eslint-disable-next-line no-restricted-syntax
+                    .catch((rawErr) => {
+                    assetGraph.warn(rawErr);
+                    return null;
+                }));
             }
-            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];
-      const characterSetLookup = subsetCharSetCache.get(subsetBuffer);
-      if (!characterSetLookup) continue; // getFontInfo failed on subset; already warned
-
-      let missedAny = false;
-      for (const char of fontUsage.pageText) {
-        // Turns out that browsers don't mind that these are missing:
-        if (char === '\t' || char === '\n') {
-          continue;
-        }
-
-        const codePoint = char.codePointAt(0);
-
-        const isMissing = !characterSetLookup.has(codePoint);
-
-        if (isMissing) {
-          // 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.
-          const { firstLocation, occurrences } = lookupChar(char);
-
-          missingGlyphsErrors.push({
-            codePoint,
-            char,
-            htmlOrSvgAsset,
-            fontUsage,
-            location: firstLocation,
-            occurrences,
-          });
-          missedAny = true;
         }
-      }
-      if (missedAny) {
-        const fontFaces = accumulatedFontFaceDeclarations.filter((fontFace) =>
-          fontUsage.fontFamilies.has(fontFace['font-family'])
-        );
-        for (const fontFace of fontFaces) {
-          const cssFontFaceSrc = fontFace.relations[0];
-          const fontFaceDeclaration = cssFontFaceSrc.node;
-          if (
-            !fontFaceDeclaration.some((node) => node.prop === 'unicode-range')
-          ) {
-            fontFaceDeclaration.append({
-              prop: 'unicode-range',
-              value: unicodeRange(fontUsage.codepoints.original),
-            });
-            cssFontFaceSrc.from.markDirty();
-          }
+    }
+    const subsetCharSetCache = new Map();
+    await Promise.all([...uniqueSubsetBuffers.entries()].map(async ([buffer, promise]) => {
+        subsetCharSetCache.set(buffer, await promise);
+    }));
+    // Codepoint unions per @font-face declaration, keyed by the at-rule node.
+    // Built across all fontUsages on a page, then flushed in a single append
+    // per @font-face so multiple fontUsages sharing a family don't lose data.
+    const unicodeRangeAccumulator = new Map();
+    for (const { htmlOrSvgAsset, fontUsages, 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) => {
+            const cachedHit = charLookupCache.get(char);
+            if (cachedHit)
+                return cachedHit;
+            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 lines_and_columns_1.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 result = { firstLocation, occurrences };
+            charLookupCache.set(char, result);
+            return result;
+        };
+        for (const fontUsage of fontUsages) {
+            if (!fontUsage.subsets)
+                continue;
+            const subsetBuffer = Object.values(fontUsage.subsets)[0];
+            const characterSetLookup = subsetCharSetCache.get(subsetBuffer);
+            if (!characterSetLookup)
+                continue; // getFontInfo failed on subset; already warned
+            let missedAny = false;
+            for (const char of fontUsage.pageText) {
+                // Turns out that browsers don't mind that these are missing:
+                if (char === '\t' || char === '\n') {
+                    continue;
+                }
+                const codePoint = char.codePointAt(0);
+                if (codePoint === undefined)
+                    continue;
+                const isMissing = !characterSetLookup.has(codePoint);
+                if (isMissing) {
+                    // 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.
+                    const { firstLocation, occurrences } = lookupChar(char);
+                    missingGlyphsErrors.push({
+                        codePoint,
+                        char,
+                        htmlOrSvgAsset,
+                        fontUsage,
+                        location: firstLocation,
+                        occurrences,
+                    });
+                    missedAny = true;
+                }
+            }
+            if (missedAny) {
+                for (const fontFace of accumulatedFontFaceDeclarations) {
+                    const family = fontFace['font-family'];
+                    if (!family || !fontUsage.fontFamilies.has(family))
+                        continue;
+                    const relation = fontFace.relations[0];
+                    const node = relation.node;
+                    if (node.some((decl) => decl.prop === 'unicode-range'))
+                        continue;
+                    let entry = unicodeRangeAccumulator.get(node);
+                    if (!entry) {
+                        entry = { relation, codepoints: new Set() };
+                        unicodeRangeAccumulator.set(node, entry);
+                    }
+                    for (const cp of fontUsage.codepoints.original) {
+                        entry.codepoints.add(cp);
+                    }
+                }
+            }
         }
-      }
     }
-  }
-
-  if (missingGlyphsErrors.length) {
-    const errorLog = missingGlyphsErrors.map(
-      ({ char, fontUsage, location, occurrences }) => {
-        const extra = occurrences > 1 ? ` (+${occurrences - 1} more)` : '';
-        return `- \\u{${char.codePointAt(0).toString(16)}} (${char}) in font-family '${
-          fontUsage.props['font-family']
-        }' (${fontUsage.props['font-weight']}/${
-          fontUsage.props['font-style']
-        }) at ${location}${extra}`;
-      }
-    );
-
-    const message = `Missing glyph fallback detected.
+    // Flush accumulated unicode-range declarations: one append per @font-face,
+    // covering every fontUsage that mapped to it.
+    for (const { relation, codepoints } of unicodeRangeAccumulator.values()) {
+        relation.node.append({
+            prop: 'unicode-range',
+            value: unicodeRange([...codepoints]),
+        });
+        relation.from.markDirty();
+    }
+    if (missingGlyphsErrors.length) {
+        const errorLog = missingGlyphsErrors.map(({ char, fontUsage, location, occurrences }) => {
+            const extra = occurrences > 1 ? ` (+${occurrences - 1} more)` : '';
+            return `- \\u{${char.codePointAt(0).toString(16)}} (${char}) in font-family '${fontUsage.props['font-family']}' (${fontUsage.props['font-weight']}/${fontUsage.props['font-style']}) at ${location}${extra}`;
+        });
+        const message = `Missing glyph fallback detected.
 When your primary webfont doesn't contain the glyphs you use, browsers that don't support unicode-range will load your fallback fonts, which will be a potential waste of bandwidth.
 These glyphs are used on your site, but they don't exist in the font you applied to them:`;
-
-    assetGraph.info(new Error(`${message}\n${errorLog.join('\n')}`));
-  }
+        assetGraph.info(new Error(`${message}\n${errorLog.join('\n')}`));
+    }
 }
-
 module.exports = warnAboutMissingGlyphs;
+//# sourceMappingURL=warnAboutMissingGlyphs.js.map

package/lib/warnAboutMissingGlyphs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"warnAboutMissingGlyphs.js","sourceRoot":"","sources":["../src/warnAboutMissingGlyphs.ts"],"names":[],"mappings":"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"}

package/lib/wasmQueue.d.ts

@@ -0,0 +1,3 @@
+declare function enqueue<T>(fn: () => Promise<T>): Promise<T>;
+export = enqueue;
+//# sourceMappingURL=wasmQueue.d.ts.map

package/lib/wasmQueue.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"wasmQueue.d.ts","sourceRoot":"","sources":["../src/wasmQueue.ts"],"names":[],"mappings":"AASA,iBAAS,OAAO,CAAC,CAAC,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAepD;AAED,SAAS,OAAO,CAAC"}

package/lib/wasmQueue.js

@@ -1,18 +1,21 @@
+"use strict";
 // Shared serialization queue for harfbuzzjs WASM calls.
 // harfbuzzjs returns corrupt results when multiple calls run concurrently
 // on the shared module instance. This queue ensures only one WASM
 // operation runs at a time across getFontInfo and collectFeatureGlyphIds.
+//
+// The previous task's resolved value is irrelevant — the queue only sequences
+// in-flight work — so we erase it via .then(() => undefined).
 let queue = Promise.resolve();
-
 function enqueue(fn) {
-  // 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;
+    // 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.
+    const next = queue.then(() => fn(), () => fn());
+    // Discard the resolved value (and swallow rejections for queue advancement
+    // only — the caller sees the original promise via `next`).
+    queue = next.then(() => undefined, () => undefined);
+    return next;
 }
-
 module.exports = enqueue;
+//# sourceMappingURL=wasmQueue.js.map

package/lib/wasmQueue.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"wasmQueue.js","sourceRoot":"","sources":["../src/wasmQueue.ts"],"names":[],"mappings":";AAAA,wDAAwD;AACxD,0EAA0E;AAC1E,kEAAkE;AAClE,0EAA0E;AAC1E,EAAE;AACF,8EAA8E;AAC9E,8DAA8D;AAC9D,IAAI,KAAK,GAAkB,OAAO,CAAC,OAAO,EAAE,CAAC;AAE7C,SAAS,OAAO,CAAI,EAAoB;IACtC,uEAAuE;IACvE,sEAAsE;IACtE,uEAAuE;IACvE,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CACrB,GAAG,EAAE,CAAC,EAAE,EAAE,EACV,GAAG,EAAE,CAAC,EAAE,EAAE,CACX,CAAC;IACF,2EAA2E;IAC3E,2DAA2D;IAC3D,KAAK,GAAG,IAAI,CAAC,IAAI,CACf,GAAG,EAAE,CAAC,SAAS,EACf,GAAG,EAAE,CAAC,SAAS,CAChB,CAAC;IACF,OAAO,IAAI,CAAC;AACd,CAAC;AAED,iBAAS,OAAO,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turntrout/subfont",
-  "version": "1.7.0",
+  "version": "1.8.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"
@@ -68,6 +68,8 @@
     "yargs": "^17.7.2"
   },
   "devDependencies": {
+    "@types/node": "^20.0.0",
+    "@types/yargs": "^17.0.0",
     "canvas": "npm:@napi-rs/canvas@^0.1.97",
     "combos": "^0.2.0",
     "coveralls": "^3.0.9",
@@ -86,7 +88,11 @@
     "prettier": "^3.0.0",
     "proxyquire": "^2.1.1",
     "puppeteer": "^24.39.1",
+    "rimraf": "^6.0.0",
     "sinon": "^19.0.0",
+    "subset-font": "^2.5.0",
+    "typescript": "^5.6.0",
+    "typescript-eslint": "^8.59.0",
     "unexpected": "^11.8.1",
     "unexpected-check": "^2.3.1",
     "unexpected-resemble": "^5.0.1",
@@ -94,7 +100,11 @@
     "unexpected-sinon": "^10.11.2"
   },
   "scripts": {
-    "lint": "eslint . && prettier --check '**/*.{js,md}'",
+    "build": "tsc && chmod +x lib/cli.js",
+    "clean": "rimraf 'lib/*.{js,d.ts,d.ts.map,js.map}'",
+    "typecheck": "tsc --noEmit",
+    "lint": "eslint . && prettier --check '**/*.{js,ts,md}'",
+    "pretest": "npm run build",
     "test": "mocha && npm run lint",
     "coverage": "nyc --reporter=lcov --reporter=text -- mocha",
     "check-coverage": "nyc check-coverage",