stylus - npm Package Compare versions

Comparing version 0.6.2 to 0.6.3

._History.md

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTR�����!
�!com.macromates.caret{
+Mac OS X        	2��ATTR��>��!
�!com.macromates.caret{
     column = 0;
-    line = 9;
+    line = 6;
 }

._package.json

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTR�����"
�"com.macromates.caret{
+Mac OS X        	2��ATTR��D��"
�"com.macromates.caret{
     column = 21;
     line = 2;
 }

._Readme.md

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTR�����#
�#com.macromates.caret{
+Mac OS X        	2��ATTR��F��#
�#com.macromates.caret{
     column = 62;
     line = 82;
 }

History.md

 
+0.6.3 / 2011-02-22 
+==================
+
+  * Fixed single-ident selectors. Closes #142
+  * Fixed cyclic __@import__ with file of the same name. Closes #143
+
 0.6.2 / 2011-02-21 
@@ -3,0 +9,0 @@ ==================

lib/._stylus.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTR�����#
�#com.macromates.caret{
+Mac OS X        	2��ATTR��R��#
�#com.macromates.caret{
     column = 24;
     line = 25;
 }

lib/functions/._index.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTR�����#
�#com.macromates.caret{
+Mac OS X        	2��ATTR��~��#
�#com.macromates.caret{
     column = 0;
     line = 566;
 }

lib/parser.js

@@ -285,9 +285,15 @@
   get looksLikeSelector() {
-    var i = 0;
+    var i = 1;
 
+    // Assume selector when an ident is
+    // followed by a selector
+    while ('ident' == this.lookahead(i).type
+      && 'newline' == this.lookahead(i + 1).type) i += 2;
+
     // Assume pseudo selectors are NOT properties
     // as 'td:th-child(1)' may look like a property
     // and function call to the parser otherwise
-    while (this.isSelectorToken(++i)) {
-      if (':' == this.lookahead(i).type && this.isPseudoSelector(i + 1))
+    while (this.isSelectorToken(i)) {
+      if (':' == this.lookahead(i++).type
+        && this.isPseudoSelector(i))
         return true;
@@ -313,3 +319,3 @@ }
 
-    // Trailing indentation
+    // Trailing separators
     while (!~[
@@ -319,2 +325,4 @@ 'newline'
       , 'outdent'
+      , 'for'
+      , 'if'
       , ';'
@@ -324,3 +332,3 @@ , '}'].indexOf(this.lookahead(i).type))
 
-    if ('indent' == this.lookahead(i))
+    if ('indent' == this.lookahead(i).type)
       return true;
@@ -787,3 +795,3 @@ },
     var ident = this.interpolate
-      , prop = new nodes.Property(ident);
+      , ret = prop = new nodes.Property(ident);
 
@@ -797,3 +805,3 @@ // optional ':'
     prop.expr = this.list;
-    if (prop.expr.isEmpty) return ident[0];
+    if (prop.expr.isEmpty) ret = ident[0];
     this.inProperty = false;
@@ -806,3 +814,3 @@ this.allowPostfix = true;
 
-    return prop;
+    return ret;
   },
@@ -809,0 +817,0 @@

lib/stylus.js

@@ -26,3 +26,3 @@
 
-exports.version = '0.6.2';
+exports.version = '0.6.3';
 
@@ -29,0 +29,0 @@ /**

lib/utils.js

@@ -18,5 +18,7 @@
  * Attempt to lookup `path` within `paths` from tail to head.
+ * Optionally a path to `ignore` may be passed.
  *
  * @param {String} path
  * @param {String} paths
+ * @param {String} ignore
  * @return {String}
@@ -26,3 +28,3 @@ * @api private
 
-exports.lookup = function(path, paths){
+exports.lookup = function(path, paths, ignore){
   var lookup
@@ -48,2 +50,3 @@ , i = paths.length;
       lookup = paths[i] + '/' + path;
+      if (ignore == lookup) continue;
       fs.statSync(lookup);
@@ -50,0 +53,0 @@ return lookup;

lib/visitor/._compiler.js

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTR�����$
�$com.macromates.caret{
+Mac OS X        	2��ATTR��X��$
�$com.macromates.caret{
     column = 40;
     line = 334;
 }

lib/visitor/evaluator.js

@@ -42,2 +42,3 @@
   this.paths = options.paths || [];
+  this.filename = options.filename;
   this.paths.push(dirname(options.filename || '.'));
@@ -489,3 +490,3 @@ this.stack.push(this.global = new Frame(root));
   if (relative) this.paths.push(relative);
-  found = utils.lookup(path, this.paths);
+  found = utils.lookup(path, this.paths, this.filename);
   if (relative) this.paths.pop();
@@ -492,0 +493,0 @@

package.json

 {   "name": "stylus"
   , "description": "Robust, expressive language which compiles to CSS"
-  , "version": "0.6.2"
+  , "version": "0.6.3"
   , "author": "TJ Holowaychuk <[e-mail]>"
@@ -5,0 +5,0 @@ , "keywords": ["css", "parser", "style", "stylesheets", "jade", "language"]

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

182827

increased by0.4%

Number of package files

74

increased by1.37%

Lines of code

6576

increased by0.21%

No dependency changes