Fix missing font size difference calculation in console output. Fixes #…

…89
Munter · May 23, 2020 · fb58286 · fb58286
1 parent 442214c
commit fb58286
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 0 deletions.
diff --git a/lib/subsetFonts.js b/lib/subsetFonts.js
@@ -448,6 +448,14 @@ async function getSubsetsForFontUsage(
               }
 
               fontUsage.subsets[format] = fontAsset.rawSrc;
+              const size = fontAsset.rawSrc.length;
+              if (
+                !fontUsage.smallestSubsetSize ||
+                size < fontUsage.smallestSubsetSize
+              ) {
+                fontUsage.smallestSubsetSize = size;
+                fontUsage.smallestSubsetFormat = format;
+              }
             }
           }
         }

diff --git a/test/subsetFonts.js b/test/subsetFonts.js
@@ -467,6 +467,64 @@ describe('subsetFonts', function() {
       ]);
     });
 
+    it('should return relevant font subsetting information', async function() {
+      httpception(defaultGoogleFontSubsetMock);
+
+      const assetGraph = new AssetGraph({
+        root: pathModule.resolve(
+          __dirname,
+          '../testdata/subsetFonts/html-link/'
+        )
+      });
+      assetGraph.on('warn', warn =>
+        expect(warn, 'to satisfy', /Cannot find module/)
+      );
+      await assetGraph.loadAssets('index.html');
+      await assetGraph.populate({
+        followRelations: {
+          crossorigin: false
+        }
+      });
+      const result = await subsetFontsWithoutFontTools(assetGraph, {
+        inlineFonts: false
+      });
+
+      expect(result, 'to exhaustively satisfy', {
+        fontInfo: [
+          {
+            htmlAsset: 'testdata/subsetFonts/html-link/index.html',
+            fontUsages: [
+              {
+                smallestOriginalSize: 17704,
+                smallestOriginalFormat: 'woff',
+                smallestSubsetSize: 14048,
+                smallestSubsetFormat: 'woff2',
+                texts: ['Hello'],
+                pageText: 'Helo',
+                text: 'Helo',
+                props: {
+                  'font-stretch': 'normal',
+                  'font-weight': '400',
+                  'font-style': 'normal',
+                  'font-family': 'Open Sans',
+                  src:
+                    "local('Open Sans'), local('OpenSans'), url(https://fonts.gstatic.com/s/opensans/v15/mem8YaGs126MiZpBA-UFVZ0d.woff) format('woff')"
+                },
+                fontUrl:
+                  'https://fonts.gstatic.com/s/opensans/v15/mem8YaGs126MiZpBA-UFVZ0d.woff',
+                fontFamilies: expect.it('to be a', Set),
+                codepoints: {
+                  original: expect.it('to be an array'),
+                  used: [101, 108, 111, 72],
+                  unused: expect.it('to be an array')
+                }
+              }
+            ]
+          }
+        ]
+      });
+    });
+
     describe('with `inlineCss: true`', function() {
       it('should inline the font Css and change outgoing relations to rootRelative', async function() {
         httpception(defaultGoogleFontSubsetMock);