less 2.4.0 → 2.5.0

data/lib/less/js/lib/less/import-visitor.js

@@ -27,9 +27,10 @@
         },
         visitImport: function (importNode, visitArgs) {
             var importVisitor = this,
-                evaldImportNode;
-
-            if (!importNode.css) {
+                evaldImportNode,
+                inlineCSS = importNode.options.inline;
+            
+            if (!importNode.css || inlineCSS) {
 
                 try {
                     evaldImportNode = importNode.evalForImport(this.env);
@@ -41,13 +42,19 @@
                     importNode.error = e;
                 }
 
-                if (evaldImportNode && !evaldImportNode.css) {
+                if (evaldImportNode && (!evaldImportNode.css || inlineCSS)) {
                     importNode = evaldImportNode;
                     this.importCount++;
                     var env = new tree.evalEnv(this.env, this.env.frames.slice(0));
-                    this._importer.push(importNode.getPath(), importNode.currentFileInfo, function (e, root, imported) {
+
+                    if (importNode.options.multiple) {
+                        env.importMultiple = true;
+                    }
+
+                    this._importer.push(importNode.getPath(), importNode.currentFileInfo, importNode.options, function (e, root, imported, fullPath) {
                         if (e && !e.filename) { e.index = importNode.index; e.filename = importNode.currentFileInfo.filename; }
-                        if (imported && !importNode.options.multiple) { importNode.skip = imported; }
+
+                        if (imported && !env.importMultiple) { importNode.skip = imported; }
 
                         var subFinish = function(e) {
                             importVisitor.importCount--;
@@ -59,11 +66,15 @@
 
                         if (root) {
                             importNode.root = root;
-                            new(tree.importVisitor)(importVisitor._importer, subFinish, env)
-                                .run(root);
-                        } else {
-                            subFinish();
+                            importNode.importedFilename = fullPath;
+                            if (!inlineCSS && !importNode.skip) {
+                                new(tree.importVisitor)(importVisitor._importer, subFinish, env)
+                                    .run(root);
+                                return;
+                            }
                         }
+
+                        subFinish();
                     });
                 }
             }

data/lib/less/js/lib/less/index.js

@@ -1,19 +1,18 @@
 var path = require('path'),
-    sys = require('util'),
     url = require('url'),
     request,
     fs = require('fs');
 
 var less = {
-    version: [1, 4, 2],
+    version: [1, 6, 2],
     Parser: require('./parser').Parser,
-    importer: require('./parser').importer,
     tree: require('./tree'),
     render: function (input, options, callback) {
         options = options || {};
 
         if (typeof(options) === 'function') {
-            callback = options, options = {};
+            callback = options;
+            options = {};
         }
 
         var parser = new(less.Parser)(options),
@@ -21,15 +20,17 @@ var less = {
 
         if (callback) {
             parser.parse(input, function (e, root) {
-                callback(e, root && root.toCSS && root.toCSS(options));
+                try { callback(e, root && root.toCSS && root.toCSS(options)); } 
+                catch (err) { callback(err); }
             });
         } else {
-            ee = new(require('events').EventEmitter);
+            ee = new (require('events').EventEmitter)();
 
             process.nextTick(function () {
                 parser.parse(input, function (e, root) {
-                    if (e) { ee.emit('error', e) }
-                    else   { ee.emit('success', root.toCSS(options)) }
+                    if (e) { return ee.emit('error', e); }
+                    try { ee.emit('success', root.toCSS(options)); } 
+                    catch (err) { ee.emit('error', err); }
                 });
             });
             return ee;
@@ -41,10 +42,10 @@ var less = {
         var message = "";
         var extract = ctx.extract;
         var error = [];
-        var stylize = options.color ? require('./lessc_helper').stylize : function (str) { return str };
+        var stylize = options.color ? require('./lessc_helper').stylize : function (str) { return str; };
 
         // only output a stack if it isn't a less error
-        if (ctx.stack && !ctx.type) { return stylize(ctx.stack, 'red') }
+        if (ctx.stack && !ctx.type) { return stylize(ctx.stack, 'red'); }
 
         if (!ctx.hasOwnProperty('index') || !extract) {
             return ctx.stack || ctx.message;
@@ -70,8 +71,10 @@ var less = {
         error = error.join('\n') + stylize('', 'reset') + '\n';
 
         message += stylize(ctx.type + 'Error: ' + ctx.message, 'red');
-        ctx.filename && (message += stylize(' in ', 'red') + ctx.filename +
-                stylize(' on line ' + ctx.line + ', column ' + (ctx.column + 1) + ':', 'grey'));
+        if (ctx.filename) {
+            message += stylize(' in ', 'red') + ctx.filename +
+                stylize(' on line ' + ctx.line + ', column ' + (ctx.column + 1) + ':', 'grey');
+        }
 
         message += '\n' + error;
 
@@ -84,26 +87,44 @@ var less = {
     },
     writeError: function (ctx, options) {
         options = options || {};
-        if (options.silent) { return }
-        sys.error(less.formatError(ctx, options));
+        if (options.silent) { return; }
+        console.error(less.formatError(ctx, options));
     }
 };
 
-['color',      'directive',  'operation',          'dimension',
- 'keyword',    'variable',   'ruleset',            'element',
- 'selector',   'quoted',     'expression',         'rule',
- 'call',       'url',        'alpha',              'import',
- 'mixin',      'comment',    'anonymous',          'value',
- 'javascript', 'assignment', 'condition',          'paren',
- 'media',      'unicode-descriptor', 'negative',   'extend'
-].forEach(function (n) {
-    require('./tree/' + n);
-});
+require('./tree/color');
+require('./tree/directive');
+require('./tree/operation');
+require('./tree/dimension');
+require('./tree/keyword');
+require('./tree/variable');
+require('./tree/ruleset');
+require('./tree/element');
+require('./tree/selector');
+require('./tree/quoted');
+require('./tree/expression');
+require('./tree/rule');
+require('./tree/call');
+require('./tree/url');
+require('./tree/alpha');
+require('./tree/import');
+require('./tree/mixin');
+require('./tree/comment');
+require('./tree/anonymous');
+require('./tree/value');
+require('./tree/javascript');
+require('./tree/assignment');
+require('./tree/condition');
+require('./tree/paren');
+require('./tree/media');
+require('./tree/unicode-descriptor');
+require('./tree/negative');
+require('./tree/extend');
 
 
 var isUrlRe = /^(?:https?:)?\/\//i;
 
-less.Parser.importer = function (file, currentFileInfo, callback, env) {
+less.Parser.fileLoader = function (file, currentFileInfo, callback, env) {
     var pathname, dirname, data,
         newFileInfo = {
             relativeUrls: env.relativeUrls,
@@ -112,12 +133,7 @@ less.Parser.importer = function (file, currentFileInfo, callback, env) {
             rootFilename: currentFileInfo.rootFilename
         };
 
-    function parseFile(e, data) {
-        if (e) { return callback(e); }
-
-        env = new less.tree.parseEnv(env);
-        env.processImports = false;
-        
+    function handleDataAndCallCallback(data) {
         var j = file.lastIndexOf('/');
 
         // Pass on an updated rootpath if path of imported file is relative and file 
@@ -135,12 +151,8 @@ less.Parser.importer = function (file, currentFileInfo, callback, env) {
         newFileInfo.currentDirectory = pathname.replace(/[^\\\/]*$/, "");
         newFileInfo.filename = pathname;
 
-        env.contents[pathname] = data;      // Updating top importing parser content cache.
-        env.currentFileInfo = newFileInfo;
-        new(less.Parser)(env).parse(data, function (e, root) {
-            callback(e, root, pathname);
-        });
-    };
+        callback(null, data, pathname, newFileInfo);
+    }
     
     var isUrl = isUrlRe.test( file );
     if (isUrl || isUrlRe.test(currentFileInfo.currentDirectory)) {
@@ -154,63 +166,71 @@ less.Parser.importer = function (file, currentFileInfo, callback, env) {
         }
 
         var urlStr = isUrl ? file : url.resolve(currentFileInfo.currentDirectory, file),
-            urlObj = url.parse(urlStr),
-            req = {
-                host:   urlObj.hostname,
-                port:   urlObj.port || 80,
-                path:   urlObj.pathname + (urlObj.search||'')
-            };
-
-        request.get(urlStr, function (error, res, body) {
+            urlObj = url.parse(urlStr);
+
+        request.get({uri: urlStr, strictSSL: !env.insecure }, function (error, res, body) {
             if (res.statusCode === 404) {
                 callback({ type: 'File', message: "resource '" + urlStr + "' was not found\n" });
                 return;
             }
             if (!body) {
-                sys.error( 'Warning: Empty body (HTTP '+ res.statusCode + ') returned by "' + urlStr +'"' );
+                console.error( 'Warning: Empty body (HTTP '+ res.statusCode + ') returned by "' + urlStr +'"' );
             }
             if (error) {
                 callback({ type: 'File', message: "resource '" + urlStr + "' gave this Error:\n  "+ error +"\n" });
             }
             pathname = urlStr;
             dirname = urlObj.protocol +'//'+ urlObj.host + urlObj.pathname.replace(/[^\/]*$/, '');
-            parseFile(null, body);
+            handleDataAndCallCallback(body);
         });
     } else {
 
         var paths = [currentFileInfo.currentDirectory].concat(env.paths);
         paths.push('.');
 
-        for (var i = 0; i < paths.length; i++) {
-            try {
-                pathname = path.join(paths[i], file);
-                fs.statSync(pathname);
-                break;
-            } catch (e) {
-                pathname = null;
+        if (env.syncImport) {
+            for (var i = 0; i < paths.length; i++) {
+                try {
+                    pathname = path.join(paths[i], file);
+                    fs.statSync(pathname);
+                    break;
+                } catch (e) {
+                    pathname = null;
+                }
             }
-        }
-        
-        if (!pathname) {
 
-            callback({ type: 'File', message: "'" + file + "' wasn't found" });
-            return;
-        }
-        
-        dirname = path.dirname(pathname);
+            if (!pathname) {
+                callback({ type: 'File', message: "'" + file + "' wasn't found" });
+                return;
+            }
 
-        if (env.syncImport) {
             try {
                 data = fs.readFileSync(pathname, 'utf-8');
-                parseFile(null, data);
+                handleDataAndCallCallback(data);
             } catch (e) {
-                parseFile(e);
+                callback(e);
             }
         } else {
-            fs.readFile(pathname, 'utf-8', parseFile);
+            (function tryPathIndex(i) {
+                if (i < paths.length) {
+                    pathname = path.join(paths[i], file);
+                    fs.stat(pathname, function (err) {
+                        if (err) {
+                            tryPathIndex(i + 1);
+                        } else {
+                            fs.readFile(pathname, 'utf-8', function(e, data) {
+                                if (e) { callback(e); }
+                                handleDataAndCallCallback(data);
+                            });
+                        }
+                    });
+                } else {
+                    callback({ type: 'File', message: "'" + file + "' wasn't found" });
+                }
+            }(0));
         }
     }
-}
+};
 
 require('./env');
 require('./functions');
@@ -219,5 +239,7 @@ require('./visitor.js');
 require('./import-visitor.js');
 require('./extend-visitor.js');
 require('./join-selector-visitor.js');
+require('./to-css-visitor.js');
+require('./source-map-output.js');
 
-for (var k in less) { exports[k] = less[k]; }
+for (var k in less) { if (less.hasOwnProperty(k)) { exports[k] = less[k]; }}

data/lib/less/js/lib/less/join-selector-visitor.js

@@ -16,12 +16,19 @@
         },
 
         visitRuleset: function (rulesetNode, visitArgs) {
-            var context = this.contexts[this.contexts.length - 1];
-            var paths = [];
+            var context = this.contexts[this.contexts.length - 1],
+                paths = [], selectors;
+
             this.contexts.push(paths);
 
             if (! rulesetNode.root) {
-                rulesetNode.joinSelectors(paths, context, rulesetNode.selectors);
+                selectors = rulesetNode.selectors;
+                if (selectors) {
+                    selectors = selectors.filter(function(selector) { return selector.getIsOutput(); });
+                    rulesetNode.selectors = selectors.length ? selectors : (selectors = null);
+                    if (selectors) { rulesetNode.joinSelectors(paths, context, selectors); }
+                }
+                if (!selectors) { rulesetNode.rules = null; }
                 rulesetNode.paths = paths;
             }
         },
@@ -30,7 +37,7 @@
         },
         visitMedia: function (mediaNode, visitArgs) {
             var context = this.contexts[this.contexts.length - 1];
-            mediaNode.ruleset.root = (context.length === 0 || context[0].multiMedia);
+            mediaNode.rules[0].root = (context.length === 0 || context[0].multiMedia);
         }
     };
 

data/lib/less/js/lib/less/lessc_helper.js

@@ -1,8 +1,6 @@
 // lessc_helper.js
 //
 //      helper functions for lessc
-var sys = require('util');
-
 var lessc_helper = {
 
     //Stylize a string
@@ -23,49 +21,62 @@ var lessc_helper = {
 
     //Print command line options
     printUsage: function() {
-        sys.puts("usage: lessc [option option=parameter ...] <source> [destination]");
-        sys.puts("");
-        sys.puts("If source is set to `-' (dash or hyphen-minus), input is read from stdin.");
-        sys.puts("");
-        sys.puts("options:");
-        sys.puts("  -h, --help              Print help (this message) and exit.");
-        sys.puts("  --include-path=PATHS    Set include paths. Separated by `:'. Use `;' on Windows.");
-        sys.puts("  -M, --depends           Output a makefile import dependency list to stdout");
-        sys.puts("  --no-color              Disable colorized output.");
-        sys.puts("  --no-ie-compat          Disable IE compatibility checks.");
-        sys.puts("  -l, --lint              Syntax check only (lint).");
-        sys.puts("  -s, --silent            Suppress output of error messages.");
-        sys.puts("  --strict-imports        Force evaluation of imports.");
-        sys.puts("  --verbose               Be verbose.");
-        sys.puts("  -v, --version           Print version number and exit.");
-        sys.puts("  -x, --compress          Compress output by removing some whitespaces.");
-        sys.puts("  --yui-compress          Compress output using ycssmin");
-        sys.puts("  --max-line-len=LINELEN  Max line length used by ycssmin");
-        sys.puts("  -O0, -O1, -O2           Set the parser's optimization level. The lower");
-        sys.puts("                          the number, the less nodes it will create in the");
-        sys.puts("                          tree. This could matter for debugging, or if you");
-        sys.puts("                          want to access the individual nodes in the tree.");
-        sys.puts("  --line-numbers=TYPE     Outputs filename and line numbers.");
-        sys.puts("                          TYPE can be either 'comments', which will output");
-        sys.puts("                          the debug info within comments, 'mediaquery'");
-        sys.puts("                          that will output the information within a fake");
-        sys.puts("                          media query which is compatible with the SASS");
-        sys.puts("                          format, and 'all' which will do both.");
-        sys.puts("  -rp, --rootpath=URL     Set rootpath for url rewriting in relative imports and urls.");
-        sys.puts("                          Works with or without the relative-urls option.");
-        sys.puts("  -ru, --relative-urls    re-write relative urls to the base less file.");
-        sys.puts("  -sm=on|off              Turn on or off strict math, where in strict mode, math");
-        sys.puts("  --strict-math=on|off    requires brackets. This option may default to on and then");
-        sys.puts("                          be removed in the future.");
-        sys.puts("  -su=on|off              Allow mixed units, e.g. 1px+1em or 1px*1px which have units");
-        sys.puts("  --strict-units=on|off   that cannot be represented.");
-        sys.puts("");
-        sys.puts("Report bugs to: http://github.com/cloudhead/less.js/issues");
-        sys.puts("Home page: <http://lesscss.org/>");
+        console.log("usage: lessc [option option=parameter ...] <source> [destination]");
+        console.log("");
+        console.log("If source is set to `-' (dash or hyphen-minus), input is read from stdin.");
+        console.log("");
+        console.log("options:");
+        console.log("  -h, --help               Print help (this message) and exit.");
+        console.log("  --include-path=PATHS     Set include paths. Separated by `:'. Use `;' on Windows.");
+        console.log("  -M, --depends            Output a makefile import dependency list to stdout");
+        console.log("  --no-color               Disable colorized output.");
+        console.log("  --no-ie-compat           Disable IE compatibility checks.");
+        console.log("  --no-js                  Disable JavaScript in less files");
+        console.log("  -l, --lint               Syntax check only (lint).");
+        console.log("  -s, --silent             Suppress output of error messages.");
+        console.log("  --strict-imports         Force evaluation of imports.");
+        console.log("  --insecure               Allow imports from insecure https hosts.");
+        console.log("  -v, --version            Print version number and exit.");
+        console.log("  -x, --compress           Compress output by removing some whitespaces.");
+        console.log("  --clean-css              Compress output using clean-css");
+        console.log("  --clean-option=opt:val   Pass an option to clean css, using CLI arguments from ");
+        console.log("                           https://github.com/GoalSmashers/clean-css e.g.");
+        console.log("                           --clean-option=--selectors-merge-mode:ie8");
+        console.log("                           and to switch on advanced use --clean-option=--advanced");
+        console.log("  --source-map[=FILENAME]  Outputs a v3 sourcemap to the filename (or output filename.map)");
+        console.log("  --source-map-rootpath=X  adds this path onto the sourcemap filename and less file paths");
+        console.log("  --source-map-basepath=X  Sets sourcemap base path, defaults to current working directory.");
+        console.log("  --source-map-less-inline puts the less files into the map instead of referencing them");
+        console.log("  --source-map-map-inline  puts the map (and any less files) into the output css file");
+        console.log("  --source-map-url=URL     the complete url and filename put in the less file");
+        console.log("  -rp, --rootpath=URL      Set rootpath for url rewriting in relative imports and urls.");
+        console.log("                           Works with or without the relative-urls option.");
+        console.log("  -ru, --relative-urls     re-write relative urls to the base less file.");
+        console.log("  -sm=on|off               Turn on or off strict math, where in strict mode, math");
+        console.log("  --strict-math=on|off     requires brackets. This option may default to on and then");
+        console.log("                           be removed in the future.");
+        console.log("  -su=on|off               Allow mixed units, e.g. 1px+1em or 1px*1px which have units");
+        console.log("  --strict-units=on|off    that cannot be represented.");
+        console.log("  --global-var='VAR=VALUE' Defines a variable that can be referenced by the file.");
+        console.log("  --modify-var='VAR=VALUE' Modifies a variable already declared in the file.");
+        console.log("");
+        console.log("-------------------------- Deprecated ----------------");
+        console.log("  -O0, -O1, -O2            Set the parser's optimization level. The lower");
+        console.log("                           the number, the less nodes it will create in the");
+        console.log("                           tree. This could matter for debugging, or if you");
+        console.log("                           want to access the individual nodes in the tree.");
+        console.log("  --line-numbers=TYPE      Outputs filename and line numbers.");
+        console.log("                           TYPE can be either 'comments', which will output");
+        console.log("                           the debug info within comments, 'mediaquery'");
+        console.log("                           that will output the information within a fake");
+        console.log("                           media query which is compatible with the SASS");
+        console.log("                           format, and 'all' which will do both.");
+        console.log("  --verbose                Be verbose.");
+        console.log("");
+        console.log("Report bugs to: http://github.com/less/less.js/issues");
+        console.log("Home page: <http://lesscss.org/>");
     }
-
-
-}
+};
 
 // Exports helper functions
-for (var h in lessc_helper) { exports[h] = lessc_helper[h] }
+for (var h in lessc_helper) { if (lessc_helper.hasOwnProperty(h)) { exports[h] = lessc_helper[h]; }}