punchcutter 2.0.13 → 2.0.15

package/lib/buildJsFont.js

@@ -13,48 +13,67 @@ const svgMin = require('./svgMin');
  * @param   {Object} config
  * @returns {Promise}
  */
-module.exports = function (config) {
+module.exports = async function (config) {
   console.log(`Building JS font: ${chalk.cyan(config.name)}`);
 
-  return loadFiles(config.src)
-    .then(function (files) {
-      return Promise.mapSeries(files, function (file) {
-        // Minify SVG.
-        return Promise.props(_.assign(file, {data: svgMin(file.data)}));
-      });
-    })
-    .then(function (files) {
-      const map = {};
-
-      _.forEach(files, function (file) {
-        const extname = path.extname(file.path);
-        const basename = path.basename(file.path, extname);
-        const {data} = file;
+  const {
+    build: {concat = true, idTransform = (id) => id}
+  } = config;
+
+  const srcFiles = await loadFiles(config.src);
 
-        map[basename] = {
-          viewBox: '',
-          data: ''
-        };
+  const files = await Promise.mapSeries(srcFiles, (file) => {
+    // Minify SVG.
+    return Promise.props(_.assign(file, {data: svgMin(file.data)}));
+  });
+
+  const map = Object.fromEntries(
+    files
+      .map((file) => {
+        const basename = idTransform(
+          path.basename(file.path, path.extname(file.path))
+        );
+        const {data} = file;
 
         const $svg = cheerio.load(data, {
           xmlMode: true
         })('svg');
 
         if ($svg.length) {
-          map[basename].viewBox = $svg.attr('viewBox');
-          map[basename].data = $svg.contents().toString();
+          return [
+            basename,
+            {
+              viewBox: $svg.attr('viewBox'),
+              data: $svg.contents().toString()
+            }
+          ];
         }
-      });
+      })
+      .filter(Boolean)
+  );
+
+  if (concat) {
+    const distPath = path.resolve(config.build.dist, config.name + '.js');
+    const distDir = path.dirname(distPath);
+
+    await fs.mkdirp(distDir);
+
+    const data =
+      config.build.prepend + JSON.stringify(map, null, 2) + config.build.append;
+
+    return fs.writeFile(distPath, data, 'utf-8');
+  } else {
+    const distDir = path.resolve(config.build.dist, config.name);
+
+    await fs.mkdirp(distDir);
 
+    return Promise.mapSeries(Object.entries(map), ([basename, iconData]) => {
       const data =
         config.build.prepend +
-        JSON.stringify(map, null, 2) +
+        JSON.stringify(iconData, null, 2) +
         config.build.append;
-      const distPath = path.resolve(config.build.dist, config.name + '.js');
-      const distDir = path.dirname(distPath);
 
-      return fs.mkdirp(distDir).then(function () {
-        return fs.writeFile(distPath, data, 'utf-8');
-      });
+      return fs.writeFile(path.join(distDir, basename + '.js'), data, 'utf-8');
     });
+  }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "punchcutter",
-  "version": "2.0.13",
+  "version": "2.0.15",
   "description": "Build fonts",
   "main": "lib/punchcutter.js",
   "repository": {