webfont 8.1.3 → 9.0.0

package/dist/standalone.js

@@ -3,241 +3,72 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
-exports.default = function (initialOptions) {
-  if (!initialOptions || !initialOptions.files) {
-    throw new Error("You must pass webfont a `files` glob");
-  }
-
-  let options = Object.assign({}, {
-    ascent: undefined, // eslint-disable-line no-undefined
-    centerHorizontally: false,
-    descent: 0,
-    fixedWidth: false,
-    fontHeight: null,
-    fontId: null,
-    fontName: "webfont",
-    fontStyle: "",
-    fontWeight: "",
-    formats: ["svg", "ttf", "eot", "woff", "woff2"],
-    formatsOptions: {
-      ttf: {
-        copyright: null,
-        ts: null,
-        version: null
-      }
-    },
-    glyphTransformFn: null,
-    // Maybe allow setup from CLI
-    maxConcurrency: _os2.default.cpus().length,
-    metadata: null,
-    metadataProvider: null,
-    normalize: false,
-    prependUnicode: false,
-    round: 10e12,
-    startUnicode: 0xea01,
-    template: null,
-    templateClassName: null,
-    templateFontName: null,
-    templateFontPath: "./",
-    verbose: false
-  }, initialOptions);
-
-  let glyphsData = [];
-
-  return buildConfig({
-    configFile: options.configFile
-  }).then(loadedConfig => {
-    if (Object.keys(loadedConfig).length > 0) {
-      options = (0, _lodash2.default)({}, options, loadedConfig.config);
-      options.filePath = loadedConfig.filepath;
-    }
-
-    return (0, _globby2.default)([].concat(options.files)).then(foundFiles => {
-      const filteredFiles = foundFiles.filter(foundFile => _path2.default.extname(foundFile) === ".svg");
-
-      if (filteredFiles.length === 0) {
-        throw new Error("Files glob patterns specified did not match any files");
-      }
-
-      return filteredFiles;
-    }).then(files => Promise.resolve().then(() => getGlyphsData(files, options)).then(generatedDataInternal => {
-      glyphsData = generatedDataInternal;
-
-      return svgIcons2svgFont(generatedDataInternal, options);
-    }))
-    // Maybe add ttfautohint
-    .then(svgFont => {
-      const result = {};
-
-      result.svg = svgFont;
-      result.glyphsData = glyphsData;
-
-      result.ttf = Buffer.from((0, _svg2ttf2.default)(result.svg.toString(), options.formatsOptions && options.formatsOptions.ttf ? options.formatsOptions.ttf : {}).buffer);
-
-      if (options.formats.indexOf("eot") !== -1) {
-        result.eot = Buffer.from((0, _ttf2eot2.default)(result.ttf).buffer);
-      }
-
-      if (options.formats.indexOf("woff") !== -1) {
-        result.woff = Buffer.from((0, _ttf2woff2.default)(result.ttf, {
-          metadata: options.metadata
-        }).buffer);
-      }
-
-      if (options.formats.indexOf("woff2") !== -1) {
-        result.woff2 = (0, _ttf2woff4.default)(result.ttf);
-      }
-
-      return result;
-    }).then(result => {
-      if (!options.template) {
-        return result;
-      }
-
-      const buildInTemplateDirectory = _path2.default.join(__dirname, "../templates");
-      const buildInTemplates = {
-        css: {
-          path: _path2.default.join(buildInTemplateDirectory, "template.css.njk")
-        },
-        html: {
-          path: _path2.default.join(buildInTemplateDirectory, "template.preview-html.njk")
-        },
-        scss: {
-          path: _path2.default.join(buildInTemplateDirectory, "template.scss.njk")
-        }
-      };
-
-      let templateFilePath = null;
-
-      if (Object.keys(buildInTemplates).includes(options.template)) {
-        result.usedBuildInTemplate = true;
-
-        _nunjucks2.default.configure(_path2.default.join(__dirname, "../"));
-
-        templateFilePath = `${buildInTemplateDirectory}/template.${options.template}.njk`;
-      } else {
-        const resolvedTemplateFilePath = _path2.default.resolve(options.template);
-
-        _nunjucks2.default.configure(_path2.default.dirname(resolvedTemplateFilePath));
-
-        templateFilePath = _path2.default.resolve(resolvedTemplateFilePath);
-      }
-
-      const nunjucksOptions = (0, _lodash2.default)({}, {
-        glyphs: glyphsData.map(glyphData => {
-          if (typeof options.glyphTransformFn === "function") {
-            glyphData.metadata = options.glyphTransformFn(glyphData.metadata);
-          }
-
-          return glyphData.metadata;
-        })
-      }, options, {
-        className: options.templateClassName ? options.templateClassName : options.fontName,
-        fontName: options.templateFontName ? options.templateFontName : options.fontName,
-        fontPath: options.templateFontPath.replace(/\/?$/, "/")
-      });
-
-      result.template = _nunjucks2.default.render(templateFilePath, nunjucksOptions);
-
-      return result;
-    }).then(result => {
-      if (options.formats.indexOf("svg") === -1) {
-        delete result.svg;
-      }
-
-      if (options.formats.indexOf("ttf") === -1) {
-        delete result.ttf;
-      }
-
-      result.config = options;
-
-      return result;
-    });
-  });
-};
+exports.default = _default;
 
 var _stream = require("stream");
 
-var _svgicons2svgfont = require("svgicons2svgfont");
-
-var _svgicons2svgfont2 = _interopRequireDefault(_svgicons2svgfont);
-
-var _cosmiconfig = require("cosmiconfig");
-
-var _cosmiconfig2 = _interopRequireDefault(_cosmiconfig);
-
-var _asyncThrottle = require("async-throttle");
-
-var _asyncThrottle2 = _interopRequireDefault(_asyncThrottle);
-
-var _metadata = require("svgicons2svgfont/src/metadata");
+var _fs = _interopRequireDefault(require("fs"));
 
-var _metadata2 = _interopRequireDefault(_metadata);
+var _path = _interopRequireDefault(require("path"));
 
-var _filesorter = require("svgicons2svgfont/src/filesorter");
+var _svgicons2svgfont = _interopRequireDefault(require("svgicons2svgfont"));
 
-var _filesorter2 = _interopRequireDefault(_filesorter);
+var _cosmiconfig = _interopRequireDefault(require("cosmiconfig"));
 
-var _fs = require("fs");
+var _pLimit = _interopRequireDefault(require("p-limit"));
 
-var _fs2 = _interopRequireDefault(_fs);
+var _metadata = _interopRequireDefault(require("svgicons2svgfont/src/metadata"));
 
-var _globby = require("globby");
+var _filesorter = _interopRequireDefault(require("svgicons2svgfont/src/filesorter"));
 
-var _globby2 = _interopRequireDefault(_globby);
+var _globby = _interopRequireDefault(require("globby"));
 
-var _lodash = require("lodash.merge");
+var _deepmerge = _interopRequireDefault(require("deepmerge"));
 
-var _lodash2 = _interopRequireDefault(_lodash);
+var _nunjucks = _interopRequireDefault(require("nunjucks"));
 
-var _nunjucks = require("nunjucks");
+var _svg2ttf = _interopRequireDefault(require("svg2ttf"));
 
-var _nunjucks2 = _interopRequireDefault(_nunjucks);
+var _ttf2eot = _interopRequireDefault(require("ttf2eot"));
 
-var _os = require("os");
+var _ttf2woff = _interopRequireDefault(require("ttf2woff"));
 
-var _os2 = _interopRequireDefault(_os);
+var _wawoff = _interopRequireDefault(require("wawoff2"));
 
-var _path = require("path");
+var _xml2js = _interopRequireDefault(require("xml2js"));
 
-var _path2 = _interopRequireDefault(_path);
-
-var _svg2ttf = require("svg2ttf");
-
-var _svg2ttf2 = _interopRequireDefault(_svg2ttf);
-
-var _ttf2eot = require("ttf2eot");
-
-var _ttf2eot2 = _interopRequireDefault(_ttf2eot);
-
-var _ttf2woff = require("ttf2woff");
-
-var _ttf2woff2 = _interopRequireDefault(_ttf2woff);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-var _ttf2woff3 = require("ttf2woff2");
+async function buildConfig(options) {
+  let searchPath = process.cwd();
+  let configPath = null;
 
-var _ttf2woff4 = _interopRequireDefault(_ttf2woff3);
+  if (options.configFile) {
+    searchPath = null;
+    configPath = _path.default.resolve(process.cwd(), options.configFile);
+  }
 
-var _xml2js = require("xml2js");
+  const configExplorer = (0, _cosmiconfig.default)("webfont");
+  const config = await (configPath ? configExplorer.load(configPath) : configExplorer.search(searchPath));
 
-var _xml2js2 = _interopRequireDefault(_xml2js);
+  if (!config) {
+    return {};
+  }
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+  return config;
+}
 
 function getGlyphsData(files, options) {
-  const metadataProvider = options.metadataProvider || (0, _metadata2.default)({
+  const metadataProvider = options.metadataProvider || (0, _metadata.default)({
     prependUnicode: options.prependUnicode,
     startUnicode: options.startUnicode
   });
-
-  const xmlParser = new _xml2js2.default.Parser();
-  const throttle = (0, _asyncThrottle2.default)(options.maxConcurrency);
-
+  const xmlParser = new _xml2js.default.Parser();
+  const throttle = (0, _pLimit.default)(options.maxConcurrency);
   return Promise.all(files.map(srcPath => throttle(() => new Promise((resolve, reject) => {
-    const glyph = _fs2.default.createReadStream(srcPath);
-    let glyphContents = "";
+    const glyph = _fs.default.createReadStream(srcPath);
 
+    let glyphContents = "";
     return glyph.on("error", glyphError => reject(glyphError)).on("data", data => {
       glyphContents += data.toString();
     }).on("end", () => {
@@ -255,13 +86,11 @@ function getGlyphsData(files, options) {
           contents: glyphContents,
           srcPath
         };
-
         return resolve(glyphData);
       });
     });
   })))).then(glyphsData => {
-    const sortedGlyphsData = glyphsData.sort((fileA, fileB) => (0, _filesorter2.default)(fileA.srcPath, fileB.srcPath));
-
+    const sortedGlyphsData = options.sort ? glyphsData.sort((fileA, fileB) => (0, _filesorter.default)(fileA.srcPath, fileB.srcPath)) : glyphsData;
     return Promise.all(sortedGlyphsData.map(glyphData => new Promise((resolve, reject) => {
       metadataProvider(glyphData.srcPath, (error, metadata) => {
         if (error) {
@@ -269,18 +98,16 @@ function getGlyphsData(files, options) {
         }
 
         glyphData.metadata = metadata;
-
         return resolve(glyphData);
       });
     })));
   });
 }
 
-function svgIcons2svgFont(glyphsData, options) {
+function toSvg(glyphsData, options) {
   let result = "";
-
   return new Promise((resolve, reject) => {
-    const fontStream = new _svgicons2svgfont2.default({
+    const fontStream = new _svgicons2svgfont.default({
       ascent: options.ascent,
       centerHorizontally: options.centerHorizontally,
       descent: options.descent,
@@ -291,46 +118,171 @@ function svgIcons2svgFont(glyphsData, options) {
       fontStyle: options.fontStyle,
       fontWeight: options.fontWeight,
       // eslint-disable-next-line no-console, no-empty-function
-      log: options.vebose ? console.log.bind(console) : () => {},
+      log: options.verbose ? console.log.bind(console) : () => {},
       metadata: options.metadata,
       normalize: options.normalize,
       round: options.round
     }).on("finish", () => resolve(result)).on("data", data => {
       result += data;
     }).on("error", error => reject(error));
-
     glyphsData.forEach(glyphData => {
       const glyphStream = new _stream.Readable();
-
       glyphStream.push(glyphData.contents);
       glyphStream.push(null);
-
       glyphStream.metadata = glyphData.metadata;
-
       fontStream.write(glyphStream);
     });
-
     fontStream.end();
   });
 }
 
-function buildConfig(options) {
-  let searchPath = process.cwd();
-  let configPath = null;
+function toTtf(buffer, options) {
+  return Buffer.from((0, _svg2ttf.default)(buffer, options).buffer);
+}
 
-  if (options.configFile) {
-    searchPath = null;
-    configPath = _path2.default.resolve(process.cwd(), options.configFile);
+function toEot(buffer) {
+  return Buffer.from((0, _ttf2eot.default)(buffer).buffer);
+}
+
+function toWoff(buffer, options) {
+  return Buffer.from((0, _ttf2woff.default)(buffer, options).buffer);
+}
+
+function toWoff2(buffer) {
+  return _wawoff.default.compress(buffer);
+}
+
+async function _default(initialOptions) {
+  if (!initialOptions || !initialOptions.files) {
+    throw new Error("You must pass webfont a `files` glob");
+  }
+
+  let options = Object.assign({}, {
+    ascent: undefined,
+    // eslint-disable-line no-undefined
+    centerHorizontally: false,
+    descent: 0,
+    fixedWidth: false,
+    fontHeight: null,
+    fontId: null,
+    fontName: "webfont",
+    fontStyle: "",
+    fontWeight: "",
+    formats: ["svg", "ttf", "eot", "woff", "woff2"],
+    formatsOptions: {
+      ttf: {
+        copyright: null,
+        ts: null,
+        version: null
+      }
+    },
+    glyphTransformFn: null,
+    // Maybe allow setup from CLI
+    // This is usually less than file read maximums while staying performance
+    maxConcurrency: 100,
+    metadata: null,
+    metadataProvider: null,
+    normalize: false,
+    prependUnicode: false,
+    round: 10e12,
+    sort: true,
+    startUnicode: 0xea01,
+    template: null,
+    templateClassName: null,
+    templateFontName: null,
+    templateFontPath: "./",
+    verbose: false
+  }, initialOptions);
+  const config = await buildConfig({
+    configFile: options.configFile
+  });
+
+  if (Object.keys(config).length > 0) {
+    options = (0, _deepmerge.default)(options, config.config);
+    options.filePath = config.filepath;
+  }
+
+  const foundFiles = await (0, _globby.default)([].concat(options.files));
+  const filteredFiles = foundFiles.filter(foundFile => _path.default.extname(foundFile) === ".svg");
+
+  if (filteredFiles.length === 0) {
+    throw new Error("Files glob patterns specified did not match any files");
   }
 
-  const configExplorer = (0, _cosmiconfig2.default)("webfont");
-  const searchForConfig = configPath ? configExplorer.load(configPath) : configExplorer.search(searchPath);
+  const result = {};
+  result.glyphsData = await getGlyphsData(filteredFiles, options);
+  result.svg = await toSvg(result.glyphsData, options);
+  result.ttf = toTtf(result.svg, options.formatsOptions && options.formatsOptions.ttf ? options.formatsOptions.ttf : {});
 
-  return searchForConfig.then(result => {
-    if (!result) {
-      return {};
+  if (options.formats.includes("eot")) {
+    result.eot = toEot(result.ttf);
+  }
+
+  if (options.formats.includes("woff")) {
+    result.woff = toWoff(result.ttf, {
+      metadata: options.metadata
+    });
+  }
+
+  if (options.formats.includes("woff2")) {
+    result.woff2 = await toWoff2(result.ttf);
+  }
+
+  if (options.template) {
+    const templateDirectory = _path.default.resolve(__dirname, "../templates");
+
+    const buildInTemplates = {
+      css: {
+        path: _path.default.join(templateDirectory, "template.css.njk")
+      },
+      html: {
+        path: _path.default.join(templateDirectory, "template.html.njk")
+      },
+      scss: {
+        path: _path.default.join(templateDirectory, "template.scss.njk")
+      }
+    };
+    let templateFilePath = null;
+
+    if (Object.keys(buildInTemplates).includes(options.template)) {
+      result.usedBuildInTemplate = true;
+
+      _nunjucks.default.configure(_path.default.resolve(__dirname, "../"));
+
+      templateFilePath = `${templateDirectory}/template.${options.template}.njk`;
+    } else {
+      const resolvedTemplateFilePath = _path.default.resolve(options.template);
+
+      _nunjucks.default.configure(_path.default.dirname(resolvedTemplateFilePath));
+
+      templateFilePath = _path.default.resolve(resolvedTemplateFilePath);
     }
 
-    return result;
-  });
+    const nunjucksOptions = _deepmerge.default.all([{
+      glyphs: result.glyphsData.map(glyphData => {
+        if (typeof options.glyphTransformFn === "function") {
+          glyphData.metadata = options.glyphTransformFn(glyphData.metadata);
+        }
+
+        return glyphData.metadata;
+      })
+    }, options, {
+      className: options.templateClassName || options.fontName,
+      fontName: options.templateFontName || options.fontName,
+      fontPath: options.templateFontPath.replace(/\/?$/, "/")
+    }]);
+
+    result.template = _nunjucks.default.render(templateFilePath, nunjucksOptions);
+  }
+
+  if (!options.formats.includes("svg")) {
+    delete result.svg;
+  }
+
+  if (!options.formats.includes("ttf")) {
+    delete result.ttf;
+  }
+
+  result.config = options;
+  return result;
 }