efront 3.38.2 → 4.0.2

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,
@@ -118,6 +118,18 @@ assert(downLevel(`()=>({\r\nfileName: entry.fileName,\r\ntextSpan: highlightSpan
 fileName: entry.fileName,
 textSpan: highlightSpan.textSpan,
 isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */ }, highlightSpan.isInString && { isInString: true }, highlightSpan.contextSpan && { contextSpan: highlightSpan.contextSpan })) }`);
+assert(downLevel(`async()=>({ [argitem.sort ? argitem.sort : 'date']: "desc" })`), `function () { return async_(
+function () {
+_0 = {}; _ = _0; if (!argitem.sort) return [1, 0]; _1 = argitem.sort; return [2, 0]
+},
+function () {
+_1 = 'date'; return [1, 0]
+},
+function () {
+_[_1] = "desc"; _0 = (_); _0 = (_0); return [_0, 2]
+})
+var _0, _1 }
+var _`);
 assert(downLevel(`={...{a:1}}`), `= extend({}, { a: 1 })`);
 assert(downLevel(`={...a,...c}`), `= extend({}, a, c)`);
 assert(downLevel(`={a:a,...b,c}`), `= (_ = extend({ a: a }, b),\r\n_.c = c, _)\r\nvar _`);
@@ -132,38 +144,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 +182,70 @@ 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 await(o of os) noSymbol`), `return async_(
+function () {
+_3 = Symbol["asyncIterator"]; _2 = os[_3]; if (_2) return [1, 0]; _3 = Symbol["iterator"]; _2 = os[_3]; if (_2) return [1, 0]; _3 = Symbol["iterator"]; _2 = Array["prototype"][_3]
+},
+function () {
+_0 = _2; _2 = _0["call"](os); _0 = _2; _2 = _0["next"](); return [_2, 1]
+},
+function (_1) {
+_2 = _1; _ = _2; return [1, 0]
+},
+function () {
+_2 = !_["done"]; if (!_2) return [1, 0]; _3 = _["value"]; o = _3; _2 = (true)
+},
+function () {
+if (!_2) return [1, 0]; noSymbol; _2 = _0["next"](); _ = _2; return [-1, 0]
+})
+var _, _0, _2, _3`)
+assert(downLevel(`for await(var [o,s] of os) noSymbol`), `return async_(
+function () {
+o; s; _4 = Symbol["asyncIterator"]; _3 = os[_4]; if (_3) return [1, 0]; _4 = Symbol["iterator"]; _3 = os[_4]; if (_3) return [1, 0]; _4 = Symbol["iterator"]; _3 = Array["prototype"][_4]
+},
+function () {
+_0 = _3; _3 = _0["call"](os); _0 = _3; _3 = _0["next"](); return [_3, 1]
+},
+function (_2) {
+_3 = _2; _ = _3; return [1, 0]
+},
+function () {
+_3 = !_["done"]; if (!_3) return [1, 0]; _4 = _["value"]; _1 = _4; _5 = _1[0]; o = _5; _6 = _1[1]; s = _6; _3 = (true)
+},
+function () {
+if (!_3) return [1, 0]; noSymbol; _3 = _0["next"](); _ = _3; return [-1, 0]
+})
+var o, s, _, _0, _1, _3, _4, _5, _6`)
+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 +257,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

@@ -123,7 +123,7 @@ var _switch = function (body, cx, unblock, result, getname) {
     var o = body[cx];
     o = o.next;
     if (!o) return;
-    var qt = _express(o, getname, true);
+    var qt = ternary(o, getname, true);
     for (var q of qt) if (q.length) pushstep(result, q);
     var q = qt[qt.length - 1];
     var qn = q.name;
@@ -142,7 +142,7 @@ var _switch = function (body, cx, unblock, result, getname) {
         var getnextname = function (deep) {
             return getname(deep + 1);
         };
-        var q = _express(block, getnextname, true);
+        var q = ternary(block, getnextname, true);
         for (var q of q) if (q.length) pushstep(result, q);
         var qe = q;
         if (qe.name) var case_ = scanner2(`if(${qn}===${qe.name})return[]`);
@@ -435,9 +435,20 @@ var remove_end_comma = function (o) {
         }
     }
     if (m && m.type === STAMP && m.text === ',') {
-        o.splice(cx, cx + 1);
+        splice(o, cx, o.length - cx);
     }
 };
+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,23 +475,33 @@ 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;
-                var c = o[cy];
-                if (c.type & STAMP && /^[,;]$/.test(c.text)) continue;
+                while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
+                var ay = cy;
                 cy = skipAssignment(o, cy);
-                if (by === cy) continue;
-                var m = o.slice(by, cy);
+                var ey = cy;
+                if (ay === ey || ay >= o.length) continue;
+                var m = o.slice(ay, ey);
                 if (m.length === 1 && (m[0].type === EXPRESS && !/\./.test(m[0].text) || m[0].type === VALUE || m[0].type === QUOTED && !m[0].length)) {
                     continue;
                 }
                 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, ey - by, { text: qe.name, type: EXPRESS });
+                    cy = by + 1;
+                }
+                else {
+                    while (cy < o.length && o[cy].type & (SPACE | COMMENT)) cy++;
+                    var c = o[cy];
+                    if (c && c.type & STAMP && /^[,;]$/.test(c.text)) cy++;
+                    splice(o, 0, cy);
+                    cy = -1;
+                }
                 cache.push(...q);
+                nameindex++;
             }
             nameindex = _nameindex;
             if (!cache.length) continue;
@@ -631,7 +652,7 @@ var ternary = function (body, getname, ret) {
         for (var a of ass) {
             if (a.type === SCOPED) {
                 if (a.entry === '[') {
-                    var q = _express(a, getnextname, true);
+                    var q = ternary(a, getnextname, true);
                     for (var q of q) {
                         if (q.length) pushstep(explist, q);
                     }
@@ -665,6 +686,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 +863,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(', '));
             }
         }

package/docs//347/211/210/346/234/254/350/257/264/346/230/216.md

@@ -7,3 +7,5 @@
 2.x版本 `efront`采用自我编译的形式发布，依赖项基本不变
 
 3.x版本 `efront`拥有自建的语法解析器，不再依赖`esprima`、`esmangle`、`escodegen`，自我编译耗时由原来的10分钟github工作流，逐步减少到2分钟左右。
+
+4.0版本 不再依赖`typescipt`（近17万行源码）

package/package.json

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