stylus-source 0.23.0 → 0.24.0

data/Rakefile

@@ -20,18 +20,18 @@ end
 
 desc "Downloads stylus into './vendor' and checks the latest released tag"
 task :update do
-  raw = open('http://registry.npmjs.org/stylus') { |io| io.binmode.read }
-  metadata = MultiJson.decode(raw)
+  raw             = open('http://registry.npmjs.org/stylus') { |io| io.binmode.read }
+  metadata        = MultiJson.decode(raw)
   current_version = File.read('VERSION')
-  version = ENV['VERSION'] || metadata['dist-tags']['latest']
-  tarball = metadata['versions'][version]['dist']['tarball']
+  version         = ENV['VERSION'] || metadata['dist-tags']['latest']
+  tarball         = metadata['versions'][version]['dist']['tarball']
 
   say "Updating stylus source from #{current_version} to #{version}"
 
   execute 'cleaning up old files', 'rm -rf vendor'
   execute "download stylus #{version}", "wget #{tarball} -O stylus.tgz"
   execute "upacking stylus #{version}", 'tar -zxvf stylus.tgz'
-  execute 'cleaning up', 'rm stylus.tgz package/.npmignore'
+  execute 'cleaning up', 'rm -rf stylus.tgz package/.npmignore'
   execute 'updating stylus dependencies', 'mv package vendor && cd vendor && npm install .'
   say 'updating VERSION file'
   File.open('VERSION', 'w') { |file| file.write(version) }

data/VERSION

@@ -1 +1 @@
-0.23.0
+0.24.0

data/vendor/lib/functions/index.js

@@ -150,7 +150,7 @@ exports.type =
 exports.typeof =
 exports['type-of'] = function type(node){
   utils.assertPresent(node, 'expression');
-  return new nodes.String(node.nodeName);
+  return node.nodeName;
 };
 
 /**
@@ -356,7 +356,7 @@ exports.unit = function unit(unit, type){
     utils.assertString(type, 'type');
     return new nodes.Unit(unit.val, type.string);
   } else {
-    return new nodes.String(unit.type || '');
+    return unit.type || '';
   }
 };
 
@@ -429,13 +429,11 @@ exports.match = function match(pattern, val){
 
 (exports.length = function length(expr){
   if (expr) {
-    if (expr.nodes) {
-      return new nodes.Unit(utils.unwrap(expr).nodes.length);
-    } else {
-      return new nodes.Unit(1);
-    }
+    return expr.nodes
+      ? utils.unwrap(expr).nodes.length
+      : 1;
   }
-  return new nodes.Unit(0);
+  return 0;
 }).raw = true;
 
 /**
@@ -502,7 +500,7 @@ exports.trace = function trace(){
   for (var i = 1, len = arguments.length; i < len; ++i) {
     expr.nodes.push(utils.unwrap(arguments[i]));
   }
-  return new nodes.Unit(expr.nodes.length);
+  return expr.nodes.length;
 }).raw = true;
 
 /**
@@ -519,7 +517,7 @@ exports.trace = function trace(){
   for (var i = 1, len = arguments.length; i < len; ++i) {
     expr.nodes.unshift(utils.unwrap(arguments[i]));
   }
-  return new nodes.Unit(expr.nodes.length);
+  return expr.nodes.length;
 }).raw = true;
 
 /**
@@ -570,7 +568,7 @@ exports.trace = function trace(){
  */
 
 (exports['opposite-position'] = function oppositePosition(positions){
-  var expr = new nodes.Expression;
+  var expr = [];
   utils.unwrap(positions).nodes.forEach(function(pos, i){
     utils.assertString(pos, 'position ' + i);
     pos = (function(){ switch (pos.string) {
@@ -578,6 +576,7 @@ exports.trace = function trace(){
       case 'bottom': return 'top';
       case 'left': return 'right';
       case 'right': return 'left';
+      case 'center': return 'center';
       default: throw new Error('invalid position ' + pos);
     }})();
     expr.push(new nodes.Literal(pos));
@@ -614,7 +613,7 @@ exports['image-size'] = function imageSize(img) {
   img.close();
 
   // Return (w h)
-  var expr = new nodes.Expression;
+  var expr = [];
   expr.push(new nodes.Unit(size[0], 'px'));
   expr.push(new nodes.Unit(size[1], 'px'));
 

data/vendor/lib/functions/index.styl

@@ -123,6 +123,51 @@ fade-in(color, amount)
 spin(color, amount)
   color + unit(amount, deg)
 
+// mix two colors by a given amount
+
+mix(color1, color2, weight = 50%)
+  unless weight in 0..100
+    error("Weight must be between 0% and 100%")
+
+  if length(color1) == 2
+    weight = color1[0]
+    color1 = color1[1]
+
+  else if length(color2) == 2
+    weight = 100 - color2[0]
+    color2 = color2[1]
+
+  require-color(color1)
+  require-color(color2)
+
+  p = unit(weight / 100, '')
+  w = p * 2 - 1
+
+  a = alpha(color1) - alpha(color2)
+
+  w1 = (((w * a == -1) ? w : (w + a) / (1 + w * a)) + 1) / 2
+  w2 = 1 - w1
+
+  channels = (red(color1) red(color2)) (green(color1) green(color2)) (blue(color1) blue(color2))
+  rgb = ()
+
+  for pair in channels
+    push(rgb, floor(pair[0] * w1 + pair[1] * w2))
+
+  a1 = alpha(color1) * p
+  a2 = alpha(color1) * (1 - p)
+  alpha = a1 + a2
+
+  rgba(rgb[0], rgb[1], rgb[2], alpha)
+
+// invert colors, leave alpha intact
+
+invert(color)
+  r = 255 - red(color)
+  g = 255 - green(color)
+  b = 255 - blue(color)
+  rgba(r,g,b,alpha(color))
+
 // return the last value in the given expr
 
 last(expr)

data/vendor/lib/parser.js

@@ -15,6 +15,13 @@ var Lexer = require('./lexer')
   , inspect = require('util').inspect
   , errors = require('./errors');
 
+// debuggers
+
+var debug = {
+    lexer: require('debug')('stylus:lexer')
+  , selector: require('debug')('stylus:parser:selector')
+};
+
 /**
  * Selector composite tokens.
  */
@@ -201,6 +208,7 @@ Parser.prototype = {
       ? this.stash.pop()
       : this.lexer.next();
     nodes.lineno = tok.lineno;
+    debug.lexer('%s %s', tok.type, tok.val || '');
     return tok;
   },
   
@@ -934,6 +942,10 @@ Parser.prototype = {
             case 'media':
             case 'font-face':
               return this.selector();
+            case 'function':
+              return this.looksLikeSelector()
+                ? this.selector()
+                : this.expression();
             // Do not disrupt the ident when an operand
             default:
               return this.operand
@@ -1045,6 +1057,7 @@ Parser.prototype = {
       // stitched together to
       // form a selector.
       while (tok = this.selectorToken()) {
+        debug.selector('%s', tok);
         // Selector component
         switch (tok.type) {
           case '{':

data/vendor/lib/stylus.js

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

data/vendor/lib/visitor/evaluator.js

@@ -20,6 +20,7 @@ var Visitor = require('./')
   , dirname = require('path').dirname
   , join = require('path').join
   , colors = require('../colors')
+  , debug = require('debug')('stylus:evaluator')
   , fs = require('fs');
 
 /**
@@ -139,6 +140,7 @@ Evaluator.prototype.populateGlobalScope = function(){
  */
 
 Evaluator.prototype.evaluate = function(){
+  debug('eval %s', this.filename);
   this.setup();
   return this.visit(this.root);
 };
@@ -152,6 +154,7 @@ Evaluator.prototype.visitGroup = function(group){
 
   group.nodes = group.nodes.map(function(selector){
     selector.val = this.interpolate(selector);
+    debug('ruleset %s', selector.val);
     return selector;
   }, this);
 
@@ -283,6 +286,7 @@ Evaluator.prototype.visitEach = function(each){
  */
 
 Evaluator.prototype.visitCall = function(call){
+  debug('call %s', call);
   var fn = this.lookup(call.name)
     , ret;
 
@@ -301,6 +305,7 @@ Evaluator.prototype.visitCall = function(call){
 
   // Undefined function, render literal css
   if (!fn || fn.nodeName != 'function') {
+    debug('%s is undefined', call);
     var ret = this.literalCall(call);
     this.ignoreColors = false;
     return ret;
@@ -326,9 +331,11 @@ Evaluator.prototype.visitCall = function(call){
 
   // Built-in
   if (fn.fn) {
+    debug('%s is built-in', call);
     ret = this.invokeBuiltin(fn.fn, args);
   // User-defined
   } else if ('function' == fn.nodeName) {
+    debug('%s is user-defined', call);
     ret = this.invokeFunction(fn, args);
   }
 
@@ -608,6 +615,7 @@ Evaluator.prototype.visitImport = function(imported){
     , literal;
 
   this.return--;
+  debug('import %s', path);
 
   // url() passed
   if ('url' == path.name) return imported;

data/vendor/node_modules/cssom/Jakefile.js

@@ -0,0 +1,35 @@
+var PATH = require("path");
+var FS = require("fs");
+
+function readFile(path) {
+	var abs_path = PATH.join(__dirname, path);
+	return FS.readFileSync(abs_path, "utf8");
+}
+
+function stripCommonJS(text) {
+	return text.replace(/\/\/\.CommonJS(?:.|\n)*?\/\/\/CommonJS/g, "");
+}
+
+desc("Packages lib files into the one huge");
+task("default", ["build/CSSOM.js"]);
+
+directory("build");
+
+file("build/CSSOM.js", ["src/files.js", "src/CSSOM.js", "build"], function() {
+	var parts = [readFile("src/CSSOM.js")];
+	require("./src/files").files.forEach(function(path) {
+		var text = readFile("lib/" + path + ".js");
+		parts.push(stripCommonJS(text).trimLeft());
+	});
+	FS.writeFileSync("build/CSSOM.js", parts.join(""));
+	process.stdout.write("build/CSSOM.js is done\n");
+});
+
+desc("Creates index file for npm package");
+task("lib", ["lib/index.js"]);
+
+file("lib/index.js", ["src/files.js"], function() {
+	FS.writeFileSync("lib/index.js", "'use strict';\n\n" + require('./src/files').files.map(function(fileName) {
+		return "exports." + fileName + " = require('./" + fileName + "')." + fileName + ";\n";
+	}).join(""));
+});

data/vendor/node_modules/cssom/lib/CSSImportRule.js

@@ -13,6 +13,7 @@ var CSSOM = {
  * @see http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSImportRule
  */
 CSSOM.CSSImportRule = function CSSImportRule() {
+	CSSOM.CSSRule.call(this);
 	this.href = "";
 	this.media = new CSSOM.MediaList;
 	this.styleSheet = new CSSOM.CSSStyleSheet;
@@ -49,7 +50,7 @@ CSSOM.CSSImportRule.prototype.__defineSetter__("cssText", function(cssText) {
 			case '\r':
 			case '\n':
 			case '\f':
-				if (state == 'after-import') {
+				if (state === 'after-import') {
 					state = 'url';
 				} else {
 					buffer += character;
@@ -57,7 +58,7 @@ CSSOM.CSSImportRule.prototype.__defineSetter__("cssText", function(cssText) {
 				break;
 
 			case '@':
-				if (!state && cssText.indexOf('@import', i) == i) {
+				if (!state && cssText.indexOf('@import', i) === i) {
 					state = 'after-import';
 					i += 'import'.length;
 					buffer = '';
@@ -65,15 +66,15 @@ CSSOM.CSSImportRule.prototype.__defineSetter__("cssText", function(cssText) {
 				break;
 
 			case 'u':
-				if (state == 'url' && cssText.indexOf('url(', i) == i) {
+				if (state === 'url' && cssText.indexOf('url(', i) === i) {
 					index = cssText.indexOf(')', i + 1);
-					if (index == -1) {
+					if (index === -1) {
 						throw i + ': ")" not found';
 					}
 					i += 'url('.length;
 					var url = cssText.slice(i, index);
 					if (url[0] === url[url.length - 1]) {
-						if (url[0] == '"' || url[0] == "'") {
+						if (url[0] === '"' || url[0] === "'") {
 							url = url.slice(1, -1);
 						}
 					}
@@ -84,7 +85,7 @@ CSSOM.CSSImportRule.prototype.__defineSetter__("cssText", function(cssText) {
 				break;
 
 			case '"':
-				if (state == 'url') {
+				if (state === 'url') {
 					index = cssText.indexOf('"', i + 1);
 					if (!index) {
 						throw i + ": '\"' not found";
@@ -96,7 +97,7 @@ CSSOM.CSSImportRule.prototype.__defineSetter__("cssText", function(cssText) {
 				break;
 
 			case "'":
-				if (state == 'url') {
+				if (state === 'url') {
 					index = cssText.indexOf("'", i + 1);
 					if (!index) {
 						throw i + ': "\'" not found';
@@ -108,7 +109,7 @@ CSSOM.CSSImportRule.prototype.__defineSetter__("cssText", function(cssText) {
 				break;
 
 			case ';':
-				if (state == 'media') {
+				if (state === 'media') {
 					if (buffer) {
 						this.media.mediaText = buffer.trim();
 					}
@@ -116,7 +117,7 @@ CSSOM.CSSImportRule.prototype.__defineSetter__("cssText", function(cssText) {
 				break;
 
 			default:
-				if (state == 'media') {
+				if (state === 'media') {
 					buffer += character;
 				}
 				break;

data/vendor/node_modules/cssom/lib/CSSKeyframeRule.js

@@ -11,8 +11,10 @@ var CSSOM = {
  * @see http://www.w3.org/TR/css3-animations/#DOM-CSSKeyframeRule
  */
 CSSOM.CSSKeyframeRule = function CSSKeyframeRule() {
+	CSSOM.CSSRule.call(this);
 	this.keyText = '';
 	this.style = new CSSOM.CSSStyleDeclaration;
+	this.style.parentRule = this;
 };
 
 CSSOM.CSSKeyframeRule.prototype = new CSSOM.CSSRule;

data/vendor/node_modules/cssom/lib/CSSKeyframesRule.js

@@ -10,6 +10,7 @@ var CSSOM = {
  * @see http://www.w3.org/TR/css3-animations/#DOM-CSSKeyframesRule
  */
 CSSOM.CSSKeyframesRule = function CSSKeyframesRule() {
+	CSSOM.CSSRule.call(this);
 	this.name = '';
 	this.cssRules = [];
 };
@@ -27,7 +28,7 @@ CSSOM.CSSKeyframesRule.prototype.__defineGetter__("cssText", function() {
 	for (var i=0, length=this.cssRules.length; i < length; i++) {
 		cssTexts.push("  " + this.cssRules[i].cssText);
 	}
-	return "@-webkit-keyframes " + this.name + " { \n" + cssTexts.join("\n") + "\n}"
+	return "@-webkit-keyframes " + this.name + " { \n" + cssTexts.join("\n") + "\n}";
 });
 
 

data/vendor/node_modules/cssom/lib/CSSMediaRule.js

@@ -12,6 +12,7 @@ var CSSOM = {
  * @see http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSMediaRule
  */
 CSSOM.CSSMediaRule = function CSSMediaRule() {
+	CSSOM.CSSRule.call(this);
 	this.media = new CSSOM.MediaList;
 	this.cssRules = [];
 };
@@ -29,7 +30,7 @@ CSSOM.CSSMediaRule.prototype.__defineGetter__("cssText", function() {
 	for (var i=0, length=this.cssRules.length; i < length; i++) {
 		cssTexts.push(this.cssRules[i].cssText);
 	}
-	return "@media " + this.media.mediaText + " {" + cssTexts.join("") + "}"
+	return "@media " + this.media.mediaText + " {" + cssTexts.join("") + "}";
 });
 
 

data/vendor/node_modules/cssom/lib/CSSRule.js

@@ -10,6 +10,7 @@ var CSSOM = {};
  */
 CSSOM.CSSRule = function CSSRule() {
 	this.parentRule = null;
+	this.parentStyleSheet = null;
 };
 
 CSSOM.CSSRule.STYLE_RULE = 1;

data/vendor/node_modules/cssom/lib/CSSStyleDeclaration.js

@@ -9,6 +9,7 @@ var CSSOM = {};
  */
 CSSOM.CSSStyleDeclaration = function CSSStyleDeclaration(){
 	this.length = 0;
+	this.parentRule = null;
 
 	// NON-STANDARD
 	this._importants = {};
@@ -27,7 +28,7 @@ CSSOM.CSSStyleDeclaration.prototype = {
 	 * Returns the empty string if the property has not been set.
 	 */
 	getPropertyValue: function(name) {
-		return this[name] || ""
+		return this[name] || "";
 	},
 
 	/**
@@ -63,11 +64,11 @@ CSSOM.CSSStyleDeclaration.prototype = {
 	 */
 	removeProperty: function(name) {
 		if (!(name in this)) {
-			return ""
+			return "";
 		}
 		var index = Array.prototype.indexOf.call(this, name);
 		if (index < 0) {
-			return ""
+			return "";
 		}
 		var prevValue = this[name];
 		this[name] = "";
@@ -78,7 +79,7 @@ CSSOM.CSSStyleDeclaration.prototype = {
 		// That's what Firefox does
 		//this[index] = ""
 
-		return prevValue
+		return prevValue;
 	},
 
 	getPropertyCSSValue: function() {
@@ -119,7 +120,7 @@ CSSOM.CSSStyleDeclaration.prototype = {
 			}
 			properties[i] = name + ": " + value + priority + ";";
 		}
-		return properties.join(" ")
+		return properties.join(" ");
 	},
 
 	set cssText(cssText){
@@ -129,6 +130,7 @@ CSSOM.CSSStyleDeclaration.prototype = {
 			this[name] = "";
 		}
 		Array.prototype.splice.call(this, 0, this.length);
+		this._importants = {};
 
 		var dummyRule = CSSOM.parse('#bogus{' + cssText + '}').cssRules[0].style;
 		var length = dummyRule.length;

data/vendor/node_modules/cssom/lib/CSSStyleRule.js

@@ -12,8 +12,10 @@ var CSSOM = {
  * @see http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSStyleRule
  */
 CSSOM.CSSStyleRule = function CSSStyleRule() {
+	CSSOM.CSSRule.call(this);
 	this.selectorText = "";
 	this.style = new CSSOM.CSSStyleDeclaration;
+	this.style.parentRule = this;
 };
 
 CSSOM.CSSStyleRule.prototype = new CSSOM.CSSRule;
@@ -106,11 +108,11 @@ CSSOM.CSSStyleRule.parse = function(ruleText) {
 
 		// Comment
 		case "/":
-			if (ruleText.charAt(i + 1) == "*") {
+			if (ruleText.charAt(i + 1) === "*") {
 				i += 2;
 				index = ruleText.indexOf("*/", i);
-				if (index == -1) {
-					throw SyntaxError("Missing */");
+				if (index === -1) {
+					throw new SyntaxError("Missing */");
 				} else {
 					i = index + 1;
 				}
@@ -120,7 +122,7 @@ CSSOM.CSSStyleRule.parse = function(ruleText) {
 			break;
 
 		case "{":
-			if (state == "selector") {
+			if (state === "selector") {
 				styleRule.selectorText = buffer.trim();
 				buffer = "";
 				state = "name";
@@ -128,7 +130,7 @@ CSSOM.CSSStyleRule.parse = function(ruleText) {
 			break;
 
 		case ":":
-			if (state == "name") {
+			if (state === "name") {
 				name = buffer.trim();
 				buffer = "";
 				state = "value";
@@ -138,7 +140,7 @@ CSSOM.CSSStyleRule.parse = function(ruleText) {
 			break;
 
 		case "!":
-			if (state == "value" && ruleText.indexOf("!important", i) === i) {
+			if (state === "value" && ruleText.indexOf("!important", i) === i) {
 				priority = "important";
 				i += "important".length;
 			} else {
@@ -147,7 +149,7 @@ CSSOM.CSSStyleRule.parse = function(ruleText) {
 			break;
 
 		case ";":
-			if (state == "value") {
+			if (state === "value") {
 				styleRule.style.setProperty(name, buffer.trim(), priority);
 				priority = "";
 				buffer = "";
@@ -158,11 +160,11 @@ CSSOM.CSSStyleRule.parse = function(ruleText) {
 			break;
 
 		case "}":
-			if (state == "value") {
+			if (state === "value") {
 				styleRule.style.setProperty(name, buffer.trim(), priority);
 				priority = "";
 				buffer = "";
-			} else if (state == "name") {
+			} else if (state === "name") {
 				break;
 			} else {
 				buffer += character;

data/vendor/node_modules/cssom/lib/CSSStyleSheet.js

@@ -11,6 +11,7 @@ var CSSOM = {
  * @see http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSStyleSheet
  */
 CSSOM.CSSStyleSheet = function CSSStyleSheet() {
+	CSSOM.StyleSheet.call(this);
 	this.cssRules = [];
 };
 
@@ -37,10 +38,10 @@ CSSOM.CSSStyleSheet.prototype.constructor = CSSOM.CSSStyleSheet;
  */
 CSSOM.CSSStyleSheet.prototype.insertRule = function(rule, index) {
 	if (index < 0 || index > this.cssRules.length) {
-		throw new RangeError("INDEX_SIZE_ERR")
+		throw new RangeError("INDEX_SIZE_ERR");
 	}
 	this.cssRules.splice(index, 0, CSSOM.CSSStyleRule.parse(rule));
-	return index
+	return index;
 };
 
 
@@ -54,9 +55,8 @@ CSSOM.CSSStyleSheet.prototype.insertRule = function(rule, index) {
  *   sheet.toString()
  *   -> "body{margin:0;}"
  *
- * @param {number} index
+ * @param {number} index within the style sheet's rule list of the rule to remove.
  * @see http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSStyleSheet-deleteRule
- * @return {number} The index within the style sheet's rule list of the rule to remove.
  */
 CSSOM.CSSStyleSheet.prototype.deleteRule = function(index) {
 	if (index < 0 || index >= this.cssRules.length) {

data/vendor/node_modules/cssom/lib/MediaList.js

@@ -37,7 +37,7 @@ CSSOM.MediaList.prototype = {
 	 * @param {string} medium
 	 */
 	appendMedium: function(medium) {
-		if (Array.prototype.indexOf.call(this, medium) == -1) {
+		if (Array.prototype.indexOf.call(this, medium) === -1) {
 			this[this.length] = medium;
 			this.length++;
 		}
@@ -48,11 +48,11 @@ CSSOM.MediaList.prototype = {
 	 */
 	deleteMedium: function(medium) {
 		var index = Array.prototype.indexOf.call(this, medium);
-		if (index != -1) {
+		if (index !== -1) {
 			Array.prototype.splice.call(this, index, 1);
 		}
 	}
-	
+
 };
 
 

data/vendor/node_modules/cssom/lib/StyleSheet.js

@@ -7,7 +7,9 @@ var CSSOM = {};
  * @constructor
  * @see http://dev.w3.org/csswg/cssom/#the-stylesheet-interface
  */
-CSSOM.StyleSheet = function StyleSheet(){};
+CSSOM.StyleSheet = function StyleSheet() {
+	this.parentStyleSheet = null;
+};
 
 
 //.CommonJS

data/vendor/node_modules/cssom/lib/clone.js

@@ -50,20 +50,20 @@ CSSOM.clone = function clone(stylesheet) {
 			styleClone.length = style.length;
 		}
 
-		if ("keyText" in rule) {
+		if (rule.hasOwnProperty('keyText')) {
 			ruleClone.keyText = rule.keyText;
 		}
 
-		if ("selectorText" in rule) {
+		if (rule.hasOwnProperty('selectorText')) {
 			ruleClone.selectorText = rule.selectorText;
 		}
 
-		if ("mediaText" in rule) {
+		if (rule.hasOwnProperty('mediaText')) {
 			ruleClone.mediaText = rule.mediaText;
 		}
 
-		if ("cssRules" in rule) {
-			rule.cssRules = clone(rule).cssRules;
+		if (rule.hasOwnProperty('cssRules')) {
+			ruleClone.cssRules = clone(rule).cssRules;
 		}
 	}