efront 4.0.45 → 4.0.48

package/coms/basic/Table.js

@@ -92,14 +92,25 @@ class Table extends Array {
         this.update();
     }
     async update() {
-        var origin = this.searched ? this.splice(0, this.length).map(o => o.$origin) : [];
+        var origin = this.splice(0, this.length)
+        if (this.searched && this.source && this.searched !== this.source.length) {
+            origin = origin.map(o => o.$origin);
+        }
+        else {
+            origin = [];
+        }
         this.searched = 0;
         var source = this.sorted ? this.sorted : this.source;
         if (!source) return;
         var searchid = ++this.searchid;
         this.complete = false;
         this.coverCount = 0;
-        if (this.searchText) for (var o of origin.length ? origin.concat(source) : source) {
+        if (origin.length) {
+            if (origin.length >= 160) origin = origin.slice(0, 80);
+            source = source.filter(a => origin.indexOf(a) < 0);
+            source = origin.concat(source);
+        }
+        if (this.searchText) for (var o of source) {
             this.addItem(o);
             if (++this.searched % 600 === 0) {
                 if (isFunction(this.callback)) this.callback();

package/coms/basic/concatByte.js

@@ -6,10 +6,8 @@ function concatTypedArray(buffs) {
     while (offset < total) {
         var b = buffs[inc++];
         if (b.buffer) b = new Uint8Array(b.buffer, b.byteOffset, b.byteLength);
-        for (var cx = 0, dx = b.length; cx < dx; cx++) {
-            res[offset + cx] = b[cx];
-        }
-        offset += dx;
+        res.set(b, offset);
+        offset += b.length;
     }
     return res;
 }

package/coms/compile/Javascript.js

@@ -312,6 +312,7 @@ var scan = function (data) {
 var detourTemplate = function (raw, params) {
     var spliter = { text: ",", type: STAMP };
     var template = scan(`extend([],{["raw"]:[]})`);
+    rootenvs.extend = true;
     var str0 = template[1].first;
     var str1 = template[1][2][2];
     for (var r of raw) {
@@ -364,19 +365,27 @@ var removeQuote = function (o, c, i) {
     if (c.next) c.next.prev = cf;
 }
 
-Javascript.prototype.detour = function detour(o, ie) {
-    var avoidMap = this.avoidMap;
+Javascript.prototype.detour = function (o, ie) {
+    context = this;
+    var envs = rootenvs = Object.create(null);
+    detour(o, ie);
+    rootenvs = null;
+    context = null;
+    return envs;
+}
+var context = null, rootenvs = null;
+function detour(o, ie) {
     while (o) {
         switch (o.type) {
             case SCOPED:
-                this.detour(o.first, ie);
+                detour(o.first, ie);
                 break;
             case EXPRESS:
                 var text = o.text.replace(/^\.\.\./, '');
                 var hasdot = o.text.length !== text.length;
-                if (avoidMap) {
+                if (context.avoidMap) {
                     var m = /^[^\.\[\]]+/.exec(o.text);
-                    if (m) { avoidMap[m[0]] = true; }
+                    if (m) { context.avoidMap[m[0]] = true; }
                 }
                 if (/\?\./.test(text)) {
                     text = renderExpress(text);
@@ -384,7 +393,7 @@ Javascript.prototype.detour = function detour(o, ie) {
                     o = replace(o, ...scan(text));
                     continue;
                 }
-                text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || this.strap_reg.test(a) || /#/.test(a) ? `[${strings.recode(a)}]` : _);
+                text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || context.strap_reg.test(a) || /#/.test(a) ? `[${strings.recode(a)}]` : _);
                 if (hasdot) text = "..." + text;
                 o.text = text;
                 break;
@@ -404,7 +413,7 @@ Javascript.prototype.detour = function detour(o, ie) {
                             else {
                                 c.entry = "(";
                                 c.leave = ")";
-                                this.detour(c.first, ie);
+                                detour(c.first, ie);
                                 splice(o, cx + 1, 0, { type: STAMP, text: ',' });
                                 removeQuote(o, c);
                             }
@@ -424,7 +433,7 @@ Javascript.prototype.detour = function detour(o, ie) {
                             } else {
                                 c.entry = '(';
                                 c.leave = ")";
-                                this.detour(c.first, ie);
+                                detour(c.first, ie);
                                 params.push(c);
                             }
                         }
@@ -460,7 +469,7 @@ Javascript.prototype.detour = function detour(o, ie) {
                 if (/^\[/.test(o.text)) break;
                 if (o.queue.isObject) {
                     var text = strings.recode(o.text);
-                    if (ie === undefined || o.prev && (o.prev.type !== STAMP || o.prev.text !== ",") || this.strap_reg.test(o.text)) {
+                    if (ie === undefined || o.prev && (o.prev.type !== STAMP || o.prev.text !== ",") || context.strap_reg.test(o.text)) {
                         text = `[${text}]`;
                     }
                     else if (ie !== false) {
@@ -612,6 +621,7 @@ var removeExport = function (c, i, code) {
             o = n && n.next;
             var exp = scan(`\r\nexports.${prop}=`);
             exp.push(name);
+            name.isExpress = true;
             allexports.push(exp);
         }
         var ni = skipAssignment(code, i);
@@ -627,6 +637,7 @@ var removeExport = function (c, i, code) {
         n.type = STAMP;
         c.text = `exports.default`;
         code.exportDefault = true;
+        n.next.isExpress = true;
         c.type = EXPRESS;
         return;
     }
@@ -638,6 +649,7 @@ var removeExport = function (c, i, code) {
         }
         c.text = `exports.${dec[0]}`;
         c.type = EXPRESS;
+        n.isExpress = true;
         code.splice(i + 1, 0, ...scan(`=`));
         var nn = n.next;
         var d = nn.text;

package/coms/compile/downLevel.js

@@ -733,13 +733,13 @@ var killspr = function (body, i, _getobjname, killobj) {
     var index = 0;
     var spr = function () {
         var s = m;
-        s.text = s.text.replace(/^\.\.\./, '');
         m = skipAssignment(m);
-        var q = scanner2(`slice_["call"]()`);
-        rootenvs.slice_ = true;
+        s.text = s.text.replace(/^\.\.\./, '');
         var v = splice2(o, s, m);
         if (m) splice2(o, m, m = m.next);
         killobj(v);
+        var q = scanner2(`slice_["call"]()`);
+        rootenvs.slice_ = true;
         insert1(q[q.length - 1], null, ...v);
         return q;
     };
@@ -760,6 +760,23 @@ var killspr = function (body, i, _getobjname, killobj) {
     var next = o.next;
     if (o.entry === '(') {
         var r = snapExpressHead(o);
+        if (r.type === STRAP && r.text === "new") {
+            var qt = scanner2(`()`)[0];
+            r = r.next;
+            var b = body.lastIndexOf(r, i);
+            var ct = splice(body, b, i - b + 1, qt);
+            var qq = ct[ct.length - 1];
+            var qb = scanner2("[null,]")[0];
+            qb.push(...splice(qq, 0, qq.length, qb));
+            ct[ct.length - 1].unshift({ type: STAMP, text: ',' });
+            ct[ct.length - 1].unshift(...ct.slice(0, ct.length - 1).map(a => extend({}, a)));
+            ct.splice(ct.length - 1, 0, ...scanner2("['bind']['apply']"));
+            qt.push(...ct);
+            relink(qq)
+            relink(qb)
+            relink(qt)
+            return b;
+        }
         var rt = r.type === EXPRESS && r.text.replace(/^\.\.\./, '');
         var p = o.prev;
         if (r === o);

package/coms/compile/downLevel_test.js

@@ -19,7 +19,7 @@ assert(downLevel(`a(c**=d)`), 'a(c = power_(c, d))', true);
 assert(downLevel(`a(c.b.d**=d)`), 'a((_ = c.b, _.d = power_(_.d, d)))\r\nvar _', true);
 assert(downLevel(`a(c.b[a.b]**=d)`), 'a((_ = c.b, _[_0 = a.b] = power_(_[_0], d)))\r\nvar _, _0', true);
 assert(downLevel(`c.b[a.b]**=d`), '_ = c.b, _[_0 = a.b] = power_(_[_0], d)\r\nvar _, _0', true);
-// 声明及解构
+i++// 声明及解构
 assert(downLevel(`var [data, args, strs] = breakcode(data, occurs), strs = []`), 'var _ = breakcode(data, occurs), data = _[0], args = _[1], strs = _[2], strs = []\r\nvar _');
 assert(downLevel(`var [name, type, options] = piece, key, repeat;`), 'var name = piece[0], type = piece[1], options = piece[2], key, repeat;');
 assert(downLevel(`var [] = piece, key,[]= repeat;`), 'var key;');
@@ -80,6 +80,7 @@ assert(downLevel(`function (a=b,[c],d,e=f){}`), "function (a, arg1, d, e) { if (
 assert(downLevel(`function (arg1=b,[c],d,e=f){}`), "function (arg1, arg2, d, e) { if (arg1 === undefined) arg1 = b; var c = arg2[0]; if (e === undefined) e = f; }")
 i++// class降级
 assert(downLevel(`class a {}`), "function a() {}")
+var tmp = scanner2('export class a{a(){}}'); tmp.fix(); assert(downLevel.code(tmp).toString(), `exports.a = function (a) { a["prototype"].a = function () {}\r\nreturn a }(function a() {})`);
 assert(downLevel(`class a { static{ a.a=1}}`), "function a() {}; (function () { a.a = 1 }())")
 assert(downLevel(`if(a) a = 1; class a {}`), "if (a) a = 1; function a() {}")
 assert(downLevel(`async function(){if(a) a = 1; class a {}}`), `function () { return async_(
@@ -192,6 +193,8 @@ assert(downLevel(`=[a,b,...c,d,e,f]`), `var slice_ = Array["prototype"]["slice"]
 assert(downLevel(`=[a,b,...c,d,e,f,...g]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a, b]["concat"](slice_["call"](c), [d, e, f], slice_["call"](g))`)
 assert(downLevel(`=[a,b,...c,d,...e]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a, b]["concat"](slice_["call"](c), [d], slice_["call"](e))`)
 assert(downLevel(`a(...b)`), `a["apply"](null, b)`)
+assert(downLevel(`a(..."b,c".split(","))`), `a["apply"](null, "b,c".split(","))`)
+assert(downLevel(`new a(...args)`), `var slice_ = Array["prototype"]["slice"];\r\nnew (a['bind']['apply'](a, [null]["concat"](slice_["call"](args))))`)
 assert(downLevel(`a(c,d,e,...b(...c))`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [c, d, e]["concat"](slice_["call"](b["apply"](null, c))))`)
 assert(downLevel(`a(c,d,e,...b.a(...c))`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [c, d, e]["concat"](slice_["call"](b.a["apply"](b, c))))`)
 assert(downLevel(`a(c,d,e,...b.a.c(...c))`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [c, d, e]["concat"](slice_["call"]((_ = b.a).c["apply"](_, c))))\r\nvar _`)
@@ -226,7 +229,7 @@ function () {
 return [8, 8]
 },
 function () {
-_2 = Symbol["asyncIterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = Array["prototype"][_2]
+_2 = Symbol["asyncIterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = os[_2]; if (_2) return [1, 0]; _2 = Array["prototype"]; _3 = Symbol["iterator"]; _2 = _2[_3]
 },
 function () {
 _0 = _2; _0 = _0["call"](os); _2 = _0["next"](); return [_2, 1]
@@ -258,13 +261,13 @@ if (!_2) return [1, 0]; _2 = _0["return"](); return [1, 0]
 function () {
 return [1, 9]
 })
-var _, _0, _2`)
+var _, _0, _2, _3`)
 assert(downLevel(`for await(var [o,s] of os) noSymbol`), `return async_(
 function () {
 return [11, 8]
 },
 function () {
-o; s; _5 = Symbol["asyncIterator"]; _5 = os[_5]; if (_5) return [1, 0]; _5 = Symbol["iterator"]; _5 = os[_5]; if (_5) return [1, 0]; _5 = Symbol["iterator"]; _5 = Array["prototype"][_5]
+o; s; _5 = Symbol["asyncIterator"]; _5 = os[_5]; if (_5) return [1, 0]; _5 = Symbol["iterator"]; _5 = os[_5]; if (_5) return [1, 0]; _5 = Array["prototype"]; _6 = Symbol["iterator"]; _5 = _5[_6]
 },
 function () {
 _0 = _5; _0 = _0["call"](os); _5 = _0["next"](); return [_5, 1]
@@ -276,16 +279,16 @@ function () {
 _5 = !_["done"]; if (!_5) return [5, 0]; _5 = _["value"]; return [_5, 1]
 },
 function (_4) {
-_5 = _4; _1 = _5; _6 = Symbol["iterator"]; _6 = _1[_6]; if (_6) return [1, 0]; _6 = Symbol["iterator"]; _6 = Array["prototype"][_6]
+_5 = _4; _1 = _5; _6 = Symbol["iterator"]; _6 = _1[_6]; if (_6) return [1, 0]; _6 = Array["prototype"]; _7 = Symbol["iterator"]; _6 = _6[_7]
 },
 function () {
-_6 = (_6); _2 = _6["call"](_1); _3 = undefined; _3 = _2["next"](); o = _3["value"]; _3 = _2["next"](); s = _3["value"]; _9 = !_3; if (_9) return [1, 0]; _9 = !_3["done"]
+_6 = (_6); _2 = _6["call"](_1); _3 = undefined; _3 = _2["next"](); o = _3["value"]; _3 = _2["next"](); s = _3["value"]; _10 = !_3; if (_10) return [1, 0]; _10 = !_3["done"]
 },
 function () {
-_9 = (_9); if (!_9) return [1, 0]; _9 = _2["return"]; _9 = isFunction(_9); if (!_9) return [1, 0]; _9 = _2["return"]()
+_10 = (_10); if (!_10) return [1, 0]; _10 = _2["return"]; _10 = isFunction(_10); if (!_10) return [1, 0]; _10 = _2["return"]()
 },
 function () {
-_3 = _9; _5 = (true)
+_3 = _10; _5 = (true)
 },
 function () {
 if (!_5) return [2, 0]; noSymbol; _5 = _0["next"](); return [_5, 1]
@@ -305,7 +308,7 @@ if (!_5) return [1, 0]; _5 = _0["return"](); return [1, 0]
 function () {
 return [1, 9]
 })
-var o, s, _, _0, _1, _2, _3, _5, _6, _7, _8, _9`);
+var o, s, _, _0, _1, _2, _3, _5, _6, _7, _8, _9, _10`);
 assert(downLevel(`for(o of os) noSymbol`), `for (_ = 0; _ < os["length"] && (o = os[_], true); _++) noSymbol\r\nvar _, _0`)
 assert(downLevel(`for(var o of os) Symbol`), `try { for (var o, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0`)
 assert(downLevel(`for(var o of os) Symbol`), `try { for (var o, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0`)
@@ -324,9 +327,9 @@ assert(downLevel("if(a){}[r, g, b] = rgb4s(r, g, b, s)"), "if (a) {} _ = rgb4s(r
 assert(downLevel(`{c,[c]:b,...a}=a`), `c = a.c, b = a[c], a = rest_(a, ["c", c])`)
 assert(downLevel(`async()=>name = require("./$split")(name)["join"]("/");`), `function () { return async_(
 function () {
-_0 = require("./$split"); _1 = _0(name); name = _1["join"]("/"); return [name, 2]
+_0 = require("./$split"); _0 = _0(name); name = _0["join"]("/"); return [name, 2]
 })
-var _0, _1 };`);
+var _0 };`);
 i++//异步或步进函数
 assert(downLevel(`function *(){yield *a}`), `function () { return aster_(
 function () {
@@ -348,7 +351,7 @@ function () {
 return [5, 8]
 },
 function () {
-a; _2 = Symbol["iterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = Array["prototype"][_2]
+a; _2 = Symbol["iterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Array["prototype"]; _3 = Symbol["iterator"]; _2 = _2[_3]
 },
 function () {
 _0 = _2; _0 = _0["call"](b); _ = _0["next"](); return [1, 0]
@@ -371,7 +374,7 @@ if (!_2) return [1, 0]; _2 = _0["return"](); return [1, 0]
 function () {
 return [1, 9]
 })
-var a, _, _0, _2 }`)
+var a, _, _0, _2, _3 }`)
 assert(downLevel(`a={async a(){var b =c;return 1}}`), `a = (_ = {},
 _.a = function () { return async_(\r\nfunction () {\r\nb = c; return [1, 2]\r\n})\r\nvar b }, _)\r\nvar _`)
 assert(downLevel(`async function(){return 1}`), `function () { return async_(\r\nfunction () {\r\nreturn [1, 2]\r\n}) }`)

package/coms/compile/scanner2.js

@@ -154,13 +154,15 @@ class Code extends Array {
     // 提前处理属性
     break() {
         this.program.avoidMap = avoidMap;
-        this.program.detour(this.first);
+        var envs = this.program.detour(this.first);
+        if (this._scoped) extend(this.envs, envs);
         return this;
     }
     // 绕开低版本ie的异常属性
     detour(ie) {
         this.program.avoidMap = avoidMap;
-        this.program.detour(this.first, ie !== false);
+        var envs = this.program.detour(this.first, ie !== false);
+        if (this._scoped) extend(this.envs, envs);
         return this;
     }
     // 压缩

package/coms/compile/unstruct.js

@@ -7,9 +7,7 @@ var RETURN = { type: STRAP, text: "@ret" };// return;
 var THROW = { type: STRAP, text: "@throw" };// return;
 var YIELD = { type: STRAP, text: "@yield" };// return;
 var NEXT = { type: STRAP, text: "@next" };// return;
-var _break = function (body, cx, result, iscontinue) {
-    var re = result[result.length - 1];
-    if (!result.length || re.ret_ && !re.await_ && re.ret_ !== -2) return;
+var mount_break = function (body, cx, b1s, iscontinue) {
     var label;
     do {
         var o = body[++cx];
@@ -24,11 +22,11 @@ var _break = function (body, cx, result, iscontinue) {
             if (b.type === LABEL && b.text === label + ":") {
                 if (!s) s = b;
                 if (!b.breaks) b.breaks = [];
-                var _b = scanner2('return []');
-                _b.ret_ = -1;
-                if (iscontinue) _b[1].continue = s, s.continue = true;
-                b.breaks.push(_b[1]);
-                pushstep(result, _b);
+                if (iscontinue) s.continue = true;
+                b1s.forEach(b1 => {
+                    if (iscontinue) b1.continue = s
+                    b.breaks.push(b1);
+                });
                 break;
             }
             else {
@@ -41,16 +39,24 @@ var _break = function (body, cx, result, iscontinue) {
             var b = labels[cx];
             if (b.type !== LABEL && (!iscontinue || b.text !== 'switch')) {
                 if (!b.breaks) b.breaks = [];
-                var _b = scanner2("return []");
-                _b.ret_ = -1;
-                if (iscontinue) _b[1].continue = b, b.continue = true;
-                b.breaks.push(_b[1]);
-                pushstep(result, _b);
+                if (iscontinue) b.continue = true;
+                b1s.forEach(b1 => {
+                    if (iscontinue) b1.continue = b;
+                    b.breaks.push(b1);
+                })
                 break;
             }
         }
     }
     return bx;
+}
+var _break = function (body, cx, result, iscontinue) {
+    var re = result[result.length - 1];
+    if (!result.length || re.ret_ && !re.await_ && re.ret_ !== -2) return;
+    var _b = scanner2('return []');
+    _b.ret_ = -1;
+    mount_break(body, cx, [_b[1]], iscontinue);
+    pushstep(result, _b);
 };
 var _try = function (body, cx, unblock, result, getname) {
     var o = body[cx];
@@ -140,11 +146,13 @@ var _switch = function (body, cx, unblock, result, getname) {
     var tmp = [];
     while (o[cy] !== m) cy++;
     var default_ = null, case_ = null;
+    var cbindex = 0, cblength = 0;
     while (cy < o.length) {
         var block = getblock(o, ++cy);
         cy += block.length;
         while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
         cy++;
+        while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
         var getnextname = function (deep) {
             return getname(deep + 1);
         };
@@ -152,18 +160,43 @@ var _switch = function (body, cx, unblock, result, getname) {
         for (var q of q) if (q.length) pushstep(result, q);
         var qe = q;
         if (qe.name) case_ = scanner2(`if(${qn}===${qe.name})return[]`), pushstep(result, case_);
-        else default_ = case_ = scanner2(`return[]`), default_.ret_ = -1;
+        else default_ = case_ = scanner2(`return[]`), default_.ret_ = -2;
         var by = cy;
         m = o[cy];
         while (m && (m.type !== STRAP || !/^(default|case)$/i.test(m.text))) m = o[++cy];
-        tmp.push(result.length - 1, case_[case_.length - 1], o.slice(by, cy));
+        var cbody = o.slice(by, cy);
+        var cb0 = cbody[0];
+        if (cb0 && cb0.type === STRAP && (cb0.text === "break" || cb0.text === 'continue')) {
+            if (!cblength) {
+                var brks = [case_[case_.length - 1]];
+                while (tmp.length > cbindex) {
+                    tmp.pop();
+                    brks.push(tmp.pop());
+                    tmp.pop();
+                };
+                mount_break(cbody, 0, brks, cb0.text === 'continue');
+                cblength = 0;
+                cbindex = tmp.length;
+                continue;
+            }
+            cbindex = tmp.length + 3;
+            cblength = 0;
+        }
+        while (cbody.length) {
+            var cbe = cbody[cbody.length - 1];
+            if (cbe.type === SPACE) cbody.pop();
+            else if (cbe.type === STAMP && cbe.text === ';') cbody.pop();
+            else break;
+        }
+        cblength += cbody.length;
+        tmp.push(result.length - 1, case_[case_.length - 1], cbody);
     }
     if (!default_) {
-        default_ = scanner2(`return[]`), default_.ret_ = -1;
-        tmp.push(result.length - 1, default_[default_.length - 1], []);
+        default_ = scanner2(`return[]`), default_.ret_ = -2;
+        if (tmp.length) tmp.push(result.length - 1, default_[default_.length - 1], []);
     }
     var default_r = default_[default_.length - 1];
-    pushstep(result, default_);
+    if (tmp.length) pushstep(result, default_);
     default_r.index = result.length - 1;
     while (tmp.length) {
         cy = tmp.shift();
@@ -441,7 +474,7 @@ var remove_end_comma = function (o) {
 };
 var ispropcall = function (o) {
     var n = o.next;
-    if (!n || n.type !== SCOPED && n.entry !== '(') return false;
+    if (!n || n.type !== SCOPED || n.entry !== '(') return false;
     if (o.type === EXPRESS && snapExpressHead(o) !== o) return true;
     if (o.type === SCOPED && o.entry === '[' && snapExpressHead(o) !== o) return true;
     return false;
@@ -457,6 +490,7 @@ var _invoke = function (t, getname) {
     queue.name = t.name;
     var qname = t.name;
     var bx = 0;
+    var lastlink = false;
     for (var cx = 0; cx < t.length; cx++) {
         var o = t[cx];
         a: if (o.type === STRAP) {
@@ -482,6 +516,7 @@ var _invoke = function (t, getname) {
         }
         if (o.type === SCOPED && (o.entry === '[' || o.entry === "(")) {
             var _nameindex = nameindex;
+            nameindex += lastlink;
             remove_end_comma(o);
             var iseval = o.iseval = isEval(o);
             var constStart = 0;
@@ -532,16 +567,19 @@ var _invoke = function (t, getname) {
             for (var c of cache) pushstep(result, c);
             cache = [];
             var n = o.next;
-            if (n && !needbreak(n) && !ispropcall(o)) {
-                var h = snapExpressHead(o);
-                var hx = t.lastIndexOf(h, cx);
-                var fs = splice(t, hx, cx + 1 - hx, { type: EXPRESS, text: getname(nameindex) });
-                fs.unshift(...scanner2(`${getname(nameindex)}=`));
-                relink(fs);
-                fs.name = getname(nameindex);
-                pushstep(result, fs);
-                nameindex++;
-                cx = hx - 1;
+            if (n && !needbreak(n)) {
+                lastlink = n.type === SCOPED;
+                if (!ispropcall(o)) {
+                    var h = snapExpressHead(o);
+                    var hx = t.lastIndexOf(h, cx);
+                    var fs = splice(t, hx, cx + 1 - hx, { type: EXPRESS, text: getname(nameindex) });
+                    fs.unshift(...scanner2(`${getname(nameindex)}=`));
+                    relink(fs);
+                    fs.name = getname(nameindex);
+                    pushstep(result, fs);
+                    cx = hx - 1;
+                }
+                if (!lastlink) nameindex++;
             }
         }
     }

package/coms/compile/unstruct_test.js

@@ -77,9 +77,9 @@ test("do{await b}while(a)", "_ = b; return [_, 1];\r\n _ = @; if (a) return [-1,
 test("switch(a){case 1:}", "if (a === 1) return [1, 0]; return [1, 0]", true);
 test("switch(a){case 1: default:}", "if (a === 1) return [1, 0]; return [1, 0]", true);
 test("switch(a.a){case 1:}", "_ = a.a; if (_ === 1) return [1, 0]; return [1, 0]", true);
-test("switch(a){case 1:break;}", "if (a === 1) return [1, 0]; return [1, 0]", true);
-test("switch(a){case 1:break;case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [1, 0]", true);
-test("switch(a){case 1:case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [1, 0]", true);
+test("switch(a){case 1:break;}", "if (a === 1) return [1, 0]", true);
+test("switch(a){case 1:break;case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]", true);
+test("switch(a){case 1:case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]", true);
 test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
 test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
 test("with(a){ a = 1}", `if (_ = with_("a", [a])) _.a = 1; else a = 1;`, true);
@@ -121,5 +121,11 @@ test("menus[a+b].name+='aaa'", "_ = a + b; _ = menus[_]; _0 = _.name + 'aaa'; _.
 test("menus[a+b]()", "_ = a + b; menus[_]()", true);
 test(`switch(a){default: a;case 1:b;}`, 'if (a === 1) return [2, 0]; return [1, 0];\r\n a; return [1, 0];\r\n b; return [1, 0]', true);
 test("loop:{a=b;if(a) continue loop}", "a = b; if (a) return [0, 0]", true);
-test("if(a)try{}finally{}else a;", 'if (!a) return [4, 0]; return [1, 8];\r\nreturn [0, 9];\r\nreturn [1, 9];\r\nreturn [2, 0];\r\na; return [1, 0]')
-test("if(a)try{}finally{}else;", 'if (!a) return [4, 0]; return [1, 8];\r\nreturn [0, 9];\r\nreturn [1, 9];\r\nreturn [1, 0]');
+test("if(a)try{}finally{}else a;", 'if (!a) return [4, 0]; return [1, 8];\r\n return [0, 9];\r\n return [1, 9];\r\n return [2, 0];\r\n a; return [1, 0]')
+test("if(a)try{}finally{}else;", 'if (!a) return [4, 0]; return [1, 8];\r\n return [0, 9];\r\n return [1, 9];\r\n return [1, 0]');
+test("b:while(t){switch(a){case c:break b;}}", 'if (!t) return [1, 0]; if (a === c) return [1, 0]; return [0, 0]');
+test("predef[key[1]](r.slice(key[0].length).trim())", '_ = key[1]; _0 = key[0].length; _0 = r.slice(_0); _0 = _0.trim(); predef[_](_0)');
+test("predef[key[1]](r.slice())(r.slice())", '_ = key[1]; _0 = r.slice(); _ = predef[_](_0); _0 = r.slice(); _(_0)');
+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]');

package/package.json

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