efront 4.21.3 → 4.22.0

package/coms/compile/Program.js

@@ -11,7 +11,9 @@ const {
     /* 512 */LABEL,
     /*1024 */PROPERTY,
     /*2048 */ELEMENT,
+    pickAssignment,
     createString,
+    setqueue,
     number_reg,
     digit_reg,
 } = require("./common");
@@ -53,6 +55,16 @@ var stringsFromRegExp = function (reg) {
     var res = combine(...queue).map(a => a.join(""));
     return res;
 }
+
+var trimDulp = function (list) {
+    var dist = [];
+    for (var a of list) {
+        if (dist.indexOf(a) >= 0) continue;
+        dist.push(a);
+    }
+    return dist;
+}
+
 var spaceDefined = require("../basic/spaces");
 
 var powermap = require("./powermap");
@@ -64,7 +76,7 @@ class Program {
         ["`", "`", /\\[\s\S]/, ["${", "}"]],
     ]
     tags = [
-        [["<", "</"], /\/?>/, /\\[\s\S]|\=\>/, "'", '"', "<!--", ["${", "}"]]
+        [["<", "</"], /\/?>/, /\\[\s\S]/, "'", '"', "<!--", ["${", "}"]]
     ];
     scriptTags = [];
     ignoreTags = ["STYLE", "SCRIPT"];
@@ -323,10 +335,10 @@ class Program {
         var scriptTags = this.scriptTags;
         var ignoreTags = this.ignoreTags;
         var structstrap_reg = this.structstrap_reg;
+        var mindpath = this.mindpath;
         var openTag = function () {
             var m1 = text.slice(start, match.index);
             var s = space_exp.exec(m1);
-
             if (s) var tag = m1.slice(0, s.index);
             else {
                 tag = m1;
@@ -373,7 +385,10 @@ class Program {
                 if (scope) queue = scope;
                 return true;
             }
-
+            if (s && !tag) {
+                undefTag();
+                return;
+            }
             queue.inTag = true;
             queue.tag = tag;
             var tagName = tag.toUpperCase();
@@ -386,7 +401,8 @@ class Program {
             }
             if (s) {
                 m = m1.slice(s[0].length + s.index);
-                if (m) save(PIECE);
+                start += s[0].length + s.index;
+                push_piece();
             }
             queue.first = null;
             queue.last = null;
@@ -405,12 +421,60 @@ class Program {
                 }
             }
             return istype;
+        };
+        var undefTag = () => {
+            var scope = {
+                type: STAMP,
+                text: queue.entry,
+                col: queue.col,
+                row: queue.row,
+                start: queue.start,
+            };
+            if (queue[0]) {
+                queue.splice(0, queue.length);
+                start = index = queue[0].start;
+            }
+            else {
+                queue = parents.pop();
+                start = index = scope.start + scope.text.length;
+            }
+            var last = queue.last;
+            if (last.type === PIECE) {
+                this.lastIndex = 0;
+                var thist = this.type;
+                this.type = undefined;
+                var res = this.exec(last.text);
+                this.type = thist;
+                this.lastIndex = index;
+                var prev = last.prev;
+                if (prev) {
+                    prev.next = res.first;
+                }
+                if (res.first) {
+                    res.first.prev = prev;
+                }
+                queue.last = res.last;
+                queue.splice(queue.length - 1, 1, ...res);
+                setqueue(res, queue);
+
+            }
+            queue_push(scope);
+
         }
         var closeTag = function () {
             queue.inTag = false;
+            if (text.charAt(index) === m) {
+                if ((m + m) in powermap) {
+                    if (!parents[parents.length - 1].tag) {
+                        undefTag();
+                        return false;
+                    }
+                }
+            }
             if (queue.closed) return;
             if (queue.length) queue.attributes = queue.splice(0, queue.length);
             if (/^\//.test(m) || queue.istype) return queue.short = true, queue.closed = true;
+            queue.tag_leave = m;
             return false;
         };
         var push_quote = function () {
@@ -506,10 +570,8 @@ class Program {
                             start = index = match.index;
                         }
                         else queue.inTag = false;
-
-                        continue;
+                        continue loop;
                     }
-
                     if (quote.end.test(m)) {
                         end = match.index;
                         if (queue.tag) {
@@ -517,7 +579,6 @@ class Program {
                             if (!queue.inTag) continue;
                             if (closeTag() === false) {
                                 start = index;
-                                queue.tag_leave = m;
                                 continue loop;
                             }
                             queue.type = ELEMENT;
@@ -542,7 +603,7 @@ class Program {
                             scope.entry = m;
                             scope.type = QUOTED;
                             if (queue.istype) scope.istype = queue.istype;
-                            scope.start = index;
+                            scope.start = match.index;
                             scope.isExpress = queue.inExpress;
                             push_parents(scope);
                             queue.inTag = 0;
@@ -708,7 +769,7 @@ class Program {
                 }
                 queue.inExpress = true;
                 queue.end = index;
-                queue.text = text.slice(queue.start, index);
+                queue.text = text.slice(start, index);
                 pop_parents();
                 continue;
             }
@@ -746,13 +807,15 @@ class Program {
                 }
                 save(STRAP);
                 var last = queue.last;
-                if (last.type === STRAP && structstrap_reg.test(last.text) && !queue.classed) {
-                    queue.classed = [last.text];
+                m = last.text;
+                if (last.type === STRAP && structstrap_reg.test(m) && !queue.classed) {
+                    queue.classed = [m];
                 }
                 else if (queue.classed) {
-                    if (last.type === STRAP && funcstrap_reg.test(last.text)) queue.classed.push(last.text);
+                    if (last.type === STRAP && funcstrap_reg.test(m)) queue.classed.push(m);
                 }
                 if (funcstrap_reg.test(m)) {
+                    last.isExpress = queue.inExpress;
                     last.isargl = true;
                 }
                 else if (type_reg.test(m)) {
@@ -874,7 +937,7 @@ class Program {
                             scope.istype = true;
                         }
                     }
-                    if (!last || (last.type !== STRAP && (!last.isObject || m === '(') || last.transive)) queue.inExpress = true;
+                    if (!last || last.type !== STRAP && last.isExpress || last.transive) queue.inExpress = true;
                     scope.isExpress = queue.inExpress;
                     scope.inExpress = true;
                 }
@@ -893,7 +956,16 @@ class Program {
                 pop_parents();
                 continue;
             }
-            if (this.scope_leave[m]) console.warn(i18n`标记不匹配`, queue.entry, m, "queue-start:", queue.start, "position:", `${row}:${index - colstart}\r\n`, index - queue.start < 200 ? text.slice(queue.start, index) : text.slice(queue.start, queue.start + 100) + "..." + text.slice(index - 97, index));
+            if (this.scope_leave[m]) {
+                console.warn(
+                    i18n`标记不匹配：`, queue.entry, m,
+                    i18n`\r\n文件位置：`, this.mindpath + ":" + `${row}:${index - colstart}`,
+                    i18n`\r\n摘要：\r\n`,
+                    index - queue.start < 200
+                        ? text.slice(queue.start, index)
+                        : text.slice(queue.start, queue.start + 100) + "..." + text.slice(index - 97, index)
+                );
+            }
             save(STAMP);
         }
         while (queue.tag && parents.length) {
@@ -912,16 +984,12 @@ class Program {
         if (cache_stamp) push_stamp();
         this.lastIndex = index;
         if (queue !== origin) {
-            console.log(
-                "代码异常结束",
-                createString(origin.slice(0, 30)),
-                `\r\n ----- deep: ${parents.length}`,
-                `\r\n ---- enrty: ${queue.entry}`,
-                `\r\n --- length: ${queue.length}`,
-                `\r\n ----- last: ${queue.last ? createString([queue.last]).slice(0, 30) : createString(queue).slice(0, 30)}`,
-                `\r\n -- parents: ${parents.map(p => `${p.row}:${p.col}-${p.tag || p.text || p.entry} `).join('-)> ')}`,
-                `\r\n ----- snap: ${createString([queue]).slice(-200)}`,
-                `\r\n ------ end. `
+            var last = queue.last || queue;
+            console.warn(
+                "代码异常结束", createString(origin.slice(0, 30)),
+                `\r\n - 祖先标记: ${parents.slice(1).map(p => `<red2>${p.tag || p.text || ""}${p.entry || ""}</red2><gray>${p.row}:${p.col}</gray>`).join('')}`,
+                `\r\n - 内层入口: <yellow>${this.mindpath}</yellow>:${last.row}:${last.col} ${last.text || last.entry}`,
+                `\r\n ----- 快照: ${createString(pickAssignment(queue.last || queue))}`,
             );
             while (queue !== origin) {
                 queue.error = "代码异常结束";
@@ -957,24 +1025,6 @@ class Program {
             }
         });
         quoteslike.forEach(q => {
-            var ts = [];
-            var r = q.slice(q[2] ? 2 : 3).concat(q[1]).map(q => {
-                if (q instanceof Array) {
-                    if (q.length > 2) {
-                        ts.push(...q.slice(0, q.length - 2));
-                    }
-                    else if (q.length !== 2) throw new Error(i18n`配置错误！`);
-                    q = q[q.length - 2];
-                }
-                if (q instanceof RegExp) {
-                    return q.source;
-                }
-                return this.compile(q);
-            });
-            if (q.tag) r = r.concat(q.tag);
-            r = r.concat(ts.map(this.compile));
-            r = sortRegster(r).join("|");
-            q.reg = new RegExp(r, 'g');
             q.end = this.createRegExp([q[1]]);
             if (q.length >= 4) {
                 var entry = q.slice(3);
@@ -1019,6 +1069,32 @@ class Program {
         for (var k in this.powermap) if (k.length === 1 && stamps.indexOf(k) < 0) stamps.push(k);
         stamps.push.apply(stamps, powers);
         this.stamp_reg = new RegExp(`^(${stamps.map(this.compile).join('|')})$`);
+        quoteslike.forEach(q => {
+            var ts = [];
+            var r = q.slice(q[2] ? 2 : 3).concat(q[1]).map(q => {
+                if (q instanceof Array) {
+                    if (q.length > 2) {
+                        ts.push(...q.slice(0, q.length - 2));
+                    }
+                    else if (q.length !== 2) throw new Error(i18n`配置错误！`);
+                    q = q[q.length - 2];
+                }
+                if (q instanceof RegExp) {
+                    return q.source;
+                }
+                return this.compile(q);
+            });
+            if (q.tag) r = r.concat(q.tag, powers.filter(p => {
+                var tagentries = q.tag[0];
+                for (var t of tagentries) {
+                    if (p.indexOf(t) >= 0) return true;
+                }
+                return false;
+            }).map(this.compile));
+            r = r.concat(ts.map(this.compile));
+            r = sortRegster(trimDulp(r)).join("|");
+            q.reg = new RegExp(r, 'g');
+        })
     }
 }
 module.exports = Program;

package/coms/compile/audit.js

@@ -1,4 +1,4 @@
-var { STAMP, EXPRESS, STRAP, isHalfSentence, skipAssignment, skipFunction, getDeclared, VALUE, STRAP, SCOPED, QUOTED, snapSentenceHead, pickSentence, createString, getBodyWith, getFuncBody } = require("./common");
+var { STAMP, EXPRESS, STRAP, isHalfSentence, pickArgument, skipAssignment, skipFunction, getDeclared, VALUE, STRAP, SCOPED, QUOTED, snapSentenceHead, pickSentence, createString, getBodyWith, getFuncBody } = require("./common");
 var addAccessedStart = function (matched, namedMap) {
     var start = +namedMap["#1"];
     var body = getBodyWith(matched[0], 'arguments');
@@ -125,6 +125,22 @@ var unMultiple = function (matched) {
     matched.suggest = `${createString(matched)}{\r\n      // 不建议在可并行执行的函数中更改外部变量，以防并发调用时出现异常\r\n      // 建议在可并行函数内声明如下变量，并修改用到这些变量的代码\r\n      var ${undec.join(',')};\r\n  }`;
     return matched;
 }
+var checkSpliceSize = function (matched, i) {
+    var [m] = matched;
+    var argq = m.next;
+    if (argq?.type !== SCOPED || argq.entry !== '(') return;
+    var o = argq.first;
+    while (i-- > 0) {
+        o = skipAssignment(o).next;
+    }
+    var arg3 = pickArgument(o);
+    if (arg3.length === 1) {
+        var [size] = arg3;
+        if (!size.isdigit && !/\.length$/.test(size.text)) {
+            matched.suggest = `//第三个参数可能出错\r\n${createString([argq])}`;
+        }
+    }
+}
 var suggest = {
     "while($2[$1++]!==$3)": "while($1<$2.length&&$2[$1++]!==$3)",
     "while($2[$1]!==$3)$1++": "while($1<$2.length&&$2[$1]!==$3)$1++",
@@ -132,6 +148,12 @@ var suggest = {
     "for(var $1=#1;$1<arguments.length;$1++)": addAccessedStart,
     "await": unMultiple,
     "yield": unMultiple,
+    "splice"(matched) {
+        checkSpliceSize(matched, 2);
+    },
+    ".splice"(matched) {
+        checkSpliceSize(matched, 1);
+    },
     "arguments"(matched) {
         var m = matched[0];
         var body = getBodyWith(m, 'arguments');

package/coms/compile/cloneNode.js

@@ -1,7 +1,8 @@
 var { VALUE, QUOTED, EXPRESS, STRAP, relink } = require("./common");
-var cloneNode = function (o) {
+var cloneNode = function (o, keep) {
     var c = o;
     if (c instanceof Array && !c.text) {
+        if (keep) return c;
         c = c.map(cloneNode);
         c.entry = o.entry;
         c.leave = o.leave;
@@ -12,6 +13,7 @@ var cloneNode = function (o) {
         relink(c);
     }
     else if (typeof c === 'object' && c instanceof Object) {
+        if (keep) return c;
         c = Object.assign({}, c);
     }
     else switch (typeof c) {

package/coms/compile/common.js

@@ -1233,7 +1233,13 @@ var getSemicolonBetween = function (prev, next) {
     if (
         (EXPRESS | VALUE | QUOTED) & prev.type
         || prev.type === STAMP && /^(\+\+|\-\-)$/.test(prev.text)
-        || prev.type === SCOPED && (prev.isExpress || prev.isObject)
+        || prev.type === SCOPED && (prev.isExpress || prev.isObject || prev.entry === '(' && (
+            // 这两种分号不存在时efront的解析器可以识别，v8的识别不了，为了兼容追加分号
+            // do{}while(); return
+            // =function(){}(); return
+            prev.perv?.type === STRAP && prev.prev.text === 'while' || prev.prev?.type === SCOPED
+        )
+        )
     ) {
         if ((EXPRESS | VALUE | QUOTED | LABEL) & next.type) return ";";
         if (next.type === STRAP) {

package/coms/compile/downLevel.js

@@ -355,7 +355,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
                     else {
                         var objname = getobjname(0);
                         q = scanner2(`(${objname} =)`);
-                        q[0].push(...splice(queue, i, i2));
+                        q[0].push(...splice(queue, i, i2 - i));
                         q[0].push(...scanner2(`${a[0]},${objname}!== undefined ? ${objname}: `), ...splice2(a[2], a[3], a[4]));
                         i2 = i;
                     }
@@ -365,7 +365,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
                 }
             }
             tmpname = getobjname(0);
-            if (i > i0) splice(queue, i++, 0, { type: STAMP, text: ',' }, { type: EXPRESS, text: tmpname }, { type: STAMP, text: "=" });
+            if (index > 0) 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);
@@ -591,7 +591,7 @@ var setprop = function (prop, k, d, q, tempname) {
             tmp = tmp[tmp.length - 1];
             d[prop.name] = tmp;
         }
-        insert1(d[prop.name], null, ...rescan`[${prop.get ? '"get"' : '"set"'}]=${pv},${tempname}`);
+        insert1(d[prop.name], null, ...rescan.keep`[${prop.get ? '"get"' : '"set"'}]=${pv},${tempname}`);
     }
     else {
         insert1(q, null, ...scanner2(`${q && q.length ? "\r\n" : ''}${k}${prop.name}=`));
@@ -599,7 +599,7 @@ var setprop = function (prop, k, d, q, tempname) {
     }
 }
 var rootenvs = null, rootHyper;
-var killcls = function (body, i, letname_, getname_) {
+var killcls = function (body, i, letname_, getname_, killobj) {
     var extends_ = [];
     var o = body[i];
     var ishalf = isHalfSentence(body, i - 1);
@@ -651,6 +651,7 @@ var killcls = function (body, i, letname_, getname_) {
         while (m) {
             var [prop, m] = getprop(o, m);
             if (!prop.value.length) prop.value = scanner2('undefined;');
+            else if (!prop.sfunc) killobj(prop.value);
             var k = prop.static ? clz.name : `${clz.name}["prototype"]`;
             var d = prop.static ? static_ : define_;
             if (prop.get || prop.set || prop.static) {
@@ -683,14 +684,18 @@ var killcls = function (body, i, letname_, getname_) {
         if (isExpress) fname[0].isExpress = true;
         insert1(invokes, null, ...fname);
         if (base) {
-            constructor[1].push(...scanner2('return this'))
+            var retthis = 'return this';
+            if (assign.length && assign.last.type !== SPACE && assign.last.text !== ';') {
+                retthis = "\r\n" + retthis;
+            }
+            constructor[1].push(...scanner2(retthis))
             relink(constructor[1]);
             var cs = createScoped(constructor[1]);
             var newt = getname(cs.vars, cs.envs, 'this_');
             if (cs.caps.this) rename(cs.caps, 'this', newt);
             var inited = false;
             assign.forEach(o => {
-                if (o.type === EXPRESS) o.text = o.text.replace(/^this([\[\.]|$)/g, newt + "$1");
+                if (o.type === EXPRESS || o.type === VALUE && !o.isdigit) o.text = o.text.replace(/^this([\[\.]|$)/g, newt + "$1");
             });
             if (cs.caps.super) {
                 cs.caps.super.forEach(o => {
@@ -704,7 +709,7 @@ var killcls = function (body, i, letname_, getname_) {
                     inited = true;
                     insert1(o.queue, o, ...scanner2(`var ${newt}=`));
                     if (n.length) n.unshift({ type: STAMP, text: ',' });
-                    n.unshift({ type: EXPRESS, text: 'this' });
+                    n.unshift({ type: VALUE, text: 'this' });
                     insert1(o.queue, n.next, ...scanner2(`||this;`));
                 })
             }
@@ -984,7 +989,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                     i++;
                     break;
                 case "class":
-                    i = killcls(body, i, letname_, getname_);
+                    i = killcls(body, i, letname_, getname_, deepkill);
                     break;
                 case "for":
                 case "function":
@@ -1042,6 +1047,11 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                 continue;
             }
             else if (o.entry === '(') {
+                var arg = o.last;
+                if (arg?.type === STAMP && arg.text === ',') {
+                    splice2(o, arg, arg.next);
+                    arg = arg.prev;
+                }
                 if (o.next && o.next.type === STAMP && o.next.text === '=>');
                 else if (o.prev && o.prev.type === STRAP) {
                     var p = o.prev;
@@ -1200,7 +1210,7 @@ var unforof = function (o, getnewname, used, killobj) {
     if (hasdeclare) {
         var [d] = getDeclared(m0);
         if (d.length) insert1(o, m, ...scanner2(d.join(",") + ","));
-        else splice(o, o.first, m0);
+        else splice2(o, o.first, m0);
     }
     var iname = getnewname();
     var gname = getnewname();
@@ -1266,7 +1276,7 @@ var unarrow = function (body, i, killobj, letname_) {
         splice(b, 0, 0, { type: STRAP, transive: true, text: "return" }, ...splice(body, ni, nni - ni, b));
         killarg(h, b, letname_);
         killobj(b);
-        ni = nni;
+        nni = indexof(body, b, ni) + 1;
     }
     else nni = ni + 1;
     return nni;
@@ -1614,7 +1624,7 @@ var newpunc = function (body, i, newname) {
                 }
                 splice(sentence, 0, 0, ...scanner2(`,${name}.${n}=${name}.${n}${punc}`));
             }
-            splice(sentence, 0, 0, ...scanner2(`${name}=`), ...splice(body, hi, i));
+            splice(sentence, 0, 0, ...scanner2(`${name}=`), ...splice(body, hi, i - hi));
             if (!isEval(body) || hp && hp.type === STAMP && /[=>]$/.test(hp.text)) {
                 var temp = scanner2(`()`)
                 splice(temp[0], 0, 0, ...sentence);

package/coms/compile/downLevel_test.js

@@ -258,7 +258,7 @@ function () {
 return [0, 9]
 },
 function () {
-_2 = _; if (!_2) return [1, 0]; _2 = !_["done"]; if (!_2) return [1, 0]; _2 = _0["return"]; _2 = isFunction(_2)
+_2 = _; if (!_2) return [1, 0]; _2 = !_["done"]; if (!_2) return [1, 0]; _2 = _0["return"], _2 = typeof _2, _2 = _2 === "function"
 },
 function () {
 if (!_2) return [1, 0]; _2 = _0["return"](); return [1, 0]
@@ -287,10 +287,10 @@ function (_4) {
 _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 () {
-_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"]
+_2 = _6["call"](_1); _3 = undefined; _3 = _2["next"](); o = _3["value"]; _3 = _2["next"](); s = _3["value"]; _11 = !_3; if (_11) return [1, 0]; _11 = !_3["done"]
 },
 function () {
-if (!_10) return [1, 0]; _10 = _2["return"]; _10 = isFunction(_10); if (!_10) return [1, 0]; _10 = _2["return"]()
+_10 = _11; if (!_10) return [1, 0]; _10 = _2["return"], _10 = typeof _10, _10 = _10 === "function"; if (!_10) return [1, 0]; _10 = _2["return"]()
 },
 function () {
 _3 = _10; _5 = true
@@ -305,7 +305,7 @@ function () {
 return [0, 9]
 },
 function () {
-_5 = _; if (!_5) return [1, 0]; _5 = !_["done"]; if (!_5) return [1, 0]; _5 = _0["return"]; _5 = isFunction(_5)
+_5 = _; if (!_5) return [1, 0]; _5 = !_["done"]; if (!_5) return [1, 0]; _5 = _0["return"], _5 = typeof _5, _5 = _5 === "function"
 },
 function () {
 if (!_5) return [1, 0]; _5 = _0["return"](); return [1, 0]
@@ -313,14 +313,14 @@ 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, _10`);
+var o, s, _, _0, _1, _2, _3, _5, _6, _7, _8, _9, _10, _11`);
 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`)
-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"] && (_1 = _["value"], _2 = (_1[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]])["call"](_1), _3 = undefined, _3 = _2["next"](), a = _3["value"], _3 = (!_3 || !_3["done"]) && isFunction(_2["return"]) && _2["return"](), true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }
+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"] && typeof _0["return"] === "function") _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"] && typeof _0["return"] === "function") _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"] && typeof _0["return"] === "function") _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"] && (_1 = _["value"], _2 = (_1[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]])["call"](_1), _3 = undefined, _3 = _2["next"](), a = _3["value"], _3 = (!_3 || !_3["done"]) && typeof _2["return"] === "function" && _2["return"](), true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && typeof _0["return"] === "function") _0["return"]() }
 var _, _0, _1, _2, _3`)
-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"], _2 = (_1[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]])["call"](_1), _3 = undefined, _3 = _2["next"](), a = _3["value"], _3 = _2["next"](), b = _3["value"], _3 = (!_3 || !_3["done"]) && isFunction(_2["return"]) && _2["return"](), true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && isFunction(_0["return"])) _0["return"]() }
+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"], _2 = (_1[Symbol["iterator"]] || Array["prototype"][Symbol["iterator"]])["call"](_1), _3 = undefined, _3 = _2["next"](), a = _3["value"], _3 = _2["next"](), b = _3["value"], _3 = (!_3 || !_3["done"]) && typeof _2["return"] === "function" && _2["return"](), true); _ = _0["next"]()) Symbol } finally { if (_ && !_["done"] && typeof _0["return"] === "function") _0["return"]() }
 var _, _0, _1, _2, _3`)
 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)`)
@@ -368,7 +368,7 @@ function () {
 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)
+_3 = _0; if (!_3) return [1, 0]; _3 = !_0["done"]; if (!_3) return [1, 0]; _3 = _1["return"], _3 = typeof _3, _3 = _3 === "function"
 },
 function () {
 if (!_3) return [1, 0]; _3 = _1["return"](); return [1, 0]
@@ -398,7 +398,7 @@ function () {
 return [0, 9]
 },
 function () {
-_2 = _; if (!_2) return [1, 0]; _2 = !_["done"]; if (!_2) return [1, 0]; _2 = _0["return"]; _2 = isFunction(_2)
+_2 = _; if (!_2) return [1, 0]; _2 = !_["done"]; if (!_2) return [1, 0]; _2 = _0["return"], _2 = typeof _2, _2 = _2 === "function"
 },
 function () {
 if (!_2) return [1, 0]; _2 = _0["return"](); return [1, 0]
@@ -487,12 +487,50 @@ var _, _0`)
 assert(downLevel(`[...{}[a]]=[1]`), `var &slice = Array["prototype"]["slice"];
 _ = [1], {}[a] = &slice["call"](_, 0)
 var _`)
-assert(downLevel(`,{...{}[a]}=[1]`), `_ = [1], {}[a] = &rest(_, [])
+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"])
+assert(downLevel(`,{b,...{}[a]}=[1]`), `, _ = [1], b = _.b, {}[a] = &rest(_, ["b"])
 var _`)
 assert(downLevel(`var penddings = {}, circle = [], module_keys = [];`), `var penddings = {}, circle = [], module_keys = [];`)
+assert(downLevel(`0,{a,b}=this`), '0, _ = this, a = _.a, b = _.b\r\nvar _')
+assert(downLevel(`0,{a,b}=1`), '0, _ = 1, a = _.a, b = _.b\r\nvar _')
+assert(downLevel(`0,{a,b}=true`), '0, _ = true, a = _.a, b = _.b\r\nvar _')
+assert(downLevel(`0,{a,b}=eval`), '0, _ = eval, a = _.a, b = _.b\r\nvar _')
+assert(downLevel(`0,{a,b}=a`), '0, _ = a, a = a.a, b = _.b\r\nvar _')
+assert(downLevel(`0,{a,b}=[]`), '0, _ = [], a = _.a, b = _.b\r\nvar _')
+assert(downLevel(`0,{a,b}=a.b`), '0, _ = a.b, a = _.a, b = _.b\r\nvar _')
+assert(downLevel(`var [list = this] = arguments;`), `var list = (_ = arguments[0], _ !== undefined ? _ : this);
+var _`)
+assert(downLevel(`var [list = this] = arguments`), `var list = (_ = arguments[0], _ !== undefined ? _ : this)
+var _`)
+assert(downLevel(`var [list = this] = 0;`), `var list = (_ = 0[0], _ !== undefined ? _ : this);
+var _`)
+assert(downLevel(`a => a() + a(1), a => a`), `function (a) { return a() + a(1) }, function (a) { return a }`)
+assert(downLevel(`a(a,)`), `a(a)`);
+assert(downLevel(`class{a=[...presets.source]}`), `var &slice = Array["prototype"]["slice"];
+function () { this.a = &slice["call"](presets.source) }`);
+assert(downLevel(`class{a=a=>a}`), `function () { this.a = function (a) { return a } }`);
+assert(downLevel(`class{ get a(){[...a]}}`), `var &slice = Array["prototype"]["slice"];
+function () {};
+Object["defineProperty"](cls0["prototype"], "a", (tmp = {}, tmp["get"] = function () { &slice["call"](a) }, tmp))
+var tmp`);
+assert(downLevel(`class{ get (){[...a]}}`), `var &slice = Array["prototype"]["slice"];
+function () {}; cls0["prototype"].get = function () { &slice["call"](a) }`);
+assert(downLevel(`class{ async get  a(){[...a]}}`), `var &slice = Array["prototype"]["slice"];
+function () {};
+Object["defineProperty"](cls0["prototype"], "a", (tmp = {}, tmp["get"] = function () { &slice["call"](a) }, tmp))
+var tmp`);
+assert(downLevel(`a=class{ static a(){[...a]}}`), `var &slice = Array["prototype"]["slice"];
+a = function (cls0) { cls0.a = function () { &slice["call"](a) }
+return cls0 }(function () {})`);
+assert(downLevel(`a=class{ static(){[...a]}}`), `var &slice = Array["prototype"]["slice"];
+a = function (cls0) { cls0["prototype"].static = function () { &slice["call"](a) }
+return cls0 }(function () {})`);
+assert(downLevel(`a=class{ static{[...a]}}`), `var &slice = Array["prototype"]["slice"];
+a = function (cls0) { (function () { &slice["call"](a) }())
+return cls0 }(function () {})`);
+

package/coms/compile/rescan.js

@@ -1,5 +1,5 @@
 var { SCOPED, EXPRESS, replace } = require("./common");
-
+var keep = false;
 var patchObject = function (code, objs) {
     var rest = [code];
     var m = null;
@@ -12,7 +12,7 @@ var patchObject = function (code, objs) {
             }
             if (c.type === EXPRESS) {
                 if (m = /^#\\(\d+)$/.exec(c.text)) {
-                    var o = cloneNode(objs[+m[1]]);
+                    var o = cloneNode(objs[+m[1]], keep);
                     if (o instanceof Array) replace(c, ...o);
                     else replace(c, o);
                 }
@@ -32,4 +32,10 @@ function rescan(strs, ...args) {
     dist = scanner2(dist.join(''));
     patchObject(dist, args);
     return dist;
+}
+rescan.keep = function () {
+    keep = true;
+    var res = rescan.apply(this, arguments);
+    keep = false;
+    return res;
 }