stylus-source 0.21.2 → 0.22.0

data/VERSION

@@ -1 +1 @@
-0.21.2
+0.22.0

data/vendor/History.md

@@ -1,4 +1,15 @@
 
+0.22.0 / 2012-01-04 
+==================
+
+  * Added `@extend`. Closes #149
+  * Added more syntax highlighting to TextMate bundle [paulmillr]
+  * Added `keys(pairs)` and `values(pairs)` BIFs
+  * Added JavaScript object coercion support
+  * Added JavaScript -> Stylus node coercion utilities
+  * Fixed `.define()`ing of functions
+  * Fixed `stylus(1)` repl for 0.6.x
+
 0.21.2 / 2011-12-22 
 ==================
 

data/vendor/Readme.md

@@ -110,6 +110,10 @@ form input {
    - [Connect](/LearnBoost/stylus/blob/master/docs/middleware.md)
    - [Ruby On Rails](https://github.com/lucasmazza/stylus_rails)
 
+### CMS Support
+
+   - [DocPad](https://github.com/bevry/docpad)
+
 ### Screencasts
 
   - [Stylus Intro](http://screenr.com/bNY)

data/vendor/bin/stylus

@@ -353,7 +353,7 @@ function repl() {
     , parser = new stylus.Parser('', options)
     , evaluator = new stylus.Evaluator(parser.parse(), options)
     , rl = require('readline')
-    , repl = rl.createInterface(process.stdin, process.stdout, true)
+    , repl = rl.createInterface(process.stdin, process.stdout, autocomplete)
     , global = evaluator.global.scope;
 
   // expose BIFs
@@ -364,56 +364,33 @@ function repl() {
   repl.prompt();
 
   // HACK: flat-list auto-complete
-  repl._tabComplete = function(){
-    var out = this.output
-      , line = this.line
+  function autocomplete(line){
+    var out = process.stdout
       , keys = Object.keys(global.locals)
       , len = keys.length
       , words = line.split(/\s+/)
       , word = words.pop()
       , names = []
       , name
-      , obj
+      , node
       , key;
 
     // find words that match
     for (var i = 0; i < len; ++i) {
       key = keys[i];
       if (0 == key.indexOf(word)) {
-        names.push(key);
-      }
-    }
-
-    // several candidates
-    if (names.length > 1) {
-      out.write('\r\n\r\n\033[90m');
-      names.forEach(function(name){
-        var node = global.lookup(name);
+        node = global.lookup(key);
         switch (node.nodeName) {
           case 'function':
-            out.write('  - ' + node + '\r\n');
+            names.push(node.toString());
             break;
           default:
-            out.write('  - ' + name + '\r\n');
+            names.push(key);
         }
-      });
-      out.write('\r\n\033[0m');
-      this._refreshLine();
-    // single candidate
-    } else if (names.length) {
-      name = names.pop();
-      obj = global.lookup(name);
-      name = name.replace(word, '');
-      switch (obj.nodeName) {
-        case 'function':
-          this._insertString(name + '()');
-          this.cursor--;
-          break;
-        default:
-          this._insertString(name);
       }
-      this._refreshLine();
     }
+
+    return [names, line];
   };
 
   repl.on('line', function(line){

data/vendor/docs/bifs.md

@@ -104,6 +104,22 @@ Return the lightness of the given `color`.
  
  Aliased as `prepend()`
 
+### keys(pairs)
+
+  Return keys in the given `pairs`:
+  
+     pairs = (one 1) (two 2) (three 3)
+     keys(pairs)
+     // => one two three
+
+### values(pairs)
+
+  Return values in the given `pairs`:
+  
+     pairs = (one 1) (two 2) (three 3)
+     values(pairs)
+     // => 1 2 3
+
 ### typeof(node)
 
 Return type of `node` as a string.

data/vendor/docs/js.md

@@ -63,6 +63,8 @@ Defer importing of the given `path` until evaluation is performed. The example b
      .define('number', 15.5)
      .define('some-bool', true)
      .define('list', [1,2,3])
+     .define('list', [1,2,[3,4,[5,6]]])
+     .define('list', { foo: 'bar', bar: 'baz' })
      .define('families', ['Helvetica Neue', 'Helvetica', 'sans-serif'])
 
 ### .define(name, fn)

data/vendor/editors/Stylus.tmbundle/Syntaxes/Stylus.tmLanguage

@@ -71,13 +71,33 @@
 			<key>name</key>
 			<string>entity.other.attribute-name.pseudo-class.stylus</string>
 		</dict>
+		<dict>
+			<key>match</key>
+			<string>\b(a|abbr|acronym|address|area|article|aside|audio|b|base|big|blockquote|body|br|button|canvas|caption|cite|code|col|colgroup|datalist|dd|del|details|dfn|dialog|div|dl|dt|em|eventsource|fieldset|figure|figcaption|footer|form|frame|frameset|(h[1-6])|head|header|hgroup|hr|html|i|iframe|img|input|ins|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|ul|var|video)\b</string>
+			<key>name</key>
+			<string>entity.name.tag.stylus</string>
+		</dict>
+    <dict>
+      <key>captures</key>
+      <dict>
+          <key>1</key>
+          <dict>
+              <key>name</key>
+              <string>punctuation.definition.constant.stylus</string>
+          </dict>
+      </dict>
+      <key>match</key>
+      <string>(#)([0-9a-fA-F]{3}|[0-9a-fA-F]{6})\b</string>
+      <key>name</key>
+      <string>constant.other.color.rgb-value.stylus</string>
+    </dict>
 		<dict>
 			<key>captures</key>
 			<dict>
 				<key>1</key>
 				<dict>
 					<key>name</key>
-					<string>punctuation.definition.entity.css</string>
+					<string>punctuation.definition.entity.stylus</string>
 				</dict>
 			</dict>
 			<key>match</key>
@@ -91,6 +111,12 @@
 			<key>name</key>
 			<string>keyword.control.stylus</string>
 		</dict>
+		<dict>
+			<key>match</key>
+			<string>((?:!|~|\+|-|(?:\*)?\*|\/|%|(?:\.)\.\.|&lt;|&gt;|(?:=|:|\?|\+|-|\*|\/|%|&lt;|&gt;)?=|!=)|(?:in|is(?:nt)?|not)\b)</string>
+			<key>name</key>
+			<string>keyword.operator.stylus</string>
+		</dict>
 		<dict>
 			<key>begin</key>
 			<string>"</string>
@@ -123,12 +149,6 @@
 			<key>name</key>
 			<string>comment.block.js</string>
 		</dict>
-		<dict>
-			<key>match</key>
-			<string>(?:\b(\d+))|(#[a-fA-F0-9]+)</string>
-			<key>name</key>
-			<string>constant.numeric.stylus</string>
-		</dict>
 		<dict>
 			<key>captures</key>
 			<dict>
@@ -157,6 +177,46 @@
 			<key>name</key>
 			<string>meta.function.stylus</string>
 		</dict>
+    <dict>
+      <key>comment</key>
+      <string>http://www.w3.org/TR/CSS21/syndata.html#value-def-color</string>
+      <key>match</key>
+      <string>\b(aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow)\b</string>
+      <key>name</key>
+      <string>support.constant.color.w3c-standard-color-name.stylus</string>
+    </dict>
+    <dict>
+      <key>match</key>
+      <string>(\b(?i:arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace)\b)</string>
+      <key>name</key>
+      <string>support.constant.font-name.stylus</string>
+    </dict>
+    <dict>
+      <key>captures</key>
+      <dict>
+          <key>1</key>
+          <dict>
+              <key>name</key>
+              <string>keyword.other.unit.stylus</string>
+          </dict>
+      </dict>
+      <key>match</key>
+      <string>(?x)
+          (?:-|\+)?(?:(?:[0-9]+(?:\.[0-9]+)?)|(?:\.[0-9]+))
+          ((?:px|pt|ch|cm|mm|in|r?em|ex|pc|deg|g?rad|dpi|dpcm|s)\b|%)?</string>
+      <key>name</key>
+      <string>constant.numeric.stylus</string>
+    </dict>
+    <dict>
+      <key>match</key> <string>\b(azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|box-shadow|border-radius|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|image-rendering|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|-moz-border-radius|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow(-[xy])?|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|pointer-events|position|quotes|resize|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|src|stress|table-layout|text-(align|decoration|indent|rendering|shadow|transform)|top|transition|transform|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-(spacing|wrap)|zoom|z-index)\b</string>
+      <key>name</key>
+      <string>support.type.property-name.stylus</string>
+    </dict>
+    <dict>
+      <key>match</key> <string>\b(absolute|all(-scroll)?|always|armenian|auto|avoid|baseline|below|bidi-override|block|bold|bolder|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|geometricPrecision|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|optimize(Legibility|Quality|Speed)|outset|outside|overline|pointer|pre(-(wrap|line))?|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|sub|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical(-(ideographic|text))?|visible(Painted|Fill|Stroke)?|w-resize|wait|whitespace|zero|smaller|larger|((xx?-)?(small|large))|painted|fill|stroke)\b</string>
+      <key>name</key>
+      <string>support.constant.property-value.stylus</string>
+    </dict>
 	</array>
 	<key>scopeName</key>
 	<string>source.stylus</string>

data/vendor/lib/functions/index.styl

@@ -128,6 +128,22 @@ spin(color, amount)
 last(expr)
   expr[length(expr) - 1]
 
+// return keys in the given pairs
+
+keys(pairs)
+  ret = ()
+  for pair in pairs
+    push(ret, pair[0]);
+  ret
+
+// return values in the given pairs
+
+values(pairs)
+  ret = ()
+  for pair in pairs
+    push(ret, pair[1]);
+  ret
+
 // join values with the given delimiter
 
 join(delim, vals...)

data/vendor/lib/lexer.js

@@ -150,6 +150,7 @@ Lexer.prototype = {
       || this.urlchars()
       || this.atrule()
       || this.scope()
+      || this.extends()
       || this.media()
       || this.comment()
       || this.newline()
@@ -424,6 +425,18 @@ Lexer.prototype = {
     }
   },
 
+  /**
+   * '@extends' ([^{\n]+)
+   */
+  
+  extends: function() {
+    var captures;
+    if (captures = /^@extends?[ \t]*([^\/{\n;]+)/.exec(this.str)) {
+      this.skip(captures);
+      return new Token('extend', captures[1].trim());
+    }
+  },
+
   /**
    * '@media' ([^{\n]+)
    */

data/vendor/lib/nodes/extend.js

@@ -0,0 +1,41 @@
+
+/*!
+ * Stylus - Extend
+ * Copyright(c) 2010 LearnBoost <dev@learnboost.com>
+ * MIT Licensed
+ */
+
+/**
+ * Module dependencies.
+ */
+
+var Node = require('./node');
+
+/**
+ * Initialize a new `Extend` with the given `selector`.
+ *
+ * @param {Selector} selector
+ * @api public
+ */
+
+var Extend = module.exports = function Extend(selector){
+  Node.call(this);
+  this.selector = selector;
+};
+
+/**
+ * Inherit from `Node.prototype`.
+ */
+
+Extend.prototype.__proto__ = Node.prototype;
+
+/**
+ * Return `@extend selector`.
+ *
+ * @return {String}
+ * @api public
+ */
+
+Extend.prototype.toString = function(){
+  return '@extend ' + this.selector;
+};

data/vendor/lib/nodes/group.js

@@ -20,6 +20,7 @@ var Node = require('./node');
 var Group = module.exports = function Group(){
   Node.call(this);
   this.nodes = [];
+  this.extends = [];
 };
 
 /**

data/vendor/lib/nodes/index.js

@@ -37,6 +37,7 @@ exports.Comment = require('./comment');
 exports.Keyframes = require('./keyframes');
 exports.Charset = require('./charset');
 exports.Import = require('./import');
+exports.Extend = require('./extend');
 exports.Function = require('./function');
 exports.Property = require('./property');
 exports.Selector = require('./selector');

data/vendor/lib/nodes/page.js

@@ -32,7 +32,7 @@ var Page = module.exports = function Page(selector, block){
 Page.prototype.__proto__ = Node.prototype;
 
 /**
- * Return `@oage name`.
+ * Return `@page name`.
  *
  * @return {String}
  * @api public

data/vendor/lib/parser.js

@@ -515,6 +515,7 @@ Parser.prototype = {
       case 'literal':
       case 'charset':
       case 'import':
+      case 'extend':
       case 'media':
       case 'page':
       case 'ident':
@@ -692,6 +693,15 @@ Parser.prototype = {
     return nodes.null;
   },
 
+  /**
+   * extend
+   */
+
+  extend: function(){
+    var val = this.expect('extend').val;
+    return new nodes.Extend(val);
+  },
+
   /**
    * media
    */

data/vendor/lib/renderer.js

@@ -12,6 +12,7 @@
 var Parser = require('./parser')
   , Compiler = require('./visitor/compiler')
   , Evaluator = require('./visitor/evaluator')
+  , Normalizer = require('./visitor/normalizer')
   , utils = require('./utils')
   , nodes = require('./nodes')
   , path = require('path')
@@ -47,12 +48,22 @@ Renderer.prototype.render = function(fn){
   var parser = this.parser = new Parser(this.str, this.options);
   try {
     nodes.filename = this.options.filename;
+    // parse
     var ast = parser.parse();
+
+    // evaluate
     this.evaluator = new Evaluator(ast, this.options);
     ast = this.evaluator.evaluate();
+
+    // normalize
+    var normalizer = new Normalizer(ast, this.options);
+    ast = normalizer.normalize();
+
+    // compile
     var compiler = new Compiler(ast, this.options)
       , css = compiler.compile()
       , js = compiler.js;
+
     fn(null, css, js);
   } catch (err) {
     var options = {};
@@ -130,6 +141,8 @@ Renderer.prototype.use = function(fn){
  */
 
 Renderer.prototype.define = function(name, fn, raw){
+  fn = utils.coerce(fn);
+
   if (fn.nodeName) {
     this.options.globals[name] = fn;
     return this;

data/vendor/lib/stylus.js

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

data/vendor/lib/utils.js

@@ -208,6 +208,72 @@ exports.unwrap = function(expr){
   return exports.unwrap(expr.nodes[0]);
 };
 
+/**
+ * Coerce JavaScript values to their Stylus equivalents.
+ *
+ * @param {Mixed} val
+ * @return {Node}
+ * @api public
+ */
+
+exports.coerce = function(val){
+  switch (typeof val) {
+    case 'function':
+      return val;
+    case 'string':
+      return new nodes.String(val);
+    case 'boolean':
+      return new nodes.Boolean(val);
+    case 'number':
+      return new nodes.Unit(val);
+    default:
+      if (null == val) return nodes.null;
+      if (Array.isArray(val)) return exports.coerceArray(val);
+      if (val.nodeName) return val;
+      return exports.coerceObject(val);
+  }
+};
+
+/**
+ * Coerce a javascript `Array` to a Stylus `Expression`.
+ *
+ * @param {Array} val
+ * @return {Expression}
+ * @api private
+ */
+
+exports.coerceArray = function(val){
+  var expr = new nodes.Expression;
+  val.forEach(function(val){
+    expr.push(exports.coerce(val));
+  });
+  return expr;
+};
+
+/**
+ * Coerce a javascript object to a Stylus `Expression`.
+ *
+ * For example `{ foo: 'bar', bar: 'baz' }` would become
+ * the expression `(foo 'bar') (bar 'baz')`.
+ *
+ * @param {Object} obj
+ * @return {Expression}
+ * @api public
+ */
+
+exports.coerceObject = function(obj){
+  var expr = new nodes.Expression
+    , val;
+
+  for (var key in obj) {
+    val = exports.coerce(obj[key]);
+    key = new nodes.Ident(key);
+    expr.push(exports.coerceArray([key, val]));
+  }
+
+  return expr;
+};
+
 /**
  * Return param names for `fn`.
  *

data/vendor/lib/visitor/compiler.js

@@ -34,7 +34,7 @@ var Compiler = module.exports = function Compiler(root, options) {
   this.spaces = options['indent spaces'] || 2;
   this.indents = 1;
   Visitor.call(this, root);
-  this.tree = [];
+  this.stack = [];
   this.js = '';
 };
 
@@ -75,18 +75,9 @@ Compiler.prototype.visitRoot = function(block){
   this.buf = '';
   for (var i = 0, len = block.nodes.length; i < len; ++i) {
     var node = block.nodes[i];
-    switch (node.nodeName) {
-      case 'null':
-      case 'expression':
-      case 'function':
-      case 'jsliteral':
-      case 'unit':
-        continue;
-      default:
-        if (this.linenos || this.firebug) this.debugInfo(node);
-        var ret = this.visit(node);
-        if (ret) this.buf += ret + '\n';
-    }
+    if (this.linenos || this.firebug) this.debugInfo(node);
+    var ret = this.visit(node);
+    if (ret) this.buf += ret + '\n';
   }
   return this.buf;
 };
@@ -310,61 +301,19 @@ Compiler.prototype.visitUnit = function(unit){
  */
 
 Compiler.prototype.visitGroup = function(group){
-  var self = this
-    , tree = this.tree
-    , prev = tree[tree.length - 1]
-    , curr = [];
-
-  // Construct an array of arrays
-  // representing the selector hierarchy
-  group.nodes.forEach(function(node){
-    curr.push(node.parent
-        ? node
-        : node.val);
-  });
+  var stack = this.stack;
 
-  tree.push(curr);
+  stack.push(group.nodes);
 
-  // Reverse recurse the
-  // hierarchy array to build
-  // up the selector combinations.
-  // When we reach root, we have our
-  // selector string built
-  var selectors = []
-    , buf = [];
-  function join(arr, i) {
-    if (i) {
-      arr[i].forEach(function(str){
-        buf.unshift(str);
-        join(arr, i - 1);
-        buf.shift();
-      });
-    } else {
-      arr[0].forEach(function(selector){
-        var str = selector.trim();
-        if (buf.length) {
-          for (var i = 0, len = buf.length; i < len; ++i) {
-            if (~buf[i].indexOf('&')) {
-              str = buf[i].replace(/&/g, str).trim();
-            } else {
-              str += ' ' + buf[i].trim();
-            }
-          }
-        }
-        selectors.push(self.indent + str.trimRight());
-      });
-    }
-  }
-
-  // Join selectors
+  // selectors
   if (group.block.hasProperties) {
-    join(tree, tree.length - 1);
+    var selectors = this.compileSelectors(stack);
     this.buf += (this.selector = selectors.join(this.compress ? ',' : ',\n'));
   }
 
-  // Output blocks
+  // output block
   this.visit(group.block);
-  tree.pop();
+  stack.pop();
 };
 
 /**
@@ -450,6 +399,61 @@ Compiler.prototype.visitProperty = function(prop){
         : ';');
 };
 
+/**
+ * Compile selector strings in `arr` from the bottom-up
+ * to produce the selector combinations. For example
+ * the following Stylus:
+ *
+ *    ul
+ *      li
+ *      p
+ *        a
+ *          color: red
+ *
+ * Would return:
+ *
+ *      [ 'ul li a', 'ul p a' ]
+ *
+ * @param {Array} arr
+ * @return {Array}
+ * @api private
+ */
+
+Compiler.prototype.compileSelectors = function(arr){
+  var stack = this.stack
+    , self = this
+    , selectors = []
+    , buf = [];
+
+  function compile(arr, i) {
+    if (i) {
+      arr[i].forEach(function(selector){
+        buf.unshift(selector.val);
+        compile(arr, i - 1);
+        buf.shift();
+      });
+    } else {
+      arr[0].forEach(function(selector){
+        var str = selector.val.trim();
+        if (buf.length) {
+          for (var i = 0, len = buf.length; i < len; ++i) {
+            if (~buf[i].indexOf('&')) {
+              str = buf[i].replace(/&/g, str).trim();
+            } else {
+              str += ' ' + buf[i].trim();
+            }
+          }
+        }
+        selectors.push(self.indent + str.trimRight());
+      });
+    }
+  }
+
+  compile(arr, arr.length - 1);
+
+  return selectors;
+};
+
 /**
  * Debug info.
  */