less 3.9.0 → 3.10.1

package/lib/less/plugin-manager.js

@@ -1,155 +1,168 @@
 /**
  * Plugin Manager
  */
-var PluginManager = function(less) {
-    this.less = less;
-    this.visitors = [];
-    this.preProcessors = [];
-    this.postProcessors = [];
-    this.installedPlugins = [];
-    this.fileManagers = [];
-    this.iterator = -1;
-    this.pluginCache = {};
-    this.Loader = new less.PluginLoader(less);
-};
+class PluginManager {
+    constructor(less) {
+        this.less = less;
+        this.visitors = [];
+        this.preProcessors = [];
+        this.postProcessors = [];
+        this.installedPlugins = [];
+        this.fileManagers = [];
+        this.iterator = -1;
+        this.pluginCache = {};
+        this.Loader = new less.PluginLoader(less);
+    }
 
-var pm, PluginManagerFactory = function(less, newFactory) {
-        if (newFactory || !pm) {
-            pm = new PluginManager(less);
+    /**
+     * Adds all the plugins in the array
+     * @param {Array} plugins
+     */
+    addPlugins(plugins) {
+        if (plugins) {
+            for (let i = 0; i < plugins.length; i++) {
+                this.addPlugin(plugins[i]);
+            }
         }
-        return pm;
-    };
+    }
 
-/**
- * Adds all the plugins in the array
- * @param {Array} plugins
- */
-PluginManager.prototype.addPlugins = function(plugins) {
-    if (plugins) {
-        for (var i = 0; i < plugins.length; i++) {
-            this.addPlugin(plugins[i]);
+    /**
+     *
+     * @param plugin
+     * @param {String} filename
+     */
+    addPlugin(plugin, filename, functionRegistry) {
+        this.installedPlugins.push(plugin);
+        if (filename) {
+            this.pluginCache[filename] = plugin;
+        }
+        if (plugin.install) {
+            plugin.install(this.less, this, functionRegistry || this.less.functions.functionRegistry);
         }
     }
-};
-/**
- *
- * @param plugin
- * @param {String} filename
- */
-PluginManager.prototype.addPlugin = function(plugin, filename, functionRegistry) {
-    this.installedPlugins.push(plugin);
-    if (filename) {
-        this.pluginCache[filename] = plugin;
+
+    /**
+     *
+     * @param filename
+     */
+    get(filename) {
+        return this.pluginCache[filename];
     }
-    if (plugin.install) {
-        plugin.install(this.less, this, functionRegistry || this.less.functions.functionRegistry);
+
+    /**
+     * Adds a visitor. The visitor object has options on itself to determine
+     * when it should run.
+     * @param visitor
+     */
+    addVisitor(visitor) {
+        this.visitors.push(visitor);
     }
-};
-/**
- *
- * @param filename
- */
-PluginManager.prototype.get = function(filename) {
-    return this.pluginCache[filename];
-};
 
-/**
- * Adds a visitor. The visitor object has options on itself to determine
- * when it should run.
- * @param visitor
- */
-PluginManager.prototype.addVisitor = function(visitor) {
-    this.visitors.push(visitor);
-};
-/**
- * Adds a pre processor object
- * @param {object} preProcessor
- * @param {number} priority - guidelines 1 = before import, 1000 = import, 2000 = after import
- */
-PluginManager.prototype.addPreProcessor = function(preProcessor, priority) {
-    var indexToInsertAt;
-    for (indexToInsertAt = 0; indexToInsertAt < this.preProcessors.length; indexToInsertAt++) {
-        if (this.preProcessors[indexToInsertAt].priority >= priority) {
-            break;
+    /**
+     * Adds a pre processor object
+     * @param {object} preProcessor
+     * @param {number} priority - guidelines 1 = before import, 1000 = import, 2000 = after import
+     */
+    addPreProcessor(preProcessor, priority) {
+        let indexToInsertAt;
+        for (indexToInsertAt = 0; indexToInsertAt < this.preProcessors.length; indexToInsertAt++) {
+            if (this.preProcessors[indexToInsertAt].priority >= priority) {
+                break;
+            }
         }
+        this.preProcessors.splice(indexToInsertAt, 0, {preProcessor, priority});
     }
-    this.preProcessors.splice(indexToInsertAt, 0, {preProcessor: preProcessor, priority: priority});
-};
-/**
- * Adds a post processor object
- * @param {object} postProcessor
- * @param {number} priority - guidelines 1 = before compression, 1000 = compression, 2000 = after compression
- */
-PluginManager.prototype.addPostProcessor = function(postProcessor, priority) {
-    var indexToInsertAt;
-    for (indexToInsertAt = 0; indexToInsertAt < this.postProcessors.length; indexToInsertAt++) {
-        if (this.postProcessors[indexToInsertAt].priority >= priority) {
-            break;
+
+    /**
+     * Adds a post processor object
+     * @param {object} postProcessor
+     * @param {number} priority - guidelines 1 = before compression, 1000 = compression, 2000 = after compression
+     */
+    addPostProcessor(postProcessor, priority) {
+        let indexToInsertAt;
+        for (indexToInsertAt = 0; indexToInsertAt < this.postProcessors.length; indexToInsertAt++) {
+            if (this.postProcessors[indexToInsertAt].priority >= priority) {
+                break;
+            }
         }
+        this.postProcessors.splice(indexToInsertAt, 0, {postProcessor, priority});
     }
-    this.postProcessors.splice(indexToInsertAt, 0, {postProcessor: postProcessor, priority: priority});
-};
-/**
- *
- * @param manager
- */
-PluginManager.prototype.addFileManager = function(manager) {
-    this.fileManagers.push(manager);
-};
-/**
- *
- * @returns {Array}
- * @private
- */
-PluginManager.prototype.getPreProcessors = function() {
-    var preProcessors = [];
-    for (var i = 0; i < this.preProcessors.length; i++) {
-        preProcessors.push(this.preProcessors[i].preProcessor);
+
+    /**
+     *
+     * @param manager
+     */
+    addFileManager(manager) {
+        this.fileManagers.push(manager);
     }
-    return preProcessors;
-};
-/**
- *
- * @returns {Array}
- * @private
- */
-PluginManager.prototype.getPostProcessors = function() {
-    var postProcessors = [];
-    for (var i = 0; i < this.postProcessors.length; i++) {
-        postProcessors.push(this.postProcessors[i].postProcessor);
+
+    /**
+     *
+     * @returns {Array}
+     * @private
+     */
+    getPreProcessors() {
+        const preProcessors = [];
+        for (let i = 0; i < this.preProcessors.length; i++) {
+            preProcessors.push(this.preProcessors[i].preProcessor);
+        }
+        return preProcessors;
     }
-    return postProcessors;
-};
-/**
- *
- * @returns {Array}
- * @private
- */
-PluginManager.prototype.getVisitors = function() {
-    return this.visitors;
-};
 
-PluginManager.prototype.visitor = function() {
-    var self = this;
-    return {
-        first: function() {
-            self.iterator = -1;
-            return self.visitors[self.iterator];
-        },
-        get: function() {
-            self.iterator += 1;
-            return self.visitors[self.iterator];
+    /**
+     *
+     * @returns {Array}
+     * @private
+     */
+    getPostProcessors() {
+        const postProcessors = [];
+        for (let i = 0; i < this.postProcessors.length; i++) {
+            postProcessors.push(this.postProcessors[i].postProcessor);
         }
-    };
-};
-/**
- *
- * @returns {Array}
- * @private
- */
-PluginManager.prototype.getFileManagers = function() {
-    return this.fileManagers;
+        return postProcessors;
+    }
+
+    /**
+     *
+     * @returns {Array}
+     * @private
+     */
+    getVisitors() {
+        return this.visitors;
+    }
+
+    visitor() {
+        const self = this;
+        return {
+            first: function() {
+                self.iterator = -1;
+                return self.visitors[self.iterator];
+            },
+            get: function() {
+                self.iterator += 1;
+                return self.visitors[self.iterator];
+            }
+        };
+    }
+
+    /**
+     *
+     * @returns {Array}
+     * @private
+     */
+    getFileManagers() {
+        return this.fileManagers;
+    }
+}
+
+let pm;
+
+function PluginManagerFactory(less, newFactory) {
+    if (newFactory || !pm) {
+        pm = new PluginManager(less);
+    }
+    return pm;
 };
 
 //
-module.exports = PluginManagerFactory;
+export default PluginManagerFactory;

package/lib/less/render.js

@@ -1,8 +1,8 @@
-var PromiseConstructor,
-    utils = require('./utils');
+let PromiseConstructor;
+import * as utils from './utils';
 
-module.exports = function(environment, ParseTree, ImportManager) {
-    var render = function (input, options, callback) {
+export default (environment, ParseTree, ImportManager) => {
+    const render = function (input, options, callback) {
         if (typeof options === 'function') {
             callback = options;
             options = utils.copyOptions(this.options, {});
@@ -12,12 +12,9 @@ module.exports = function(environment, ParseTree, ImportManager) {
         }
 
         if (!callback) {
-            if (!PromiseConstructor) {
-                PromiseConstructor = typeof Promise === 'undefined' ? require('promise') : Promise;
-            }
-            var self = this;
-            return new PromiseConstructor(function (resolve, reject) {
-                render.call(self, input, options, function(err, output) {
+            const self = this;
+            return new Promise((resolve, reject) => {
+                render.call(self, input, options, (err, output) => {
                     if (err) {
                         reject(err);
                     } else {
@@ -26,12 +23,12 @@ module.exports = function(environment, ParseTree, ImportManager) {
                 });
             });
         } else {
-            this.parse(input, options, function(err, root, imports, options) {
+            this.parse(input, options, (err, root, imports, options) => {
                 if (err) { return callback(err); }
 
-                var result;
+                let result;
                 try {
-                    var parseTree = new ParseTree(root, imports);
+                    const parseTree = new ParseTree(root, imports);
                     result = parseTree.toCSS(options);
                 }
                 catch (err) { return callback(err); }

package/lib/less/source-map-builder.js

@@ -1,72 +1,77 @@
-module.exports = function (SourceMapOutput, environment) {
+export default (SourceMapOutput, environment) => {
+    class SourceMapBuilder {
+        constructor(options) {
+            this.options = options;
+        }
 
-    var SourceMapBuilder = function (options) {
-        this.options = options;
-    };
+        toCSS(rootNode, options, imports) {
+            const sourceMapOutput = new SourceMapOutput(
+                {
+                    contentsIgnoredCharsMap: imports.contentsIgnoredChars,
+                    rootNode,
+                    contentsMap: imports.contents,
+                    sourceMapFilename: this.options.sourceMapFilename,
+                    sourceMapURL: this.options.sourceMapURL,
+                    outputFilename: this.options.sourceMapOutputFilename,
+                    sourceMapBasepath: this.options.sourceMapBasepath,
+                    sourceMapRootpath: this.options.sourceMapRootpath,
+                    outputSourceFiles: this.options.outputSourceFiles,
+                    sourceMapGenerator: this.options.sourceMapGenerator,
+                    sourceMapFileInline: this.options.sourceMapFileInline
+                });
 
-    SourceMapBuilder.prototype.toCSS = function(rootNode, options, imports) {
-        var sourceMapOutput = new SourceMapOutput(
-            {
-                contentsIgnoredCharsMap: imports.contentsIgnoredChars,
-                rootNode: rootNode,
-                contentsMap: imports.contents,
-                sourceMapFilename: this.options.sourceMapFilename,
-                sourceMapURL: this.options.sourceMapURL,
-                outputFilename: this.options.sourceMapOutputFilename,
-                sourceMapBasepath: this.options.sourceMapBasepath,
-                sourceMapRootpath: this.options.sourceMapRootpath,
-                outputSourceFiles: this.options.outputSourceFiles,
-                sourceMapGenerator: this.options.sourceMapGenerator,
-                sourceMapFileInline: this.options.sourceMapFileInline
-            });
+            const css = sourceMapOutput.toCSS(options);
+            this.sourceMap = sourceMapOutput.sourceMap;
+            this.sourceMapURL = sourceMapOutput.sourceMapURL;
+            if (this.options.sourceMapInputFilename) {
+                this.sourceMapInputFilename = sourceMapOutput.normalizeFilename(this.options.sourceMapInputFilename);
+            }
+            if (this.options.sourceMapBasepath !== undefined && this.sourceMapURL !== undefined) {
+                this.sourceMapURL = sourceMapOutput.removeBasepath(this.sourceMapURL);
+            }
+            return css + this.getCSSAppendage();
+        }
+
+        getCSSAppendage() {
+
+            let sourceMapURL = this.sourceMapURL;
+            if (this.options.sourceMapFileInline) {
+                if (this.sourceMap === undefined) {
+                    return '';
+                }
+                sourceMapURL = `data:application/json;base64,${environment.encodeBase64(this.sourceMap)}`;
+            }
 
-        var css = sourceMapOutput.toCSS(options);
-        this.sourceMap = sourceMapOutput.sourceMap;
-        this.sourceMapURL = sourceMapOutput.sourceMapURL;
-        if (this.options.sourceMapInputFilename) {
-            this.sourceMapInputFilename = sourceMapOutput.normalizeFilename(this.options.sourceMapInputFilename);
+            if (sourceMapURL) {
+                return `/*# sourceMappingURL=${sourceMapURL} */`;
+            }
+            return '';
         }
-        if (this.options.sourceMapBasepath !== undefined && this.sourceMapURL !== undefined) {
-            this.sourceMapURL = sourceMapOutput.removeBasepath(this.sourceMapURL);
+
+        getExternalSourceMap() {
+            return this.sourceMap;
         }
-        return css + this.getCSSAppendage();
-    };
 
-    SourceMapBuilder.prototype.getCSSAppendage = function() {
+        setExternalSourceMap(sourceMap) {
+            this.sourceMap = sourceMap;
+        }
 
-        var sourceMapURL = this.sourceMapURL;
-        if (this.options.sourceMapFileInline) {
-            if (this.sourceMap === undefined) {
-                return '';
-            }
-            sourceMapURL = 'data:application/json;base64,' + environment.encodeBase64(this.sourceMap);
+        isInline() {
+            return this.options.sourceMapFileInline;
         }
 
-        if (sourceMapURL) {
-            return '/*# sourceMappingURL=' + sourceMapURL + ' */';
+        getSourceMapURL() {
+            return this.sourceMapURL;
         }
-        return '';
-    };
 
-    SourceMapBuilder.prototype.getExternalSourceMap = function() {
-        return this.sourceMap;
-    };
-    SourceMapBuilder.prototype.setExternalSourceMap = function(sourceMap) {
-        this.sourceMap = sourceMap;
-    };
+        getOutputFilename() {
+            return this.options.sourceMapOutputFilename;
+        }
 
-    SourceMapBuilder.prototype.isInline = function() {
-        return this.options.sourceMapFileInline;
-    };
-    SourceMapBuilder.prototype.getSourceMapURL = function() {
-        return this.sourceMapURL;
-    };
-    SourceMapBuilder.prototype.getOutputFilename = function() {
-        return this.options.sourceMapOutputFilename;
-    };
-    SourceMapBuilder.prototype.getInputFilename = function() {
-        return this.sourceMapInputFilename;
-    };
+        getInputFilename() {
+            return this.sourceMapInputFilename;
+        }
+    }
 
     return SourceMapBuilder;
 };