less 1.7.0 → 1.7.5

package/lib/less/functions.js

@@ -63,22 +63,22 @@ tree.functions = {
     },
 
     hue: function (color) {
-        return new(tree.Dimension)(Math.round(color.toHSL().h));
+        return new(tree.Dimension)(color.toHSL().h);
     },
     saturation: function (color) {
-        return new(tree.Dimension)(Math.round(color.toHSL().s * 100), '%');
+        return new(tree.Dimension)(color.toHSL().s * 100, '%');
     },
     lightness: function (color) {
-        return new(tree.Dimension)(Math.round(color.toHSL().l * 100), '%');
+        return new(tree.Dimension)(color.toHSL().l * 100, '%');
     },
     hsvhue: function(color) {
-        return new(tree.Dimension)(Math.round(color.toHSV().h));
+        return new(tree.Dimension)(color.toHSV().h);
     },
     hsvsaturation: function (color) {
-        return new(tree.Dimension)(Math.round(color.toHSV().s * 100), '%');
+        return new(tree.Dimension)(color.toHSV().s * 100, '%');
     },
     hsvvalue: function (color) {
-        return new(tree.Dimension)(Math.round(color.toHSV().v * 100), '%');
+        return new(tree.Dimension)(color.toHSV().v * 100, '%');
     },
     red: function (color) {
         return new(tree.Dimension)(color.rgb[0]);
@@ -93,7 +93,7 @@ tree.functions = {
         return new(tree.Dimension)(color.toHSL().a);
     },
     luma: function (color) {
-        return new(tree.Dimension)(Math.round(color.luma() * color.alpha * 100), '%');
+        return new(tree.Dimension)(color.luma() * color.alpha * 100, '%');
     },
     luminance: function (color) {
         var luminance =
@@ -101,7 +101,7 @@ tree.functions = {
           + (0.7152 * color.rgb[1] / 255)
           + (0.0722 * color.rgb[2] / 255);
 
-        return new(tree.Dimension)(Math.round(luminance * color.alpha * 100), '%');
+        return new(tree.Dimension)(luminance * color.alpha * 100, '%');
     },
     saturate: function (color, amount) {
         // filter: saturate(3.2);
@@ -221,7 +221,7 @@ tree.functions = {
         }
     },
     e: function (str) {
-        return new(tree.Anonymous)(str instanceof tree.JavaScript ? str.evaluated : str);
+        return new(tree.Anonymous)(str instanceof tree.JavaScript ? str.evaluated : str.value);
     },
     escape: function (str) {
         return new(tree.Anonymous)(encodeURI(str.value).replace(/=/g, "%3D").replace(/:/g, "%3A").replace(/#/g, "%23").replace(/;/g, "%3B").replace(/\(/g, "%28").replace(/\)/g, "%29"));
@@ -302,7 +302,7 @@ tree.functions = {
                 continue;
             }
             currentUnified = current.unit.toString() === "" && unitClone !== undefined ? new(tree.Dimension)(current.value, unitClone).unify() : current.unify();
-            unit = currentUnified.unit.toString() === "" && unitStatic !== undefined ? unitStatic : currentUnified.unit.toString();			
+            unit = currentUnified.unit.toString() === "" && unitStatic !== undefined ? unitStatic : currentUnified.unit.toString();
             unitStatic = unit !== "" && unitStatic === undefined || unit !== "" && order[0].unify().unit.toString() === "" ? unit : unitStatic;
             unitClone = unit !== "" && unitClone === undefined ? current.unit.toString() : unitClone;
             j = values[""] !== undefined && unit !== "" && unit === unitStatic ? values[""] : values[unit];
@@ -392,12 +392,12 @@ tree.functions = {
     },
     shade: function(color, amount) {
         return this.mix(this.rgb(0, 0, 0), color, amount);
-    },   
+    },
     extract: function(values, index) {
-        index = index.value - 1; // (1-based index)       
+        index = index.value - 1; // (1-based index)
         // handle non-array values as an array of length 1
         // return 'undefined' if index is invalid
-        return Array.isArray(values.value) 
+        return Array.isArray(values.value)
             ? values.value[index] : Array(values)[index];
     },
     length: function(values) {
@@ -414,7 +414,7 @@ tree.functions = {
         var mimetype = mimetypeNode.value;
         var filePath = (filePathNode && filePathNode.value);
 
-        var fs = require('fs'),
+        var fs = require('./fs'),
             path = require('path'),
             useBase64 = false;
 
@@ -422,6 +422,13 @@ tree.functions = {
             filePath = mimetype;
         }
 
+        var fragmentStart = filePath.indexOf('#');
+        var fragment = '';
+        if (fragmentStart!==-1) {
+            fragment = filePath.slice(fragmentStart);
+            filePath = filePath.slice(0, fragmentStart);
+        }
+
         if (this.env.isPathRelative(filePath)) {
             if (this.currentFileInfo.relativeUrls) {
                 filePath = path.join(this.currentFileInfo.currentDirectory, filePath);
@@ -470,7 +477,7 @@ tree.functions = {
         buf = useBase64 ? buf.toString('base64')
                         : encodeURIComponent(buf);
 
-        var uri = "\"data:" + mimetype + ',' + buf + "\"";
+        var uri = "\"data:" + mimetype + ',' + buf + fragment + "\"";
         return new(tree.URL)(new(tree.Anonymous)(uri));
     },
 
@@ -583,15 +590,15 @@ tree._mime = {
 
 var mathFunctions = {
  // name,  unit
-    ceil:  null, 
-    floor: null, 
-    sqrt:  null, 
+    ceil:  null,
+    floor: null,
+    sqrt:  null,
     abs:   null,
-    tan:   "", 
-    sin:   "", 
+    tan:   "",
+    sin:   "",
     cos:   "",
-    atan:  "rad", 
-    asin:  "rad", 
+    atan:  "rad",
+    asin:  "rad",
     acos:  "rad"
 };
 
@@ -616,19 +623,19 @@ function colorBlend(mode, color1, color2) {
     var ab = color1.alpha, cb, // backdrop
         as = color2.alpha, cs, // source
         ar, cr, r = [];        // result
-        
+
     ar = as + ab * (1 - as);
     for (var i = 0; i < 3; i++) {
         cb = color1.rgb[i] / 255;
         cs = color2.rgb[i] / 255;
         cr = mode(cb, cs);
         if (ar) {
-            cr = (as * cs + ab * (cb 
+            cr = (as * cs + ab * (cb
                 - as * (cb + cs - cr))) / ar;
         }
         r[i] = cr * 255;
     }
-    
+
     return new(tree.Color)(r, ar);
 }
 
@@ -638,7 +645,7 @@ var colorBlendMode = {
     },
     screen: function(cb, cs) {
         return cb + cs - cb * cs;
-    },   
+    },
     overlay: function(cb, cs) {
         cb *= 2;
         return (cb <= 1)
@@ -651,7 +658,7 @@ var colorBlendMode = {
             e = 1;
             d = (cb > 0.25) ? Math.sqrt(cb)
                 : ((16 * cb - 12) * cb + 4) * cb;
-        }            
+        }
         return cb - (1 - 2 * cs) * e * (d - cb);
     },
     hardlight: function(cb, cs) {
@@ -698,25 +705,25 @@ tree.defaultFunc = {
 
 function initFunctions() {
     var f, tf = tree.functions;
-    
+
     // math
     for (f in mathFunctions) {
         if (mathFunctions.hasOwnProperty(f)) {
             tf[f] = _math.bind(null, Math[f], mathFunctions[f]);
         }
     }
-    
+
     // color blending
     for (f in colorBlendMode) {
         if (colorBlendMode.hasOwnProperty(f)) {
             tf[f] = colorBlend.bind(null, colorBlendMode[f]);
         }
     }
-    
+
     // default
     f = tree.defaultFunc;
     tf["default"] = f.eval.bind(f);
-    
+
 } initFunctions();
 
 function hsla(color) {
@@ -749,13 +756,9 @@ function clamp(val) {
 }
 
 tree.fround = function(env, value) {
-    var p;
-    if (env && (env.numPrecision != null)) {
-        p = Math.pow(10, env.numPrecision);
-        return Math.round(value * p) / p;
-    } else {
-        return value;
-    }
+    var p = env && env.numPrecision;
+    //add "epsilon" to ensure numbers like 1.000000005 (represented as 1.000000004999....) are properly rounded...
+    return (p == null) ? value : Number((value + 2e-16).toFixed(p));
 };
 
 tree.functionCall = function(env, currentFileInfo) {

package/lib/less/import-visitor.js

@@ -38,7 +38,7 @@
             var importVisitor = this,
                 evaldImportNode,
                 inlineCSS = importNode.options.inline;
-            
+
             if (!importNode.css || inlineCSS) {
 
                 try {
@@ -61,10 +61,13 @@
                     }
 
                     this._importer.push(importNode.getPath(), importNode.currentFileInfo, importNode.options, function (e, root, importedAtRoot, fullPath) {
-                        if (e && !e.filename) { e.index = importNode.index; e.filename = importNode.currentFileInfo.filename; }
+                        if (e && !e.filename) {
+                            e.index = importNode.index; e.filename = importNode.currentFileInfo.filename;
+                        }
 
-                        if (!env.importMultiple) { 
-                            if (importedAtRoot) {
+                        var duplicateImport = importedAtRoot || fullPath in importVisitor.recursionDetector;
+                        if (!env.importMultiple) {
+                            if (duplicateImport) {
                                 importNode.skip = true;
                             } else {
                                 importNode.skip = function() {
@@ -73,7 +76,7 @@
                                     }
                                     importVisitor.onceFileDetectionMap[fullPath] = true;
                                     return false;
-                                }; 
+                                };
                             }
                         }
 
@@ -88,7 +91,6 @@
                         if (root) {
                             importNode.root = root;
                             importNode.importedFilename = fullPath;
-                            var duplicateImport = importedAtRoot || fullPath in importVisitor.recursionDetector;
 
                             if (!inlineCSS && (env.importMultiple || !duplicateImport)) {
                                 importVisitor.recursionDetector[fullPath] = true;
@@ -131,7 +133,7 @@
             this.env.frames.shift();
         },
         visitMedia: function (mediaNode, visitArgs) {
-            this.env.frames.unshift(mediaNode.ruleset);
+            this.env.frames.unshift(mediaNode.rules[0]);
             return mediaNode;
         },
         visitMediaOut: function (mediaNode) {

package/lib/less/index.js

@@ -1,10 +1,10 @@
 var path = require('path'),
     url = require('url'),
     request,
-    fs = require('fs');
+    fs = require('./fs');
 
 var less = {
-    version: [1, 7, 0],
+    version: [1, 7, 5],
     Parser: require('./parser').Parser,
     tree: require('./tree'),
     render: function (input, options, callback) {
@@ -24,19 +24,19 @@ var less = {
                 var css;
                 try {
                     css = root && root.toCSS && root.toCSS(options);
-                } 
+                }
                 catch (err) { callback(err); return; }
                 callback(null, css);
-            });
+            }, options);
         } else {
             ee = new (require('events').EventEmitter)();
 
             process.nextTick(function () {
                 parser.parse(input, function (e, root) {
                     if (e) { return ee.emit('error', e); }
-                    try { ee.emit('success', root.toCSS(options)); } 
+                    try { ee.emit('success', root.toCSS(options)); }
                     catch (err) { ee.emit('error', err); }
-                });
+                }, options);
             });
             return ee;
         }
@@ -143,13 +143,13 @@ less.Parser.fileLoader = function (file, currentFileInfo, callback, env) {
     function handleDataAndCallCallback(data) {
         var j = file.lastIndexOf('/');
 
-        // Pass on an updated rootpath if path of imported file is relative and file 
+        // Pass on an updated rootpath if path of imported file is relative and file
         // is in a (sub|sup) directory
-        // 
-        // Examples: 
+        //
+        // Examples:
         // - If path of imported file is 'module/nav/nav.less' and rootpath is 'less/',
         //   then rootpath should become 'less/module/nav/'
-        // - If path of imported file is '../mixins.less' and rootpath is 'less/', 
+        // - If path of imported file is '../mixins.less' and rootpath is 'less/',
         //   then rootpath should become 'less/../'
         if(newFileInfo.relativeUrls && !/^(?:[a-z-]+:|\/)/.test(file) && j != -1) {
             var relativeSubDirectory = file.slice(0, j+1);
@@ -160,7 +160,7 @@ less.Parser.fileLoader = function (file, currentFileInfo, callback, env) {
 
         callback(null, data, pathname, newFileInfo);
     }
-    
+
     var isUrl = isUrlRe.test( file );
     if (isUrl || isUrlRe.test(currentFileInfo.currentDirectory)) {
         if (request === undefined) {
@@ -175,7 +175,16 @@ less.Parser.fileLoader = function (file, currentFileInfo, callback, env) {
         var urlStr = isUrl ? file : url.resolve(currentFileInfo.currentDirectory, file),
             urlObj = url.parse(urlStr);
 
+        if (!urlObj.protocol) {
+            urlObj.protocol = "http";
+            urlStr = urlObj.format();
+        }
+
         request.get({uri: urlStr, strictSSL: !env.insecure }, function (error, res, body) {
+            if (error) {
+                callback({ type: 'File', message: "resource '" + urlStr + "' gave this Error:\n  "+ error +"\n" });
+                return;
+            }
             if (res.statusCode === 404) {
                 callback({ type: 'File', message: "resource '" + urlStr + "' was not found\n" });
                 return;
@@ -183,17 +192,15 @@ less.Parser.fileLoader = function (file, currentFileInfo, callback, env) {
             if (!body) {
                 console.error( 'Warning: Empty body (HTTP '+ res.statusCode + ') returned by "' + urlStr +'"' );
             }
-            if (error) {
-                callback({ type: 'File', message: "resource '" + urlStr + "' gave this Error:\n  "+ error +"\n" });
-            }
             pathname = urlStr;
             dirname = urlObj.protocol +'//'+ urlObj.host + urlObj.pathname.replace(/[^\/]*$/, '');
             handleDataAndCallCallback(body);
         });
     } else {
 
-        var paths = [currentFileInfo.currentDirectory].concat(env.paths);
-        paths.push('.');
+        var paths = [currentFileInfo.currentDirectory];
+        if (env.paths) paths.push.apply(paths, env.paths);
+        if (paths.indexOf('.') === -1) paths.push('.');
 
         if (env.syncImport) {
             for (var i = 0; i < paths.length; i++) {
@@ -226,8 +233,13 @@ less.Parser.fileLoader = function (file, currentFileInfo, callback, env) {
                             tryPathIndex(i + 1);
                         } else {
                             fs.readFile(pathname, 'utf-8', function(e, data) {
-                                if (e) { callback(e); }
-                                handleDataAndCallCallback(data);
+                                if (e) { callback(e); return; }
+
+                                // do processing in the next tick to allow
+                                // file handling to dispose
+                                process.nextTick(function() {
+                                    handleDataAndCallCallback(data);
+                                });
                             });
                         }
                     });

package/lib/less/lessc_helper.js

@@ -59,6 +59,7 @@ var lessc_helper = {
         console.log("  --strict-units=on|off    that cannot be represented.");
         console.log("  --global-var='VAR=VALUE' Defines a variable that can be referenced by the file.");
         console.log("  --modify-var='VAR=VALUE' Modifies a variable already declared in the file.");
+        console.log("  --url-args='QUERYSTRING' Adds params into url tokens (e.g. 42, cb=42 or 'a=1&b=2')");
         console.log("");
         console.log("-------------------------- Deprecated ----------------");
         console.log("  -O0, -O1, -O2            Set the parser's optimization level. The lower");