efront 4.20.1 → 4.21.0

package/coms/compile/downLevel_test.js

@@ -9,16 +9,16 @@ assert = function (a, b) {
 var innerJs = new Javascript;
 innerJs.defaultType = common.STRAP;
 // 运算符
-assert(downLevel(`a??b`), 'nullish_(a, b)', true);
-assert(downLevel(`a**b`), 'power_(a, b)', true);
-assert(downLevel(`a.c**b`), 'power_(a.c, b)', true);
-assert(downLevel(`a??=b`), 'a = nullish_(a, b)', true);
-assert(downLevel(`a**=b`), 'a = power_(a, b)', true);
-assert(downLevel(`a+=b+c**d`), 'a += b + power_(c, d)', true);
-assert(downLevel(`a(c**=d)`), 'a(c = power_(c, d))', true);
-assert(downLevel(`a(c.b.d**=d)`), 'a((_ = c.b, _.d = power_(_.d, d)))\r\nvar _', true);
-assert(downLevel(`a(c.b[a.b]**=d)`), 'a((_ = c.b, _[_0 = a.b] = power_(_[_0], d)))\r\nvar _, _0', true);
-assert(downLevel(`c.b[a.b]**=d`), '_ = c.b, _[_0 = a.b] = power_(_[_0], d)\r\nvar _, _0', true);
+assert(downLevel(`a??b`), '&nullish(a, b)', true);
+assert(downLevel(`a**b`), '&power(a, b)', true);
+assert(downLevel(`a.c**b`), '&power(a.c, b)', true);
+assert(downLevel(`a??=b`), 'a = &nullish(a, b)', true);
+assert(downLevel(`a**=b`), 'a = &power(a, b)', true);
+assert(downLevel(`a+=b+c**d`), 'a += b + &power(c, d)', true);
+assert(downLevel(`a(c**=d)`), 'a(c = &power(c, d))', true);
+assert(downLevel(`a(c.b.d**=d)`), 'a((_ = c.b, _.d = &power(_.d, d)))\r\nvar _', true);
+assert(downLevel(`a(c.b[a.b]**=d)`), 'a((_ = c.b, _[_0 = a.b] = &power(_[_0], d)))\r\nvar _, _0', true);
+assert(downLevel(`c.b[a.b]**=d`), '_ = c.b, _[_0 = a.b] = &power(_[_0], d)\r\nvar _, _0', true);
 i++// 声明及解构
 assert(downLevel(`var [data, args, strs] = breakcode(data, occurs), strs = []`), 'var _ = breakcode(data, occurs), data = _[0], args = _[1], strs = _[2], strs = []\r\nvar _');
 assert(downLevel(`var [name, type, options] = piece, key, repeat;`), 'var name = piece[0], type = piece[1], options = piece[2], key, repeat;');
@@ -83,7 +83,7 @@ assert(downLevel(`class a {}`), "function a() {}")
 var tmp = scanner2('export class a{a(){}}'); tmp.fix(); assert(downLevel.code(tmp).toString(), `exports.a = function (a) { a["prototype"].a = function () {}\r\nreturn a }(function a() {})`);
 assert(downLevel(`class a { static{ a.a=1}}`), "function a() {}; (function () { a.a = 1 }())")
 assert(downLevel(`if(a) a = 1; class a {}`), "if (a) a = 1; function a() {}")
-assert(downLevel(`async function(){if(a) a = 1; class a {}}`), `function () { return async_(
+assert(downLevel(`async function(){if(a) a = 1; class a {}}`), `function () { return &async(
 function () {
 a = function () {}; if (!a) return [1, 0]; a = 1; return [1, 0]
 })
@@ -97,8 +97,8 @@ assert(downLevel(`var a=class { constructor(){this.a=1}; static b=2 b(){}};`), `
 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;
-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() {
+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;
 return this_ })`);
 assert(downLevel(`class a {get a(){}}`), `function a() {};
@@ -118,18 +118,18 @@ var tmp`);
 i++// 属性降级
 assert(downLevel(`return ({b,async a(){}})`), `return ((_ = {},
 _.b = b,
-_.a = function () { return async_() }, _))\r\nvar _`);
+_.a = function () { return &async() }, _))\r\nvar _`);
 assert(downLevel(`var a={b,async a(){}}`), `var a = (_ = {},
 _.b = b,
-_.a = function () { return async_() }, _)\r\nvar _`);
+_.a = function () { return &async() }, _)\r\nvar _`);
 assert(downLevel(`var a={b:a=>b,c}`), `var a = (_ = {},
 _.b = function (a) { return b },
 _.c = c, _)\r\nvar _`);
 assert(downLevel(`={b,async a(){}}`), `= (_ = {},
 _.b = b,
-_.a = function () { return async_() }, _)\r\nvar _`);
+_.a = function () { return &async() }, _)\r\nvar _`);
 assert(downLevel(`={async [a](){}}`), `= (_ = {},
-_[a] = function () { return async_() }, _)\r\nvar _`);
+_[a] = function () { return &async() }, _)\r\nvar _`);
 assert(downLevel(`={[a]:b}`), `= (_ = {},
 _[a] = b, _)\r\nvar _`);
 assert(downLevel(`={a:1,[a]:1}`), `= (_ = { a: 1 },
@@ -152,13 +152,13 @@ _[b] = (_0 = {},
 _0[a] = 1, _0), _)\r\nvar _, _0, _1`);
 i++// 对象展开
 assert(downLevel(`={ok:ok}`), `= { ok: ok }`);
-assert(downLevel(`={...a}`), `= extend({}, a)`);
-assert(downLevel(`={...a&&b}`), `= extend({}, a && b)`);
-assert(downLevel(`()=>({\r\nfileName: entry.fileName,\r\ntextSpan: highlightSpan.textSpan,\r\nisWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */,\r\n...highlightSpan.isInString && { isInString: true },\r\n...highlightSpan.contextSpan && { contextSpan: highlightSpan.contextSpan }})`), `function () { return (extend({
+assert(downLevel(`={...a}`), `= &extend({}, a)`);
+assert(downLevel(`={...a&&b}`), `= &extend({}, a && b)`);
+assert(downLevel(`()=>({\r\nfileName: entry.fileName,\r\ntextSpan: highlightSpan.textSpan,\r\nisWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */,\r\n...highlightSpan.isInString && { isInString: true },\r\n...highlightSpan.contextSpan && { contextSpan: highlightSpan.contextSpan }})`), `function () { return (&extend({
 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_(
+assert(downLevel(`async()=>({ [argitem.sort ? argitem.sort : 'date']: "desc" })`), `function () { return &async(
 function () {
 _ = {}; if (!argitem.sort) return [1, 0]; _1 = argitem.sort; return [2, 0]
 },
@@ -170,51 +170,51 @@ _[_1] = "desc"; _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 _`);
-assert(downLevel(`={...b,c,...d,e}`), `= (_ = extend({}, b),\r\n_.c = c, extend(_, d),\r\n_.e = e, _)\r\nvar _`);
-assert(downLevel(`={...a,b}`), `= (_ = extend({}, a),
+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 _`);
+assert(downLevel(`={...b,c,...d,e}`), `= (_ = &extend({}, b),\r\n_.c = c, &extend(_, d),\r\n_.e = e, _)\r\nvar _`);
+assert(downLevel(`={...a,b}`), `= (_ = &extend({}, a),
 _.b = b, _)\r\nvar _`);
-assert(downLevel(`={...a,b,...c}`), `= (_ = extend({}, a),
-_.b = b, extend(_, c), _)\r\nvar _`);
-assert(downLevel(`={...a,...c,b}`), `= (_ = extend({}, a, c),
+assert(downLevel(`={...a,b,...c}`), `= (_ = &extend({}, a),
+_.b = b, &extend(_, c), _)\r\nvar _`);
+assert(downLevel(`={...a,...c,b}`), `= (_ = &extend({}, a, c),
 _.b = b, _)\r\nvar _`);
-assert(downLevel(`={...{},...c,b}`), `= (_ = extend({}, {}, c),
+assert(downLevel(`={...{},...c,b}`), `= (_ = &extend({}, {}, c),
 _.b = b, _)\r\nvar _`);
 assert(downLevel(`={a(){},get c(){},b}`), `= (_ = {},
 _.a = function () {},
 Object["defineProperty"](_, "c", (_0 = {}, _0["get"] = function () {}, _0)),
 _.b = b, _)\r\nvar _, _0`);
 assert(downLevel(`if(){Promise.reslove({get then() {}})}`), `if () { Promise.reslove((_ = {},\r\nObject["defineProperty"](_, "then", (_0 = {}, _0["get"] = function () {}, _0)), _)) }\r\nvar _, _0`)
-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]`), `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(..."b,c".split(","))`), `a["apply"](null, "b,c".split(","))`)
-assert(downLevel(`new a(...args)`), `var slice_ = Array["prototype"]["slice"];\r\nnew (a['bind']['apply'](a, [null]["concat"](slice_["call"](args))))`)
-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(`new a(...args)`), `var &slice = Array["prototype"]["slice"];\r\nnew (a['bind']['apply'](a, [null]["concat"](&slice["call"](args))))`)
+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)`), `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));`);
+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; }`)
@@ -225,11 +225,11 @@ 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];\r\nvar _0")
 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){}`), `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,...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_(
+assert(downLevel(`(...a) => k`), `var &slice = Array["prototype"]["slice"];\r\nfunction () { var a = &slice["call"](arguments, 0); return k }`)
+assert(downLevel(`for await(o of os) noSymbol`), `return &async(
 function () {
 return [8, 8]
 },
@@ -267,7 +267,7 @@ function () {
 return [1, 9]
 })
 var _, _0, _2, _3`)
-assert(downLevel(`for await(var [o,s] of os) noSymbol`), `return async_(
+assert(downLevel(`for await(var [o,s] of os) noSymbol`), `return &async(
 function () {
 return [11, 8]
 },
@@ -322,21 +322,21 @@ assert(downLevel(`for(var [a] of os)Symbol`), `try { for (var a, _0 = os[Symbol[
 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"]() }
 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)`)
-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(`[...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_(
+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"); _0 = _0(name); name = _0["join"]("/"); return [name, 2]
 })
 var _0 };`);
 i++//异步或步进函数
-assert(downLevel(`function *(){yield *a}`), `function () { return aster_(
+assert(downLevel(`function *(){yield *a}`), `function () { return &aster(
 function () {
 return [9, 8]
 },
@@ -377,8 +377,8 @@ function () {
 return [1, 9]
 })
 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_(
+assert(downLevel(`async function(){}`), `function () { return &async() }`)
+assert(downLevel(`async function(){for(var a of b){Symbol}}`), `function () { return &async(
 function () {
 return [5, 8]
 },
@@ -408,13 +408,13 @@ return [1, 9]
 })
 var a, _, _0, _2, _3 }`)
 assert(downLevel(`a={async a(){var b =c;return 1}}`), `a = (_ = {},
-_.a = function () { return async_(\r\nfunction () {\r\nb = c; return [1, 2]\r\n})\r\nvar b }, _)\r\nvar _`)
-assert(downLevel(`async function(){return 1}`), `function () { return async_(\r\nfunction () {\r\nreturn [1, 2]\r\n}) }`)
-assert(downLevel(`async function(a){await a}`), `function (a) { return async_(\r\nfunction () {\r\n_0 = a; return [_0, 1]\r\n})\r\nvar _0 }`)
-assert(downLevel(`async function(a){return await a}`), `function (a) { return async_(\r\nfunction () {\r\n_0 = a; return [_0, 1]\r\n},\r\nfunction (_) {\r\n_0 = _; return [_0, 2]\r\n})\r\nvar _0 }`)
-assert(downLevel(`async function(a){await a,await b}`), `function (a) { return async_(\r\nfunction () {\r\n_0 = a; return [_0, 1]\r\n},\r\nfunction (_) {\r\n_0 = _; _0 = b; return [_0, 1]\r\n})\r\nvar _0 }`)
-assert(downLevel(`async function(){await a,await b}`), `function () { return async_(\r\nfunction () {\r\n_0 = a; return [_0, 1]\r\n},\r\nfunction (_) {\r\n_0 = _; _0 = b; return [_0, 1]\r\n})\r\nvar _0 }`)
-assert(downLevel(`async function(a){ if(c)await a,await b;else if(s) await c;}`), `function (a) { return async_(
+_.a = function () { return &async(\r\nfunction () {\r\nb = c; return [1, 2]\r\n})\r\nvar b }, _)\r\nvar _`)
+assert(downLevel(`async function(){return 1}`), `function () { return &async(\r\nfunction () {\r\nreturn [1, 2]\r\n}) }`)
+assert(downLevel(`async function(a){await a}`), `function (a) { return &async(\r\nfunction () {\r\n_0 = a; return [_0, 1]\r\n})\r\nvar _0 }`)
+assert(downLevel(`async function(a){return await a}`), `function (a) { return &async(\r\nfunction () {\r\n_0 = a; return [_0, 1]\r\n},\r\nfunction (_) {\r\n_0 = _; return [_0, 2]\r\n})\r\nvar _0 }`)
+assert(downLevel(`async function(a){await a,await b}`), `function (a) { return &async(\r\nfunction () {\r\n_0 = a; return [_0, 1]\r\n},\r\nfunction (_) {\r\n_0 = _; _0 = b; return [_0, 1]\r\n})\r\nvar _0 }`)
+assert(downLevel(`async function(){await a,await b}`), `function () { return &async(\r\nfunction () {\r\n_0 = a; return [_0, 1]\r\n},\r\nfunction (_) {\r\n_0 = _; _0 = b; return [_0, 1]\r\n})\r\nvar _0 }`)
+assert(downLevel(`async function(a){ if(c)await a,await b;else if(s) await c;}`), `function (a) { return &async(
 function () {
 if (!c) return [3, 0]; _0 = a; return [_0, 1]
 },
@@ -431,8 +431,8 @@ function (_) {
 _0 = _; return [1, 0]
 })
 var _0 }`)
-assert(downLevel(`async function(a){ for(var i=1;i<2;i++) await 1 }`), `function (a) { return async_(\r\nfunction () {\r\ni = 1; return [1, 0]\r\n},\r\nfunction () {\r\n_0 = i < 2; if (!_0) return [2, 0]; _0 = 1; return [_0, 1]\r\n},\r\nfunction (_) {\r\n_0 = _; _0 = i++; return [-1, 0]\r\n})\r\nvar i, _0 }`)
-assert(downLevel('async function(){ if(b); else {if (a){}else{location = getRequestProtocol(url) + "//" + location;}}}'), `function () { return async_(
+assert(downLevel(`async function(a){ for(var i=1;i<2;i++) await 1 }`), `function (a) { return &async(\r\nfunction () {\r\ni = 1; return [1, 0]\r\n},\r\nfunction () {\r\n_0 = i < 2; if (!_0) return [2, 0]; _0 = 1; return [_0, 1]\r\n},\r\nfunction (_) {\r\n_0 = _; _0 = i++; return [-1, 0]\r\n})\r\nvar i, _0 }`)
+assert(downLevel('async function(){ if(b); else {if (a){}else{location = getRequestProtocol(url) + "//" + location;}}}'), `function () { return &async(
 function () {
 if (!b) return [1, 0]; return [3, 0]
 },
@@ -443,7 +443,7 @@ function () {
 _0 = getRequestProtocol(url), _0 = _0 + "//", location = _0 + location; return [1, 0]
 })
 var _0 }`);
-assert(downLevel("var{a}=await b"), `return async_(
+assert(downLevel("var{a}=await b"), `return &async(
 function () {
 _0 = b; return [_0, 1]
 },
@@ -451,7 +451,7 @@ function (_) {
 _0 = _; _0 = _0.a; a = _0
 })
 var a, _0`)
-assert(downLevel(`async a=>await a`), `function (a) { return return async_(
+assert(downLevel(`async a=>await a`), `function (a) { return return &async(
 function () {
 _0 = a; return [_0, 1]
 })
@@ -461,8 +461,8 @@ assert(downLevel(`Object.defineProperty(dis, f.key, {get() {}, set(v) {}})`), `O
 _.get = function () {},
 _.set = function (v) {}, _))
 var _`);
-assert(downLevel(`var restq = splice(queue, i, i2 - i, ...a[1], { type: STAMP, text: "=" });`), `var slice_ = Array["prototype"]["slice"];
-var restq = splice["apply"](null, [queue, i, i2 - i]["concat"](slice_["call"](a[1]), [{ type: STAMP, text: "=" }]));`)
+assert(downLevel(`var restq = splice(queue, i, i2 - i, ...a[1], { type: STAMP, text: "=" });`), `var &slice = Array["prototype"]["slice"];
+var restq = splice["apply"](null, [queue, i, i2 - i]["concat"](&slice["call"](a[1]), [{ type: STAMP, text: "=" }]));`)
 var c = scanner2(`\r\n    if (search.length) return null;\r\n    return path.join(...pathlist);\r\n`); i++
 c.fix(); i++
 c.break(); i++
@@ -479,20 +479,20 @@ assert(downLevel(`[{}.b,c]=[1]`), '_ = [1], {}.b = _[0], c = _[1]\r\nvar _')
 assert(downLevel(`[{}.b]=[1]`), '({}).b = [1][0]')
 assert(downLevel(`[[[a[b]]]]=[1]`), 'a[b] = [1][0][0][0]')
 assert(downLevel(`[[[{}[b]]]]=[1]`), '({})[b] = [1][0][0][0]')
-assert(downLevel(`[...a[b]]=[1]`), 'var slice_ = Array["prototype"]["slice"];\r\n_ = [1], a[b] = slice_["call"](_, 0)\r\nvar _')
-assert(downLevel(`[a,...{length}]=[1]`), 'var slice_ = Array["prototype"]["slice"];\r\n_ = [1], a = _[0], _0 = slice_["call"](_, 1), length = _0.length\r\nvar _, _0')
-assert(downLevel(`[...{length}]=[1]`), `var slice_ = Array["prototype"]["slice"];
-_ = [1], _0 = slice_["call"](_, 0), length = _0.length
+assert(downLevel(`[...a[b]]=[1]`), 'var &slice = Array["prototype"]["slice"];\r\n_ = [1], a[b] = &slice["call"](_, 0)\r\nvar _')
+assert(downLevel(`[a,...{length}]=[1]`), 'var &slice = Array["prototype"]["slice"];\r\n_ = [1], a = _[0], _0 = &slice["call"](_, 1), length = _0.length\r\nvar _, _0')
+assert(downLevel(`[...{length}]=[1]`), `var &slice = Array["prototype"]["slice"];
+_ = [1], _0 = &slice["call"](_, 0), length = _0.length
 var _, _0`)
-assert(downLevel(`[...{}[a]]=[1]`), `var slice_ = Array["prototype"]["slice"];
-_ = [1], {}[a] = slice_["call"](_, 0)
+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_(_, [])
+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_(_, [])
+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 = [];`)

package/coms/compile/nametill.js

@@ -0,0 +1,13 @@
+function till(n) {
+    if (/^[&\^%\?@#]/.test(n)) {
+        var s = n = n.replace(/[&\^%\?@#]/g, '_');
+        var i = 0;
+        while (n in this) {
+            n = s + i++;
+        }
+    }
+    return n;
+}
+module.exports = function nametill(names, prevent) {
+    return names.map(till, prevent);
+}

package/coms/compile/polyfill.js

@@ -2,7 +2,7 @@ var { SCOPED } = require("./common");
 var backEach = require("../basic/backEach");
 
 var polyfills = Object.assign(Object.create(null), {
-    "Object.assign": 'extend'
+    "Object.assign": '&extend'
 });
 var polyfill = function (o, i, used) {
     var v = o.text;

package/coms/compile/run-test262.js

@@ -46,14 +46,14 @@ var harness = await async function () {
 }();
 await async function () {
     extend(harness, {
-        aster_,
-        async_,
-        asyncAster_,
-        extends_,
+        &aster,
+        &async,
+        &asyncAster,
+        &extends,
         isFunction,
-        restIter_,
-        rest_,
-        exec_,
+        &restIter,
+        &rest,
+        &exec,
     })
     extend(global, harness);
     var rest = [path.join(testpath, 'test')];
@@ -93,7 +93,7 @@ await async function () {
     await queue.call(testFiles, async function (f, i) {
         var runText = async function (text) {
             /**
-             * @type {vm.RunningCodeInNewContextOptions}
+             * &type {vm.RunningCodeInNewContextOptions}
              */
             var ctxOptions = {
                 timeout: 1000,

package/coms/compile/scanner2.js

@@ -1,5 +1,10 @@
 "use strict";
-var createNamelist = require("./namelist");
+var createShortName = require("./namelist");
+var createShortList = function (keys, prevent) {
+    return createShortName(keys.length, prevent);
+};
+var renameHashName = require("./nametill");
+var createNameList = createShortList;
 var Html = require("./Html");
 var Javascript = require("./Javascript");
 const {
@@ -37,11 +42,20 @@ var compress = function (scoped, maped = Object.create(null)) {
     var keys = Object.keys(map);
     keys.sort((a, b) => used[b].length - used[a].length);
     if (keys.length) {
-        var names = createNamelist(keys.length, __prevent);
+        var names = createNameList(keys, __prevent);
+        var umap = Array(keys.length);
         for (var cx = 0, dx = keys.length; cx < dx; cx++) {
             var k = keys[cx];
             var name = names[cx];
+            umap[cx] = used[k];
             rename(used, k, name);
+            delete used[k];
+            delete map[k];
+        }
+        for (var cx = 0, dx = names.length; cx < dx; cx++) {
+            var n = names[cx];
+            map[n] = true;
+            used[n] = umap[cx];
         }
     }
     if (scoped.length) {
@@ -138,7 +152,7 @@ class Code extends Array {
                 if (k in occurs) continue;
                 occurs[k] = true;
             }
-            for (var k in scoped.lets) {
+            if (scoped.lets !== scoped.vars) for (var k in scoped.lets) {
                 if (k in occurs) continue;
                 occurs[k] = true;
             }
@@ -167,6 +181,11 @@ class Code extends Array {
         if (this._scoped) extend(this.envs, envs);
         return this;
     }
+    revar() {
+        createNameList = renameHashName;
+        compress(this.scoped);
+        createNameList = createShortList;
+    }
     // 压缩
     press(keepspace) {
         this.keepspace = keepspace;

package/coms/compile/unstruct.js

@@ -134,13 +134,13 @@ var _withget = function (text) {
     if (index < 0) index = text.length;
     var name = text.slice(0, index);
     var prop = text.slice(index);
-    return rescan`${patchMark}withget_(${`"${name}"`},[${_evals()}],${name})${prop}`;
+    return rescan`${patchMark + "wget"}(${`"${name}"`},[${_evals()}],${name})${prop}`;
 };
 var _withset = function (text, tmpname, valname) {
     var index = text.indexOf(".");
     if (index < 0) index = text.length;
     var name = text.slice(0, index);
-    return rescan`if(${tmpname}=${patchMark}with_(${`"${name}"`},[${_evals()}]))${tmpname}.${text}=${valname};else ${text}=${valname};`;
+    return rescan`if(${tmpname}=${patchMark + "with"}(${`"${name}"`},[${_evals()}]))${tmpname}.${text}=${valname};else ${text}=${valname};`;
 };
 var _switch = function (body, cx, unblock, result, getname) {
     var o = body[cx];
@@ -1404,7 +1404,7 @@ var strip = false;
 var canbeTemp = function (body) {
     return _canbeTemp(body, strip);
 };
-var patchMark = '';
+var patchMark = '&';
 module.exports = function (body, newname, ret) {
     strip = body.strip;
     var patchMark_ = patchMark;

package/coms/compile/unstruct_test.js

@@ -85,7 +85,7 @@ test("switch(a){case 1:break;case 2:break;}", "if (a === 1) return [1, 0]; if (a
 test("switch(a){case 1:case 2:break;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]", true);
 test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
 test("switch(a){case 1:case 2:x=1;}", "if (a === 1) return [1, 0]; if (a === 2) return [1, 0]; return [2, 0];\r\n x = 1; return [1, 0]", true);
-test("with(a){ a = 1}", `if (_ = with_("a", [a])) _.a = 1; else a = 1;`, true);
+test("with(a){ a = 1}", `if (_ = &with("a", [a])) _.a = 1; else a = 1;`, true);
 test("try{a=2+1}catch(e){return;}", 'return [65537, 7];\r\n a = 2 + 1; return [0, 9];\r\n e = @; return [undefined, 2];\r\n return [1, 9]', true);
 test("try{a=2+1}catch(e){}", 'return [1, 7];\r\n a = 2 + 1; return [0, 9];\r\n return [1, 9]', true);
 test("try{a=2+1}catch(e){a=3}", 'return [65537, 7];\r\n a = 2 + 1; return [0, 9];\r\n e = @; a = 3; return [0, 9];\r\n return [1, 9]', true);

package/coms/compile//347/264/240/351/246/250.js

@@ -463,8 +463,15 @@ var Method = function () {
     if (!this.base) this.base = base;
     vlist.push(valueMap);
     var argDefaults = this.args.defaults;
+    var ipd = 0;
     this.args.forEach((k, i) => {
-        var a = arguments[i];
+        var p = i + ipd;
+        if (/^\.\.\.@/i.test(k)) {
+            var a = Array.prototype.slice.call(arguments, p, i + arguments.length - this.args.length + 1);
+            ipd += a.length - 1;
+            k = k.slice(3);
+        }
+        else var a = arguments[p];
         if (a === undefined || a === null) a = seprateFunc(calcvars(argDefaults[k])).map(evalproc).join('');
         valueMap[k] = a;
     });
@@ -497,17 +504,18 @@ var killneg = function (v, n) {
             v = n + v;
         }
     }
+    else if (n === '...');
     else if (n) v = n + v;
     return v;
 };
 var calcvars = function (v) {
     var decode = /^['"`]/.test(v) ? strings.decode : a => a;
-    return v.replace(/(^\-)?(@[^\s\{\}\(\)\[\]\:\+\*\/,;\!\>\$\=\&\%\#\@'"`\?\.\/\|~#]+|@\{[^\}@]*\})/g, function (_, n, m) {
+    return v.replace(/(^\-|\.\.\.)?(@[^\s\{\}\(\)\[\]\:\+\*\/,;\!\>\$\=\&\%\#\@'"`\?\.\/\|~#]+|@\{[^\}@]*\})/g, function (_, n, m) {
         var value = getFromScopeList(m, vlist, m);
         value = decode(value);
         value = killneg(value, n);
         return value;
-    }).replace(/(^|\s|[\]\)\(\[\+\*\/,;]|^\-)(?:var\s*\(([\s\S]*?)\)|(--\S+))/g, function (m, q, a, b) {
+    }).replace(/(^|\s|[\]\)\(\[\+\*\/,;]|\-|\.\.\.)(?:var\s*\(([\s\S]*?)\)|(--\S+))/g, function (m, q, a, b) {
         var v = getFromScopeList(b || a.trim(), vlist, m.slice(q.length));
         v = killneg(v, q);
         return v;
@@ -564,7 +572,7 @@ var eval2 = function (props) {
             var [, name, args] = match;
             args = createArgMap(args);
             p.args = args;
-            p.reg = new RegExp(args.join("|") + /|@\{[^\}@]+\}/.source, 'g');
+            p.reg = new RegExp(args.map(a => /(?:\.\.\.)?/.source + a.replace(/^\.\.\./, '')).join("|") + /|@\{[^\}@]+\}/.source, 'g');
             if (!methods[name]) methods[name] = [];
             var argDefaults = args.defaults;
             Object.keys(argDefaults).forEach(k => {

package/coms/compile//347/264/240/351/246/250_test.js

@@ -87,7 +87,10 @@ assert(素馨(`a{a:extract(2 3,2)}`), `a{a:3;}`);
 assert(素馨(`value: range(10px, 30px, 10);`, '', true), `value:10px 20px 30px;`);
 assert(素馨(`value: range(4);`, '', true), `value:1 2 3 4;`);
 assert(素馨(`@a:-1;b{a:-@a}`, '', true), `b{a:1;}`);
+assert(素馨(`@b(@c,...@d,@e){each(@d,(@a){a:@a})};@b(1,2,3,4,5,3,4)`, '', true), `a:2;a:3;a:4;a:5;a:3;`);
 assert(素馨(`--mwidth:0px;--bwidth:2px;--qwidth: var(--mwidth)+var(--bwidth);width:--qwidth`, '', true), `width:2px;`);
+assert(素馨(`a{--a:1px;padding:var(--a) -var(--a);}`, '', true), `a{padding:1px -1px;}`);
+assert(素馨(`a{@a:1px;padding:@a -@a;}`, '', true), `a{padding:1px -1px;}`);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].text, '-0.2em');
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[0].isdigit, true);
 assert(scanner2(`-0.2em .3em -0.2em 0`, new 素馨.素心)[2].text, ".3em");

package/coms/explorer/fileitem.html

@@ -1,8 +1,9 @@
-<fileitem type_="d.type" @mouseenter="startMarquee(sp)" @mouseleave="stopMarquee(sp)" @touchstart="startMarquee(sp)"
-    @touchend="stopMarquee(sp)">
+<fileitem type_="d.type" ext+ @mouseenter="startMarquee(sp)" @mouseleave="stopMarquee(sp)"
+    @touchstart="startMarquee(sp)" @touchend="stopMarquee(sp)">
     <template -src="d.isfolder?icons.folder:icons.file"></template>
-    <span #sp ng-text=d.name></span>
-    <p -if="d.pending" keep >
+    <span #sp name ng-text=d.name></span>
+    <p -if="d.pending" keep>
         <r -style="{width:(d.percent*100).toFixed(4)+'%'}"></r>
     </p>
+    <span ext? -if="!d.isfolder"></span>
 </fileitem>

package/coms/explorer/fileitem.js

@@ -8,6 +8,7 @@ class Fileitem {
 var e = Fileitem.prototype;
 e.startMarquee = function (sp) {
     if (sp.scrollWidth <= sp.clientWidth) return;
+    clearInterval(sp.mq);
     sp.mq = setInterval(function () {
         clearInterval(sp.mq);
         sp.mq = setInterval(function () {
@@ -17,7 +18,7 @@ e.startMarquee = function (sp) {
         }, 16);
     }, 400);
     sp.setAttribute("marquee", '');
-    sp.scrollLeft = sp.clientWidth;
+    sp.scrollLeft = sp.clientWidth - parseFloat(getComputedStyle(sp).paddingLeft);
 };
 e.stopMarquee = function (sp) {
     clearInterval(sp.mq);
@@ -29,6 +30,9 @@ function fileitem(elem) {
     elem.innerHTML = template;
     var e = elem.children[0];
     e.$scope = new Fileitem;
+    var ext = /\.([^\.]+)$/.exec(elem.$scope.d.name);
+    if (ext) e.$scope.ext = ext[1];
+    else e.$scope.ext = '';
     extend(e.$scope, elem.$scope);
     return e;
 }