efront 4.1.1 → 4.1.3

package/coms/compile//347/264/240/351/246/250.js

@@ -108,13 +108,13 @@ var splitParams = function (params) {
     for (var cx = 0, dx = code.length; cx < dx; cx++) {
         var o = code[cx];
         if (o.type === STAMP && o.text === ',') {
-            params.push(createString(p));
+            params.push(createString(p).trim());
             p = [];
             continue;
         }
         p.push(o);
     }
-    if (p.length) params.push(createString(p));
+    if (p.length) params.push(createString(p).trim());
     return params;
 }
 var createArgMap = function (args, split = ',', equal = ':') {
@@ -431,11 +431,15 @@ function evalscoped(scoped, base = '') {
     var vlist = [vars];
     var mlist = [macros];
     var clist = [smaps];
+    var calcvars = function (v) {
+        return v.replace(/(^|\s|[\]\)\(\[\-\+\*\/,;])(?:var\s*\(([\s\S]*?)\)|(--\S+|@[^\s\{\}\(\)\[\]\:\+\*\/,;\!\>\$\=\&\%\#\@'"`\?\.\/\|~#]+|@\{[^\}@]*\}))/g, function (m, q, a, b) {
+            return q + getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
+        });
+    };
     var initvars = function (vars) {
         for (var k in vars) {
             var v = vars[k];
-            v = getFromScopeList(v, vlist);
-            vars[k] = v;
+            vars[k] = replace_punc(calcvars(v));
         }
     };
     initvars(vars);
@@ -453,11 +457,6 @@ function evalscoped(scoped, base = '') {
             base = temp;
             return res;
         };
-        var calcvars = function (v) {
-            return v.replace(/(^|\s|[\]\)\(\[\-\+\*\/,;])(?:var\s*\(([\s\S]*?)\)|(--\S+|@[^\s\{\(\:\+\*\/,;\!\[\>\$\=\&\%\#\@\+'"`\?\.\/\|~]+|@\{[^\}@]*\}))/g, function (m, q, a, b) {
-                return q + getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
-            });
-        };
         var evalproc = function (k, retnoparam) {
             var match = (retnoparam !== false ? /^([^\(\)\s,;:]*)(?:\s*\(([\s\S]*)\))$/ : /^([^\(\)\s,;:]+)(?:\s*\(([\s\S]*)\))?$/).exec(k);
             if (!match) return calcvars(k);
@@ -536,6 +535,7 @@ function evalscoped(scoped, base = '') {
                 if (base && !p.rooted) p.base = fixBase(base, k);
                 else p.base = presets.test(k) ? `@{${k}}` : k;
                 if (p.vars) vlist.push(p.vars);
+                initvars(p.vars);
                 var value = evalthis(p);
                 if (p.vars) vlist.pop();
                 if (value.rest.length) rest = rest.concat(value.rest);

package/coms/compile//347/264/240/351/246/250_test.js

@@ -57,6 +57,8 @@ test(`:not(a):not(b){c:d}`, `:not(a):not(b){c:d;}`);
 test(`a>{b{a:b}}`, `a>b{a:b;}`);
 test(`a    >{b{a:b}}`, `a>b{a:b;}`);
 test(`a{>b{a:b}}`, `a>b{a:b;}`);
+test(`.type(@type,@media) {.@{type} {&:before{content:"@{media}";}}}.type(videoinput, "相机");`, `.videoinput:before{content:"相机";}`);
+test(`.type(@type,@media) {.@{type} {&:before{content:"@{media}";}}}.type(videoinput, 相机);`, `.videoinput:before{content:"相机";}`);
 assert(素馨(`:not(a):not(b){c:d}`, 'abc'), `abc :not(a):not(b){c:d;}`);
 assert(素馨(`&:not(a):not(b){c:d}`, 'abc'), `abc:not(a):not(b){c:d;}`);
 assert(素馨(`:scope{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
@@ -65,4 +67,6 @@ assert(素馨(`&{&:not(a):not(b){c:d}}`, 'abc'), `abc:not(a):not(b){c:d;}`);
 assert(素馨(`:root>a{&:not(a):not(b){c:d}}`, '.abc-'), `.abc->a:not(a):not(b){c:d;}`);
 assert(素馨(`a>:root{&:not(a):not(b){c:d}}`, '.abc-'), `a>.abc-:not(a):not(b){c:d;}`);
 
-assert(素馨(`.a (){ &:after{abc:1}} .b{.a();}`, '.abc-'), `.abc- .b:after{abc:1;}`);
+assert(素馨(`.a (){ &:after{abc:1}} .b{.a();}`, '.abc-'), `.abc- .b:after{abc:1;}`);
+assert(素馨(`@a:1px;@margin-x:@a+10px; a{m:-@margin-x}`), `a{m:-11px;}`);
+assert(素馨(`a{@a:1px;@margin-x:@a+10px;m:-@margin-x}`), `a{m:-11px;}`);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.1.1",
+    "version": "4.1.3",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {