less 3.0.0-pre.2 → 3.0.1

package/lib/less/visitors/extend-visitor.js

@@ -3,7 +3,7 @@ var tree = require("../tree"),
     logger = require("../logger"),
     utils = require("../utils");
 
-/*jshint loopfunc:true */
+/* jshint loopfunc:true */
 
 var ExtendFinderVisitor = function() {
     this._visitor = new Visitor(this);
@@ -110,17 +110,17 @@ ProcessExtendsVisitor.prototype = {
         extendList.filter(function(extend) {
             return !extend.hasFoundMatches && extend.parent_ids.length == 1;
         }).forEach(function(extend) {
-                var selector = "_unknown_";
-                try {
-                    selector = extend.selector.toCSS({});
-                }
-                catch(_) {}
+            var selector = "_unknown_";
+            try {
+                selector = extend.selector.toCSS({});
+            }
+            catch (_) {}
 
-                if (!indices[extend.index + ' ' + selector]) {
-                    indices[extend.index + ' ' + selector] = true;
-                    logger.warn("extend '" + selector + "' has no matches");
-                }
-            });
+            if (!indices[extend.index + ' ' + selector]) {
+                indices[extend.index + ' ' + selector] = true;
+                logger.warn("extend '" + selector + "' has no matches");
+            }
+        });
     },
     doExtendChaining: function (extendsList, extendsListTarget, iterationCount) {
         //
@@ -137,7 +137,7 @@ ProcessExtendsVisitor.prototype = {
 
         iterationCount = iterationCount || 0;
 
-        //loop through comparing every extend with every target extend.
+        // loop through comparing every extend with every target extend.
         // a target extend is the one on the ruleset we are looking at copy/edit/pasting in place
         // e.g.  .a:extend(.b) {}  and .b:extend(.c) {} then the first extend extends the second one
         // and the second is the target.
@@ -203,7 +203,7 @@ ProcessExtendsVisitor.prototype = {
                     selectorOne = extendsToAdd[0].selfSelectors[0].toCSS();
                     selectorTwo = extendsToAdd[0].selector.toCSS();
                 }
-                catch(e) {}
+                catch (e) {}
                 throw { message: "extend circular reference detected. One of the circular extends is currently:" +
                     selectorOne + ":extend(" + selectorTwo + ")"};
             }
@@ -368,7 +368,7 @@ ProcessExtendsVisitor.prototype = {
     },
     extendSelector:function (matches, selectorPath, replacementSelector, isVisible) {
 
-        //for a set of matches, replace each match with the replacement selector
+        // for a set of matches, replace each match with the replacement selector
 
         var currentSelectorPathIndex = 0,
             currentSelectorPathElementIndex = 0,

package/lib/less/visitors/import-visitor.js

@@ -22,7 +22,7 @@ ImportVisitor.prototype = {
             // process the contents
             this._visitor.visit(root);
         }
-        catch(e) {
+        catch (e) {
             this.error = e;
         }
 
@@ -58,7 +58,7 @@ ImportVisitor.prototype = {
 
         try {
             evaldImportNode = importNode.evalForImport(context);
-        } catch(e) {
+        } catch (e) {
             if (!e.filename) { e.index = importNode.getIndex(); e.filename = importNode.fileInfo().filename; }
             // attempt to eval properly and treat as css
             importNode.css = true;

package/lib/less/visitors/join-selector-visitor.js

@@ -22,7 +22,7 @@ JoinSelectorVisitor.prototype = {
 
         this.contexts.push(paths);
 
-        if (! rulesetNode.root) {
+        if (!rulesetNode.root) {
             selectors = rulesetNode.selectors;
             if (selectors) {
                 selectors = selectors.filter(function(selector) { return selector.getIsOutput(); });

package/lib/less/visitors/to-css-visitor.js

@@ -9,14 +9,14 @@ var CSSVisitorUtils = function(context) {
 CSSVisitorUtils.prototype = {
     containsSilentNonBlockedChild: function(bodyRules) {
         var rule;
-        if (bodyRules == null) {
+        if (!bodyRules) {
             return false;
         }
         for (var r = 0; r < bodyRules.length; r++) {
             rule = bodyRules[r];
             if (rule.isSilent && rule.isSilent(this._context) && !rule.blocksVisibility()) {
-                //the atrule contains something that was referenced (likely by extend)
-                //therefore it needs to be shown in output too
+                // the atrule contains something that was referenced (likely by extend)
+                // therefore it needs to be shown in output too
                 return true;
             }
         }
@@ -24,28 +24,21 @@ CSSVisitorUtils.prototype = {
     },
 
     keepOnlyVisibleChilds: function(owner) {
-        if (owner == null || owner.rules == null) {
-            return ;
-        }
-
-        owner.rules = owner.rules.filter(function(thing) {
+        if (owner && owner.rules) {
+            owner.rules = owner.rules.filter(function(thing) {
                 return thing.isVisible();
-            }
-        );
+            });
+        }
     },
 
     isEmpty: function(owner) {
-        if (owner == null || owner.rules == null) {
-            return true;
-        }
-        return owner.rules.length === 0;
+        return (owner && owner.rules) 
+            ? (owner.rules.length === 0) : true;
     },
 
     hasVisibleSelector: function(rulesetNode) {
-        if (rulesetNode == null || rulesetNode.paths == null) {
-            return false;
-        }
-        return rulesetNode.paths.length > 0;
+        return (rulesetNode && rulesetNode.paths)
+            ? (rulesetNode.paths.length > 0) : false;
     },
 
     resolveVisibility: function (node, originalRules) {
@@ -146,9 +139,16 @@ ToCSSVisitor.prototype = {
         }
     },
 
+    visitAnonymous: function(anonymousNode, visitArgs) {
+        if (!anonymousNode.blocksVisibility()) {
+            anonymousNode.accept(this._visitor);
+            return anonymousNode;
+        }
+    },
+
     visitAtRuleWithBody: function(atRuleNode, visitArgs) {
-        //if there is only one nested ruleset and that one has no path, then it is
-        //just fake ruleset
+        // if there is only one nested ruleset and that one has no path, then it is
+        // just fake ruleset
         function hasFakeRuleset(atRuleNode) {
             var bodyRules = atRuleNode.rules;
             return bodyRules.length === 1 && (!bodyRules[0].paths || bodyRules[0].paths.length === 0);
@@ -161,9 +161,9 @@ ToCSSVisitor.prototype = {
 
             return nodeRules;
         }
-        //it is still true that it is only one ruleset in array
-        //this is last such moment
-        //process childs
+        // it is still true that it is only one ruleset in array
+        // this is last such moment
+        // process childs
         var originalRules = getBodyRules(atRuleNode);
         atRuleNode.accept(this._visitor);
         visitArgs.visitDeeper = false;
@@ -221,13 +221,13 @@ ToCSSVisitor.prototype = {
     },
 
     visitRuleset: function (rulesetNode, visitArgs) {
-        //at this point rulesets are nested into each other
+        // at this point rulesets are nested into each other
         var rule, rulesets = [];
 
         this.checkValidNodes(rulesetNode.rules, rulesetNode.firstRoot);
 
-        if (! rulesetNode.root) {
-            //remove invisible paths
+        if (!rulesetNode.root) {
+            // remove invisible paths
             this._compileRulesetPaths(rulesetNode);
 
             // remove rulesets from this ruleset body and compile them separately
@@ -253,7 +253,7 @@ ToCSSVisitor.prototype = {
             }
             visitArgs.visitDeeper = false;
 
-        } else { //if (! rulesetNode.root) {
+        } else { // if (! rulesetNode.root) {
             rulesetNode.accept(this._visitor);
             visitArgs.visitDeeper = false;
         }
@@ -263,7 +263,7 @@ ToCSSVisitor.prototype = {
             this._removeDuplicateRules(rulesetNode.rules);
         }
 
-        //now decide whether we keep the ruleset
+        // now decide whether we keep the ruleset
         if (this.utils.isVisibleRuleset(rulesetNode)) {
             rulesetNode.ensureVisibility();
             rulesets.splice(0, 0, rulesetNode);
@@ -321,72 +321,39 @@ ToCSSVisitor.prototype = {
         }
     },
 
-    _mergeRules: function (rules) {
-        if (!rules) { return; }
-
-        var groups = {},
-            parts,
-            rule,
-            key;
+    _mergeRules: function(rules) {
+        if (!rules) {
+            return; 
+        }
 
+        var groups    = {},
+            groupsArr = [];
+        
         for (var i = 0; i < rules.length; i++) {
-            rule = rules[i];
-
-            if ((rule instanceof tree.Declaration) && rule.merge) {
-                key = [rule.name,
-                    rule.important ? "!" : ""].join(",");
-
-                if (!groups[key]) {
-                    groups[key] = [];
-                } else {
-                    rules.splice(i--, 1);
-                }
-
+            var rule = rules[i];
+            if (rule.merge) {
+                var key = rule.name;
+                groups[key] ? rules.splice(i--, 1) : 
+                    groupsArr.push(groups[key] = []);
                 groups[key].push(rule);
             }
         }
 
-        Object.keys(groups).map(function (k) {
-
-            function toExpression(values) {
-                return new (tree.Expression)(values.map(function (p) {
-                    return p.value;
-                }));
-            }
-
-            function toValue(values) {
-                return new (tree.Value)(values.map(function (p) {
-                    return p;
-                }));
-            }
-
-            parts = groups[k];
-
-            if (parts.length > 1) {
-                rule = parts[0];
-                var spacedGroups = [];
-                var lastSpacedGroup = [];
-                parts.map(function (p) {
-                    if (p.merge === "+") {
-                        if (lastSpacedGroup.length > 0) {
-                            spacedGroups.push(toExpression(lastSpacedGroup));
-                        }
-                        lastSpacedGroup = [];
+        groupsArr.forEach(function(group) {
+            if (group.length > 0) {
+                var result = group[0],
+                    space  = [],
+                    comma  = [new tree.Expression(space)];
+                group.forEach(function(rule) {
+                    if ((rule.merge === '+') && (space.length > 0)) {
+                        comma.push(new tree.Expression(space = []));
                     }
-                    lastSpacedGroup.push(p);
+                    space.push(rule.value);
+                    result.important = result.important || rule.important;
                 });
-                spacedGroups.push(toExpression(lastSpacedGroup));
-                rule.value = toValue(spacedGroups);
+                result.value = new tree.Value(comma);
             }
         });
-    },
-
-    visitAnonymous: function(anonymousNode, visitArgs) {
-        if (anonymousNode.blocksVisibility()) {
-            return ;
-        }
-        anonymousNode.accept(this._visitor);
-        return anonymousNode;
     }
 };
 

package/lib/less/visitors/visitor.js

@@ -10,21 +10,21 @@ function _noop(node) {
 function indexNodeTypes(parent, ticker) {
     // add .typeIndex to tree node types for lookup table
     var key, child;
-    for (key in parent) {
-        if (parent.hasOwnProperty(key)) {
-            child = parent[key];
-            switch (typeof child) {
-                case "function":
-                    // ignore bound functions directly on tree which do not have a prototype
-                    // or aren't nodes
-                    if (child.prototype && child.prototype.type) {
-                        child.prototype.typeIndex = ticker++;
-                    }
-                    break;
-                case "object":
-                    ticker = indexNodeTypes(child, ticker);
-                    break;
-            }
+    for (key in parent) { 
+        /* eslint guard-for-in: 0 */
+        child = parent[key];
+        switch (typeof child) {
+            case "function":
+                // ignore bound functions directly on tree which do not have a prototype
+                // or aren't nodes
+                if (child.prototype && child.prototype.type) {
+                    child.prototype.typeIndex = ticker++;
+                }
+                break;
+            case "object":
+                ticker = indexNodeTypes(child, ticker);
+                break;
+        
         }
     }
     return ticker;

package/lib/less-browser/bootstrap.js

@@ -3,14 +3,30 @@
  * used in the browser distributed version of less
  * to kick-start less using the browser api
  */
-/*global window, document */
+/* global window, document */
 
-// shim Promise if required
-require('promise/polyfill.js');
+// TODO - consider switching this out for a recommendation for this polyfill?
+// <script src="https://cdn.polyfill.io/v2/polyfill.min.js"></script>
+// Browsers have good Promise support
+require("promise/polyfill");
 
-var options = window.less || {};
+var options = require('../less/default-options')();
+
+if (window.less) {
+    for (key in window.less) {
+        if (window.less.hasOwnProperty(key)) {
+            options[key] = window.less[key];
+        }
+    }
+}
 require("./add-default-options")(window, options);
 
+options.plugins = options.plugins || [];
+
+if (window.LESS_PLUGINS) {
+    options.plugins = options.plugins.concat(window.LESS_PLUGINS);
+}
+
 var less = module.exports = require("./index")(window, options);
 
 window.less = less;
@@ -31,7 +47,7 @@ if (options.onReady) {
     if (/!watch/.test(window.location.hash)) {
         less.watch();
     }
-    // Simulate synchronous stylesheet loading by blocking page rendering
+    // Simulate synchronous stylesheet loading by hiding page rendering
     if (!options.async) {
         css = 'body { display: none !important }';
         head = document.head || document.getElementsByTagName('head')[0];

package/lib/less-browser/cache.js

@@ -17,8 +17,8 @@ module.exports = function(window, options, logger) {
                     if (modifyVars) {
                         cache.setItem(path + ':vars', JSON.stringify(modifyVars));
                     }
-                } catch(e) {
-                    //TODO - could do with adding more robust error handling
+                } catch (e) {
+                    // TODO - could do with adding more robust error handling
                     logger.error('failed to save "' + path + '" to local storage for caching.');
                 }
             }

package/lib/less-browser/error-reporting.js

@@ -24,7 +24,7 @@ module.exports = function(window, less, options) {
             }
         };
 
-        if (e.extract) {
+        if (e.line) {
             errorline(e, 0, '');
             errorline(e, 1, 'line');
             errorline(e, 2, '');
@@ -112,7 +112,7 @@ module.exports = function(window, less, options) {
     }
 
     function removeErrorConsole(path) {
-        //no action
+        // no action
     }
 
     function removeError(path) {
@@ -130,7 +130,7 @@ module.exports = function(window, less, options) {
         var filename = e.filename || rootHref;
         var errors = [];
         var content = (e.type || "Syntax") + "Error: " + (e.message || 'There is an error in your .less file') +
-            " in " + filename + " ";
+            " in " + filename;
 
         var errorline = function (e, i, classname) {
             if (e.extract[i] !== undefined) {
@@ -140,11 +140,11 @@ module.exports = function(window, less, options) {
             }
         };
 
-        if (e.extract) {
+        if (e.line) {
             errorline(e, 0, '');
             errorline(e, 1, 'line');
             errorline(e, 2, '');
-            content += 'on line ' + e.line + ', column ' + (e.column + 1) + ':\n' +
+            content += ' on line ' + e.line + ', column ' + (e.column + 1) + ':\n' +
                 errors.join('\n');
         }
         if (e.stack && (e.extract || options.logLevel >= 4)) {

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

@@ -1,4 +1,4 @@
-/*global window, XMLHttpRequest */
+/* global window, XMLHttpRequest */
 
 module.exports = function(options, logger) {
 
@@ -6,22 +6,7 @@ module.exports = function(options, logger) {
 
     var fileCache = {};
 
-    //TODOS - move log somewhere. pathDiff and doing something similar in node. use pathDiff in the other browser file for the initial load
-
-    function getXMLHttpRequest() {
-        if (window.XMLHttpRequest && (window.location.protocol !== "file:" || !("ActiveXObject" in window))) {
-            return new XMLHttpRequest();
-        } else {
-            try {
-                /*global ActiveXObject */
-                return new ActiveXObject("Microsoft.XMLHTTP");
-            } catch (e) {
-                logger.error("browser doesn't support AJAX.");
-                return null;
-            }
-        }
-    }
-
+    // TODOS - move log somewhere. pathDiff and doing something similar in node. use pathDiff in the other browser file for the initial load
     var FileManager = function() {
     };
 
@@ -38,7 +23,7 @@ module.exports = function(options, logger) {
     };
     FileManager.prototype.doXHR = function doXHR(url, type, callback, errback) {
 
-        var xhr = getXMLHttpRequest();
+        var xhr = new XMLHttpRequest();
         var async = options.isFileProtocol ? options.fileAsync : true;
 
         if (typeof xhr.overrideMimeType === 'function') {
@@ -82,36 +67,43 @@ module.exports = function(options, logger) {
         fileCache = {};
     };
 
-    FileManager.prototype.loadFile = function loadFile(filename, currentDirectory, options, environment, callback) {
+    FileManager.prototype.loadFile = function loadFile(filename, currentDirectory, options, environment) {
+        // TODO: Add prefix support like less-node?
+        // What about multiple paths?
+
         if (currentDirectory && !this.isPathAbsolute(filename)) {
             filename = currentDirectory + filename;
         }
 
+        filename = options.ext ? this.tryAppendExtension(filename, options.ext) : filename;
+
         options = options || {};
 
         // sheet may be set to the stylesheet for the initial load or a collection of properties including
         // some context variables for imports
         var hrefParts = this.extractUrlParts(filename, window.location.href);
         var href      = hrefParts.url;
-
-        if (options.useFileCache && fileCache[href]) {
-            try {
-                var lessText = fileCache[href];
-                callback(null, { contents: lessText, filename: href, webInfo: { lastModified: new Date() }});
-            } catch (e) {
-                callback({filename: href, message: "Error loading file " + href + " error was " + e.message});
+        var self      = this;
+        
+        return new Promise(function(resolve, reject) {
+            if (options.useFileCache && fileCache[href]) {
+                try {
+                    var lessText = fileCache[href];
+                    return resolve({ contents: lessText, filename: href, webInfo: { lastModified: new Date() }});
+                } catch (e) {
+                    return reject({ filename: href, message: "Error loading file " + href + " error was " + e.message });
+                }
             }
-            return;
-        }
 
-        this.doXHR(href, options.mime, function doXHRCallback(data, lastModified) {
-            // per file cache
-            fileCache[href] = data;
+            self.doXHR(href, options.mime, function doXHRCallback(data, lastModified) {
+                // per file cache
+                fileCache[href] = data;
 
-            // Use remote copy (re-parse)
-            callback(null, { contents: data, filename: href, webInfo: { lastModified: lastModified }});
-        }, function doXHRError(status, url) {
-            callback({ type: 'File', message: "'" + url + "' wasn't found (" + status + ")", href: href });
+                // Use remote copy (re-parse)
+                resolve({ contents: data, filename: href, webInfo: { lastModified: lastModified }});
+            }, function doXHRError(status, url) {
+                reject({ type: 'File', message: "'" + url + "' wasn't found (" + status + ")", href: href });
+            });
         });
     };
 

package/lib/less-browser/index.js

@@ -22,7 +22,7 @@ module.exports = function(window, options) {
     var cache = less.cache = options.cache || require("./cache")(window, options, less.logger);
     require('./image-size')(less.environment);
 
-    //Setup user functions - Deprecate?
+    // Setup user functions - Deprecate?
     if (options.functions) {
         less.functions.functionRegistry.addMultiple(options.functions);
     }
@@ -30,13 +30,7 @@ module.exports = function(window, options) {
     var typePattern = /^text\/(x-)?less$/;
 
     function clone(obj) {
-        var cloned = {};
-        for (var prop in obj) {
-            if (obj.hasOwnProperty(prop)) {
-                cloned[prop] = obj[prop];
-            }
-        }
-        return cloned;
+        return JSON.parse(JSON.stringify(obj || {}));
     }
 
     // only really needed for phantom
@@ -60,7 +54,7 @@ module.exports = function(window, options) {
                 var lessText = style.innerHTML || '';
                 instanceOptions.filename = document.location.href.replace(/#.*$/, '');
 
-                /*jshint loopfunc:true */
+                /* jshint loopfunc:true */
                 // use closure to store current style
                 less.render(lessText, instanceOptions,
                         bind(function(style, e, result) {
@@ -116,7 +110,7 @@ module.exports = function(window, options) {
 
             }
 
-            //TODO add tests around how this behaves when reloading
+            // TODO add tests around how this behaves when reloading
             errors.remove(path);
 
             instanceOptions.rootFileInfo = newFileInfo;
@@ -131,13 +125,14 @@ module.exports = function(window, options) {
             });
         }
 
-        fileManager.loadFile(sheet.href, null, instanceOptions, environment, function(e, loadedFile) {
-            if (e) {
-                callback(e);
-                return;
-            }
-            loadInitialFileCallback(loadedFile);
-        });
+        fileManager.loadFile(sheet.href, null, instanceOptions, environment)
+            .then(function(loadedFile) {
+                loadInitialFileCallback(loadedFile);
+            }).catch(function(err) {
+                console.log(err);
+                callback(err);
+            });
+
     }
 
     function loadStyleSheets(callback, reload, modifyVars) {