less 3.0.0-pre.2 → 3.0.1

package/lib/less-browser/plugin-loader.js

@@ -1,3 +1,6 @@
+// TODO: Add tests for browser @plugin
+/*global window */
+
 var AbstractPluginLoader = require("../less/environment/abstract-plugin-loader.js");
 
 /**
@@ -5,57 +8,17 @@ var AbstractPluginLoader = require("../less/environment/abstract-plugin-loader.j
  */
 var PluginLoader = function(less) {
     this.less = less;
+    // shim for browser require?
     this.require = require;
 };
 
 PluginLoader.prototype = new AbstractPluginLoader();
 
-PluginLoader.prototype.tryLoadPlugin = function(name, basePath, callback) {
-    var self = this;
-    var prefix = name.slice(0, 1);
-    var explicit = prefix === "." || prefix === "/" || name.slice(-3).toLowerCase() === ".js";
-    this.tryLoadFromEnvironment(name, basePath, explicit, function(err, data) {
-        if (explicit) {
-            callback(err, data);
-        }
-        else {
-            if (!err) {
-                callback(null, data);
-            }
-            else {
-                self.tryLoadFromEnvironment('less-plugin-' + name, basePath, explicit, function(err2, data) {
-                    callback(err, data);
-                });
-            }
-        }
+PluginLoader.prototype.loadPlugin = function(filename, basePath, context, environment, fileManager) {
+    return new Promise(function(fulfill, reject) {
+        fileManager.loadFile(filename, basePath, context, environment)
+            .then(fulfill).catch(reject);
     });
-
-};
-
-PluginLoader.prototype.tryLoadFromEnvironment = function(filename, basePath, explicit, callback) {
-    var fileManager = new this.less.FileManager();
-
-    if (basePath) {
-        filename = (fileManager.extractUrlParts(filename, basePath)).url;
-    }
-
-    if (filename) {
-
-        filename = fileManager.tryAppendExtension(filename, '.js');
-        
-        var done = function(err, data) {
-            if (err) {
-                callback(err);
-            } else {
-                callback(null, data);
-            }
-        };
-        fileManager.loadFile(filename, null, null, null, done);
-
-    }
-    else {
-        callback({ message: 'Plugin could not be found.'});
-    }
 };
 
 module.exports = PluginLoader;

package/lib/less-browser/utils.js

@@ -16,7 +16,7 @@ module.exports = {
                     try {
                         options[opt] = JSON.parse(tag.dataset[opt]);
                     }
-                    catch(_) {}
+                    catch (_) {}
                 }
             }
         }

package/lib/less-node/file-manager.js

@@ -1,14 +1,10 @@
 var path = require('path'),
     fs = require('./fs'),
-    PromiseConstructor,
+    PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise,
     AbstractFileManager = require("../less/environment/abstract-file-manager.js");
 
-try {
-    PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise;
-} catch(e) {
-}
-
 var FileManager = function() {
+    this.contents = {};
 };
 
 FileManager.prototype = new AbstractFileManager();
@@ -21,88 +17,122 @@ FileManager.prototype.supportsSync = function(filename, currentDirectory, option
 };
 
 FileManager.prototype.loadFile = function(filename, currentDirectory, options, environment, callback) {
+
     var fullFilename,
-        data,
         isAbsoluteFilename = this.isPathAbsolute(filename),
-        filenamesTried = [];
+        filenamesTried = [],
+        self = this,
+        prefix = filename.slice(0, 1),
+        explicit = prefix === "." || prefix === "/",
+        result = null;
 
     options = options || {};
 
-    if (options.syncImport || !PromiseConstructor) {
-        data = this.loadFileSync(filename, currentDirectory, options, environment, 'utf-8');
-        callback(data.error, data);
-        return;
-    }
+    var paths = isAbsoluteFilename ? [''] : [currentDirectory];
 
-    var paths = isAbsoluteFilename ? [""] : [currentDirectory];
     if (options.paths) { paths.push.apply(paths, options.paths); }
-    if (!isAbsoluteFilename && paths.indexOf('.') === -1) { paths.push('.'); }
 
-    // promise is guaranteed to be asyncronous
-    // which helps as it allows the file handle
-    // to be closed before it continues with the next file
-    return new PromiseConstructor(function(fulfill, reject) {
-        (function tryPathIndex(i) {
-            if (i < paths.length) {
-                fullFilename = filename;
-                if (paths[i]) {
-                    fullFilename = path.join(paths[i], fullFilename);
-                }
-                fs.stat(fullFilename, function (err) {
-                    if (err) {
-                        filenamesTried.push(fullFilename);
-                        tryPathIndex(i + 1);
-                    } else {
-                        fs.readFile(fullFilename, 'utf-8', function(e, data) {
-                            if (e) { reject(e); return; }
+    // Search node_modules
+    if (!explicit) { paths.push.apply(paths, this.modulePaths); }
 
-                            fulfill({ contents: data, filename: fullFilename});
-                        });
-                    }
-                });
-            } else {
-                reject({ type: 'File', message: "'" + filename + "' wasn't found. Tried - " + filenamesTried.join(",") });
-            }
-        }(0));
-    });
-};
+    if (!isAbsoluteFilename && paths.indexOf('.') === -1) { paths.push('.'); }
 
-FileManager.prototype.loadFileSync = function(filename, currentDirectory, options, environment, encoding) {
-    var fullFilename, paths, filenamesTried = [], isAbsoluteFilename = this.isPathAbsolute(filename) , data;
-    options = options || {};
+    var prefixes = options.prefixes || [''];
+    var fileParts = this.extractUrlParts(filename);
 
-    paths = isAbsoluteFilename ? [""] : [currentDirectory];
-    if (options.paths) {
-        paths.push.apply(paths, options.paths);
+    if (options.syncImport) {
+        getFileData(returnData, returnData);
+        if (callback) {
+            callback(result.error, result);
+        }
+        else {
+            return result;
+        }
     }
-    if (!isAbsoluteFilename && paths.indexOf('.') === -1) {
-        paths.push('.');
+    else {
+        // promise is guaranteed to be asyncronous
+        // which helps as it allows the file handle
+        // to be closed before it continues with the next file
+        return new PromiseConstructor(getFileData);
     }
 
-    var err, result;
-    for (var i = 0; i < paths.length; i++) {
-        try {
-            fullFilename = filename;
-            if (paths[i]) {
-                fullFilename = path.join(paths[i], fullFilename);
-            }
-            filenamesTried.push(fullFilename);
-            fs.statSync(fullFilename);
-            break;
-        } catch (e) {
-            fullFilename = null;
+    function returnData(data) {
+        if (!data.filename) {
+            result = { error: data };
+        }
+        else {
+            result = data;
         }
     }
 
-    if (!fullFilename) {
-        err = { type: 'File', message: "'" + filename + "' wasn't found. Tried - " + filenamesTried.join(",") };
-        result = { error: err };
-    } else {
-        data = fs.readFileSync(fullFilename, encoding);
-        result = { contents: data, filename: fullFilename};
+    function getFileData(fulfill, reject) {
+        (function tryPathIndex(i) {
+            if (i < paths.length) {
+                (function tryPrefix(j) {
+                    if (j < prefixes.length) {
+                        fullFilename = fileParts.rawPath + prefixes[j] + fileParts.filename;
+
+                        if (paths[i]) {
+                            fullFilename = path.join(paths[i], fullFilename);
+                        }
+
+                        if (paths[i].indexOf('node_modules') > -1) {
+                            try {
+                                fullFilename = require.resolve(fullFilename);
+                            }
+                            catch (e) {}
+                        }
+
+                        fullFilename = options.ext ? self.tryAppendExtension(fullFilename, options.ext) : fullFilename;
+
+                        if (self.contents[fullFilename]) {
+                            fulfill({ contents: self.contents[fullFilename], filename: fullFilename});
+                        }
+                        else {
+                            var readFileArgs = [fullFilename];
+                            if (!options.rawBuffer) {
+                                readFileArgs.push('utf-8');
+                            }
+                            if (options.syncImport) {
+                                try {
+                                    var data = fs.readFileSync.apply(this, readFileArgs);
+                                    self.contents[fullFilename] = data;
+                                    fulfill({ contents: data, filename: fullFilename});
+                                }
+                                catch (e) {
+                                    filenamesTried.push(fullFilename);
+                                    return tryPrefix(j + 1);
+                                }
+                            }
+                            else {
+                                readFileArgs.push(function(e, data) {
+                                    if (e) {
+                                        filenamesTried.push(fullFilename);
+                                        return tryPrefix(j + 1);
+                                    }
+                                    self.contents[fullFilename] = data;
+                                    fulfill({ contents: data, filename: fullFilename});
+                                });
+                                fs.readFile.apply(this, readFileArgs);
+                            }
+
+                        }
+
+                    }
+                    else {
+                        tryPathIndex(i + 1);
+                    }
+                })(0);
+            } else {
+                reject({ type: 'File', message: "'" + filename + "' wasn't found. Tried - " + filenamesTried.join(",") });
+            }
+        }(0));
     }
+};
 
-    return result;
+FileManager.prototype.loadFileSync = function(filename, currentDirectory, options, environment) {
+    options.syncImport = true;
+    return this.loadFile(filename, currentDirectory, options, environment);
 };
 
 module.exports = FileManager;

package/lib/less-node/fs.js

@@ -3,7 +3,7 @@ try
 {
     fs = require("graceful-fs");
 }
-catch(e)
+catch (e)
 {
     fs = require("fs");
 }

package/lib/less-node/image-size.js

@@ -1,7 +1,7 @@
 module.exports = function(environment) {
     var Dimension = require("../less/tree/dimension"),
-    Expression = require("../less/tree/expression"),
-    functionRegistry = require("./../less/functions/function-registry");
+        Expression = require("../less/tree/expression"),
+        functionRegistry = require("./../less/functions/function-registry");
 
     function imageSize(functionContext, filePathNode) {
         var filePath = filePathNode.value;

package/lib/less-node/index.js

@@ -3,7 +3,8 @@ var environment = require("./environment"),
     UrlFileManager = require("./url-file-manager"),
     createFromEnvironment = require("../less"),
     less = createFromEnvironment(environment, [new FileManager(), new UrlFileManager()]),
-    lesscHelper = require('./lessc-helper');
+    lesscHelper = require('./lessc-helper'),
+    path = require('path');
 
 // allow people to create less with their own environment
 less.createFromEnvironment = createFromEnvironment;
@@ -12,63 +13,12 @@ less.PluginLoader = require("./plugin-loader");
 less.fs = require("./fs");
 less.FileManager = FileManager;
 less.UrlFileManager = UrlFileManager;
-less.options = less.options || {};
 
-less.formatError = function(ctx, options) {
-    options = options || {};
-
-    var message = "";
-    var extract = ctx.extract;
-    var error = [];
-    var stylize = options.color ? lesscHelper.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.hasOwnProperty('index') || !extract) {
-        return ctx.stack || ctx.message;
-    }
-
-    if (typeof extract[0] === 'string') {
-        error.push(stylize((ctx.line - 1) + ' ' + extract[0], 'grey'));
-    }
-
-    if (typeof extract[1] === 'string') {
-        var errorTxt = ctx.line + ' ';
-        if (extract[1]) {
-            errorTxt += extract[1].slice(0, ctx.column) +
-                            stylize(stylize(stylize(extract[1].substr(ctx.column, 1), 'bold') +
-                            extract[1].slice(ctx.column + 1), 'red'), 'inverse');
-        }
-        error.push(errorTxt);
-    }
-
-    if (typeof extract[2] === 'string') {
-        error.push(stylize((ctx.line + 1) + ' ' + extract[2], 'grey'));
-    }
-    error = error.join('\n') + stylize('', 'reset') + '\n';
-
-    message += stylize(ctx.type + 'Error: ' + ctx.message, 'red');
-    if (ctx.filename) {
-        message += stylize(' in ', 'red') + ctx.filename +
-            stylize(' on line ' + ctx.line + ', column ' + (ctx.column + 1) + ':', 'grey');
-    }
-
-    message += '\n' + error;
-
-    if (ctx.callLine) {
-        message += stylize('from ', 'red') + (ctx.filename || '') + '/n';
-        message += stylize(ctx.callLine, 'grey') + ' ' + ctx.callExtract + '/n';
-    }
-
-    return message;
-};
-
-less.writeError = function (ctx, options) {
-    options = options || {};
-    if (options.silent) { return; }
-    console.error(less.formatError(ctx, options));
-};
+// Set up options
+less.options = require('../less/default-options')();
+less.options.paths = [
+    path.join(process.cwd(), "node_modules")
+];
 
 // provide image-size functionality
 require('./image-size')(less.environment);

package/lib/less-node/lessc-helper.js

@@ -3,7 +3,7 @@
 //      helper functions for lessc
 var lessc_helper = {
 
-    //Stylize a string
+    // Stylize a string
     stylize : function(str, style) {
         var styles = {
             'reset'     : [0,   0],
@@ -19,49 +19,49 @@ var lessc_helper = {
                '\x1b[' + styles[style][1] + 'm';
     },
 
-    //Print command line options
+    // Print command line options
     printUsage: function() {
         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               Prints help (this message) and exit.");
-        console.log("  --include-path=PATHS     Sets include paths. Separated by `:'. `;' also supported on windows.");
-        console.log("  -M, --depends            Outputs a makefile import dependency list to stdout.");
-        console.log("  --no-color               Disables colorized output.");
-        console.log("  --no-ie-compat           Disables IE compatibility checks.");
-        console.log("  --inline-js              Enables inline JavaScript in less files");
-        console.log("  -l, --lint               Syntax check only (lint).");
-        console.log("  -s, --silent             Suppresses output of error messages.");
-        console.log("  --strict-imports         Forces evaluation of imports.");
-        console.log("  --insecure               Allows imports from insecure https hosts.");
-        console.log("  -v, --version            Prints version number and exit.");
-        console.log("  --verbose                Be verbose.");
-        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) as a base64 data uri into the output css file.");
-        console.log("  --source-map-url=URL     Sets a custom URL to map file, for sourceMappingURL comment");
-        console.log("                           in generated CSS file.");
-        console.log("  -rp, --rootpath=URL      Sets 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-writes relative urls to the base less file.");
-        console.log("  -sm=on|off               Turns 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               Allows 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("  --url-args='QUERYSTRING' Adds params into url tokens (e.g. 42, cb=42 or 'a=1&b=2')");
-        console.log("  --plugin=PLUGIN=OPTIONS  Loads a plugin. You can also omit the --plugin= if the plugin begins");
-        console.log("                           less-plugin. E.g. the clean css plugin is called less-plugin-clean-css");
-        console.log("                           once installed (npm install less-plugin-clean-css), use either with");
-        console.log("                           --plugin=less-plugin-clean-css or just --clean-css");
-        console.log("                           specify options afterwards e.g. --plugin=less-plugin-clean-css=\"advanced\"");
-        console.log("                           or --clean-css=\"advanced\"");
+        console.log("  -h, --help                   Prints help (this message) and exit.");
+        console.log("  --include-path=PATHS         Sets include paths. Separated by `:'. `;' also supported on windows.");
+        console.log("  -M, --depends                Outputs a makefile import dependency list to stdout.");
+        console.log("  --no-color                   Disables colorized output.");
+        console.log("  --ie-compat                  Enables IE8 compatibility checks.");
+        console.log("  --js                         Enables inline JavaScript in less files");
+        console.log("  -l, --lint                   Syntax check only (lint).");
+        console.log("  -s, --silent                 Suppresses output of error messages.");
+        console.log("  --strict-imports             Forces evaluation of imports.");
+        console.log("  --insecure                   Allows imports from insecure https hosts.");
+        console.log("  -v, --version                Prints version number and exit.");
+        console.log("  --verbose                    Be verbose.");
+        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-include-source  Puts the less files into the map instead of referencing them.");
+        console.log("  --source-map-inline          Puts the map (and any less files) as a base64 data uri into the output css file.");
+        console.log("  --source-map-url=URL         Sets a custom URL to map file, for sourceMappingURL comment");
+        console.log("                               in generated CSS file.");
+        console.log("  -rp, --rootpath=URL          Sets 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-writes relative urls to the base less file.");
+        console.log("  -sm=on|off                   Turns 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                   Allows 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("  --url-args='QUERYSTRING'     Adds params into url tokens (e.g. 42, cb=42 or 'a=1&b=2')");
+        console.log("  --plugin=PLUGIN=OPTIONS      Loads a plugin. You can also omit the --plugin= if the plugin begins");
+        console.log("                               less-plugin. E.g. the clean css plugin is called less-plugin-clean-css");
+        console.log("                               once installed (npm install less-plugin-clean-css), use either with");
+        console.log("                               --plugin=less-plugin-clean-css or just --clean-css");
+        console.log("                               specify options afterwards e.g. --plugin=less-plugin-clean-css=\"advanced\"");
+        console.log("                               or --clean-css=\"advanced\"");
         console.log("");
         console.log("-------------------------- Deprecated ----------------");
         console.log("  --line-numbers=TYPE      Outputs filename and line numbers.");

package/lib/less-node/plugin-loader.js

@@ -1,4 +1,5 @@
 var path = require("path"),
+    PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise,
     AbstractPluginLoader = require("../less/environment/abstract-plugin-loader.js");
 
 /**
@@ -23,93 +24,31 @@ var PluginLoader = function(less) {
 
 PluginLoader.prototype = new AbstractPluginLoader();
 
-PluginLoader.prototype.tryLoadPlugin = function(name, basePath, callback) {
+PluginLoader.prototype.loadPlugin = function(filename, basePath, context, environment, fileManager) {
     var self = this;
-    var prefix = name.slice(0, 1);
-    var explicit = prefix === "." || prefix === "/" || name.slice(-3).toLowerCase() === ".js";
-    if (explicit) {
-        this.tryLoadFromEnvironment(name, basePath, explicit, callback);
+    var prefix = filename.slice(0, 1);
+    var explicit = prefix === "." || prefix === "/" || filename.slice(-3).toLowerCase() === ".js";
+    if (!explicit) {
+        context.prefixes = ['less-plugin-', ''];
     }
-    else {
-        this.tryLoadFromEnvironment('less-plugin-' + name, basePath, explicit, function(err, data) {
-            if (!err) {
-                callback(null, data);
-            }
-            else {
-                self.tryLoadFromEnvironment(name, basePath, explicit, callback);
-            }
-        });
-    }
-
-};
-
-PluginLoader.prototype.tryLoadFromEnvironment = function(name, basePath, explicit, callback) {
-    var filename = name;
-    var self = this;
 
-    function getFile(filename) {
-        var fileManager = new self.less.FileManager();
-
-        filename = fileManager.tryAppendExtension(filename, '.js');
-        fileManager.loadFile(filename).then(
+    return new PromiseConstructor(function(fulfill, reject) {
+        fileManager.loadFile(filename, basePath, context, environment).then(
             function(data) {
                 try {
-                    self.require = self.requireRelative(filename);
+                    self.require = self.requireRelative(data.filename);
+                    fulfill(data);
                 }
-                catch(e) {
-                    callback(e);
+                catch (e) {
+                    console.log(e);
+                    reject(e);
                 }
-                callback(null, data);
-            }, 
-
-            function(err) {
-                callback(err);
-            }
-        );
-    }
-    if (explicit) {
-        if (basePath) {
-            filename = path.join(basePath, name);
-        }
-        getFile(filename);
-    }
-    else {
-        // Search node_modules for a possible plugin name match
-        try {
-            filename = require.resolve(path.join("../../../", name));
-        }
-        catch(e) {
-        }
-        // is installed as a sub dependency of the current folder
-        try {
-            filename = require.resolve(path.join(process.cwd(), "node_modules", name));
-        }
-        catch(e) {
-        }
-        // is referenced relative to the current directory
-        try {
-            filename = require.resolve(path.join(process.cwd(), name));
-        }
-        catch(e) {
-        }
-        // unlikely - would have to be a dependency of where this code was running (less.js)...
-        if (name[0] !== '.') {
-            try {
-                filename = require.resolve(name);
             }
-            catch(e) {
-            }
-        }
-        if (basePath) {
-            filename = path.join(basePath, name);
-        }
-        if (filename) {
-            getFile(filename);
-        }
-        else {
-            callback({ message: 'Plugin could not be found.'});
-        }
-    }
+        ).catch(function(err) {
+            reject(err);
+        });
+    });
+
 };
 
 module.exports = PluginLoader;

package/lib/less-node/url-file-manager.js

@@ -21,7 +21,7 @@ UrlFileManager.prototype.loadFile = function(filename, currentDirectory, options
     return new PromiseConstructor(function(fulfill, reject) {
         if (request === undefined) {
             try { request = require('request'); }
-            catch(e) { request = null; }
+            catch (e) { request = null; }
         }
         if (!request) {
             reject({ type: 'File', message: "optional dependency 'request' required to import over http(s)\n" });