less 3.9.0 → 3.10.1

package/lib/less/environment/file-manager-api.js

@@ -1,4 +1,4 @@
-module.exports = {
+export default {
     /**
      * Given the full path to a file, return the path component
      * Provided by AbstractFileManager

package/lib/less/functions/boolean.js

@@ -1,15 +1,13 @@
+import Anonymous from '../tree/anonymous';
+import Keyword from '../tree/keyword';
 
-var functionRegistry = require('./function-registry'),
-    Anonymous = require('../tree/anonymous'),
-    Keyword = require('../tree/keyword');
+function boolean(condition) {
+    return condition ? Keyword.True : Keyword.False;
+}
 
-functionRegistry.addMultiple({
-    boolean: function(condition) {
-        return condition ? Keyword.True : Keyword.False;
-    },
+function If(condition, trueValue, falseValue) {
+    return condition ? trueValue
+        : (falseValue || new Anonymous);
+}
 
-    'if': function(condition, trueValue, falseValue) {
-        return condition ? trueValue
-            : (falseValue || new Anonymous);
-    }
-});
+export default { boolean, 'if': If };

package/lib/less/functions/color-blending.js

@@ -1,16 +1,25 @@
-var Color = require('../tree/color'),
-    functionRegistry = require('./function-registry');
+import Color from '../tree/color';
 
 // Color Blending
 // ref: http://www.w3.org/TR/compositing-1
 
 function colorBlend(mode, color1, color2) {
-    var ab = color1.alpha, cb, // backdrop
-        as = color2.alpha, cs, // source
-        ar, cr, r = [];        // result
+    const ab = color1.alpha;        // result
+
+    let // backdrop
+        cb;
+
+    const as = color2.alpha;
+
+    let // source
+        cs;
+
+    let ar;
+    let cr;
+    const r = [];
 
     ar = as + ab * (1 - as);
-    for (var i = 0; i < 3; i++) {
+    for (let i = 0; i < 3; i++) {
         cb = color1.rgb[i] / 255;
         cs = color2.rgb[i] / 255;
         cr = mode(cb, cs);
@@ -24,7 +33,7 @@ function colorBlend(mode, color1, color2) {
     return new Color(r, ar);
 }
 
-var colorBlendModeFunctions = {
+const colorBlendModeFunctions = {
     multiply: function(cb, cs) {
         return cb * cs;
     },
@@ -38,7 +47,8 @@ var colorBlendModeFunctions = {
             colorBlendModeFunctions.screen(cb - 1, cs);
     },
     softlight: function(cb, cs) {
-        var d = 1, e = cb;
+        let d = 1;
+        let e = cb;
         if (cs > 0.5) {
             e = 1;
             d = (cb > 0.25) ? Math.sqrt(cb)
@@ -65,10 +75,10 @@ var colorBlendModeFunctions = {
     }
 };
 
-for (var f in colorBlendModeFunctions) {
+for (const f in colorBlendModeFunctions) {
     if (colorBlendModeFunctions.hasOwnProperty(f)) {
         colorBlend[f] = colorBlend.bind(null, colorBlendModeFunctions[f]);
     }
 }
 
-functionRegistry.addMultiple(colorBlend);
+export default colorBlend;

package/lib/less/functions/color.js

@@ -1,15 +1,14 @@
-var Dimension = require('../tree/dimension'),
-    Color = require('../tree/color'),
-    Quoted = require('../tree/quoted'),
-    Anonymous = require('../tree/anonymous'),
-    functionRegistry = require('./function-registry'),
-    colorFunctions;
+import Dimension from '../tree/dimension';
+import Color from '../tree/color';
+import Quoted from '../tree/quoted';
+import Anonymous from '../tree/anonymous';
+let colorFunctions;
 
 function clamp(val) {
     return Math.min(1, Math.max(0, val));
 }
 function hsla(origColor, hsl) {
-    var color = colorFunctions.hsla(hsl.h, hsl.s, hsl.l, hsl.a);
+    const color = colorFunctions.hsla(hsl.h, hsl.s, hsl.l, hsl.a);
     if (color) {
         if (origColor.value && 
             /^(rgb|hsl)/.test(origColor.value)) {
@@ -20,6 +19,22 @@ function hsla(origColor, hsl) {
         return color;
     }
 }
+function toHSL(color) {
+    if (color.toHSL) {
+        return color.toHSL();
+    } else {
+        throw new Error('Argument cannot be evaluated to a color');
+    }
+}
+
+function toHSV(color) {
+    if (color.toHSV) {
+        return color.toHSV();
+    } else {
+        throw new Error('Argument cannot be evaluated to a color');
+    }
+}
+
 function number(n) {
     if (n instanceof Dimension) {
         return parseFloat(n.unit.is('%') ? n.value / 100 : n.value);
@@ -41,7 +56,7 @@ function scaled(n, size) {
 }
 colorFunctions = {
     rgb: function (r, g, b) {
-        var color = colorFunctions.rgba(r, g, b, 1.0);
+        const color = colorFunctions.rgba(r, g, b, 1.0);
         if (color) {
             color.value = 'rgb';
             return color;
@@ -57,14 +72,14 @@ colorFunctions = {
                 }
                 return new Color(r.rgb, a, 'rgba');
             }
-            var rgb = [r, g, b].map(function (c) { return scaled(c, 255); });
+            const rgb = [r, g, b].map(c => scaled(c, 255));
             a = number(a);
             return new Color(rgb, a, 'rgba');
         }
         catch (e) {}
     },
     hsl: function (h, s, l) {
-        var color = colorFunctions.hsla(h, s, l, 1.0);
+        const color = colorFunctions.hsla(h, s, l, 1.0);
         if (color) {
             color.value = 'hsl';
             return color;
@@ -81,7 +96,8 @@ colorFunctions = {
                 return new Color(h.rgb, a, 'hsla');
             }
 
-            var m1, m2;
+            let m1;
+            let m2;
 
             function hue(h) {
                 h = h < 0 ? h + 1 : (h > 1 ? h - 1 : h);
@@ -100,12 +116,12 @@ colorFunctions = {
             }
 
             h = (number(h) % 360) / 360;
-            s = clamp(number(s)); l = clamp(number(l)); a = clamp(number(a));
+            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;
 
-            var rgb = [
+            const rgb = [
                 hue(h + 1 / 3) * 255,
                 hue(h)       * 255,
                 hue(h - 1 / 3) * 255
@@ -122,17 +138,18 @@ colorFunctions = {
 
     hsva: function(h, s, v, a) {
         h = ((number(h) % 360) / 360) * 360;
-        s = number(s); v = number(v); a = number(a);
+        s = number(s);v = number(v);a = number(a);
 
-        var i, f;
+        let i;
+        let f;
         i = Math.floor((h / 60) % 6);
         f = (h / 60) - i;
 
-        var vs = [v,
+        const vs = [v,
             v * (1 - s),
             v * (1 - f * s),
             v * (1 - (1 - f) * s)];
-        var perm = [[0, 3, 1],
+        const perm = [[0, 3, 1],
             [2, 0, 1],
             [1, 0, 3],
             [1, 2, 0],
@@ -146,22 +163,22 @@ colorFunctions = {
     },
 
     hue: function (color) {
-        return new Dimension(color.toHSL().h);
+        return new Dimension(toHSL(color).h);
     },
     saturation: function (color) {
-        return new Dimension(color.toHSL().s * 100, '%');
+        return new Dimension(toHSL(color).s * 100, '%');
     },
     lightness: function (color) {
-        return new Dimension(color.toHSL().l * 100, '%');
+        return new Dimension(toHSL(color).l * 100, '%');
     },
     hsvhue: function(color) {
-        return new Dimension(color.toHSV().h);
+        return new Dimension(toHSV(color).h);
     },
     hsvsaturation: function (color) {
-        return new Dimension(color.toHSV().s * 100, '%');
+        return new Dimension(toHSV(color).s * 100, '%');
     },
     hsvvalue: function (color) {
-        return new Dimension(color.toHSV().v * 100, '%');
+        return new Dimension(toHSV(color).v * 100, '%');
     },
     red: function (color) {
         return new Dimension(color.rgb[0]);
@@ -173,13 +190,13 @@ colorFunctions = {
         return new Dimension(color.rgb[2]);
     },
     alpha: function (color) {
-        return new Dimension(color.toHSL().a);
+        return new Dimension(toHSL(color).a);
     },
     luma: function (color) {
         return new Dimension(color.luma() * color.alpha * 100, '%');
     },
     luminance: function (color) {
-        var luminance =
+        const luminance =
             (0.2126 * color.rgb[0] / 255) +
                 (0.7152 * color.rgb[1] / 255) +
                 (0.0722 * color.rgb[2] / 255);
@@ -192,7 +209,7 @@ colorFunctions = {
         if (!color.rgb) {
             return null;
         }
-        var hsl = color.toHSL();
+        const hsl = toHSL(color);
 
         if (typeof method !== 'undefined' && method.value === 'relative') {
             hsl.s +=  hsl.s * amount.value / 100;
@@ -204,7 +221,7 @@ colorFunctions = {
         return hsla(color, hsl);
     },
     desaturate: function (color, amount, method) {
-        var hsl = color.toHSL();
+        const hsl = toHSL(color);
 
         if (typeof method !== 'undefined' && method.value === 'relative') {
             hsl.s -=  hsl.s * amount.value / 100;
@@ -216,7 +233,7 @@ colorFunctions = {
         return hsla(color, hsl);
     },
     lighten: function (color, amount, method) {
-        var hsl = color.toHSL();
+        const hsl = toHSL(color);
 
         if (typeof method !== 'undefined' && method.value === 'relative') {
             hsl.l +=  hsl.l * amount.value / 100;
@@ -228,7 +245,7 @@ colorFunctions = {
         return hsla(color, hsl);
     },
     darken: function (color, amount, method) {
-        var hsl = color.toHSL();
+        const hsl = toHSL(color);
 
         if (typeof method !== 'undefined' && method.value === 'relative') {
             hsl.l -=  hsl.l * amount.value / 100;
@@ -240,7 +257,7 @@ colorFunctions = {
         return hsla(color, hsl);
     },
     fadein: function (color, amount, method) {
-        var hsl = color.toHSL();
+        const hsl = toHSL(color);
 
         if (typeof method !== 'undefined' && method.value === 'relative') {
             hsl.a +=  hsl.a * amount.value / 100;
@@ -252,7 +269,7 @@ colorFunctions = {
         return hsla(color, hsl);
     },
     fadeout: function (color, amount, method) {
-        var hsl = color.toHSL();
+        const hsl = toHSL(color);
 
         if (typeof method !== 'undefined' && method.value === 'relative') {
             hsl.a -=  hsl.a * amount.value / 100;
@@ -264,15 +281,15 @@ colorFunctions = {
         return hsla(color, hsl);
     },
     fade: function (color, amount) {
-        var hsl = color.toHSL();
+        const hsl = toHSL(color);
 
         hsl.a = amount.value / 100;
         hsl.a = clamp(hsl.a);
         return hsla(color, hsl);
     },
     spin: function (color, amount) {
-        var hsl = color.toHSL();
-        var hue = (hsl.h + amount.value) % 360;
+        const hsl = toHSL(color);
+        const hue = (hsl.h + amount.value) % 360;
 
         hsl.h = hue < 0 ? 360 + hue : hue;
 
@@ -283,25 +300,21 @@ colorFunctions = {
     // http://sass-lang.com
     //
     mix: function (color1, color2, weight) {
-        if (!color1.toHSL || !color2.toHSL) {
-            console.log(color2.type);
-            console.dir(color2);
-        }
         if (!weight) {
             weight = new Dimension(50);
         }
-        var p = weight.value / 100.0;
-        var w = p * 2 - 1;
-        var a = color1.toHSL().a - color2.toHSL().a;
+        const p = weight.value / 100.0;
+        const w = p * 2 - 1;
+        const a = toHSL(color1).a - toHSL(color2).a;
 
-        var w1 = (((w * a == -1) ? w : (w + a) / (1 + w * a)) + 1) / 2.0;
-        var w2 = 1 - w1;
+        const w1 = (((w * a == -1) ? w : (w + a) / (1 + w * a)) + 1) / 2.0;
+        const w2 = 1 - w1;
 
-        var rgb = [color1.rgb[0] * w1 + color2.rgb[0] * w2,
+        const rgb = [color1.rgb[0] * w1 + color2.rgb[0] * w2,
             color1.rgb[1] * w1 + color2.rgb[1] * w2,
             color1.rgb[2] * w1 + color2.rgb[2] * w2];
 
-        var alpha = color1.alpha * p + color2.alpha * (1 - p);
+        const alpha = color1.alpha * p + color2.alpha * (1 - p);
 
         return new Color(rgb, alpha);
     },
@@ -322,7 +335,7 @@ colorFunctions = {
         }
         // Figure out which is actually light and dark:
         if (dark.luma() > light.luma()) {
-            var t = light;
+            const t = light;
             light = dark;
             dark = t;
         }
@@ -381,8 +394,8 @@ colorFunctions = {
     color: function(c) {
         if ((c instanceof Quoted) &&
             (/^#([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);
+            const val = c.value.slice(1);
+            return new Color(val, undefined, `#${val}`);
         }
         if ((c instanceof Color) || (c = Color.fromKeyword(c.value))) {
             c.value = undefined;
@@ -400,4 +413,5 @@ colorFunctions = {
         return colorFunctions.mix(colorFunctions.rgb(0, 0, 0), color, amount);
     }
 };
-functionRegistry.addMultiple(colorFunctions);
+
+export default colorFunctions;

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

@@ -1,42 +1,41 @@
-module.exports = function(environment) {
-    var Quoted = require('../tree/quoted'),
-        URL = require('../tree/url'),
-        utils = require('../utils'),
-        functionRegistry = require('./function-registry'),
-        fallback = function(functionThis, node) {
-            return new URL(node, functionThis.index, functionThis.currentFileInfo).eval(functionThis.context);
-        },
-        logger = require('../logger');
+import Quoted from '../tree/quoted';
+import URL from '../tree/url';
+import * as utils from '../utils';
+import logger from '../logger';
 
-    functionRegistry.add('data-uri', function(mimetypeNode, filePathNode) {
+export default environment => {
+    
+    const fallback = (functionThis, node) => new URL(node, functionThis.index, functionThis.currentFileInfo).eval(functionThis.context);    
+
+    return { 'data-uri': function(mimetypeNode, filePathNode) {
 
         if (!filePathNode) {
             filePathNode = mimetypeNode;
             mimetypeNode = null;
         }
 
-        var mimetype = mimetypeNode && mimetypeNode.value;
-        var filePath = filePathNode.value;
-        var currentFileInfo = this.currentFileInfo;
-        var currentDirectory = currentFileInfo.rewriteUrls ?
+        let mimetype = mimetypeNode && mimetypeNode.value;
+        let filePath = filePathNode.value;
+        const currentFileInfo = this.currentFileInfo;
+        const currentDirectory = currentFileInfo.rewriteUrls ?
             currentFileInfo.currentDirectory : currentFileInfo.entryPath;
 
-        var fragmentStart = filePath.indexOf('#');
-        var fragment = '';
+        const fragmentStart = filePath.indexOf('#');
+        let fragment = '';
         if (fragmentStart !== -1) {
             fragment = filePath.slice(fragmentStart);
             filePath = filePath.slice(0, fragmentStart);
         }
-        var context = utils.clone(this.context);
+        const context = utils.clone(this.context);
         context.rawBuffer = true;
 
-        var fileManager = environment.getFileManager(filePath, currentDirectory, context, environment, true);
+        const fileManager = environment.getFileManager(filePath, currentDirectory, context, environment, true);
 
         if (!fileManager) {
             return fallback(this, filePathNode);
         }
 
-        var useBase64 = false;
+        let useBase64 = false;
 
         // detect the mimetype if not given
         if (!mimetypeNode) {
@@ -47,7 +46,7 @@ module.exports = function(environment) {
                 useBase64 = false;
             } else {
                 // use base 64 unless it's an ASCII or UTF-8 format
-                var charset = environment.charsetLookup(mimetype);
+                const charset = environment.charsetLookup(mimetype);
                 useBase64 = ['US-ASCII', 'UTF-8'].indexOf(charset) < 0;
             }
             if (useBase64) { mimetype += ';base64'; }
@@ -56,33 +55,20 @@ module.exports = function(environment) {
             useBase64 = /;base64$/.test(mimetype);
         }
 
-        var fileSync = fileManager.loadFileSync(filePath, currentDirectory, context, environment);
+        const fileSync = fileManager.loadFileSync(filePath, currentDirectory, context, environment);
         if (!fileSync.contents) {
-            logger.warn('Skipped data-uri embedding of ' + filePath + ' because file not found');
+            logger.warn(`Skipped data-uri embedding of ${filePath} because file not found`);
             return fallback(this, filePathNode || mimetypeNode);
         }
-        var buf = fileSync.contents;
+        let buf = fileSync.contents;
         if (useBase64 && !environment.encodeBase64) {
             return fallback(this, filePathNode);
         }
 
         buf = useBase64 ? environment.encodeBase64(buf) : encodeURIComponent(buf);
 
-        var uri = 'data:' + mimetype + ',' + buf + fragment;
-
-        // IE8 cannot handle a data-uri larger than 32,768 characters. If this is exceeded
-        // and the --ieCompat flag is enabled, return a normal url() instead.
-        var DATA_URI_MAX = 32768;
-        if (uri.length >= DATA_URI_MAX) {
-
-            if (this.context.ieCompat !== false) {
-                logger.warn('Skipped data-uri embedding of ' + filePath + ' because its size (' + uri.length +
-                    ' characters) exceeds IE8-safe ' + DATA_URI_MAX + ' characters!');
-
-                return fallback(this, filePathNode || mimetypeNode);
-            }
-        }
+        const uri = `data:${mimetype},${buf}${fragment}`;
 
-        return new URL(new Quoted('"' + uri + '"', uri, false, this.index, this.currentFileInfo), this.index, this.currentFileInfo);
-    });
+        return new URL(new Quoted(`"${uri}"`, uri, false, this.index, this.currentFileInfo), this.index, this.currentFileInfo);
+    }};
 };

package/lib/less/functions/default.js

@@ -1,9 +1,9 @@
-var Keyword = require('../tree/keyword'),
-    functionRegistry = require('./function-registry');
+import Keyword from '../tree/keyword';
 
-var defaultFunc = {
+const defaultFunc = {
     eval: function () {
-        var v = this.value_, e = this.error_;
+        const v = this.value_;
+        const e = this.error_;
         if (e) {
             throw e;
         }
@@ -22,6 +22,4 @@ var defaultFunc = {
     }
 };
 
-functionRegistry.add('default', defaultFunc.eval.bind(defaultFunc));
-
-module.exports = defaultFunc;
+export default defaultFunc;

package/lib/less/functions/function-caller.js

@@ -1,46 +1,49 @@
-var Expression = require('../tree/expression');
+import Expression from '../tree/expression';
 
-var functionCaller = function(name, context, index, currentFileInfo) {
-    this.name = name.toLowerCase();
-    this.index = index;
-    this.context = context;
-    this.currentFileInfo = currentFileInfo;
+class functionCaller {
+    constructor(name, context, index, currentFileInfo) {
+        this.name = name.toLowerCase();
+        this.index = index;
+        this.context = context;
+        this.currentFileInfo = currentFileInfo;
 
-    this.func = context.frames[0].functionRegistry.get(this.name);
-};
-functionCaller.prototype.isValid = function() {
-    return Boolean(this.func);
-};
+        this.func = context.frames[0].functionRegistry.get(this.name);
+    }
+
+    isValid() {
+        return Boolean(this.func);
+    }
 
-functionCaller.prototype.call = function(args) {
-    // This code is terrible and should be replaced as per this issue...
-    // https://github.com/less/less.js/issues/2477
-    if (Array.isArray(args)) {
-        args = args.filter(function (item) {
-            if (item.type === 'Comment') {
-                return false;
-            }
-            return true;
-        })
-        .map(function(item) {
-            if (item.type === 'Expression') {
-                var subNodes = item.value.filter(function (item) {
-                    if (item.type === 'Comment') {
-                        return false;
+    call(args) {
+        // This code is terrible and should be replaced as per this issue...
+        // https://github.com/less/less.js/issues/2477
+        if (Array.isArray(args)) {
+            args = args.filter(item => {
+                if (item.type === 'Comment') {
+                    return false;
+                }
+                return true;
+            })
+                .map(item => {
+                    if (item.type === 'Expression') {
+                        const subNodes = item.value.filter(item => {
+                            if (item.type === 'Comment') {
+                                return false;
+                            }
+                            return true;
+                        });
+                        if (subNodes.length === 1) {
+                            return subNodes[0];
+                        } else {
+                            return new Expression(subNodes);
+                        }
                     }
-                    return true;
+                    return item;
                 });
-                if (subNodes.length === 1) {
-                    return subNodes[0];
-                } else {
-                    return new Expression(subNodes);
-                }
-            }
-            return item;
-        });
-    }
+        }
 
-    return this.func.apply(this, args);
-};
+        return this.func(...args);
+    }
+}
 
-module.exports = functionCaller;
+export default functionCaller;

package/lib/less/functions/function-registry.js

@@ -13,9 +13,9 @@ function makeRegistry( base ) {
         },
         addMultiple: function(functions) {
             Object.keys(functions).forEach(
-                function(name) {
+                name => {
                     this.add(name, functions[name]);
-                }.bind(this));
+                });
         },
         get: function(name) {
             return this._data[name] || ( base && base.get( name ));
@@ -32,4 +32,4 @@ function makeRegistry( base ) {
     };
 }
 
-module.exports = makeRegistry( null );
+export default makeRegistry( null );