less 3.0.0-pre.2 → 3.0.1

package/test/less-bom/plugin/plugin-tree-nodes.js

@@ -1,80 +1,82 @@
 functions.addMultiple({
 
     "test-comment": function() {
-        return new tree.Combinator(' ');
+        return less.combinator(' ');
     },
-    "test-directive": function(arg1, arg2) {
-        return new tree.Directive(arg1.value, new tree.Anonymous(arg2.value));
+    "test-atrule": function(arg1, arg2) {
+        return less.atrule(arg1.value, arg2.value);
     },
     "test-extend": function() {
-        //TODO
+        // TODO
     },
     "test-import": function() {
-        //TODO
+        // TODO
     },
     "test-media": function() {
-        //TODO
+        // TODO
     },
     "test-mixin-call": function() {
-        //TODO
+        // TODO
     },
     "test-mixin-definition": function() {
-        //TODO
+        // TODO
     },
     "test-ruleset-call": function() {
-        return new tree.Combinator(' ');
+        return less.combinator(' ');
     },
-    // Functions must return something. Must 'return true' if they produce no output.
-    "test-undefined": function() { },
-
-    // These cause root errors
-    "test-alpha": function() {
-        return new tree.Alpha(30);
+    // Functions must return something, even if it's false/true
+    "test-undefined": function() { 
+        return;
     },
+    "test-collapse": function() { 
+        return true;
+    },
+    // These cause root errors
     "test-assignment": function() {
-        return new tree.Assignment("bird", "robin");
+        return less.assignment("bird", "robin");
     },
     "test-attribute": function() {
-        return new tree.Attribute("foo", "=", "bar");
+        return less.attribute("foo", "=", "bar");
     },
     "test-call": function() {
-        return new tree.Call("foo");
+        return less.call("foo");
     },
     "test-color": function() {
-        return new tree.Color([50, 50, 50]);
+        return less.color([50, 50, 50]);
     },
     "test-condition": function() {
-        return new tree.Condition('<', new tree.Value([0]), new tree.Value([1]));
+        return less.condition('<', less.value([0]), less.value([1]));
     },
     "test-detached-ruleset" : function() {
-        var rule = new tree.Rule('prop', new tree.Anonymous('value'));
-        return new tree.DetachedRuleset(new tree.Ruleset("", [ rule ]));
+        var decl = less.declaration('prop', 'value');
+        return less.detachedruleset(less.ruleset("", [ decl ]));
     },
     "test-dimension": function() {
-        return new tree.Dimension(1, 'px');
+        return less.dimension(1, 'px');
     },
     "test-element": function() {
-        return new tree.Element('+', 'a');
+        return less.element('+', 'a');
     },
     "test-expression": function() {
-        return new tree.Expression([1, 2, 3]);
+        return less.expression([1, 2, 3]);
     },
     "test-keyword": function() {
-        return new tree.Keyword('foo');
+        return less.keyword('foo');
     },
     "test-operation": function() {
-        return new tree.Operation('+', [1, 2]);
+        return less.operation('+', [1, 2]);
     },
     "test-quoted": function() {
-        return new tree.Quoted('"', 'foo');
+        return less.quoted('"', 'foo');
     },
     "test-selector": function() {
-        return new tree.Selector([new tree.Element('a')]);
+        var sel = less.selector('.a.b');
+        return sel;
     },
     "test-url": function() {
-        return new tree.URL('http://google.com');
+        return less.url('http://google.com');
     },
     "test-value": function() {
-        return new tree.Value([1]);
+        return less.value([1]);
     }
 });

package/test/less-bom/plugin-module.less

@@ -0,0 +1,7 @@
+// Test NPM import
+@plugin "clean-css";
+
+a {
+  background: none;
+}
+

package/test/less-bom/plugin.less

@@ -1,5 +1,5 @@
 // importing plugin globally
-@plugin "./plugin/plugin-global";
+@plugin "plugin/plugin-global";
 
 // transitively include plugins from importing another sheet
 @import "./plugin/plugin-transitive";
@@ -86,8 +86,38 @@
 .root {
   @ruleset2();
 }
+.test-empty {
+  val1: foo;
+  test-collapse();
+  val2: foo;
+}
+.test-simple {
+  @plugin "./plugin/plugin-simple";
+  value: pi-anon();
+  value: (pi() * 2);
+}
+.test-conflicts {
+  @plugin "./plugin/plugin-scope1";
+  value: foo();
+}
+.test-conflicts {
+  @plugin "./plugin/plugin-scope2";
+  value: foo();
+}
+.test-conflicts {
+  @plugin "./plugin/plugin-scope1";
+  value: foo();
+}
+.test-collection {
+  @plugin "./plugin/plugin-collection";
+  @var: 32;
+  store(@var);
+  store(5);
+  store("bird");
+  list: list();
+}
 
-test-directive("@charset"; '"utf-8"');
-test-directive("@arbitrary"; "value after ()");
+test-atrule("@charset"; '"utf-8"');
+test-atrule("@arbitrary"; "value after ()");
 
 

package/test/less-bom/property-accessors.less

@@ -0,0 +1,67 @@
+
+.block_1 {
+  color: red;
+  background-color: $color;
+  @width: 50px;
+  width: @width;
+  height: ($width / 2);
+  @color: red;
+  border: 1px solid lighten($color, 10%);
+  &:hover {
+    color: $color;
+    background-color: $color;
+    .mixin1();
+  }
+  .one {
+    background: $color;
+  }
+  content: "${color}";
+  prop: $color;
+
+}
+
+.block_2 {
+  color: red; 
+  .two {
+    background-color: $color; 
+  }
+  color: blue;  
+}
+
+.block_3 {
+  color: red; 
+  .three {
+    background-color: $color;
+  }
+  .mixin2();
+  color: blue;
+}
+.block_4 {
+  color: red; 
+  .four {
+    background-color: $color;
+  }
+  color: blue;
+  .mixin2();
+}
+// property merging
+a {
+    background-color+: red;
+    background-color+: foo;
+
+    &b {
+        background: $background-color;
+    }
+}
+
+.value_as_property {
+  prop1: color;
+  ${prop1}: #FF0000;  // not sure why you'd want to do this, but ok
+}
+
+.mixin1() {
+  color: green;
+}
+.mixin2() { 
+  color: yellow;
+}

package/test/less-bom/root-registry/file.less

@@ -0,0 +1 @@
+@charset "utf-8";

package/test/less-bom/root-registry/root.less

@@ -0,0 +1,3 @@
+// https://github.com/less/less.js/issues/3112
+@file: ext();
+@import '@{file}';

package/test/less-test.js

@@ -1,4 +1,4 @@
-/*jshint latedef: nofunc */
+/* jshint latedef: nofunc */
 
 module.exports = function() {
     var path = require('path'),
@@ -19,6 +19,14 @@ module.exports = function() {
     var normalFolder = 'test/less';
     var bomFolder = 'test/less-bom';
 
+    // Define String.prototype.endsWith if it doesn't exist (in older versions of node)
+    // This is required by the testSourceMap function below
+    if (typeof String.prototype.endsWith !== 'function') {
+        String.prototype.endsWith = function (str) {
+            return this.slice(-str.length) === str;
+        }
+    }
+
     less.logger.addListener({
         info: function(msg) {
             if (isVerbose) {
@@ -37,21 +45,21 @@ module.exports = function() {
         queueRunning = false;
     function queue(func) {
         if (queueRunning) {
-            //console.log("adding to queue");
+            // console.log("adding to queue");
             queueList.push(func);
         } else {
-            //console.log("first in queue - starting");
+            // console.log("first in queue - starting");
             queueRunning = true;
             func();
         }
     }
     function release() {
         if (queueList.length) {
-            //console.log("running next in queue");
+            // console.log("running next in queue");
             var func = queueList.shift();
             setTimeout(func, 0);
         } else {
-            //console.log("stopping queue");
+            // console.log("stopping queue");
             queueRunning = false;
         }
     }
@@ -74,6 +82,25 @@ module.exports = function() {
     });
 
     function testSourcemap(name, err, compiledLess, doReplacements, sourcemap, baseFolder) {
+        // Check the sourceMappingURL at the bottom of the file
+        var expectedSourceMapURL = name + ".css.map",
+            sourceMappingPrefix = "/*# sourceMappingURL=",
+            sourceMappingSuffix = " */",
+            expectedCSSAppendage = sourceMappingPrefix + expectedSourceMapURL + sourceMappingSuffix;
+        if (!compiledLess.endsWith(expectedCSSAppendage)) {
+            // To display a better error message, we need to figure out what the actual sourceMappingURL value was, if it was even present
+            var indexOfSourceMappingPrefix = compiledLess.indexOf(sourceMappingPrefix);
+            if (indexOfSourceMappingPrefix === -1) {
+                fail("ERROR: sourceMappingURL was not found in " + baseFolder + "/" + name + ".css.");
+                return;
+            }
+
+            var startOfSourceMappingValue = indexOfSourceMappingPrefix + sourceMappingPrefix.length,
+                indexOfNextSpace = compiledLess.indexOf(" ", startOfSourceMappingValue),
+                actualSourceMapURL = compiledLess.substring(startOfSourceMappingValue, indexOfNextSpace === -1 ? compiledLess.length : indexOfNextSpace);
+            fail("ERROR: sourceMappingURL should be \"" + expectedSourceMapURL + "\" but is \"" + actualSourceMapURL + "\".");
+        }
+
         fs.readFile(path.join('test/', name) + '.json', 'utf8', function (e, expectedSourcemap) {
             process.stdout.write("- " + path.join(baseFolder, name) + ": ");
             if (sourcemap === expectedSourcemap) {
@@ -109,32 +136,57 @@ module.exports = function() {
 
     function testErrors(name, err, compiledLess, doReplacements, sourcemap, baseFolder) {
         fs.readFile(path.join(baseFolder, name) + '.txt', 'utf8', function (e, expectedErr) {
-            process.stdout.write("- " + path.join(baseFolder, name) + ": ");
-            expectedErr = doReplacements(expectedErr, baseFolder);
+            process.stdout.write('- ' + path.join(baseFolder, name) + ": ");
+            expectedErr = doReplacements(expectedErr, baseFolder, err && err.filename);
             if (!err) {
                 if (compiledLess) {
-                    fail("No Error", 'red');
+                    fail('No Error', 'red');
                 } else {
-                    fail("No Error, No Output");
+                    fail('No Error, No Output');
                 }
             } else {
-                var errMessage = less.formatError(err);
+                var errMessage = err.toString();
                 if (errMessage === expectedErr) {
                     ok('OK');
                 } else {
-                    difference("FAIL", expectedErr, errMessage);
+                    difference('FAIL', expectedErr, errMessage);
                 }
             }
         });
     }
 
-    function globalReplacements(input, directory) {
-        var p = path.join(process.cwd(), directory),
+    // https://github.com/less/less.js/issues/3112
+    function testJSImport() {
+        process.stdout.write("- Testing root function registry");
+        less.functions.functionRegistry.add('ext', function() { 
+            return new less.tree.Anonymous('file');
+        });
+        var expected = "@charset \"utf-8\";\n";
+        toCSS({}, require('path').join(process.cwd(), 'test/less/root-registry/root.less'), function(error, output) {
+            if (error) {
+                return fail("ERROR: " + error);
+            }
+            if (output.css === expected) {
+                return ok('OK');
+            }
+            difference("FAIL", expected, output.css);
+        });
+    }
+
+    function globalReplacements(input, directory, filename) {
+        var path = require('path');
+        var p = filename ? path.join(path.dirname(filename), '/') : path.join(process.cwd(), directory),
             pathimport = path.join(process.cwd(), directory + "import/"),
             pathesc = p.replace(/[.:/\\]/g, function(a) { return '\\' + (a == '\\' ? '\/' : a); }),
             pathimportesc = pathimport.replace(/[.:/\\]/g, function(a) { return '\\' + (a == '\\' ? '\/' : a); });
 
         return input.replace(/\{path\}/g, p)
+                .replace(/\{node\}/g, "")
+                .replace(/\{\/node\}/g, "")
+                .replace(/\{pathhref\}/g, "")
+                .replace(/\{404status\}/g, "")
+                .replace(/\{nodepath\}/g, path.join(process.cwd(), 'node_modules', '/'))
+                .replace(/\{pathrel\}/g, path.join(path.relative(process.cwd(), p), '/')) 
                 .replace(/\{pathesc\}/g, pathesc)
                 .replace(/\{pathimport\}/g, pathimport)
                 .replace(/\{pathimportesc\}/g, pathimportesc)
@@ -197,7 +249,7 @@ module.exports = function() {
         }
 
         fs.readdirSync(path.join(baseFolder, foldername)).forEach(function (file) {
-            if (! /\.less/.test(file)) { return; }
+            if (!/\.less/.test(file)) { return; }
 
             var name = getBasename(file);
 
@@ -213,6 +265,11 @@ module.exports = function() {
                 options.sourceMapRootpath = "testweb/";
                 // TODO separate options?
                 options.sourceMap = options;
+
+                // This options is normally set by the bin/lessc script. Setting it causes the sourceMappingURL comment to be appended to the CSS
+                // output. The value is designed to allow the sourceMapBasepath option to be tested, as it should be removed by less before
+                // setting the sourceMappingURL value, leaving just the sourceMapOutputFilename and .map extension.
+                options.sourceMapFilename = options.sourceMapBasepath + "/" + options.sourceMapOutputFilename + ".map";
             }
 
             options.getVars = function(file) {
@@ -222,7 +279,7 @@ module.exports = function() {
             var doubleCallCheck = false;
             queue(function() {
                 toCSS(options, path.join(baseFolder, foldername + file), function (err, result) {
-                    
+
                     if (doubleCallCheck) {
                         totalTests++;
                         fail("less is calling back twice");
@@ -244,7 +301,7 @@ module.exports = function() {
                             if (err.stack) {
                                 process.stdout.write(err.stack + "\n");
                             } else {
-                                //this sometimes happen - show the whole error object
+                                // this sometimes happen - show the whole error object
                                 console.log(err);
                             }
                         }
@@ -367,7 +424,7 @@ module.exports = function() {
         try {
             process.stdout.write("- Integration - creating parser without options: ");
             less.render("");
-        } catch(e) {
+        } catch (e) {
             fail(stylize("FAIL\n", "red"));
             return;
         }
@@ -383,6 +440,7 @@ module.exports = function() {
         testEmptySourcemap: testEmptySourcemap,
         testNoOptions: testNoOptions,
         prepBomTest: prepBomTest,
+        testJSImport: testJSImport,
         finished: finished
     };
 };

package/test/modify-vars.js

@@ -1,5 +1,5 @@
 var less = require('../lib/less'),
-  fs = require('fs');
+    fs = require('fs');
 
 var input = fs.readFileSync("./test/less/modifyVars/extended.less", 'utf8');
 var expectedCss = fs.readFileSync('./test/css/modifyVars/extended.css', 'utf8');

package/test/plugins/visitor/index.js

@@ -8,7 +8,7 @@
         run: function (root) {
             return this._visitor.visit(root);
         },
-        visitRule: function (ruleNode, visitArgs) {
+        visitDeclaration: function (ruleNode, visitArgs) {
             if (ruleNode.name != '-some-aribitrary-property') {
                 return ruleNode;
             } else {

package/.jscsrc

@@ -1,73 +0,0 @@
-{
-    "disallowImplicitTypeConversion": ["numeric", "binary", "string"],
-    "disallowKeywords": ["with"],
-    "disallowMixedSpacesAndTabs": true,
-    "disallowMultipleLineBreaks": true,
-    "disallowOperatorBeforeLineBreak": ["."],
-    "disallowSpaceAfterKeywords": [
-                                        "void"//,
-                                        //"typeof"
-                                  ],
-    "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~"],
-    "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
-    "disallowSpacesInCallExpression": true,
-    "disallowSpacesInNamedFunctionExpression": {
-        "beforeOpeningRoundBrace": true},
-    "disallowTrailingComma": true,
-    "disallowTrailingWhitespace": false,
-    "maximumLineLength": 160,
-    "requireCommaBeforeLineBreak": true,
-    "requireCurlyBraces": [   "if",
-                              "else",
-                              "for",
-                              "while",
-                              "do",
-                              "try",
-                              "catch"],
-    "requireOperatorBeforeLineBreak": [ "?",
-                                        "=",
-                                        "+",
-                                        "-",
-                                        "/",
-                                        "*",
-                                        "==",
-                                        "===",
-                                        "!=",
-                                        "!==",
-                                        ">",
-                                        ">=",
-                                        "<",
-                                        "<="],
-    "requireSpaceAfterBinaryOperators": true,
-    "requireSpaceAfterKeywords": [
-                                        "else",
-                                        "case",
-                                        "try",
-                                        "typeof",
-                                        "return",
-                                        "if",
-                                        "for",
-                                        "while",
-                                        "do"
-                                    ],
-    "requireSpaceBeforeBlockStatements": true,
-    "requireSpaceBeforeBinaryOperators": [
-                                        "=",
-                                        "+",
-                                        "-",
-                                        "/",
-                                        "*",
-                                        "==",
-                                        "===",
-                                        "!=",
-                                        "!=="
-                                    ],
-    "requireSpaceBeforeBlockStatements": true,
-    "requireSpaceBetweenArguments": true,
-    "requireSpacesInConditionalExpression": true,
-    "requireSpacesInForStatement": true,
-    "requireSpacesInNamedFunctionExpression": {
-        "beforeOpeningCurlyBrace": true
-    },
-    "validateIndentation": 4
-}

package/.jshintrc

@@ -1,11 +0,0 @@
-{
-    "evil": true,
-    "latedef": true,
-    "node": true,
-    "undef": true,
-    "unused": "vars",
-    "noarg": true,
-    "eqnull": true,
-    "forin": true,
-    "predef": ["Promise"]
-}

package/lib/less/tree/alpha.js

@@ -1,28 +0,0 @@
-var Node = require("./node");
-
-var Alpha = function (val) {
-    this.value = val;
-};
-Alpha.prototype = new Node();
-Alpha.prototype.type = "Alpha";
-
-Alpha.prototype.accept = function (visitor) {
-    this.value = visitor.visit(this.value);
-};
-Alpha.prototype.eval = function (context) {
-    if (this.value.eval) { return new Alpha(this.value.eval(context)); }
-    return this;
-};
-Alpha.prototype.genCSS = function (context, output) {
-    output.add("alpha(opacity=");
-
-    if (this.value.genCSS) {
-        this.value.genCSS(context, output);
-    } else {
-        output.add(this.value);
-    }
-
-    output.add(")");
-};
-
-module.exports = Alpha;

package/lib/less/tree/directive.js

@@ -1,12 +0,0 @@
-// Backwards compatibility shim for Directive (AtRule)
-var AtRule = require("./atrule");
-
-var Directive = function () {
-    var args = Array.prototype.slice.call(arguments);
-    AtRule.apply(this, args);
-};
-
-Directive.prototype = Object.create(AtRule.prototype);
-Directive.prototype.constructor = Directive;
-
-module.exports = Directive;

package/lib/less/tree/rule.js

@@ -1,12 +0,0 @@
-// Backwards compatibility shim for Rule (Declaration)
-var Declaration = require("./declaration");
-
-var Rule = function () {
-    var args = Array.prototype.slice.call(arguments);
-    Declaration.apply(this, args);
-};
-
-Rule.prototype = Object.create(Declaration.prototype);
-Rule.prototype.constructor = Rule;
-
-module.exports = Rule;

package/test/less/errors/functions-2-alpha.less

@@ -1,2 +0,0 @@
-@plugin "../plugin/plugin-tree-nodes";
-test-alpha();

package/test/less/errors/functions-2-alpha.txt

@@ -1,3 +0,0 @@
-SyntaxError: Alpha node returned by a function is not valid here in {path}functions-2-alpha.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
-2 test-alpha();

package/test/less-bom/errors/functions-2-alpha.less

@@ -1,2 +0,0 @@
-@plugin "../plugin/plugin-tree-nodes";
-test-alpha();

package/test/less-bom/errors/functions-2-alpha.txt

@@ -1,3 +0,0 @@
-SyntaxError: Alpha node returned by a function is not valid here in {path}functions-2-alpha.less on line 2, column 1:
-1 @plugin "../plugin/plugin-tree-nodes";
-2 test-alpha();

package/test/sourcemaps/maps/import-map.map

@@ -1 +0,0 @@
-{"version":3,"sources":["../../less/import.less","../../less/import/import-test-b.less","../../less/import/import-test-e.less","../../less/import/import-test-c.less","../../less/import/import-test-f.less","../../less/import/deeper/deeper-2/url-import-2.less","../../less/import/import-test-d.css"],"names":[],"mappings":"AA6BA,SAAS;;;6DA1BqE;YAKlE,sBAAqC;AAEjD;ECLE,YAAA;EACA,UAAA;EDMA,WAAA;EACA,WAAA;;mBAE0D;EEd5D;IAAO,WAAA;;;ACEP;EACE,UAAA;;AFAF;EACE,YAAA;EACA,UAAA;;AGJF;EACE,YAAA;;ACHF;EACE,UAAA;;mBLkB+E;EMnBjF;IAAO,aAAA;;;mBNqBgE;EEpBvE;IAAO,WAAA;;;mBFsB+E;EMvBtF;IAAO,aAAA;;;ANyBP;EExBA;IAAO,WAAA","file":"../import.css"}