less 2.6.0 → 2.7.2

package/lib/less/tree/ruleset.js

@@ -14,6 +14,7 @@ var Ruleset = function (selectors, rules, strictImports, visibilityInfo) {
     this._lookups = {};
     this.strictImports = strictImports;
     this.copyVisibilityInfo(visibilityInfo);
+    this.allowRoot = true;
 };
 Ruleset.prototype = new Node();
 Ruleset.prototype.type = "Ruleset";
@@ -463,6 +464,91 @@ Ruleset.prototype.joinSelector = function (paths, context, selector) {
         return selector;
     }
 
+    // joins selector path from `beginningPath` with selector path in `addPath`
+    // `replacedElement` contains element that is being replaced by `addPath`
+    // returns concatenated path
+    function addReplacementIntoPath(beginningPath, addPath, replacedElement, originalSelector) {
+        var newSelectorPath, lastSelector, newJoinedSelector;
+        // our new selector path
+        newSelectorPath = [];
+
+        //construct the joined selector - if & is the first thing this will be empty,
+        // if not newJoinedSelector will be the last set of elements in the selector
+        if (beginningPath.length > 0) {
+            newSelectorPath = beginningPath.slice(0);
+            lastSelector = newSelectorPath.pop();
+            newJoinedSelector = originalSelector.createDerived(lastSelector.elements.slice(0));
+        }
+        else {
+            newJoinedSelector = originalSelector.createDerived([]);
+        }
+
+        if (addPath.length > 0) {
+            // /deep/ is a combinator that is valid without anything in front of it
+            // so if the & does not have a combinator that is "" or " " then
+            // and there is a combinator on the parent, then grab that.
+            // this also allows + a { & .b { .a & { ... though not sure why you would want to do that
+            var combinator = replacedElement.combinator, parentEl = addPath[0].elements[0];
+            if (combinator.emptyOrWhitespace && !parentEl.combinator.emptyOrWhitespace) {
+                combinator = parentEl.combinator;
+            }
+            // join the elements so far with the first part of the parent
+            newJoinedSelector.elements.push(new Element(combinator, parentEl.value, replacedElement.index, replacedElement.currentFileInfo));
+            newJoinedSelector.elements = newJoinedSelector.elements.concat(addPath[0].elements.slice(1));
+        }
+
+        // now add the joined selector - but only if it is not empty
+        if (newJoinedSelector.elements.length !== 0) {
+            newSelectorPath.push(newJoinedSelector);
+        }
+
+        //put together the parent selectors after the join (e.g. the rest of the parent)
+        if (addPath.length > 1) {
+            var restOfPath = addPath.slice(1);
+            restOfPath = restOfPath.map(function (selector) {
+                return selector.createDerived(selector.elements, []);
+            });
+            newSelectorPath = newSelectorPath.concat(restOfPath);
+        }
+        return newSelectorPath;
+    }
+
+    // joins selector path from `beginningPath` with every selector path in `addPaths` array
+    // `replacedElement` contains element that is being replaced by `addPath`
+    // returns array with all concatenated paths
+    function addAllReplacementsIntoPath( beginningPath, addPaths, replacedElement, originalSelector, result) {
+        var j;
+        for (j = 0; j < beginningPath.length; j++) {
+            var newSelectorPath = addReplacementIntoPath(beginningPath[j], addPaths, replacedElement, originalSelector);
+            result.push(newSelectorPath);
+        }
+        return result;
+    }
+
+    function mergeElementsOnToSelectors(elements, selectors) {
+        var i, sel;
+
+        if (elements.length === 0) {
+            return ;
+        }
+        if (selectors.length === 0) {
+            selectors.push([ new Selector(elements) ]);
+            return;
+        }
+
+        for (i = 0; i < selectors.length; i++) {
+            sel = selectors[i];
+
+            // if the previous thing in sel is a parent this needs to join on to it
+            if (sel.length > 0) {
+                sel[sel.length - 1] = sel[sel.length - 1].createDerived(sel[sel.length - 1].elements.concat(elements));
+            }
+            else {
+                sel.push(new Selector(elements));
+            }
+        }
+    }
+
     // replace all parent selectors inside `inSelector` by content of `context` array
     // resulting selectors are returned inside `paths` array
     // returns true if `inSelector` contained at least one parent selector
@@ -583,91 +669,6 @@ Ruleset.prototype.joinSelector = function (paths, context, selector) {
         return hadParentSelector;
     }
 
-    // joins selector path from `beginningPath` with selector path in `addPath`
-    // `replacedElement` contains element that is being replaced by `addPath`
-    // returns concatenated path
-    function addReplacementIntoPath(beginningPath, addPath, replacedElement, originalSelector) {
-        var newSelectorPath, lastSelector, newJoinedSelector;
-        // our new selector path
-        newSelectorPath = [];
-
-        //construct the joined selector - if & is the first thing this will be empty,
-        // if not newJoinedSelector will be the last set of elements in the selector
-        if (beginningPath.length > 0) {
-            newSelectorPath = beginningPath.slice(0);
-            lastSelector = newSelectorPath.pop();
-            newJoinedSelector = originalSelector.createDerived(lastSelector.elements.slice(0));
-        }
-        else {
-            newJoinedSelector = originalSelector.createDerived([]);
-        }
-
-        if (addPath.length > 0) {
-            // /deep/ is a combinator that is valid without anything in front of it
-            // so if the & does not have a combinator that is "" or " " then
-            // and there is a combinator on the parent, then grab that.
-            // this also allows + a { & .b { .a & { ... though not sure why you would want to do that
-            var combinator = replacedElement.combinator, parentEl = addPath[0].elements[0];
-            if (combinator.emptyOrWhitespace && !parentEl.combinator.emptyOrWhitespace) {
-                combinator = parentEl.combinator;
-            }
-            // join the elements so far with the first part of the parent
-            newJoinedSelector.elements.push(new Element(combinator, parentEl.value, replacedElement.index, replacedElement.currentFileInfo));
-            newJoinedSelector.elements = newJoinedSelector.elements.concat(addPath[0].elements.slice(1));
-        }
-
-        // now add the joined selector - but only if it is not empty
-        if (newJoinedSelector.elements.length !== 0) {
-            newSelectorPath.push(newJoinedSelector);
-        }
-
-        //put together the parent selectors after the join (e.g. the rest of the parent)
-        if (addPath.length > 1) {
-            var restOfPath = addPath.slice(1);
-            restOfPath = restOfPath.map(function (selector) {
-                return selector.createDerived(selector.elements, []);
-            });
-            newSelectorPath = newSelectorPath.concat(restOfPath);
-        }
-        return newSelectorPath;
-    }
-
-    // joins selector path from `beginningPath` with every selector path in `addPaths` array
-    // `replacedElement` contains element that is being replaced by `addPath`
-    // returns array with all concatenated paths
-    function addAllReplacementsIntoPath( beginningPath, addPaths, replacedElement, originalSelector, result) {
-        var j;
-        for (j = 0; j < beginningPath.length; j++) {
-            var newSelectorPath = addReplacementIntoPath(beginningPath[j], addPaths, replacedElement, originalSelector);
-            result.push(newSelectorPath);
-        }
-        return result;
-    }
-
-    function mergeElementsOnToSelectors(elements, selectors) {
-        var i, sel;
-
-        if (elements.length === 0) {
-            return ;
-        }
-        if (selectors.length === 0) {
-            selectors.push([ new Selector(elements) ]);
-            return;
-        }
-
-        for (i = 0; i < selectors.length; i++) {
-            sel = selectors[i];
-
-            // if the previous thing in sel is a parent this needs to join on to it
-            if (sel.length > 0) {
-                sel[sel.length - 1] = sel[sel.length - 1].createDerived(sel[sel.length - 1].elements.concat(elements));
-            }
-            else {
-                sel.push(new Selector(elements));
-            }
-        }
-    }
-
     function deriveSelector(visibilityInfo, deriveFrom) {
         var newSelector = deriveFrom.createDerived(deriveFrom.elements, deriveFrom.extendList, deriveFrom.evaldCondition);
         newSelector.copyVisibilityInfo(visibilityInfo);

package/lib/less/tree/unit.js

@@ -61,7 +61,7 @@ Unit.prototype.map = function(callback) {
     }
 };
 Unit.prototype.usedUnits = function() {
-    var group, result = {}, mapUnit;
+    var group, result = {}, mapUnit, groupName;
 
     mapUnit = function (atomicUnit) {
         /*jshint loopfunc:true */
@@ -72,7 +72,7 @@ Unit.prototype.usedUnits = function() {
         return atomicUnit;
     };
 
-    for (var groupName in unitConversions) {
+    for (groupName in unitConversions) {
         if (unitConversions.hasOwnProperty(groupName)) {
             group = unitConversions[groupName];
 

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

@@ -95,7 +95,7 @@ var ProcessExtendsVisitor = function() {
 ProcessExtendsVisitor.prototype = {
     run: function(root) {
         var extendFinder = new ExtendFinderVisitor();
-        this.extendIndicies = {};
+        this.extendIndices = {};
         extendFinder.run(root);
         if (!extendFinder.foundExtends) { return root; }
         root.allExtends = root.allExtends.concat(this.doExtendChaining(root.allExtends, root.allExtends));
@@ -105,7 +105,7 @@ ProcessExtendsVisitor.prototype = {
         return newRoot;
     },
     checkExtendsForNonMatched: function(extendList) {
-        var indicies = this.extendIndicies;
+        var indices = this.extendIndices;
         extendList.filter(function(extend) {
             return !extend.hasFoundMatches && extend.parent_ids.length == 1;
         }).forEach(function(extend) {
@@ -115,8 +115,8 @@ ProcessExtendsVisitor.prototype = {
                 }
                 catch(_) {}
 
-                if (!indicies[extend.index + ' ' + selector]) {
-                    indicies[extend.index + ' ' + selector] = true;
+                if (!indices[extend.index + ' ' + selector]) {
+                    indices[extend.index + ' ' + selector] = true;
                     logger.warn("extend '" + selector + "' has no matches");
                 }
             });
@@ -140,7 +140,7 @@ ProcessExtendsVisitor.prototype = {
         // 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.
-        // the seperation into two lists allows us to process a subset of chains with a bigger set, as is the
+        // the separation into two lists allows us to process a subset of chains with a bigger set, as is the
         // case when processing media queries
         for (extendIndex = 0; extendIndex < extendsList.length; extendIndex++) {
             for (targetExtendIndex = 0; targetExtendIndex < extendsListTarget.length; targetExtendIndex++) {

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

@@ -144,7 +144,6 @@ ToCSSVisitor.prototype = {
         } else {
             return this.visitDirectiveWithoutBody(directiveNode, visitArgs);
         }
-        return directiveNode;
     },
 
     visitDirectiveWithBody: function(directiveNode, visitArgs) {
@@ -199,13 +198,24 @@ ToCSSVisitor.prototype = {
         return directiveNode;
     },
 
-    checkPropertiesInRoot: function(rules) {
-        var ruleNode;
+    checkValidNodes: function(rules, isRoot) {
+        if (!rules) {
+            return;
+        }
+
         for (var i = 0; i < rules.length; i++) {
-            ruleNode = rules[i];
-            if (ruleNode instanceof tree.Rule && !ruleNode.variable) {
-                throw { message: "properties must be inside selector blocks, they cannot be in the root.",
-                    index: ruleNode.index, filename: ruleNode.currentFileInfo ? ruleNode.currentFileInfo.filename : null};
+            var ruleNode = rules[i];
+            if (isRoot && ruleNode instanceof tree.Rule && !ruleNode.variable) {
+                throw { message: "Properties must be inside selector blocks. They cannot be in the root",
+                    index: ruleNode.index, filename: ruleNode.currentFileInfo && ruleNode.currentFileInfo.filename};
+            }
+            if (ruleNode instanceof tree.Call) {
+                throw { message: "Function '" + ruleNode.name + "' is undefined",
+                    index: ruleNode.index, filename: ruleNode.currentFileInfo && ruleNode.currentFileInfo.filename};
+            }
+            if (ruleNode.type && !ruleNode.allowRoot) {
+                throw { message: ruleNode.type + " node returned by a function is not valid here",
+                    index: ruleNode.index, filename: ruleNode.currentFileInfo && ruleNode.currentFileInfo.filename};
             }
         }
     },
@@ -213,9 +223,9 @@ ToCSSVisitor.prototype = {
     visitRuleset: function (rulesetNode, visitArgs) {
         //at this point rulesets are nested into each other
         var rule, rulesets = [];
-        if (rulesetNode.firstRoot) {
-            this.checkPropertiesInRoot(rulesetNode.rules);
-        }
+
+        this.checkValidNodes(rulesetNode.rules, rulesetNode.firstRoot);
+
         if (! rulesetNode.root) {
             //remove invisible paths
             this._compileRulesetPaths(rulesetNode);

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

@@ -104,16 +104,6 @@ module.exports = function(window, less, options) {
         }
     }
 
-    function error(e, rootHref) {
-        if (!options.errorReporting || options.errorReporting === "html") {
-            errorHTML(e, rootHref);
-        } else if (options.errorReporting === "console") {
-            errorConsole(e, rootHref);
-        } else if (typeof options.errorReporting === 'function') {
-            options.errorReporting("add", e, rootHref);
-        }
-    }
-
     function removeErrorHTML(path) {
         var node = window.document.getElementById('less-error-message:' + utils.extractId(path));
         if (node) {
@@ -163,6 +153,16 @@ module.exports = function(window, less, options) {
         less.logger.error(content);
     }
 
+    function error(e, rootHref) {
+        if (!options.errorReporting || options.errorReporting === "html") {
+            errorHTML(e, rootHref);
+        } else if (options.errorReporting === "console") {
+            errorConsole(e, rootHref);
+        } else if (typeof options.errorReporting === 'function') {
+            options.errorReporting("add", e, rootHref);
+        }
+    }
+
     return {
         add: error,
         remove: removeError

package/lib/less-browser/index.js

@@ -225,34 +225,57 @@ module.exports = function(window, options) {
             fileManager.clearFileCache();
         }
         return new Promise(function (resolve, reject) {
-            var startTime, endTime, totalMilliseconds;
+            var startTime, endTime, totalMilliseconds, remainingSheets;
             startTime = endTime = new Date();
 
-            loadStyleSheets(function (e, css, _, sheet, webInfo) {
-                if (e) {
-                    errors.add(e, e.href || sheet.href);
-                    reject(e);
-                    return;
-                }
-                if (webInfo.local) {
-                    less.logger.info("loading " + sheet.href + " from cache.");
-                } else {
-                    less.logger.info("rendered " + sheet.href + " successfully.");
-                }
-                browser.createCSS(window.document, css, sheet);
-                less.logger.info("css for " + sheet.href + " generated in " + (new Date() - endTime) + 'ms');
-                if (webInfo.remaining === 0) {
-                    totalMilliseconds = new Date() - startTime;
-                    less.logger.info("less has finished. css generated in " + totalMilliseconds + 'ms');
-                    resolve({
-                        startTime: startTime,
-                        endTime: endTime,
-                        totalMilliseconds: totalMilliseconds,
-                        sheets: less.sheets.length
-                    });
-                }
+            // Set counter for remaining unprocessed sheets
+            remainingSheets = less.sheets.length;
+
+            if (remainingSheets === 0) {
+
                 endTime = new Date();
-            }, reload, modifyVars);
+                totalMilliseconds = endTime - startTime;
+                less.logger.info("Less has finished and no sheets were loaded.");
+                resolve({
+                    startTime: startTime,
+                    endTime: endTime,
+                    totalMilliseconds: totalMilliseconds,
+                    sheets: less.sheets.length
+                });
+
+            } else {
+                // Relies on less.sheets array, callback seems to be guaranteed to be called for every element of the array
+                loadStyleSheets(function (e, css, _, sheet, webInfo) {
+                    if (e) {
+                        errors.add(e, e.href || sheet.href);
+                        reject(e);
+                        return;
+                    }
+                    if (webInfo.local) {
+                        less.logger.info("Loading " + sheet.href + " from cache.");
+                    } else {
+                        less.logger.info("Rendered " + sheet.href + " successfully.");
+                    }
+                    browser.createCSS(window.document, css, sheet);
+                    less.logger.info("CSS for " + sheet.href + " generated in " + (new Date() - endTime) + 'ms');
+
+                    // Count completed sheet
+                    remainingSheets--;
+
+                    // Check if the last remaining sheet was processed and then call the promise
+                    if (remainingSheets === 0) {
+                        totalMilliseconds = new Date() - startTime;
+                        less.logger.info("Less has finished. CSS generated in " + totalMilliseconds + 'ms');
+                        resolve({
+                            startTime: startTime,
+                            endTime: endTime,
+                            totalMilliseconds: totalMilliseconds,
+                            sheets: less.sheets.length
+                        });
+                    }
+                    endTime = new Date();
+                }, reload, modifyVars);
+            }
 
             loadStyles(modifyVars);
         });

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

@@ -38,7 +38,7 @@ FileManager.prototype.loadFile = function(filename, currentDirectory, options, e
     if (options.paths) { paths.push.apply(paths, options.paths); }
     if (!isAbsoluteFilename && paths.indexOf('.') === -1) { paths.push('.'); }
 
-    // promise is guarenteed to be asyncronous
+    // 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) {

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

@@ -15,8 +15,8 @@ var lessc_helper = {
             'red'       : [31, 39],
             'grey'      : [90, 39]
         };
-        return '\033[' + styles[style][0] + 'm' + str +
-               '\033[' + styles[style][1] + 'm';
+        return '\x1b[' + styles[style][0] + 'm' + str +
+               '\x1b[' + styles[style][1] + 'm';
     },
 
     //Print command line options

package/lib/source-map/source-map-0.1.31.js

@@ -1338,7 +1338,7 @@ define('source-map/source-map-consumer', ['require', 'exports', 'module' ,  'sou
   /**
    * Returns the original source content. The only argument is the url of the
    * original source file. Returns null if no original source content is
-   * availible.
+   * available.
    */
   SourceMapConsumer.prototype.sourceContentFor =
     function SourceMapConsumer_sourceContentFor(aSource) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "2.6.0",
+  "version": "2.7.2",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {
@@ -17,6 +17,10 @@
     "type": "git",
     "url": "https://github.com/less/less.js.git"
   },
+  "master": {
+    "url": "https://github.com/less/less.js/blob/master/",
+    "raw": "https://raw.githubusercontent.com/less/less.js/master/"
+  },
   "license": "Apache-2.0",
   "bin": {
     "lessc": "./bin/lessc"
@@ -30,36 +34,37 @@
   },
   "browser": "./dist/less.js",
   "engines": {
-    "node": ">=0.10.0"
+    "node": ">=0.12"
   },
   "scripts": {
     "test": "grunt test"
   },
   "optionalDependencies": {
     "errno": "^0.1.1",
-    "graceful-fs": "^3.0.5",
-    "image-size": "~0.3.5",
+    "graceful-fs": "^4.1.2",
+    "image-size": "~0.5.0",
     "mime": "^1.2.11",
     "mkdirp": "^0.5.0",
-    "promise": "^6.0.1",
-    "request": "^2.51.0",
-    "source-map": "^0.4.2"
+    "promise": "^7.1.1",
+    "source-map": "^0.5.3",
+    "request": "^2.72.0"
   },
   "devDependencies": {
-    "diff": "^1.0",
-    "grunt": "^0.4.5",
-    "grunt-browserify": "~3.5.0",
-    "grunt-contrib-clean": "^0.6.0",
-    "grunt-contrib-concat": "^0.5.0",
-    "grunt-contrib-connect": "^0.9.0",
-    "grunt-contrib-jasmine": "^0.8.2",
-    "grunt-contrib-jshint": "^0.11.0",
-    "grunt-contrib-uglify": "^0.8.0",
-    "grunt-jscs": "^1.6.0",
-    "grunt-saucelabs": "^8.3.2",
-    "grunt-shell": "^1.1.1",
-    "jit-grunt": "^0.9.1",
-    "time-grunt": "^1.0.0"
+    "diff": "^2.2.2",
+    "grunt": "~0.4.5",
+    "grunt-browserify": "^5.0.0",
+    "grunt-contrib-clean": "^1.0.0",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-connect": "^1.0.2",
+    "grunt-contrib-jasmine": "^1.0.3",
+    "grunt-contrib-jshint": "^1.0.0",
+    "grunt-contrib-uglify": "^1.0.1",
+    "grunt-jscs": "^2.8.0",
+    "grunt-saucelabs": "^8.6.2",
+    "grunt-shell": "^1.3.0",
+    "jit-grunt": "^0.10.0",
+    "phantomjs-prebuilt": "^2.1.7",
+    "time-grunt": "^1.3.0"
   },
   "keywords": [
     "compile less",
@@ -85,5 +90,7 @@
     "stylesheet",
     "variables in css",
     "css less"
-  ]
+  ],
+  "rawcurrent": "https://raw.github.com/less/less.js/v",
+  "sourcearchive": "https://github.com/less/less.js/archive/v"
 }

package/test/browser/common.js

@@ -6,19 +6,40 @@ jasmine.getEnv().addReporter(new jasmine.JSReporter2());
 
 var logMessages = [];
 window.less = window.less || {};
+
+var logLevel_debug = 4,
+    logLevel_info = 3,
+    logLevel_warn = 2,
+    logLevel_error = 1;
+
+// The amount of logging in the javascript console.
+// 3 - Debug, information and errors
+// 2 - Information and errors
+// 1 - Errors
+// 0 - None
+// Defaults to 2
+
 less.loggers = [
     {
-        info: function (msg) {
-            logMessages.push(msg);
+        debug: function(msg) {
+            if (less.options.logLevel >= logLevel_debug) {
+                logMessages.push(msg);
+            }
         },
-        debug: function (msg) {
-            logMessages.push(msg);
+        info: function(msg) {
+            if (less.options.logLevel >= logLevel_info) {
+                logMessages.push(msg);
+            }
         },
-        warn: function (msg) {
-            logMessages.push(msg);
+        warn: function(msg) {
+            if (less.options.logLevel >= logLevel_warn) {
+                logMessages.push(msg);
+            }
         },
-        error: function (msg) {
-            logMessages.push(msg);
+        error: function(msg) {
+            if (less.options.logLevel >= logLevel_error) {
+                logMessages.push(msg);
+            }
         }
     }
 ];

package/test/browser/less/console-errors/test-error.txt

@@ -1,2 +1,2 @@
-less: OperationError: Can't substract or divide a color from a number in {pathhref}console-errors/test-error.less on line null, column 0:
+less: OperationError: Can't subtract or divide a color from a number in {pathhref}console-errors/test-error.less on line null, column 0:
 1   prop: (3 / #fff);