less 2.3.3 → 2.4.0

data/lib/less/js/lib/less/tree/unicode-descriptor.js

@@ -4,6 +4,7 @@ tree.UnicodeDescriptor = function (value) {
     this.value = value;
 };
 tree.UnicodeDescriptor.prototype = {
+    type: "UnicodeDescriptor",
     toCSS: function (env) {
         return this.value;
     },

data/lib/less/js/lib/less/tree/url.js

@@ -1,10 +1,14 @@
 (function (tree) {
 
-tree.URL = function (val, rootpath) {
+tree.URL = function (val, currentFileInfo) {
     this.value = val;
-    this.rootpath = rootpath;
+    this.currentFileInfo = currentFileInfo;
 };
 tree.URL.prototype = {
+    type: "Url",
+    accept: function (visitor) {
+        this.value = visitor.visit(this.value);
+    },
     toCSS: function () {
         return "url(" + this.value.toCSS() + ")";
     },
@@ -12,15 +16,15 @@ tree.URL.prototype = {
         var val = this.value.eval(ctx), rootpath;
 
         // Add the base path if the URL is relative
-        if (typeof val.value === "string" && !/^(?:[a-z-]+:|\/)/.test(val.value)) {
-            rootpath = this.rootpath;
+        rootpath = this.currentFileInfo && this.currentFileInfo.rootpath;
+        if (rootpath && typeof val.value === "string" && ctx.isPathRelative(val.value)) {
             if (!val.quote) {
                 rootpath = rootpath.replace(/[\(\)'"\s]/g, function(match) { return "\\"+match; });
             }
             val.value = rootpath + val.value;
         }
 
-        return new(tree.URL)(val, this.rootpath);
+        return new(tree.URL)(val, null);
     }
 };
 

data/lib/less/js/lib/less/tree/value.js

@@ -2,9 +2,12 @@
 
 tree.Value = function (value) {
     this.value = value;
-    this.is = 'value';
 };
 tree.Value.prototype = {
+    type: "Value",
+    accept: function (visitor) {
+        this.value = visitor.visit(this.value);
+    },
     eval: function (env) {
         if (this.value.length === 1) {
             return this.value[0].eval(env);

data/lib/less/js/lib/less/tree/variable.js

@@ -1,7 +1,8 @@
 (function (tree) {
 
-tree.Variable = function (name, index, file) { this.name = name, this.index = index, this.file = file };
+tree.Variable = function (name, index, currentFileInfo) { this.name = name, this.index = index, this.currentFileInfo = currentFileInfo };
 tree.Variable.prototype = {
+    type: "Variable",
     eval: function (env) {
         var variable, v, name = this.name;
 
@@ -12,7 +13,7 @@ tree.Variable.prototype = {
         if (this.evaluating) {
             throw { type: 'Name',
                     message: "Recursive variable definition for " + name,
-                    filename: this.file,
+                    filename: this.currentFileInfo.file,
                     index: this.index };
         }
         
@@ -29,7 +30,7 @@ tree.Variable.prototype = {
         else {
             throw { type: 'Name',
                     message: "variable " + name + " is undefined",
-                    filename: this.file,
+                    filename: this.currentFileInfo.filename,
                     index: this.index };
         }
     }

data/lib/less/js/lib/less/visitor.js

@@ -0,0 +1,54 @@
+(function (tree) {
+
+    tree.visitor = function(implementation) {
+        this._implementation = implementation;
+    };
+
+    tree.visitor.prototype = {
+        visit: function(node) {
+
+            if (node instanceof Array) {
+                return this.visitArray(node);
+            }
+
+            if (!node || !node.type) {
+                return node;
+            }
+
+            var funcName = "visit" + node.type,
+                func = this._implementation[funcName],
+                visitArgs, newNode;
+            if (func) {
+                visitArgs = {visitDeeper: true};
+                newNode = func.call(this._implementation, node, visitArgs);
+                if (this._implementation.isReplacing) {
+                    node = newNode;
+                }
+            }
+            if ((!visitArgs || visitArgs.visitDeeper) && node && node.accept) {
+                node.accept(this);
+            }
+            funcName = funcName + "Out";
+            if (this._implementation[funcName]) {
+                this._implementation[funcName](node);
+            }
+            return node;
+        },
+        visitArray: function(nodes) {
+            var i, newNodes = [];
+            for(i = 0; i < nodes.length; i++) {
+                var evald = this.visit(nodes[i]);
+                if (evald instanceof Array) {
+                    newNodes = newNodes.concat(evald);
+                } else {
+                    newNodes.push(evald);
+                }
+            }
+            if (this._implementation.isReplacing) {
+                return newNodes;
+            }
+            return nodes;
+        }
+    };
+
+})(require('./tree'));

data/lib/less/js/package.json

@@ -1,23 +1,73 @@
 {
-  "name"          : "less",
-  "description"   : "Leaner CSS",
-  "homepage"      : "http://lesscss.org",
-  "keywords"      : ["css", "parser", "lesscss", "browser"],
-  "author"        : "Alexis Sellier <self@cloudhead.net>",
-  "contributors"  : [],
-  "version"       : "1.3.3",
-  "bin"           : { "lessc": "./bin/lessc" },
-  "main"          : "./lib/less/index",
-  "directories"   : { "test": "./test" },
-  "engines"       : { "node": ">=0.4.2" },
-  "optionalDependencies" : { "ycssmin": ">=1.0.1" },
-  "devDependencies" : { "diff": "~1.0" },
+  "name": "less",
+  "version": "1.4.2",
+  "description": "Leaner CSS",
+  "homepage": "http://lesscss.org",
+  "author": "Alexis Sellier <self@cloudhead.net>",
+  "contributors": [
+    "The Core Less Team"
+  ],
+  "bugs": {
+    "url": "https://github.com/less/less.js/issues"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/less/less.js.git"
+  },
+  "bin": {
+    "lessc": "./bin/lessc"
+  },
+  "main": "./lib/less/index",
+  "directories": {
+    "test": "./test"
+  },
+  "jam": {
+    "main": "./dist/less-1.4.1.js"
+  },
+  "engines": {
+    "node": ">=0.4.2"
+  },
   "scripts": {
-   "test": "make test"
+    "test": "make test"
+  },
+  "optionalDependencies": {
+    "mime": "1.2.x",
+    "request": ">=2.12.0",
+    "mkdirp": "~0.3.4",
+    "ycssmin": ">=1.0.1"
+  },
+  "devDependencies": {
+    "diff": "~1.0"
   },
-  "bugs": { "url" : "https://github.com/cloudhead/less.js/issues"},
-  "repository" :
-  { "type" : "git",
-    "url" : "https://github.com/cloudhead/less.js.git"
-  }
+  "keywords": [
+    "compile less",
+    "css nesting",
+    "css variable",
+    "css",
+    "gradients css",
+    "gradients css3",
+    "less compiler",
+    "less css",
+    "less mixins",
+    "less",
+    "less.js",
+    "lesscss",
+    "mixins",
+    "nested css",
+    "parser",
+    "preprocessor",
+    "bootstrap css",
+    "bootstrap less",
+    "style",
+    "styles",
+    "stylesheet",
+    "variables in css",
+    "css less"
+  ],
+  "licenses": [
+    {
+      "type": "Apache v2",
+      "url": "https://github.com/less/less.js/blob/master/LICENSE"
+    }
+  ]
 }

data/lib/less/js/test/browser-test-prepare.js

@@ -2,19 +2,24 @@ var path = require('path'),
     fs = require('fs'),
     sys = require('util');
 
+var readDirFilesSync = function(dir, regex, callback) {
+    fs.readdirSync(dir).forEach(function (file) {
+        if (! regex.test(file)) { return; }
+        callback(file);
+    });
+}
+
 var createTestRunnerPage = function(dir, exclude, testSuiteName, dir2) {
     var output = '<html><head>\n';
 
-    fs.readdirSync(path.join("test", dir, 'less', dir2 || "")).forEach(function (file) {
-        if (! /\.less/.test(file)) { return; }
-        
+    readDirFilesSync(path.join("test", dir, 'less', dir2 || ""), /\.less$/, function (file) {
         var name = path.basename(file, '.less'),
             id = (dir ? dir + '-' : "") + 'less-' + (dir2 ? dir2 + "-" : "") + name;
         
         if (exclude && name.match(exclude)) { return; }
         
-        output += '<link id="original-less:' + id + '" rel="stylesheet/less" type="text/css" href="http://localhost:8081/' + path.join(dir, 'less', dir2 || "", name) + '.less' +'">\n';
-        output += '<link id="expected-less:' + id + '" rel="stylesheet"  type="text/css" href="http://localhost:8081/' + path.join(dir, 'css', dir2 || "", name) + '.css' + '">\n';
+        output += '<link id="original-less:' + id + '" rel="stylesheet/less" type="text/css" href="/' + path.join(dir, 'less', dir2 || "", name) + '.less' +'">\n';
+        output += '<link id="expected-less:' + id + '" rel="stylesheet"  type="text/css" href="/' + path.join(dir, 'css', dir2 || "", name) + '.css' + '">\n';
     });
 
     output += String(fs.readFileSync(path.join('test/browser', 'template.htm'))).replace("{runner-name}", testSuiteName);
@@ -22,8 +27,20 @@ var createTestRunnerPage = function(dir, exclude, testSuiteName, dir2) {
     fs.writeFileSync(path.join('test/browser', 'test-runner-'+testSuiteName+'.htm'), output);
 };
 
+var removeFiles = function(dir, regex) {
+    readDirFilesSync(dir, regex, function(file) {
+        fs.unlinkSync(path.join(dir, file), function() {
+            console.log("Failed to delete " + file);
+        });
+    });
+}
+
+removeFiles("test/browser", /test-runner-[a-zA-Z-]*\.htm$/);
 createTestRunnerPage("", /javascript|urls/, "main");
+createTestRunnerPage("", null, "legacy", "legacy");
+createTestRunnerPage("", /javascript/, "errors", "errors");
 createTestRunnerPage("browser", null, "browser");
 createTestRunnerPage("browser", null, "relative-urls", "relative-urls");
 createTestRunnerPage("browser", null, "rootpath", "rootpath");
-createTestRunnerPage("browser", null, "rootpath-relative", "rootpath-relative");
+createTestRunnerPage("browser", null, "rootpath-relative", "rootpath-relative");
+createTestRunnerPage("browser", null, "production");

data/lib/less/js/test/browser/common.js

@@ -1,14 +1,30 @@
 /*if not async then phantomjs fails to run the webserver and the test concurrently*/
-var less = { async: true };
+var less = { async: true, strictMath: true };
+
+/* record log messages for testing */
+var logMessages = [],
+    realConsoleLog = console.log;
+console.log = function(msg) {
+    logMessages.push(msg);
+    realConsoleLog.call(console, msg);
+};
 
 var testLessEqualsInDocument = function() {
+    testLessInDocument(testSheet);
+};
+
+var testLessErrorsInDocument = function() {
+    testLessInDocument(testErrorSheet);
+};
+
+var testLessInDocument = function(testFunc) {
     var links = document.getElementsByTagName('link'),
         typePattern = /^text\/(x-)?less$/;
 
     for (var i = 0; i < links.length; i++) {
         if (links[i].rel === 'stylesheet/less' || (links[i].rel.match(/stylesheet/) &&
            (links[i].type.match(typePattern)))) {
-            testSheet(links[i]);
+            testFunc(links[i]);
         }
     }
 };
@@ -32,12 +48,48 @@ var testSheet = function(sheet) {
     });
 };
 
+var testErrorSheet = function(sheet) {
+    it(sheet.id + " should match an error", function() {
+        var lessHref =  sheet.href,
+            id = sheet.id.replace(/^original-less:/, "less-error-message:"),
+            errorHref = lessHref.replace(/.less$/, ".txt"),
+            errorFile = loadFile(errorHref),
+            actualErrorElement = document.getElementById(id),
+            actualErrorMsg;
+
+        describe("the error", function() {
+            expect(actualErrorElement).not.toBe(null);
+        });
+            
+        actualErrorMsg = actualErrorElement.innerText
+                .replace(/\n\d+/g, function(lineNo) { return lineNo + " "; })
+                .replace(/\n\s*in /g, " in ")
+                .replace("\n\n", "\n");
+
+        waitsFor(function() {
+            return errorFile.loaded;
+        }, "failed to load expected outout", 10000);
+        
+        runs(function() {
+            var errorTxt = errorFile.text
+                .replace("{path}", "")
+                .replace("{pathrel}", "")
+                .replace("{pathhref}", "http://localhost:8081/less/errors/")
+                .replace("{404status}", " (404)");
+            expect(actualErrorMsg).toEqual(errorTxt);
+            if (errorTxt == actualErrorMsg) {
+                actualErrorElement.style.display = "none";
+            }
+        });
+    });
+};
+
 var loadFile = function(href) {
     var request = new XMLHttpRequest(),
         response = { loaded: false, text: ""};
     request.open('GET', href, true);
     request.onload = function(e) {
-        response.text = request.response;
+        response.text = request.response.replace(/\r/g, "");
         response.loaded = true;
     }
     request.send();

data/lib/less/js/test/browser/css/urls.css

@@ -34,3 +34,16 @@
 .values {
   url: url('http://localhost:8081/browser/less/Trebuchet');
 }
+#data-uri {
+  uri: url('http://localhost:8081/browser/less/../../data/image.jpg');
+}
+#data-uri-guess {
+  uri: url('http://localhost:8081/browser/less/../../data/image.jpg');
+}
+#data-uri-ascii {
+  uri-1: url('http://localhost:8081/browser/less/../../data/page.html');
+  uri-2: url('http://localhost:8081/browser/less/../../data/page.html');
+}
+#data-uri-toobig {
+  uri: url('http://localhost:8081/browser/less/../../data/data-uri-fail.png');
+}

data/lib/less/js/test/browser/less/relative-urls/urls.less

@@ -1,4 +1,4 @@
-@import "../imports/urls.less";
+@import ".././imports/urls.less";
 @import "http://localhost:8081/browser/less/imports/urls2.less";
 @font-face {
   src: url("/fonts/garamond-pro.ttf");

data/lib/less/js/test/browser/less/urls.less

@@ -31,3 +31,19 @@
     @a: 'Trebuchet';
     url: url(@a);
 }
+#data-uri {
+  uri: data-uri('image/jpeg;base64', '../../data/image.jpg');
+}
+
+#data-uri-guess {
+  uri: data-uri('../../data/image.jpg');
+}
+
+#data-uri-ascii {
+  uri-1: data-uri('text/html', '../../data/page.html');
+  uri-2: data-uri('../../data/page.html');
+}
+
+#data-uri-toobig {
+  uri: data-uri('../../data/data-uri-fail.png');
+}

data/lib/less/js/test/browser/phantom-runner.js

@@ -40,8 +40,9 @@ if (!listening) {
  * it can be passed in as a string (e.g.: "1 == 1" or "$('#bar').is(':visible')" or
  * as a callback function.
  * @param timeOutMillis the max amount of time to wait. If not specified, 3 sec is used.
+ * @param timeOutErrorMessage the error message if time out occurs
  */
-function waitFor(testFx, onReady, timeOutMillis) {
+function waitFor(testFx, onReady, timeOutMillis, timeOutErrorMessage) {
     var maxtimeOutMillis = timeOutMillis ? timeOutMillis : 10001, //< Default Max Timeout is 10s
         start = new Date().getTime(),
         condition = false,
@@ -52,11 +53,10 @@ function waitFor(testFx, onReady, timeOutMillis) {
             } else {
                 if(!condition) {
                     // If condition still not fulfilled (timeout but condition is 'false')
-                    console.log("'waitFor()' timeout");
+                    console.log(timeOutErrorMessage || "'waitFor()' timeout");
                     phantom.exit(1);
                 } else {
                     // Condition fulfilled (timeout and/or condition is 'true')
-                    //console.log("'waitFor()' finished in " + (new Date().getTime() - start) + "ms.");
                     typeof(onReady) === "string" ? eval(onReady) : onReady(); //< Do what it's supposed to do once the condition is fulfilled
                     clearInterval(interval); //< Stop this interval
                 }
@@ -88,7 +88,7 @@ function testPage(url) {
                     if (list && list.length > 0) {
                       console.log('');
                       console.log(list.length + ' test(s) FAILED:');
-                      for (i = 0; i < list.length; ++i) {
+                      for (var i = 0; i < list.length; ++i) {
                           var el = list[i],
                               desc = el.querySelector('.description'),
                               msg = el.querySelector('.resultMessage.fail');
@@ -104,7 +104,9 @@ function testPage(url) {
                     }
                 });
                 testFinished(exitCode);
-            });
+            },
+            10000, // 10 second timeout
+            "Test failed waiting for jasmine results on page: " + url);
         }
     });
 }