Merge pull request #17 from papandreou/feature/assetgraph4

Update to assetgraph 4
Munter · Mar 8, 2018 · 5e35ad9 · 5e35ad9
2 parents 28ce1e1 + af689e1
commit 5e35ad9
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 57 deletions.
diff --git a/bin/subfont b/bin/subfont
@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 
-var optimist = require('optimist');
+const optimist = require('optimist');
 
-var commandLineOptions = optimist
+const commandLineOptions = optimist
   .usage('Create optimal font subsets from your actual font usage.\n$0 [options] <htmlFile(s) | url(s)>')
   .options('h', {
     alias: 'help',
@@ -58,11 +58,11 @@ var commandLineOptions = optimist
   .argv;
 
 if (commandLineOptions.h) {
-    optimist.showHelp();
-    process.exit(1);
+  optimist.showHelp();
+  process.exit(1);
 }
 
-var validFontDisplayValues = [
+const validFontDisplayValues = [
   'auto',
   'block',
   'swap',
@@ -75,15 +75,15 @@ if (validFontDisplayValues.indexOf(commandLineOptions['font-display']) === -1) {
   process.exit(1);
 }
 
-var urlTools = require('urltools');
-var rootUrl = commandLineOptions.root && urlTools.urlOrFsPathToUrl(commandLineOptions.root, true);
-var outRoot = commandLineOptions.output && urlTools.urlOrFsPathToUrl(commandLineOptions.output, true);
-var inPlace = commandLineOptions['in-place'];
-var inlineSubsets = commandLineOptions['inline-fonts'];
-var inlineCss = commandLineOptions['inline-css'];
-var fontDisplay = commandLineOptions['font-display'];
-var debug = commandLineOptions.debug;
-var inputUrls;
+const urlTools = require('urltools');
+let rootUrl = commandLineOptions.root && urlTools.urlOrFsPathToUrl(commandLineOptions.root, true);
+const outRoot = commandLineOptions.output && urlTools.urlOrFsPathToUrl(commandLineOptions.output, true);
+const inPlace = commandLineOptions['in-place'];
+const inlineSubsets = commandLineOptions['inline-fonts'];
+const inlineCss = commandLineOptions['inline-css'];
+const fontDisplay = commandLineOptions['font-display'];
+const debug = commandLineOptions.debug;
+let inputUrls;
 
 if (commandLineOptions._.length > 0) {
   inputUrls = commandLineOptions._.map(function (urlOrFsPath) {
@@ -119,64 +119,68 @@ if (!inPlace && !outRoot) {
   process.exit(1);
 }
 
-var AssetGraph = require('assetgraph');
-var query = AssetGraph.query;
+const AssetGraph = require('assetgraph');
 
-var assetGraphConfig = {
+const assetGraphConfig = {
   root: rootUrl
 };
 
 if (rootUrl.indexOf('file:') === -1) {
   assetGraphConfig.canonicalRoot = rootUrl.replace(/\/?$/, '/'); // Ensure trailing slash
 }
 
-var followRelationsQuery = {
+const followRelationsQuery = {
   crossorigin: false
 };
 
 if (!commandLineOptions.recursive) {
-  followRelationsQuery.type = AssetGraph.query.not(/Anchor$/);
+  followRelationsQuery.type = { $not: { $regex: /Anchor$/ } };
 }
 
 var assetGraph = new AssetGraph(assetGraphConfig);
-assetGraph
-  .logEvents()
-  .loadAssets(inputUrls)
-  .populate({
-    followRelations: followRelationsQuery
-  })
-  .subsetFonts({
-    debug: debug,
-    inlineSubsets: inlineSubsets,
-    inlineCss: inlineCss,
-    fontDisplay: fontDisplay
-  })
-  .queue(function omitFunctionCalls(assetGraph) {
-      assetGraph.findRelations({type: 'JavaScriptStaticUrl', to: {isLoaded: true}}).forEach(function (relation) {
-          relation.omitFunctionCall();
-      });
-  })
-  .if(rootUrl.indexOf('file:') === -1)
-    .queue(function rootRelativeRelations(assetGraph) {
-      assetGraph.findRelations().forEach(function (relation) {
+(async () => {
+  try {
+    await assetGraph.logEvents();
+    await assetGraph.loadAssets(inputUrls);
+    await assetGraph.populate({
+      followRelations: followRelationsQuery
+    });
+    const { fontInfo } = await assetGraph.subsetFonts({
+      inlineSubsets,
+      inlineCss,
+      fontDisplay
+    });
+
+    // Omit function calls:
+    assetGraph.findRelations({type: 'JavaScriptStaticUrl', to: {isLoaded: true}}).forEach(function (relation) {
+        relation.omitFunctionCall();
+    });
+
+    if (!rootUrl.startsWith('file:')) {
+      // Root-relative relations:
+
+      for (const relation of assetGraph.findRelations()) {
         if (relation.hrefType === 'protocolRelative' || relation.hrefType === 'absolute') {
           relation.hrefType = 'rootRelative';
         }
-      })
-    })
-    .moveAssets({ type: 'Html', isLoaded: true, isInline: false, fileName: query.or('', undefined) }, function (asset, assetGraph) {
-      var nextSuffixToTry = 0;
-      var url;
-      do {
-        url = asset.url.replace(rootUrl, outRoot).replace(/\/?$/, '/') + 'index' + (nextSuffixToTry ? '-' + nextSuffixToTry : '') + asset.defaultExtension;
-        nextSuffixToTry += 1;
-      } while (assetGraph.findAssets({ url: url }).length > 0);
-
-      return url;
-    })
-  .endif()
-
-  .writeAssetsToDisc({ isLoaded: true, url: AssetGraph.query.createPrefixMatcher(assetGraph.root) }, outRoot, assetGraph.root)
-  .run(function (assetGraph) {
+      }
+
+      await assetGraph.moveAssets({ type: 'Html', isLoaded: true, isInline: false, fileName: { $or: ['', undefined] } }, function (asset, assetGraph) {
+        return asset.url.replace(/\/?$/, '/') + 'index' + asset.defaultExtension;
+      });
+    }
+
+    await assetGraph.writeAssetsToDisc({
+      isLoaded: true,
+      url: url => url.startsWith(assetGraph.root)
+    }, outRoot, assetGraph.root);
+
+    if (debug) {
+      console.log(require('util').inspect(fontInfo, false, 99));
+    }
     console.log('Output written to', outRoot);
-  });
+  } catch (err) {
+    console.log(err.stack);
+    process.exit(1);
+  }
+})();
diff --git a/package.json b/package.json
@@ -26,7 +26,7 @@
   },
   "homepage": "/~https://github.com/Munter/subfont#readme",
   "dependencies": {
-    "assetgraph": "^3.13.1",
+    "assetgraph": "^4.0.0",
     "optimist": "^0.6.1",
     "urltools": "^0.3.5"
   }