less 3.9.0 → 3.10.1

package/lib/less/functions/index.js

@@ -1,21 +1,33 @@
-module.exports = function(environment) {
-    var functions = {
-        functionRegistry: require('./function-registry'),
-        functionCaller: require('./function-caller')
-    };
+import functionRegistry from './function-registry';
+import functionCaller from './function-caller';
+
+import boolean from './boolean';
+import defaultFunc from './default';
+import color from './color';
+import colorBlending from './color-blending';
+import dataUri from './data-uri';
+import list from './list';
+import math from './math';
+import number from './number';
+import string from './string';
+import svg from './svg';
+import types from './types';
+
+export default environment => {
+    const functions = { functionRegistry, functionCaller };
 
     // register functions
-    require('./boolean');
-    require('./default');
-    require('./color');
-    require('./color-blending');
-    require('./data-uri')(environment);
-    require('./list');
-    require('./math');
-    require('./number');
-    require('./string');
-    require('./svg')(environment);
-    require('./types');
+    functionRegistry.addMultiple(boolean);
+    functionRegistry.add('default', defaultFunc.eval.bind(defaultFunc));
+    functionRegistry.addMultiple(color);
+    functionRegistry.addMultiple(colorBlending);
+    functionRegistry.addMultiple(dataUri(environment));
+    functionRegistry.addMultiple(list);
+    functionRegistry.addMultiple(math);
+    functionRegistry.addMultiple(number);
+    functionRegistry.addMultiple(string);
+    functionRegistry.addMultiple(svg(environment));
+    functionRegistry.addMultiple(types);
 
     return functions;
 };

package/lib/less/functions/list.js

@@ -1,22 +1,22 @@
-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'),
-    functionRegistry = require('./function-registry');
+import Comment from '../tree/comment';
+import Dimension from '../tree/dimension';
+import Declaration from '../tree/declaration';
+import Expression from '../tree/expression';
+import Ruleset from '../tree/ruleset';
+import Selector from '../tree/selector';
+import Element from '../tree/element';
+import Quote from '../tree/quoted';
 
-var getItemsFromNode = function(node) {
+const getItemsFromNode = node => {
     // handle non-array values as an array of length 1
     // return 'undefined' if index is invalid
-    var items = Array.isArray(node.value) ?
+    const items = Array.isArray(node.value) ?
         node.value : Array(node);
 
     return items;
 };
 
-functionRegistry.addMultiple({
+export default {
     _SELF: function(n) {
         return n;
     },
@@ -37,7 +37,10 @@ functionRegistry.addMultiple({
      * @param {Dimension} [step=1] 
      */
     range: function(start, end, step) {
-        var from, to, stepValue = 1, list = [];
+        let from;
+        let to;
+        let stepValue = 1;
+        const list = [];
         if (end) {
             to = end;
             from = start.value;
@@ -50,16 +53,18 @@ functionRegistry.addMultiple({
             to = start;
         }
 
-        for (var i = from; i <= to.value; i += stepValue) {
+        for (let i = from; i <= to.value; i += stepValue) {
             list.push(new Dimension(i, to.unit));
         }
 
         return new Expression(list);
     },
     each: function(list, rs) {
-        var rules = [], newRules, iterator;
+        const rules = [];
+        let newRules;
+        let iterator;
 
-        if (list.value) {
+        if (list.value && !(list instanceof Quote)) {
             if (Array.isArray(list.value)) {
                 iterator = list.value;
             } else {
@@ -75,9 +80,9 @@ functionRegistry.addMultiple({
             iterator = [list];
         }
 
-        var valueName = '@value',
-            keyName = '@key',
-            indexName = '@index';
+        let valueName = '@value';
+        let keyName = '@key';
+        let indexName = '@index';
 
         if (rs.params) {
             valueName = rs.params[0] && rs.params[0].name;
@@ -88,8 +93,10 @@ functionRegistry.addMultiple({
             rs = rs.ruleset;
         }
 
-        for (var i = 0; i < iterator.length; i++) {
-            var key, value, item = iterator[i];
+        for (let i = 0; i < iterator.length; i++) {
+            let key;
+            let value;
+            const item = iterator[i];
             if (item instanceof Declaration) {
                 key = typeof item.name === 'string' ? item.name : item.name[0].value;
                 value = item.value;
@@ -97,7 +104,7 @@ functionRegistry.addMultiple({
                 key = new Dimension(i + 1);
                 value = item;
             }
-            
+
             if (item instanceof Comment) {
                 continue;
             }
@@ -118,7 +125,7 @@ functionRegistry.addMultiple({
                     key,
                     false, false, this.index, this.currentFileInfo));
             }
-        
+
             rules.push(new Ruleset([ new(Selector)([ new Element("", '&') ]) ],
                 newRules,
                 rs.strictImports,
@@ -127,10 +134,9 @@ functionRegistry.addMultiple({
         }
 
         return new Ruleset([ new(Selector)([ new Element("", '&') ]) ],
-                rules,
-                rs.strictImports,
-                rs.visibilityInfo()
-            ).eval(this.context);
-
+            rules,
+            rs.strictImports,
+            rs.visibilityInfo()
+        ).eval(this.context);
     }
-});
+};

package/lib/less/functions/math-helper.js

@@ -1,8 +1,6 @@
-var Dimension = require('../tree/dimension');
+import Dimension from '../tree/dimension';
 
-var MathHelper = function() {
-};
-MathHelper._math = function (fn, unit, n) {
+const MathHelper = (fn, unit, n) => {
     if (!(n instanceof Dimension)) {
         throw { type: 'Argument', message: 'argument must be a number' };
     }
@@ -13,4 +11,5 @@ MathHelper._math = function (fn, unit, n) {
     }
     return new Dimension(fn(parseFloat(n.value)), unit);
 };
-module.exports = MathHelper;
+
+export default MathHelper;

package/lib/less/functions/math.js

@@ -1,7 +1,6 @@
-var functionRegistry = require('./function-registry'),
-    mathHelper = require('./math-helper.js');
+import mathHelper from './math-helper.js';
 
-var mathFunctions = {
+const mathFunctions = {
     // name,  unit
     ceil:  null,
     floor: null,
@@ -15,15 +14,15 @@ var mathFunctions = {
     acos:  'rad'
 };
 
-for (var f in mathFunctions) {
+for (const f in mathFunctions) {
     if (mathFunctions.hasOwnProperty(f)) {
-        mathFunctions[f] = mathHelper._math.bind(null, Math[f], mathFunctions[f]);
+        mathFunctions[f] = mathHelper.bind(null, Math[f], mathFunctions[f]);
     }
 }
 
-mathFunctions.round = function (n, f) {
-    var fraction = typeof f === 'undefined' ? 0 : f.value;
-    return mathHelper._math(function(num) { return num.toFixed(fraction); }, null, n);
+mathFunctions.round = (n, f) => {
+    const fraction = typeof f === 'undefined' ? 0 : f.value;
+    return mathHelper(num => num.toFixed(fraction), null, n);
 };
 
-functionRegistry.addMultiple(mathFunctions);
+export default mathFunctions;

package/lib/less/functions/number.js

@@ -1,16 +1,25 @@
-var Dimension = require('../tree/dimension'),
-    Anonymous = require('../tree/anonymous'),
-    functionRegistry = require('./function-registry'),
-    mathHelper = require('./math-helper.js');
+import Dimension from '../tree/dimension';
+import Anonymous from '../tree/anonymous';
+import mathHelper from './math-helper.js';
 
-var minMax = function (isMin, args) {
+const minMax = function (isMin, args) {
     args = Array.prototype.slice.call(args);
     switch (args.length) {
         case 0: throw { type: 'Argument', message: 'one or more arguments required' };
     }
-    var i, j, current, currentUnified, referenceUnified, unit, unitStatic, unitClone,
-        order  = [], // elems only contains original argument values.
-        values = {}; // key is the unit.toString() for unified Dimension values,
+    let i; // key is the unit.toString() for unified Dimension values,
+    let j;
+    let current;
+    let currentUnified;
+    let referenceUnified;
+    let unit;
+    let unitStatic;
+    let unitClone;
+
+    const // elems only contains original argument values.
+        order  = [];
+
+    const values = {};
     // value is the index into the order array.
     for (i = 0; i < args.length; i++) {
         current = args[i];
@@ -43,14 +52,15 @@ var minMax = function (isMin, args) {
         return order[0];
     }
     args = order.map(function (a) { return a.toCSS(this.context); }).join(this.context.compress ? ',' : ', ');
-    return new Anonymous((isMin ? 'min' : 'max') + '(' + args + ')');
+    return new Anonymous(`${isMin ? 'min' : 'max'}(${args})`);
 };
-functionRegistry.addMultiple({
-    min: function () {
-        return minMax(true, arguments);
+
+export default {
+    min: function(...args) {
+        return minMax(true, args);
     },
-    max: function () {
-        return minMax(false, arguments);
+    max: function(...args) {
+        return minMax(false, args);
     },
     convert: function (val, unit) {
         return val.convertTo(unit.value);
@@ -72,10 +82,8 @@ functionRegistry.addMultiple({
         return new Dimension(Math.pow(x.value, y.value), x.unit);
     },
     percentage: function (n) {
-        var result = mathHelper._math(function(num) {
-            return num * 100;
-        }, '%', n);
+        const result = mathHelper(num => num * 100, '%', n);
 
         return result;
     }
-});
+};

package/lib/less/functions/string.js

@@ -1,11 +1,11 @@
-var Quoted = require('../tree/quoted'),
-    Anonymous = require('../tree/anonymous'),
-    JavaScript = require('../tree/javascript'),
-    functionRegistry = require('./function-registry');
+import Quoted from '../tree/quoted';
+import Anonymous from '../tree/anonymous';
+import Quote from '../tree/quoted';
+import JavaScript from '../tree/javascript';
 
-functionRegistry.addMultiple({
+export default {
     e: function (str) {
-        return new Anonymous(str instanceof JavaScript ? str.evaluated : str.value);
+        return new Quote('"', str instanceof JavaScript ? str.evaluated : str.value, true);
     },
     escape: function (str) {
         return new Anonymous(
@@ -13,20 +13,20 @@ functionRegistry.addMultiple({
                 .replace(/\(/g, '%28').replace(/\)/g, '%29'));
     },
     replace: function (string, pattern, replacement, flags) {
-        var result = string.value;
+        let result = string.value;
         replacement = (replacement.type === 'Quoted') ?
             replacement.value : replacement.toCSS();
         result = result.replace(new RegExp(pattern.value, flags ? flags.value : ''), replacement);
         return new Quoted(string.quote || '', result, string.escaped);
     },
     '%': function (string /* arg, arg, ... */) {
-        var args = Array.prototype.slice.call(arguments, 1),
-            result = string.value;
+        const args = Array.prototype.slice.call(arguments, 1);
+        let result = string.value;
 
-        for (var i = 0; i < args.length; i++) {
+        for (let i = 0; i < args.length; i++) {
             /* jshint loopfunc:true */
-            result = result.replace(/%[sda]/i, function(token) {
-                var value = ((args[i].type === 'Quoted') &&
+            result = result.replace(/%[sda]/i, token => {
+                const value = ((args[i].type === 'Quoted') &&
                     token.match(/s/i)) ? args[i].value : args[i].toCSS();
                 return token.match(/[A-Z]$/) ? encodeURIComponent(value) : value;
             });
@@ -34,4 +34,4 @@ functionRegistry.addMultiple({
         result = result.replace(/%%/g, '%');
         return new Quoted(string.quote || '', result, string.escaped);
     }
-});
+};

package/lib/less/functions/svg.js

@@ -1,21 +1,23 @@
-module.exports = function(environment) {
-    var Dimension = require('../tree/dimension'),
-        Color = require('../tree/color'),
-        Expression = require('../tree/expression'),
-        Quoted = require('../tree/quoted'),
-        URL = require('../tree/url'),
-        functionRegistry = require('./function-registry');
+import Dimension from '../tree/dimension';
+import Color from '../tree/color';
+import Expression from '../tree/expression';
+import Quoted from '../tree/quoted';
+import URL from '../tree/url';
 
-    functionRegistry.add('svg-gradient', function(direction) {
-
-        var stops,
-            gradientDirectionSvg,
-            gradientType = 'linear',
-            rectangleDimension = 'x="0" y="0" width="1" height="1"',
-            renderEnv = {compress: false},
-            returner,
-            directionValue = direction.toCSS(renderEnv),
-            i, color, position, positionValue, alpha;
+export default environment => {
+    return { 'svg-gradient': function(direction) {
+        let stops;
+        let gradientDirectionSvg;
+        let gradientType = 'linear';
+        let rectangleDimension = 'x="0" y="0" width="1" height="1"';
+        const renderEnv = {compress: false};
+        let returner;
+        const directionValue = direction.toCSS(renderEnv);
+        let i;
+        let color;
+        let position;
+        let positionValue;
+        let alpha;
 
         function throwArgumentDescriptor() {
             throw { type: 'Argument',
@@ -57,8 +59,7 @@ module.exports = function(environment) {
                 throw { type: 'Argument', message: 'svg-gradient direction must be \'to bottom\', \'to right\',' +
                     ' \'to bottom right\', \'to top right\' or \'ellipse at center\'' };
         }
-        returner = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1">' +
-            '<' + gradientType + 'Gradient id="g" ' + gradientDirectionSvg + '>';
+        returner = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1 1"><${gradientType}Gradient id="g" ${gradientDirectionSvg}>`;
 
         for (i = 0; i < stops.length; i += 1) {
             if (stops[i] instanceof Expression) {
@@ -74,14 +75,13 @@ module.exports = function(environment) {
             }
             positionValue = position ? position.toCSS(renderEnv) : i === 0 ? '0%' : '100%';
             alpha = color.alpha;
-            returner += '<stop offset="' + positionValue + '" stop-color="' + color.toRGB() + '"' + (alpha < 1 ? ' stop-opacity="' + alpha + '"' : '') + '/>';
+            returner += `<stop offset="${positionValue}" stop-color="${color.toRGB()}"${alpha < 1 ? ` stop-opacity="${alpha}"` : ''}/>`;
         }
-        returner += '</' + gradientType + 'Gradient>' +
-            '<rect ' + rectangleDimension + ' fill="url(#g)" /></svg>';
+        returner += `</${gradientType}Gradient><rect ${rectangleDimension} fill="url(#g)" /></svg>`;
 
         returner = encodeURIComponent(returner);
 
-        returner = 'data:image/svg+xml,' + returner;
-        return new URL(new Quoted('\'' + returner + '\'', returner, false, this.index, this.currentFileInfo), this.index, this.currentFileInfo);
-    });
+        returner = `data:image/svg+xml,${returner}`;
+        return new URL(new Quoted(`'${returner}'`, returner, false, this.index, this.currentFileInfo), this.index, this.currentFileInfo);
+    }};
 };

package/lib/less/functions/types.js

@@ -1,28 +1,25 @@
-var Keyword = require('../tree/keyword'),
-    DetachedRuleset = require('../tree/detached-ruleset'),
-    Dimension = require('../tree/dimension'),
-    Color = require('../tree/color'),
-    Quoted = require('../tree/quoted'),
-    Anonymous = require('../tree/anonymous'),
-    URL = require('../tree/url'),
-    Operation = require('../tree/operation'),
-    functionRegistry = require('./function-registry');
+import Keyword from '../tree/keyword';
+import DetachedRuleset from '../tree/detached-ruleset';
+import Dimension from '../tree/dimension';
+import Color from '../tree/color';
+import Quoted from '../tree/quoted';
+import Anonymous from '../tree/anonymous';
+import URL from '../tree/url';
+import Operation from '../tree/operation';
 
-var isa = function (n, Type) {
-        return (n instanceof Type) ? Keyword.True : Keyword.False;
-    },
-    isunit = function (n, unit) {
-        if (unit === undefined) {
-            throw { type: 'Argument', message: 'missing the required second argument to isunit.' };
-        }
-        unit = typeof unit.value === 'string' ? unit.value : unit;
-        if (typeof unit !== 'string') {
-            throw { type: 'Argument', message: 'Second argument to isunit should be a unit or a string.' };
-        }
-        return (n instanceof Dimension) && n.unit.is(unit) ? Keyword.True : Keyword.False;
-    };
+const isa = (n, Type) => (n instanceof Type) ? Keyword.True : Keyword.False;
+const isunit = (n, unit) => {
+    if (unit === undefined) {
+        throw { type: 'Argument', message: 'missing the required second argument to isunit.' };
+    }
+    unit = typeof unit.value === 'string' ? unit.value : unit;
+    if (typeof unit !== 'string') {
+        throw { type: 'Argument', message: 'Second argument to isunit should be a unit or a string.' };
+    }
+    return (n instanceof Dimension) && n.unit.is(unit) ? Keyword.True : Keyword.False;
+};
 
-functionRegistry.addMultiple({
+export default {
     isruleset: function (n) {
         return isa(n, DetachedRuleset);
     },
@@ -50,12 +47,11 @@ functionRegistry.addMultiple({
     isem: function (n) {
         return isunit(n, 'em');
     },
-    isunit: isunit,
+    isunit,
     unit: function (val, unit) {
         if (!(val instanceof Dimension)) {
             throw { type: 'Argument',
-                message: 'the first argument to unit must be a number' +
-                    (val instanceof Operation ? '. Have you forgotten parenthesis?' : '') };
+                message: `the first argument to unit must be a number${val instanceof Operation ? '. Have you forgotten parenthesis?' : ''}` };
         }
         if (unit) {
             if (unit instanceof Keyword) {
@@ -71,4 +67,4 @@ functionRegistry.addMultiple({
     'get-unit': function (n) {
         return new Anonymous(n.unit);
     }
-});
+};