efront 4.0.17 → 4.0.19

package/coms/basic/strings.js

@@ -34,9 +34,14 @@ function encode(str, q = "\"", escapeUnicode = true) {
 function decode(s) {
     var r = /^(['"`])([\s\S]*)\1$/.exec(s);
     if (!r) return s;
-    return r[2].replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\([0-7]{1,3}|[\s\S])/ig, (a, b) => {
+    return r[2].replace(/\\u\{[0-9a-f]+\}|\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\([0-7]{1,3}|[\s\S])/ig, (a, b) => {
         if (!b) {
-            return String.fromCharCode(parseInt(a.slice(2), 16));
+            a = parseInt(a.slice(2).replace(/^\{(.*)\}$/, '$1'), 16);
+            if (a > 0xffff) {
+                a -= 0x10000;
+                return String.fromCharCode((0b11011000 | a >> 18) << 8 | a >> 10 & 0xff, (0b11011100 | a >> 8 & 0b00000011) << 8 | a & 0xff);
+            }
+            return String.fromCharCode(a);
         }
         if (unescapeMap.hasOwnProperty(a)) return unescapeMap[a];
         if (/^[0-7]+$/.test(b)) return String.fromCharCode(parseInt(b, 8));

package/coms/basic_/Symbol.js

@@ -30,6 +30,8 @@ var Symbol = this.Symbol || function () {
     };
     try {
         Object.defineProperty(Array.prototype, Symbol.iterator, { value: iterator, enumerable: false })
-    } catch { }
+    } catch {
+        Array.prototype[Symbol.iterator] = iterator;
+    }
     return Symbol;
 }();

package/coms/basic_/aster_.js

@@ -1,7 +1,10 @@
 class Generator {
     constructor(f) {
         this.state = "suspended";
-        this.exec = f;
+        this.exec = f.bind(this, this.return, this.throw, function (value, next) {
+            this.exec = next;
+            this.value = value;
+        });
     };
     throw(e) {
         delete this.exec;
@@ -13,15 +16,12 @@ class Generator {
         this.state = "closed";
         return { value: undefined, done: true };
     }
-    next() {
+    next(arg) {
         if (this.exec) {
             var exec = this.exec;
             delete this.exec;
             delete this.value;
-            exec(this.return, this.throw, (value, exec) => {
-                this.value = value;
-                this.exec = exec;
-            });
+            exec(arg);
         }
         return { value: this.value, done: !this.exec };
     }

package/coms/basic_/asyncAster_.js

@@ -1,7 +1,11 @@
 class AsyncGenerator {
     constructor(f) {
         this.state = "suspended";
-        this.exec = f;
+        this.exec = f.bind(this, this.return, this.throw, (value, next) => {
+            this.exec = next;
+            delete this.promise;
+            this.resolve({ value, done: false });
+        })
     };
     throw(e) {
         delete this.exec;
@@ -13,30 +17,20 @@ class AsyncGenerator {
         this.state = "closed";
         return Promise.resolve({ value: undefined, done: true });
     }
-    next() {
+    next(a) {
         if (this.exec) {
             var exec = this.exec;
             delete this.exec;
             delete this.value;
-            return this.promise = new Promise(function (ok, oh) {
-                exec(function (result) {
-                    delete this.promise;
-                    ok(result);
-                    this.return(result);
-                }, function (error) {
-                    delete this.promise;
-                    oh(error);
-                    this.throw(error);
-                }, (value, exec) => {
-                    delete this.promise;
-                    ok({ value: value, done: !this.exec })
-                    this.value = value;
-                    this.exec = exec;
-                });
-            })
+            this.promise = new Promise(ok => {
+                this.resolve = ok;
+                exec(a);
+            });
+            return this.promise;
         }
         else if (this.promise) {
-            return this.promise.then(this.next, this.next);
+            var next = () => this.next(a);
+            return this.promise.then(next, next);
         }
         return Promise.resolve({ value: undefined, done: true });
     }

package/coms/basic_/exec_.js

@@ -1,22 +1,23 @@
 var exec_ = function (args, ok, oh, int) {
-    var p = null, index = 0, r, finished = false, t = this;
+    var p = null, index = 0, r, e, finished = false, t = this;
     var next = function (arg) {
         p = arg;
         run();
     };
-    var catches = [], catch_;
+    var catches = [], catch_, throwed;
     var thro = function (err) {
         if (catch_) {
             fina();
         }
         else if (catches.length) {
             catch_ = catches.pop();
-            [index, p] = catch_;
+            [index, p, throwed] = catch_;
             index += p & 0xffff;
             if (p >>> 16) {
                 next(err);
             }
             else {
+                e = err;
                 fina();
             }
         }
@@ -44,7 +45,10 @@ var exec_ = function (args, ok, oh, int) {
     }
     var run = function () {
         var args_length = args.length, i;
-        if (finished && !catch_ || index >= args_length) return ok(r);
+        if (!catch_ || index >= args_length) {
+            if (throwed) return oh();
+            if (finished) return ok(r);
+        }
         while (index < args_length) {
             try {
                 [p, i] = args[index].call(t, p) || [1, 0];
@@ -61,7 +65,8 @@ var exec_ = function (args, ok, oh, int) {
                     else return next(p);
                 case 2: return finished = true, retn(p); // return p;
                 case 3: return index++, int(p, next); // yield p;
-                case 7: index++; catches.push([index, p]); break; // try start
+                case 7: index++; catches.push([index, p]); break; // try catch finally?
+                case 8: index++; catches.push([index, p, 1]); break; // try finally
                 case 9: return p ? fine() : fina(); // finally
                 default: throw "代码异常！";
             }

package/coms/compile/Javascript.js

@@ -75,12 +75,6 @@ Javascript.prototype.fixType = function (o) {
     if (m === 'yield') {
         var temp = queue;
         var type = STRAP;
-        if (queue.entry === '[' || queue.isClass || queue.isObject || last && (last.type === STAMP && (
-            queue[queue.length - 1].type !== SPACE && /^(\+\+|\-\-)$/.test(last.text)
-            || !/^(>>>?=|<<=|[^><!=]=|[,;])/.test(last.text)
-        ) || last.type === STRAP)) {
-            type = EXPRESS;
-        }
         if (type === STRAP) while (temp) {
             if (temp.entry != "{" || !temp.prev || temp.prev.type !== SCOPED || temp.prev.entry !== '(') {
                 temp = temp.queue;
@@ -195,9 +189,16 @@ Javascript.prototype.setType = function (o) {
         if (o.type & (VALUE | QUOTED | STRAP)) {
             o.isprop = this.isProperty(o);
         }
-        else if (o.type === SCOPED && o.entry === '[') {
-            if (queue.isObject) o.isprop = this.isProperty(o);
-            if (queue.isClass) o.isprop = !last || last.isprop || last.type === STAMP && last.text === ';';
+        else if (o.type === SCOPED) {
+            if (o.entry === '[') {
+                if (queue.isObject) o.isprop = this.isProperty(o);
+                if (queue.isClass) o.isprop = !last || last.isprop || last.type === STAMP && last.text === ';';
+            }
+            else if (o.entry === "{") {
+                if (last && last.type === PROPERTY && last.text === 'static') {
+                    last.type = STRAP;
+                }
+            }
         }
         else if (o.type === STAMP) {
             o.isprop = o.text === "*" && (!last || /^[,;]$/.test(last.text) || queue.isClass && isShortMethodEnd(last));

package/coms/compile/common.js

@@ -76,14 +76,9 @@ var skipAssignment = function (o, cx) {
                     needpunc = false;
                     break;
                 default:
-                    if (/^[!~\+\-]+$/.test(o.text)) {
-                        needpunc = false;
-                        next();
-                        break;
-                    }
-                    if (!needpunc) break loop;
                     needpunc = false;
                     next();
+                    break;
             }
             break;
         case SCOPED:
@@ -200,6 +195,20 @@ function skipSentenceQueue(o) {
     } while (o && o.type === STAMP && o.text === ',' ? o = o.next : false);
     return o;
 }
+function skipFunction(o) {
+    if (o.type === STRAP && o.text === 'async') o = o.next;
+    if (o.type !== STRAP) return skipAssignment(o);
+    if (o.text === 'function') {
+        while (o && (o.type !== SCOPED || o.entry !== '{')) o = o.next;
+        return o.next;
+    }
+    if (o.text === 'class') {
+        while (!o.isClass) o = o.next;
+        while (o.isClass) o = o.next;
+        return o;
+    }
+    return o;
+}
 function snapSentenceHead(o) {
     // 只检查一级
     while (o && o.prev) {
@@ -364,6 +373,19 @@ var snapExpressFoot = function (o) {
     }
     return o;
 };
+var mustBeYield = function (o) {
+    if (!o.next) return;
+    var mustyield = false;
+    if (o.next.type === STRAP && !/^(?:instanceof|in|of|from|as)$/.test(o.next.text)
+        || o.next.type === STAMP && /[!~]/.test(o.next.text)
+        || o.next.type === EXPRESS && !/^[\.\[]/.test(o.next.text)
+        || o.next.type & (VALUE | QUOTED | SCOPED)
+    ) {
+        mustyield = true;
+    }
+    return mustyield;
+
+}
 var createScoped = function (parsed, wash) {
     var used = Object.create(null); var vars = Object.create(null), lets = vars;
     var scoped = [], funcbody = scoped, argscope = scoped, thisscope = scoped;
@@ -430,11 +452,11 @@ var createScoped = function (parsed, wash) {
                             o.type = STRAP;
                             continue;
                         }
-                        if ((!o.prev || o.prev.type !== STAMP || o.prev.text === ';') && (!o.next || o.next.type !== STAMP || o.next.text === '*')) {
+                        if (mustBeYield(o)) {
                             o.type = STRAP;
                             funcbody.aster = true;
-                            continue;
                         }
+                        continue;
                     }
                     if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                         isScope = true;
@@ -487,17 +509,8 @@ var createScoped = function (parsed, wash) {
                                         break;
                                     };
                                 }
-                                if (mustyield !== false && o.next) {
-                                    if (o.next.type === STRAP && !/^(?:instanceof|in|of|from|as)$/.test(o.next.text)
-                                        || o.next.type === STAMP && /[!~]/.test(o.next.text)
-                                        || o.next.type === EXPRESS && !/^[\.\[]/.test(o.next.text)
-                                        || o.next.type & (VALUE | QUOTED | SCOPED)
-                                    ) {
-                                        mustyield = true;
-                                    }
-                                }
+                                if (mustyield !== false) mustyield = mustBeYield(o);
                                 if (mustyield) funcbody.aster = true;
-                                else o.type = EXPRESS;
                                 continue;
                             }
                             funcbody.yield = true;
@@ -522,6 +535,7 @@ var createScoped = function (parsed, wash) {
                             mergeTo(used, used0);
                             mapDeclared(m, declared);
                             continue loop;
+                        case "static":
                         case "function":
                             isFunction = true;
 
@@ -548,7 +562,6 @@ var createScoped = function (parsed, wash) {
                                     o = o.next;
                                 }
                             }
-
                             isScope = true;
                             break;
                         case "for":
@@ -1187,6 +1200,24 @@ var createExpressList = function (code) {
     }
     return list;
 };
+var isHalfSentence = function (body, i) {
+    var a = 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 !== SCOPED || a.entry !== "(") return false;
+    a = a.prev;
+    if (!a || a.type !== STRAP) return false;
+    if (a.text === 'while') {
+        var p = a.prev;
+        if (!p || p.type !== SCOPED || p.entry !== '{' || !p.prev) return true;
+        p = p.prev;
+        if (p.type !== STRAP || p.text !== 'do') return true;
+        return false;
+    }
+    return /^(if|for|with)$/.test(a.text);
+};
+
 var splice = function (queue, index, size, ...args) {
     if (index < 0) index += queue.length;
     var p = queue[index];
@@ -1245,6 +1276,8 @@ module.exports = {
     relink,
     setqueue,
     replace,
+    skipFunction,
+    isHalfSentence,
     splice,
     mergeTo
 };

package/coms/compile/downLevel.js

@@ -1,7 +1,7 @@
 var scanner2 = require("./scanner2");
 var strings = require("../basic/strings");
 var Program = scanner2.Program;
-var { STAMP, SCOPED, STRAP, EXPRESS, COMMENT, SPACE, PROPERTY, VALUE, LABEL, QUOTED, rename, getDeclared, skipAssignment, createScoped, createString, splice, relink, snapExpressHead, needBreakBetween } = require("./common");
+var { STAMP, SCOPED, STRAP, EXPRESS, COMMENT, SPACE, PROPERTY, VALUE, LABEL, QUOTED, rename, isHalfSentence, skipFunction, getDeclared, skipAssignment, skipSentenceQueue, createScoped, createString, splice, relink, snapExpressHead, needBreakBetween } = require("./common");
 var splice2 = function (q, from, to, ...a) {
     var cx = q.indexOf(from);
     if (cx < 0) throw console.log(splice2.caller, console.format('\r\n<red2>自</red2>'), from && createString([from]), console.format('\r\n<yellow>至</yellow>'), to && createString([to]), console.format(`\r\n<cyan>码列</cyan>`), createString(q)), '结构异常';
@@ -446,6 +446,7 @@ var rootenvs = null, rootHyper;
 var killcls = function (body, i, getname_) {
     var extends_ = [];
     var o = body[i];
+    var ishalf = isHalfSentence(body, i - 1);
     var start = o;
     var decName = !o.isExpress && o.next.type === EXPRESS && o.next.text;
     while (o) {
@@ -494,7 +495,14 @@ var killcls = function (body, i, getname_) {
             var k = prop.static ? clz.name : `${clz.name}["prototype"]`;
             var d = prop.static ? static_ : define_;
             if (prop.get || prop.set || prop.static) {
-                setprop(prop, k, d, defines);
+                if (prop.name) {
+                    setprop(prop, k, d, defines);
+                }
+                else if (prop.static) {
+                    var value = scanner2(`(function(){}())`);
+                    splice(value[0], 2, 1, ...prop.value)
+                    splice(foot, 0, foot.length, value[0]);
+                }
             }
             else if (/^(?:\.constructor|\[(['"`])constructor\1\])$/.test(prop.name)) {
                 constructor = prop.value;
@@ -561,7 +569,7 @@ var killcls = function (body, i, getname_) {
     var s = i;
     i = body.indexOf(o, i);
     if (i < 0) i = body.length;
-    if (head.length > 1 || start.isExpress) {
+    if (head.length > 1 || start.isExpress || ishalf && defines.length) {
         splice(defines, defines.length, 0, ...scanner2(`\r\nreturn ${clz.name}`))
         if (decName) splice(func, 0, 0, ...scanner2(`var ${decName}=`));
         splice(body, s, i - s, ...func);
@@ -571,7 +579,7 @@ var killcls = function (body, i, getname_) {
             splice(invokes, invokes.length, 0, { text: ';', type: STAMP }, ...defines);
         }
         splice(body, s, i - s, ...invokes);
-        if (o) insert1(body, o, { type: SPACE, text: '\r\n' });
+        if (o && o.type & ~(SPACE | STAMP) && invokes.length) insert1(body, o, { type: SPACE, text: '\r\n' });
     }
     return i;
 };
@@ -747,7 +755,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                         var y = scanner2(`for(var ${name} of) yield ${name};`);
                         y[2].type = STRAP;
                         splice(y[1], y[1].length, 0, ...splice(body, i, n - i));
-                        unforof(y[1], getname_.bind(null, '_'), y.used);
+                        unforof(y[0], getname_.bind(null, '_'), y.used);
                         splice(body, i - 1, 1, ...y);
                     }
                     i++;
@@ -918,7 +926,7 @@ var unforin = function (o, getnewname_, killobj) {
     if (n.type !== STRAP || n.text !== 'in') {
         return false;
     }
-    if (ises3(o, killobj) && ises3(o.next, killobj)) return;
+    if (ises3(o.first, killobj) && ises3(o.next, killobj)) return;
     var prev = o.prev;
     while (prev && prev.type === LABEL) prev = prev.prev;
     var pp = prev && prev.prev;
@@ -947,6 +955,8 @@ var unforin = function (o, getnewname_, killobj) {
 
 var unforof = function (o, getnewname, used) {
     var hasawait = false;
+    var r = o;
+    o = o.next;
     if (o.type === STRAP && o.text === 'await') {
         hasawait = true;
         splice2(o.queue, o, o.next);
@@ -986,7 +996,14 @@ var unforof = function (o, getnewname, used) {
         splice(o, o.length, 0, { type: STAMP, text: ',' });
     }
     if (useSimpleLoop) splice(o, o.length, 0, ...scanner2(`${iname}=0,${gname}=${oname}["length"];${iname}<${gname}&&(${createString([p])}=${oname}[${iname}],true);${iname}++`));
-    else rootenvs.Symbol = true, splice(o, o.length, 0, ...scanner2(`${gname}=${hasawait ? `${oname}[Symbol["asyncIterator"]]||${oname}[Symbol["iterator"]]` : `${oname}[Symbol["iterator"]]||${oname}[Symbol["asyncIterator"]]`}||Array["prototype"][Symbol["iterator"]],${gname}=${gname}["call"](${oname}),${iname}=${hasawait ? "await " : ''}${gname}["next"]();!${iname}["done"]&&(${createString([p])}=${iname}["value"],true);${iname}=${hasawait ? 'await ' : ''}${gname}["next"]()`));
+    else {
+        rootenvs.Symbol = true, splice(o, o.length, 0, ...scanner2(`${gname}=${hasawait ? `${oname}[Symbol["asyncIterator"]]||${oname}[Symbol["iterator"]]` : `${oname}[Symbol["iterator"]]`}||Array["prototype"][Symbol["iterator"]],${gname}=${gname}["call"](${oname}),${iname}=${hasawait ? "await " : ''}${gname}["next"]();!${iname}["done"]&&(${createString([p])}=${iname}["value"],true);${iname}=${hasawait ? 'await ' : ''}${gname}["next"]()`));
+        var n = o.next;
+        n = skipSentenceQueue(n);
+        var tf = scanner2(`try{}finally{if(${iname}&&!${iname}["done"]&&isFunction(${gname}["return"]))${gname}["return"]()}`);
+        splice(tf[1], 0, 0, ...splice2(r.queue, r, n, ...tf));
+        rootenvs.isFunction = true;
+    }
     relink(o);
 };
 var unarrow = function (body, i, killobj, letname_) {
@@ -1146,9 +1163,10 @@ var killret = function (body, labels = Object.create(null), gettmpname) {
                 lbls.push(lbl);
             }
         }
-        else if (o.type === SCOPED) {
-            killret(o, labels, gettmpname);
-            if (o.entry === '{') unlabel = true;
+        else if (o.type === SCOPED && o.entry === "{") {
+            if (o.isClass || o.isObject);
+            else killret(o, labels, gettmpname);
+            unlabel = true;
         }
         else if (o.type === STAMP && o.text === ';') {
             unlabel = true;
@@ -1157,16 +1175,22 @@ var killret = function (body, labels = Object.create(null), gettmpname) {
             for (var lbl of lbls) delete labels[lbl];
             lbls = [];
         }
+        if (o.type === STAMP && o.text === "=>") {
+            o = skipFunction(o);
+            continue;
+        }
         if (o.type !== STRAP) {
             o = o.next;
             continue;
         }
         switch (o.text) {
+            case "async":
+            case "class":
             case "function":
-                while (o && o.type !== SCOPED || o.entry !== '{') o = o.next;
-                break;
+                o = skipFunction(o);
+                continue;
             case "return":
-                if (o.next && !o.isend) insert1(body, o.next, ...scanner2(`${gettmp()}=1,`));
+                if (o.next && !o.isend) insert1(body, o.next, ...scanner2(`${gettmp(1, o.next)}=1,`));
                 else insert1(body, o.next, ...scanner2(`${gettmp()}=1,void 0`)), o.isend = false;
                 breakmap[o.text] = 1;
                 break;
@@ -1206,6 +1230,7 @@ var killret = function (body, labels = Object.create(null), gettmpname) {
     }
     return breakmap;
 }
+
 var down = function (scoped) {
     var inAsync = scoped.async;
     var inAster = scoped.yield;
@@ -1361,7 +1386,7 @@ var down = function (scoped) {
                 if (hp && hp.type === STRAP && hp.text === 'await') hp = hp.prev;
                 if (!hp) break a;
                 if (hp.text === 'for') {
-                    unforof(hp.next, getdeepname, scoped.used);
+                    unforof(hp, getdeepname, scoped.used);
                     if (funcMark) killed = unforin(scoped.head, getdeepname, _killobj.bind(null, _getlocal)) !== false;
                     // unforcx(scoped.head, getdeepname);
                 }
@@ -1436,7 +1461,7 @@ var downcode = downLevel.code = function (code) {
     code.keepcolor = false;
     if (rootenvs.slice_) {
         delete rootenvs.slice_;
-        if (!code.vars.slice_) splice(code.scoped.body, 0, 0, ...scanner2('var slice_ = Array["prototype"]["slice"];\r\n'));
+        if (!code.vars.slice_) splice(code, 0, 0, ...scanner2('var slice_ = Array["prototype"]["slice"];\r\n'));
     }
     rootenvs = null;
     return code;

package/coms/compile/downLevel_test.js

@@ -53,6 +53,14 @@ 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() {}")
+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_(
+function () {
+a = function a() {}; if (!a) return [1, 0]; a = 1; return [1, 0]
+})
+var a, _0 }`)
+assert(downLevel(`if(a) class b{ c(){}};`), `if (a) var b = function (b) { b["prototype"].c = function () {}\r\nreturn b }(function b() {});`)
 assert(downLevel(`class a {a=1}`), "function a() { this.a = 1 }")
 assert(downLevel(`class a {a=1; b(){}}`), `function a() { this.a = 1; }; a["prototype"].b = function () {}`)
 assert(downLevel(`=class a {a=1; b(){}}`), `= function (a) { a["prototype"].b = function () {}\r\nreturn a }(function a() { this.a = 1; })`)
@@ -188,6 +196,9 @@ assert(downLevel(`function (a,...,c){}`), `function (a, c) { c = arguments["leng
 assert(downLevel(`(...a) => k`), `var slice_ = Array["prototype"]["slice"];\r\nfunction () { var a = slice_["call"](arguments, 0); return k }`)
 assert(downLevel(`for await(o of os) noSymbol`), `return async_(
 function () {
+return [7, 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]
 },
 function () {
@@ -204,10 +215,25 @@ if (!_2) return [2, 0]; noSymbol; _2 = _0["next"](); return [_2, 1]
 },
 function (_1) {
 _2 = _1; _ = _2; return [-2, 0]
+},
+function () {
+return [0, 9]
+},
+function () {
+_2 = _ &&! _["done"]; if (!_2) return [1, 0]; _2 = _0["return"]; _2 = isFunction(_2)
+},
+function () {
+if (!_2) return [1, 0]; _2 = _0["return"](); return [1, 0]
+},
+function () {
+return [1, 9]
 })
 var _, _0, _2`)
 assert(downLevel(`for await(var [o,s] of os) noSymbol`), `return async_(
 function () {
+return [7, 8]
+},
+function () {
 o; s; _3 = Symbol["asyncIterator"]; _3 = os[_3]; if (_3) return [1, 0]; _3 = Symbol["iterator"]; _3 = os[_3]; if (_3) return [1, 0]; _3 = Symbol["iterator"]; _3 = Array["prototype"][_3]
 },
 function () {
@@ -224,14 +250,26 @@ if (!_3) return [2, 0]; noSymbol; _3 = _0["next"](); return [_3, 1]
 },
 function (_2) {
 _3 = _2; _ = _3; return [-2, 0]
+},
+function () {
+return [0, 9]
+},
+function () {
+_3 = _ &&! _["done"]; if (!_3) return [1, 0]; _3 = _0["return"]; _3 = isFunction(_3)
+},
+function () {
+if (!_3) return [1, 0]; _3 = _0["return"](); return [1, 0]
+},
+function () {
+return [1, 9]
 })
 var o, s, _, _0, _1, _3`)
 assert(downLevel(`for(o of os) noSymbol`), `for (_ = 0, _0 = os["length"]; _ < _0 && (o = os[_], true); _++) noSymbol\r\nvar _, _0`)
-assert(downLevel(`for(var o of os) Symbol`), `for (var o, _0 = os[Symbol["iterator"]] || os[Symbol["asyncIterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol\r\nvar _, _0`)
-assert(downLevel(`for(var o of os) Symbol`), `for (var o, _0 = os[Symbol["iterator"]] || os[Symbol["asyncIterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol\r\nvar _, _0`)
-assert(downLevel(`for(var o of o)Symbol`), `for (var o, _1 = o, _0 = _1[Symbol["iterator"]] || _1[Symbol["asyncIterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](_1), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol\r\nvar _, _0, _1`)
-assert(downLevel(`for(var [a] of os)Symbol`), `for (var a, _0 = os[Symbol["iterator"]] || os[Symbol["asyncIterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (a = _["value"][0], true); _ = _0["next"]()) Symbol\r\nvar _, _0`)
-assert(downLevel(`for(var [a,b] of os)Symbol`), `for (var a, b, _0 = os[Symbol["iterator"]] || os[Symbol["asyncIterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (_1 = _["value"], a = _1[0], b = _1[1], true); _ = _0["next"]()) Symbol\r\nvar _, _0, _1`)
+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`)
+assert(downLevel(`for(var o of o)Symbol`), `try { for (var o, _1 = o, _0 = _1[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](_1), _ = _0["next"](); !_["done"] && (o = _["value"], true); _ = _0["next"]()) Symbol } finally { if (_ &&! _["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0, _1`)
+assert(downLevel(`for(var [a] of os)Symbol`), `try { for (var a, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (a = _["value"][0], true); _ = _0["next"]()) Symbol } finally { if (_ &&! _["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0`)
+assert(downLevel(`for(var [a,b] of os)Symbol`), `try { for (var a, b, _0 = os[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]], _0 = _0["call"](os), _ = _0["next"](); !_["done"] && (_1 = _["value"], a = _1[0], b = _1[1], true); _ = _0["next"]()) Symbol } finally { if (_ &&! _["done"] && isFunction(_0["return"])) _0["return"]() }\r\nvar _, _0, _1`)
 assert(downLevel(`[...a]=a`), `var slice_ = Array["prototype"]["slice"];\r\na = slice_["call"](a, 0)`)
 assert(downLevel(`[c,...a]=a`), `var slice_ = Array["prototype"]["slice"];\r\nc = a[0], a = slice_["call"](a, 1)`)
 assert(downLevel(`[...a]=a`), `var slice_ = Array["prototype"]["slice"];\r\na = slice_["call"](a, 0)`)
@@ -242,9 +280,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 () {
-name = require("./$split")(name)["join"]("/"); return [name, 2]
+_0 = require("./$split"); _1 = _0(name); name = _1["join"]("/"); return [name, 2]
 })
-var _0 };`);
+var _0, _1 };`);
 i++//异步或步进函数
 assert(downLevel(`function *(){yield *a}`), `function () { return aster_(
 function () {
@@ -263,7 +301,10 @@ var _, _0, _1, _3 }`)
 assert(downLevel(`async function(){}`), `function () { return async_() }`)
 assert(downLevel(`async function(){for(var a of b){Symbol}}`), `function () { return async_(
 function () {
-a; _2 = Symbol["iterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Symbol["asyncIterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = Array["prototype"][_2]
+return [5, 8]
+},
+function () {
+a; _2 = Symbol["iterator"]; _2 = b[_2]; if (_2) return [1, 0]; _2 = Symbol["iterator"]; _2 = Array["prototype"][_2]
 },
 function () {
 _0 = _2; _0 = _0["call"](b); _ = _0["next"](); return [1, 0]
@@ -273,6 +314,18 @@ _2 = !_["done"]; if (!_2) return [1, 0]; a = _["value"]; _2 = (true)
 },
 function () {
 if (!_2) return [1, 0]; Symbol; _ = _0["next"](); return [-1, 0]
+},
+function () {
+return [0, 9]
+},
+function () {
+_2 = _ &&! _["done"]; if (!_2) return [1, 0]; _2 = _0["return"]; _2 = isFunction(_2)
+},
+function () {
+if (!_2) return [1, 0]; _2 = _0["return"](); return [1, 0]
+},
+function () {
+return [1, 9]
 })
 var a, _, _0, _2 }`)
 assert(downLevel(`a={async a(){var b =c;return 1}}`), `a = (_ = {},
@@ -308,6 +361,6 @@ function () {
 if (!a) return [1, 0]; return [2, 0]
 },
 function () {
-_0 = getRequestProtocol(url) + "//", location = _0 + location; return [1, 0]
+_1 = getRequestProtocol(url); _0 = _1 + "//", location = _0 + location; return [1, 0]
 })
-var _0 }`);
+var _0, _1 }`);

package/coms/compile/powermap.js

@@ -4,7 +4,7 @@ var powermap = {};
     '&&,||,^^,??'/* 4 */, '&,|,^'/* 5 */,
     'instanceof,in,==,>=,<=,>,<,!=,!==,===,!in,!instanceof'/* 6 */,
     '>>,>>>,<<'/* 7 */, '+,-'/* 8 */, '*,/,%'/* 9 */, '**'/* 10 */,
-    'typeof,await,new,delete,void,!,~'/* 11 */, '++,--'/* 12 */,
+    'typeof,await,yield,new,delete,void,!,~'/* 11 */, '++,--'/* 12 */,
 ].forEach((pp, i) => {
     pp.split(",").forEach(p => {
         powermap[p] = i + 1;