@turntrout/subfont 1.6.0 → 1.7.1

package/lib/escapeJsStringLiteral.js

@@ -0,0 +1,13 @@
+// Escape a value for safe inclusion in any JS string context (single-quoted,
+// double-quoted, or template literal). Uses JSON.stringify for robust escaping
+// of backslashes, quotes, newlines, U+2028, U+2029, etc.
+// The < escape prevents </script> from closing an inline script tag.
+function escapeJsStringLiteral(str) {
+  return JSON.stringify(str)
+    .slice(1, -1)
+    .replace(/'/g, "\\'")
+    .replace(/`/g, '\\x60')
+    .replace(/</g, '\\x3c');
+}
+
+module.exports = escapeJsStringLiteral;

package/lib/extractVisibleText.js

@@ -81,8 +81,12 @@ const namedEntities = {
 const entityRe = /&(?:#x([0-9a-fA-F]+)|#(\d+)|([a-zA-Z]+));/g;
 function decodeEntities(str) {
   return str.replace(entityRe, (match, hex, dec, name) => {
-    if (hex) return String.fromCodePoint(parseInt(hex, 16));
-    if (dec) return String.fromCodePoint(parseInt(dec, 10));
+    try {
+      if (hex) return String.fromCodePoint(parseInt(hex, 16));
+      if (dec) return String.fromCodePoint(parseInt(dec, 10));
+    } catch {
+      return match;
+    }
     if (name && namedEntities[name.toLowerCase()] !== undefined) {
       return namedEntities[name.toLowerCase()];
     }

package/lib/fontConverter.js

@@ -0,0 +1,25 @@
+const pathModule = require('path');
+const { Worker } = require('worker_threads');
+
+const workerPath = pathModule.join(__dirname, 'fontConverterWorker.js');
+
+function convert(buffer, targetFormat, sourceFormat) {
+  return new Promise((resolve, reject) => {
+    const worker = new Worker(workerPath);
+    worker.on('message', (msg) => {
+      worker.terminate();
+      if (msg.type === 'result') {
+        resolve(Buffer.from(msg.buffer));
+      } else {
+        reject(new Error(msg.error));
+      }
+    });
+    worker.on('error', (err) => {
+      worker.terminate();
+      reject(err);
+    });
+    worker.postMessage({ buffer, targetFormat, sourceFormat });
+  });
+}
+
+module.exports = { convert };

package/lib/fontConverterWorker.js

@@ -0,0 +1,16 @@
+const { parentPort } = require('worker_threads');
+const fontverter = require('fontverter');
+
+parentPort.on('message', async (msg) => {
+  try {
+    const buffer = Buffer.from(msg.buffer);
+    const result = await fontverter.convert(
+      buffer,
+      msg.targetFormat,
+      msg.sourceFormat
+    );
+    parentPort.postMessage({ type: 'result', buffer: result });
+  } catch (err) {
+    parentPort.postMessage({ type: 'error', error: err.message });
+  }
+});

package/lib/fontFaceHelpers.js

@@ -75,15 +75,27 @@ function getFontFaceDeclarationText(node, relations) {
 
 const fontOrder = ['woff2', 'woff', 'truetype'];
 
-function getFontFaceForFontUsage(fontUsage) {
-  const subsets = fontOrder
-    .filter((format) => fontUsage.subsets[format])
+// Cache base64-encoded data URIs keyed by the underlying Buffer. Subset
+// buffers are shared across pages (propagated from the canonical fontUsage),
+// so without this every page re-encodes the same multi-hundred-KB buffer.
+const subsetDataUrlCache = new WeakMap();
+function getSubsetDataUrls(subsetsObj) {
+  let cached = subsetDataUrlCache.get(subsetsObj);
+  if (cached) return cached;
+  cached = fontOrder
+    .filter((format) => subsetsObj[format])
     .map((format) => ({
       format,
-      url: `data:${contentTypeByFontFormat[format]};base64,${fontUsage.subsets[
+      url: `data:${contentTypeByFontFormat[format]};base64,${subsetsObj[
         format
       ].toString('base64')}`,
     }));
+  subsetDataUrlCache.set(subsetsObj, cached);
+  return cached;
+}
+
+function getFontFaceForFontUsage(fontUsage) {
+  const subsets = getSubsetDataUrls(fontUsage.subsets);
 
   const resultString = ['@font-face {'];
 

package/lib/gatherStylesheetsWithPredicates.js

@@ -3,18 +3,17 @@ module.exports = function gatherStylesheetsWithPredicates(
   htmlAsset,
   relationIndex
 ) {
-  const assetStack = [];
+  const visiting = new Set();
   const incomingMedia = [];
   const conditionalCommentConditionStack = [];
   const result = [];
   (function traverse(asset, isWithinNotIeConditionalComment, isWithinNoscript) {
-    if (assetStack.includes(asset)) {
-      // Cycle detected
+    if (visiting.has(asset)) {
       return;
     } else if (!asset.isLoaded) {
       return;
     }
-    assetStack.push(asset);
+    visiting.add(asset);
     // Use pre-built index if available, otherwise fall back to findRelations
     const relations = relationIndex
       ? relationIndex.get(asset) || []
@@ -60,7 +59,7 @@ module.exports = function gatherStylesheetsWithPredicates(
         }
       }
     }
-    assetStack.pop();
+    visiting.delete(asset);
     if (asset.type === 'Css') {
       const predicates = {};
       for (const incomingMedium of incomingMedia) {

package/lib/normalizeFontPropertyValue.js

@@ -34,7 +34,7 @@ function isValidWeight(weight) {
 function normalizeFontPropertyValue(propName, value) {
   const propNameLowerCase = propName.toLowerCase();
   if (value === undefined) {
-    return initialValueByProp[propName];
+    return initialValueByProp[propNameLowerCase];
   }
   if (propNameLowerCase === 'font-family') {
     return unquote(value);

package/lib/sfntCache.js

@@ -1,4 +1,5 @@
 const fontverter = require('fontverter');
+const { convert } = require('./fontConverter');
 
 const sfntPromiseByBuffer = new WeakMap();
 
@@ -9,13 +10,15 @@ function toSfnt(buffer) {
   let promise;
   try {
     const format = fontverter.detectFormat(buffer);
-    promise =
-      format === 'sfnt'
-        ? Promise.resolve(buffer)
-        : fontverter.convert(buffer, 'sfnt');
-  } catch (err) {
-    // Unrecognized format — don't cache so retries work
-    return fontverter.convert(buffer, 'sfnt');
+    if (format === 'sfnt') {
+      promise = Promise.resolve(buffer);
+    } else if (format === 'woff2') {
+      promise = convert(buffer, 'sfnt');
+    } else {
+      promise = fontverter.convert(buffer, 'sfnt');
+    }
+  } catch {
+    promise = convert(buffer, 'sfnt');
   }
   // Evict on rejection so retries with the same buffer aren't stuck
   promise.catch(() => sfntPromiseByBuffer.delete(buffer));

package/lib/subfont.d.ts

@@ -0,0 +1,33 @@
+import AssetGraph = require('assetgraph');
+declare class UsageError extends Error {
+    constructor(message: string);
+}
+interface SubfontOptions {
+    root?: string;
+    canonicalRoot?: string;
+    output?: string;
+    debug?: boolean;
+    dryRun?: boolean;
+    silent?: boolean;
+    inlineCss?: boolean;
+    fontDisplay?: string;
+    inPlace?: boolean;
+    inputFiles?: Array<string | URL>;
+    recursive?: boolean;
+    relativeUrls?: boolean;
+    dynamic?: boolean;
+    fallbacks?: boolean;
+    text?: string;
+    sourceMaps?: boolean;
+    concurrency?: number;
+    chromeFlags?: string[];
+    cache?: boolean | string;
+    strict?: boolean;
+}
+interface SubfontFn {
+    (options: SubfontOptions, console?: Console): Promise<InstanceType<typeof AssetGraph>>;
+    UsageError: typeof UsageError;
+}
+declare const subfont: SubfontFn;
+export = subfont;
+//# sourceMappingURL=subfont.d.ts.map

package/lib/subfont.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"subfont.d.ts","sourceRoot":"","sources":["../src/subfont.ts"],"names":[],"mappings":"AAKA,OAAO,UAAU,GAAG,QAAQ,YAAY,CAAC,CAAC;AAQ1C,cAAM,UAAW,SAAQ,KAAK;gBAChB,OAAO,EAAE,MAAM;CAI5B;AAED,UAAU,cAAc;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,KAAK,CAAC,MAAM,GAAG,GAAG,CAAC,CAAC;IACjC,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,EAAE,CAAC;IACvB,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;IACzB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAqBD,UAAU,SAAS;IACjB,CACE,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,OAAO,GAChB,OAAO,CAAC,YAAY,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC;IAC5C,UAAU,EAAE,OAAO,UAAU,CAAC;CAC/B;AAED,QAAA,MAAM,OAAO,EA6pBR,SAAS,CAAC;AAIf,SAAS,OAAO,CAAC"}