less 2.3.1 → 2.4.0

package/lib/less-rhino/index.js

@@ -18,11 +18,11 @@ function formatError(ctx, options) {
         return ctx.stack || ctx.message;
     }
 
-    if (typeof(extract[0]) === 'string') {
+    if (typeof extract[0] === 'string') {
         error.push(stylize((ctx.line - 1) + ' ' + extract[0], 'grey'));
     }
 
-    if (typeof(extract[1]) === 'string') {
+    if (typeof extract[1] === 'string') {
         var errorTxt = ctx.line + ' ';
         if (extract[1]) {
             errorTxt += extract[1].slice(0, ctx.column) +
@@ -32,14 +32,14 @@ function formatError(ctx, options) {
         error.push(errorTxt);
     }
 
-    if (typeof(extract[2]) === 'string') {
+    if (typeof extract[2] === 'string') {
         error.push(stylize((ctx.line + 1) + ' ' + extract[2], 'grey'));
     }
     error = error.join('\n') + stylize('', 'reset') + '\n';
 
     message += stylize(ctx.type + 'Error: ' + ctx.message, 'red');
     if (ctx.filename) {
-     message += stylize(' in ', 'red') + ctx.filename +
+        message += stylize(' in ', 'red') + ctx.filename +
             stylize(' on line ' + ctx.line + ', column ' + (ctx.column + 1) + ':', 'grey');
     }
 
@@ -113,7 +113,7 @@ less.Parser.fileLoader = function (file, currentFileInfo, callback, env) {
     }
 
     var j = file.lastIndexOf('/');
-    if(newFileInfo.relativeUrls && !/^(?:[a-z-]+:|\/)/.test(file) && j != -1) {
+    if (newFileInfo.relativeUrls && !/^(?:[a-z-]+:|\/)/.test(file) && j != -1) {
         var relativeSubDirectory = file.slice(0, j + 1);
         newFileInfo.rootpath = newFileInfo.rootpath + relativeSubDirectory; // append (sub|sup) directory path of imported file
     }
@@ -196,8 +196,12 @@ function writeFile(filename, content) {
         }
 
         match = arg.match(/^--?([a-z][0-9a-z-]*)(?:=(.*))?$/i);
-        if (match) { arg = match[1]; } // was (?:=([^\s]*)), check!
-        else { return arg; }
+        if (match) {
+            arg = match[1];
+        }
+        else {
+            return arg;
+        }
 
         switch (arg) {
             case 'v':
@@ -305,10 +309,10 @@ function writeFile(filename, content) {
             case 'source-map-output-map-file':
                 if (checkArgFunc(arg, match[2])) {
                     options.writeSourceMap = function(sourceMapContent) {
-                         writeFile(match[2], sourceMapContent);
+                        writeFile(match[2], sourceMapContent);
                     };
                 }
-            break;
+                break;
             case 'rp':
             case 'rootpath':
                 if (checkArgFunc(arg, match[2])) {

package/lib/source-map/source-map-0.1.31.js

@@ -1872,7 +1872,7 @@ define('source-map/source-node', ['require', 'exports', 'module' ,  'source-map/
       if (original.source !== null
           && original.line !== null
           && original.column !== null) {
-        if(lastOriginalSource !== original.source
+        if (lastOriginalSource !== original.source
            || lastOriginalLine !== original.line
            || lastOriginalColumn !== original.column
            || lastOriginalName !== original.name) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "less",
-  "version": "2.3.1",
+  "version": "2.4.0",
   "description": "Leaner CSS",
   "homepage": "http://lesscss.org",
   "author": {

package/test/browser/css/relative-urls/urls.css

@@ -15,6 +15,7 @@
 }
 #misc {
   background-image: url(http://localhost:8081/test/browser/less/relative-urls/images/image.jpg);
+  background: url("#inline-svg");
 }
 #data-uri {
   background: url(data:image/png;charset=utf-8;base64,

package/test/browser/less/relative-urls/urls.less

@@ -10,6 +10,7 @@
 }
 #misc {
   background-image: url(images/image.jpg);
+  background: url("#inline-svg");
 }
 #data-uri {
   background: url(data:image/png;charset=utf-8;base64,

package/test/browser/runner-browser-options.js

@@ -18,34 +18,34 @@ if (window.navigator.userAgent.indexOf("MSIE") >= 0) {
 // setup style tags with less and link tags pointing to expected css output
 
 for (var i = 0; i < testFiles.length; i++) {
-  var file = testFiles[i],
-      lessPath  = '/test/less/' + file + '.less',
-      cssPath   = '/test/css/' + file + '.css',
-      lessStyle = document.createElement('style'),
-      cssLink   = document.createElement('link'),
-      lessText  = '@import "' + lessPath + '";';
+    var file = testFiles[i],
+        lessPath  = '/test/less/' + file + '.less',
+        cssPath   = '/test/css/' + file + '.css',
+        lessStyle = document.createElement('style'),
+        cssLink   = document.createElement('link'),
+        lessText  = '@import "' + lessPath + '";';
 
-  lessStyle.type = 'text/less';
-  lessStyle.id = file;
-  lessStyle.href = file;
+    lessStyle.type = 'text/less';
+    lessStyle.id = file;
+    lessStyle.href = file;
 
-  if (lessStyle.styleSheet === undefined) {
-    lessStyle.appendChild(document.createTextNode(lessText));
-  }
+    if (lessStyle.styleSheet === undefined) {
+        lessStyle.appendChild(document.createTextNode(lessText));
+    }
 
-  cssLink.rel = 'stylesheet';
-  cssLink.type = 'text/css';
-  cssLink.href = cssPath;
-  cssLink.id = 'expected-' + file;
+    cssLink.rel = 'stylesheet';
+    cssLink.type = 'text/css';
+    cssLink.href = cssPath;
+    cssLink.id = 'expected-' + file;
 
-  var head = document.getElementsByTagName('head')[0];
+    var head = document.getElementsByTagName('head')[0];
 
-  head.appendChild(lessStyle);
+    head.appendChild(lessStyle);
 
-  if (lessStyle.styleSheet) {
-    lessStyle.styleSheet.cssText = lessText;
-  }
+    if (lessStyle.styleSheet) {
+        lessStyle.styleSheet.cssText = lessText;
+    }
 
-  head.appendChild(cssLink);
-  testSheets[i] = lessStyle;
+    head.appendChild(cssLink);
+    testSheets[i] = lessStyle;
 }

package/test/browser/runner-errors-spec.js

@@ -1,3 +1,3 @@
 describe("less.js error tests", function() {
-  testLessErrorsInDocument();
+    testLessErrorsInDocument();
 });

package/test/browser/runner-global-vars-spec.js

@@ -1,3 +1,3 @@
 describe("less.js global vars", function() {
-  testLessEqualsInDocument();
+    testLessEqualsInDocument();
 });

package/test/browser/runner-main-options.js

@@ -5,14 +5,14 @@ var less = {
 less.strictMath = true;
 less.functions = {
   add: function(a, b) {
-    return new(less.tree.Dimension)(a.value + b.value);
+      return new(less.tree.Dimension)(a.value + b.value);
   },
   increment: function(a) {
-    return new(less.tree.Dimension)(a.value + 1);
+      return new(less.tree.Dimension)(a.value + 1);
   },
   _color: function(str) {
-    if (str.value === "evil red") {
-      return new(less.tree.Color)("600");
-    }
+      if (str.value === "evil red") {
+          return new(less.tree.Color)("600");
+      }
   }
 };

package/test/browser/runner-main-spec.js

@@ -2,6 +2,6 @@ console.warn("start spec");
 describe("less.js main tests", function() {
     testLessEqualsInDocument();
     it("the global environment", function() {
-      expect(window.require).toBe(undefined);
+        expect(window.require).toBe(undefined);
     });
 });

package/test/copy-bom.js

@@ -11,34 +11,34 @@ module.exports = function() {
     var _buff = new Buffer(BUF_LENGTH);
 
     function copyFolderWithBom(src, dest) {
-      var stats = fs.lstatSync(src);
-      var destFolder = path.dirname(dest);
-      var destFolderExists = fs.existsSync(destFolder);
-      var performCopy = false;
+        var stats = fs.lstatSync(src);
+        var destFolder = path.dirname(dest);
+        var destFolderExists = fs.existsSync(destFolder);
+        var performCopy = false;
 
-      if (stats.isFile()) {
-        if (!destFolderExists) {
-            fs.mkdirSync(destFolder);
-        }
-        if (src.match(/\.(css|less)$/)) {
-            copyFileAddingBomSync(src, dest);
-        } else {
-            copyFileSync(src, dest);
-        }
-      }
-      else if (stats.isDirectory()) {
-        if (!fs.existsSync(destFolder)) {
-            fs.mkdirSync(destFolder);
-        }
-        if (!fs.existsSync(dest)) {
-            fs.mkdirSync(dest);
+        if (stats.isFile()) {
+            if (!destFolderExists) {
+                fs.mkdirSync(destFolder);
+            }
+            if (src.match(/\.(css|less)$/)) {
+                copyFileAddingBomSync(src, dest);
+            } else {
+                copyFileSync(src, dest);
+            }
         }
-        fs.readdirSync(src).forEach(function(d) {
-            if (d !== 'bom') {
-                copyFolderWithBom(path.join(src, d), path.join(dest, d));
+        else if (stats.isDirectory()) {
+            if (!fs.existsSync(destFolder)) {
+                fs.mkdirSync(destFolder);
+            }
+            if (!fs.existsSync(dest)) {
+                fs.mkdirSync(dest);
             }
-        });
-      }
+            fs.readdirSync(src).forEach(function(d) {
+                if (d !== 'bom') {
+                    copyFolderWithBom(path.join(src, d), path.join(dest, d));
+                }
+            });
+        }
     }
 
     function copyFileAddingBomSync(srcFile, destFile) {
@@ -50,20 +50,20 @@ module.exports = function() {
     }
 
     function copyFileSync(srcFile, destFile) {
-        var fdr = fs.openSync(srcFile, 'r')
-        var stat = fs.fstatSync(fdr)
-        var fdw = fs.openSync(destFile, 'w', stat.mode)
-        var bytesRead = 1
-        var pos = 0
+        var fdr = fs.openSync(srcFile, 'r');
+        var stat = fs.fstatSync(fdr);
+        var fdw = fs.openSync(destFile, 'w', stat.mode);
+        var bytesRead = 1;
+        var pos = 0;
 
         while (bytesRead > 0) {
-        bytesRead = fs.readSync(fdr, _buff, 0, BUF_LENGTH, pos)
-        fs.writeSync(fdw, _buff, 0, bytesRead)
-        pos += bytesRead
+            bytesRead = fs.readSync(fdr, _buff, 0, BUF_LENGTH, pos)
+            fs.writeSync(fdw, _buff, 0, bytesRead);
+            pos += bytesRead;
         }
 
-        fs.closeSync(fdr)
-        fs.closeSync(fdw)
+        fs.closeSync(fdr);
+        fs.closeSync(fdw);
     }
 
     return {

package/test/css/functions.css

@@ -175,3 +175,11 @@
   format-keyword: hello;
   format-anonymous: hello anonymous world;
 }
+#list-details {
+  length: 2;
+  one: a 1;
+  two: b 2;
+  two-length: 2;
+  two-one: b;
+  two-two: 2;
+}

package/test/css/import-interpolation.css

@@ -5,6 +5,7 @@ body {
   width: 100px;
   height: 100px;
   background: url('../assets/logo.png');
+  background: url("#inline-svg");
 }
 
 .a {

package/test/css/mixins-important.css

@@ -49,3 +49,9 @@
 .when-calling-nested-with-param-issue-2394 {
   width: 10px !important;
 }
+.class1-2421 {
+  margin: 5px !important;
+}
+.class2-2421 {
+  margin: 5px;
+}

package/test/css/selectors.css

@@ -163,3 +163,8 @@ blank blank blank blank blank blank blank blank blank blank blank blank blank bl
 .selector:not(:hover) {
   test: global scope;
 }
+.extend-this,
+.active.first-level .second-level,
+.first-level .second-level.active2 {
+  content: '\2661';
+}

package/test/css/static-urls/urls.css

@@ -31,6 +31,7 @@
   width: 100px;
   height: 100px;
   background: url('assets/logo.png');
+  background: url("#inline-svg");
 }
 @font-face {
   font-family: xecret;

package/test/css/urls.css

@@ -39,6 +39,7 @@
   width: 100px;
   height: 100px;
   background: url('import/assets/logo.png');
+  background: url("#inline-svg");
 }
 @font-face {
   font-family: xecret;

package/test/index.js

@@ -40,6 +40,7 @@ lessTester.runTestSet({strictMath: true, strictUnits: true, sourceMap: true, glo
         }
         return path.join('test/sourcemaps', filename) + '.json';
     });
+lessTester.runTestSet({strictMath: true, strictUnits: true, sourceMap: {sourceMapFileInline: true}}, "sourcemaps-empty/", lessTester.testEmptySourcemap);
 lessTester.runTestSet({globalVars: true, banner: "/**\n  * Test\n  */\n"}, "globalVars/",
     null, null, null, function(name, type, baseFolder) { return path.join(baseFolder, name) + '.json'; });
 lessTester.runTestSet({modifyVars: true}, "modifyVars/",
@@ -49,4 +50,4 @@ lessTester.runTestSet({paths: ['test/data/', 'test/less/import/']}, "include-pat
 lessTester.testSyncronous({syncImport: true}, "import");
 lessTester.testSyncronous({syncImport: true}, "css");
 lessTester.testNoOptions();
-lessTester.finished();
+lessTester.finished();

package/test/less/functions.less

@@ -199,3 +199,16 @@
   }
 }
 
+#list-details {
+  @list:
+    a 1, // Some comment
+    b 2;
+
+  length: length(@list);
+  one: extract(@list, 1);
+  @two: extract(@list, 2);
+  two: @two;
+  two-length: length(@two);
+  two-one: extract(@two, 1);
+  two-two: extract(@two, 2);
+}

package/test/less/import/imports/logo.less

@@ -2,4 +2,5 @@
   width: 100px;
   height: 100px;
   background: url('../assets/logo.png');
+  background: url("#inline-svg");
 }

package/test/less/mixins-important.less

@@ -34,4 +34,20 @@
 }
 .when-calling-nested-with-param-issue-2394 {
   .size(10px) !important;
-}
+}
+.testMixin-2421 () {
+    .topCheck-2421 () {
+        .nestedCheck-2421() {
+            margin: 5px;
+        }
+        .nestedCheck-2421();
+    }
+    .topCheck-2421();
+}
+.class1-2421 {
+    .testMixin-2421() !important;
+}
+.class2-2421 {
+    .testMixin-2421();
+}
+

package/test/less/selectors.less

@@ -172,3 +172,13 @@ blank blank blank blank blank blank blank blank blank blank blank blank blank bl
 .selector:not(&:hover) {
   test: global scope;
 }
+// https://github.com/less/less.js/issues/2206
+.extend-this {
+  content: '\2661';
+}
+.first-level {
+  .second-level {
+    .active&:extend(.extend-this) { }
+    &.active2:extend(.extend-this) { }
+  }
+}

package/test/less/sourcemaps-empty/var-defs.less

@@ -0,0 +1 @@
+@test-var: 'something';

package/test/less/urls.less

@@ -47,7 +47,7 @@
   uri: data-uri('image/jpeg;base64', '../data/image.jpg');
   @var: replace('../data/replace.jpg', "replace", "image");
   background-image: data-uri(@var), data-uri(replace('../data/image.filext', "filext", "jpg"));
-  
+
   uri-fragment: data-uri('image/jpeg;base64', '../data/image.jpg#fragment');
 }
 

package/test/less-test.js

@@ -2,8 +2,9 @@
 
 module.exports = function() {
     var path = require('path'),
-        fs = require('fs');
-        copyBom = require('./copy-bom')();
+        fs = require('fs'),
+        copyBom = require('./copy-bom')(),
+        doBomTest = false;
 
     var less = require('../lib/less-node');
     var stylize = require('../lib/less-node/lessc-helper').stylize;
@@ -88,6 +89,23 @@ module.exports = function() {
         });
     }
 
+    function testEmptySourcemap(name, err, compiledLess, doReplacements, sourcemap, baseFolder) {
+        process.stdout.write("- " + path.join(baseFolder, name) + ": ");
+        if (err) {
+            fail("ERROR: " + (err && err.message));
+        } else {
+            var expectedSourcemap = undefined;
+            if ( compiledLess !== "" ) {
+                difference("\nCompiledLess must be empty", "", compiledLess);
+
+            } else if (sourcemap !== expectedSourcemap) {
+                fail("Sourcemap must be undefined");
+            } else {
+                ok('OK');
+            }
+        }
+    }
+
     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) + ": ");
@@ -134,29 +152,32 @@ module.exports = function() {
         }
         totalTests++;
         queue(function() {
-        var isSync = true;
-        toCSS(options, path.join(normalFolder, filenameNoExtension + ".less"), function (err, result) {
-            process.stdout.write("- Test Sync " + filenameNoExtension + ": ");
+            var isSync = true;
+            toCSS(options, path.join(normalFolder, filenameNoExtension + ".less"), function (err, result) {
+                process.stdout.write("- Test Sync " + filenameNoExtension + ": ");
 
-            if (isSync) {
-                ok("OK");
-            } else {
-                fail("Not Sync");
-            }
-            release();
-        });
-        isSync = false;
+                if (isSync) {
+                    ok("OK");
+                } else {
+                    fail("Not Sync");
+                }
+                release();
+            });
+            isSync = false;
         });
     }
 
     function prepBomTest() {
-      copyBom.copyFolderWithBom(normalFolder, bomFolder);
+        copyBom.copyFolderWithBom(normalFolder, bomFolder);
+        doBomTest = true;
     }
 
     function runTestSet(options, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
         var options2 = options ? JSON.parse(JSON.stringify(options)) : {};
         runTestSetInternal(normalFolder, options, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
-        runTestSetInternal(bomFolder, options2, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
+        if (doBomTest) {
+            runTestSetInternal(bomFolder, options2, foldername, verifyFunction, nameModifier, doReplacements, getFilename);
+        }
     }
 
     function runTestSetNormalOnly(options, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
@@ -166,12 +187,12 @@ module.exports = function() {
     function runTestSetInternal(baseFolder, options, foldername, verifyFunction, nameModifier, doReplacements, getFilename) {
         foldername = foldername || "";
 
-        if(!doReplacements) {
+        if (!doReplacements) {
             doReplacements = globalReplacements;
         }
 
         function getBasename(file) {
-             return foldername + path.basename(file, '.less');
+            return foldername + path.basename(file, '.less');
         }
 
         fs.readdirSync(path.join(baseFolder, foldername)).forEach(function (file) {
@@ -185,7 +206,7 @@ module.exports = function() {
 
             totalTests++;
 
-            if (options.sourceMap) {
+            if (options.sourceMap && !options.sourceMap.sourceMapFileInline) {
                 options.sourceMapOutputFilename = name + ".css";
                 options.sourceMapBasepath = path.join(process.cwd(), baseFolder);
                 options.sourceMapRootpath = "testweb/";
@@ -224,11 +245,11 @@ module.exports = function() {
                     return;
                 }
                 var css_name = name;
-                if(nameModifier) { css_name = nameModifier(name); }
+                if (nameModifier) { css_name = nameModifier(name); }
                 fs.readFile(path.join('test/css', css_name) + '.css', 'utf8', function (e, css) {
                     process.stdout.write("- " + path.join(baseFolder, css_name) + ": ");
 
-                        css = css && doReplacements(css, path.join(baseFolder, foldername));
+                    css = css && doReplacements(css, path.join(baseFolder, foldername));
                     if (result.css === css) { ok('OK'); }
                     else {
                         difference("FAIL", css, result.css);
@@ -242,12 +263,12 @@ module.exports = function() {
 
     function diff(left, right) {
         require('diff').diffLines(left, right).forEach(function(item) {
-          if(item.added || item.removed) {
-            var text = item.value.replace("\n", String.fromCharCode(182) + "\n").replace('\ufeff', '[[BOM]]');
-              process.stdout.write(stylize(text, item.added ? 'green' : 'red'));
-          } else {
-              process.stdout.write(item.value.replace('\ufeff', '[[BOM]]'));
-          }
+            if (item.added || item.removed) {
+                var text = item.value && item.value.replace("\n", String.fromCharCode(182) + "\n").replace('\ufeff', '[[BOM]]');
+                process.stdout.write(stylize(text, item.added ? 'green' : 'red'));
+            } else {
+                process.stdout.write(item.value && item.value.replace('\ufeff', '[[BOM]]'));
+            }
         });
         process.stdout.write("\n");
     }
@@ -313,7 +334,7 @@ module.exports = function() {
 
         options.paths = options.paths || [];
         if (!contains(options.paths, addPath)) {
-          options.paths.push(addPath);
+            options.paths.push(addPath);
         }
         options.filename = require('path').resolve(process.cwd(), path);
         options.optimization = options.optimization || 0;
@@ -348,6 +369,7 @@ module.exports = function() {
         testSyncronous: testSyncronous,
         testErrors: testErrors,
         testSourcemap: testSourcemap,
+        testEmptySourcemap: testEmptySourcemap,
         testNoOptions: testNoOptions,
         prepBomTest: prepBomTest,
         finished: finished

package/test/modify-vars.js

@@ -1,19 +1,19 @@
 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')
+var input = fs.readFileSync("./test/less/modifyVars/extended.less", 'utf8');
+var expectedCss = fs.readFileSync('./test/css/modifyVars/extended.css', 'utf8');
 var options = {
-  modifyVars: JSON.parse(fs.readFileSync("./test/less/modifyVars/extended.json", 'utf8'))
-}
+    modifyVars: JSON.parse(fs.readFileSync("./test/less/modifyVars/extended.json", 'utf8'))
+};
 
 less.render(input, options, function (err, result) {
-  if (err) {
-      console.log(err);
-  }
-  if (result.css === expectedCss) {
-    console.log("PASS");
-  } else {
-    console.log("FAIL");
-  }
+    if (err) {
+        console.log(err);
+    }
+    if (result.css === expectedCss) {
+        console.log("PASS");
+    } else {
+        console.log("FAIL");
+    }
 });