stylus-source 0.15.4 → 0.17.0

data/{lib/stylus → vendor/lib}/nodes/expression.js

@@ -147,11 +147,43 @@ Expression.prototype.operate = function(op, right, val){
       return ret == this.nodes[0] ? this : right;
     case 'in':
       return Node.prototype.operate.call(this, op, right);
+    case '!=':
+      return this.operate('==', right, val).negate();
+    case '==':
+      var len = this.nodes.length
+        , right = right.toExpression()
+        , a
+        , b;
+      if (len != right.nodes.length) return nodes.false;
+      for (var i = 0; i < len; ++i) {
+        a = this.nodes[i];
+        b = right.nodes[i];
+        if (a.operate(op, b).isTrue) continue;
+        return nodes.false;
+      }
+      return nodes.true;
+      break;
     default:
       return this.first.operate(op, right, val);
   }
 };
 
+/**
+ * Iterate nodes to return a `Boolean`.
+ *
+ * @return {Boolean}
+ * @api public
+ */
+
+Expression.prototype.toBoolean = function(){
+  for (var i = 0, len = this.nodes.length; i < len; ++i) {
+    if (this.nodes[i].toBoolean().isTrue) {
+      return nodes.true;
+    }
+  }
+  return nodes.false;
+};
+
 /**
  * Return "<a> <b> <c>" or "<a>, <b>, <c>" if
  * the expression represents a list.

data/{lib/stylus → vendor/lib}/nodes/node.js

@@ -90,6 +90,20 @@ Node.prototype.toBoolean = function(){
   return nodes.true;
 };
 
+/**
+ * Return the expression, or wrap this node in an expression.
+ *
+ * @return {Expression}
+ * @api public
+ */
+
+Node.prototype.toExpression = function(){
+  if ('expression' == this.nodeName) return this;
+  var expr = new nodes.Expression;
+  expr.push(this);
+  return expr;
+};
+
 /**
  * Return false if `op` is generally not coerced.
  *

data/{lib/stylus → vendor/lib}/nodes/rgba.js

@@ -11,6 +11,8 @@
 
 var Node = require('./node')
   , HSLA = require('./hsla')
+  , functions = require('../functions')
+  , adjust = functions['-adjust']
   , nodes = require('./');
 
 /**
@@ -202,7 +204,7 @@ RGBA.prototype.operate = function(op, right){
         case 'unit':
           var n = right.val;
           switch (right.type) {
-            case '%': return this.hsla.adjustLightness(n).rgba;
+            case '%': return adjust(this, new nodes.String('lightness'), right);
             case 'deg': return this.hsla.adjustHue(n).rgba;
             default: return this.add(n,n,n,0);
           }
@@ -217,7 +219,7 @@ RGBA.prototype.operate = function(op, right){
         case 'unit':
           var n = right.val;
           switch (right.type) {
-            case '%': return this.hsla.adjustLightness(-n).rgba;
+            case '%': return adjust(this, new nodes.String('lightness'), new nodes.Unit(-n, '%'));
             case 'deg': return this.hsla.adjustHue(-n).rgba;
             default: return this.sub(n,n,n,0);
           }

data/{lib/stylus → vendor/lib}/parser.js

@@ -490,6 +490,7 @@ Parser.prototype = {
    *  | charset
    *  | import
    *  | media
+   *  | scope
    *  | keyframes
    *  | page
    *  | for
@@ -516,6 +517,7 @@ Parser.prototype = {
       case 'media':
       case 'page':
       case 'ident':
+      case 'scope':
       case 'unless':
       case 'function':
       case 'for':
@@ -678,7 +680,17 @@ Parser.prototype = {
     this.state.pop();
     return node;
   },
-  
+
+  /**
+   * scope
+   */
+
+  scope: function(){
+    var val = this.expect('scope').val;
+    this.selectorScope = val;
+    return nodes.null;
+  },
+
   /**
    * media
    */
@@ -983,7 +995,9 @@ Parser.prototype = {
   selector: function() {
     var tok
       , arr
-      , group = new nodes.Group;
+      , group = new nodes.Group
+      , scope = this.selectorScope
+      , isRoot = 'root' == this.currentState();
 
     do {
       arr = [];
@@ -1026,6 +1040,7 @@ Parser.prototype = {
       }
 
       // Push the selector
+      if (isRoot && scope) arr.unshift(new nodes.Literal(scope + ' '));
       group.push(new nodes.Selector(arr));
     } while (this.accept(',') || this.accept('newline'));
 

data/{lib/stylus → vendor/lib}/stylus.js

@@ -24,7 +24,7 @@ exports = module.exports = render;
  * Library version.
  */
 
-exports.version = '0.15.4';
+exports.version = '0.17.0';
 
 /**
  * Expose nodes.

data/{lib/stylus → vendor/lib}/visitor/compiler.js

@@ -135,6 +135,7 @@ Compiler.prototype.visitBlock = function(block){
         break;
       case 'media':
       case 'import':
+      case 'fontface':
         this.visit(node);
         break;
     }

data/{lib/stylus → vendor/lib}/visitor/evaluator.js

@@ -387,9 +387,12 @@ Evaluator.prototype.visitBinOp = function(binop){
 
 Evaluator.prototype.visitUnaryOp = function(unary){
   var op = unary.op
-    , node = this.visit(unary.expr).first.clone();
+    , node = this.visit(unary.expr);
 
-  if ('!' != op) utils.assertType(node, 'unit');
+  if ('!' != op) {
+    node = node.first.clone();
+    utils.assertType(node, 'unit');
+  }
 
   switch (op) {
     case '-':
@@ -404,7 +407,7 @@ Evaluator.prototype.visitUnaryOp = function(unary){
     case '!':
       return node.toBoolean().negate();
   }
-  
+
   return node;
 };
 
@@ -568,6 +571,9 @@ Evaluator.prototype.visitImport = function(imported){
     , Parser = require('../parser')
     , path = this.visit(imported.path).first;
 
+  // url() passed
+  if ('url' == path.name) return imported;
+
   // Enusre string
   if (!path.string) throw new Error('@import string expected');
   var name = path = path.string;

data/vendor/node_modules/mkdirp/LICENSE

@@ -0,0 +1,21 @@
+Copyright 2010 James Halliday (mail@substack.net)
+
+This project is free software released under the MIT/X11 license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/vendor/node_modules/mkdirp/README.markdown

@@ -0,0 +1,21 @@
+mkdirp
+======
+
+Like `mkdir -p`, but in node.js!
+
+Example
+=======
+
+pow.js
+------
+    var mkdirp = require('mkdirp');
+    
+    mkdirp('/tmp/foo/bar/baz', 0755, function (err) {
+        if (err) console.error(err)
+        else console.log('pow!')
+    });
+
+Output
+    pow!
+
+And now /tmp/foo/bar/baz exists, huzzah!

data/vendor/node_modules/mkdirp/examples/pow.js

@@ -0,0 +1,6 @@
+var mkdirp = require('mkdirp');
+
+mkdirp('/tmp/foo/bar/baz', 0755, function (err) {
+    if (err) console.error(err)
+    else console.log('pow!')
+});

data/vendor/node_modules/mkdirp/examples/pow.js.orig

@@ -0,0 +1,6 @@
+var mkdirp = require('mkdirp');
+
+mkdirp('/tmp/foo/bar/baz', 0755, function (err) {
+    if (err) console.error(err)
+    else console.log('pow!')
+});

data/vendor/node_modules/mkdirp/examples/pow.js.rej

@@ -0,0 +1,19 @@
+--- examples/pow.js
++++ examples/pow.js
+@@ -1,6 +1,15 @@
+-var mkdirp = require('mkdirp').mkdirp;
++var mkdirp = require('../').mkdirp,
++    mkdirpSync = require('../').mkdirpSync;
+ 
+ mkdirp('/tmp/foo/bar/baz', 0755, function (err) {
+     if (err) console.error(err)
+     else console.log('pow!')
+ });
++
++try {
++  mkdirpSync('/tmp/bar/foo/baz', 0755);
++  console.log('double pow!');
++}
++catch (ex) {
++  console.log(ex);
++}

data/vendor/node_modules/mkdirp/index.js

@@ -0,0 +1,20 @@
+var path = require('path');
+var fs = require('fs');
+
+var exports = module.exports = function mkdirP (p, mode, f) {
+    var cb = f || function () {};
+    p = path.resolve(p);
+    
+    var ps = path.normalize(p).split('/');
+    path.exists(p, function (exists) {
+        if (exists) cb(null);
+        else mkdirP(ps.slice(0,-1).join('/'), mode, function (err) {
+            if (err && err.code !== 'EEXIST') cb(err)
+            else fs.mkdir(p, mode, function (err) {
+                if (err && err.code !== 'EEXIST') cb(err)
+                else cb()
+            });
+        });
+    });
+};
+exports.mkdirp = exports.mkdirP = module.exports;

data/vendor/node_modules/mkdirp/package.json

@@ -0,0 +1,23 @@
+{
+    "name" : "mkdirp",
+    "description" : "Recursively mkdir, like `mkdir -p`",
+    "version" : "0.0.7",
+    "author" : "James Halliday <mail@substack.net> (http://substack.net)",
+    "main" : "./index",
+    "keywords" : [
+        "mkdir",
+        "directory"
+    ],
+    "repository" : {
+        "type" : "git",
+        "url" : "http://github.com/substack/node-mkdirp.git"
+    },
+    "scripts" : {
+        "test" : "node node_modules/tap/bin/tap.js test/*.js"
+    },
+    "devDependencies" : {
+        "tap" : "0.0.x"
+    },
+    "license" : "MIT/X11",
+    "engines": { "node": "*" }
+}

data/vendor/node_modules/mkdirp/test/mkdirp.js

@@ -0,0 +1,28 @@
+var mkdirp = require('../');
+var path = require('path');
+var fs = require('fs');
+var test = require('tap').test;
+
+test('woo', function (t) {
+    t.plan(2);
+    var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+    var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+    var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+    
+    var file = '/tmp/' + [x,y,z].join('/');
+    
+    mkdirp(file, 0755, function (err) {
+        if (err) t.fail(err);
+        else path.exists(file, function (ex) {
+            if (!ex) t.fail('file not created')
+            else fs.stat(file, function (err, stat) {
+                if (err) t.fail(err)
+                else {
+                    t.equal(stat.mode & 0777, 0755);
+                    t.ok(stat.isDirectory(), 'target not a directory');
+                    t.end();
+                }
+            })
+        })
+    });
+});

data/vendor/node_modules/mkdirp/test/race.js

@@ -0,0 +1,41 @@
+var mkdirp = require('../').mkdirp;
+var path = require('path');
+var fs = require('fs');
+var test = require('tap').test;
+
+test('race', function (t) {
+    t.plan(4);
+    var ps = [ '', 'tmp' ];
+    
+    for (var i = 0; i < 25; i++) {
+        var dir = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+        ps.push(dir);
+    }
+    var file = ps.join('/');
+    
+    var res = 2;
+    mk(file, function () {
+        if (--res === 0) t.end();
+    });
+    
+    mk(file, function () {
+        if (--res === 0) t.end();
+    });
+    
+    function mk (file, cb) {
+        mkdirp(file, 0755, function (err) {
+            if (err) t.fail(err);
+            else path.exists(file, function (ex) {
+                if (!ex) t.fail('file not created')
+                else fs.stat(file, function (err, stat) {
+                    if (err) t.fail(err)
+                    else {
+                        t.equal(stat.mode & 0777, 0755);
+                        t.ok(stat.isDirectory(), 'target not a directory');
+                        if (cb) cb();
+                    }
+                })
+            })
+        });
+    }
+});

data/vendor/node_modules/mkdirp/test/rel.js

@@ -0,0 +1,32 @@
+var mkdirp = require('../');
+var path = require('path');
+var fs = require('fs');
+var test = require('tap').test;
+
+test('rel', function (t) {
+    t.plan(2);
+    var x = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+    var y = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+    var z = Math.floor(Math.random() * Math.pow(16,4)).toString(16);
+    
+    var cwd = process.cwd();
+    process.chdir('/tmp');
+    
+    var file = [x,y,z].join('/');
+    
+    mkdirp(file, 0755, function (err) {
+        if (err) t.fail(err);
+        else path.exists(file, function (ex) {
+            if (!ex) t.fail('file not created')
+            else fs.stat(file, function (err, stat) {
+                if (err) t.fail(err)
+                else {
+                    process.chdir(cwd);
+                    t.equal(stat.mode & 0777, 0755);
+                    t.ok(stat.isDirectory(), 'target not a directory');
+                    t.end();
+                }
+            })
+        })
+    });
+});

data/vendor/package.json

@@ -0,0 +1,16 @@
+{   "name": "stylus"
+  , "description": "Robust, expressive, and feature-rich CSS superset"
+  , "version": "0.17.0"
+  , "author": "TJ Holowaychuk <tj@vision-media.ca>"
+  , "keywords": ["css", "parser", "style", "stylesheets", "jade", "language"]
+  , "repository": "git://github.com/learnboost/stylus"
+  , "main": "./index.js"
+  , "engines": { "node": ">= 0.2.4" }
+  , "bin": { "stylus": "./bin/stylus" }
+  , "scripts" : { "prepublish" : "npm prune" }
+  , "dependencies": {
+      "cssom": "0.2.0"
+    , "growl": "1.1.0"
+    , "mkdirp": "0.0.7"
+  }
+}