less 4.5.1 → 4.6.1

package/lib/less/functions/number.js

@@ -1,39 +1,37 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var dimension_1 = tslib_1.__importDefault(require("../tree/dimension"));
-var anonymous_1 = tslib_1.__importDefault(require("../tree/anonymous"));
-var math_helper_js_1 = tslib_1.__importDefault(require("./math-helper.js"));
-var minMax = function (isMin, args) {
-    var _this = this;
+import Dimension from '../tree/dimension.js';
+import Anonymous from '../tree/anonymous.js';
+import mathHelper from './math-helper.js';
+
+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; // key is the unit.toString() for unified Dimension values,
-    var j;
-    var current;
-    var currentUnified;
-    var referenceUnified;
-    var unit;
-    var unitStatic;
-    var unitClone;
-    var // elems only contains original argument values.
-    order = [];
-    var 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];
-        if (!(current instanceof dimension_1.default)) {
+        if (!(current instanceof Dimension)) {
             if (Array.isArray(args[i].value)) {
                 Array.prototype.push.apply(args, Array.prototype.slice.call(args[i].value));
                 continue;
-            }
-            else {
+            } else {
                 throw { type: 'Argument', message: 'incompatible types' };
             }
         }
-        currentUnified = current.unit.toString() === '' && unitClone !== undefined ? new dimension_1.default(current.value, unitClone).unify() : current.unify();
+        currentUnified = current.unit.toString() === '' && unitClone !== undefined ? new Dimension(current.value, unitClone).unify() : current.unify();
         unit = currentUnified.unit.toString() === '' && unitStatic !== undefined ? unitStatic : currentUnified.unit.toString();
         unitStatic = unit !== '' && unitStatic === undefined || unit !== '' && order[0].unify().unit.toString() === '' ? unit : unitStatic;
         unitClone = unit !== '' && unitClone === undefined ? current.unit.toString() : unitClone;
@@ -46,8 +44,8 @@ var minMax = function (isMin, args) {
             order.push(current);
             continue;
         }
-        referenceUnified = order[j].unit.toString() === '' && unitClone !== undefined ? new dimension_1.default(order[j].value, unitClone).unify() : order[j].unify();
-        if (isMin && currentUnified.value < referenceUnified.value ||
+        referenceUnified = order[j].unit.toString() === '' && unitClone !== undefined ? new Dimension(order[j].value, unitClone).unify() : order[j].unify();
+        if ( isMin && currentUnified.value < referenceUnified.value ||
             !isMin && currentUnified.value > referenceUnified.value) {
             order[j] = current;
         }
@@ -55,52 +53,43 @@ var minMax = function (isMin, args) {
     if (order.length == 1) {
         return order[0];
     }
-    args = order.map(function (a) { return a.toCSS(_this.context); }).join(this.context.compress ? ',' : ', ');
-    return new anonymous_1.default("".concat(isMin ? 'min' : 'max', "(").concat(args, ")"));
+    args = order.map(a => { return a.toCSS(this.context); }).join(this.context.compress ? ',' : ', ');
+    return new Anonymous(`${isMin ? 'min' : 'max'}(${args})`);
 };
-exports.default = {
-    min: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
+
+export default {
+    min: function(...args) {
         try {
             return minMax.call(this, true, args);
-        }
-        catch (e) { }
+        } catch (e) {}
     },
-    max: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
+    max: function(...args) {
         try {
             return minMax.call(this, false, args);
-        }
-        catch (e) { }
+        } catch (e) {}
     },
     convert: function (val, unit) {
         return val.convertTo(unit.value);
     },
     pi: function () {
-        return new dimension_1.default(Math.PI);
+        return new Dimension(Math.PI);
     },
-    mod: function (a, b) {
-        return new dimension_1.default(a.value % b.value, a.unit);
+    mod: function(a, b) {
+        return new Dimension(a.value % b.value, a.unit);
     },
-    pow: function (x, y) {
+    pow: function(x, y) {
         if (typeof x === 'number' && typeof y === 'number') {
-            x = new dimension_1.default(x);
-            y = new dimension_1.default(y);
-        }
-        else if (!(x instanceof dimension_1.default) || !(y instanceof dimension_1.default)) {
+            x = new Dimension(x);
+            y = new Dimension(y);
+        } else if (!(x instanceof Dimension) || !(y instanceof Dimension)) {
             throw { type: 'Argument', message: 'arguments must be numbers' };
         }
-        return new dimension_1.default(Math.pow(x.value, y.value), x.unit);
+
+        return new Dimension(Math.pow(x.value, y.value), x.unit);
     },
     percentage: function (n) {
-        var result = (0, math_helper_js_1.default)(function (num) { return num * 100; }, '%', n);
+        const result = mathHelper(num => num * 100, '%', n);
+
         return result;
     }
 };
-//# sourceMappingURL=number.js.map

package/lib/less/functions/string.js

@@ -1,40 +1,36 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var quoted_1 = tslib_1.__importDefault(require("../tree/quoted"));
-var anonymous_1 = tslib_1.__importDefault(require("../tree/anonymous"));
-var javascript_1 = tslib_1.__importDefault(require("../tree/javascript"));
-exports.default = {
+import Quoted from '../tree/quoted.js';
+import Anonymous from '../tree/anonymous.js';
+import JavaScript from '../tree/javascript.js';
+
+export default {
     e: function (str) {
-        return new quoted_1.default('"', str instanceof javascript_1.default ? str.evaluated : str.value, true);
+        return new Quoted('"', str instanceof JavaScript ? str.evaluated : str.value, true);
     },
     escape: function (str) {
-        return new anonymous_1.default(encodeURI(str.value).replace(/=/g, '%3D').replace(/:/g, '%3A').replace(/#/g, '%23').replace(/;/g, '%3B')
-            .replace(/\(/g, '%28').replace(/\)/g, '%29'));
+        return new Anonymous(
+            encodeURI(str.value).replace(/=/g, '%3D').replace(/:/g, '%3A').replace(/#/g, '%23').replace(/;/g, '%3B')
+                .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_1.default(string.quote || '', result, string.escaped);
+        return new Quoted(string.quote || '', result, string.escaped);
     },
     '%': function (string /* arg, arg, ... */) {
-        var args = Array.prototype.slice.call(arguments, 1);
-        var result = string.value;
-        var _loop_1 = function (i) {
+        const args = Array.prototype.slice.call(arguments, 1);
+        let result = string.value;
+
+        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;
             });
-        };
-        for (var i = 0; i < args.length; i++) {
-            _loop_1(i);
         }
         result = result.replace(/%%/g, '%');
-        return new quoted_1.default(string.quote || '', result, string.escaped);
+        return new Quoted(string.quote || '', result, string.escaped);
     }
 };
-//# sourceMappingURL=string.js.map

package/lib/less/functions/style.js

@@ -1,28 +1,29 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var variable_1 = tslib_1.__importDefault(require("../tree/variable"));
-var variable_2 = tslib_1.__importDefault(require("../tree/variable"));
-var styleExpression = function (args) {
-    var _this = this;
+import Variable from '../tree/variable.js';
+import Anonymous from '../tree/anonymous.js';
+
+/** @param {*[]} args */
+const styleExpression = function (args) {
     args = Array.prototype.slice.call(args);
-    switch (args.length) {
-        case 0: throw { type: 'Argument', message: 'one or more arguments required' };
+    if (args.length === 0) {
+        throw { type: 'Argument', message: 'one or more arguments required' };
     }
-    var entityList = [new variable_1.default(args[0].value, this.index, this.currentFileInfo).eval(this.context)];
-    args = entityList.map(function (a) { return a.toCSS(_this.context); }).join(this.context.compress ? ',' : ', ');
-    return new variable_2.default("style(".concat(args, ")"));
+
+    const entityList = [new Variable(args[0].value, this.index, this.currentFileInfo).eval(this.context)];
+
+    const result = entityList.map(a => { return a.toCSS(this.context); }).join(this.context.compress ? ',' : ', ');
+
+    return new Anonymous(`style(${result})`);
 };
-exports.default = {
-    style: function () {
-        var args = [];
-        for (var _i = 0; _i < arguments.length; _i++) {
-            args[_i] = arguments[_i];
-        }
+
+export default {
+    /** @param {...*} args */
+    style: function(...args) {
         try {
             return styleExpression.call(this, args);
+        } catch (e) {
+            // When style() is used as a CSS function (e.g. @container style(--responsive: true)),
+            // arguments won't be valid Less variables. Return undefined to let the
+            // parser fall through and treat it as plain CSS.
         }
-        catch (e) { }
     },
 };
-//# sourceMappingURL=style.js.map

package/lib/less/functions/svg.js

@@ -1,86 +1,87 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var dimension_1 = tslib_1.__importDefault(require("../tree/dimension"));
-var color_1 = tslib_1.__importDefault(require("../tree/color"));
-var expression_1 = tslib_1.__importDefault(require("../tree/expression"));
-var quoted_1 = tslib_1.__importDefault(require("../tree/quoted"));
-var url_1 = tslib_1.__importDefault(require("../tree/url"));
-exports.default = (function () {
-    return { 'svg-gradient': function (direction) {
-            var stops;
-            var gradientDirectionSvg;
-            var gradientType = 'linear';
-            var rectangleDimension = 'x="0" y="0" width="1" height="1"';
-            var renderEnv = { compress: false };
-            var returner;
-            var directionValue = direction.toCSS(renderEnv);
-            var i;
-            var color;
-            var position;
-            var positionValue;
-            var alpha;
-            function throwArgumentDescriptor() {
-                throw { type: 'Argument',
-                    message: 'svg-gradient expects direction, start_color [start_position], [color position,]...,' +
-                        ' end_color [end_position] or direction, color list' };
-            }
-            if (arguments.length == 2) {
-                if (arguments[1].value.length < 2) {
-                    throwArgumentDescriptor();
-                }
-                stops = arguments[1].value;
-            }
-            else if (arguments.length < 3) {
+import Dimension from '../tree/dimension.js';
+import Color from '../tree/color.js';
+import Expression from '../tree/expression.js';
+import Quoted from '../tree/quoted.js';
+import URL from '../tree/url.js';
+
+export default () => {
+    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',
+                message: 'svg-gradient expects direction, start_color [start_position], [color position,]...,' +
+                            ' end_color [end_position] or direction, color list' };
+        }
+
+        if (arguments.length == 2) {
+            if (arguments[1].value.length < 2) {
                 throwArgumentDescriptor();
             }
-            else {
-                stops = Array.prototype.slice.call(arguments, 1);
+            stops = arguments[1].value;
+        } else if (arguments.length < 3) {
+            throwArgumentDescriptor();
+        } else {
+            stops = Array.prototype.slice.call(arguments, 1);
+        }
+
+        switch (directionValue) {
+            case 'to bottom':
+                gradientDirectionSvg = 'x1="0%" y1="0%" x2="0%" y2="100%"';
+                break;
+            case 'to right':
+                gradientDirectionSvg = 'x1="0%" y1="0%" x2="100%" y2="0%"';
+                break;
+            case 'to bottom right':
+                gradientDirectionSvg = 'x1="0%" y1="0%" x2="100%" y2="100%"';
+                break;
+            case 'to top right':
+                gradientDirectionSvg = 'x1="0%" y1="100%" x2="100%" y2="0%"';
+                break;
+            case 'ellipse':
+            case 'ellipse at center':
+                gradientType = 'radial';
+                gradientDirectionSvg = 'cx="50%" cy="50%" r="75%"';
+                rectangleDimension = 'x="-50" y="-50" width="101" height="101"';
+                break;
+            default:
+                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}>`;
+
+        for (i = 0; i < stops.length; i += 1) {
+            if (stops[i] instanceof Expression) {
+                color = stops[i].value[0];
+                position = stops[i].value[1];
+            } else {
+                color = stops[i];
+                position = undefined;
             }
-            switch (directionValue) {
-                case 'to bottom':
-                    gradientDirectionSvg = 'x1="0%" y1="0%" x2="0%" y2="100%"';
-                    break;
-                case 'to right':
-                    gradientDirectionSvg = 'x1="0%" y1="0%" x2="100%" y2="0%"';
-                    break;
-                case 'to bottom right':
-                    gradientDirectionSvg = 'x1="0%" y1="0%" x2="100%" y2="100%"';
-                    break;
-                case 'to top right':
-                    gradientDirectionSvg = 'x1="0%" y1="100%" x2="100%" y2="0%"';
-                    break;
-                case 'ellipse':
-                case 'ellipse at center':
-                    gradientType = 'radial';
-                    gradientDirectionSvg = 'cx="50%" cy="50%" r="75%"';
-                    rectangleDimension = 'x="-50" y="-50" width="101" height="101"';
-                    break;
-                default:
-                    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\"><".concat(gradientType, "Gradient id=\"g\" ").concat(gradientDirectionSvg, ">");
-            for (i = 0; i < stops.length; i += 1) {
-                if (stops[i] instanceof expression_1.default) {
-                    color = stops[i].value[0];
-                    position = stops[i].value[1];
-                }
-                else {
-                    color = stops[i];
-                    position = undefined;
-                }
-                if (!(color instanceof color_1.default) || (!((i === 0 || i + 1 === stops.length) && position === undefined) && !(position instanceof dimension_1.default))) {
-                    throwArgumentDescriptor();
-                }
-                positionValue = position ? position.toCSS(renderEnv) : i === 0 ? '0%' : '100%';
-                alpha = color.alpha;
-                returner += "<stop offset=\"".concat(positionValue, "\" stop-color=\"").concat(color.toRGB(), "\"").concat(alpha < 1 ? " stop-opacity=\"".concat(alpha, "\"") : '', "/>");
+
+            if (!(color instanceof Color) || (!((i === 0 || i + 1 === stops.length) && position === undefined) && !(position instanceof Dimension))) {
+                throwArgumentDescriptor();
             }
-            returner += "</".concat(gradientType, "Gradient><rect ").concat(rectangleDimension, " fill=\"url(#g)\" /></svg>");
-            returner = encodeURIComponent(returner);
-            returner = "data:image/svg+xml,".concat(returner);
-            return new url_1.default(new quoted_1.default("'".concat(returner, "'"), returner, false, this.index, this.currentFileInfo), this.index, this.currentFileInfo);
-        } };
-});
-//# sourceMappingURL=svg.js.map
+            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 += `</${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);
+    }};
+};

package/lib/less/functions/types.js

@@ -1,16 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var keyword_1 = tslib_1.__importDefault(require("../tree/keyword"));
-var detached_ruleset_1 = tslib_1.__importDefault(require("../tree/detached-ruleset"));
-var dimension_1 = tslib_1.__importDefault(require("../tree/dimension"));
-var color_1 = tslib_1.__importDefault(require("../tree/color"));
-var quoted_1 = tslib_1.__importDefault(require("../tree/quoted"));
-var anonymous_1 = tslib_1.__importDefault(require("../tree/anonymous"));
-var url_1 = tslib_1.__importDefault(require("../tree/url"));
-var operation_1 = tslib_1.__importDefault(require("../tree/operation"));
-var isa = function (n, Type) { return (n instanceof Type) ? keyword_1.default.True : keyword_1.default.False; };
-var isunit = function (n, unit) {
+import Keyword from '../tree/keyword.js';
+import DetachedRuleset from '../tree/detached-ruleset.js';
+import Dimension from '../tree/dimension.js';
+import Color from '../tree/color.js';
+import Quoted from '../tree/quoted.js';
+import Anonymous from '../tree/anonymous.js';
+import URL from '../tree/url.js';
+import Operation from '../tree/operation.js';
+
+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.' };
     }
@@ -18,26 +16,27 @@ var isunit = function (n, unit) {
     if (typeof unit !== 'string') {
         throw { type: 'Argument', message: 'Second argument to isunit should be a unit or a string.' };
     }
-    return (n instanceof dimension_1.default) && n.unit.is(unit) ? keyword_1.default.True : keyword_1.default.False;
+    return (n instanceof Dimension) && n.unit.is(unit) ? Keyword.True : Keyword.False;
 };
-exports.default = {
+
+export default {
     isruleset: function (n) {
-        return isa(n, detached_ruleset_1.default);
+        return isa(n, DetachedRuleset);
     },
     iscolor: function (n) {
-        return isa(n, color_1.default);
+        return isa(n, Color);
     },
     isnumber: function (n) {
-        return isa(n, dimension_1.default);
+        return isa(n, Dimension);
     },
     isstring: function (n) {
-        return isa(n, quoted_1.default);
+        return isa(n, Quoted);
     },
     iskeyword: function (n) {
-        return isa(n, keyword_1.default);
+        return isa(n, Keyword);
     },
     isurl: function (n) {
-        return isa(n, url_1.default);
+        return isa(n, URL);
     },
     ispixel: function (n) {
         return isunit(n, 'px');
@@ -48,27 +47,24 @@ exports.default = {
     isem: function (n) {
         return isunit(n, 'em');
     },
-    isunit: isunit,
+    isunit,
     unit: function (val, unit) {
-        if (!(val instanceof dimension_1.default)) {
+        if (!(val instanceof Dimension)) {
             throw { type: 'Argument',
-                message: "the first argument to unit must be a number".concat(val instanceof operation_1.default ? '. 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_1.default) {
+            if (unit instanceof Keyword) {
                 unit = unit.value;
-            }
-            else {
+            } else {
                 unit = unit.toCSS();
             }
-        }
-        else {
+        } else {
             unit = '';
         }
-        return new dimension_1.default(val.value, unit);
+        return new Dimension(val.value, unit);
     },
     'get-unit': function (n) {
-        return new anonymous_1.default(n.unit);
+        return new Anonymous(n.unit);
     }
 };
-//# sourceMappingURL=types.js.map