stylus - npm Package Compare versions

Comparing version 0.40.0 to 0.40.1

lib/lexer.js

@@ -735,3 +735,3 @@
     var captures;
-    if (captures = /^#([a-fA-F0-9]{1})[ \t]*/.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{1})(?![a-fA-F0-9])/.exec(this.str)) {
       this.skip(captures);
@@ -751,3 +751,3 @@ var n = parseInt(captures[1] + captures[1], 16)
     var captures;
-    if (captures = /^#([a-fA-F0-9]{2})[ \t]*/.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{2})(?![a-fA-F0-9])/.exec(this.str)) {
       this.skip(captures);
@@ -767,3 +767,3 @@ var n = parseInt(captures[1], 16)
     var captures;
-    if (captures = /^#([a-fA-F0-9]{3})[ \t]*/.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{3})(?![a-fA-F0-9])/.exec(this.str)) {
       this.skip(captures);
@@ -786,3 +786,3 @@ var rgb = captures[1]
     var captures;
-    if (captures = /^#([a-fA-F0-9]{4})[ \t]*/.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{4})(?![a-fA-F0-9])/.exec(this.str)) {
       this.skip(captures);
@@ -806,3 +806,3 @@ var rgb = captures[1]
     var captures;
-    if (captures = /^#([a-fA-F0-9]{6})[ \t]*/.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{6})(?![a-fA-F0-9])/.exec(this.str)) {
       this.skip(captures);
@@ -825,3 +825,3 @@ var rgb = captures[1]
     var captures;
-    if (captures = /^#([a-fA-F0-9]{8})[ \t]*/.exec(this.str)) {
+    if (captures = /^#([a-fA-F0-9]{8})(?![a-fA-F0-9])/.exec(this.str)) {
       this.skip(captures);
@@ -828,0 +828,0 @@ var rgb = captures[1]

lib/nodes/import.js

@@ -31,1 +31,15 @@
 Import.prototype.__proto__ = Node.prototype;
+
+/**
+ * Return a clone of this node.
+ *
+ * @return {Node}
+ * @api public
+ */
+
+Import.prototype.clone = function(){
+  var clone = new Import(this.path.clone());
+  clone.lineno = this.lineno;
+  clone.filename = this.filename;
+  return clone;
+};

lib/parser.js

@@ -960,4 +960,3 @@
     var i = 2
-      , la = this.lookahead(i).type
-      , isSelector;
+      , la = this.lookahead(i).type;
 
@@ -976,2 +975,11 @@ while ('space' == la) la = this.lookahead(++i).type;
         return this.assignment();
+      // Member
+      case '.':
+        if (this._ident == this.peek()) return this.id();
+        while ('=' != this.lookahead(++i).type
+          && !~[',', 'newline', 'indent', 'eos'].indexOf(this.lookahead(i).type)) ;
+        if ('=' == this.lookahead(i).type) {
+          this._ident = this.peek();
+          return this.expression();
+        }
       // Assignment []=
@@ -983,7 +991,6 @@ case '[':
           && 'eos' != this.lookahead(i).type) ;
-        isSelector = this.looksLikeSelector() && this.stateAllowsSelector();
-        if ('=' == this.lookahead(i).type || ('[' == this.lookahead(i).type && !isSelector)) {
+        if ('=' == this.lookahead(i).type) {
           this._ident = this.peek();
           return this.expression();
-        } else if (isSelector) {
+        } else if (this.looksLikeSelector() && this.stateAllowsSelector()) {
           return this.selector();
@@ -1027,3 +1034,5 @@ }
             case 'font-face':
-              return this.selector();
+              return '[' == la
+                ? this.subscript()
+                : this.selector();
             case 'function':
@@ -1636,3 +1645,3 @@ return this.looksLikeSelector()
   /**
-   *   primary ('.' id)+
+   *   primary ('.' id)+ '='?
    * | primary
@@ -1649,2 +1658,3 @@ */
       this.skipSpaces();
+      if (this.accept('=')) node.val = this.expression();
     }
@@ -1651,0 +1661,0 @@ return node;

lib/visitor/compiler.js

@@ -322,5 +322,4 @@ /*!
   if (this.compress) {
-    // Zero is always '0', unless when
-    // a percentage, this is required by keyframes
-    if ('%' != type && 0 == n) return '0';
+    // Always return '0' unless the unit is a percentage or time
+    if ('%' != type && 's' != type && 'ms' != type && 0 == n) return '0';
     // Omit leading '0' on floats
@@ -327,0 +326,0 @@ if (float && n < 1 && n > -1) {

lib/visitor/evaluator.js

@@ -264,2 +264,3 @@
   }
+  if (node.val) obj.set(right.name, this.visit(node.val));
   return obj.get(right.name);
@@ -266,0 +267,0 @@ };

package.json

 {
   "name": "stylus",
   "description": "Robust, expressive, and feature-rich CSS superset",
-  "version": "0.40.0",
+  "version": "0.40.1",
   "author": "TJ Holowaychuk <[e-mail]>",
@@ -6,0 +6,0 @@ "keywords": [

No alert changes

Improved metrics

Total package byte prevSize

253983

increased by0.29%

Lines of code

9643

increased by0.23%

No dependency changes