@turntrout/subfont 1.0.4 → 1.0.5

package/lib/FontTracerPool.js

@@ -159,6 +159,17 @@ class FontTracerPool {
     }
     this._pendingTasks = [];
 
+    // Reject any in-flight tasks still assigned to workers.
+    // Clear _taskByWorker before terminate() so _onWorkerExit won't double-reject.
+    for (const [, taskId] of this._taskByWorker) {
+      const cb = this._taskCallbacks.get(taskId);
+      if (cb) {
+        this._taskCallbacks.delete(taskId);
+        cb.reject(new Error('Worker pool destroyed'));
+      }
+    }
+    this._taskByWorker.clear();
+
     // Terminate workers with a 5-second timeout to prevent hanging
     const TERMINATE_TIMEOUT_MS = 5000;
     await Promise.all(

package/lib/HeadlessBrowser.js

@@ -180,7 +180,8 @@ class HeadlessBrowser {
         urlTools.resolveUrl(
           baseUrl,
           urlTools.buildRelativeUrl(assetGraph.root, htmlAsset.url)
-        )
+        ),
+        { timeout: 30000 }
       );
 
       await page.addScriptTag({

package/lib/extractVisibleText.js

@@ -10,6 +10,7 @@ const INVISIBLE_ELEMENTS = new Set([
   'iframe',
   'object',
   'embed',
+  'datalist',
 ]);
 const TEXT_ATTRIBUTES = new Set([
   'alt',
@@ -72,3 +73,4 @@ function extractVisibleText(html) {
 }
 
 module.exports = extractVisibleText;
+module.exports.INVISIBLE_ELEMENTS = INVISIBLE_ELEMENTS;

package/lib/subfont.js

@@ -216,14 +216,15 @@ module.exports = async function subfont(
     }
   }
 
-  let sumSizesBefore = 0;
-  for (const asset of assetGraph.findAssets({
+  const sizeableAssetQuery = {
     isInline: false,
     isLoaded: true,
     type: {
       $in: ['Html', 'Svg', 'Css', 'JavaScript'],
     },
-  })) {
+  };
+  let sumSizesBefore = 0;
+  for (const asset of assetGraph.findAssets(sizeableAssetQuery)) {
     sumSizesBefore += asset.rawSrc.length;
   }
 
@@ -269,13 +270,7 @@ module.exports = async function subfont(
 
   phaseStart = Date.now();
   let sumSizesAfter = 0;
-  for (const asset of assetGraph.findAssets({
-    isInline: false,
-    isLoaded: true,
-    type: {
-      $in: ['Html', 'Svg', 'Css', 'JavaScript'],
-    },
-  })) {
+  for (const asset of assetGraph.findAssets(sizeableAssetQuery)) {
     sumSizesAfter += asset.rawSrc.length;
   }
 

package/lib/unicodeRange.js

@@ -14,7 +14,7 @@ const getUnicodeRanges = (codePoints) => {
   const ranges = [];
   let start, end;
 
-  codePoints.sort((a, b) => a - b);
+  codePoints = [...codePoints].sort((a, b) => a - b);
 
   for (let i = 0; i < codePoints.length; i++) {
     start = codePoints[i];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@turntrout/subfont",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "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"