subfont 7.0.0 → 7.1.1

package/CHANGELOG.md

@@ -1,3 +1,11 @@
+### v7.1.1 (2023-05-07)
+
+- [Fix file name generation when the font-family contains backslash Fixes \#171](https://github.com/Munter/subfont/commit/1cff3c4095680569ecf50d017035730eb4bd0cc0) ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+
+### v7.1.0 (2023-04-15)
+
+- [#170](https://github.com/Munter/subfont/pull/170) Use harfbuzzjs instead of fontkit ([Andreas Lind](mailto:andreaslindpetersen@gmail.com))
+
 ### v7.0.0 (2023-04-08)
 
 #### Pull requests

package/lib/getFontInfo.js

@@ -0,0 +1,27 @@
+const fontverter = require('fontverter');
+
+async function getFontInfoFromBuffer(buffer) {
+  const harfbuzzJs = await require('harfbuzzjs');
+
+  const blob = harfbuzzJs.createBlob(await fontverter.convert(buffer, 'sfnt')); // Load the font data into something Harfbuzz can use
+  const face = harfbuzzJs.createFace(blob, 0); // Select the first font in the file (there's normally only one!)
+
+  const fontInfo = {
+    characterSet: Array.from(face.collectUnicodes()),
+    variationAxes: face.getAxisInfos(),
+  };
+
+  face.destroy();
+  blob.destroy();
+
+  return fontInfo;
+}
+
+const fontInfoPromiseByBuffer = new WeakMap();
+
+module.exports = function getFontInfo(buffer) {
+  if (!fontInfoPromiseByBuffer.has(buffer)) {
+    fontInfoPromiseByBuffer.set(buffer, getFontInfoFromBuffer(buffer));
+  }
+  return fontInfoPromiseByBuffer.get(buffer);
+};

package/lib/subsetFonts.js

@@ -20,13 +20,13 @@ const injectSubsetDefinitions = require('./injectSubsetDefinitions');
 const cssFontParser = require('css-font-parser');
 const cssListHelpers = require('css-list-helpers');
 const LinesAndColumns = require('lines-and-columns').default;
-const fontkit = require('fontkit');
 const crypto = require('crypto');
 
 const unquote = require('./unquote');
 const normalizeFontPropertyValue = require('./normalizeFontPropertyValue');
 const getCssRulesByProperty = require('./getCssRulesByProperty');
 const unicodeRange = require('./unicodeRange');
+const getFontInfo = require('./getFontInfo');
 
 const googleFontsCssUrlRegex = /^(?:https?:)?\/\/fonts\.googleapis\.com\/css/;
 
@@ -383,26 +383,17 @@ function getSubsetPromiseId(fontUsage, format, variationAxes = null) {
   ].join('\x1d');
 }
 
-function createFontkitMemoizer(assetGraph) {
-  return memoizeSync(function (url) {
-    return fontkit.create(assetGraph.findAssets({ url })[0].rawSrc);
-  });
-}
-
-function getFullyPinnedVariationAxes(
-  fontkitMemoizer,
+async function getFullyPinnedVariationAxes(
+  assetGraph,
   fontUrl,
   seenAxisValuesByFontUrlAndAxisName
 ) {
-  let font;
-  try {
-    font = fontkitMemoizer(fontUrl);
-  } catch (err) {
-    // Don't break if we encounter an invalid font or one that's unsupported by fontkit
-    return;
-  }
+  const fontInfo = await getFontInfo(
+    assetGraph.findAssets({ url: fontUrl })[0].rawSrc
+  );
+
   let variationAxes;
-  const fontVariationEntries = Object.entries(font.variationAxes);
+  const fontVariationEntries = Object.entries(fontInfo.variationAxes);
   const seenAxisValuesByAxisName =
     seenAxisValuesByFontUrlAndAxisName.get(fontUrl);
   if (fontVariationEntries.length > 0 && seenAxisValuesByAxisName) {
@@ -435,7 +426,6 @@ async function getSubsetsForFontUsage(
   htmlOrSvgAssetTextsWithProps,
   formats,
   seenAxisValuesByFontUrlAndAxisName,
-  fontkitMemoizer,
   instance = false
 ) {
   const allFonts = [];
@@ -480,8 +470,8 @@ async function getSubsetsForFontUsage(
       const text = fontUsage.text;
       let variationAxes;
       if (instance) {
-        variationAxes = getFullyPinnedVariationAxes(
-          fontkitMemoizer,
+        variationAxes = await getFullyPinnedVariationAxes(
+          assetGraph,
           fontUsage.fontUrl,
           seenAxisValuesByFontUrlAndAxisName
         );
@@ -681,7 +671,7 @@ async function createSelfHostedGoogleFontsCssAsset(
     lines.push(`  src: ${srcFragments.join(', ')};`);
     lines.push(
       `  unicode-range: ${unicodeRange(
-        fontkit.create(cssFontFaceSrc.to.rawSrc).characterSet
+        (await getFontInfo(cssFontFaceSrc.to.rawSrc)).characterSet
       )};`
     );
     lines.push('}');
@@ -761,7 +751,10 @@ function parseFontStretchRange(str) {
   return [minFontStretch, maxFontStretch];
 }
 
-function warnAboutMissingGlyphs(htmlOrSvgAssetTextsWithProps, assetGraph) {
+async function warnAboutMissingGlyphs(
+  htmlOrSvgAssetTextsWithProps,
+  assetGraph
+) {
   const missingGlyphsErrors = [];
 
   for (const {
@@ -771,9 +764,9 @@ function warnAboutMissingGlyphs(htmlOrSvgAssetTextsWithProps, assetGraph) {
   } of htmlOrSvgAssetTextsWithProps) {
     for (const fontUsage of fontUsages) {
       if (fontUsage.subsets) {
-        const characterSet = fontkit.create(
+        const { characterSet } = await getFontInfo(
           Object.values(fontUsage.subsets)[0]
-        ).characterSet;
+        );
 
         let missedAny = false;
         for (const char of [...fontUsage.pageText]) {
@@ -953,12 +946,11 @@ function getVariationAxisUsage(htmlOrSvgAssetTextsWithProps) {
   return { seenAxisValuesByFontUrlAndAxisName, outOfBoundsAxesByFontUrl };
 }
 
-function warnAboutUnusedVariationAxes(
+async function warnAboutUnusedVariationAxes(
   assetGraph,
   seenAxisValuesByFontUrlAndAxisName,
   outOfBoundsAxesByFontUrl,
-  notFullyInstancedFontUrls,
-  fontkitMemoizer
+  notFullyInstancedFontUrls
 ) {
   const warnings = [];
   for (const [
@@ -969,17 +961,20 @@ function warnAboutUnusedVariationAxes(
       continue;
     }
     const outOfBoundsAxes = outOfBoundsAxesByFontUrl.get(fontUrl) || new Set();
-    let font;
+    let fontInfo;
     try {
-      font = fontkitMemoizer(fontUrl);
+      fontInfo = await getFontInfo(
+        assetGraph.findAssets({ url: fontUrl })[0].rawSrc
+      );
     } catch (err) {
-      // Don't break if we encounter an invalid font or one that's unsupported by fontkit
+      // Don't break if we encounter an invalid font
       continue;
     }
+
     const unusedAxes = [];
     const underutilizedAxes = [];
     for (const [name, { min, max, default: defaultValue }] of Object.entries(
-      font.variationAxes
+      fontInfo.variationAxes
     )) {
       if (ignoredVariationAxes.has(name)) {
         continue;
@@ -1290,7 +1285,8 @@ async function subsetFonts(
         let originalCodepoints;
         try {
           // Guard against 'Unknown font format' errors
-          originalCodepoints = fontkit.create(originalFont.rawSrc).characterSet;
+          originalCodepoints = (await getFontInfo(originalFont.rawSrc))
+            .characterSet;
         } catch (err) {}
         if (originalCodepoints) {
           const usedCodepoints = getCodepoints(fontUsage.text);
@@ -1323,25 +1319,21 @@ async function subsetFonts(
   const { seenAxisValuesByFontUrlAndAxisName, outOfBoundsAxesByFontUrl } =
     getVariationAxisUsage(htmlOrSvgAssetTextsWithProps);
 
-  const fontkitMemoizer = createFontkitMemoizer(assetGraph);
-
   // Generate subsets:
   const { notFullyInstancedFontUrls } = await getSubsetsForFontUsage(
     assetGraph,
     htmlOrSvgAssetTextsWithProps,
     formats,
     seenAxisValuesByFontUrlAndAxisName,
-    fontkitMemoizer,
     instance
   );
 
-  warnAboutMissingGlyphs(htmlOrSvgAssetTextsWithProps, assetGraph);
-  warnAboutUnusedVariationAxes(
+  await warnAboutMissingGlyphs(htmlOrSvgAssetTextsWithProps, assetGraph);
+  await warnAboutUnusedVariationAxes(
     assetGraph,
     seenAxisValuesByFontUrlAndAxisName,
     outOfBoundsAxesByFontUrl,
-    notFullyInstancedFontUrls,
-    fontkitMemoizer
+    notFullyInstancedFontUrls
   );
 
   // Insert subsets:
@@ -1483,9 +1475,11 @@ async function subsetFonts(
         .split(/\s+/)
         .map((token) => normalizeFontPropertyValue('font-weight', token))
         .join('_');
-      const fileNamePrefix = `${unquote(nameProps[0])
+      const fileNamePrefix = `${unquote(
+        cssFontParser.parseFontFamily(nameProps[0])[0]
+      )
         .replace(/__subset$/, '')
-        .replace(/ /g, '_')}-${fontWeightRangeStr}${
+        .replace(/[^a-z0-9_-]/gi, '_')}-${fontWeightRangeStr}${
         nameProps[2] === 'italic' ? 'i' : ''
       }`;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "subfont",
-  "version": "7.0.0",
+  "version": "7.1.1",
   "description": "Speeds up your pages initial paint by automatically subsetting local or Google fonts and loading them optimally",
   "engines": {
     "node": ">=10.0.0"
@@ -55,9 +55,9 @@
     "css-list-helpers": "^2.0.0",
     "font-snapper": "^1.2.0",
     "font-tracer": "^3.6.0",
-    "fontkit": "^1.8.0",
     "fontverter": "^2.0.0",
     "gettemporaryfilepath": "^1.0.1",
+    "harfbuzzjs": "^0.3.3",
     "lines-and-columns": "^1.1.6",
     "lodash": "^4.17.15",
     "memoizesync": "^1.1.1",