less 2.2.2 → 2.6.0

data/lib/less/js/build/build.yml

@@ -0,0 +1,162 @@
+###
+# NOTICE:
+# this file is specifically for controlling
+# paths for Less.js source files, as well as
+# the order in which source files are
+# concatenated.
+#
+# Please do not add paths for anything else
+# to this file. All other paths for testing,
+# benchmarking and so on should be controlled
+# in the Gruntfile.
+###
+
+# Less.js Lib
+lib: lib/less
+lib_source_map: 'lib/source-map'
+
+# =================================
+# General
+# =================================
+prepend:
+  browser: ['build/require.js', 'build/browser-header.js']
+  rhino:   ['build/require-rhino.js', 'build/rhino-header.js', 'build/rhino-modules.js']
+
+append:
+  amd:     build/amd.js
+  browser: <%= build.lib %>/browser.js
+  rhino:   <%= build.lib %>/rhino.js
+
+
+# =================================
+# Core less files
+# =================================
+
+# <%= build.less.* %>
+less:
+  parser           : <%= build.lib %>/parser.js
+  functions        : <%= build.lib %>/functions.js
+  colors           : <%= build.lib %>/colors.js
+  tree             : <%= build.lib %>/tree.js
+  treedir          : <%= build.lib %>/tree/*.js # glob all files in ./lib/less/tree directory
+  env              : <%= build.lib %>/env.js
+  visitor          : <%= build.lib %>/visitor.js
+  import_visitor   : <%= build.lib %>/import-visitor.js
+  join             : <%= build.lib %>/join-selector-visitor.js
+  to_css_visitor   : <%= build.lib %>/to-css-visitor.js
+  extend_visitor   : <%= build.lib %>/extend-visitor.js
+  browser          : <%= build.lib %>/browser.js
+  source_map_output: <%= build.lib %>/source-map-output.js
+
+
+# =================================
+# Browser build
+# =================================
+
+# <%= build.browser %>
+browser:
+
+  # prepend utils
+  - <%= build.prepend.browser %>
+
+  # core
+  - <%= build.less.parser %>
+  - <%= build.less.functions %>
+  - <%= build.less.colors %>
+  - <%= build.less.tree %>
+  - <%= build.less.treedir %> # glob all files
+  - <%= build.less.env %>
+  - <%= build.less.visitor %>
+  - <%= build.less.import_visitor %>
+  - <%= build.less.join %>
+  - <%= build.less.to_css_visitor %>
+  - <%= build.less.extend_visitor %>
+  - <%= build.less.source_map_output %>
+
+  # append browser-specific code
+  - <%= build.append.browser %>
+  - <%= build.append.amd %>
+
+
+# =================================
+# Rhino build
+# =================================
+
+# <%= build.rhino %>
+rhino:
+  # prepend utils
+  - <%= build.prepend.rhino %>
+
+  # core
+  - <%= build.less.parser %>
+  - <%= build.less.functions %>
+  - <%= build.less.colors %>
+  - <%= build.less.tree %>
+  - <%= build.less.treedir %> # glob all files
+  - <%= build.less.env %>
+  - <%= build.less.visitor %>
+  - <%= build.less.import_visitor %>
+  - <%= build.less.join %>
+  - <%= build.less.to_css_visitor %>
+  - <%= build.less.extend_visitor %>
+  - <%= build.less.source_map_output %>
+  - <%= build.source_map %>
+
+
+# <%= build.rhinolessc %>
+rhinolessc:
+  - <%= build.append.rhino %>
+
+
+# =================================
+# Tree files
+# =================================
+
+# <%= build.tree %>
+# Technically listing the array out this way isn't
+# necessary since we can glob the files in alphabetical
+# order anyway. But this gives you control over the order
+# the files are used, and allows targeting of individual
+# files directly in the Gruntfile. But be we can just
+# remove this if files can be concatenated in any order.
+tree:
+  - <%= build.lib %>/tree/alpha.js
+  - <%= build.lib %>/tree/anonymous.js
+  - <%= build.lib %>/tree/assignment.js
+  - <%= build.lib %>/tree/call.js
+  - <%= build.lib %>/tree/color.js
+  - <%= build.lib %>/tree/comment.js
+  - <%= build.lib %>/tree/condition.js
+  - <%= build.lib %>/tree/detached-ruleset.js
+  - <%= build.lib %>/tree/dimension.js
+  - <%= build.lib %>/tree/directive.js
+  - <%= build.lib %>/tree/element.js
+  - <%= build.lib %>/tree/expression.js
+  - <%= build.lib %>/tree/extend.js
+  - <%= build.lib %>/tree/import.js
+  - <%= build.lib %>/tree/javascript.js
+  - <%= build.lib %>/tree/keyword.js
+  - <%= build.lib %>/tree/media.js
+  - <%= build.lib %>/tree/mixin.js
+  - <%= build.lib %>/tree/negative.js
+  - <%= build.lib %>/tree/operation.js
+  - <%= build.lib %>/tree/paren.js
+  - <%= build.lib %>/tree/quoted.js
+  - <%= build.lib %>/tree/rule.js
+  - <%= build.lib %>/tree/ruleset.js
+  - <%= build.lib %>/tree/ruleset-call.js
+  - <%= build.lib %>/tree/selector.js
+  - <%= build.lib %>/tree/unicode-descriptor.js
+  - <%= build.lib %>/tree/url.js
+  - <%= build.lib %>/tree/value.js
+  - <%= build.lib %>/tree/variable.js
+  
+# =================================
+# source-map build
+# =================================
+
+# <%= build.source_map %>
+source_map:
+  - <%= build.lib_source_map %>/source-map-header.js
+  - <%= build.lib_source_map %>/source-map-0.1.31.js
+  - <%= build.lib_source_map %>/source-map-footer.js

data/lib/less/js/build/require-rhino.js

@@ -2,6 +2,11 @@
 // Stub out `require` in rhino
 //
 function require(arg) {
-    return less[arg.split('/')[1]];
-};
+    var split = arg.split('/');
+    var resultModule = split.length == 1 ? less.modules[split[0]] : less[split[1]];
+    if (!resultModule) {
+        throw { message: "Cannot find module '" + arg + "'"};
+    }
+    return resultModule;
+}
 

data/lib/less/js/build/rhino-header.js

@@ -0,0 +1,4 @@
+if (typeof(window) === 'undefined') { less = {} }
+else                                { less = window.less = {} }
+tree = less.tree = {};
+less.mode = 'rhino';

data/lib/less/js/build/rhino-modules.js

@@ -0,0 +1,131 @@
+(function() {
+
+    console = function() {
+        var stdout = java.lang.System.out;
+        var stderr = java.lang.System.err;
+
+        function doLog(out, type) {
+            return function() {
+                var args = java.lang.reflect.Array.newInstance(java.lang.Object, arguments.length - 1);
+                var format = arguments[0];
+                var conversionIndex = 0;
+                // need to look for %d (integer) conversions because in Javascript all numbers are doubles
+                for (var i = 1; i < arguments.length; i++) {
+                    var arg = arguments[i];
+                    if (conversionIndex != -1) {
+                        conversionIndex = format.indexOf('%', conversionIndex);
+                    }
+                    if (conversionIndex >= 0 && conversionIndex < format.length) {
+                        var conversion = format.charAt(conversionIndex + 1);
+                        if (conversion === 'd' && typeof arg === 'number') {
+                            arg = new java.lang.Integer(new java.lang.Double(arg).intValue());
+                        }
+                        conversionIndex++;
+                    }
+                    args[i-1] = arg;
+                }
+                try {
+                    out.println(type + java.lang.String.format(format, args));
+                } catch(ex) {
+                    stderr.println(ex);
+                }
+            }
+        }
+        return {
+            log: doLog(stdout, ''),
+            info: doLog(stdout, 'INFO: '),
+            error: doLog(stderr, 'ERROR: '),
+            warn: doLog(stderr, 'WARN: ')
+        };
+    }();
+
+    less.modules = {};
+
+    less.modules.path = {
+        join: function() {
+            var parts = [];
+            for (i in arguments) {
+                parts = parts.concat(arguments[i].split(/\/|\\/));
+            }
+            var result = [];
+            for (i in parts) {
+                var part = parts[i];
+                if (part === '..' && result.length > 0) {
+                    result.pop();
+                } else if (part === '' && result.length > 0) {
+                    // skip
+                } else if (part !== '.') {
+		    if (part.slice(-1)==='\\' || part.slice(-1)==='/') {
+		      part = part.slice(0, -1);
+		    }
+                    result.push(part);
+                }
+            }
+            return result.join('/');
+        },
+        dirname: function(p) {
+            var path = p.split('/');
+            path.pop();
+            return path.join('/');
+        },
+        basename: function(p, ext) {
+            var base = p.split('/').pop();
+            if (ext) {
+                var index = base.lastIndexOf(ext);
+                if (base.length === index + ext.length) {
+                    base = base.substr(0, index);
+                }
+            }
+            return base;
+        },
+        extname: function(p) {
+            var index = p.lastIndexOf('.');
+            return index > 0 ? p.substring(index) : '';
+        }
+    };
+
+    less.modules.fs = {
+        readFileSync: function(name) {
+            // read a file into a byte array
+            var file = new java.io.File(name);
+            var stream = new java.io.FileInputStream(file);
+            var buffer = [];
+            var c;
+            while ((c = stream.read()) != -1) {
+                buffer.push(c);
+            }
+            stream.close();
+            return {
+                length: buffer.length,
+                toString: function(enc) {
+                    if (enc === 'base64') {
+                        return encodeBase64Bytes(buffer);
+                    } else if (enc) {
+                        return java.lang.String["(byte[],java.lang.String)"](buffer, enc);
+                    } else {
+                        return java.lang.String["(byte[])"](buffer);
+                    }
+                }
+            };
+        }
+    };
+
+    less.encoder = {
+        encodeBase64: function(str) {
+            return encodeBase64String(str);
+        }
+    };
+
+    // ---------------------------------------------------------------------------------------------
+    // private helper functions
+    // ---------------------------------------------------------------------------------------------
+
+    function encodeBase64Bytes(bytes) {
+        // requires at least a JRE Platform 6 (or JAXB 1.0 on the classpath)
+        return javax.xml.bind.DatatypeConverter.printBase64Binary(bytes)
+    }
+    function encodeBase64String(str) {
+        return encodeBase64Bytes(new java.lang.String(str).getBytes());
+    }
+
+})();

data/lib/less/js/build/tasks/.gitkeep

@@ -0,0 +1 @@
+# Reserved for specialized Less.js tasks.

data/lib/less/js/build.gradle

@@ -0,0 +1,347 @@
+import groovy.io.FileType
+import org.apache.tools.ant.taskdefs.condition.Os
+import org.gradle.api.tasks.Exec
+
+buildscript {
+    repositories {
+        mavenCentral()
+		jcenter()
+    }
+    dependencies {
+        classpath 'com.eriwen:gradle-js-plugin:1.8.0'
+		classpath 'com.moowork.gradle:gradle-grunt-plugin:0.2'
+    }
+}
+
+apply plugin: 'js'
+apply plugin: 'grunt'
+
+repositories {
+    mavenCentral()
+}
+
+configurations {
+    rhino
+}
+
+dependencies {
+    rhino 'org.mozilla:rhino:1.7R4'
+}
+
+project.ext {
+    packageProps = new groovy.json.JsonSlurper().parseText(new File("package.json").toURL().text)
+    failures = 0;
+    rhinoTestSrc = "out/rhino-test-${packageProps.version}.js"
+    testSrc = 'test/less'
+    testOut = 'out/test'
+}
+
+task runGruntRhino(type: GruntTask) {
+    gruntArgs = "rhino"
+}
+
+combineJs {
+	dependsOn runGruntRhino
+    source = ["dist/less-rhino-${packageProps.version}.js", "test/rhino/test-header.js","dist/lessc-rhino-${packageProps.version}.js"]
+    dest = file(rhinoTestSrc)
+}
+
+task testRhino(type: AllRhinoTests) {
+//      dependsOn 'testRhinoBase'
+    dependsOn 'testRhinoBase', 'testRhinoErrors', 'testRhinoLegacy', 'testRhinoStaticUrls', 'testRhinoCompression', 'testRhinoDebugAll', 'testRhinoDebugComments', 'testRhinoDebugMediaquery', 'testRhinoNoJsError', 'testRhinoSourceMap'
+}
+
+task testRhinoBase(type: RhinoTest) {
+    options = [ '--strict-math=true', '--relative-urls' ]
+}
+
+task testRhinoDebugAll(type: DebugRhinoTest) {
+    options = [ '--strict-math=true', '--line-numbers=all' ]
+    testDir = 'debug' + fs
+    suffix = "-all"
+}
+
+task testRhinoDebugComments(type: DebugRhinoTest) {
+    options = [ '--strict-math=true', '--line-numbers=comments' ]
+    testDir = 'debug' + fs
+    suffix = "-comments"
+}
+
+task testRhinoDebugMediaquery(type: DebugRhinoTest) {
+    options = [ '--strict-math=true', '--line-numbers=mediaquery' ]
+    testDir = 'debug' + fs
+    suffix = "-mediaquery"
+}
+
+task testRhinoErrors(type: RhinoTest) {
+    options = [ '--strict-math=true', '--strict-units=true' ]
+    testDir = 'errors/'
+    expectErrors = true
+}
+
+task testRhinoChyby(type: RhinoTest) {
+    options = [ '--strict-math=true', '--strict-units=true' ]
+    testDir = 'chyby/'
+   // expectErrors = true
+}
+
+task testRhinoNoJsError(type: RhinoTest) {
+    options = [ '--strict-math=true', '--strict-units=true', '--no-js' ]
+    testDir = 'no-js-errors/'
+    expectErrors = true
+}
+
+task testRhinoLegacy(type: RhinoTest) {
+    testDir = 'legacy/'
+}
+
+task testRhinoStaticUrls(type: RhinoTest) {
+    options = [ '--strict-math=true', '--rootpath=folder (1)/' ]
+    testDir = 'static-urls/'
+}
+
+task testRhinoCompression(type: RhinoTest) {
+    options = [ '--compress=true' ]
+    testDir = 'compression/'
+}
+
+task testRhinoSourceMap(type: SourceMapRhinoTest) {
+    options = [ '--strict-math=true', '--strict-units=true']
+    testDir = 'sourcemaps/'
+}
+
+task setupTest {
+	dependsOn combineJs
+    doLast {
+        file(testOut).deleteDir()
+    }
+}
+
+task clean << {
+    file(rhinoTestSrc).delete()
+    file(testOut).deleteDir()
+}
+
+class SourceMapRhinoTest extends RhinoTest {
+	
+	// helper to get the output map file
+	def getOutputMap(lessFile) {
+		def outFile = project.file(lessFile.path.replace('test/less', project.testOut).replace('.less', '.css'))
+		return project.file(outFile.path + ".map");
+	}
+	
+	// callback to add SourceMap options to the options list
+	def postProcessOptions(options, lessFile) {
+		def outFile = getOutputMap(lessFile)
+		project.file(outFile.parent).mkdirs()
+		options << "--source-map=${testDir}${lessFile.name.replace('.less','.css')}"
+		options << "--source-map-basepath=${lessRootDir}"
+		options << "--source-map-rootpath=testweb/"
+		options << "--source-map-output-map-file=${outFile}"
+
+		options
+	}
+	
+	// Callback to validate output
+	def handleResult(exec, out, lessFile) {
+		def actualFile = getOutputMap(lessFile)
+		def expectedFile = project.file(projectDir + fs + "test" + fs + testDir + fs + lessFile.name.replace(".less", ".json"))		
+		assert actualFile.text == expectedFile.text
+	}
+		
+}
+
+class DebugRhinoTest extends RhinoTest {
+
+    def escapeIt(it) {
+      return it.replaceAll("\\\\", "\\\\\\\\").replaceAll("/", "\\\\/").replaceAll(":", "\\\\:").replaceAll("\\.", "\\\\.");
+    }
+
+    def globalReplacements(input, directory) {
+      def pDirectory = toPlatformFs(directory)
+      def p = lessRootDir + fs + pDirectory 
+      def pathimport = p + toPlatformFs("import/")
+      def pathesc = escapeIt(p)
+      def pathimportesc = escapeIt(pathimport)
+      
+      def result = input.replace("{path}", p).replace("{pathesc}", pathesc).replace("{pathimport}", pathimport)
+      return result.replace("{pathimportesc}", pathimportesc).replace("\r\n", "\n")
+    }
+}
+
+class RhinoTest extends DefaultTask {
+
+    RhinoTest() {
+        dependsOn 'setupTest'
+    }
+
+    def suffix = ""
+    def testDir = ''
+    def options = []
+    def expectErrors = false
+    def fs = File.separator;
+    def projectDir = toUpperCaseDriveLetter(System.getProperty("user.dir"));
+    def lessRootDir = projectDir + fs + "test" + fs + "less"
+ 
+    def toUpperCaseDriveLetter(path) {
+      if (path.charAt(1)==':' && path.charAt(2)=='\\') {
+          return path.substring(0,1).toUpperCase() + path.substring(1);
+      } 
+      return path;
+    }
+
+    def toPlatformFs(path) {
+      return path.replace('\\', fs).replace('/', fs); 
+    }
+
+    def expectedCssPath(lessFilePath) {
+	  lessFilePath.replace('.less', "${suffix}.css").replace("${fs}less${fs}", "${fs}css${fs}");
+    }
+
+    def globalReplacements(input, directory) {
+      return input;
+    }
+
+    def stylize(str, style) {
+        def styles = [
+            reset     : [0,   0],
+            bold      : [1,  22],
+            inverse   : [7,  27],
+            underline : [4,  24],
+            yellow    : [33, 39],
+            green     : [32, 39],
+            red       : [31, 39],
+            grey      : [90, 39]
+        ];
+        return '\033[' + styles[style][0] + 'm' + str +
+                '\033[' + styles[style][1] + 'm';
+    }
+	
+	// Callback for subclasses to make any changes to the options
+	def postProcessOptions(options, lessFile) {
+		options
+	}
+	
+	// Callback to validate output
+	def handleResult(exec, out, lessFile) {
+		def actual = out.toString().trim()
+		def actualResult = project.file(lessFile.path.replace('test/less', project.testOut).replace('.less', '.css'))
+		project.file(actualResult.parent).mkdirs()
+		actualResult << actual
+		def expected
+		if (expectErrors) {
+			assert exec.exitValue != 0
+			expected = project.file(lessFile.path.replace('.less', '.txt')).text.trim().
+					replace('{path}', lessFile.parent + '/').
+					replace('{pathhref}', '').
+					replace('{404status}', '')
+		} else {
+			assert exec.exitValue == 0
+			def expectedFile = expectedCssPath(lessFile.path)
+			expected = project.file(expectedFile).text.trim()
+			expected = globalReplacements(expected, testDir)
+		}
+		actual=actual.trim()
+		actual = actual.replace('\r\n', '\n')
+		expected = expected.replace('\r\n', '\n')
+		actual = actual.replace("/","\\")
+		expected = expected.replace("/","\\")
+//                        println "* actual *"
+//                        println actual
+//                        new File("actual.txt").write(actual)
+//                        println "* expected *"
+//                        println expected
+//                        new File("expected.txt").write(expected)
+		assert actual == expected
+		actualResult.delete()
+
+	}
+
+    @TaskAction
+    def runTest() {
+        int testSuccesses = 0, testFailures = 0, testErrors = 0
+        project.file('test/less/' + testDir).eachFileMatch(FileType.FILES, ~/.*\.less/) { lessFile ->
+            println "lessfile: $lessFile"
+            if (!project.hasProperty('test') || lessFile.name.startsWith(project.test)) {
+                def out = new java.io.ByteArrayOutputStream()
+                def processedOptions = postProcessOptions([project.rhinoTestSrc, lessFile] + options, lessFile)
+                def execOptions = {
+                    main = 'org.mozilla.javascript.tools.shell.Main'
+//                    main = 'org.mozilla.javascript.tools.debugger.Main'
+                    classpath = project.configurations.rhino
+                    args = processedOptions
+                    standardOutput = out
+                    ignoreExitValue = true
+                }
+                println "rhinoTestSrc: ${project.rhinoTestSrc}" 
+                try {
+                    def exec = project.javaexec(execOptions)
+					handleResult(exec, out, lessFile)
+					testSuccesses++
+					println stylize('   ok', 'green')
+                }
+                catch (ex) {
+                    println ex
+                    println()
+                    testErrors++;
+                }
+                catch (AssertionError ae) {
+                    println stylize('   failed', 'red')
+                    println ae
+                    testFailures++
+                }
+            } else {
+                println stylize('   skipped', 'yellow')
+            }
+        }
+        println stylize(testSuccesses + ' ok', 'green')
+        println stylize(testFailures + ' assertion failed', testFailures == 0 ? 'green' : 'red')
+        println stylize(testErrors + ' errors', testErrors == 0 ? 'green' : 'red')
+        if (testFailures != 0 || testErrors != 0) {
+            project.failures++;
+        }
+    }
+}
+
+class AllRhinoTests extends DefaultTask {
+
+    AllRhinoTests() {
+    }
+
+    @TaskAction
+    def runTest() {
+       println stylize(project.failures + ' test suites failed', project.failures == 0 ? 'green' : 'red')
+    }
+
+    def stylize(str, style) {
+        def styles = [
+            reset     : [0,   0],
+            bold      : [1,  22],
+            inverse   : [7,  27],
+            underline : [4,  24],
+            yellow    : [33, 39],
+            green     : [32, 39],
+            red       : [31, 39],
+            grey      : [90, 39]
+        ];
+        return '\033[' + styles[style][0] + 'm' + str +
+                '\033[' + styles[style][1] + 'm';
+    }
+}
+
+class GruntTask extends Exec {
+    private String gruntExecutable = Os.isFamily(Os.FAMILY_WINDOWS) ? "grunt.cmd" : "grunt"
+    private String switches = "--no-color"
+
+    String gruntArgs = "" 
+
+    public GruntTask() {
+        super()
+        this.setExecutable(gruntExecutable)
+    }
+
+    public void setGruntArgs(String gruntArgs) {
+        this.args = "$switches $gruntArgs".trim().split(" ") as List
+    }
+}
+