icon-maker - npm Package Compare versions

Comparing version 0.1.0 to 0.2.0

index.js

@@ -7,3 +7,4 @@ const path = require('path');
   constructor({
-    files = ['ttf', 'woff', 'eot', 'svg']
+    files = ['ttf', 'woff', 'eot', 'svg'],
+    fontFamily = 'default'
   } = {}) {
@@ -19,11 +20,8 @@ if (files === undefined || !Array.isArray(files)) {
     }
+    this._fontFamily = fontFamily;
     this._files = files;
-    this._fonts = {};
+    this._svgs = [];
   }
   addSvg(svgPath, fontFamily = 'default') {
-    const fonts = this._fonts;
-    if (fonts[fontFamily] === undefined) {
-      fonts[fontFamily] = [];
-    }
-    fonts[fontFamily].push(svgPath);
+    this._svgs.push(svgPath);
   }
@@ -36,50 +34,41 @@ run(cb) {
     const files = this._files;
-    const fontsPromises = Object.keys(this._fonts).map(fontFamily => new Promise((resolve, reject) => {
-      const svgPaths = this._fonts[fontFamily];
+    const svgPaths = this._svgs;
+    const fontFamily = this._fontFamily;
 
-      let fontmin = new Fontmin().src(svgPaths).use(Fontmin.svgs2ttf(fontFamily));
-      if (files.indexOf('eot') !== -1) {
-        fontmin = fontmin.use(Fontmin.ttf2eot({ fontFamily }));
+    let fontmin = new Fontmin().src(svgPaths).use(Fontmin.svgs2ttf(fontFamily));
+    if (files.indexOf('eot') !== -1) {
+      fontmin = fontmin.use(Fontmin.ttf2eot({ fontFamily }));
+    }
+    if (files.indexOf('woff') !== -1) {
+      fontmin = fontmin.use(Fontmin.ttf2woff({ fontFamily }));
+    }
+    if (files.indexOf('svg') !== -1) {
+      fontmin = fontmin.use(Fontmin.ttf2svg({ fontFamily }));
+    }
+    fontmin.use(Fontmin.css({
+      fontFamily,
+      iconPrefix: fontFamily,
+      glyph: true
+    }));
+
+    fontmin.run((err, fontFiles) => {
+      if (err) {
+        cb(err);
       }
-      if (files.indexOf('woff') !== -1) {
-        fontmin = fontmin.use(Fontmin.ttf2woff({ fontFamily }));
-      }
-      if (files.indexOf('svg') !== -1) {
-        fontmin = fontmin.use(Fontmin.ttf2svg({ fontFamily }));
-      }
-      fontmin.use(Fontmin.css({
-        fontFamily,
-        iconPrefix: fontFamily,
-        glyph: true
-      }));
+      cb(undefined, fontFiles.reduce((obj, fontFile) => {
+        if (path.extname(fontFile.path) === '.css') {
+          const cssContents = replaceCssContents(fontFile.contents.toString(), files);
 
-      fontmin.run((err, fontFiles) => {
-        if (err) {
-          reject(err);
+          return Object.assign(obj, {
+            css: cssContents
+          });
+        } else {
+          return Object.assign(obj, {
+            fontFiles: (obj.fontFiles || [])
+            .concat(fontFile)
+          });
         }
-        resolve(
-          fontFiles.reduce((obj, fontFile) => {
-            if (path.extname(fontFile.path) === '.css') {
-              const cssContents = replaceCssContents(fontFile.contents.toString(), files);
-
-              return Object.assign(obj, {
-                css: cssContents
-              });
-            } else {
-              return Object.assign(obj, {
-                fontFiles: (obj.fontFiles || [])
-                .concat(fontFile)
-              });
-            }
-          }, { fontFamily })
-        );
-      });
-    }));
-
-    Promise.all(fontsPromises).then(fonts => {
-      cb(undefined, fonts);
-    }, err => {
-      cb(err);
+      }, { fontFamily }));
     });
   }
 };

package.json

 {
   "name": "icon-maker",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "",
@@ -5,0 +5,0 @@ "main": "index.js",

replace-css-contents.js

@@ -0,0 +0,0 @@ module.exports = (cssContents, fileExtensions) => {

test/index.js

@@ -7,5 +7,5 @@ const path = require('path');
 iconMaker.addSvg(path.join(__dirname, 'svg', 'yin-yan.svg'));
-iconMaker.addSvg(path.join(__dirname, 'svg', 'yin-yan.svg'), 'blaEE');
-iconMaker.run((err, fonts) => {
-  console.log(fonts[0].fontFiles[0].path);
+iconMaker.addSvg(path.join(__dirname, 'svg', 'yin-yan.svg'));
+iconMaker.run((err, font) => {
+  console.log(font.fontFiles[0].path);
 });

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Worsened metrics

Total package byte prevSize

7745

decreased by-4.98%

Number of package files

8

decreased by-11.11%

Lines of code

93

decreased by-14.68%

No dependency changes