less 3.0.0-pre.2 → 3.0.1

package/test/less/functions.less

@@ -230,3 +230,21 @@ html {
   color: mix(blue, @color1, 50%);
   color: mix(blue, @color2, 50%);
 }
+
+#boolean {
+  a: boolean(not(2 < 1));
+  b: boolean(not(2 > 1) and (true));
+  c: boolean(not(boolean((true))));
+}
+
+#if {
+  a: if(not(false), 1, 2);
+  b: if(not(true), 1, 2);
+  @1: if(not(false), {c: 3}, {d: 4}); @1();
+
+  e: if(not(true), 5);
+  @f: boolean((3 = 4));
+  f: if(not(@f), 6);
+
+  if((false), {g: 7}); /* results in void */
+}

package/test/less/import-module.less

@@ -0,0 +1,3 @@
+@import "import-module/one/two/three/3.less";
+@import "import-module/one/two/2";
+@import "import-module/one/1.less";

package/test/less/import.less

@@ -1,6 +1,4 @@
 /** comment at the top**/
-@import url(http://fonts.googleapis.com/css?family=Open+Sans);
-
 @import url(/absolute/something.css) screen and (color) and (max-width: 600px);
 
 @import (optional) "file-does-not-exist.does-not-exist";

package/test/less/legacy/legacy.less

@@ -1,4 +1,4 @@
-@media (-o-min-device-pixel-ratio: 2/1) {
+@media (-o-min-device-pixel-ratio: 2) {
   .test-math-and-units {
     font: ignores 0/0 rules;
     test-division: 4 / 2 + 5em;

package/test/less/media.less

@@ -23,7 +23,7 @@
 @ratio_large: 16;
 @ratio_small: 9;
 
-@media all and (device-aspect-ratio: @ratio_large / @ratio_small) {
+@media all and (device-aspect-ratio: ~"@{ratio_large} / @{ratio_small}") {
    body { max-width: 800px; }
 }
 
@@ -177,7 +177,7 @@ body {
   }
 }
 
-@media (-webkit-min-device-pixel-ratio: 2), (min--moz-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: 2/1), (min-resolution: 2dppx), (min-resolution: 128dpcm) {
+@media (-webkit-min-device-pixel-ratio: 2), (min--moz-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: ~"2/1"), (min-resolution: 2dppx), (min-resolution: 128dpcm) {
   .b {
     background: red;
   }

package/test/less/merge.less

@@ -36,17 +36,20 @@
   .first-background();
 }
 .test4 {
-  // Won't merge values from sources that merked as !important, for backwards compatibility with css
   .first-transform();
   .fifth-transform();
 }
 .test5 {
-  // Won't merge values from mixins that merked as !important, for backwards compatibility with css
   .first-transform();
   .second-transform() !important;
 }
 .test6 {
-  // Ignores !merge if no peers found
+  .second-transform();
+}
+.test7 {
+  // inherit !important from merged subrules
+  .second-transform();
+  .second-transform() !important;
   .second-transform();
 }
 

package/test/less/plugin/plugin-collection.js

@@ -0,0 +1,9 @@
+var collection = [];
+
+functions.add('store', function(val) {
+    collection.push(val);  // imma store this for later
+    return false;
+});
+functions.add('list', function() {
+    return less.value(collection);
+});

package/test/less/plugin/plugin-local.js

@@ -7,8 +7,8 @@ functions.addMultiple({
     }
 });
 
-return {
+registerPlugin({
     setOptions: function(raw) {
         // do nothing
     }
-}
+});

package/test/less/plugin/plugin-scope1.js

@@ -0,0 +1,3 @@
+functions.add('foo', function() {
+    return "foo";
+});

package/test/less/plugin/plugin-scope2.js

@@ -0,0 +1,3 @@
+functions.add('foo', function() {
+    return "bar";
+});

package/test/less/plugin/plugin-simple.js

@@ -0,0 +1,7 @@
+functions.add('pi-anon', function() {
+    return Math.PI;
+});
+
+functions.add('pi', function() {
+    return less.dimension(Math.PI);
+});

package/test/less/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/plugin-module.less

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

package/test/less/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/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/root-registry/file.less

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

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

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

package/test/less-bom/calc.less

@@ -0,0 +1,7 @@
+.no-math {
+  @var: 50vh/2;
+  width: calc(50% + (@var - 20px));
+  foo: 1 + 2 calc(3 + 4) 5 + 6;
+  @floor: floor(1 + .1);
+  bar: calc(@floor + 20%);
+}

package/test/less-bom/css-grid.less

@@ -0,0 +1,15 @@
+.wrapper {
+  display: grid;
+  grid-template-columns: [col1-start] 9fr [col1-end] 10px [col2-start] 3fr [col2-end];
+  grid-template-rows: auto;
+}
+
+.wrapper {
+  display: grid;
+  grid-template-columns: 9fr 1.875em 3fr;
+  grid-template-rows: auto;
+  grid-template-areas:
+    "header header header"
+    "content . sidebar"
+    "footer footer footer";
+}

package/test/less-bom/detached-rulesets.less

@@ -31,8 +31,8 @@
 .wrap-mixin(@ruleset);
 
 .desktop-and-old-ie(@rules) {
-  @media screen and (min-width: 1200) { @rules(); }
-  html.lt-ie9 &                       { @rules(); }
+  @media screen and (min-width: 1200) { @rules() }
+  html.lt-ie9 &                       { @rules() }
 }
 
 header {

package/test/less-bom/errors/color-invalid-hex-code.less

@@ -1,3 +1,4 @@
 .a {
     @wrongHEXColorCode: #DCALLB;
+    color: @wrongHEXColorCode;
 }

package/test/less-bom/errors/color-invalid-hex-code.txt

@@ -1,4 +1,4 @@
 SyntaxError: Invalid HEX color code in {path}color-invalid-hex-code.less on line 2, column 29:
 1 .a {
 2     @wrongHEXColorCode: #DCALLB;
-3 }
+3     color: @wrongHEXColorCode;

package/test/less-bom/errors/color-invalid-hex-code2.less

@@ -1,3 +1,4 @@
 .a {
     @wrongHEXColorCode: #fffblack;
+    color: @wrongHEXColorCode;
 }

package/test/less-bom/errors/color-invalid-hex-code2.txt

@@ -1,4 +1,4 @@
 SyntaxError: Invalid HEX color code in {path}color-invalid-hex-code2.less on line 2, column 29:
 1 .a {
 2     @wrongHEXColorCode: #fffblack;
-3 }
+3     color: @wrongHEXColorCode;

package/test/less-bom/errors/import-missing.txt

@@ -1,3 +1,3 @@
-FileError: '{pathhref}file-does-not-exist.less' wasn't found{404status}{node}. Tried - {path}file-does-not-exist.less,{pathrel}file-does-not-exist.less,file-does-not-exist.less{/node} in {path}import-missing.less on line 6, column 1:
+FileError: '{pathhref}file-does-not-exist.less' wasn't found{404status}{node}. Tried - {path}file-does-not-exist.less,{pathrel}file-does-not-exist.less,{nodepath}file-does-not-exist.less,file-does-not-exist.less{/node} in {path}import-missing.less on line 6, column 1:
 5 
 6 @import "file-does-not-exist.less";

package/test/less-bom/errors/plugin/plugin-error-2.js

@@ -0,0 +1,5 @@
+registerPlugin({
+    use: function() {
+        throw new Error("An error was here.")
+    }
+});

package/test/less-bom/errors/plugin/plugin-error-3.js

@@ -0,0 +1,5 @@
+registerPlugin({
+    eval: function() {
+        throw new Error("An error was here.")
+    }
+});

package/test/less-bom/errors/plugin/plugin-error.js

@@ -0,0 +1 @@
+throw new Error('Error');

package/test/less-bom/errors/plugin-1.less

@@ -0,0 +1 @@
+@plugin "plugin/plugin-error";

package/test/less-bom/errors/plugin-1.txt

@@ -0,0 +1,2 @@
+SyntaxError: Error in {path}plugin-error.js{node} on line 1, column 8:
+1 throw new Error('Error');{/node}

package/test/less-bom/errors/plugin-2.less

@@ -0,0 +1 @@
+@plugin "plugin/plugin-error-2";

package/test/less-bom/errors/plugin-2.txt

@@ -0,0 +1,5 @@
+SyntaxError: Error during @plugin call in {path}plugin-error-2.js{node} on line 3, column 16:
+2     use: function() {
+3         throw new Error("An error was here.")
+4     }
+{/node}

package/test/less-bom/errors/plugin-3.less

@@ -0,0 +1 @@
+@plugin "plugin/plugin-error-3";

package/test/less-bom/errors/plugin-3.txt

@@ -0,0 +1,5 @@
+SyntaxError: Plugin error during evaluation in {path}plugin-error-3.js{node} on line 3, column 16:
+2     eval: function() {
+3         throw new Error("An error was here.")
+4     }
+{/node}

package/test/less-bom/functions.less

@@ -230,3 +230,21 @@ html {
   color: mix(blue, @color1, 50%);
   color: mix(blue, @color2, 50%);
 }
+
+#boolean {
+  a: boolean(not(2 < 1));
+  b: boolean(not(2 > 1) and (true));
+  c: boolean(not(boolean((true))));
+}
+
+#if {
+  a: if(not(false), 1, 2);
+  b: if(not(true), 1, 2);
+  @1: if(not(false), {c: 3}, {d: 4}); @1();
+
+  e: if(not(true), 5);
+  @f: boolean((3 = 4));
+  f: if(not(@f), 6);
+
+  if((false), {g: 7}); /* results in void */
+}

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

@@ -0,0 +1,3 @@
+@import "import-module/one/two/three/3.less";
+@import "import-module/one/two/2";
+@import "import-module/one/1.less";

package/test/less-bom/import.less

@@ -1,6 +1,4 @@
 /** comment at the top**/
-@import url(http://fonts.googleapis.com/css?family=Open+Sans);
-
 @import url(/absolute/something.css) screen and (color) and (max-width: 600px);
 
 @import (optional) "file-does-not-exist.does-not-exist";

package/test/less-bom/legacy/legacy.less

@@ -1,4 +1,4 @@
-@media (-o-min-device-pixel-ratio: 2/1) {
+@media (-o-min-device-pixel-ratio: 2) {
   .test-math-and-units {
     font: ignores 0/0 rules;
     test-division: 4 / 2 + 5em;

package/test/less-bom/media.less

@@ -23,7 +23,7 @@
 @ratio_large: 16;
 @ratio_small: 9;
 
-@media all and (device-aspect-ratio: @ratio_large / @ratio_small) {
+@media all and (device-aspect-ratio: ~"@{ratio_large} / @{ratio_small}") {
    body { max-width: 800px; }
 }
 
@@ -177,7 +177,7 @@ body {
   }
 }
 
-@media (-webkit-min-device-pixel-ratio: 2), (min--moz-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: 2/1), (min-resolution: 2dppx), (min-resolution: 128dpcm) {
+@media (-webkit-min-device-pixel-ratio: 2), (min--moz-device-pixel-ratio: 2), (-o-min-device-pixel-ratio: ~"2/1"), (min-resolution: 2dppx), (min-resolution: 128dpcm) {
   .b {
     background: red;
   }

package/test/less-bom/merge.less

@@ -36,17 +36,20 @@
   .first-background();
 }
 .test4 {
-  // Won't merge values from sources that merked as !important, for backwards compatibility with css
   .first-transform();
   .fifth-transform();
 }
 .test5 {
-  // Won't merge values from mixins that merked as !important, for backwards compatibility with css
   .first-transform();
   .second-transform() !important;
 }
 .test6 {
-  // Ignores !merge if no peers found
+  .second-transform();
+}
+.test7 {
+  // inherit !important from merged subrules
+  .second-transform();
+  .second-transform() !important;
   .second-transform();
 }
 

package/test/less-bom/plugin/plugin-collection.js

@@ -0,0 +1,9 @@
+var collection = [];
+
+functions.add('store', function(val) {
+    collection.push(val);  // imma store this for later
+    return false;
+});
+functions.add('list', function() {
+    return less.value(collection);
+});

package/test/less-bom/plugin/plugin-local.js

@@ -7,8 +7,8 @@ functions.addMultiple({
     }
 });
 
-return {
+registerPlugin({
     setOptions: function(raw) {
         // do nothing
     }
-}
+});

package/test/less-bom/plugin/plugin-scope1.js

@@ -0,0 +1,3 @@
+functions.add('foo', function() {
+    return "foo";
+});

package/test/less-bom/plugin/plugin-scope2.js

@@ -0,0 +1,3 @@
+functions.add('foo', function() {
+    return "bar";
+});

package/test/less-bom/plugin/plugin-simple.js

@@ -0,0 +1,7 @@
+functions.add('pi-anon', function() {
+    return Math.PI;
+});
+
+functions.add('pi', function() {
+    return less.dimension(Math.PI);
+});