stylus - npm Package Compare versions

Comparing version 0.5.3 to 0.6.0

._History.md

@@ -1,4 +0,4 @@
-Mac OS X        	2��ATTRi�o��"
�"com.macromates.caret{
-    column = 60;
-    line = 4;
+Mac OS X        	2��ATTRl�"��"
�"com.macromates.caret{
+    column = 0;
+    line = 12;
 }

._package.json

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

History.md

 
+0.6.0 / 2011-02-18 
+==================
+
+  * Added `stylus(1)` direct css to stylus file conversion [Mario]
+    For example instead of `$ stylus --css < foo.css > foo.styl`
+    you may now either `$ stylus --css foo.css` or provide
+    a destination path `$ stylus --css foo.css /tmp/out.styl`.
+
+  * Added postfix conditionals. Closes #74
+    Expressive ruby-ish syntax, ex: `padding 5px if allow-padding`.
+
 0.5.3 / 2011-02-17 
@@ -3,0 +14,0 @@ ==================

lib/._parser.js

@@ -1,6 +0,1 @@
-Mac OS X        	2��ATTRi����0� com.macromates.bookmarked_lines�$com.macromates.caret(
-    1258
-){
-    column = 41;
-    line = 796;
-}
+Mac OS X        	2��ATTRl�1�� 
� com.macromates.caretx���R������<[k0?'3/«��

lib/._stylus.js

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

lib/parser.js

@@ -83,2 +83,3 @@
 var Parser = module.exports = function Parser(str, options) {
+  var self = this;
   options = options || {};
@@ -89,2 +90,5 @@ this.str = nodes.source = str;
   this.state = ['root'];
+  this.state.pop = function(){
+    self.prevState = [].pop.call(this);
+  };
 };
@@ -324,2 +328,37 @@
   /**
+   *   statement
+   * | statement 'if' expression
+   * | statement 'unless' expression
+   */
+  
+  get statement() {
+    var op
+      , stmt = this.stmt
+      , state = this.prevState;
+
+    // special-case statements since it
+    // is not an expression. We could
+    // implement postfix conditionals at
+    // the expression level, however they
+    // would then fail to enclose properties
+    if (this.allowPostfix) {
+      delete this.allowPostfix;
+      state = 'expression';
+    }
+
+    switch (state) {
+      case 'assignment':
+      case 'expression':
+      case 'function arguments':
+        if (op = this.accept('if') || this.accept('unless')) {
+          stmt = new nodes.If(this.expression, stmt);
+          stmt.negate = 'unless' == op.type;
+          this.accept(';');
+        }
+    }
+
+    return stmt;
+  },
+  
+  /**
    *    ident
@@ -340,3 +379,3 @@ *  | selector
   
-  get statement() {
+  get stmt() {
     var type = this.peek.type;
@@ -398,4 +437,6 @@ switch (type) {
     var delim
+      , stmt
       , _ = this.css
       , block = this.parent = new nodes.Block(this.parent, node);
+
     if (false === scope) block.scope = false;
@@ -416,3 +457,3 @@
         if (this.accept('newline')) continue;
-        var stmt = this.statement;
+        stmt = this.statement;
         this.accept(';');
@@ -422,3 +463,3 @@ this.skipWhitespace;
         if (this.accept('newline')) continue;
-        var stmt = this.statement;
+        stmt = this.statement;
       }
@@ -527,2 +568,3 @@ if (!stmt) this.error('unexpected token {peek} in block');
     this.expect('import');
+    this.allowPostfix = true;
     return new nodes.Import(this.expect('string').val.val);
@@ -538,2 +580,3 @@ },
     var str = this.expect('string').val;
+    this.allowPostfix = true;
     return new nodes.Charset(str);
@@ -760,2 +803,3 @@ },
     this.inProperty = false;
+    this.allowPostfix = true;
     this.state.pop();
@@ -762,0 +806,0 @@

lib/stylus.js

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

lib/visitor/evaluator.js

@@ -453,3 +453,3 @@
   // Selector mixin
-  if (group && ret && !this.return) {
+  if (group && ret && 'block' == ret.nodeName && !this.return) {
     this.mixin(ret.nodes, group.block);
@@ -456,0 +456,0 @@ return nodes.null;

package.json

 {   "name": "stylus"
   , "description": "Robust, expressive language which compiles to CSS"
-  , "version": "0.5.3"
+  , "version": "0.6.0"
   , "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

179163

increased by0.45%

Lines of code

6543

increased by0.28%

Worsened metrics

Number of package files

70

decreased by-9.09%

No dependency changes