stylus-source 0.32.1 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 207a64add1d5ae7c9c221091a58b0ccceb060873
-  data.tar.gz: 0b555d50adf55d4b39c81d355148a52f2ef2b9b2
+  metadata.gz: e43f1d0afc6bc5ef7a1e8b10f4db14c85882f229
+  data.tar.gz: f5aab3d545f9f2d8f3c818e18a67860518e3ea2d
 SHA512:
-  metadata.gz: b89b6030f371acd7de7aaae3a362850496edde44a8ad9b4b99f8a0e58a84d50b8eee6059edc2f6637bbfbcc4676669aa0ce877df9f459435de01be378ab460a9
-  data.tar.gz: b10b863520f2bc76135367a9c2d24cbe0863c8355b7ffb7c7fad7d0741e4d2dd7ead4881d0e6750e5c66f7cc155121312a0d1a33a943fd3315d4c069649abdda
+  metadata.gz: b4d427303372c6b71b85f0858cf370f93179b325c3b9a816696abfbe3cbab7a5054102f54bfe11cf775a12a4497216c99a423e39580cd090d56aa1646de567cc
+  data.tar.gz: 9303eaf8bd3b90779ad350a31f507cef1997e07b38856e686ad0139fae05fda4bc4c21519d38438b725bfeb61e53eb589abf6b9323caae49673ece09add56b4a

data/VERSION

@@ -1 +1 @@
-0.32.1
+0.33.0

data/vendor/bin/stylus

@@ -91,7 +91,7 @@ var plugins = [];
 var urlFunction = false;
 
 /**
- * Include css on import.
+ * Include CSS on import.
  */
 
 var includeCSS = false;
@@ -121,21 +121,21 @@ var usage = [
   , '  Options:'
   , ''
   , '    -i, --interactive       Start interactive REPL'
-  , '    -u, --use <path>        Utilize the stylus plugin at <path>'
-  , '    -U, --inline            Utilize image inlining via data uri support'
+  , '    -u, --use <path>        Utilize the Stylus plugin at <path>'
+  , '    -U, --inline            Utilize image inlining via data URI support'
   , '    -w, --watch             Watch file(s) for changes and re-compile'
   , '    -o, --out <dir>         Output to <dir> when passing files'
-  , '    -C, --css <src> [dest]  Convert css input to stylus'
+  , '    -C, --css <src> [dest]  Convert CSS input to Stylus'
   , '    -I, --include <path>    Add <path> to lookup paths'
-  , '    -c, --compress          Compress css output'
+  , '    -c, --compress          Compress CSS output'
   , '    -d, --compare           Display input along with output'
-  , '    -f, --firebug           Emits debug infos in the generated css that'
+  , '    -f, --firebug           Emits debug infos in the generated CSS that'
   , '                            can be used by the FireStylus Firebug plugin'
-  , '    -l, --line-numbers      Emits comments in the generated css'
-  , '                            indicating the corresponding stylus line'
+  , '    -l, --line-numbers      Emits comments in the generated CSS'
+  , '                            indicating the corresponding Stylus line'
   , '    --import <file>         Import stylus <file>'
-  , '    --include-css           Include regular css on @import'
-  , '    -V, --version           Display the version of stylus'
+  , '    --include-css           Include regular CSS on @import'
+  , '    -V, --version           Display the version of Stylus'
   , '    -h, --help              Display help information'
   , ''
 ].join('\n');
@@ -320,7 +320,7 @@ var options = {
 
 var str = '';
 
-// Convert css to stylus
+// Convert CSS to Stylus
 
 if (convertCSS) {
     switch (files.length) {
@@ -350,7 +350,7 @@ if (convertCSS) {
 }
 
 /**
- * Start stylus REPL.
+ * Start Stylus REPL.
  */
 
 function repl() {
@@ -424,7 +424,7 @@ function repl() {
 }
 
 /**
- * Highlight the given string of stylus.
+ * Highlight the given string of Stylus.
  */
 
 function highlight(str) {
@@ -535,7 +535,7 @@ function compileFile(file) {
 }
 
 /**
- * Write the given css output.
+ * Write the given CSS output.
  */
 
 function writeFile(file, css) {

data/vendor/lib/browserify.js

@@ -0,0 +1,2 @@
+
+module.exports = require('./stylus');

data/vendor/lib/convert/css.js

@@ -1,11 +1,11 @@
 /*!
- * Stylus - css to stylus conversion
+ * Stylus - CSS to Stylus conversion
  * Copyright(c) 2010 LearnBoost <dev@learnboost.com>
  * MIT Licensed
  */
 
 /**
- * Convert the given `css` to stylus source.
+ * Convert the given `css` to Stylus source.
  *
  * @param {String} css
  * @return {String}
@@ -32,7 +32,7 @@ function Converter(css) {
 }
 
 /**
- * Convert to stylus.
+ * Convert to Stylus.
  *
  * @return {String}
  * @api private

data/vendor/lib/functions/index.js

@@ -742,14 +742,33 @@ exports.trace = function trace(){
  *    image-size('foo.png')[1]
  *    // => 100px
  *
+ * Can be used to test if the image exists,
+ * using an optional argument set to `true`
+ * (without this argument this function throws error
+ * if there is no such image).
+ *
+ * Example:
+ *
+ *    image-size('nosuchimage.png', true)[0]
+ *    // => 0
+ *
  * @param {String} img
+ * @param {Boolean} ignoreErr
  * @return {Expression}
  * @api public
  */
 
-exports['image-size'] = function imageSize(img) {
+exports['image-size'] = function imageSize(img, ignoreErr) {
   utils.assertType(img, 'string', 'img');
-  var img = new Image(this, img.string);
+  try {
+    var img = new Image(this, img.string);
+  } catch (err) {
+    if (ignoreErr) {
+      return [new nodes.Unit(0), new nodes.Unit(0)];
+    } else {
+      throw err;
+    }
+  }
 
   // Read size
   img.open();
@@ -880,4 +899,4 @@ function parseUnit(str){
   var n = parseInt(m[1], 10);
   var type = m[2];
   return new nodes.Unit(n, type);
-}
+}

data/vendor/lib/functions/index.styl

@@ -224,7 +224,7 @@ join(delim, vals...)
   for val, i in vals
     buf += i ? delim + val : val
 
-// add a css rule to the containing block
+// add a CSS rule to the containing block
 
 // - This definition allows add-property to be used as a mixin
 // - It has the same effect as interpolation but allows users

data/vendor/lib/lexer.js

@@ -797,7 +797,7 @@ Lexer.prototype = {
   
   selector: function() {
     var captures;
-    if (captures = /^[^{\n,]+/.exec(this.str)) {
+    if (captures = /^.*?(?=\/\/(?![^\[]*\])|[,\n{])/.exec(this.str)) {
       var selector = captures[0];
       this.skip(captures);
       return new Token('selector', selector);

data/vendor/lib/middleware.js

@@ -35,10 +35,10 @@ var imports = {};
  *    `compile`   Custom compile function, accepting the arguments
  *                `(str, path)`.
  *    `compress`  Whether the output .css files should be compressed
- *    `firebug`   Emits debug infos in the generated css that can
+ *    `firebug`   Emits debug infos in the generated CSS that can
  *                be used by the FireStylus Firebug plugin
- *    `linenos`   Emits comments in the generated css indicating 
- *                the corresponding stylus line
+ *    `linenos`   Emits comments in the generated CSS indicating 
+ *                the corresponding Stylus line
  *
  * Examples:
  * 

data/vendor/lib/parser.js

@@ -299,14 +299,19 @@ Parser.prototype = {
         // unclosed, must be a block
         if (!this.lineContains('}')) return;
         // check if ':' is within the braces.
-        // though not required by stylus, chances
+        // though not required by Stylus, chances
         // are if someone is using {} they will
-        // use css-style props, helping us with
+        // use CSS-style props, helping us with
         // the ambiguity in this case
         var i = 0
           , la;
         while (la = this.lookahead(++i)) {
-          if ('}' == la.type) break;
+          if ('}' == la.type) {
+            // Check empty block.
+            if (i == 2 || (i == 3 && this.lookahead(i - 1).type == 'space'))
+              return;
+            break;
+          }
           if (':' == la.type) return;
         }
       }

data/vendor/lib/visitor/compiler.js

@@ -19,7 +19,7 @@ var Visitor = require('./')
  *
  * Options:
  *
- *   - `compress`  Compress the css output, defaults to false
+ *   - `compress`  Compress the CSS output (default: false)
  *
  * @param {Node} root
  * @api public
@@ -89,7 +89,7 @@ Compiler.prototype.visitRoot = function(block){
 Compiler.prototype.visitBlock = function(block){
   var node;
 
-  if (block.hasProperties) {
+  if (block.hasProperties && !block.lacksRenderedSelectors) {
     var arr = [this.compress ? '{' : ' {'];
     ++this.indents;
     for (var i = 0, len = block.nodes.length; i < len; ++i) {
@@ -343,7 +343,10 @@ Compiler.prototype.visitGroup = function(group){
   // selectors
   if (group.block.hasProperties) {
     var selectors = this.compileSelectors(stack);
-    this.buf += (this.selector = selectors.join(this.compress ? ',' : ',\n'));
+    if(selectors.length)
+      this.buf += (this.selector = selectors.join(this.compress ? ',' : ',\n'));
+    else
+      group.block.lacksRenderedSelectors = true;
   }
 
   // output block
@@ -458,7 +461,8 @@ Compiler.prototype.compileSelectors = function(arr){
   var stack = this.stack
     , self = this
     , selectors = []
-    , buf = [];
+    , buf = []
+    , hiddenSelectorRegexp = /^\s*\$/;
 
   function interpolateParent(selector, buf) {
     var str = selector.val.trim();
@@ -477,6 +481,7 @@ Compiler.prototype.compileSelectors = function(arr){
   function compile(arr, i) {
     if (i) {
       arr[i].forEach(function(selector){
+        if(selector.val.match(hiddenSelectorRegexp)) return;
         if (selector.inherits) {
           buf.unshift(selector.val);
           compile(arr, i - 1);
@@ -487,6 +492,7 @@ Compiler.prototype.compileSelectors = function(arr){
       });
     } else {
       arr[0].forEach(function(selector){
+        if(selector.val.match(hiddenSelectorRegexp)) return;
         var str = interpolateParent(selector, buf);
         selectors.push(self.indent + str.trimRight());
       });

data/vendor/lib/visitor/evaluator.js

@@ -336,7 +336,7 @@ Evaluator.prototype.visitCall = function(call){
     fn = this.lookupFunction(call.name);
   }
 
-  // Undefined function, render literal css
+  // Undefined function? render literal CSS
   if (!fn || fn.nodeName != 'function') {
     debug('%s is undefined', call);
     var ret = this.literalCall(call);

data/vendor/lib/visitor/normalizer.js

@@ -150,12 +150,14 @@ Normalizer.prototype.visitMedia = function(media){
     , other = [];
 
   media.block.nodes.forEach(function(node, i) {
+    node = this.visit(node);
+
     if ('property' == node.nodeName) {
       props.push(node);
     } else {
       other.push(node);
     }
-  });
+  }, this);
 
   // Fake self-referencing group to contain
   // any props that are floating

data/vendor/package.json

@@ -1,10 +1,11 @@
 {   "name": "stylus"
   , "description": "Robust, expressive, and feature-rich CSS superset"
-  , "version": "0.32.1"
+  , "version": "0.33.0"
   , "author": "TJ Holowaychuk <tj@vision-media.ca>"
   , "keywords": ["css", "parser", "style", "stylesheets", "jade", "language"]
-  , "repository": "git://github.com/learnboost/stylus"
+  , "repository": "git://github.com/LearnBoost/stylus"
   , "main": "./index.js"
+  , "browserify": "./lib/browserify.js"
   , "engines": { "node": "*" }
   , "bin": { "stylus": "./bin/stylus" }
   , "scripts" : { "prepublish" : "npm prune", "test": "make test" }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: stylus-source
 version: !ruby/object:Gem::Version
-  version: 0.32.1
+  version: 0.33.0
 platform: ruby
 authors:
 - TJ Holowaychuk
@@ -27,6 +27,7 @@ files:
 - vendor/bin/stylus
 - vendor/bm.js
 - vendor/index.js
+- vendor/lib/browserify.js
 - vendor/lib/colors.js
 - vendor/lib/convert/css.js
 - vendor/lib/errors.js