less 3.0.0 → 3.0.1

package/lib/less/environment/abstract-plugin-loader.js

@@ -56,7 +56,7 @@ AbstractPluginLoader.prototype.evalPlugin = function(contents, context, imports,
         fileInfo: fileInfo
     };
     registry = functionRegistry.create();
-    
+
     var registerPlugin = function(obj) {
         pluginObj = obj;
     };
@@ -67,7 +67,7 @@ AbstractPluginLoader.prototype.evalPlugin = function(contents, context, imports,
     } catch (e) {
         return new this.less.LessError(e, imports, filename);
     }
-      
+
     if (!pluginObj) {
         pluginObj = localModule.exports;
     }
@@ -92,7 +92,7 @@ AbstractPluginLoader.prototype.evalPlugin = function(contents, context, imports,
             e.message = 'Error during @plugin call';
             return new this.less.LessError(e, imports, filename);
         }
-        
+
     }
     else {
         return new this.less.LessError({ message: "Not a valid plugin" });

package/lib/less/environment/environment.js

@@ -1,3 +1,8 @@
+/**
+ * @todo Document why this abstraction exists, and the relationship between
+ *       environment, file managers, and plugin manager
+ */
+
 var logger = require("../logger");
 var environment = function(externalEnvironment, fileManagers) {
     this.fileManagers = fileManagers || [];

package/lib/less/index.js

@@ -2,7 +2,7 @@ module.exports = function(environment, fileManagers) {
     var SourceMapOutput, SourceMapBuilder, ParseTree, ImportManager, Environment;
 
     var initial = {
-        version: [3, 0, 0],
+        version: [3, 0, 1],
         data: require('./data'),
         tree: require('./tree'),
         Environment: (Environment = require("./environment/environment")),

package/lib/less/less-error.js

@@ -18,10 +18,10 @@ var utils = require('./utils');
  * @prop {string[]} extract
  *
  * @param {Object} e              - An error object to wrap around or just a descriptive object
- * @param {Object} importManager  - An instance of ImportManager (see import-manager.js)
+ * @param {Object} fileContentMap - An object with file contents in 'contents' property (like importManager) @todo - move to fileManager?
  * @param {string} [currentFilename]
  */
-var LessError = module.exports = function LessError(e, importManager, currentFilename) {
+var LessError = module.exports = function LessError(e, fileContentMap, currentFilename) {
     Error.call(this);
 
     var filename = e.filename || currentFilename;
@@ -29,13 +29,13 @@ var LessError = module.exports = function LessError(e, importManager, currentFil
     this.message = e.message;
     this.stack = e.stack;
 
-    if (importManager && filename) {
-        var input = importManager.contents[filename],
+    if (fileContentMap && filename) {
+        var input = fileContentMap.contents[filename],
             loc = utils.getLocation(e.index, input),
             line = loc.line,
             col  = loc.column,
             callLine = e.call && utils.getLocation(e.call, input).line,
-            lines = input.split('\n');
+            lines = input ? input.split('\n') : '';
 
         this.type = e.type || 'Syntax';
         this.filename = filename;
@@ -58,7 +58,7 @@ var LessError = module.exports = function LessError(e, importManager, currentFil
 
         this.callLine = callLine + 1;
         this.callExtract = lines[callLine];
-        
+
         this.extract = [
             lines[this.line - 2],
             lines[this.line - 1],

package/lib/less/parse.js

@@ -33,7 +33,7 @@ module.exports = function(environment, ParseTree, ImportManager) {
         } else {
             var context,
                 rootFileInfo,
-                pluginManager = new PluginManager(this, true);
+                pluginManager = new PluginManager(this, !options.reUsePluginManager);
 
             options.pluginManager = pluginManager;
 
@@ -79,7 +79,7 @@ module.exports = function(environment, ParseTree, ImportManager) {
                     }
                 });
             }
-            
+
             new Parser(context, imports, rootFileInfo)
                 .parse(input, function (e, root) {
                     if (e) { return callback(e); }

package/lib/less/plugin-manager.js

@@ -151,5 +151,5 @@ PluginManager.prototype.getFileManagers = function() {
     return this.fileManagers;
 };
 
-// 
+//
 module.exports = PluginManagerFactory;

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

@@ -18,7 +18,7 @@ PluginLoader.prototype.loadPlugin = function(filename, basePath, context, enviro
     return new Promise(function(fulfill, reject) {
         fileManager.loadFile(filename, basePath, context, environment)
             .then(fulfill).catch(reject);
-    });        
+    });
 };
 
 module.exports = PluginLoader;

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

@@ -4,7 +4,7 @@ var path = require('path'),
     AbstractFileManager = require("../less/environment/abstract-file-manager.js");
 
 var FileManager = function() {
-    this.files = {};
+    this.contents = {};
 };
 
 FileManager.prototype = new AbstractFileManager();
@@ -34,7 +34,7 @@ FileManager.prototype.loadFile = function(filename, currentDirectory, options, e
 
     // Search node_modules
     if (!explicit) { paths.push.apply(paths, this.modulePaths); }
-    
+
     if (!isAbsoluteFilename && paths.indexOf('.') === -1) { paths.push('.'); }
 
     var prefixes = options.prefixes || [''];
@@ -82,11 +82,11 @@ FileManager.prototype.loadFile = function(filename, currentDirectory, options, e
                             }
                             catch (e) {}
                         }
-                        
+
                         fullFilename = options.ext ? self.tryAppendExtension(fullFilename, options.ext) : fullFilename;
 
-                        if (self.files[fullFilename]) {
-                            fulfill({ contents: self.files[fullFilename], filename: fullFilename});
+                        if (self.contents[fullFilename]) {
+                            fulfill({ contents: self.contents[fullFilename], filename: fullFilename});
                         }
                         else {
                             var readFileArgs = [fullFilename];
@@ -96,7 +96,7 @@ FileManager.prototype.loadFile = function(filename, currentDirectory, options, e
                             if (options.syncImport) {
                                 try {
                                     var data = fs.readFileSync.apply(this, readFileArgs);
-                                    self.files[fullFilename] = data;
+                                    self.contents[fullFilename] = data;
                                     fulfill({ contents: data, filename: fullFilename});
                                 }
                                 catch (e) {
@@ -106,11 +106,11 @@ FileManager.prototype.loadFile = function(filename, currentDirectory, options, e
                             }
                             else {
                                 readFileArgs.push(function(e, data) {
-                                    if (e) { 
+                                    if (e) {
                                         filenamesTried.push(fullFilename);
                                         return tryPrefix(j + 1);
                                     }
-                                    self.files[fullFilename] = data;
+                                    self.contents[fullFilename] = data;
                                     fulfill({ contents: data, filename: fullFilename});
                                 });
                                 fs.readFile.apply(this, readFileArgs);

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

@@ -40,6 +40,7 @@ PluginLoader.prototype.loadPlugin = function(filename, basePath, context, enviro
                     fulfill(data);
                 }
                 catch (e) {
+                    console.log(e);
                     reject(e);
                 }
             }
@@ -47,7 +48,7 @@ PluginLoader.prototype.loadPlugin = function(filename, basePath, context, enviro
             reject(err);
         });
     });
-        
+
 };
 
 module.exports = PluginLoader;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {

package/test/browser/less.js

@@ -895,7 +895,7 @@ PluginLoader.prototype.loadPlugin = function(filename, basePath, context, enviro
     return new Promise(function(fulfill, reject) {
         fileManager.loadFile(filename, basePath, context, environment)
             .then(fulfill).catch(reject);
-    });        
+    });
 };
 
 module.exports = PluginLoader;
@@ -1473,7 +1473,7 @@ AbstractPluginLoader.prototype.evalPlugin = function(contents, context, imports,
         fileInfo: fileInfo
     };
     registry = functionRegistry.create();
-    
+
     var registerPlugin = function(obj) {
         pluginObj = obj;
     };
@@ -1484,7 +1484,7 @@ AbstractPluginLoader.prototype.evalPlugin = function(contents, context, imports,
     } catch (e) {
         return new this.less.LessError(e, imports, filename);
     }
-      
+
     if (!pluginObj) {
         pluginObj = localModule.exports;
     }
@@ -1509,7 +1509,7 @@ AbstractPluginLoader.prototype.evalPlugin = function(contents, context, imports,
             e.message = 'Error during @plugin call';
             return new this.less.LessError(e, imports, filename);
         }
-        
+
     }
     else {
         return new this.less.LessError({ message: "Not a valid plugin" });
@@ -1586,6 +1586,11 @@ module.exports = AbstractPluginLoader;
 
 
 },{"../functions/function-registry":26,"../less-error":36}],19:[function(require,module,exports){
+/**
+ * @todo Document why this abstraction exists, and the relationship between
+ *       environment, file managers, and plugin manager
+ */
+
 var logger = require("../logger");
 var environment = function(externalEnvironment, fileManagers) {
     this.fileManagers = fileManagers || [];
@@ -2911,10 +2916,10 @@ var utils = require('./utils');
  * @prop {string[]} extract
  *
  * @param {Object} e              - An error object to wrap around or just a descriptive object
- * @param {Object} importManager  - An instance of ImportManager (see import-manager.js)
+ * @param {Object} fileContentMap - An object with file contents in 'contents' property (like importManager) @todo - move to fileManager?
  * @param {string} [currentFilename]
  */
-var LessError = module.exports = function LessError(e, importManager, currentFilename) {
+var LessError = module.exports = function LessError(e, fileContentMap, currentFilename) {
     Error.call(this);
 
     var filename = e.filename || currentFilename;
@@ -2922,13 +2927,13 @@ var LessError = module.exports = function LessError(e, importManager, currentFil
     this.message = e.message;
     this.stack = e.stack;
 
-    if (importManager && filename) {
-        var input = importManager.contents[filename],
+    if (fileContentMap && filename) {
+        var input = fileContentMap.contents[filename],
             loc = utils.getLocation(e.index, input),
             line = loc.line,
             col  = loc.column,
             callLine = e.call && utils.getLocation(e.call, input).line,
-            lines = input.split('\n');
+            lines = input ? input.split('\n') : '';
 
         this.type = e.type || 'Syntax';
         this.filename = filename;
@@ -2951,7 +2956,7 @@ var LessError = module.exports = function LessError(e, importManager, currentFil
 
         this.callLine = callLine + 1;
         this.callExtract = lines[callLine];
-        
+
         this.extract = [
             lines[this.line - 2],
             lines[this.line - 1],
@@ -3167,7 +3172,7 @@ module.exports = function(environment, ParseTree, ImportManager) {
         } else {
             var context,
                 rootFileInfo,
-                pluginManager = new PluginManager(this, true);
+                pluginManager = new PluginManager(this, !options.reUsePluginManager);
 
             options.pluginManager = pluginManager;
 
@@ -3213,7 +3218,7 @@ module.exports = function(environment, ParseTree, ImportManager) {
                     }
                 });
             }
-            
+
             new Parser(context, imports, rootFileInfo)
                 .parse(input, function (e, root) {
                     if (e) { return callback(e); }
@@ -5755,7 +5760,7 @@ PluginManager.prototype.getFileManagers = function() {
     return this.fileManagers;
 };
 
-// 
+//
 module.exports = PluginManagerFactory;
 
 },{}],44:[function(require,module,exports){