less 4.5.1 → 4.6.1

package/lib/less/tree/comment.js

@@ -1,27 +1,48 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var node_1 = tslib_1.__importDefault(require("./node"));
-var debug_info_1 = tslib_1.__importDefault(require("./debug-info"));
-var Comment = function (value, isLineComment, index, currentFileInfo) {
-    this.value = value;
-    this.isLineComment = isLineComment;
-    this._index = index;
-    this._fileInfo = currentFileInfo;
-    this.allowRoot = true;
-};
-Comment.prototype = Object.assign(new node_1.default(), {
-    type: 'Comment',
-    genCSS: function (context, output) {
+// @ts-check
+/** @import { EvalContext, CSSOutput, FileInfo } from './node.js' */
+/** @import { DebugInfoContext } from './debug-info.js' */
+import Node from './node.js';
+import getDebugInfo from './debug-info.js';
+
+class Comment extends Node {
+    get type() { return 'Comment'; }
+
+    /**
+     * @param {string} value
+     * @param {boolean} isLineComment
+     * @param {number} index
+     * @param {FileInfo} currentFileInfo
+     */
+    constructor(value, isLineComment, index, currentFileInfo) {
+        super();
+        this.value = value;
+        this.isLineComment = isLineComment;
+        this._index = index;
+        this._fileInfo = currentFileInfo;
+        this.allowRoot = true;
+        /** @type {{ lineNumber: number, fileName: string } | undefined} */
+        this.debugInfo = undefined;
+    }
+
+    /**
+     * @param {EvalContext} context
+     * @param {CSSOutput} output
+     */
+    genCSS(context, output) {
         if (this.debugInfo) {
-            output.add((0, debug_info_1.default)(context, this), this.fileInfo(), this.getIndex());
+            output.add(getDebugInfo(context, /** @type {DebugInfoContext} */ (this)), this.fileInfo(), this.getIndex());
         }
-        output.add(this.value);
-    },
-    isSilent: function (context) {
-        var isCompressed = context.compress && this.value[2] !== '!';
+        output.add(/** @type {string} */ (this.value));
+    }
+
+    /**
+     * @param {EvalContext} context
+     * @returns {boolean}
+     */
+    isSilent(context) {
+        const isCompressed = context.compress && /** @type {string} */ (this.value)[2] !== '!';
         return this.isLineComment || isCompressed;
     }
-});
-exports.default = Comment;
-//# sourceMappingURL=comment.js.map
+}
+
+export default Comment;

package/lib/less/tree/condition.js

@@ -1,40 +1,65 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var node_1 = tslib_1.__importDefault(require("./node"));
-var Condition = function (op, l, r, i, negate) {
-    this.op = op.trim();
-    this.lvalue = l;
-    this.rvalue = r;
-    this._index = i;
-    this.negate = negate;
-};
-Condition.prototype = Object.assign(new node_1.default(), {
-    type: 'Condition',
-    accept: function (visitor) {
+// @ts-check
+/** @import { EvalContext, TreeVisitor } from './node.js' */
+import Node from './node.js';
+
+class Condition extends Node {
+    get type() { return 'Condition'; }
+
+    /**
+     * @param {string} op
+     * @param {Node} l
+     * @param {Node} r
+     * @param {number} i
+     * @param {boolean} negate
+     */
+    constructor(op, l, r, i, negate) {
+        super();
+        this.op = op.trim();
+        this.lvalue = l;
+        this.rvalue = r;
+        this._index = i;
+        this.negate = negate;
+    }
+
+    /** @param {TreeVisitor} visitor */
+    accept(visitor) {
         this.lvalue = visitor.visit(this.lvalue);
         this.rvalue = visitor.visit(this.rvalue);
-    },
-    eval: function (context) {
-        var result = (function (op, a, b) {
-            switch (op) {
-                case 'and': return a && b;
-                case 'or': return a || b;
-                default:
-                    switch (node_1.default.compare(a, b)) {
-                        case -1:
-                            return op === '<' || op === '=<' || op === '<=';
-                        case 0:
-                            return op === '=' || op === '>=' || op === '=<' || op === '<=';
-                        case 1:
-                            return op === '>' || op === '>=';
-                        default:
-                            return false;
-                    }
-            }
-        })(this.op, this.lvalue.eval(context), this.rvalue.eval(context));
+    }
+
+    /**
+     * @param {EvalContext} context
+     * @returns {boolean}
+     * @suppress {checkTypes}
+     */
+    // @ts-ignore - Condition.eval returns boolean, not Node (used as guard condition)
+    eval(context) {
+        const a = this.lvalue.eval(context);
+        const b = this.rvalue.eval(context);
+        /** @type {boolean} */
+        let result;
+
+        switch (this.op) {
+            case 'and': result = Boolean(a && b); break;
+            case 'or':  result = Boolean(a || b); break;
+            default:
+                switch (Node.compare(a, b)) {
+                    case -1:
+                        result = this.op === '<' || this.op === '=<' || this.op === '<=';
+                        break;
+                    case 0:
+                        result = this.op === '=' || this.op === '>=' || this.op === '=<' || this.op === '<=';
+                        break;
+                    case 1:
+                        result = this.op === '>' || this.op === '>=';
+                        break;
+                    default:
+                        result = false;
+                }
+        }
+
         return this.negate ? !result : result;
     }
-});
-exports.default = Condition;
-//# sourceMappingURL=condition.js.map
+}
+
+export default Condition;

package/lib/less/tree/container.js

@@ -1,48 +1,104 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var ruleset_1 = tslib_1.__importDefault(require("./ruleset"));
-var value_1 = tslib_1.__importDefault(require("./value"));
-var selector_1 = tslib_1.__importDefault(require("./selector"));
-var atrule_1 = tslib_1.__importDefault(require("./atrule"));
-var nested_at_rule_1 = tslib_1.__importDefault(require("./nested-at-rule"));
-var Container = function (value, features, index, currentFileInfo, visibilityInfo) {
-    this._index = index;
-    this._fileInfo = currentFileInfo;
-    var selectors = (new selector_1.default([], null, null, this._index, this._fileInfo)).createEmptySelectors();
-    this.features = new value_1.default(features);
-    this.rules = [new ruleset_1.default(selectors, value)];
-    this.rules[0].allowImports = true;
-    this.copyVisibilityInfo(visibilityInfo);
-    this.allowRoot = true;
-    this.setParent(selectors, this);
-    this.setParent(this.features, this);
-    this.setParent(this.rules, this);
-};
-Container.prototype = Object.assign(new atrule_1.default(), tslib_1.__assign(tslib_1.__assign({ type: 'Container' }, nested_at_rule_1.default), { genCSS: function (context, output) {
+// @ts-check
+/** @import { EvalContext, CSSOutput, FileInfo, VisibilityInfo } from './node.js' */
+/** @import { FunctionRegistry, NestableAtRuleThis } from './nested-at-rule.js' */
+import Node from './node.js';
+import Ruleset from './ruleset.js';
+import Value from './value.js';
+import Selector from './selector.js';
+import AtRule from './atrule.js';
+import NestableAtRulePrototype from './nested-at-rule.js';
+
+/**
+ * @typedef {Ruleset & {
+ *   allowImports?: boolean,
+ *   debugInfo?: { lineNumber: number, fileName: string },
+ *   functionRegistry?: FunctionRegistry
+ * }} RulesetWithExtras
+ */
+
+class Container extends AtRule {
+    get type() { return 'Container'; }
+
+    /**
+     * @param {Node[] | null} value
+     * @param {Node[]} features
+     * @param {number} index
+     * @param {FileInfo} currentFileInfo
+     * @param {VisibilityInfo} visibilityInfo
+     */
+    constructor(value, features, index, currentFileInfo, visibilityInfo) {
+        super();
+        this._index = index;
+        this._fileInfo = currentFileInfo;
+
+        const selectors = (new Selector([], null, null, this._index, this._fileInfo)).createEmptySelectors();
+
+        /** @type {Value} */
+        this.features = new Value(features);
+        /** @type {RulesetWithExtras[]} */
+        this.rules = [new Ruleset(selectors, value)];
+        this.rules[0].allowImports = true;
+        this.copyVisibilityInfo(visibilityInfo);
+        this.allowRoot = true;
+        this.setParent(selectors, /** @type {Node} */ (/** @type {unknown} */ (this)));
+        this.setParent(this.features, /** @type {Node} */ (/** @type {unknown} */ (this)));
+        this.setParent(this.rules, /** @type {Node} */ (/** @type {unknown} */ (this)));
+
+        /** @type {boolean | undefined} */
+        this._evaluated = undefined;
+    }
+
+    /**
+     * @param {EvalContext} context
+     * @param {CSSOutput} output
+     */
+    genCSS(context, output) {
         output.add('@container ', this._fileInfo, this._index);
         this.features.genCSS(context, output);
         this.outputRuleset(context, output, this.rules);
-    }, eval: function (context) {
+    }
+
+    /**
+     * @param {EvalContext} context
+     * @returns {Node}
+     */
+    eval(context) {
+        if (this._evaluated) {
+            return /** @type {Node} */ (/** @type {unknown} */ (this));
+        }
         if (!context.mediaBlocks) {
             context.mediaBlocks = [];
             context.mediaPath = [];
         }
-        var media = new Container(null, [], this._index, this._fileInfo, this.visibilityInfo());
+
+        const media = new Container(null, [], this._index, this._fileInfo, this.visibilityInfo());
+        media._evaluated = true;
         if (this.debugInfo) {
             this.rules[0].debugInfo = this.debugInfo;
             media.debugInfo = this.debugInfo;
         }
-        media.features = this.features.eval(context);
-        context.mediaPath.push(media);
-        context.mediaBlocks.push(media);
-        this.rules[0].functionRegistry = context.frames[0].functionRegistry.inherit();
+
+        media.features = /** @type {Value} */ (this.features.eval(context));
+
+        context.mediaPath.push(/** @type {Node} */ (/** @type {unknown} */ (media)));
+        context.mediaBlocks.push(/** @type {Node} */ (/** @type {unknown} */ (media)));
+
+        const fr = /** @type {RulesetWithExtras} */ (context.frames[0]).functionRegistry;
+        if (fr) {
+            this.rules[0].functionRegistry = fr.inherit();
+        }
         context.frames.unshift(this.rules[0]);
-        media.rules = [this.rules[0].eval(context)];
+        media.rules = [/** @type {RulesetWithExtras} */ (this.rules[0].eval(context))];
         context.frames.shift();
+
         context.mediaPath.pop();
-        return context.mediaPath.length === 0 ? media.evalTop(context) :
-            media.evalNested(context);
-    } }));
-exports.default = Container;
-//# sourceMappingURL=container.js.map
+
+        return context.mediaPath.length === 0 ? /** @type {NestableAtRuleThis} */ (/** @type {unknown} */ (media)).evalTop(context) :
+            /** @type {NestableAtRuleThis} */ (/** @type {unknown} */ (media)).evalNested(context);
+    }
+}
+
+// Apply NestableAtRulePrototype methods (accept, isRulesetLike override AtRule's versions)
+Object.assign(Container.prototype, NestableAtRulePrototype);
+
+export default Container;

package/lib/less/tree/debug-info.js

@@ -1,41 +1,54 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+// @ts-check
+
+/**
+ * @typedef {object} DebugInfoData
+ * @property {number} lineNumber
+ * @property {string} fileName
+ */
+
+/**
+ * @typedef {object} DebugInfoContext
+ * @property {DebugInfoData} debugInfo
+ */
+
 /**
  * @deprecated The dumpLineNumbers option is deprecated. Use sourcemaps instead.
  * This will be removed in a future version.
  *
- * @param {Object} ctx - Context object with debugInfo
+ * @param {DebugInfoContext} ctx - Context object with debugInfo
  * @returns {string} Debug info as CSS comment
  */
 function asComment(ctx) {
-    return "/* line ".concat(ctx.debugInfo.lineNumber, ", ").concat(ctx.debugInfo.fileName, " */\n");
+    return `/* line ${ctx.debugInfo.lineNumber}, ${ctx.debugInfo.fileName} */\n`;
 }
+
 /**
  * @deprecated The dumpLineNumbers option is deprecated. Use sourcemaps instead.
  * This function generates Sass-compatible debug info using @media -sass-debug-info syntax.
  * This format had short-lived usage and is no longer recommended.
  * This will be removed in a future version.
  *
- * @param {Object} ctx - Context object with debugInfo
+ * @param {DebugInfoContext} ctx - Context object with debugInfo
  * @returns {string} Sass-compatible debug info as @media query
  */
 function asMediaQuery(ctx) {
-    var filenameWithProtocol = ctx.debugInfo.fileName;
+    let filenameWithProtocol = ctx.debugInfo.fileName;
     if (!/^[a-z]+:\/\//i.test(filenameWithProtocol)) {
-        filenameWithProtocol = "file://".concat(filenameWithProtocol);
+        filenameWithProtocol = `file://${filenameWithProtocol}`;
     }
-    return "@media -sass-debug-info{filename{font-family:".concat(filenameWithProtocol.replace(/([.:/\\])/g, function (a) {
+    return `@media -sass-debug-info{filename{font-family:${filenameWithProtocol.replace(/([.:/\\])/g, function (a) {
         if (a == '\\') {
             a = '/';
         }
-        return "\\".concat(a);
-    }), "}line{font-family:\\00003").concat(ctx.debugInfo.lineNumber, "}}\n");
+        return `\\${a}`;
+    })}}line{font-family:\\00003${ctx.debugInfo.lineNumber}}}\n`;
 }
+
 /**
  * Generates debug information (line numbers) for CSS output.
  *
- * @param {Object} context - Context object with dumpLineNumbers option
- * @param {Object} ctx - Context object with debugInfo
+ * @param {{ dumpLineNumbers?: string, compress?: boolean }} context - Context object with dumpLineNumbers option
+ * @param {DebugInfoContext} ctx - Context object with debugInfo
  * @param {string} [lineSeparator] - Separator between comment and media query (for 'all' mode)
  * @returns {string} Debug info string
  *
@@ -45,7 +58,7 @@ function asMediaQuery(ctx) {
  * which had short-lived usage and is no longer recommended.
  */
 function debugInfo(context, ctx, lineSeparator) {
-    var result = '';
+    let result = '';
     if (context.dumpLineNumbers && !context.compress) {
         switch (context.dumpLineNumbers) {
             case 'comments':
@@ -61,5 +74,5 @@ function debugInfo(context, ctx, lineSeparator) {
     }
     return result;
 }
-exports.default = debugInfo;
-//# sourceMappingURL=debug-info.js.map
+
+export default debugInfo;

package/lib/less/tree/declaration.js

@@ -1,58 +1,90 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var node_1 = tslib_1.__importDefault(require("./node"));
-var value_1 = tslib_1.__importDefault(require("./value"));
-var keyword_1 = tslib_1.__importDefault(require("./keyword"));
-var anonymous_1 = tslib_1.__importDefault(require("./anonymous"));
-var Constants = tslib_1.__importStar(require("../constants"));
-var MATH = Constants.Math;
+// @ts-check
+/** @import { EvalContext, CSSOutput, FileInfo } from './node.js' */
+import Node from './node.js';
+import Value from './value.js';
+import Keyword from './keyword.js';
+import Anonymous from './anonymous.js';
+import * as Constants from '../constants.js';
+const MATH = Constants.Math;
+
+/**
+ * @param {EvalContext} context
+ * @param {Node[]} name
+ * @returns {string}
+ */
 function evalName(context, name) {
-    var value = '';
-    var i;
-    var n = name.length;
-    var output = { add: function (s) { value += s; } };
+    let value = '';
+    let i;
+    const n = name.length;
+    /** @type {CSSOutput} */
+    const output = {add: function (s) {value += s;}, isEmpty: function() { return value === ''; }};
     for (i = 0; i < n; i++) {
         name[i].eval(context).genCSS(context, output);
     }
     return value;
 }
-var Declaration = function (name, value, important, merge, index, currentFileInfo, inline, variable) {
-    this.name = name;
-    this.value = (value instanceof node_1.default) ? value : new value_1.default([value ? new anonymous_1.default(value) : null]);
-    this.important = important ? " ".concat(important.trim()) : '';
-    this.merge = merge;
-    this._index = index;
-    this._fileInfo = currentFileInfo;
-    this.inline = inline || false;
-    this.variable = (variable !== undefined) ? variable
-        : (name.charAt && (name.charAt(0) === '@'));
-    this.allowRoot = true;
-    this.setParent(this.value, this);
-};
-Declaration.prototype = Object.assign(new node_1.default(), {
-    type: 'Declaration',
-    genCSS: function (context, output) {
-        output.add(this.name + (context.compress ? ':' : ': '), this.fileInfo(), this.getIndex());
+
+class Declaration extends Node {
+    get type() { return 'Declaration'; }
+
+    /**
+     * @param {string | Node[]} name
+     * @param {Node | string | null} value
+     * @param {string} [important]
+     * @param {string} [merge]
+     * @param {number} [index]
+     * @param {FileInfo} [currentFileInfo]
+     * @param {boolean} [inline]
+     * @param {boolean} [variable]
+     */
+    constructor(name, value, important, merge, index, currentFileInfo, inline, variable) {
+        super();
+        this.name = name;
+        this.value = (value instanceof Node) ? value : new Value([value ? new Anonymous(value) : null]);
+        this.important = important ? ` ${important.trim()}` : '';
+        /** @type {string | undefined} */
+        this.merge = merge;
+        this._index = index;
+        this._fileInfo = currentFileInfo;
+        /** @type {boolean} */
+        this.inline = inline || false;
+        /** @type {boolean} */
+        this.variable = (variable !== undefined) ? variable
+            : (typeof name === 'string' && name.charAt(0) === '@');
+        /** @type {boolean} */
+        this.allowRoot = true;
+        this.setParent(this.value, this);
+    }
+
+    /**
+     * @param {EvalContext} context
+     * @param {CSSOutput} output
+     */
+    genCSS(context, output) {
+        output.add(/** @type {string} */ (this.name) + (context.compress ? ':' : ': '), this.fileInfo(), this.getIndex());
         try {
-            this.value.genCSS(context, output);
+            /** @type {Node} */ (this.value).genCSS(context, output);
         }
         catch (e) {
-            e.index = this._index;
-            e.filename = this._fileInfo.filename;
+            const err = /** @type {{ index?: number, filename?: string }} */ (e);
+            err.index = this._index;
+            err.filename = this._fileInfo && this._fileInfo.filename;
             throw e;
         }
         output.add(this.important + ((this.inline || (context.lastRule && context.compress)) ? '' : ';'), this._fileInfo, this._index);
-    },
-    eval: function (context) {
-        var mathBypass = false, prevMath, name = this.name, evaldValue, variable = this.variable;
+    }
+
+    /** @param {EvalContext} context */
+    eval(context) {
+        let mathBypass = false, prevMath, name = this.name, evaldValue, variable = this.variable;
         if (typeof name !== 'string') {
             // expand 'primitive' name directly to get
             // things faster (~10% for benchmark.less):
-            name = (name.length === 1) && (name[0] instanceof keyword_1.default) ?
-                name[0].value : evalName(context, name);
+            name = (/** @type {Node[]} */ (name).length === 1) && (/** @type {Node[]} */ (name)[0] instanceof Keyword) ?
+                /** @type {string} */ (/** @type {Node[]} */ (name)[0].value) : evalName(context, /** @type {Node[]} */ (name));
             variable = false; // never treat expanded interpolation as new variable name
         }
+
         // @todo remove when parens-division is default
         if (name === 'font' && context.math === MATH.ALWAYS) {
             mathBypass = true;
@@ -61,22 +93,30 @@ Declaration.prototype = Object.assign(new node_1.default(), {
         }
         try {
             context.importantScope.push({});
-            evaldValue = this.value.eval(context);
+            evaldValue = /** @type {Node} */ (this.value).eval(context);
+
             if (!this.variable && evaldValue.type === 'DetachedRuleset') {
                 throw { message: 'Rulesets cannot be evaluated on a property.',
                     index: this.getIndex(), filename: this.fileInfo().filename };
             }
-            var important = this.important;
-            var importantResult = context.importantScope.pop();
-            if (!important && importantResult.important) {
+            let important = this.important;
+            const importantResult = context.importantScope.pop();
+            if (!important && importantResult && importantResult.important) {
                 important = importantResult.important;
             }
-            return new Declaration(name, evaldValue, important, this.merge, this.getIndex(), this.fileInfo(), this.inline, variable);
+
+            return new Declaration(/** @type {string} */ (name),
+                evaldValue,
+                important,
+                this.merge,
+                this.getIndex(), this.fileInfo(), this.inline,
+                variable);
         }
         catch (e) {
-            if (typeof e.index !== 'number') {
-                e.index = this.getIndex();
-                e.filename = this.fileInfo().filename;
+            const err = /** @type {{ index?: number, filename?: string }} */ (e);
+            if (typeof err.index !== 'number') {
+                err.index = this.getIndex();
+                err.filename = this.fileInfo().filename;
             }
             throw e;
         }
@@ -85,10 +125,15 @@ Declaration.prototype = Object.assign(new node_1.default(), {
                 context.math = prevMath;
             }
         }
-    },
-    makeImportant: function () {
-        return new Declaration(this.name, this.value, '!important', this.merge, this.getIndex(), this.fileInfo(), this.inline);
     }
-});
-exports.default = Declaration;
-//# sourceMappingURL=declaration.js.map
+
+    makeImportant() {
+        return new Declaration(this.name,
+            /** @type {Node} */ (this.value),
+            '!important',
+            this.merge,
+            this.getIndex(), this.fileInfo(), this.inline);
+    }
+}
+
+export default Declaration;