efront 4.1.0 → 4.1.2

package/coms/compile/autoenum.js

@@ -61,30 +61,38 @@ var maplist = function (u) {
             map[r].ccount = 0;
         }
         var m = map[r];
-        m.push(o);
+        if (!o.equal && o.kind) m.unshift(o);
+        else m.push(o);
         if (o.equal || o.kind) {
-            var typeref = o.typeref;
-            if (typeref && typeof typeref === 'object') {
-                typeref = typeref.typeref;
-                o.typeref = typeref;
-            }
-            if (typeref && typeref !== m.typeref) {
-                m.typeref = typeref;
-                m.wcount++;
+            if (enumtype & REFTYPE) {
+                var typeref = o.typeref;
+                if (typeref && typeof typeref === 'object') {
+                    typeref = typeref.typeref;
+                    o.typeref = typeref;
+                }
+                if (typeref) {
+                    if (m.typeref !== typeref) {
+                        m.typeref = typeref;
+                        m.wcount++;
+                    }
+                }
+                else if (m.typeref) {
+                    var n = o.next;
+                    o[ignore] = true;
+                    if (n.type === STAMP && /^(\+\+|\-\-)$/.test(n.text)) continue;
+                    if (/^[\+\-]\=$/.test(n.text)) {
+                        var nn = n.next;
+                        if (nn && snapExpressFoot(nn) == nn && nn.isdigit && (nn.text & 0x1ff) === +nn.text) continue;
+                    }
+                    else if (!n || !/[^=!]?=$/.test(n.text)) continue;
+                    o[ignore] = false;
+                    m.wcount++;
+                }
             }
-            else if (m.typeref) {
-                var n = o.next;
-                o[ignore] = true;
-                if (n.type === STAMP && /^(\+\+|\-\-)$/.test(n.text)) continue;
-                if (/^[\+\-]\=$/.test(n.text)) {
-                    var nn = n.next;
-                    if (nn && snapExpressFoot(nn) == nn && nn.isdigit && (nn.text & 0x1ff) === +nn.text) continue;
-                }
-                else if (!n || !/=$/.test(n.text)) continue;
-                o[ignore] = false;
-                m.wcount++;
+            if (enumtype & (REFSTRC | REFMOVE)) {
+                if (o.property) o[ignore] = true;
+                else m.wcount++;
             }
-            else m.wcount++;
         }
         if (o.called) m.ccount++;
     }
@@ -140,6 +148,10 @@ function inCondition(o) {
         }
         if (p.type === STAMP) {
             if (p.text === ";") break;
+            if (/^[\?\:]$/i.test(p.text)) {
+                incondition = true;
+                break;
+            }
             o = p.prev;
             continue;
         }
@@ -149,62 +161,79 @@ function inCondition(o) {
 
 }
 
-function enumref(scoped) {
-    var { refs } = scoped;
-    for (var k in refs) {
-        var rs = refs[k];
-        for (var rk in rs) {
-            var os = rs[rk];
-            if (os.wcount !== 1 || os.length < 2) continue;
-            var eq = null, em = null, tp = null;
-            loop: for (var o of os) {
-                if (o.equal && !o[ignore]) {
-                    if (o.equal.text !== '=') break;
-                    if (o.queue.kind) break;
-                    var q = o.queue;
-                    if (q !== scoped.body) {
-                        if (q.entry === '(' && q.queue === scoped.body) {
-                            var qp = q.prev;
-                            if (qp.type === EXPRESS) qp = qp.prev;
-                            if (qp && qp.type === STRAP && qp.text === "await") qp = qp.prev;
-                            if (qp && qp.type === STRAP && qp.text === 'for') {
-                                var f = q.first;
-                                var fc = 0;
-                                while (f && f !== o) {
-                                    if (f.type === STAMP && f.text === ";") {
-                                        fc++;
-                                        if (fc > 1) break loop;
-                                    }
-                                    f = f.next;
+function enumref(refitem, scoped) {
+    for (var rk in refitem) {
+        var os = refitem[rk];
+        if (os.wcount !== 1 || os.length < 2) continue;
+        var eq = null, em = null, tp = null;
+        loop: for (var o of os) {
+            if (o.equal && !o[ignore]) {
+                if (o.equal.text !== '=') break;
+                if (o.queue.kind) break;
+                var q = o.queue;
+                if (q !== scoped.body) {
+                    if (q.entry === '(' && q.queue === scoped.body) {
+                        var qp = q.prev;
+                        if (qp.type === EXPRESS) qp = qp.prev;
+                        if (qp && qp.type === STRAP && qp.text === "await") qp = qp.prev;
+                        if (qp && qp.type === STRAP && qp.text === 'for') {
+                            var f = q.first;
+                            var fc = 0;
+                            while (f && f !== o) {
+                                if (f.type === STAMP && f.text === ";") {
+                                    fc++;
+                                    if (fc > 1) break loop;
                                 }
+                                f = f.next;
                             }
                         }
-                        else break;
                     }
-                    if (inCondition(o)) break;
+                    else break;
+                }
+                if (inCondition(o)) break;
+                if (enumtype & REFTYPE) {
                     if (o.typeref) {
                         tp = o.typeref;
                         if (isObject(tp)) tp = tp.typeref;
                         continue;
                     }
+                }
+                if (enumtype & REFSTRC) {
                     if (o.enumref) {
                         em = o.enumref;
                         continue;
                     }
+                }
+                if (enumtype & REFMOVE) {
                     o = o.equal.next;
                     var n = skipAssignment(o);
                     if (!o || n !== o.next) break loop;
                     if (o.type === VALUE && o.isdigit) eq = o;
                 }
-                else {
+            }
+            else if (o.kind) {
+                if (enumtype & REFTYPE) {
+                    if (o.typeref) {
+                        tp = o.typeref;
+                        if (isObject(tp)) tp = tp.typeref;
+                        continue;
+                    }
+                }
+            }
+            else {
+                if (enumtype & REFTYPE) {
                     if (tp) {
                         o.typeref = tp;
                         continue;
                     }
+                }
+                if (enumtype & REFSTRC) {
                     if (em) {
                         o.enumref = em;
                         continue;
                     }
+                }
+                if (enumtype & REFMOVE) {
                     if (!eq) break;
                     if (o.short) continue;
                     o.type = eq.type;
@@ -216,13 +245,17 @@ function enumref(scoped) {
         }
     }
 }
-
 function atuoenum(scoped) {
-    createRefMap(scoped);
-    enumref(scoped);
+    var { used } = scoped;
+    for (var k in used) {
+        var rs = maplist(used[k]);
+        enumref(rs, scoped);
+    }
 }
-var exports = module.exports = function main(code) {
+var enumtype = 0;
+var exports = module.exports = function main(code, type = REFMOVE) {
     var rest = [code.scoped];
+    enumtype = type;
     while (rest.length) {
         var s = rest.pop();
         if (s.length) rest.push(...s);
@@ -230,6 +263,9 @@ var exports = module.exports = function main(code) {
     }
     return code;
 }
+var REFMOVE = exports.REFMOVE = 1;
+var REFSTRC = exports.REFSTRC = 2;
+var REFTYPE = exports.REFTYPE = 4;
 exports.createRefId = createRefId;
 exports.createRefMap = createRefMap;
 exports.enumscoped = atuoenum;

package/coms/compile/autoenum_test.js

@@ -31,4 +31,5 @@ t("var a=-1; console.log(--a)", "var a = -1; console.log(--a)");
 t("var a=-1; return ++a", "var a = -1; return ++a");
 t("var a=-1; typeof ++a", "var a = -1; typeof ++a");
 t("var a=-1; ++a", "var a = -1; ++a");
+t("b?a=1:b=2;console.log(a)", "b ? a = 1 : b = 2; console.log(a)");
 // t(fs.readFileSync(path.join(__dirname,"../zimoli/spacechar_test.js")).toString())

package/coms/compile/common.js

@@ -259,9 +259,15 @@ function snapSentenceHead(o) {
             break;
         }
         if (p.type === STAMP) {
-            if (/=>|[,;]/.test(p.text) || equal_reg.test(p.text)) {
+            if (/=>|[,;]/.test(p.text)) {
                 break;
             }
+            if (/^[\?\:]$/.test(p.text)) {
+                if (o) {
+                    var e = snapExpressFoot(o).next;
+                    if (e.type === STAMP && equal_reg.test(e.text)) break;
+                }
+            }
             if (/^(?:[!~]|\+\+|\-\-)$/.test(p.text)) {
                 o = p;
                 continue;
@@ -496,6 +502,7 @@ var createScoped = function (parsed, wash) {
                         case "var":
                             m = m || vars;
                             var [declared, used0, o0, skiped] = getDeclared(o.next, s);
+                            mergeTo(used, used0);
                             while (skiped.length) {
                                 var o1 = run(skiped[0], 0);
                                 let sindex = skiped.indexOf(o1);
@@ -503,7 +510,6 @@ var createScoped = function (parsed, wash) {
                                 skiped.splice(0, sindex + 1);
                             }
                             o = o0;
-                            mergeTo(used, used0);
                             mapDeclared(m, declared);
                             continue loop;
                         case "static":
@@ -1222,16 +1228,16 @@ var splice = function (queue, index, size, ...args) {
     var res = queue.splice(index, size, ...args);
     var previ = queue.lastIndexOf(prev, index);
     var nexti = queue.indexOf(next, index + args.length);
-    if (previ < 0) previ = 0;
-    if (nexti < 0) nexti = queue.length;
+    if (previ < 0) previ = 0, prev = null;
+    if (nexti < 0) nexti = queue.length, next = null;
     else nexti++;
     var changedargs = queue.slice(previ, nexti);
     var pp = prev && prev.prev;
     var nn = next && next.next;
     relink(changedargs);
-    if (prev) prev.prev = pp;
+    if (pp) changedargs.first.prev = pp, pp.next = changedargs.first;
     else queue.first = changedargs.first;
-    if (next) next.next = nn;
+    if (nn) changedargs.last.next = nn, nn.prev = changedargs.last;
     else queue.last = changedargs.last;
     setqueue(args, queue);
     return res;
@@ -1276,6 +1282,27 @@ var canbeTemp = function (body, strip = false) {
     return o.type === EXPRESS && (strip || !/[\.\[]/.test(o.text)) || o.type === VALUE || o.type === QUOTED && !o.length;
 };
 
+var pickSentence = function (o) {
+    if (!o) return [];
+    if (o && o.type & (SPACE | COMMENT) && o.prev) o = o.prev;
+    if (o && o.type === STAMP && o.prev) o = o.prev;
+    if (o.type === STRAP && /^(in|instanceof|as|of)$/.test(o.text) && o.prev) o = o.prev;
+    var h = snapSentenceHead(o);
+    var e = skipAssignment(o);
+    var q = o.queue;
+    if (q) {
+        var qh = q.indexOf(h);
+        var qe = e ? q.indexOf(e) : q.length;
+        if (qh >= 0 && qe >= 0) return q.slice(qh, qe);
+    }
+    var res = [];
+    do {
+        res.push(h);
+        h = h.next;
+    } while (h !== e);
+    return res;
+};
+
 module.exports = {
     /*   1 */COMMENT,
     /*   2 */SPACE,
@@ -1297,6 +1324,7 @@ module.exports = {
     createScoped,
     createExpressList,
     snapSentenceHead,
+    pickSentence,
     snapExpressHead,
     snapExpressFoot,
     skipSentenceQueue,

package/coms/compile/unstruct.js

@@ -335,6 +335,7 @@ var _while = function (body, cx, unblock, result) {
     pushstep(result, wend);
     we[0].text = String(1 + i - result.length);
     be.push(...scanner2(`${result.length - i}, 0`));
+    relink(be);
     return cx;
 };
 var pushstep = function (result, step) {
@@ -607,7 +608,7 @@ var _invoke = function (t, getname) {
     else if (t.length) {
         var t0 = t[0];
         if (t0.type === EXPRESS && /^[\.\[]/.test(t0.text) || t0.type & (STAMP | STRAP) && powermap[t0.text] < powermap.new) {
-            t.unshift(...scanner2(`${qname}=${qname}`));
+            t.unshift(...rescan(`${qname}=${qname}`));
             relink(t);
         }
         pushstep(result, t);

package/coms/compile/unstruct_test.js

@@ -132,4 +132,6 @@ test("predef[key[1]](r.slice())(r.slice())", '_ = key[1]; _0 = r.slice(); _ = pr
 test("predef[key[1]][key[2]][key[3]]", '_ = key[1]; _ = predef[_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _[_0]');
 test("[key[1]][key[2]][key[3]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _[_0]');
 test("[key[1]][key[2]]+[key[3]][key[4]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _0 = [_0]; _1 = key[4]; _ + _0[_1]');
-test("if(a)a:{break a}", "if (!a) return [2, 0]; return [1, 0];\r\n return [1, 0]", true);
+test("if(a)a:{break a}", "if (!a) return [2, 0]; return [1, 0];\r\n return [1, 0]", true);
+unstruct.debug = true;
+test("rgb=(rgb<<8|rgb>>16)&0xffffff", "_ = rgb << 8, _0 = rgb >> 16, _ = _ | _0; _ = (_); rgb = _ & 0xffffff", true);

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

@@ -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

@@ -65,4 +65,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/coms/docs/codetext.xht

@@ -173,6 +173,7 @@
         javascript(a, blink) {
             if (blink) var index = a.indexOf(blink);
             if (index >= 0) a = a.slice(0, index) + a.slice(index + 1);
+            js.keepspace = !!blink;
             var c = compile$scanner2(a, js);
             if (index >= 0) {
                 var patched = patchBlink(c, index, blink);

package/package.json

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