stylecow-core - npm Package Compare versions

Comparing version 2.1.1 to 2.2.0

lib/coder.js

@@ -40,5 +40,5 @@ "use strict";
 
-    // available modes: "auto", "embed", "none"
+    // available modes: "auto", "embed", "file", "none"
     sourceMap (mode) {
-        if (['auto', 'embed', 'none'].indexOf(mode) === -1) {
+        if (['auto', 'embed', 'none', 'file'].indexOf(mode) === -1) {
             throw new Error('Mode no valid');
@@ -52,3 +52,3 @@ }
 
-    run (css, cssFile, mapDest, previousMap) {
+    run (css, cssFile, previousMap, mapDest) {
         this.codeStyle = this.styles[this.styleName];
@@ -65,3 +65,3 @@ this.sourceMapRoot = null;
 
-        //map destination
+        // map destination (false|true|string)
         if (mapDest === undefined) {
@@ -72,2 +72,4 @@ if (this.sourceMapMode === 'embed') {
                 mapDest = false;
+            } else if (this.sourceMapMode === 'file') {
+                mapDest = (typeof prev.dest === 'string') ? prev.dest : cssFile.replace(/\.css$/, '.map');
             } else if (prev.dest) {
@@ -83,14 +85,14 @@ mapDest = prev.dest;
         //Init map
-        if (mapDest === true) { //embed
-            this.sourceMapRoot = cssFile ? path.dirname(cssFile) : '';
+        if (typeof mapDest === 'string') {
+            this.sourceMapRoot = path.dirname(mapDest);
 
             this.map = new SourceMapGenerator({
-                file: '',
+                file: mapDest,
                 root: this.sourceMapRoot
             });
-        } else if (mapDest) { //external file
-            this.sourceMapRoot = path.dirname(mapDest);
-            
+        } else {
+            this.sourceMapRoot = cssFile ? path.dirname(cssFile) : '';
+
             this.map = new SourceMapGenerator({
-                file: mapDest,
+                file: '',
                 root: this.sourceMapRoot
@@ -104,3 +106,3 @@ });
             //previous source
-            if ((previousMap === undefined) && prev.map) {
+            if (!previousMap && prev.map) {
                 previousMap = prev.map;
@@ -143,3 +145,3 @@ }
     append (code, original) {
-        if (this.map && original) {
+        if (original) {
             let file = original.getData('file');
@@ -146,0 +148,0 @@

lib/css/at-rule.js

@@ -9,3 +9,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -12,0 +12,0 @@ stylecow.AtRule = class AtRule extends require('./classes/node-collection-name') {

lib/css/attribute-selector.js

@@ -7,3 +7,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -10,0 +10,0 @@ stylecow.AttributeSelector = class AttributeSelector extends require('./classes/node-collection') {

lib/css/bang.js

@@ -7,3 +7,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -10,0 +10,0 @@ stylecow.Bang = class Bang extends require('./classes/node-name') {

lib/css/block.js

@@ -12,3 +12,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -15,0 +15,0 @@ stylecow.Block = class Block extends require('./classes/node-collection') {

lib/css/class-selector.js

@@ -6,3 +6,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -9,0 +9,0 @@ stylecow.ClassSelector = class ClassSelector extends require('./classes/node-name') {

lib/css/classes/node-collection-vendor.js

 "use strict";
 
-let NodeVendor = require('./node-vendor');
+const NodeVendor = require('./node-vendor');
 
@@ -5,0 +5,0 @@ /**

lib/css/combinator.js

@@ -8,3 +8,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -11,0 +11,0 @@ stylecow.Combinator = class Combinator extends require('./classes/node-name') {

lib/css/comment.js

@@ -5,3 +5,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -8,0 +8,0 @@ stylecow.Comment = class Comment extends require('./classes/node-name') {

lib/css/comparator.js

@@ -12,3 +12,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -15,0 +15,0 @@ stylecow.Comparator = class Comparator extends require('./classes/node-name') {

lib/css/conditional-expression.js

@@ -9,3 +9,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -12,0 +12,0 @@ stylecow.ConditionalExpression = class ConditionalExpression extends require('./classes/node-collection') {

lib/css/conditional-feature-boolean.js

@@ -6,3 +6,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -9,0 +9,0 @@ stylecow.ConditionalFeatureBoolean = class ConditionalFeatureBoolean extends require('./classes/node-name') {

lib/css/conditional-feature-range.js

@@ -6,3 +6,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -9,0 +9,0 @@ stylecow.ConditionalFeatureRange = class ConditionalFeatureRange extends require('./classes/node-collection') {

lib/css/conditional-feature.js

@@ -7,3 +7,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -21,3 +21,3 @@ stylecow.ConditionalFeature = class ConditionalFeature extends require('./classes/node-collection-vendor') {
                 element.push(stylecow.Value.create(reader, element) || reader.error());
-            } while (reader.currToken === COMMA && reader.move());
+            } while (reader.skip(COMMA));
 
@@ -24,0 +24,0 @@ return element;

lib/css/conditional-selector.js

@@ -6,3 +6,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -9,0 +9,0 @@ stylecow.ConditionalSelector = class ConditionalSelector extends require('./classes/node-collection') {

lib/css/custom-property.js

@@ -10,3 +10,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -13,0 +13,0 @@ stylecow.CustomProperty = class CustomProperty extends require('./classes/node-collection-name') {

lib/css/declaration.js

@@ -14,3 +14,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -59,3 +59,3 @@ stylecow.Declaration = class Declaration extends require('./classes/node-collection-vendor') {
 
-            } while (reader.currToken === COMMA && reader.move());
+            } while (reader.skip(COMMA));
         }
@@ -62,0 +62,0 @@

lib/css/expression.js

@@ -7,3 +7,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -10,0 +10,0 @@ stylecow.Expression = class Expression extends require('./classes/node-collection') {

lib/css/extension-name.js

@@ -6,3 +6,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -9,0 +9,0 @@ stylecow.ExtensionName = class ExtensionName extends require('./classes/node-name') {

lib/css/function.js

@@ -9,3 +9,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -54,3 +54,3 @@ stylecow.Function = class Function extends require('./classes/node-collection-vendor') {
 
-                    } while (reader.currToken === COMMA && reader.move());
+                    } while (reader.skip(COMMA));
                     break;
@@ -57,0 +57,0 @@ }

lib/css/hex.js

@@ -5,3 +5,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -8,0 +8,0 @@ stylecow.Hex = class Hex extends require('./classes/node-name') {

lib/css/id-selector.js

@@ -5,3 +5,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -8,0 +8,0 @@ stylecow.IdSelector = class IdSelector extends require('./classes/node-name') {

lib/css/keyframe-selector.js

@@ -7,3 +7,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -23,3 +23,3 @@ stylecow.KeyframeSelector = class KeyframeSelector extends require('./classes/node-collection') {
             }
-        } while (reader.currToken === COMMA && reader.move());
+        } while (reader.skip(COMMA));
 
@@ -26,0 +26,0 @@ return element;

lib/css/keyframe.js

 "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -5,0 +5,0 @@ stylecow.Keyframe = class Keyframe extends require('./classes/node-collection') {

lib/css/keyword.js

@@ -5,3 +5,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -8,0 +8,0 @@ stylecow.Keyword = class Keyword extends require('./classes/node-vendor') {

lib/css/media-queries.js

@@ -5,3 +5,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -15,3 +15,3 @@ stylecow.MediaQueries = class MediaQueries extends require('./classes/node-collection') {
             element.push(stylecow.MediaQuery.create(reader, element) || reader.error());
-        } while (reader.currToken === COMMA && reader.move());
+        } while (reader.skip(COMMA));
 
@@ -18,0 +18,0 @@ return element;

lib/css/media-query.js

@@ -6,3 +6,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -9,0 +9,0 @@ stylecow.MediaQuery = class MediaQuery extends require('./classes/node-collection') {

lib/css/nested-at-rule.js

@@ -8,3 +8,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -11,0 +11,0 @@ stylecow.NestedAtRule = class NestedAtRule extends require('./classes/node-collection-vendor') {

lib/css/number.js

@@ -5,3 +5,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -8,0 +8,0 @@ stylecow.Number = class Number extends require('./classes/node-name') {

lib/css/operator.js

@@ -8,3 +8,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -11,0 +11,0 @@ stylecow.Operator = class Operator extends require('./classes/node-name') {

lib/css/placeholder-selector.js

@@ -6,3 +6,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -9,0 +9,0 @@ stylecow.PlaceholderSelector = class PlaceholderSelector extends require('./classes/node-name') {

lib/css/pseudo-class-function.js

@@ -10,3 +10,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -71,3 +71,3 @@ stylecow.PseudoClassFunction = class PseudoClassFunction extends require('./classes/node-collection-vendor') {
                     element.push(stylecow.Value.create(reader, element) || reader.error());
-                } while (reader.currToken === COMMA && reader.move());
+                } while (reader.skip(COMMA));
             }
@@ -74,0 +74,0 @@

lib/css/pseudo-class.js

@@ -6,3 +6,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -9,0 +9,0 @@ stylecow.PseudoClass = class PseudoClass extends require('./classes/node-vendor') {

lib/css/pseudo-element.js

@@ -6,3 +6,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -9,0 +9,0 @@ stylecow.PseudoElement = class PseudoElement extends require('./classes/node-vendor') {

lib/css/ratio.js

@@ -7,3 +7,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -10,0 +10,0 @@ stylecow.Ratio = class Ratio extends require('./classes/node-collection') {

lib/css/root.js

@@ -5,3 +5,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -8,0 +8,0 @@ stylecow.Root = class Root extends require('./classes/node-collection') {

lib/css/rule.js

 "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -5,0 +5,0 @@ stylecow.Rule = class Rule extends require('./classes/node-collection') {

lib/css/selector.js

@@ -14,3 +14,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -17,0 +17,0 @@ stylecow.Selector = class Selector extends require('./classes/node-collection') {

lib/css/selectors.js

@@ -7,3 +7,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -21,3 +21,3 @@ stylecow.Selectors = class Selectors extends require('./classes/node-collection') {
             element.push(stylecow.Selector.create(reader, element) || reader.error());
-        } while (reader.currToken === COMMA && reader.move());
+        } while (reader.skip(COMMA));
 
@@ -24,0 +24,0 @@ return element;

lib/css/string.js

@@ -5,3 +5,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -8,0 +8,0 @@ stylecow.String = class String extends require('./classes/node-name') {

lib/css/type-selector.js

@@ -5,3 +5,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -8,0 +8,0 @@ stylecow.TypeSelector = class TypeSelector extends require('./classes/node-name') {

lib/css/unit.js

@@ -7,3 +7,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -10,0 +10,0 @@ stylecow.Unit = class Unit extends require('./classes/node-collection-name') {

lib/css/universal-selector.js

@@ -5,3 +5,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -8,0 +8,0 @@ stylecow.UniversalSelector = class UniversalSelector extends require('./classes/node') {

lib/css/value.js

@@ -13,3 +13,3 @@ "use strict";
 
-let stylecow = require('../index');
+const stylecow = require('../index');
 
@@ -16,0 +16,0 @@ stylecow.Value = class Value extends require('./classes/node-collection') {

package.json

@@ -10,3 +10,3 @@ {
   ],
-  "version": "2.1.1",
+  "version": "2.2.0",
   "engines": {
@@ -13,0 +13,0 @@ "node": ">=4.0"

tests/tests.js

@@ -23,3 +23,3 @@ var assert   = require('assert');
         var normalCode = normal.run(test.css);
-        var minifyCode = minifier.run(test.css, 'output.min.css', 'output.min.map');
+        var minifyCode = minifier.run(test.css, 'output.min.css');
 
@@ -26,0 +26,0 @@ it('should match output.normal.css', function() {

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

Improved metrics

Total package byte prevSize

59754007

Lines of code

387729

No dependency changes