less 3.0.0-pre.2 → 3.0.1

package/bin/lessc

@@ -3,6 +3,7 @@
 var path = require('path'),
     fs = require('../lib/less-node/fs'),
     os = require("os"),
+    utils = require('../lib/less/utils'),
     errno,
     mkdirp;
 
@@ -13,43 +14,17 @@ try {
 }
 
 var less = require('../lib/less-node'),
-    pluginLoader = new less.PluginLoader(less),
+    pluginManager = new less.PluginManager(less),
+    fileManager = new less.FileManager(),
     plugins = [],
     queuePlugins = [],
     args = process.argv.slice(1),
     silent = false,
     verbose = false,
-    options = {
-        depends: false,
-        compress: false,
-        max_line_len: -1,
-        lint: false,
-        paths: [],
-        color: true,
-        strictImports: false,
-        insecure: false,
-        rootpath: '',
-        relativeUrls: false,
-        ieCompat: true,
-        strictMath: false,
-        strictUnits: false,
-        globalVars: null,
-        modifyVars: null,
-        urlArgs: '',
-        plugins: plugins
-    }; 
-
-if (less.options) {
-    for (var i = 0, keys = Object.keys(options); i < keys.length; i++) {
-        if (!less.options[keys[i]]) {
-            less.options[keys[i]] = options[keys[i]];
-        }
-    }
     options = less.options;
-}
-else {
-    less.options = options;
-}
+
+options.plugins = plugins;
+options.reUsePluginManager = true;
 
 var sourceMapOptions = {};
 var continueProcessing = true;
@@ -103,7 +78,7 @@ var sourceMapFileInline = false;
 
 function printUsage() {
     less.lesscHelper.printUsage();
-    pluginLoader.printUsage(plugins);
+    pluginManager.Loader.printUsage(plugins);
     continueProcessing = false;
 }
 function render() {
@@ -133,10 +108,14 @@ function render() {
                 return;
             }
             // its in the same directory, so always just the basename
-            sourceMapOptions.sourceMapOutputFilename = path.basename(output);
-            sourceMapOptions.sourceMapFullFilename = output + ".map";
+            if (output) {
+                sourceMapOptions.sourceMapOutputFilename = path.basename(output);
+                sourceMapOptions.sourceMapFullFilename = output + ".map";
+            }
             // its in the same directory, so always just the basename
-            sourceMapOptions.sourceMapFilename = path.basename(sourceMapOptions.sourceMapFullFilename);
+            if ('sourceMapFullFilename' in sourceMapOptions) {
+                sourceMapOptions.sourceMapFilename = path.basename(sourceMapOptions.sourceMapFullFilename);
+            }
         } else if (options.sourceMap && !sourceMapFileInline) {
             var mapFilename = path.resolve(process.cwd(), sourceMapOptions.sourceMapFullFilename),
                 mapDir = path.dirname(mapFilename),
@@ -156,12 +135,13 @@ function render() {
     }
 
     if (sourceMapOptions.sourceMapRootpath === undefined) {
-        var pathToMap = path.dirname(sourceMapFileInline ? output : sourceMapOptions.sourceMapFullFilename || '.'),
+        var pathToMap = path.dirname((sourceMapFileInline ? output : sourceMapOptions.sourceMapFullFilename) || '.'),
             pathToInput = path.dirname(sourceMapOptions.sourceMapInputFilename || '.');
         sourceMapOptions.sourceMapRootpath = path.relative(pathToMap, pathToInput);
     }
 
-    if (! input) {
+
+    if (!input) {
         console.error("lessc: no input files");
         console.error("");
         printUsage();
@@ -176,7 +156,7 @@ function render() {
         if (!existsSync(dir)) {
             if (mkdirp === undefined) {
                 try {mkdirp = require('mkdirp');}
-                catch(e) { mkdirp = null; }
+                catch (e) { mkdirp = null; }
             }
             cmd = mkdirp && mkdirp.sync || fs.mkdirSync;
             cmd(dir);
@@ -310,7 +290,11 @@ function render() {
                 }
             },
             function(err) {
-                less.writeError(err, options);
+                if (!options.silent) {
+                    console.error(err.toString({
+                        stylize: options.color && less.lesscHelper.stylize
+                    }));
+                }
                 process.exitCode = 1;
             });
     };
@@ -348,18 +332,18 @@ function processPluginQueue() {
         }
     }
     queuePlugins.forEach(function(queue) {
-        pluginLoader.tryLoadPlugin(queue.name, function(err, data) {
-            if (err) {
-                pluginError(queue.name);
-            }
-            else {
+        var context = utils.clone(options);
+        pluginManager.Loader.loadPlugin(queue.name, process.cwd(), context, less.environment, fileManager)
+            .then(function(data) {
                 pluginFinished({
                     fileContent: data.contents,
                     filename: data.filename,
                     options: queue.options
                 });
-            }
-        });
+            })
+            .catch(function() {
+                pluginError(queue.name);
+            });
     });
 }
 
@@ -427,14 +411,15 @@ function processPluginQueue() {
             case 'no-color':
                 options.color = false;
                 break;
-            case 'no-ie-compat':
-                options.ieCompat = false;
+            case 'ie-compat':
+                options.ieCompat = true;
                 break;
-            case 'inline-js':
+            case 'js':
                 options.javascriptEnabled = true;
                 break;
             case 'no-js':
-                console.error('The "--no-js" argument is deprecated. Use "--inline-js" to enable inline JavaScript.');
+                console.error('The "--no-js" argument is deprecated, as inline JavaScript ' +
+                    'is disabled by default. Use "--js" to enable inline JavaScript (not recommended).');
                 break;
             case 'include-path':
                 if (checkArgFunc(arg, match[2])) {
@@ -470,10 +455,12 @@ function processPluginQueue() {
                     sourceMapOptions.sourceMapBasepath = match[2];
                 }
                 break;
+            case 'source-map-inline':
             case 'source-map-map-inline':
                 sourceMapFileInline = true;
                 options.sourceMap = true;
                 break;
+            case 'source-map-include-source':
             case 'source-map-less-inline':
                 sourceMapOptions.outputSourceFiles = true;
                 break;