less 3.8.0 → 3.8.1

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/index.js

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

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/utils.js

@@ -1,5 +1,6 @@
 /* jshint proto: true */
 var Constants = require('./constants');
+var clone = require('clone');
 
 var utils = {
     getLocation: function(index, inputStream) {
@@ -39,6 +40,9 @@ var utils = {
         return cloned;
     },
     copyOptions: function(obj1, obj2) {
+        if (obj2 && obj2._defaults) {
+            return obj2;
+        }
         var opts = utils.defaults(obj1, obj2);
         if (opts.strictMath) {
             opts.math = Constants.Math.STRICT_LEGACY;
@@ -79,26 +83,15 @@ var utils = {
         return opts;
     },
     defaults: function(obj1, obj2) {
-        if (!obj2._defaults || obj2._defaults !== obj1) {
-            for (var prop in obj1) {
-                if (obj1.hasOwnProperty(prop)) {
-                    if (!obj2.hasOwnProperty(prop)) {
-                        obj2[prop] = obj1[prop];
-                    }
-                    else if (Array.isArray(obj1[prop])
-                        && Array.isArray(obj2[prop])) {
-
-                        obj1[prop].forEach(function(p) {
-                            if (obj2[prop].indexOf(p) === -1) {
-                                obj2[prop].push(p);
-                            }
-                        });
-                    }
-                }
-            }
+        var newObj = obj2 || {};
+        if (!obj2._defaults) {
+            newObj = {};
+            var defaults = clone(obj1);
+            newObj._defaults = defaults;
+            var cloned = obj2 ? clone(obj2) : {};
+            Object.assign(newObj, defaults, cloned);
         }
-        obj2._defaults = obj1;
-        return obj2;
+        return newObj;
     },
     merge: function(obj1, obj2) {
         for (var prop in obj2) {

package/lib/less-browser/index.js

@@ -30,7 +30,13 @@ module.exports = function(window, options) {
     var typePattern = /^text\/(x-)?less$/;
 
     function clone(obj) {
-        return JSON.parse(JSON.stringify(obj || {}));
+        var cloned = {};
+        for (var prop in obj) {
+            if (obj.hasOwnProperty(prop)) {
+                cloned[prop] = obj[prop];
+            }
+        }
+        return cloned;
     }
 
     // only really needed for phantom

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "3.8.0",
+  "version": "3.8.1",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {
@@ -71,6 +71,7 @@
     "less-plugin-autoprefix": "^1.5.1",
     "less-plugin-clean-css": "^1.5.1",
     "performance-now": "^0.2.0",
+    "phantomjs-polyfill-object-assign": "0.0.2",
     "phantomjs-prebuilt": "^2.1.16",
     "phin": "^2.2.3",
     "promise": "^7.1.1",
@@ -104,5 +105,7 @@
   ],
   "rawcurrent": "https://raw.github.com/less/less.js/v",
   "sourcearchive": "https://github.com/less/less.js/archive/v",
-  "dependencies": {}
+  "dependencies": {
+    "clone": "^2.1.2"
+  }
 }