stylus-source 0.21.2 → 0.22.0

data/vendor/lib/visitor/evaluator.js

@@ -583,6 +583,16 @@ Evaluator.prototype.visitIf = function(node){
   return ret || nodes.null;
 };
 
+/**
+ * Visit Extend.
+ */
+
+Evaluator.prototype.visitExtend = function(extend){
+  var selector = extend.selector;
+  this.currentBlock.node.extends.push(selector);
+  return nodes.null; 
+};
+
 /**
  * Visit Import.
  */

data/vendor/lib/visitor/normalizer.js

@@ -0,0 +1,226 @@
+
+/*!
+ * Stylus - Normalizer
+ * Copyright(c) 2010 LearnBoost <dev@learnboost.com>
+ * MIT Licensed
+ */
+
+/**
+ * Module dependencies.
+ */
+
+var Visitor = require('./')
+  , nodes = require('../nodes')
+  , utils = require('../utils')
+  , fs = require('fs');
+
+/**
+ * Initialize a new `Normalizer` with the given `root` Node.
+ *
+ * This visitor implements the first stage of the duel-stage
+ * compiler, tasked with stripping the "garbage" from
+ * the evaluated nodes, ditching null rules, resolving
+ * ruleset selectors etc. This step performs the logic
+ * necessary to facilitate the "@extend" functionality,
+ * as these must be resolved _before_ buffering output.
+ *
+ * @param {Node} root
+ * @api public
+ */
+
+var Normalizer = module.exports = function Normalizer(root, options) {
+  options = options || {};
+  Visitor.call(this, root);
+  this.stack = [];
+  this.extends = {};
+  this.map = {};
+};
+
+/**
+ * Inherit from `Visitor.prototype`.
+ */
+
+Normalizer.prototype.__proto__ = Visitor.prototype;
+
+/**
+ * Normalize the node tree.
+ *
+ * @return {Node}
+ * @api private
+ */
+
+Normalizer.prototype.normalize = function(){
+  return this.visit(this.root);
+};
+
+/**
+ * Visit Root.
+ */
+
+Normalizer.prototype.visitRoot = function(block){
+  var ret = new nodes.Root
+    , node;
+
+  for (var i = 0, len = block.nodes.length; i < len; ++i) {
+    node = block.nodes[i];
+    switch (node.nodeName) {
+      case 'null':
+      case 'expression':
+      case 'function':
+      case 'jsliteral':
+      case 'unit':
+        continue;
+      default:
+        ret.push(this.visit(node));
+    }
+  }
+
+  return ret;
+};
+
+/**
+ * Visit Block.
+ */
+
+Normalizer.prototype.visitBlock = function(block){
+  var ret = new nodes.Block
+    , node;
+
+  if (block.hasProperties) {
+    for (var i = 0, len = block.nodes.length; i < len; ++i) {
+      this.last = len - 1 == i;
+      node = block.nodes[i];
+      switch (node.nodeName) {
+        case 'null':
+        case 'expression':
+        case 'function':
+        case 'jsliteral':
+        case 'group':
+        case 'unit':
+          continue;
+        default:
+          ret.push(this.visit(node));
+      } 
+    }
+  }
+
+  // nesting
+  for (var i = 0, len = block.nodes.length; i < len; ++i) {
+    node = block.nodes[i];
+    ret.push(this.visit(node));
+  }
+
+  return block;
+};
+
+/**
+ * Visit Group.
+ */
+
+Normalizer.prototype.visitGroup = function(group){
+  // TODO: clean this mess up
+  var stack = this.stack
+    , map = this.map
+    , self = this;
+
+  stack.push(group.nodes);
+
+  if (group.block.hasProperties) {
+    var selectors = this.compileSelectors(stack);
+
+    // map for extension lookup
+    selectors.forEach(function(selector){
+      map[selector] = map[selector] || [];
+      map[selector].push(group);
+    });
+
+    // extensions
+    this.extend(group, selectors);
+  }
+
+  group.block = this.visit(group.block);
+  stack.pop();
+  return group;
+};
+
+/**
+ * Apply `group` extensions.
+ *
+ * @param {Group} group
+ * @param {Array} selectors
+ * @api private
+ */
+
+Normalizer.prototype.extend = function(group, selectors){
+  var map = this.map
+    , self = this;
+
+  group.extends.forEach(function(extend){
+    var groups = map[extend];
+    if (!groups) throw new Error('Failed to @extend "' + extend + '"');
+    selectors.forEach(function(selector){
+      var node = new nodes.Selector;
+      node.val = selector;
+      groups.forEach(function(group){
+        self.extend(group, selectors);
+        group.push(node);
+      });
+    });
+  });
+};
+
+/**
+ * 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
+ */
+
+Normalizer.prototype.compileSelectors = function(arr){
+  // TODO: remove this duplication
+  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(str.trimRight());
+      });
+    }
+  }
+
+  compile(arr, arr.length - 1);
+
+  return selectors;
+};

data/vendor/node_modules/cssom/docs/parse.html

@@ -173,7 +173,21 @@ function buildPath(level) {
 function stringifyObjectKey(key) {
 	return /^[a-zA-Z_$][A-Za-z0-9_$]*$/.test(key) ?
 		key :
-		JSON.stringify(key);
+		'"' + escapeDoubleQuotes(key) + '"';
+}
+
+
+/**
+ * @param {string} string
+ * @return {string}
+ * @see http://stackoverflow.com/questions/7382115/escape-quotes-in-a-string-with-backslash
+ */
+function escapeDoubleQuotes(string) {
+	return string.replace(/(\\*)(")/g, function(all, backslashes, quote) {
+		return backslashes.length % 2 ?
+			all :
+			backslashes + '\\' + quote;
+	});
 }
 
 

data/vendor/node_modules/cssom/docs/parse.html_

@@ -0,0 +1,268 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<title>CSSOM.js parse method</title>
+	<script>
+	var exports = {};
+	function require(){
+		return exports;
+	}
+	</script>
+	<script src="../lib/CSSStyleDeclaration.js"></script>
+	<script src="../lib/CSSRule.js"></script>
+	<script src="../lib/CSSStyleRule.js"></script>
+	<script src="../lib/CSSImportRule.js"></script>
+	<script src="../lib/MediaList.js"></script>
+	<script src="../lib/CSSMediaRule.js"></script>
+	<script src="../lib/StyleSheet.js"></script>
+	<script src="../lib/CSSStyleSheet.js"></script>
+	<script src="../lib/parse.js"></script>
+	<script>
+	window.CSSOM = exports;
+	</script>
+	<style type="text/css">
+	html, body {
+		background: #333;
+		color: #EEE;
+		font: 12px sans-serif;
+		margin: 0;
+		height: 100%;
+	}
+	body {
+		padding-bottom: 1.7em;
+		-webkit-box-sizing: border-box;
+		-moz-box-sizing: border-box;
+		box-sizing: border-box;
+	}
+	table {
+		width: 100%;
+		table-layout: fixed;
+		margin: 0 auto;
+	}
+	td {
+		vertical-align: top;
+	}
+	h1 {
+		font: normal 1em sans-serif;
+		display: inline;
+	}
+	#labels {
+		color: #FFE992;
+		width: 66%;
+	}
+	#labels td {
+		width: 50%;
+		text-align: center;
+	}
+	#labels td::before {
+		content: '↱ ';
+		color: #998e62;
+		position: relative;
+		top: .4em;
+	}
+	#labels td::after {
+		content: ' ↴';
+		color: #998e62;
+		position: relative;
+		top: .4em;
+	}
+	#content {
+		width: 100%;
+		height: 100%;
+	}
+	#content td {
+		width: 33%;
+	}
+	#content td + td {
+		padding-left: 1%;
+	}
+	#output span {
+		color: #666;
+	}
+	.style-cell textarea {
+		width: 99%;
+		height: 100%;
+		font: 12px monospace;
+		white-space: pre-wrap;
+	}
+	.serialized-cell {
+		border-left: 1px solid #363636;
+	}
+	#message {
+		visibility: hidden;
+	}
+	.error #message {
+		visibility: visible;
+		position: absolute;
+		top: 0;
+		left: 34%;
+		padding: 1em;
+		background: black;
+		color: #e34343;
+		font-size: 24px;
+	}
+	</style>
+</head>
+<body>
+<table id="labels">
+	<tr><td><h1>CSSOM.parse</h1></td><td>.toString</td></tr>
+</table>
+<table id="content">
+	<tr>
+		<td class="style-cell">
+<textarea id="style" spellcheck="false" rows="40">img {
+  border: none
+}</textarea></td>
+		<td class="output-cell"><pre id="output"></pre></td>
+		<td class="serialized-cell"><pre id="serialized"></pre></td>
+	</tr>
+</table>
+<div id="message"></div>
+<script defer>
+/**
+ * @param {number} depth
+ * @return {string}
+ */
+function makeIndent(depth) {
+	var INDENT = '    ';
+	if (depth == 1) {
+		return INDENT;
+	} else if (depth < 1) {
+		return '';
+	}
+
+	if (depth in makeIndent.cache) {
+		return makeIndent.cache[depth];
+	} else {
+		var result = INDENT;
+		for (var i = depth; --i;) {
+			result += INDENT;
+		}
+		makeIndent.cache[depth] = result;
+		return result;
+	}
+}
+makeIndent.cache = {};
+
+
+/**
+ * buildPath(2) -> '../..'
+ * @param {number} level
+ * @return {string}
+ */
+function buildPath(level) {
+	if (level == 0) {
+		return '.';
+	} else {
+		var result = '..';
+		for (var i = 1; i < level; i++) {
+			result += '/..';
+		}
+		return result;
+	}
+}
+
+
+/**
+ * stringifyObjectKey('color') -> 'color'
+ * stringifyObjectKey('background-color') -> '"background-color"'
+ * @param {string} key
+ * @return {string}
+ */
+function stringifyObjectKey(key) {
+	return /^[a-zA-Z_$][A-Za-z0-9_$]*$/.test(key) ?
+		key :
+		JSON.stringify(key);
+}
+
+
+/**
+ * @param {Object} object
+ * @param {number} [depth]
+ * @param {Array} [stack]
+ * @return {string}
+ */
+function inspect(object, depth, stack) {
+	depth ? depth++ : (depth = 1);
+	stack = stack || (stack = []);
+
+	switch (typeof object) {
+		case 'object':
+			var level = stack.indexOf(object);
+			if (level != -1) {
+				return buildPath(level);
+			}
+			stack = [object].concat(stack);
+
+			var properties = [];
+			var indent = makeIndent(depth);
+			for (var key in object) {
+				if (object.hasOwnProperty(key)) {
+					properties.push(indent + stringifyObjectKey(key) + '<span>: </span>' + inspect(object[key], depth, stack));
+				}
+			}
+			var indentInside = makeIndent(depth - 1);
+			return '<span>{</span>\n' + properties.join('<span>,</span>\n') + '\n' + indentInside + '<span>}</span>';
+
+		case 'string':
+			return '"' + object + '"';
+
+		default:
+			return object.toString();
+	}
+}
+
+
+
+var errors = [];
+if (!("__defineGetter__" in {})) {
+	errors.push("Object.prototype.__defineGetter__ isn’t supported");
+}
+if (errors.length) {
+	document.getElementById("message").innerHTML = errors.join("<br>");
+	document.body.className = "error";
+	throw errors.join("\n\n");
+}
+
+var style = document.getElementById("style");
+var output = document.getElementById("output");
+var serialized = document.getElementById("serialized");
+
+function outputUpdated(){
+	var value = style.value;
+	if (value != style.prevValue) {
+		var css = CSSOM.parse(value);
+		output.innerHTML = inspect(css);
+		serialized.innerHTML = css.toString();
+		style.prevValue = value;
+	}
+}
+
+function hashChanged(){
+	var hash = location.hash;
+	var splitted = hash.split("=");
+	if (splitted.length < 2) {
+		return;
+	}
+	var name = splitted[0];
+	var value = splitted[1];
+	if (name == "#css") {
+		style.value = decodeURIComponent(value);
+		outputUpdated();
+	}
+}
+
+hashChanged();
+outputUpdated();
+
+window.onhashchange = hashChanged;
+style.onkeyup = style.onpaste = function changed(){
+	outputUpdated();
+};
+style.onchange = function updateLocation(){
+	location.hash = "css=" + encodeURIComponent(style.value);
+};
+</script>
+</body>
+</html>

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

@@ -23,7 +23,7 @@ CSSOM.CSSStyleDeclaration.prototype = {
 	 *
 	 * @param {string} name
 	 * @see http://www.w3.org/TR/DOM-Level-2-Style/css.html#CSS-CSSStyleDeclaration-getPropertyValue
-	 * @return {string} the value of the property if it has been explicitly set for this declaration block. 
+	 * @return {string} the value of the property if it has been explicitly set for this declaration block.
 	 * Returns the empty string if the property has not been set.
 	 */
 	getPropertyValue: function(name) {
@@ -120,11 +120,27 @@ CSSOM.CSSStyleDeclaration.prototype = {
 			properties[i] = name + ": " + value + priority + ";";
 		}
 		return properties.join(" ")
-	}
+	},
 
+	set cssText(cssText){
+		var i, name;
+		for (i = this.length; i--;) {
+			name = this[i];
+			this[name] = "";
+		}
+		Array.prototype.splice.call(this, 0, this.length);
+
+		var dummyRule = CSSOM.parse('#bogus{' + cssText + '}').cssRules[0].style;
+		var length = dummyRule.length;
+		for (i = 0; i < length; ++i) {
+			name = dummyRule[i];
+			this.setProperty(dummyRule[i], dummyRule.getPropertyValue(name), dummyRule.getPropertyPriority(name));
+		}
+	}
 };
 
 
 //.CommonJS
 exports.CSSStyleDeclaration = CSSOM.CSSStyleDeclaration;
+CSSOM.parse = require('./parse').parse; // Cannot be included sooner due to the mutual dependency between parse.js and CSSStyleDeclaration.js
 ///CommonJS

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

@@ -211,15 +211,6 @@ CSSOM.parse = function parse(token, options) {
 		case ";":
 			switch (state) {
 				case "value":
-					// Hack for AssetGraph: Start a new CSSStyleRule if a property gets redefined.
-					// Temporary workaround until https://github.com/NV/CSSOM/issues/16 gets resolved
-					if (styleRule.style.getPropertyValue(name)) {
-						styleRule.__ends = i;
-						currentScope.cssRules.push(styleRule);
-						styleRule = new CSSOM.CSSStyleRule;
-						styleRule.selectorText = currentScope.cssRules[currentScope.cssRules.length - 1].selectorText;
-						styleRule.__starts = i;
-					}
 					styleRule.style.setProperty(name, buffer.trim(), priority);
 					priority = "";
 					buffer = "";
@@ -246,15 +237,6 @@ CSSOM.parse = function parse(token, options) {
 		case "}":
 			switch (state) {
 				case "value":
-					// Hack for AssetGraph: Start a new CSSStyleRule if a property gets redefined.
-					// Temporary workaround until https://github.com/NV/CSSOM/issues/16 gets resolved
-					if (styleRule.style.getPropertyValue(name)) {
-						styleRule.__ends = i;
-						currentScope.cssRules.push(styleRule);
-						styleRule = new CSSOM.CSSStyleRule;
-						styleRule.selectorText = currentScope.cssRules[currentScope.cssRules.length - 1].selectorText;
-						styleRule.__starts = i;
-					}
 					styleRule.style.setProperty(name, buffer.trim(), priority);
 					priority = "";
 				case "before-name":

data/vendor/node_modules/cssom/package.json

@@ -2,7 +2,7 @@
 	"name": "cssom",
 	"description": "CSS Object Model implementation and CSS parser",
 	"keywords": ["CSS", "CSSOM", "parser", "styleSheet"],
-	"version": "0.2.0",
+	"version": "0.2.1",
 	"homepage": "https://github.com/NV/CSSOM",
 	"author": "Nikita Vasilyev <me@elv1s.ru>",
 	"repository": {

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

@@ -22,14 +22,21 @@ test("CSSStyleDeclaration", function(){
 	equal(d.getPropertyValue("color"), "purple");
 	equal(d.getPropertyValue("width"), "128px");
 	equal(d.getPropertyValue("position"), "");
-	
+
 	strictEqual(d.getPropertyPriority("color"), "");
 	strictEqual(d.getPropertyPriority("width"), "important");
 	strictEqual(d.getPropertyPriority("position"), "");
-	
+
 	d.setProperty("color", "green");
 	d.removeProperty("width");
-	
+
 	equal(d.cssText, "color: green;");
 
 });
+
+test("CSSStyleDeclaration#cssText", function(){
+	var d = new CSSOM.CSSStyleDeclaration;
+	var cssText = "color: pink; outline: 2px solid red;";
+	d.cssText = cssText;
+	strictEqual(d.cssText, cssText);
+});

data/vendor/package.json

@@ -1,6 +1,6 @@
 {   "name": "stylus"
   , "description": "Robust, expressive, and feature-rich CSS superset"
-  , "version": "0.21.2"
+  , "version": "0.22.0"
   , "author": "TJ Holowaychuk <tj@vision-media.ca>"
   , "keywords": ["css", "parser", "style", "stylesheets", "jade", "language"]
   , "repository": "git://github.com/learnboost/stylus"
@@ -9,7 +9,7 @@
   , "bin": { "stylus": "./bin/stylus" }
   , "scripts" : { "prepublish" : "npm prune" }
   , "dependencies": {
-      "cssom": "0.2.0"
+      "cssom": "0.2.1"
     , "growl": "1.1.0"
     , "mkdirp": "0.0.7"
   }

data/vendor/test/cases/bifs.keys.css

@@ -0,0 +1,4 @@
+body {
+  foo: one 1 two 2 three 3;
+  foo: one two three;
+}

data/vendor/test/cases/bifs.keys.styl

@@ -0,0 +1,6 @@
+
+list = (one 1) (two 2) (three 3)
+
+body
+  foo: list
+  foo: keys(list)

data/vendor/test/cases/bifs.values.css

@@ -0,0 +1,5 @@
+
+body {
+  foo: one 1 two 2 three 3;
+  foo: 1 2 3;
+}

data/vendor/test/cases/bifs.values.styl

@@ -0,0 +1,6 @@
+
+list = (one 1) (two 2) (three 3)
+
+body
+  foo: list
+  foo: values(list)

data/vendor/test/cases/css.extend.css

@@ -0,0 +1,13 @@
+.message,
+.warning,
+.error {
+  margin: 5px;
+  padding: 20px;
+  font-weight: bold;
+}
+.warning {
+  color: #ff0;
+}
+.error {
+  color: #f00;
+}