efront 4.15.3 → 4.17.0

package/coms/compile/Javascript.js

@@ -44,7 +44,7 @@ var colonstrap_reg = /^(case|default)$/;
 class Javascript extends Program {
     straps = straps;
     value_reg = /^(false|true|null|Infinity|NaN|undefined|eval)$/
-    transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|default|instanceof|throw|extends|import|from)$/
+    transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|instanceof|throw|extends|import|from)$/
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
     forceend_reg = /^(return|yield|break|continue|debugger|async)$/;
     defaultType = EXPRESS;
@@ -137,7 +137,6 @@ var setStrapExpress = function (mark_type, mark_text, prop, o, default_type) {
         if (pp && pp.type === STAMP && pp.text === "*") pp = pp.prev;
         isfunc = pp && pp.type === STRAP && pp.text === 'function';
         if (isfunc) break;
-
         q = q.queue;
     }
     if (isfunc) {
@@ -211,6 +210,16 @@ var fixType = function (o) {
                     type = EXPRESS;
                 }
             }
+            else if (m === 'of') {
+                if (!last) {
+                    type = EXPRESS;
+                    break;
+                }
+                var qp = queue.prev;
+                if (qp?.type === STRAP && qp.text === 'await') qp = qp.prev;
+                if (qp?.type === STRAP && qp.text === 'for') type = STRAP;
+                else type = EXPRESS;
+            }
             break;
     }
     if (type === PROPERTY) o.isprop = true;
@@ -259,11 +268,10 @@ var setObject = function (o) {
             continue;
         }
         m.isprop = true;
-        if (m.type === EXPRESS || m.type === QUOTED) {
+        if (m.type === EXPRESS || m.type === STRAP) {
             if (!/\./.test(m.text)) m.type = PROPERTY;
         }
         if (m.prev && m.prev.type === PROPERTY) {
-
             m.prev.type = STRAP;
         }
     }
@@ -378,7 +386,11 @@ Javascript.prototype.setType = function (o) {
     }
     if (o.type === STRAP) switch (o.text) {
         case "yield": setYieldExpress(o, this.defaultType); break;
-        case "await": setAwaitExpress(o, this.defaultType); break;
+        case "await":
+            var p = o.prev;
+            if (p?.type === STRAP && p.text === 'for') break;
+            setAwaitExpress(o, this.defaultType);
+            break;
     }
     if (o.type === EXPRESS && last?.type === EXPRESS && !last.isend && /^(async|await|yield)$/.test(last.text)) {
         last.type = STRAP;
@@ -784,7 +796,7 @@ var removeImport = function (c, i, code) {
             else {
                 if (!name) name = name1;
                 used[name1].forEach(u => {
-                    compile$patchname(name, u, ".default");
+                    patchname(name, u, ".default");
                 });
             }
         }
@@ -877,6 +889,16 @@ var removeExport = function (c, i, code) {
         code.exportDefault = true;
         n.next.isExpress = true;
         c.type = EXPRESS;
+        var d = n.next;
+        if (d.type === STRAP && /^(class|function|var|let|const)$/.test(d.text)) {
+            d = d.next;
+            if (d.type === EXPRESS && !/[\.\[]/.test(d.text)) {
+                code.used[d.tack].forEach(o => {
+                    if (d === o) return;
+                    patchname('', o, "exports.default");
+                })
+            }
+        }
         return;
     }
     var [dec, map, o] = getDeclared(n.next, 'export');
@@ -961,10 +983,14 @@ Javascript.prototype.newVar = function (used, string_template) {
     return name;
 }
 Javascript.prototype.fix = function (code) {
+    var hasExport = false;
     backEach(code, function (o, i) {
         if (o.type !== STRAP) return;
         if (o.text === 'import') removeImport.call(this, o, i, code);
-        else if (o.text === 'export') removeExport.call(this, o, i, code);
+        else if (o.text === 'export') {
+            hasExport = true;
+            removeExport.call(this, o, i, code);
+        }
     }, this);
     if (code.exportStars) {
         var exportStars = code.exportStars;
@@ -1033,8 +1059,10 @@ Javascript.prototype.fix = function (code) {
             }
         });
     }
+    if (hasExport) code.export = true;
     relink(code);
     setqueue(code);
+    return code;
 }
 Javascript.prototype.createString = createString;
 Javascript.prototype.createScoped = createScoped;

package/coms/compile/Javascript_test.js

@@ -7,6 +7,7 @@ var testFix = function (a, e) {
 }
 js.debug = true;
 assert(scanner2("/a/g", js)[0].type, common.QUOTED);
+testFix(`export default function a(){} a.a=1`, `exports.default = function a() {} exports.default.a = 1`);
 testFix(`export * from "a";`, 'var a = require("a");\r\nexports.default = undefined\r\nextendIfNeeded(exports, a)');
 testFix(`export {A} from "a";`, 'var a = require("a")\r\nexports.A = a.A;');
 testFix(`import a from "a";console.log(a)`, 'var a = require("a"); console.log(a.default)');

package/coms/compile/Program.js

@@ -852,6 +852,10 @@ class Program {
                         else queue.inExpress = scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(last.text);
                     }
                     else if (last.type === EXPRESS) a: {
+                        if (last.text === '...') {
+                            scope.isObject = true;
+                            break a;
+                        }
                         var li = queue.length - 1;
                         var lp = queue[li];
                         while (lp !== last) {

package/coms/compile/common.js

@@ -32,7 +32,7 @@ var skipAssignment = function (o, cx) {
         var ox = cx;
         o = body[ox];
         while (o && o.type & (SPACE | COMMENT)) o = body[++ox];
-        cx = ox + 1;
+        cx = ox;
     }
     else if (o.type & (SPACE | COMMENT)) o = o.next;
     var needpunc = false;
@@ -558,7 +558,7 @@ var createScoped = function (parsed, wash) {
             var function_obj = null;
             if (o.type === STAMP && equal_reg.test(o.text)) {
                 var p = snapExpressHead(o.prev);
-                if (!p || p.type & (STRAP | STAMP) || !p.isExpress) {
+                if (!p || p.type & (STRAP | STAMP) || p.type !== EXPRESS && !p.isExpress) {
                     let n = o.next;
                     if (n && n.type & (EXPRESS | VALUE)) {
                         n.equal = o;
@@ -586,6 +586,14 @@ var createScoped = function (parsed, wash) {
                     break;
                 case PROPERTY:
                     if (!o.short) break;
+                    switch (o.text) {
+                        case "yield":
+                            scoped.yield = false;
+                            break;
+                        case "await":
+                            scoped.await = false;
+                            break;
+                    }
                 case VALUE:
                     if (o.isdigit || /^(null|false|true)$/.test(o.text)) break;
                 case EXPRESS:
@@ -651,7 +659,12 @@ var createScoped = function (parsed, wash) {
                             funcbody.return.push(o);
                             break;
                         case "await":
-                            funcbody.async = funcbody.await = true;
+                            funcbody.await = true;
+                            if (!funcbody.async) saveTo(used, 'await', o);
+                            break;
+                        case "yield":
+                            funcbody.yield = true;
+                            if (!funcbody.aster) saveTo(used, 'yield', o);
                             break;
                         case "as":
                         case "from":
@@ -776,7 +789,7 @@ var createScoped = function (parsed, wash) {
                     lets = vars;
                     if (isFunction) {
                         vars.this = true, vars.arguments = true;
-                        scoped.yield = scoped.aster = isAster;
+                        scoped.aster = isAster;
                         thisscope = scoped;
                         argscope = scoped;
                     }
@@ -797,16 +810,16 @@ var createScoped = function (parsed, wash) {
                     }
                 }
                 if (isArrow);
-                else while (o && o.isExpress && o.type !== SCOPED) {
+                else while (o && (o.type !== SCOPED || o.entry === '[')) {
                     o = o.next;
                     if (o && o.type === EXPRESS) {
-                        saveTo(used, o.text, o);
+                        var tack = o.text.replace(/[\.\[][\s\S]*$/, '');
+                        saveTo(used, tack, o);
                         if (o.prev && o.prev.type === STRAP && o.prev.text === 'extends') continue;
-                        lets[o.text] = true;
+                        lets[tack] = true;
                         o.kind = isFunction ? 'function' : 'class';
                         o = o.next;
                     }
-                    if (isFunction) break;
                 }
                 if (!isFunction) while (o.type !== SCOPED) {
                     // if (o.next && o.next.type === STAMP && o.next.text === "=>") break;
@@ -959,23 +972,55 @@ var createScoped = function (parsed, wash) {
     }
     if (vars.yield) scoped.yield = false;
     if (vars.await) scoped.await = false;
-    if (scoped.yield !== false && envs.yield) {
+    y: if (scoped.yield !== false && envs.yield) {
+        for (var s of scoped) if (s.isfunc && s.envs.yield) break y;
+        for (var s of used.yield) if (s.kind || s.isprop || hasEqual(s)) break y;
         used.yield.forEach(o => o.type = STRAP);
         scoped.yield = scoped.aster = true;
         delete envs.yield;
         delete used.yield;
     }
-    if (scoped.await !== false && envs.await) {
+    a: if (scoped.await !== false && envs.await) {
+        for (var s of scoped) if (s.isfunc && s.envs.await) break a;
+        for (var s of used.await) if (s.kind || s.isprop || hasEqual(s)) break a;
         used.await.forEach(o => o.type = STRAP);
         scoped.await = scoped.async = true;
         delete envs.await;
         delete used.await;
     }
+    if (used.yield) {
+        used.yield.forEach(o => { if (o.type === STRAP) o.type = EXPRESS });
+    }
+    if (used.await) {
+        used.await.forEach(o => { if (o.type === STRAP) o.type = EXPRESS });
+    }
     delete envs.eval;
     delete envs.new;
     scoped.envs = envs;
     return scoped;
 };
+var hasEqual = function (s) {
+    while (s) {
+        if (s.equal) return true;
+        var sn = s.next;
+        if (sn?.type === STRAP) {
+            if (sn.text === 'of') return true;
+            if (sn.text === "in") {
+                var q = s.queue;
+                if (q.entry === '(') {
+                    var qp = q.prev;
+                    if (qp.type === STRAP && qp.text === 'await') qp = qp.text;
+                    if (qp.type === STRAP && qp.text === 'for') return true;
+                }
+            }
+        }
+        var sp = s.prev;
+        if (sp?.type === STRAP && sp.text === 'as') return true;
+        s = s.queue;
+    }
+    return false;
+};
+
 var getDeclared = function (o, kind, queue) {
     var declared = [], used = Object.create(null); var skiped = [];
     var prop = null;
@@ -1007,18 +1052,31 @@ var getDeclared = function (o, kind, queue) {
         }
         switch (o.type) {
             case SCOPED:
-                if (snapExpressFoot(o) === o) {
+                var foot = snapExpressFoot(o);
+                if (!prop) prop = declared["..."] ? declared["..."][1] - index : `[${index}]`;
+                if (foot === o) {
                     var [d, u, _, s] = getDeclared(o.first, kind, o);
                     while (s.length) skiped.push.apply(skiped, s.splice(0, 1024));
                     mergeTo(used, u);
                     if (d.length || d.attributes.length) declared.push(d);
-                    if (!prop) prop = declared["..."] ? declared["..."][1] - index : `[${index}]`;
                     d.entry = o.entry;
                     o.kind = kind;
                     attributes.push([prop, d]);
                     o = o.next;
                     break;
                 }
+                else {
+                    var s = [];
+                    while (foot !== o) {
+                        s.push(o);
+                        o = o.next;
+                    }
+                    s.push(foot);
+                    skiped.push(...s);
+                    o = o.next;
+                    attributes.push([prop, s]);
+                    break;
+                }
             case STAMP:
                 var next = o.next;
                 if (o.text === "*" && next) {
@@ -1044,11 +1102,12 @@ var getDeclared = function (o, kind, queue) {
             case EXPRESS:
             case STRAP:
             case VALUE:
-                var isrest = /^\.\.\./.test(o.text);
                 var n = o;
                 var k = o.text;
-                if (isrest) declared.push(k = k.slice(3))
-                else if (o.text) declared.push(k);
+                var isrest = /^\.\.\./.test(k);
+                if (isrest) k = k.slice(3);
+                var isdec = !/[\.\[]/.test(k);
+                if (k && isdec) declared.push(k);
                 if (!isrest) {
                     var prev = o.prev;
                     if (prev?.type === STAMP && prev.text === '...') {
@@ -1078,7 +1137,7 @@ var getDeclared = function (o, kind, queue) {
                 o = f.next;
                 break;
             default:
-                console.log(createString(pickSentence(queue)));
+                console.log(createString(pickSentence(queue)), o.text, o.type);
                 throw new Error(i18n`代码结构异常`);
         }
         if (!o) break;
@@ -1094,7 +1153,7 @@ var getDeclared = function (o, kind, queue) {
                     o.prev.equal = o;
                     o = o.next;
                     var o0 = skipAssignment(o);
-                    if (isrest) throw i18n`余集变量不能有默认值`;
+                    if (isrest) throw new Error(i18n`余集变量不能有默认值`);
                     attributes[attributes.length - 1].push(queue, o, o0);
                     while (o !== o0) {
                         skiped.push(o);
@@ -1274,30 +1333,28 @@ var createString = function (parsed) {
                 // 每一次要远行，我都不得不对自己的物品去粗取精。取舍之间，什么重要，什么不是那么重要，都有了一道明显的分界线。
                 if (uncomment) break;
                 var tmp = o.text, opentmp = false;
-                if (helpcode) {
-                    if (helpreg.test(tmp)) {
-                        opentmp = true;
-                        if (/^\/\*/.test(tmp)) opentmp = 2;
-                        tmp = tmp.replace(helpreg, '');
-                        cacheresult = [];
-                        result = cacheresult;
-                        result.push("/* [[ 开发辅助代码: */");
-                    }
-                    if (/--\!?\>\s*(?:\*\/)?$/.test(tmp) && result !== finalresult) {
-                        if (!opentmp) tmp = tmp.replace(/^\/[\/\*]\s*/, '');
-                        tmp = tmp.replace(/\s*--\!?\>\s*(?:\*\/)?$/, "");
-                        if (tmp) {
-                            result.push(tmp);
-                        }
-                        result.push("/* ]] */");
-                        opentmp = true;
-                        if (helpcode && cacheresult) finalresult = finalresult.concat(cacheresult), cacheresult = [];
-                        result = finalresult;
-                    }
-                    else if (opentmp) {
-                        if (opentmp === 2) tmp = tmp.replace(/\s*\*\/$/, '');
-                        if (tmp) result.push("\r\n", tmp);
+                if (helpreg.test(tmp)) {
+                    opentmp = true;
+                    if (/^\/\*/.test(tmp)) opentmp = 2;
+                    tmp = tmp.replace(helpreg, '');
+                    cacheresult = [];
+                    result = cacheresult;
+                    result.push("/* [[ 开发辅助代码: */");
+                }
+                if (/--\!?\>\s*(?:\*\/)?$/.test(tmp) && result !== finalresult) {
+                    if (!opentmp) tmp = tmp.replace(/^\/[\/\*]\s*/, '');
+                    tmp = tmp.replace(/\s*--\!?\>\s*(?:\*\/)?$/, "");
+                    if (tmp) {
+                        result.push(tmp);
                     }
+                    result.push("/* ]] */");
+                    opentmp = true;
+                    if (helpcode && cacheresult) finalresult = finalresult.concat(cacheresult), cacheresult = [];
+                    result = finalresult;
+                }
+                else if (opentmp) {
+                    if (opentmp === 2) tmp = tmp.replace(/\s*\*\/$/, '');
+                    if (tmp) result.push("\r\n", tmp);
                 }
                 if (keepspace && !opentmp) {
                     if (patchspace && lasttype !== SPACE && lasttype !== EXPRESS) result.push(" ");
@@ -1488,6 +1545,7 @@ var isHalfSentence = function (body, i) {
     while (a && a.type & (SPACE | COMMENT)) a = body[--i];
     if (!a) return false;
     if (a.type === STRAP && a.text === 'else') return true;
+    if (a.type === STAMP && (a.unary || !/^(;|\+\+|\-\-)$/.test(a.text))) return true;
     if (a.type !== SCOPED || a.entry !== "(") return false;
     a = a.prev;
     if (!a || a.type !== STRAP) return false;

package/coms/compile/downLevel.js

@@ -42,6 +42,16 @@ var unslice = function (arr) {
         }
     };
 };
+var patchCurve = function (b) {
+    if (b.length > 1) {
+        var b0 = b[0];
+        if (b0.brace) {
+            b[0] = scanner2(`()`)[0];
+            b[0].push(b0);
+            relink(b[0]);
+        }
+    }
+}
 // 解构赋值
 var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
     var tmpname = '';
@@ -52,11 +62,11 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
         var [k, v] = d;
         var dp = 0;
         if (typeof k === 'number' && k < 0) {
-            if (iter) throw i18n`暂不支持在当前语境读取尾部非剩余元素`;
+            if (iter) throw new Error(i18n`暂不支持在当前语境读取尾部非剩余元素`);
             dp = 1;
             k = `${tmpname}["length"]>${doged - k - 1}?${tmpname}[${tmpname}["length"] - ${-k}]:undefined`;
         } else {
-            if (rootenvs.Symbol && /\[\d+\]/.test(k)) {
+            if (rootenvs.Symbol && /\[\d+\]/.test(k) && iter) {
                 var inc = parseInt(k.slice(1, k.length - 1));
                 inc++;
                 while (iter.index < inc) iter.next();
@@ -235,8 +245,18 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
         return single(v, p);
     };
     if (_var && i < queue.length) splice(queue, i++, 0, { type: STRAP, text: _var });
+    var i0 = i;
     loop: while (i < queue.length) {
         var o = queue[i];
+        if (o.type === STAMP) {
+            switch (o.text) {
+                case ",":
+                    i++;
+                    continue;
+                case ";":
+                    return i;
+            }
+        }
         var next = snapExpressFoot(o).next;
         tmpname = '';
         var index0 = index;
@@ -317,6 +337,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
                 var a = single(d, '');
                 if (a) {
                     if (index > 0) splice(queue, i++, 0, { type: STAMP, text: ',' });
+                    patchCurve(a[1]);
                     var i2 = skipAssignment(queue, i);
                     var restq = splice(queue, i, i2 - i, ...a[1], { type: STAMP, text: "=" });
                     killobj(restq);
@@ -341,12 +362,12 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
                     }
                     splice(queue, i = i2, 0, ...q);
                     i += q.length;
-                    index++;
                     continue;
                 }
             }
             tmpname = getobjname(0);
-            splice(queue, i, 0, { type: EXPRESS, text: tmpname }, { type: STAMP, text: "=" });
+            if (i > i0) splice(queue, i++, 0, { type: STAMP, text: ',' }, { type: EXPRESS, text: tmpname }, { type: STAMP, text: "=" });
+            else splice(queue, i, 0, { type: EXPRESS, text: tmpname }, { type: STAMP, text: "=" });
             i += 2;
             var i2 = skipAssignment(queue, i);
             var n = queue[i2];
@@ -356,8 +377,10 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
         }
         for (var o0 of objs) {
             deep = 0;
-            var [[d]] = getDeclared(o0);
-            dog(d);
+            var dd = getDeclared(o0)[0];
+            var d = dd[0];
+            if (!d) dog(dd.attributes[0][1]);
+            else dog(d);
         }
         if (hasnext && index > index0) {
             splice(queue, i++, 0, { type: STAMP, text: ',' });
@@ -1322,7 +1345,7 @@ var killarg = function (head, body, _getname, setarg = true) {
             cname = '';
             collect = index + 1;
         }
-        else throw i18n`参数声明异常！`;
+        else throw new Error(i18n`参数声明异常！`);
         if (o && o.type === STAMP) {
             if (o.text === ',') {
                 o = o.next; continue;

package/coms/compile/downLevel_test.js

@@ -338,18 +338,45 @@ var _0 };`);
 i++//异步或步进函数
 assert(downLevel(`function *(){yield *a}`), `function () { return aster_(
 function () {
-_; _0 = 0; return [1, 0]
+return [9, 8]
 },
 function () {
-_3 = _0 < a["length"]; if (!_3) return [1, 0]; _ = a[_0]; _3 = true
+_; _3 = Symbol["asyncIterator"]; _3 = a[_3]; if (_3) return [1, 0]; _3 = Symbol["iterator"]; _3 = a[_3]; if (_3) return [1, 0]; _3 = Array["prototype"]; _4 = Symbol["iterator"]; _3 = _3[_4]
 },
 function () {
-if (!_3) return [2, 0]; return [_, 3]
+_1 = _3; _1 = _1["call"](a); _3 = _1["next"](); return [_3, 1]
+},
+function (_2) {
+_3 = _2; _0 = _3; return [1, 0]
+},
+function () {
+_3 = !_0["done"]; if (!_3) return [2, 0]; _3 = _0["value"]; return [_3, 1]
+},
+function (_2) {
+_3 = _2; _ = _3; _3 = true
+},
+function () {
+if (!_3) return [3, 0]; return [_, 3]
+},
+function () {
+_3 = _1["next"](); return [_3, 1]
+},
+function (_2) {
+_3 = _2; _0 = _3; return [-4, 0]
 },
 function () {
-_3 = _0++; return [-2, 0]
+return [0, 9]
+},
+function () {
+_3 = _0; if (!_3) return [1, 0]; _3 = !_0["done"]; if (!_3) return [1, 0]; _3 = _1["return"]; _3 = isFunction(_3)
+},
+function () {
+if (!_3) return [1, 0]; _3 = _1["return"](); return [1, 0]
+},
+function () {
+return [1, 9]
 })
-var _, _0, _1, _3 }`)
+var _, _0, _1, _3, _4 }`)
 assert(downLevel(`async function(){}`), `function () { return async_() }`)
 assert(downLevel(`async function(){for(var a of b){Symbol}}`), `function () { return async_(
 function () {
@@ -424,7 +451,6 @@ function (_) {
 _0 = _; _0 = _0.a; a = _0
 })
 var a, _0`)
-
 assert(downLevel(`async a=>await a`), `function (a) { return return async_(
 function () {
 _0 = a; return [_0, 1]
@@ -437,10 +463,36 @@ _.set = function (v) {}, _))
 var _`);
 assert(downLevel(`var restq = splice(queue, i, i2 - i, ...a[1], { type: STAMP, text: "=" });`), `var slice_ = Array["prototype"]["slice"];
 var restq = splice["apply"](null, [queue, i, i2 - i]["concat"](slice_["call"](a[1]), [{ type: STAMP, text: "=" }]));`)
-var c = scanner2(`\r\n    if (search.length) return null;\r\n    return path.join(...pathlist);\r\n`);
-c.fix();
-c.break();
-assert(c.toString(), `\r\n    if (search["length"]) return null;\r\n    return path["join"](...pathlist);\r\n`)
+var c = scanner2(`\r\n    if (search.length) return null;\r\n    return path.join(...pathlist);\r\n`); i++
+c.fix(); i++
+c.break(); i++
+assert(c.toString(), `\r\n    if (search["length"]) return null;\r\n    return path["join"](...pathlist);\r\n`);
 assert(downLevel.code(c).toString(), `\r\n    if (search["length"]) return null;\r\n    return path["join"]["apply"](path, pathlist);\r\n`);
 downLevel.debug = true; i++;
 assert(downLevel(`Symbol;var c = (a.data || (a.data = {})).transition = no(this);`), 'Symbol; var c = (a.data || (a.data = {})).transition = no(this);', true);
+assert(downLevel(`[a.b]=[1]`), 'a.b = [1][0]')
+assert(downLevel(`[a[b]]=[1]`), 'a[b] = [1][0]')
+assert(downLevel(`[(a)[b]]=[1]`), '(a)[b] = [1][0]')
+assert(downLevel(`[[a][b]]=[1]`), '[a][b] = [1][0]')
+assert(downLevel(`[a,{}.b,c]=[1]`), '_ = [1], a = _[0], {}.b = _[1], c = _[2]\r\nvar _')
+assert(downLevel(`[{}.b,c]=[1]`), '_ = [1], {}.b = _[0], c = _[1]\r\nvar _')
+assert(downLevel(`[{}.b]=[1]`), '({}).b = [1][0]')
+assert(downLevel(`[[[a[b]]]]=[1]`), 'a[b] = [1][0][0][0]')
+assert(downLevel(`[[[{}[b]]]]=[1]`), '({})[b] = [1][0][0][0]')
+assert(downLevel(`[...a[b]]=[1]`), 'var slice_ = Array["prototype"]["slice"];\r\n_ = [1], a[b] = slice_["call"](_, 0)\r\nvar _')
+assert(downLevel(`[a,...{length}]=[1]`), 'var slice_ = Array["prototype"]["slice"];\r\n_ = [1], a = _[0], _0 = slice_["call"](_, 1), length = _0.length\r\nvar _, _0')
+assert(downLevel(`[...{length}]=[1]`), `var slice_ = Array["prototype"]["slice"];
+_ = [1], _0 = slice_["call"](_, 0), length = _0.length
+var _, _0`)
+assert(downLevel(`[...{}[a]]=[1]`), `var slice_ = Array["prototype"]["slice"];
+_ = [1], {}[a] = slice_["call"](_, 0)
+var _`)
+assert(downLevel(`,{...{}[a]}=[1]`), `_ = [1], {}[a] = rest_(_, [])
+var _`)
+assert(downLevel(`var res=null,res2=1,{...{}[a]}=[1]`), `var res = null, res2 = 1, _ = [1], {}[a] = rest_(_, [])
+var _`);
+assert(downLevel(`var res=null,{...{}[a]}=[1]`), `var res = null, _ = [1], {}[a] = rest_(_, [])
+var _`)
+assert(downLevel(`,{b,...{}[a]}=[1]`), `_ = [1], b = _.b, {}[a] = rest_(_, ["b"])
+var _`)
+assert(downLevel(`var penddings = {}, circle = [], module_keys = [];`), `var penddings = {}, circle = [], module_keys = [];`)

package/coms/compile/run-test262.js

@@ -49,6 +49,7 @@ await async function () {
         aster_,
         async_,
         asyncAster_,
+        extends_,
         isFunction,
         restIter_,
         rest_,
@@ -59,6 +60,7 @@ await async function () {
     var ignore = [
         "dynamic-import",
         "intl402",
+        "identifiers",
         "built-ins",
     ];
     ignore.forEach(k => ignore[k] = true);
@@ -94,15 +96,17 @@ await async function () {
              * @type {vm.RunningCodeInNewContextOptions}
              */
             var ctxOptions = {
+                timeout: 1000,
                 filename: f,
-                displayErrors: false,
+                displayErrors: true,
             };
-            running = true;
-            if (code.envs.$DONE) harness.$DONE = function (e) {
-                if (e) console.fail(ti, f + "\r\n"), console.log(currentText), console.trace(e), process.exit();
-            };
-            vm.runInThisContext(text, ctxOptions);
-            running = false;
+            var sandbox = Object.create(null);
+            for (var k in code.envs) {
+                if (k in harness) sandbox[k] = harness[k];
+            }
+            var ctx = vm.createContext(sandbox);
+            var p = vm.runInContext(text, ctx, ctxOptions);
+            await Promise.race([p, wait(1000)]);
         };
         var ti = `${i}/${testFiles.length}`;
         var data = await fs.readFile(f);
@@ -119,23 +123,29 @@ await async function () {
         currentText = text;
         currentIndex = ti;
         if (text) {
+            running = true;
             try {
                 console.test("执行", ti, f);
                 await runText(text);
             } catch (e) { de = e };
+            running = false;
         }
         if (de) try {
+            running = true;
             try {
                 console.test("检查", ti, f);
                 await runText(data);
-            } catch (e) { de = null };
+            } catch (e) {
+                if (typeof e === typeof de) de = null
+            };
+            running = false;
         } catch { de = null; }
         if (!text && de) {
             console.log(de)
             console.fail(ti, f);
             throw de;
         }
-        console.pass(path.relative(testpath, f));
+        console.pass(ti, path.relative(testpath, f));
     }, 1, null);
     console.log(`\r\n完成 ${testFiles.length} 个测试项！`);
 }();