less 3.7.0 → 3.9.0

package/lib/less/constants.js

@@ -0,0 +1,13 @@
+module.exports = {
+    Math: {
+        ALWAYS: 0,
+        PARENS_DIVISION: 1,
+        PARENS: 2,
+        STRICT_LEGACY: 3
+    },
+    RewriteUrls: {
+        OFF: 0,
+        LOCAL: 1,
+        ALL: 2
+    }
+};

package/lib/less/contexts.js

@@ -1,6 +1,6 @@
 var contexts = {};
 module.exports = contexts;
-var MATH = require('./math-constants');
+var Constants = require('./constants');
 
 var copyFromOriginal = function copyFromOriginal(original, destination, propertiesToCopy) {
     if (!original) { return; }
@@ -18,7 +18,7 @@ var copyFromOriginal = function copyFromOriginal(original, destination, properti
 var parseCopyProperties = [
     // options
     'paths',            // option - unmodified - paths to search for imports on
-    'relativeUrls',     // option - whether to adjust URL's to be relative
+    'rewriteUrls',      // option - whether to adjust URL's to be relative
     'rootpath',         // option - rootpath to append to URL's
     'strictImports',    // option -
     'insecure',         // option - whether to allow imports from insecure ssl hosts
@@ -51,7 +51,8 @@ var evalCopyProperties = [
     'urlArgs',           // whether to add args into url tokens
     'javascriptEnabled', // option - whether Inline JavaScript is enabled. if undefined, defaults to false
     'pluginManager',     // Used as the plugin manager for the session
-    'importantScope'     // used to bubble up !important statements
+    'importantScope',    // used to bubble up !important statements
+    'rewriteUrls'        // option - whether to adjust URL's to be relative
 ];
 
 contexts.Eval = function(options, frames) {
@@ -95,26 +96,45 @@ contexts.Eval.prototype.isMathOn = function (op) {
     if (!this.mathOn) {
         return false;
     }
-    if (op === '/' && this.math !== MATH.ALWAYS && (!this.parensStack || !this.parensStack.length)) {
+    if (op === '/' && this.math !== Constants.Math.ALWAYS && (!this.parensStack || !this.parensStack.length)) {
         return false;
     }
-    if (this.math > MATH.PARENS_DIVISION) {
+    if (this.math > Constants.Math.PARENS_DIVISION) {
         return this.parensStack && this.parensStack.length;
     }
     return true;
 };
 
-contexts.Eval.prototype.isPathRelative = function (path) {
-    return !/^(?:[a-z-]+:|\/|#)/i.test(path);
+contexts.Eval.prototype.pathRequiresRewrite = function (path) {
+    var isRelative = this.rewriteUrls === Constants.RewriteUrls.LOCAL ? isPathLocalRelative : isPathRelative;
+
+    return isRelative(path);
 };
 
-contexts.Eval.prototype.normalizePath = function( path ) {
+contexts.Eval.prototype.rewritePath = function (path, rootpath) {
+    var newPath;
+
+    rootpath = rootpath || '';
+    newPath = this.normalizePath(rootpath + path);
+
+    // If a path was explicit relative and the rootpath was not an absolute path
+    // we must ensure that the new path is also explicit relative.
+    if (isPathLocalRelative(path) &&
+        isPathRelative(rootpath) &&
+        isPathLocalRelative(newPath) === false) {
+        newPath = './' + newPath;
+    }
+
+    return newPath;
+};
+
+contexts.Eval.prototype.normalizePath = function (path) {
     var
         segments = path.split('/').reverse(),
         segment;
 
     path = [];
-    while (segments.length !== 0 ) {
+    while (segments.length !== 0) {
         segment = segments.pop();
         switch ( segment ) {
             case '.':
@@ -127,7 +147,7 @@ contexts.Eval.prototype.normalizePath = function( path ) {
                 }
                 break;
             default:
-                path.push( segment );
+                path.push(segment);
                 break;
         }
     }
@@ -135,4 +155,12 @@ contexts.Eval.prototype.normalizePath = function( path ) {
     return path.join('/');
 };
 
+function isPathRelative(path) {
+    return !/^(?:[a-z-]+:|\/|#)/i.test(path);
+}
+
+function isPathLocalRelative(path) {
+    return path.charAt(0) === '.';
+}
+
 // todo - do the same for the toCSS ?

package/lib/less/default-options.js

@@ -42,7 +42,7 @@ module.exports = function() {
          * that references an image, exactly the same URL will be output in the css. 
          * This option allows you to re-write URL's in imported files so that the 
          * URL is always relative to the base imported file */
-        relativeUrls: false,
+        rewriteUrls: false,
 
         /* Compatibility with IE8. Used for limiting data-uri length */
         ieCompat: false,  // true until 3.0

package/lib/less/functions/color.js

@@ -8,8 +8,17 @@ var Dimension = require('../tree/dimension'),
 function clamp(val) {
     return Math.min(1, Math.max(0, val));
 }
-function hsla(color) {
-    return colorFunctions.hsla(color.h, color.s, color.l, color.a);
+function hsla(origColor, hsl) {
+    var color = colorFunctions.hsla(hsl.h, hsl.s, hsl.l, hsl.a);
+    if (color) {
+        if (origColor.value && 
+            /^(rgb|hsl)/.test(origColor.value)) {
+            color.value = origColor.value;
+        } else {
+            color.value = 'rgb';
+        }
+        return color;
+    }
 }
 function number(n) {
     if (n instanceof Dimension) {
@@ -32,46 +41,79 @@ function scaled(n, size) {
 }
 colorFunctions = {
     rgb: function (r, g, b) {
-        return colorFunctions.rgba(r, g, b, 1.0);
+        var color = colorFunctions.rgba(r, g, b, 1.0);
+        if (color) {
+            color.value = 'rgb';
+            return color;
+        }
     },
     rgba: function (r, g, b, a) {
-        var rgb = [r, g, b].map(function (c) { return scaled(c, 255); });
-        a = number(a);
-        return new Color(rgb, a);
+        try {
+            if (r instanceof Color) {
+                if (g) {
+                    a = number(g);
+                } else {
+                    a = r.alpha;
+                }
+                return new Color(r.rgb, a, 'rgba');
+            }
+            var rgb = [r, g, b].map(function (c) { return scaled(c, 255); });
+            a = number(a);
+            return new Color(rgb, a, 'rgba');
+        }
+        catch (e) {}
     },
     hsl: function (h, s, l) {
-        return colorFunctions.hsla(h, s, l, 1.0);
+        var color = colorFunctions.hsla(h, s, l, 1.0);
+        if (color) {
+            color.value = 'hsl';
+            return color;
+        }
     },
     hsla: function (h, s, l, a) {
+        try {
+            if (h instanceof Color) {
+                if (s) {
+                    a = number(s);
+                } else {
+                    a = h.alpha;
+                }
+                return new Color(h.rgb, a, 'hsla');
+            }
 
-        var m1, m2;
+            var m1, m2;
 
-        function hue(h) {
-            h = h < 0 ? h + 1 : (h > 1 ? h - 1 : h);
-            if (h * 6 < 1) {
-                return m1 + (m2 - m1) * h * 6;
-            }
-            else if (h * 2 < 1) {
-                return m2;
-            }
-            else if (h * 3 < 2) {
-                return m1 + (m2 - m1) * (2 / 3 - h) * 6;
-            }
-            else {
-                return m1;
+            function hue(h) {
+                h = h < 0 ? h + 1 : (h > 1 ? h - 1 : h);
+                if (h * 6 < 1) {
+                    return m1 + (m2 - m1) * h * 6;
+                }
+                else if (h * 2 < 1) {
+                    return m2;
+                }
+                else if (h * 3 < 2) {
+                    return m1 + (m2 - m1) * (2 / 3 - h) * 6;
+                }
+                else {
+                    return m1;
+                }
             }
-        }
 
-        h = (number(h) % 360) / 360;
-        s = clamp(number(s)); l = clamp(number(l)); a = clamp(number(a));
+            h = (number(h) % 360) / 360;
+            s = clamp(number(s)); l = clamp(number(l)); a = clamp(number(a));
 
-        m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s;
-        m1 = l * 2 - m2;
+            m2 = l <= 0.5 ? l * (s + 1) : l + s - l * s;
+            m1 = l * 2 - m2;
 
-        return colorFunctions.rgba(hue(h + 1 / 3) * 255,
-            hue(h)       * 255,
-            hue(h - 1 / 3) * 255,
-            a);
+            var rgb = [
+                hue(h + 1 / 3) * 255,
+                hue(h)       * 255,
+                hue(h - 1 / 3) * 255
+            ];
+            a = number(a);
+            return new Color(rgb, a, 'hsla');
+        }
+        catch (e) {}
     },
 
     hsv: function(h, s, v) {
@@ -159,7 +201,7 @@ colorFunctions = {
             hsl.s += amount.value / 100;
         }
         hsl.s = clamp(hsl.s);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     desaturate: function (color, amount, method) {
         var hsl = color.toHSL();
@@ -171,7 +213,7 @@ colorFunctions = {
             hsl.s -= amount.value / 100;
         }
         hsl.s = clamp(hsl.s);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     lighten: function (color, amount, method) {
         var hsl = color.toHSL();
@@ -183,7 +225,7 @@ colorFunctions = {
             hsl.l += amount.value / 100;
         }
         hsl.l = clamp(hsl.l);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     darken: function (color, amount, method) {
         var hsl = color.toHSL();
@@ -195,7 +237,7 @@ colorFunctions = {
             hsl.l -= amount.value / 100;
         }
         hsl.l = clamp(hsl.l);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     fadein: function (color, amount, method) {
         var hsl = color.toHSL();
@@ -207,7 +249,7 @@ colorFunctions = {
             hsl.a += amount.value / 100;
         }
         hsl.a = clamp(hsl.a);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     fadeout: function (color, amount, method) {
         var hsl = color.toHSL();
@@ -219,14 +261,14 @@ colorFunctions = {
             hsl.a -= amount.value / 100;
         }
         hsl.a = clamp(hsl.a);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     fade: function (color, amount) {
         var hsl = color.toHSL();
 
         hsl.a = amount.value / 100;
         hsl.a = clamp(hsl.a);
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     spin: function (color, amount) {
         var hsl = color.toHSL();
@@ -234,7 +276,7 @@ colorFunctions = {
 
         hsl.h = hue < 0 ? 360 + hue : hue;
 
-        return hsla(hsl);
+        return hsla(color, hsl);
     },
     //
     // Copyright (c) 2006-2009 Hampton Catlin, Natalie Weizenbaum, and Chris Eppstein
@@ -338,8 +380,9 @@ colorFunctions = {
     },
     color: function(c) {
         if ((c instanceof Quoted) &&
-            (/^#([a-f0-9]{6}|[a-f0-9]{3})$/i.test(c.value))) {
-            return new Color(c.value.slice(1));
+            (/^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3,4})$/i.test(c.value))) {
+            var val = c.value.slice(1);
+            return new Color(val, undefined, '#' + val);
         }
         if ((c instanceof Color) || (c = Color.fromKeyword(c.value))) {
             c.value = undefined;
@@ -347,7 +390,7 @@ colorFunctions = {
         }
         throw {
             type:    'Argument',
-            message: 'argument must be a color keyword or 3/6 digit hex e.g. #FFF'
+            message: 'argument must be a color keyword or 3|4|6|8 digit hex e.g. #FFF'
         };
     },
     tint: function(color, amount) {

package/lib/less/functions/data-uri.js

@@ -18,7 +18,7 @@ module.exports = function(environment) {
         var mimetype = mimetypeNode && mimetypeNode.value;
         var filePath = filePathNode.value;
         var currentFileInfo = this.currentFileInfo;
-        var currentDirectory = currentFileInfo.relativeUrls ?
+        var currentDirectory = currentFileInfo.rewriteUrls ?
             currentFileInfo.currentDirectory : currentFileInfo.entryPath;
 
         var fragmentStart = filePath.indexOf('#');

package/lib/less/functions/list.js

@@ -1,5 +1,7 @@
-var Dimension = require('../tree/dimension'),
+var Comment = require('../tree/comment'),
+    Dimension = require('../tree/dimension'),
     Declaration = require('../tree/declaration'),
+    Expression = require('../tree/expression'),
     Ruleset = require('../tree/ruleset'),
     Selector = require('../tree/selector'),
     Element = require('../tree/element'),
@@ -26,8 +28,36 @@ functionRegistry.addMultiple({
     length: function(values) {
         return new Dimension(getItemsFromNode(values).length);
     },
+    /**
+     * Creates a Less list of incremental values.
+     * Modeled after Lodash's range function, also exists natively in PHP
+     * 
+     * @param {Dimension} [start=1]
+     * @param {Dimension} end  - e.g. 10 or 10px - unit is added to output
+     * @param {Dimension} [step=1] 
+     */
+    range: function(start, end, step) {
+        var from, to, stepValue = 1, list = [];
+        if (end) {
+            to = end;
+            from = start.value;
+            if (step) {
+                stepValue = step.value;
+            }
+        }
+        else {
+            from = 1;
+            to = start;
+        }
+
+        for (var i = from; i <= to.value; i += stepValue) {
+            list.push(new Dimension(i, to.unit));
+        }
+
+        return new Expression(list);
+    },
     each: function(list, rs) {
-        var i = 0, rules = [], newRules, iterator;
+        var rules = [], newRules, iterator;
 
         if (list.value) {
             if (Array.isArray(list.value)) {
@@ -37,6 +67,8 @@ functionRegistry.addMultiple({
             }
         } else if (list.ruleset) {
             iterator = list.ruleset.rules;
+        } else if (list.rules) {
+            iterator = list.rules;
         } else if (Array.isArray(list)) {
             iterator = list;
         } else {
@@ -55,17 +87,20 @@ functionRegistry.addMultiple({
         } else {
             rs = rs.ruleset;
         }
-        
-        iterator.forEach(function(item) {
-            i = i + 1;
-            var key, value;
+
+        for (var i = 0; i < iterator.length; i++) {
+            var key, value, item = iterator[i];
             if (item instanceof Declaration) {
                 key = typeof item.name === 'string' ? item.name : item.name[0].value;
                 value = item.value;
             } else {
-                key = new Dimension(i);
+                key = new Dimension(i + 1);
                 value = item;
             }
+            
+            if (item instanceof Comment) {
+                continue;
+            }
 
             newRules = rs.rules.slice(0);
             if (valueName) {
@@ -75,7 +110,7 @@ functionRegistry.addMultiple({
             }
             if (indexName) {
                 newRules.push(new Declaration(indexName,
-                    new Dimension(i),
+                    new Dimension(i + 1),
                     false, false, this.index, this.currentFileInfo));
             }
             if (keyName) {
@@ -89,7 +124,7 @@ functionRegistry.addMultiple({
                 rs.strictImports,
                 rs.visibilityInfo()
             ));
-        });
+        }
 
         return new Ruleset([ new(Selector)([ new Element("", '&') ]) ],
                 rules,

package/lib/less/import-manager.js

@@ -8,7 +8,7 @@ var contexts = require('./contexts'),
 module.exports = function(environment) {
 
     // FileInfo = {
-    //  'relativeUrls' - option - whether to adjust URL's to be relative
+    //  'rewriteUrls' - option - whether to adjust URL's to be relative
     //  'filename' - full resolved filename of current file
     //  'rootpath' - path to append to normal URLs for this node
     //  'currentDirectory' - path to the current file, absolute
@@ -65,7 +65,7 @@ module.exports = function(environment) {
         };
 
         var newFileInfo = {
-            relativeUrls: this.context.relativeUrls,
+            rewriteUrls: this.context.rewriteUrls,
             entryPath: currentFileInfo.entryPath,
             rootpath: currentFileInfo.rootpath,
             rootFilename: currentFileInfo.rootFilename
@@ -92,7 +92,7 @@ module.exports = function(environment) {
             // - If path of imported file is '../mixins.less' and rootpath is 'less/',
             //   then rootpath should become 'less/../'
             newFileInfo.currentDirectory = fileManager.getPath(resolvedFilename);
-            if (newFileInfo.relativeUrls) {
+            if (newFileInfo.rewriteUrls) {
                 newFileInfo.rootpath = fileManager.join(
                     (importManager.context.rootpath || ''),
                     fileManager.pathDiff(newFileInfo.currentDirectory, newFileInfo.entryPath));

package/lib/less/index.js

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

package/lib/less/parse.js

@@ -46,7 +46,7 @@ module.exports = function(environment, ParseTree, ImportManager) {
                 var entryPath = filename.replace(/[^\/\\]*$/, '');
                 rootFileInfo = {
                     filename: filename,
-                    relativeUrls: context.relativeUrls,
+                    rewriteUrls: context.rewriteUrls,
                     rootpath: context.rootpath || '',
                     currentDirectory: entryPath,
                     entryPath: entryPath,

package/lib/less/parser/parser.js

@@ -636,15 +636,8 @@ var Parser = function Parser(context, imports, fileInfo) {
                 color: function () {
                     var rgb;
 
-                    if (parserInput.currentChar() === '#' && (rgb = parserInput.$re(/^#([A-Fa-f0-9]{6}|[A-Fa-f0-9]{3})/))) {
-                        // strip colons, brackets, whitespaces and other characters that should not
-                        // definitely be part of color string
-                        var colorCandidateString = rgb.input.match(/^#([\w]+).*/);
-                        colorCandidateString = colorCandidateString[1];
-                        if (!colorCandidateString.match(/^[A-Fa-f0-9]+$/)) { // verify if candidate consists only of allowed HEX characters
-                            error('Invalid HEX color code');
-                        }
-                        return new(tree.Color)(rgb[1], undefined, '#' + colorCandidateString);
+                    if (parserInput.currentChar() === '#' && (rgb = parserInput.$re(/^#([A-Fa-f0-9]{8}|[A-Fa-f0-9]{6}|[A-Fa-f0-9]{3,4})/))) {
+                        return new(tree.Color)(rgb[1], undefined, rgb[0]);
                     }
                 },
 

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

@@ -58,7 +58,7 @@ module.exports = function (environment) {
             sourceColumns,
             i;
 
-        if (fileInfo) {
+        if (fileInfo && fileInfo.filename) {
             var inputSource = this._contentsMap[fileInfo.filename];
 
             // remove vars/banner added to the top of the file
@@ -77,7 +77,7 @@ module.exports = function (environment) {
         lines = chunk.split('\n');
         columns = lines[lines.length - 1];
 
-        if (fileInfo) {
+        if (fileInfo && fileInfo.filename) {
             if (!mapLines) {
                 this._sourceMapGenerator.addMapping({ generated: { line: this._lineNumber + 1, column: this._column},
                     original: { line: sourceLines.length, column: sourceColumns.length},

package/lib/less/tree/color.js

@@ -5,6 +5,7 @@ var Node = require('./node'),
 // RGB Colors - #ff0014, #eee
 //
 var Color = function (rgb, a, originalForm) {
+    var self = this;
     //
     // The end goal here, is to parse the arguments
     // into an integer triplet, such as `128, 255, 0`
@@ -13,16 +14,26 @@ var Color = function (rgb, a, originalForm) {
     //
     if (Array.isArray(rgb)) {
         this.rgb = rgb;
-    } else if (rgb.length == 6) {
-        this.rgb = rgb.match(/.{2}/g).map(function (c) {
-            return parseInt(c, 16);
+    } else if (rgb.length >= 6) {
+        this.rgb = [];
+        rgb.match(/.{2}/g).map(function (c, i) {
+            if (i < 3) {
+                self.rgb.push(parseInt(c, 16));
+            } else {
+                self.alpha = (parseInt(c, 16)) / 255;
+            }
         });
     } else {
-        this.rgb = rgb.split('').map(function (c) {
-            return parseInt(c + c, 16);
+        this.rgb = [];
+        rgb.split('').map(function (c, i) {
+            if (i < 3) {
+                self.rgb.push(parseInt(c + c, 16));
+            } else {
+                self.alpha = (parseInt(c + c, 16)) / 255;
+            }
         });
     }
-    this.alpha = typeof a === 'number' ? a : 1;
+    this.alpha = this.alpha || (typeof a === 'number' ? a : 1);
     if (typeof originalForm !== 'undefined') {
         this.value = originalForm;
     }
@@ -57,25 +68,54 @@ Color.prototype.genCSS = function (context, output) {
     output.add(this.toCSS(context));
 };
 Color.prototype.toCSS = function (context, doNotCompress) {
-    var compress = context && context.compress && !doNotCompress, color, alpha;
+    var compress = context && context.compress && !doNotCompress, color, alpha,
+        colorFunction, args = [];
 
     // `value` is set if this color was originally
     // converted from a named color string so we need
     // to respect this and try to output named color too.
+    alpha = this.fround(context, this.alpha);
+
     if (this.value) {
-        return this.value;
+        if (this.value.indexOf('rgb') === 0) {
+            if (alpha < 1) {
+                colorFunction = 'rgba';
+            }
+        } else if (this.value.indexOf('hsl') === 0) {
+            if (alpha < 1) {
+                colorFunction = 'hsla';
+            } else {
+                colorFunction = 'hsl';
+            }
+        } else {
+            return this.value;
+        }
+    } else {
+        if (alpha < 1) {
+            colorFunction = 'rgba';
+        }
     }
 
-    // If we have some transparency, the only way to represent it
-    // is via `rgba`. Otherwise, we use the hex representation,
-    // which has better compatibility with older browsers.
-    // Values are capped between `0` and `255`, rounded and zero-padded.
-    alpha = this.fround(context, this.alpha);
-    if (alpha < 1) {
-        return 'rgba(' + this.rgb.map(function (c) {
-            return clamp(Math.round(c), 255);
-        }).concat(clamp(alpha, 1))
-            .join(',' + (compress ? '' : ' ')) + ')';
+    switch (colorFunction) {
+        case 'rgba':
+            args = this.rgb.map(function (c) {
+                return clamp(Math.round(c), 255);
+            }).concat(clamp(alpha, 1));
+            break;
+        case 'hsla':
+            args.push(clamp(alpha, 1));
+        case 'hsl':
+            color = this.toHSL();
+            args = [
+                this.fround(context, color.h),
+                this.fround(context, color.s * 100) + '%',
+                this.fround(context, color.l * 100) + '%'
+            ].concat(args);
+    }
+
+    if (colorFunction) {
+        // Values are capped between `0` and `255`, rounded and zero-padded.
+        return colorFunction + '(' + args.join(',' + (compress ? '' : ' ')) + ')';
     }
 
     color = this.toRGB();

package/lib/less/tree/declaration.js

@@ -2,7 +2,7 @@ var Node = require('./node'),
     Value = require('./value'),
     Keyword = require('./keyword'),
     Anonymous = require('./anonymous'),
-    MATH = require('../math-constants');
+    MATH = require('../constants').Math;
 
 var Declaration = function (name, value, important, merge, index, currentFileInfo, inline, variable) {
     this.name = name;

package/lib/less/tree/expression.js

@@ -2,7 +2,7 @@ var Node = require('./node'),
     Paren = require('./paren'),
     Comment = require('./comment'),
     Dimension = require('./dimension'),
-    MATH = require('../math-constants');
+    MATH = require('../constants').Math;
 
 var Expression = function (value, noSpacing) {
     this.value = value;