less - npm Package Compare versions

Comparing version 1.1.0 to 1.1.1

lib/less/index.js

@@ -8,3 +8,3 @@ var path = require('path'),
 var less = {
-    version: [1, 1, 0],
+    version: [1, 1, 1],
     Parser: require('less/parser').Parser,
@@ -11,0 +11,0 @@ importer: require('less/parser').importer,

lib/less/tree.js

@@ -7,1 +7,8 @@ require('less/tree').find = function (obj, fun) {
 };
+require('less/tree').jsify = function (obj) {
+    if (Array.isArray(obj.value) && (obj.value.length > 1)) {
+        return '[' + obj.value.map(function (v) { return v.toCSS(false) }).join(', ') + ']';
+    } else {
+        return obj.toCSS(false);
+    }
+};

lib/less/tree/expression.js

@@ -10,4 +10,6 @@ (function (tree) {
             }));
+        } else if (this.value.length === 1) {
+            return this.value[0].eval(env);
         } else {
-            return this.value[0].eval(env);
+            return this;
         }
@@ -14,0 +16,0 @@ },

lib/less/tree/javascript.js

@@ -9,18 +9,17 @@ (function (tree) {
 tree.JavaScript.prototype = {
-    toCSS: function () {
-        if (this.escaped) {
-            return this.evaluated;
-        } else {
-            return JSON.stringify(this.evaluated);
-        }
-    },
     eval: function (env) {
         var result,
+            that = this,
             context = {};
 
         var expression = this.expression.replace(/@\{([\w-]+)\}/g, function (_, name) {
-            return new(tree.Variable)('@' + name).eval(env).value;
+            return tree.jsify(new(tree.Variable)('@' + name, that.index).eval(env));
         });
 
-        expression = new(Function)('return (' + expression + ')');
+        try {
+            expression = new(Function)('return (' + expression + ')');
+        } catch (e) {
+            throw { message: "JavaScript evaluation error: `" + expression + "`" ,
+                    index: this.index };
+        }
 
@@ -37,3 +36,3 @@ for (var k in env.frames[0].variables()) {
         try {
-            this.evaluated = expression.call(context);
+            result = expression.call(context);
         } catch (e) {
@@ -43,3 +42,9 @@ throw { message: "JavaScript evaluation error: '" + e.name + ': ' + e.message + "'" ,
         }
-        return this;
+        if (typeof(result) === 'string') {
+            return new(tree.Quoted)('"' + result + '"', result, this.escaped, this.index);
+        } else if (Array.isArray(result)) {
+            return new(tree.Anonymous)(result.join(', '));
+        } else {
+            return new(tree.Anonymous)(result);
+        }
     }
@@ -46,0 +51,0 @@ };

lib/less/tree/mixin.js

@@ -80,3 +80,3 @@ (function (tree) {
         }
-        frame.rules.unshift(new(tree.Rule)('@arguments', new(tree.Expression)(_arguments)));
+        frame.rules.unshift(new(tree.Rule)('@arguments', new(tree.Expression)(_arguments).eval(env)));
 
@@ -83,0 +83,0 @@ return new(tree.Ruleset)(null, this.rules.slice(0)).eval({

lib/less/tree/quoted.js

@@ -18,6 +18,7 @@ (function (tree) {
     eval: function (env) {
-        this.value = this.value.replace(/@\{([\w-]+)\}/g, function (_, name) {
-            return new(tree.Variable)('@' + name).eval(env).value;
-        }).replace(/`([^`]+)`/g, function (_, exp) {
-            return new(tree.JavaScript)(exp, this.index, true).eval(env).toCSS();
+        var that = this;
+        this.value = this.value.replace(/`([^`]+)`/g, function (_, exp) {
+            return new(tree.JavaScript)(exp, that.index, true).eval(env).value;
+        }).replace(/@\{([\w-]+)\}/g, function (_, name) {
+            return new(tree.Variable)('@' + name, that.index).eval(env).value;
         });
@@ -24,0 +25,0 @@ return this;

package.json

@@ -8,3 +8,3 @@ {
   "contributors"  : [],
-  "version"       : "1.1.0",
+  "version"       : "1.1.1",
   "bin"           : { "lessc": "./bin/lessc" },
@@ -11,0 +11,0 @@ "main"          : "./lib/less/index",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

575233

increased by29.17%

Number of package files

92

increased by5.75%

Lines of code

10767

increased by33.22%

No dependency changes