efront 3.38.2 → 4.0.0

package/coms/basic_/readme.md

@@ -1,6 +1,6 @@
 # efront 兼容性说明
 * `coms/basic_`目录的代码均为非标准实现，如果你要兼容低版本的运行环境，尽量避免使用高级的功能
-* 当前的`efront`进行代码降级时用到了`typescript`，所以下文有些问题的描述会误伤`typescript`，不用觉得奇怪。
+* 3.x及以前版本的`efront`进行代码降级时用到了`typescript`，所以下文有些问题的描述会误伤`typescript`，不用觉得奇怪。
 * 已知在转换成低版本代码后与高级版本有区别的语法如下：
 1.  ```javascript
     class ... extends Array {...} 

package/coms/compile/downLevel.js

@@ -24,7 +24,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
         var dp = 0;
         if (typeof k === 'number' && k < 0) {
             dp = 1;
-            k = `${tmpname}.length>${doged - k - 1}?${tmpname}[${tmpname}.length - ${-k}]:undefined`;
+            k = `${tmpname}["length"]>${doged - k - 1}?${tmpname}[${tmpname}["length"] - ${-k}]:undefined`;
         } else {
             k = tmpname + k;
         }
@@ -123,12 +123,12 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj) {
                 map[a] = a;
             });
             d.attributes.forEach(dec);
-            write(name, `rest_(${tmpname},[${Object.keys(map)}])`, false);
+            write(name, `rest_(${tmpname},[${Object.keys(map)}])`, false), rootenvs.rest_ = true;
         }
         else {
             doged = at + 1;
             head.forEach(dec);
-            write(name, `Array.prototype.slice.call(${tmpname},${at}${a > at ? `,${at - a}` : ''})`, rest.length > 0);
+            write(name, `slice_["call"](${tmpname},${at}${a > at ? `,${at - a}` : ''})`, rest.length > 0), rootenvs.slice_ = true;
             doged = at + 1;
             total = rest.length;
             rest.forEach(dec);
@@ -245,7 +245,7 @@ var killmap = function (body, i, _getobjname, killobj) {
         s = m, p = m.prev;
         if (m.type === EXPRESS) break;
         while (m && (m.type === STRAP || m.type === STAMP)) m = m.next;
-        if (!m || m.isprop && (m.type === SCOPED || m.type === PROPERTY && /\[/.test(m.text) || m.short || m.next && m.next.type === SCOPED)) {
+        if (!m || m.type & (PROPERTY | QUOTED | EXPRESS) && /^\[/.test(m.text) || m.isprop && (m.type === SCOPED || m.short || m.next && m.next.type === SCOPED)) {
             break;
         }
         m = m.next;
@@ -425,10 +425,12 @@ var setprop = function (prop, k, d, q) {
             else pe = null;
         }
         if (!d[prop.name]) {
-            let tmp = scanner2(`\r\nObject.defineProperty(${k},${prop.name},{})`);
+            let tmp = scanner2(`\r\nObject["defineProperty"](${k},${prop.name},{})`);
             insert1(q, null, ...tmp);
             if (pe) insert1(q, null, pe);
-            d[prop.name] = tmp[tmp.length - 1][4];
+            tmp = tmp[tmp.length - 1];
+            tmp = tmp[tmp.length - 1];
+            d[prop.name] = tmp;
         }
         if (d[prop.name].length) insert1(d[prop.name], null, { type: STAMP, text: ',' });
         insert1(d[prop.name], null, { type: PROPERTY, text: prop.get ? "get" : "set" });
@@ -489,7 +491,7 @@ var killcls = function (body, i, getname_) {
         while (m) {
             var [prop, m] = getprop(o, m);
             if (!prop.value.length) prop.value = scanner2('undefined;');
-            var k = prop.static ? clz.name : `${clz.name}.prototype`;
+            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);
@@ -518,16 +520,16 @@ var killcls = function (body, i, getname_) {
             if (cs.used.this) rename(cs.used, 'this', newt);
             var inited = false;
             assign.forEach(o => {
-                if (o.type === EXPRESS) o.text = o.text.replace(/^this\./g, newt);
+                if (o.type === EXPRESS) o.text = o.text.replace(/^this([\[\.]|$)/g, newt + "$1");
             });
             if (cs.used.super) {
                 cs.used.super.forEach(o => {
                     if (o.text !== 'super') return;
                     var n = o.next;
                     if (!n || n.type !== SCOPED || n.entry !== "(") return;
-                    o.text = base + '.call';
+                    o.text = base + '["call"]';
                     if (!inited) {
-                        insert1(o.queue, o, ...assign);
+                        insert1(o.queue, skipAssignment(o), ...assign);
                     }
                     inited = true;
                     insert1(o.queue, o, ...scanner2(`var ${newt}=`));
@@ -539,11 +541,11 @@ var killcls = function (body, i, getname_) {
             if (scoped.used.super) {
                 scoped.used.super.forEach(o => {
                     if (!/^super(\.|\[|$)/.test(o.text)) return;
-                    o.text = `${base}.prototype` + o.text.replace(/^super/, '');
-                    insert1(o.queue, o.next, ...scanner2('.bind(this)'));
+                    o.text = `${base}["prototype"]` + o.text.replace(/^super/, '');
+                    insert1(o.queue, o.next, ...scanner2('["bind"](this)'));
                 })
             }
-            if (!inited) constructor[1].unshift(...scanner2(`\r\nvar ${newt}=${base}.apply(this,arguments)||this;\r\n`), ...assign);
+            if (!inited) constructor[1].unshift(...scanner2(`\r\nvar ${newt}=${base}["apply"](this,arguments)||this;\r\n`), ...assign);
         }
         else {
             constructor[1].unshift(...assign);
@@ -582,7 +584,7 @@ var indexof = function (list, o, i) {
     return i;
 };
 // 数组或参数展开
-var killspr = function (body, i, _getobjname, setsolid, killobj) {
+var killspr = function (body, i, _getobjname, killobj) {
     var o = body[i];
     var m = o.first;
     if (!m) return i + 1;
@@ -592,12 +594,12 @@ var killspr = function (body, i, _getobjname, setsolid, killobj) {
         var s = m;
         s.text = s.text.replace(/^\.\.\./, '');
         m = skipAssignment(m);
-        var q = scanner2(`Array.prototype.slice.call()`);
+        var q = scanner2(`slice_["call"]()`);
+        rootenvs.slice_ = true;
         var v = splice2(o, s, m);
         if (m) splice2(o, m, m = m.next);
         killobj(v);
-        insert1(q[1], null, ...v);
-        setsolid(q, q[0]);
+        insert1(q[q.length - 1], null, ...v);
         return q;
     };
     var killnext = function (m) {
@@ -613,11 +615,12 @@ var killspr = function (body, i, _getobjname, setsolid, killobj) {
         index++;
     }
     if (!m) return i + 1;
-    var c = scanner2('.concat()');
+    var c = scanner2('["concat"]()');
     var next = o.next;
     if (o.entry === '(') {
         var r = snapExpressHead(o);
         var rt = r.type === EXPRESS && r.text.replace(/^\.\.\./, '');
+        var p = o.prev;
         if (r === o);
         else if (
             r === o.prev && r.type === EXPRESS && !/\.[\s\S]*\./.test(rt) && !/\[[^\]]*\]\[[^\]]*\]/.test(rt)) {
@@ -625,8 +628,12 @@ var killspr = function (body, i, _getobjname, setsolid, killobj) {
             var n = /\.|\[/.test(rt) ? rt.replace(/\.[^\.]*|\[[^\]]*\]$/, '') : "null";
             splice(o, 0, 0, ...scanner2(n + ","));
         }
+        else if (p && r === p.prev && p.type === SCOPED && p.entry === "[" && !/[\.\[]/.test(rt)) {
+            splice(o, 0, 0, ...scanner2(rt + ","));
+            p = r;
+        }
         else {
-            var p = o.prev, n = null, hasdot = false;
+            var n = null, hasdot = false;
             var pt = p.type === EXPRESS && p.text.replace(/^\.\.\./, '');
             if (p.type === EXPRESS && (n = /^(?:[\s\S]*[^\.])?(\.[^\.]*|\[[^\]]*\])$/.exec(pt))) {
                 hasdot = p.text.length !== pt.length;
@@ -652,7 +659,7 @@ var killspr = function (body, i, _getobjname, setsolid, killobj) {
                 if (cx >= 0) splice(h1, cx, 1);
             }
         }
-        splice(body, i++, 0, ...scanner2('.apply'));
+        splice(body, i++, 0, ...scanner2('["apply"]'));
         var m1 = skipAssignment(m);
         if (index > 0 || m1 && m1.next) {
             var h = splice(o, 2, o.length);
@@ -696,7 +703,7 @@ var killspr = function (body, i, _getobjname, setsolid, killobj) {
     return indexof(body, next, i);
 };
 
-var killobj = function (body, getobjname, getletname, getname_, letname_, setsolid, deep = 0) {
+var killobj = function (body, getobjname, getletname, getname_, letname_, deep = 0) {
     var i = 0;
     var _getdeep = function () {
         deep++;
@@ -712,7 +719,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, setsol
         return getobjname(deep + i);
     };
     var deepkill = function (o) {
-        killobj(o, getobjname, getletname, getname_, letname_, setsolid, deep);
+        killobj(o, getobjname, getletname, getname_, letname_, deep);
         if (o.await_) body.await_ = true;
     };
     while (i < body.length) {
@@ -798,7 +805,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, setsol
                     i = killdec(body, i, _getdeepname, '', deepkill);
                 }
                 else {
-                    i = killspr(body, i, _getobjname, setsolid, deepkill);
+                    i = killspr(body, i, _getobjname, deepkill);
                 }
                 continue;
             }
@@ -808,11 +815,11 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, setsol
                     var p = o.prev;
                     if (p.transive || /^(if|else|while|with|switch)$/.test(p.text)) deepkill(o);
                 }
-                else if (!o.prev || o.prev.type === STAMP || o.prev.type === STRAP) {
+                else if (!o.prev || o.prev.type & (STAMP | STRAP)) {
                     deepkill(o);
                 }
                 else {
-                    i = killspr(body, i, _getobjname, setsolid, deepkill);
+                    i = killspr(body, i, _getobjname, deepkill);
                     continue;
                 }
             }
@@ -971,8 +978,8 @@ var unforof = function (o, getnewname, used) {
         o.push(...mo);
         o.push({ type: STAMP, text: ',' });
     }
-    if (useSimpleLoop) o.push(...scanner2(`${iname}=0,${gname}=${oname}.length;${iname}<${gname}&&(${createString([p])}=${oname}[${iname}],true);${iname}++`));
-    else rootenvs.Symbol = true, o.push(...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}=${gname}.next()`));
+    if (useSimpleLoop) o.push(...scanner2(`${iname}=0,${gname}=${oname}["length"];${iname}<${gname}&&(${createString([p])}=${oname}[${iname}],true);${iname}++`));
+    else rootenvs.Symbol = true, o.push(...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}=${gname}["next"]()`));
     relink(o);
 };
 var unarrow = function (body, i, killobj, letname_) {
@@ -993,7 +1000,7 @@ var unarrow = function (body, i, killobj, letname_) {
     if (n.type !== SCOPED || n.entry !== "{") {
         var nni = skipAssignment(body, ni);
         b = scanner2('{}')[0];
-        b.push({ type: STRAP, text: "return" }, ...body.splice(ni, nni - ni, b));
+        splice(b, 0, 0, { type: STRAP, transive: true, text: "return" }, ...splice(body, ni, nni - ni, b));
         killarg(h, b, letname_);
         killobj(b);
         ni = nni;
@@ -1056,10 +1063,10 @@ var killarg = function (head, body, _getname, setarg = true) {
         argcodes.unshift.apply(argcodes, anames.map((a, i) => {
             if (a === cname) cname = '';
             var n = anames.length - i;
-            return `${a}=arguments.length>${collect + n - 1}?arguments[arguments.length - ${n}]:undefined`;
+            return `${a}=arguments["length"]>${collect + n - 1}?arguments[arguments["length"] - ${n}]:undefined`;
         }));
 
-        if (cname) argcodes.unshift(`var ${cname}=Array.prototype.slice.call(arguments,${collect}${index > collect ? `,${collect - index}` : ""})`);
+        if (cname) argcodes.unshift(`var ${cname}=slice_["call"](arguments,${collect}${index > collect ? `,${collect - index}` : ""})`), rootenvs.slice_ = true;
     }
     if (argcodes.length && setarg) {
         if (!body) {
@@ -1315,25 +1322,6 @@ var down = function (scoped) {
         scoped.body.unshift.apply(scoped.body, codelist);
     };
 
-    var solidmap = {};
-    var setsolid = function (q, o) {
-        var k = o.text;
-        if (!/\.[\s\S]+\./.test(k)) return;
-        var c = k.replace(/^[\s\S]*?(\.[^\.]*$)/, '$1');
-        k = k.replace(/^([\s\S]*?)\.[^\.]*$/, '$1');
-        if (!solidmap[k]) {
-            solidmap[k] = [q, o];
-            return;
-        }
-        if (typeof solidmap[k] !== 'string') {
-            var n = k.replace(/^[\s\S]*?([^\.]*)$/, "$1");
-            n = _getname(n + "_");
-            var [q, b] = solidmap[k];
-            b.text = `(${n} = ${k})${c}`;
-            solidmap[k] = n;
-        }
-        o.text = solidmap[k] + c;
-    };
     var markcodes = [];
     if (scoped.isfunc && scoped.used.this && (funcMark || scoped.insett)) {
         let tn = _getname("this_");
@@ -1349,9 +1337,9 @@ var down = function (scoped) {
     }
     var fordeep = 0;
     var _killobj = function (_getlocal, o) {
-        return killobj(o, gettmpname, getletname, _getlocal, _letname, setsolid);
+        return killobj(o, gettmpname, getletname, _getlocal, _letname);
     };
-    var kill = function (scoped, _, body) {
+    var kill = function (scoped, _, parentScope) {
         if (scoped.isfunc) return down(scoped);
         killlet(scoped);
         var saveddeep = fordeep;
@@ -1380,6 +1368,7 @@ var down = function (scoped) {
         fordeep = saveddeep;
     };
     if (scoped.isfunc) {
+        if (!scoped.body && scoped.head) scoped.body = scoped.head.next;
         if (scoped.head) var [argsmap, argcodes] = killarg(scoped.head, scoped.body, _letname, false);
         else argcodes = [];
         if ((markcodes.length || argcodes.length) && !funcMark) precode(markcodes.concat(argcodes).join(";") + ";");
@@ -1412,6 +1401,7 @@ var down = function (scoped) {
             scoped.yield = false;
         }
         var vars1 = Object.keys(vars).filter(k => !(k in scoped.vars));
+        scoped.vars = vars;
         if (argsmap) vars1 = vars1.filter(k => !(k in argsmap));
         if (vars1.length && scoped.body) scoped.body.push(...scanner2(`\r\nvar ${vars1}`));
         if (scoped.body) relink(scoped.body);
@@ -1433,6 +1423,10 @@ var downcode = downLevel.code = function (code) {
     rootHyper = rootenvs.Symbol || code.yield || code.async;
     down(code.scoped);
     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'));
+    }
     rootenvs = null;
     return code;
 };

package/coms/compile/downLevel_test.js

@@ -2,7 +2,7 @@ var downLevel = require("./downLevel");
 var _asert = assert, i = 10;
 assert = function (a, b) {
     var d = 1;
-    b = b.split(/(?<!\r)\n/), d = b.length, b = b.join("\r\n");
+    b = b.split(/(?<!\r)\n/), d = b["length"], b = b["join"]("\r\n");
     _asert(a, b, i);
     i += d;
 }
@@ -54,27 +54,27 @@ assert(downLevel(`function (arg1=b,[c],d,e=f){}`), "function (arg1, arg2, d, e)
 i++// class降级
 assert(downLevel(`class a {}`), "function a() {}")
 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; })")
-assert(downLevel(`var a=class {a=1; static b=2 b(){}};`), "var a = function (cls0) { cls0.b = 2\r\ncls0.prototype.b = function () {}\r\nreturn cls0 }(function () { this.a = 1; });")
-assert(downLevel(`var a=class { constructor(){this.a=1}; static b=2 b(){}};`), "var a = function (cls0) { cls0.b = 2\r\ncls0.prototype.b = function () {}\r\nreturn cls0 }(function () { 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; })`)
+assert(downLevel(`var a=class {a=1; static b=2 b(){}};`), `var a = function (cls0) { cls0.b = 2\r\ncls0["prototype"].b = function () {}\r\nreturn cls0 }(function () { this.a = 1; });`)
+assert(downLevel(`var a=class { constructor(){this.a=1}; static b=2 b(){}};`), `var a = function (cls0) { cls0.b = 2\r\ncls0["prototype"].b = function () {}\r\nreturn cls0 }(function () { this.a = 1 });`)
 assert(downLevel(`class a {static b(){}}`), "function a() {}; a.b = function () {}")
 assert(downLevel(`class a extends b{}`), `function a() {
-var this_ = b.apply(this, arguments) || this;
+var this_ = b["apply"](this, arguments) || this;
 return this_ }; extends_(a, b)`);
 assert(downLevel(`class a extends class b{}{}`), `var a = function (b, a) { extends_(a, b)\r\nreturn a }(function b() {}, function a() {
-var this_ = b.apply(this, arguments) || this;
+var this_ = b["apply"](this, arguments) || this;
 return this_ })`);
 assert(downLevel(`class a {get a(){}}`), `function a() {};
-Object.defineProperty(a.prototype, "a", { get: function () {} })`);
+Object["defineProperty"](a["prototype"], "a", { get: function () {} })`);
 assert(downLevel(`class a {set a(){}}`), `function a() {};
-Object.defineProperty(a.prototype, "a", { set: function () {} })`);
+Object["defineProperty"](a["prototype"], "a", { set: function () {} })`);
 assert(downLevel(`class a {get a(){}; get b(){}; set a(){}}`), `function a() {};
-Object.defineProperty(a.prototype, "a", { get: function () {}, set: function () {} });
-Object.defineProperty(a.prototype, "b", { get: function () {} });`);
+Object["defineProperty"](a["prototype"], "a", { get: function () {}, set: function () {} });
+Object["defineProperty"](a["prototype"], "b", { get: function () {} });`);
 assert(downLevel(`class a {set a(){}; get b(){}; set a(){}}`), `function a() {};
-Object.defineProperty(a.prototype, "a", { set: function () {}, set: function () {} });
-Object.defineProperty(a.prototype, "b", { get: function () {} });`);
+Object["defineProperty"](a["prototype"], "a", { set: function () {}, set: function () {} });
+Object["defineProperty"](a["prototype"], "b", { get: function () {} });`);
 i++// 属性降级
 assert(downLevel(`return ({b,async a(){}})`), `return ((_ = {},
 _.b = b,
@@ -132,38 +132,37 @@ assert(downLevel(`={...{},...c,b}`), `= (_ = extend({}, {}, c),
 _.b = b, _)\r\nvar _`);
 assert(downLevel(`={a(){},get c(){},b}`), `= (_ = {},
 _.a = function () {},
-Object.defineProperty(_, "c", { get: function () {} }),
+Object["defineProperty"](_, "c", { get: function () {} }),
 _.b = b, _)\r\nvar _`);
-assert(downLevel(`=[...a]`), `= Array.prototype.slice.call(a)`)
-assert(downLevel(`let a = [...a,...a()];`), `var a = (slice_ = Array.prototype.slice).call(a).concat(slice_.call(a()));
-var slice_`)
-assert(downLevel(`=[...a,...b]`), `= (slice_ = Array.prototype.slice).call(a).concat(slice_.call(b))\r\nvar slice_`)
-assert(downLevel(`=[a,...b]`), `= [a].concat(Array.prototype.slice.call(b))`)
-assert(downLevel(`=[a,...b,...c]`), `= [a].concat((slice_ = Array.prototype.slice).call(b), slice_.call(c))\r\nvar slice_`)
-assert(downLevel(`=[a,b,...c]`), `= [a, b].concat(Array.prototype.slice.call(c))`)
-assert(downLevel(`=[a,b,...c,d]`), `= [a, b].concat(Array.prototype.slice.call(c), [d])`)
-assert(downLevel(`=[a,b,...c,d,e,f]`), `= [a, b].concat(Array.prototype.slice.call(c), [d, e, f])`)
-assert(downLevel(`=[a,b,...c,d,e,f,...g]`), `= [a, b].concat((slice_ = Array.prototype.slice).call(c), [d, e, f], slice_.call(g))\r\nvar slice_`)
-assert(downLevel(`=[a,b,...c,d,...e]`), `= [a, b].concat((slice_ = Array.prototype.slice).call(c), [d], slice_.call(e))\r\nvar slice_`)
-assert(downLevel(`a(...b)`), `a.apply(null, b)`)
-assert(downLevel(`a(c,d,e,...b(...c))`), `a.apply(null, [c, d, e].concat(Array.prototype.slice.call(b.apply(null, c))))`)
-assert(downLevel(`a(c,d,e,...b.a(...c))`), `a.apply(null, [c, d, e].concat(Array.prototype.slice.call(b.a.apply(b, c))))`)
-assert(downLevel(`a(c,d,e,...b.a.c(...c))`), `a.apply(null, [c, d, e].concat(Array.prototype.slice.call((_ = b.a).c.apply(_, c))))\r\nvar _`)
-assert(downLevel(`a(...b,...c)`), `a.apply(null, (slice_ = Array.prototype.slice).call(b).concat(slice_.call(c)))\r\nvar slice_`)
-assert(downLevel(`a(...b,c)`), `a.apply(null, Array.prototype.slice.call(b).concat([c]))`)
-assert(downLevel(`getPendingExpressions()[_push](...flattenCommaList(expr));`), `(_ = getPendingExpressions())[_push].apply(_, flattenCommaList(expr));\r\nvar _`)
-assert(downLevel(`a(b,...c)`), `a.apply(null, [b].concat(Array.prototype.slice.call(c)))`)
-assert(downLevel(`a(a,b,...c,d,...e)`), `a.apply(null, [a, b].concat((slice_ = Array.prototype.slice).call(c), [d], slice_.call(e)))\r\nvar slice_`)
-assert(downLevel(`a.call(a,b,...c,d,...e)`), `a.call.apply(a, [a, b].concat((slice_ = Array.prototype.slice).call(c), [d], slice_.call(e)))\r\nvar slice_`)
-assert(downLevel(`a.b(a,b,...c,d,...e)`), `a.b.apply(a, [a, b].concat((slice_ = Array.prototype.slice).call(c), [d], slice_.call(e)))\r\nvar slice_`)
-assert(downLevel(`[].b(a,b,...c,d,...e)`), `(_ = []).b.apply(_, [a, b].concat((slice_ = Array.prototype.slice).call(c), [d], slice_.call(e)))\r\nvar _, slice_`)
-assert(downLevel(`a(...b).c(...d)`), `(_ = a.apply(null, b)).c.apply(_, d)\r\nvar _`)
-assert(downLevel(`a(...b).c(...d).e(...f)`), `(_ = (_ = a.apply(null, b)).c.apply(_, d)).e.apply(_, f)\r\nvar _`)
-assert(downLevel(`diagnostic.relatedInformation.push(...relatedInformation);`), `(_ = diagnostic.relatedInformation).push.apply(_, relatedInformation);\r\nvar _`);
-assert(downLevel(`const typeNames = [79 /* Identifier */, ...typeKeywords];`), `var typeNames = [79 /* Identifier */].concat(Array.prototype.slice.call(typeKeywords));`);
+assert(downLevel(`=[...a]`), `var slice_ = Array["prototype"]["slice"];\r\n= slice_["call"](a)`)
+assert(downLevel(`let a = [...a,...a()];`), `var slice_ = Array["prototype"]["slice"];\r\nvar a = slice_["call"](a)["concat"](slice_["call"](a()));`)
+assert(downLevel(`=[...a,...b]`), `var slice_ = Array["prototype"]["slice"];\r\n= slice_["call"](a)["concat"](slice_["call"](b))`)
+assert(downLevel(`=[a,...b]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a]["concat"](slice_["call"](b))`)
+assert(downLevel(`=[a,...b,...c]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a]["concat"](slice_["call"](b), slice_["call"](c))`)
+assert(downLevel(`=[a,b,...c]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a, b]["concat"](slice_["call"](c))`)
+assert(downLevel(`=[a,b,...c,d]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a, b]["concat"](slice_["call"](c), [d])`)
+assert(downLevel(`=[a,b,...c,d,e,f]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a, b]["concat"](slice_["call"](c), [d, e, f])`)
+assert(downLevel(`=[a,b,...c,d,e,f,...g]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a, b]["concat"](slice_["call"](c), [d, e, f], slice_["call"](g))`)
+assert(downLevel(`=[a,b,...c,d,...e]`), `var slice_ = Array["prototype"]["slice"];\r\n= [a, b]["concat"](slice_["call"](c), [d], slice_["call"](e))`)
+assert(downLevel(`a(...b)`), `a["apply"](null, b)`)
+assert(downLevel(`a(c,d,e,...b(...c))`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [c, d, e]["concat"](slice_["call"](b["apply"](null, c))))`)
+assert(downLevel(`a(c,d,e,...b.a(...c))`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [c, d, e]["concat"](slice_["call"](b.a["apply"](b, c))))`)
+assert(downLevel(`a(c,d,e,...b.a.c(...c))`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [c, d, e]["concat"](slice_["call"]((_ = b.a).c["apply"](_, c))))\r\nvar _`)
+assert(downLevel(`a(...b,...c)`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, slice_["call"](b)["concat"](slice_["call"](c)))`)
+assert(downLevel(`a(...b,c)`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, slice_["call"](b)["concat"]([c]))`)
+assert(downLevel(`getPendingExpressions()[_push](...flattenCommaList(expr));`), `(_ = getPendingExpressions())[_push]["apply"](_, flattenCommaList(expr));\r\nvar _`)
+assert(downLevel(`a(b,...c)`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [b]["concat"](slice_["call"](c)))`)
+assert(downLevel(`a(a,b,...c,d,...e)`), `var slice_ = Array["prototype"]["slice"];\r\na["apply"](null, [a, b]["concat"](slice_["call"](c), [d], slice_["call"](e)))`)
+assert(downLevel(`a["call"](a,b,...c,d,...e)`), `var slice_ = Array["prototype"]["slice"];\r\na["call"]["apply"](a, [a, b]["concat"](slice_["call"](c), [d], slice_["call"](e)))`)
+assert(downLevel(`a.b(a,b,...c,d,...e)`), `var slice_ = Array["prototype"]["slice"];\r\na.b["apply"](a, [a, b]["concat"](slice_["call"](c), [d], slice_["call"](e)))`)
+assert(downLevel(`[].b(a,b,...c,d,...e)`), `var slice_ = Array["prototype"]["slice"];\r\n(_ = []).b["apply"](_, [a, b]["concat"](slice_["call"](c), [d], slice_["call"](e)))\r\nvar _`)
+assert(downLevel(`a(...b).c(...d)`), `(_ = a["apply"](null, b)).c["apply"](_, d)\r\nvar _`)
+assert(downLevel(`a(...b).c(...d).e(...f)`), `(_ = (_ = a["apply"](null, b)).c["apply"](_, d)).e["apply"](_, f)\r\nvar _`)
+assert(downLevel(`diagnostic.relatedInformation.push(...relatedInformation);`), `(_ = diagnostic.relatedInformation).push["apply"](_, relatedInformation);\r\nvar _`);
+assert(downLevel(`const typeNames = [79 /* Identifier */, ...typeKeywords];`), `var slice_ = Array["prototype"]["slice"];\r\nvar typeNames = [79 /* Identifier */]["concat"](slice_["call"](typeKeywords));`);
 i++// 箭头函数
 assert(downLevel(`a=>k`), "function (a) { return k }")
-assert(downLevel(`function (a,...b,b){}`), "function (a, b) { b = arguments.length > 1 ? arguments[arguments.length - 1] : undefined; }")
+assert(downLevel(`function (a,...b,b){}`), `function (a, b) { b = arguments["length"] > 1 ? arguments[arguments["length"] - 1] : undefined; }`)
 assert(downLevel(`(a)=>k`), "function (a) { return k }")
 assert(downLevel(`(a=1)=>k`), "function (a) { if (a === undefined) a = 1; return k }")
 assert(downLevel(`([a])=>b`), "function (arg) { var a = arg[0]; return b }")
@@ -171,31 +170,36 @@ assert(downLevel(`map(([a])=>a)`), "map(function (arg) { var a = arg[0]; return
 assert(downLevel(`var [_, R, G, B, A] = rgbHex.exec(color).map(a => parseInt(a + a, 16));`), "var _0 = rgbHex.exec(color).map(function (a) { return parseInt(a + a, 16) }), _ = _0[0], R = _0[1], G = _0[2], B = _0[3], A = _0[4];")
 assert(downLevel(`if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag'), initialEvent.target)) return;`), "if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName) || getTargetIn(function (a) { return a.nodrag || a.hasAttribute('nodrag') }, initialEvent.target)) return;")
 i++// 对象收集
-assert(downLevel(`function (a,...b){}`), "function (a) { var b = Array.prototype.slice.call(arguments, 1); }")
-assert(downLevel(`function (a,...b,c){}`), "function (a, c) { var b = Array.prototype.slice.call(arguments, 1, -1); c = arguments.length > 1 ? arguments[arguments.length - 1] : undefined; }")
-assert(downLevel(`function (a,...,c){}`), "function (a, c) { c = arguments.length > 1 ? arguments[arguments.length - 1] : undefined; }")
-assert(downLevel(`(...a) => k`), "function () { var a = Array.prototype.slice.call(arguments, 0); return k }")
-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(`[...a]=a`), "a = Array.prototype.slice.call(a, 0)")
-assert(downLevel(`[c,...a]=a`), "c = a[0], a = Array.prototype.slice.call(a, 1)")
-assert(downLevel(`[...a]=a`), "a = Array.prototype.slice.call(a, 0)")
-assert(downLevel(`[...a,c]=a`), "_ = a, a = Array.prototype.slice.call(a, 0, -1), c = _.length > 1 ? _[_.length - 1] : undefined\r\nvar _")
+assert(downLevel(`function (a,...b){}`), `var slice_ = Array["prototype"]["slice"];\r\nfunction (a) { var b = slice_["call"](arguments, 1); }`)
+assert(downLevel(`function (a,...b,c){}`), `var slice_ = Array["prototype"]["slice"];\r\nfunction (a, c) { var b = slice_["call"](arguments, 1, -1); c = arguments["length"] > 1 ? arguments[arguments["length"] - 1] : undefined; }`)
+assert(downLevel(`function (a,...,c){}`), `function (a, c) { c = arguments["length"] > 1 ? arguments[arguments["length"] - 1] : undefined; }`)
+assert(downLevel(`(...a) => k`), `var slice_ = Array["prototype"]["slice"];\r\nfunction () { var a = slice_["call"](arguments, 0); return k }`)
+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(`[...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)`)
+assert(downLevel(`[...a,c]=a`), `var slice_ = Array["prototype"]["slice"];\r\n_ = a, a = slice_["call"](a, 0, -1), c = _["length"] > 1 ? _[_["length"] - 1] : undefined\r\nvar _`)
 assert(downLevel(`{...a,c}=a`), `c = a.c, a = rest_(a, ["c"])`)
 assert(downLevel(`{c,...a}=a`), `c = a.c, a = rest_(a, ["c"])`)
 assert(downLevel("if(a){}[r, g, b] = rgb4s(r, g, b, s)"), "if (a) {} _ = rgb4s(r, g, b, s), r = _[0], g = _[1], b = _[2]\r\nvar _", true);
 assert(downLevel(`{c,[c]:b,...a}=a`), `c = a.c, b = a[c], a = rest_(a, ["c", c])`)
+assert(downLevel(`async()=>name = require("./$split")(name)["join"]("/");`), `function () { return async_(
+function () {
+_0 = require("./$split")(name)["join"]("/"); name = _0; return [_0, 2]
+})
+var _0 };`);
 i++//异步或步进函数
 assert(downLevel(`function *(){yield *a}`), `function () { return aster_(
 function () {
-_; _0 = 0; _3 = a.length; _1 = _3; return [1, 0]
+_; _0 = 0; _3 = a["length"]; _1 = _3; return [1, 0]
 },
 function () {
-_3 = _0 < _1; if (!_3) return [1, 0]; _4 = a[_0]; _ = _4; _3 = (_4, true)
+_3 = _0 < _1; if (!_3) return [1, 0]; _4 = a[_0]; _ = _4; _3 = (true)
 },
 function () {
 if (!_3) return [2, 0]; return [_, 3]
@@ -207,16 +211,16 @@ 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 () {
-a; _3 = Symbol.iterator; _2 = b[_3]; if (_2) return [1, 0]; _3 = Symbol.asyncIterator; _2 = b[_3]; if (_2) return [1, 0]; _3 = Symbol.iterator; _2 = Array.prototype[_3]
+a; _3 = Symbol["iterator"]; _2 = b[_3]; if (_2) return [1, 0]; _3 = Symbol["asyncIterator"]; _2 = b[_3]; if (_2) return [1, 0]; _3 = Symbol["iterator"]; _2 = Array["prototype"][_3]
 },
 function () {
-_0 = _2; _2 = _0.call(b); _0 = _2; _2 = _0.next(); _ = _2; return [1, 0]
+_0 = _2; _2 = _0["call"](b); _0 = _2; _2 = _0["next"](); _ = _2; return [1, 0]
 },
 function () {
-_2 = !_.done; if (!_2) return [1, 0]; _3 = _.value; a = _3; _2 = (_3, true)
+_2 = !_["done"]; if (!_2) return [1, 0]; _3 = _["value"]; a = _3; _2 = (true)
 },
 function () {
-if (!_2) return [1, 0]; Symbol; _2 = _0.next(); _ = _2; return [-1, 0]
+if (!_2) return [1, 0]; Symbol; _2 = _0["next"](); _ = _2; return [-1, 0]
 })
 var a, _, _0, _2, _3 }`)
 assert(downLevel(`a={async a(){var b =c;return 1}}`), `a = (_ = {},

package/coms/compile/unstruct.js

@@ -438,6 +438,17 @@ var remove_end_comma = function (o) {
         o.splice(cx, cx + 1);
     }
 };
+var isEvalScope = function (o) {
+    if (o.entry === "[") {
+        var h = snapExpressHead(o);
+        return o !== h;
+    }
+    else if (o.entry === '(') {
+        var h = snapExpressHead(o);
+        return o === h;
+    }
+    return false;
+}
 var _invoke = function (t, getname) {
     var nameindex = 0;;
     var getdeepname = function (deep = 0) {
@@ -464,6 +475,7 @@ var _invoke = function (t, getname) {
         if (o.type === SCOPED && (o.entry === '[' || o.entry === "(")) {
             var _nameindex = nameindex;
             remove_end_comma(o);
+            var iseval = isEvalScope(o);
             for (var cy = 0; cy < o.length; cy++) {
                 if (o[cy].type & (SPACE | COMMENT)) continue;
                 var by = cy;
@@ -477,10 +489,17 @@ var _invoke = function (t, getname) {
                 }
                 var q = toqueue(m, getdeepname, true);
                 var qe = q[q.length - 1];
-                o.splice(by, cy - by, { text: qe.name, type: EXPRESS });
-                cy -= cy - by - 1;
-                nameindex++;
+                if (!iseval || m[m.length - 1] === o.last) {
+                    splice(o, by, cy - by, { text: qe.name, type: EXPRESS });
+                    cy = by + 1;
+                }
+                else {
+                    while (o[cy].type & (SPACE | COMMENT)) cy++;
+                    splice(o, by, cy - by + 1);
+                    cy = by;
+                }
                 cache.push(...q);
+                nameindex++;
             }
             nameindex = _nameindex;
             if (!cache.length) continue;
@@ -665,6 +684,23 @@ var ternary = function (body, getname, ret) {
     }
     return explist;
 };
+var isFunctionOnly = function (body) {
+    for (var cx = 2, dx = body.length; cx < dx; cx++) {
+        if (body[cx].type & (SPACE | COMMENT)) continue;
+        break;
+    }
+    var o = body[cx];
+    if (!o) return false;
+    if (o.type === STRAP && o.text === 'function') {
+        while (o && o.entry !== "{") o = body[cx++];
+        if (!o) return false;
+    }
+    else return false;
+    for (; cx < dx; cx++) {
+        if (!(body[cx].type & (SPACE | COMMENT))) return false;
+    }
+    return true;
+};
 var canbeOnce = function (body) {
     for (var cx = 0, dx = body.length; cx < dx; cx++) {
         if (body[cx].type & (SPACE | COMMENT)) continue;
@@ -825,7 +861,12 @@ var _express = function (body, getname, ret) {
     }
     if (needname) q.name = getname(nameindex);
     relink(q);
-    result = _invoke(q, getdeepname);
+    if (isFunctionOnly(q)) {
+        result = [q];
+    }
+    else {
+        result = _invoke(q, getdeepname);
+    }
     if (hasor) result[result.length - 1].ret_ = true;
     return result;
 };

package/coms/compile/unstruct_test.js

@@ -57,7 +57,7 @@ test("if(await a) await b", "_ = a; return [_, 1];\r\n if (!@) return [2, 0]; _
 test("for(a in b)", "for (a in b)", true);
 test("for(var a in b) a.push()", "for (var a in b) a.push()", true);
 test("for(;;)", "return [0, 0]", true);
-test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_0 = Symbol.iterator; _ = os[_0]; if (_) return [1, 0]; _0 = Symbol.asyncIterator; _ = os[_0]; if (_) return [1, 0]; _0 = Symbol.iterator; _ = Array.prototype[_0];\r\n a = _; _ = a.call(os); a = _; _ = a.next(); b = _; return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; _0 = b.value; o = _0; _ = (_0, true);\r\n if (!_) return [1, 0]; _ = a.next(); b = _; return [-1, 0]", true);
+test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_0 = Symbol.iterator; _ = os[_0]; if (_) return [1, 0]; _0 = Symbol.asyncIterator; _ = os[_0]; if (_) return [1, 0]; _0 = Symbol.iterator; _ = Array.prototype[_0];\r\n a = _; _ = a.call(os); a = _; _ = a.next(); b = _; return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; _0 = b.value; o = _0; _ = (true);\r\n if (!_) return [1, 0]; _ = a.next(); b = _; return [-1, 0]", true);
 test("for(a=0;a<1;a++)if(a==0)continue", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [2, 0]; _ = a == 0; if (_) return [1, 0]; return [1, 0];\r\n _ = a++; return [-1, 0]`, true);
 test("for(a=0;a<10;a++) await a", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [2, 0]; _ = a; return [_, 1];\r\n _ = @; _ = a++; return [-1, 0]", true);
 test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1, 0];\r\n _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1];\r\n _ = @; _ = b; return [_, 1];\r\n _ = @; _ = a++; return [-2, 0]", true);

package/coms/reptile/colored_console.js

@@ -156,14 +156,14 @@ var formatRows = function (arg, rows, deep, entry, leave) {
         if (isArray) {
             for (var cx = 0, dx = rows.length; cx < dx; cx += itemcount) {
                 res.push(rows.slice(cx, cx + itemcount).map((r, i) => {
-                    return Array(maxLength[i] - lens[cx + i] + 1).join(" ") + r;
+                    return Array(Math.max(maxLength[i] - lens[cx + i], 0)).join(" ") + r;
                 }).join(', '));
             }
         }
         else {
             for (var cx = 0, dx = rows.length; cx < dx; cx += itemcount) {
                 res.push([rows[cx], ...rows.slice(cx + 1, cx + itemcount).map((r, i) => {
-                    return Array(maxLength[i] - lens[cx + i] + 1).join(" ") + r;
+                    return Array(Math.max(maxLength[i] - lens[cx + i], 0)).join(" ") + r;
                 })].join(', '));
             }
         }