less 4.4.2 → 4.6.0

package/lib/less/visitors/to-css-visitor.js

@@ -1,23 +1,23 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
 /* eslint-disable no-unused-vars */
 /**
  * @todo - Remove unused when JSDoc types are added for visitor methods
  */
-var tree_1 = tslib_1.__importDefault(require("../tree"));
-var visitor_1 = tslib_1.__importDefault(require("./visitor"));
-var CSSVisitorUtils = /** @class */ (function () {
-    function CSSVisitorUtils(context) {
-        this._visitor = new visitor_1.default(this);
+import tree from '../tree/index.js';
+import Visitor from './visitor.js';
+import mergeRules from '../tree/merge-rules.js';
+
+class CSSVisitorUtils {
+    constructor(context) {
+        this._visitor = new Visitor(this);
         this._context = context;
     }
-    CSSVisitorUtils.prototype.containsSilentNonBlockedChild = function (bodyRules) {
-        var rule;
+
+    containsSilentNonBlockedChild(bodyRules) {
+        let rule;
         if (!bodyRules) {
             return false;
         }
-        for (var r = 0; r < bodyRules.length; r++) {
+        for (let r = 0; r < bodyRules.length; r++) {
             rule = bodyRules[r];
             if (rule.isSilent && rule.isSilent(this._context) && !rule.blocksVisibility()) {
                 // the atrule contains something that was referenced (likely by extend)
@@ -26,141 +26,169 @@ var CSSVisitorUtils = /** @class */ (function () {
             }
         }
         return false;
-    };
-    CSSVisitorUtils.prototype.keepOnlyVisibleChilds = function (owner) {
+    }
+
+    keepOnlyVisibleChilds(owner) {
         if (owner && owner.rules) {
-            owner.rules = owner.rules.filter(function (thing) { return thing.isVisible(); });
+            owner.rules = owner.rules.filter(thing => thing.isVisible());
         }
-    };
-    CSSVisitorUtils.prototype.isEmpty = function (owner) {
-        return (owner && owner.rules)
+    }
+
+    isEmpty(owner) {
+        return (owner && owner.rules) 
             ? (owner.rules.length === 0) : true;
-    };
-    CSSVisitorUtils.prototype.hasVisibleSelector = function (rulesetNode) {
+    }
+
+    hasVisibleSelector(rulesetNode) {
         return (rulesetNode && rulesetNode.paths)
             ? (rulesetNode.paths.length > 0) : false;
-    };
-    CSSVisitorUtils.prototype.resolveVisibility = function (node) {
+    }
+
+    resolveVisibility(node) {
         if (!node.blocksVisibility()) {
             if (this.isEmpty(node)) {
-                return;
+                return ;
             }
+
             return node;
         }
-        var compiledRulesBody = node.rules[0];
+
+        const compiledRulesBody = node.rules[0];
         this.keepOnlyVisibleChilds(compiledRulesBody);
+
         if (this.isEmpty(compiledRulesBody)) {
-            return;
+            return ;
         }
+
         node.ensureVisibility();
         node.removeVisibilityBlock();
+
         return node;
-    };
-    CSSVisitorUtils.prototype.isVisibleRuleset = function (rulesetNode) {
+    }
+
+    isVisibleRuleset(rulesetNode) {
         if (rulesetNode.firstRoot) {
             return true;
         }
+
         if (this.isEmpty(rulesetNode)) {
             return false;
         }
+
         if (!rulesetNode.root && !this.hasVisibleSelector(rulesetNode)) {
             return false;
         }
+
         return true;
-    };
-    return CSSVisitorUtils;
-}());
-var ToCSSVisitor = function (context) {
-    this._visitor = new visitor_1.default(this);
+    }
+}
+
+const ToCSSVisitor = function(context) {
+    this._visitor = new Visitor(this);
     this._context = context;
     this.utils = new CSSVisitorUtils(context);
 };
+
 ToCSSVisitor.prototype = {
     isReplacing: true,
     run: function (root) {
         return this._visitor.visit(root);
     },
+
     visitDeclaration: function (declNode, visitArgs) {
         if (declNode.blocksVisibility() || declNode.variable) {
             return;
         }
         return declNode;
     },
+
     visitMixinDefinition: function (mixinNode, visitArgs) {
         // mixin definitions do not get eval'd - this means they keep state
         // so we have to clear that state here so it isn't used if toCSS is called twice
         mixinNode.frames = [];
     },
+
     visitExtend: function (extendNode, visitArgs) {
     },
+
     visitComment: function (commentNode, visitArgs) {
         if (commentNode.blocksVisibility() || commentNode.isSilent(this._context)) {
             return;
         }
         return commentNode;
     },
-    visitMedia: function (mediaNode, visitArgs) {
-        var originalRules = mediaNode.rules[0].rules;
+
+    visitMedia: function(mediaNode, visitArgs) {
+        const originalRules = mediaNode.rules[0].rules;
         mediaNode.accept(this._visitor);
         visitArgs.visitDeeper = false;
+
         return this.utils.resolveVisibility(mediaNode, originalRules);
     },
+
     visitImport: function (importNode, visitArgs) {
         if (importNode.blocksVisibility()) {
-            return;
+            return ;
         }
         return importNode;
     },
-    visitAtRule: function (atRuleNode, visitArgs) {
+
+    visitAtRule: function(atRuleNode, visitArgs) {
         if (atRuleNode.rules && atRuleNode.rules.length) {
             return this.visitAtRuleWithBody(atRuleNode, visitArgs);
-        }
-        else {
+        } else {
             return this.visitAtRuleWithoutBody(atRuleNode, visitArgs);
         }
     },
-    visitAnonymous: function (anonymousNode, visitArgs) {
+
+    visitAnonymous: function(anonymousNode, visitArgs) {
         if (!anonymousNode.blocksVisibility()) {
             anonymousNode.accept(this._visitor);
             return anonymousNode;
         }
     },
-    visitAtRuleWithBody: function (atRuleNode, visitArgs) {
+
+    visitAtRuleWithBody: function(atRuleNode, visitArgs) {
         // if there is only one nested ruleset and that one has no path, then it is
         // just fake ruleset
         function hasFakeRuleset(atRuleNode) {
-            var bodyRules = atRuleNode.rules;
+            const bodyRules = atRuleNode.rules;
             return bodyRules.length === 1 && (!bodyRules[0].paths || bodyRules[0].paths.length === 0);
         }
         function getBodyRules(atRuleNode) {
-            var nodeRules = atRuleNode.rules;
+            const nodeRules = atRuleNode.rules;
             if (hasFakeRuleset(atRuleNode)) {
                 return nodeRules[0].rules;
             }
+
             return nodeRules;
         }
         // it is still true that it is only one ruleset in array
         // this is last such moment
         // process childs
-        var originalRules = getBodyRules(atRuleNode);
+        const originalRules = getBodyRules(atRuleNode);
         atRuleNode.accept(this._visitor);
         visitArgs.visitDeeper = false;
+
         if (!this.utils.isEmpty(atRuleNode)) {
             this._mergeRules(atRuleNode.rules[0].rules);
         }
+
         return this.utils.resolveVisibility(atRuleNode, originalRules);
     },
-    visitAtRuleWithoutBody: function (atRuleNode, visitArgs) {
+
+    visitAtRuleWithoutBody: function(atRuleNode, visitArgs) {
         if (atRuleNode.blocksVisibility()) {
             return;
         }
+
         if (atRuleNode.name === '@charset') {
             // Only output the debug info together with subsequent @charset definitions
             // a comment (or @media statement) before the actual @charset atrule would
             // be considered illegal css as it has to be on the first line
             if (this.charset) {
                 if (atRuleNode.debugInfo) {
-                    var comment = new tree_1.default.Comment("/* ".concat(atRuleNode.toCSS(this._context).replace(/\n/g, ''), " */\n"));
+                    const comment = new tree.Comment(`/* ${atRuleNode.toCSS(this._context).replace(/\n/g, '')} */\n`);
                     comment.debugInfo = atRuleNode.debugInfo;
                     return this._visitor.visit(comment);
                 }
@@ -168,40 +196,49 @@ ToCSSVisitor.prototype = {
             }
             this.charset = true;
         }
+
         return atRuleNode;
     },
-    checkValidNodes: function (rules, isRoot) {
+
+    checkValidNodes: function(rules, isRoot) {
         if (!rules) {
             return;
         }
-        for (var i = 0; i < rules.length; i++) {
-            var ruleNode = rules[i];
-            if (isRoot && ruleNode instanceof tree_1.default.Declaration && !ruleNode.variable) {
+
+        for (let i = 0; i < rules.length; i++) {
+            const ruleNode = rules[i];
+            if (isRoot && ruleNode instanceof tree.Declaration && !ruleNode.variable) {
                 throw { message: 'Properties must be inside selector blocks. They cannot be in the root',
-                    index: ruleNode.getIndex(), filename: ruleNode.fileInfo() && ruleNode.fileInfo().filename };
+                    index: ruleNode.getIndex(), filename: ruleNode.fileInfo() && ruleNode.fileInfo().filename};
             }
-            if (ruleNode instanceof tree_1.default.Call) {
-                throw { message: "Function '".concat(ruleNode.name, "' did not return a root node"),
-                    index: ruleNode.getIndex(), filename: ruleNode.fileInfo() && ruleNode.fileInfo().filename };
+            if (ruleNode instanceof tree.Call) {
+                throw { message: `Function '${ruleNode.name}' did not return a root node`,
+                    index: ruleNode.getIndex(), filename: ruleNode.fileInfo() && ruleNode.fileInfo().filename};
             }
             if (ruleNode.type && !ruleNode.allowRoot) {
-                throw { message: "".concat(ruleNode.type, " node returned by a function is not valid here"),
-                    index: ruleNode.getIndex(), filename: ruleNode.fileInfo() && ruleNode.fileInfo().filename };
+                throw { message: `${ruleNode.type} node returned by a function is not valid here`,
+                    index: ruleNode.getIndex(), filename: ruleNode.fileInfo() && ruleNode.fileInfo().filename};
             }
         }
     },
+
     visitRuleset: function (rulesetNode, visitArgs) {
         // at this point rulesets are nested into each other
-        var rule;
-        var rulesets = [];
+        let rule;
+
+        const rulesets = [];
+
         this.checkValidNodes(rulesetNode.rules, rulesetNode.firstRoot);
+
         if (!rulesetNode.root) {
             // remove invisible paths
             this._compileRulesetPaths(rulesetNode);
+
             // remove rulesets from this ruleset body and compile them separately
-            var nodeRules = rulesetNode.rules;
-            var nodeRuleCnt = nodeRules ? nodeRules.length : 0;
-            for (var i = 0; i < nodeRuleCnt;) {
+            const nodeRules = rulesetNode.rules;
+
+            let nodeRuleCnt = nodeRules ? nodeRules.length : 0;
+            for (let i = 0; i < nodeRuleCnt; ) {
                 rule = nodeRules[i];
                 if (rule && rule.rules) {
                     // visit because we are moving them out from being a child
@@ -217,109 +254,79 @@ ToCSSVisitor.prototype = {
             // compile body
             if (nodeRuleCnt > 0) {
                 rulesetNode.accept(this._visitor);
-            }
-            else {
+            } else {
                 rulesetNode.rules = null;
             }
             visitArgs.visitDeeper = false;
-        }
-        else { // if (! rulesetNode.root) {
+        } else { // if (! rulesetNode.root) {
             rulesetNode.accept(this._visitor);
             visitArgs.visitDeeper = false;
         }
+
         if (rulesetNode.rules) {
             this._mergeRules(rulesetNode.rules);
             this._removeDuplicateRules(rulesetNode.rules);
         }
+
         // now decide whether we keep the ruleset
         if (this.utils.isVisibleRuleset(rulesetNode)) {
             rulesetNode.ensureVisibility();
             rulesets.splice(0, 0, rulesetNode);
         }
+
         if (rulesets.length === 1) {
             return rulesets[0];
         }
         return rulesets;
     },
-    _compileRulesetPaths: function (rulesetNode) {
+
+    _compileRulesetPaths: function(rulesetNode) {
         if (rulesetNode.paths) {
             rulesetNode.paths = rulesetNode.paths
-                .filter(function (p) {
-                var i;
-                if (p[0].elements[0].combinator.value === ' ') {
-                    p[0].elements[0].combinator = new (tree_1.default.Combinator)('');
-                }
-                for (i = 0; i < p.length; i++) {
-                    if (p[i].isVisible() && p[i].getIsOutput()) {
-                        return true;
+                .filter(p => {
+                    let i;
+                    if (p[0].elements[0].combinator.value === ' ') {
+                        p[0].elements[0].combinator = new(tree.Combinator)('');
                     }
-                }
-                return false;
-            });
+                    for (i = 0; i < p.length; i++) {
+                        if (p[i].isVisible() && p[i].getIsOutput()) {
+                            return true;
+                        }
+                    }
+                    return false;
+                });
         }
     },
-    _removeDuplicateRules: function (rules) {
-        if (!rules) {
-            return;
-        }
+
+    _removeDuplicateRules: function(rules) {
+        if (!rules) { return; }
+
         // remove duplicates
-        var ruleCache = {};
-        var ruleList;
-        var rule;
-        var i;
-        for (i = rules.length - 1; i >= 0; i--) {
-            rule = rules[i];
-            if (rule instanceof tree_1.default.Declaration) {
-                if (!ruleCache[rule.name]) {
+        const ruleCache = {};
+
+        for (let i = rules.length - 1; i >= 0 ; i--) {
+            let rule = rules[i];
+            if (rule instanceof tree.Declaration) {
+                if (!Object.prototype.hasOwnProperty.call(ruleCache, rule.name)) {
                     ruleCache[rule.name] = rule;
-                }
-                else {
-                    ruleList = ruleCache[rule.name];
-                    if (ruleList instanceof tree_1.default.Declaration) {
-                        ruleList = ruleCache[rule.name] = [ruleCache[rule.name].toCSS(this._context)];
+                } else {
+                    let ruleList = ruleCache[rule.name];
+                    if (!Array.isArray(ruleList)) {
+                        const prevRuleCSS = ruleList.toCSS(this._context);
+                        ruleList = ruleCache[rule.name] = [prevRuleCSS];
                     }
-                    var ruleCSS = rule.toCSS(this._context);
+                    const ruleCSS = rule.toCSS(this._context);
                     if (ruleList.indexOf(ruleCSS) !== -1) {
                         rules.splice(i, 1);
-                    }
-                    else {
+                    } else {
                         ruleList.push(ruleCSS);
                     }
                 }
             }
         }
     },
-    _mergeRules: function (rules) {
-        if (!rules) {
-            return;
-        }
-        var groups = {};
-        var groupsArr = [];
-        for (var i = 0; i < rules.length; i++) {
-            var rule = rules[i];
-            if (rule.merge) {
-                var key = rule.name;
-                groups[key] ? rules.splice(i--, 1) :
-                    groupsArr.push(groups[key] = []);
-                groups[key].push(rule);
-            }
-        }
-        groupsArr.forEach(function (group) {
-            if (group.length > 0) {
-                var result_1 = group[0];
-                var space_1 = [];
-                var comma_1 = [new tree_1.default.Expression(space_1)];
-                group.forEach(function (rule) {
-                    if ((rule.merge === '+') && (space_1.length > 0)) {
-                        comma_1.push(new tree_1.default.Expression(space_1 = []));
-                    }
-                    space_1.push(rule.value);
-                    result_1.important = result_1.important || rule.important;
-                });
-                result_1.value = new tree_1.default.Value(comma_1);
-            }
-        });
-    }
+
+    _mergeRules: mergeRules
 };
-exports.default = ToCSSVisitor;
-//# sourceMappingURL=to-css-visitor.js.map
+
+export default ToCSSVisitor;

package/lib/less/visitors/visitor.js

@@ -1,16 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-var tslib_1 = require("tslib");
-var tree_1 = tslib_1.__importDefault(require("../tree"));
-var _visitArgs = { visitDeeper: true };
-var _hasIndexed = false;
+import tree from '../tree/index.js';
+
+const _visitArgs = { visitDeeper: true };
+let _hasIndexed = false;
+
 function _noop(node) {
     return node;
 }
+
 function indexNodeTypes(parent, ticker) {
     // add .typeIndex to tree node types for lookup table
-    var key, child;
-    for (key in parent) {
+    let key, child;
+    for (key in parent) { 
         /* eslint guard-for-in: 0 */
         child = parent[key];
         switch (typeof child) {
@@ -24,25 +24,30 @@ function indexNodeTypes(parent, ticker) {
             case 'object':
                 ticker = indexNodeTypes(child, ticker);
                 break;
+        
         }
     }
     return ticker;
 }
-var Visitor = /** @class */ (function () {
-    function Visitor(implementation) {
+
+class Visitor {
+    constructor(implementation) {
         this._implementation = implementation;
         this._visitInCache = {};
         this._visitOutCache = {};
+
         if (!_hasIndexed) {
-            indexNodeTypes(tree_1.default, 1);
+            indexNodeTypes(tree, 1);
             _hasIndexed = true;
         }
     }
-    Visitor.prototype.visit = function (node) {
+
+    visit(node) {
         if (!node) {
             return node;
         }
-        var nodeTypeIndex = node.typeIndex;
+
+        const nodeTypeIndex = node.typeIndex;
         if (!nodeTypeIndex) {
             // MixinCall args aren't a node type?
             if (node.value && node.value.typeIndex) {
@@ -50,48 +55,57 @@ var Visitor = /** @class */ (function () {
             }
             return node;
         }
-        var impl = this._implementation;
-        var func = this._visitInCache[nodeTypeIndex];
-        var funcOut = this._visitOutCache[nodeTypeIndex];
-        var visitArgs = _visitArgs;
-        var fnName;
+
+        const impl = this._implementation;
+        let func = this._visitInCache[nodeTypeIndex];
+        let funcOut = this._visitOutCache[nodeTypeIndex];
+        const visitArgs = _visitArgs;
+        let fnName;
+
         visitArgs.visitDeeper = true;
+
         if (!func) {
-            fnName = "visit".concat(node.type);
+            fnName = `visit${node.type}`;
             func = impl[fnName] || _noop;
-            funcOut = impl["".concat(fnName, "Out")] || _noop;
+            funcOut = impl[`${fnName}Out`] || _noop;
             this._visitInCache[nodeTypeIndex] = func;
             this._visitOutCache[nodeTypeIndex] = funcOut;
         }
+
         if (func !== _noop) {
-            var newNode = func.call(impl, node, visitArgs);
+            const newNode = func.call(impl, node, visitArgs);
             if (node && impl.isReplacing) {
                 node = newNode;
             }
         }
+
         if (visitArgs.visitDeeper && node) {
             if (node.length) {
-                for (var i = 0, cnt = node.length; i < cnt; i++) {
+                for (let i = 0, cnt = node.length; i < cnt; i++) {
                     if (node[i].accept) {
                         node[i].accept(this);
                     }
                 }
-            }
-            else if (node.accept) {
+            } else if (node.accept) {
                 node.accept(this);
             }
         }
+
         if (funcOut != _noop) {
             funcOut.call(impl, node);
         }
+
         return node;
-    };
-    Visitor.prototype.visitArray = function (nodes, nonReplacing) {
+    }
+
+    visitArray(nodes, nonReplacing) {
         if (!nodes) {
             return nodes;
         }
-        var cnt = nodes.length;
-        var i;
+
+        const cnt = nodes.length;
+        let i;
+
         // Non-replacing
         if (nonReplacing || !this._implementation.isReplacing) {
             for (i = 0; i < cnt; i++) {
@@ -99,27 +113,28 @@ var Visitor = /** @class */ (function () {
             }
             return nodes;
         }
+
         // Replacing
-        var out = [];
+        const out = [];
         for (i = 0; i < cnt; i++) {
-            var evald = this.visit(nodes[i]);
-            if (evald === undefined) {
-                continue;
-            }
+            const evald = this.visit(nodes[i]);
+            if (evald === undefined) { continue; }
             if (!evald.splice) {
                 out.push(evald);
-            }
-            else if (evald.length) {
+            } else if (evald.length) {
                 this.flatten(evald, out);
             }
         }
         return out;
-    };
-    Visitor.prototype.flatten = function (arr, out) {
+    }
+
+    flatten(arr, out) {
         if (!out) {
             out = [];
         }
-        var cnt, i, item, nestedCnt, j, nestedItem;
+
+        let cnt, i, item, nestedCnt, j, nestedItem;
+
         for (i = 0, cnt = arr.length; i < cnt; i++) {
             item = arr[i];
             if (item === undefined) {
@@ -129,6 +144,7 @@ var Visitor = /** @class */ (function () {
                 out.push(item);
                 continue;
             }
+
             for (j = 0, nestedCnt = item.length; j < nestedCnt; j++) {
                 nestedItem = item[j];
                 if (nestedItem === undefined) {
@@ -136,15 +152,14 @@ var Visitor = /** @class */ (function () {
                 }
                 if (!nestedItem.splice) {
                     out.push(nestedItem);
-                }
-                else if (nestedItem.length) {
+                } else if (nestedItem.length) {
                     this.flatten(nestedItem, out);
                 }
             }
         }
+
         return out;
-    };
-    return Visitor;
-}());
-exports.default = Visitor;
-//# sourceMappingURL=visitor.js.map
+    }
+}
+
+export default Visitor;