less 4.9.0 → 5.0.0-alpha.2

package/lib/less/functions/color.js

@@ -1,452 +0,0 @@
-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 Expression from '../tree/expression.js';
-import Operation from '../tree/operation.js';
-let colorFunctions;
-
-function clamp(val) {
-    return Math.min(1, Math.max(0, val));
-}
-function hsla(origColor, hsl) {
-    const 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 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);
-    } else if (typeof n === 'number') {
-        return n;
-    } else {
-        throw {
-            type: 'Argument',
-            message: 'color functions take numbers as parameters'
-        };
-    }
-}
-function scaled(n, size) {
-    if (n instanceof Dimension && n.unit.is('%')) {
-        return parseFloat(n.value * size / 100);
-    } else {
-        return number(n);
-    }
-}
-colorFunctions = {
-    rgb: function (r, g, b) {
-        let a = 1
-        /**
-         * Comma-less syntax
-         *   e.g. rgb(0 128 255 / 50%)
-         */
-        if (r instanceof Expression) {
-            const val = r.value
-            r = val[0]
-            g = val[1]
-            b = val[2]
-            /** 
-             * @todo - should this be normalized in
-             *   function caller? Or parsed differently?
-             */
-            if (b instanceof Operation) {
-                const op = b
-                b = op.operands[0]
-                a = op.operands[1]
-            }
-        }
-        const color = colorFunctions.rgba(r, g, b, a);
-        if (color) {
-            color.value = 'rgb';
-            return color;
-        }
-    },
-    rgba: function (r, g, b, a) {
-        try {
-            if (r instanceof Color) {
-                if (g) {
-                    a = number(g);
-                } else {
-                    a = r.alpha;
-                }
-                return new Color(r.rgb, a, 'rgba');
-            }
-            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) {
-        let a = 1
-        if (h instanceof Expression) {
-            const val = h.value
-            h = val[0]
-            s = val[1]
-            l = val[2]
-
-            if (l instanceof Operation) {
-                const op = l
-                l = op.operands[0]
-                a = op.operands[1]
-            }
-        }
-        const color = colorFunctions.hsla(h, s, l, a);
-        if (color) {
-            color.value = 'hsl';
-            return color;
-        }
-    },
-    hsla: function (h, s, l, a) {
-        let m1;
-        let 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;
-            }
-        }
-
-        try {
-            if (h instanceof Color) {
-                if (s) {
-                    a = number(s);
-                } else {
-                    a = h.alpha;
-                }
-                return new Color(h.rgb, a, 'hsla');
-            }
-
-            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;
-
-            const 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) {
-        return colorFunctions.hsva(h, s, v, 1.0);
-    },
-
-    hsva: function(h, s, v, a) {
-        h = ((number(h) % 360) / 360) * 360;
-        s = number(s);v = number(v);a = number(a);
-
-        let i;
-        let f;
-        i = Math.floor((h / 60) % 6);
-        f = (h / 60) - i;
-
-        const vs = [v,
-            v * (1 - s),
-            v * (1 - f * s),
-            v * (1 - (1 - f) * s)];
-        const perm = [[0, 3, 1],
-            [2, 0, 1],
-            [1, 0, 3],
-            [1, 2, 0],
-            [3, 1, 0],
-            [0, 1, 2]];
-
-        return colorFunctions.rgba(vs[perm[i][0]] * 255,
-            vs[perm[i][1]] * 255,
-            vs[perm[i][2]] * 255,
-            a);
-    },
-
-    hue: function (color) {
-        return new Dimension(toHSL(color).h);
-    },
-    saturation: function (color) {
-        return new Dimension(toHSL(color).s * 100, '%');
-    },
-    lightness: function (color) {
-        return new Dimension(toHSL(color).l * 100, '%');
-    },
-    hsvhue: function(color) {
-        return new Dimension(toHSV(color).h);
-    },
-    hsvsaturation: function (color) {
-        return new Dimension(toHSV(color).s * 100, '%');
-    },
-    hsvvalue: function (color) {
-        return new Dimension(toHSV(color).v * 100, '%');
-    },
-    red: function (color) {
-        return new Dimension(color.rgb[0]);
-    },
-    green: function (color) {
-        return new Dimension(color.rgb[1]);
-    },
-    blue: function (color) {
-        return new Dimension(color.rgb[2]);
-    },
-    alpha: function (color) {
-        return new Dimension(toHSL(color).a);
-    },
-    luma: function (color) {
-        return new Dimension(color.luma() * color.alpha * 100, '%');
-    },
-    luminance: function (color) {
-        const luminance =
-            (0.2126 * color.rgb[0] / 255) +
-                (0.7152 * color.rgb[1] / 255) +
-                (0.0722 * color.rgb[2] / 255);
-
-        return new Dimension(luminance * color.alpha * 100, '%');
-    },
-    saturate: function (color, amount, method) {
-        // filter: saturate(3.2);
-        // should be kept as is, so check for color
-        if (!color.rgb) {
-            return null;
-        }
-        const hsl = toHSL(color);
-
-        if (typeof method !== 'undefined' && method.value === 'relative') {
-            hsl.s +=  hsl.s * amount.value / 100;
-        }
-        else {
-            hsl.s += amount.value / 100;
-        }
-        hsl.s = clamp(hsl.s);
-        return hsla(color, hsl);
-    },
-    desaturate: function (color, amount, method) {
-        const hsl = toHSL(color);
-
-        if (typeof method !== 'undefined' && method.value === 'relative') {
-            hsl.s -=  hsl.s * amount.value / 100;
-        }
-        else {
-            hsl.s -= amount.value / 100;
-        }
-        hsl.s = clamp(hsl.s);
-        return hsla(color, hsl);
-    },
-    lighten: function (color, amount, method) {
-        const hsl = toHSL(color);
-
-        if (typeof method !== 'undefined' && method.value === 'relative') {
-            hsl.l +=  hsl.l * amount.value / 100;
-        }
-        else {
-            hsl.l += amount.value / 100;
-        }
-        hsl.l = clamp(hsl.l);
-        return hsla(color, hsl);
-    },
-    darken: function (color, amount, method) {
-        const hsl = toHSL(color);
-
-        if (typeof method !== 'undefined' && method.value === 'relative') {
-            hsl.l -=  hsl.l * amount.value / 100;
-        }
-        else {
-            hsl.l -= amount.value / 100;
-        }
-        hsl.l = clamp(hsl.l);
-        return hsla(color, hsl);
-    },
-    fadein: function (color, amount, method) {
-        const hsl = toHSL(color);
-
-        if (typeof method !== 'undefined' && method.value === 'relative') {
-            hsl.a +=  hsl.a * amount.value / 100;
-        }
-        else {
-            hsl.a += amount.value / 100;
-        }
-        hsl.a = clamp(hsl.a);
-        return hsla(color, hsl);
-    },
-    fadeout: function (color, amount, method) {
-        const hsl = toHSL(color);
-
-        if (typeof method !== 'undefined' && method.value === 'relative') {
-            hsl.a -=  hsl.a * amount.value / 100;
-        }
-        else {
-            hsl.a -= amount.value / 100;
-        }
-        hsl.a = clamp(hsl.a);
-        return hsla(color, hsl);
-    },
-    fade: function (color, amount) {
-        const hsl = toHSL(color);
-
-        hsl.a = amount.value / 100;
-        hsl.a = clamp(hsl.a);
-        return hsla(color, hsl);
-    },
-    spin: function (color, amount) {
-        const hsl = toHSL(color);
-        const hue = (hsl.h + amount.value) % 360;
-
-        hsl.h = hue < 0 ? 360 + hue : hue;
-
-        return hsla(color, hsl);
-    },
-    //
-    // Copyright (c) 2006-2009 Hampton Catlin, Natalie Weizenbaum, and Chris Eppstein
-    // http://sass-lang.com
-    //
-    mix: function (color1, color2, weight) {
-        if (!weight) {
-            weight = new Dimension(50);
-        }
-        const p = weight.value / 100.0;
-        const w = p * 2 - 1;
-        const a = toHSL(color1).a - toHSL(color2).a;
-
-        const w1 = (((w * a == -1) ? w : (w + a) / (1 + w * a)) + 1) / 2.0;
-        const w2 = 1 - w1;
-
-        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];
-
-        const alpha = color1.alpha * p + color2.alpha * (1 - p);
-
-        return new Color(rgb, alpha);
-    },
-    greyscale: function (color) {
-        return colorFunctions.desaturate(color, new Dimension(100));
-    },
-    contrast: function (color, dark, light, threshold) {
-        // filter: contrast(3.2);
-        // should be kept as is, so check for color
-        if (!color.rgb) {
-            return null;
-        }
-        if (typeof light === 'undefined') {
-            light = colorFunctions.rgba(255, 255, 255, 1.0);
-        }
-        if (typeof dark === 'undefined') {
-            dark = colorFunctions.rgba(0, 0, 0, 1.0);
-        }
-        // Figure out which is actually light and dark:
-        if (dark.luma() > light.luma()) {
-            const t = light;
-            light = dark;
-            dark = t;
-        }
-        if (typeof threshold === 'undefined') {
-            threshold = 0.43;
-        } else {
-            threshold = number(threshold);
-        }
-        if (color.luma() < threshold) {
-            return light;
-        } else {
-            return dark;
-        }
-    },
-    // Changes made in 2.7.0 - Reverted in 3.0.0
-    // contrast: function (color, color1, color2, threshold) {
-    //     // Return which of `color1` and `color2` has the greatest contrast with `color`
-    //     // according to the standard WCAG contrast ratio calculation.
-    //     // http://www.w3.org/TR/WCAG20/#contrast-ratiodef
-    //     // The threshold param is no longer used, in line with SASS.
-    //     // filter: contrast(3.2);
-    //     // should be kept as is, so check for color
-    //     if (!color.rgb) {
-    //         return null;
-    //     }
-    //     if (typeof color1 === 'undefined') {
-    //         color1 = colorFunctions.rgba(0, 0, 0, 1.0);
-    //     }
-    //     if (typeof color2 === 'undefined') {
-    //         color2 = colorFunctions.rgba(255, 255, 255, 1.0);
-    //     }
-    //     var contrast1, contrast2;
-    //     var luma = color.luma();
-    //     var luma1 = color1.luma();
-    //     var luma2 = color2.luma();
-    //     // Calculate contrast ratios for each color
-    //     if (luma > luma1) {
-    //         contrast1 = (luma + 0.05) / (luma1 + 0.05);
-    //     } else {
-    //         contrast1 = (luma1 + 0.05) / (luma + 0.05);
-    //     }
-    //     if (luma > luma2) {
-    //         contrast2 = (luma + 0.05) / (luma2 + 0.05);
-    //     } else {
-    //         contrast2 = (luma2 + 0.05) / (luma + 0.05);
-    //     }
-    //     if (contrast1 > contrast2) {
-    //         return color1;
-    //     } else {
-    //         return color2;
-    //     }
-    // },
-    argb: function (color) {
-        return new Anonymous(color.toARGB());
-    },
-    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))) {
-            const val = c.value.slice(1);
-            return new Color(val, undefined, `#${val}`);
-        }
-        if ((c instanceof Color) || (c = Color.fromKeyword(c.value))) {
-            c.value = undefined;
-            return c;
-        }
-        throw {
-            type:    'Argument',
-            message: 'argument must be a color keyword or 3|4|6|8 digit hex e.g. #FFF'
-        };
-    },
-    tint: function(color, amount) {
-        return colorFunctions.mix(colorFunctions.rgb(255, 255, 255), color, amount);
-    },
-    shade: function(color, amount) {
-        return colorFunctions.mix(colorFunctions.rgb(0, 0, 0), color, amount);
-    }
-};
-
-export default colorFunctions;

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

@@ -1,74 +0,0 @@
-import Quoted from '../tree/quoted.js';
-import URL from '../tree/url.js';
-import * as utils from '../utils.js';
-import logger from '../logger.js';
-
-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;
-        }
-
-        let mimetype = mimetypeNode && mimetypeNode.value;
-        let filePath = filePathNode.value;
-        const currentFileInfo = this.currentFileInfo;
-        const currentDirectory = currentFileInfo.rewriteUrls ?
-            currentFileInfo.currentDirectory : currentFileInfo.entryPath;
-
-        const fragmentStart = filePath.indexOf('#');
-        let fragment = '';
-        if (fragmentStart !== -1) {
-            fragment = filePath.slice(fragmentStart);
-            filePath = filePath.slice(0, fragmentStart);
-        }
-        const context = utils.clone(this.context);
-        context.rawBuffer = true;
-
-        const fileManager = environment.getFileManager(filePath, currentDirectory, context, environment, true);
-
-        if (!fileManager) {
-            return fallback(this, filePathNode);
-        }
-
-        let useBase64 = false;
-
-        // detect the mimetype if not given
-        if (!mimetypeNode) {
-
-            mimetype = environment.mimeLookup(filePath);
-
-            if (mimetype === 'image/svg+xml') {
-                useBase64 = false;
-            } else {
-                // use base 64 unless it's an ASCII or UTF-8 format
-                const charset = environment.charsetLookup(mimetype);
-                useBase64 = ['US-ASCII', 'UTF-8'].indexOf(charset) < 0;
-            }
-            if (useBase64) { mimetype += ';base64'; }
-        }
-        else {
-            useBase64 = /;base64$/.test(mimetype);
-        }
-
-        const fileSync = fileManager.loadFileSync(filePath, currentDirectory, context, environment);
-        if (!fileSync.contents) {
-            logger.warn(`Skipped data-uri embedding of ${filePath} because file not found`);
-            return fallback(this, filePathNode || mimetypeNode);
-        }
-        let buf = fileSync.contents;
-        if (useBase64 && !environment.encodeBase64) {
-            return fallback(this, filePathNode);
-        }
-
-        buf = useBase64 ? environment.encodeBase64(buf) : encodeURIComponent(buf);
-
-        const uri = `data:${mimetype},${buf}${fragment}`;
-
-        return new URL(new Quoted(`"${uri}"`, uri, false, this.index, this.currentFileInfo), this.index, this.currentFileInfo);
-    }};
-};

package/lib/less/functions/default.js

@@ -1,26 +0,0 @@
-import Keyword from '../tree/keyword.js';
-import * as utils from '../utils.js';
-
-const defaultFunc = {
-    eval: function () {
-        const v = this.value_;
-        const e = this.error_;
-        if (e) {
-            throw e;
-        }
-        if (!utils.isNullOrUndefined(v)) {
-            return v ? Keyword.True : Keyword.False;
-        }
-    },
-    value: function (v) {
-        this.value_ = v;
-    },
-    error: function (e) {
-        this.error_ = e;
-    },
-    reset: function () {
-        this.value_ = this.error_ = null;
-    }
-};
-
-export default defaultFunc;

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

@@ -1,55 +0,0 @@
-import Expression from '../tree/expression.js';
-
-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);
-    }
-
-    isValid() {
-        return Boolean(this.func);
-    }
-
-    call(args) {
-        if (!(Array.isArray(args))) {
-            args = [args];
-        }
-        const evalArgs = this.func.evalArgs;
-        if (evalArgs !== false) {
-            args = args.map(a => a.eval(this.context));
-        }
-        const commentFilter = item => !(item.type === 'Comment');
-
-        // This code is terrible and should be replaced as per this issue...
-        // https://github.com/less/less.js/issues/2477
-        args = args
-            .filter(commentFilter)
-            .map(item => {
-                if (item.type === 'Expression') {
-                    const subNodes = item.value.filter(commentFilter);
-                    if (subNodes.length === 1) {
-                        // https://github.com/less/less.js/issues/3616
-                        if (item.parens && subNodes[0].op === '/') {
-                            return item;
-                        }
-                        return subNodes[0];
-                    } else {
-                        return new Expression(subNodes);
-                    }
-                }
-                return item;
-            });
-
-        if (evalArgs === false) {
-            return this.func(this.context, ...args);
-        }
-
-        return this.func(...args);
-    }
-}
-
-export default functionCaller;

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

@@ -1,36 +0,0 @@
-function makeRegistry( base ) {
-    return {
-        _data: {},
-        add: function(name, func) {
-            // precautionary case conversion, as later querying of
-            // the registry by function-caller uses lower case as well.
-            name = name.toLowerCase();
-
-            // eslint-disable-next-line no-prototype-builtins
-            if (this._data.hasOwnProperty(name)) {
-                // TODO warn
-            }
-            this._data[name] = func;
-        },
-        addMultiple: function(functions) {
-            Object.keys(functions).forEach(
-                name => {
-                    this.add(name, functions[name]);
-                });
-        },
-        get: function(name) {
-            return this._data[name] || ( base && base.get( name ));
-        },
-        getLocalFunctions: function() {
-            return this._data;
-        },
-        inherit: function() {
-            return makeRegistry( this );
-        },
-        create: function(base) {
-            return makeRegistry(base);
-        }
-    };
-}
-
-export default makeRegistry( null );

package/lib/less/functions/index.js

@@ -1,35 +0,0 @@
-import functionRegistry from './function-registry.js';
-import functionCaller from './function-caller.js';
-
-import boolean from './boolean.js';
-import defaultFunc from './default.js';
-import color from './color.js';
-import colorBlending from './color-blending.js';
-import dataUri from './data-uri.js';
-import list from './list.js';
-import math from './math.js';
-import number from './number.js';
-import string from './string.js';
-import svg from './svg.js';
-import types from './types.js';
-import style from './style.js';
-
-export default environment => {
-    const functions = { functionRegistry, functionCaller };
-
-    // register functions
-    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);
-    functionRegistry.addMultiple(style);
-
-    return functions;
-};