efront 4.21.4 → 4.22.0

package/coms/compile/downLevel.js

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

package/coms/compile/downLevel_test.js

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

package/coms/compile/rescan.js

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

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 + "wget"}(${`"${name}"`},[${_evals()}],${name})${prop}`;
+    return rescan.keep`${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.keep`if(${tmpname}=${patchMark + "with"}(${`"${name}"`},[${_evals()}]))${tmpname}.${text}=${valname};else ${text}=${valname};`;
 };
 var _switch = function (body, cx, unblock, result, getname) {
     var o = body[cx];
@@ -324,7 +324,7 @@ var _while = function (body, cx, unblock, result) {
     o = o.next;
     while (cx < body.length && body[cx] !== o) cx++;
     var i = result.length;
-    var b = rescan`if (${getCondition(o, unblock, true)}) return []`;
+    var b = rescan.keep`if (${getCondition(o, unblock, true)}) return []`;
     var be = b[b.length - 1];
     pushstep(result, b);
     var i2 = result.length - 1;
@@ -351,7 +351,7 @@ var pushstep = function (result, step) {
     }
     else if (q.await_) {
         if (!step.awaited) {
-            step.unshift(...rescan`${q.name}=${ret_};`), relink(step);
+            step.unshift(...rescan.keep`${q.name}=${ret_};`), relink(step);
             step.awaited = true;
         }
         result.push(step);
@@ -435,7 +435,7 @@ var _do = function (body, cx, unblock, result) {
     o = o.next.next;
 
     if (label.continue) ifpatch(result), label.contat = result.length;
-    var b = rescan`if (${getCondition(o, unblock)}) return [${i - result.length}, 0]`;
+    var b = rescan.keep`if (${getCondition(o, unblock)}) return [${i - result.length}, 0]`;
     pushstep(result, b);
     b[b.length - 1][0].text = String(i - result.length + 1);
     while (cx < body.length && body[cx] !== o) cx++;
@@ -464,7 +464,7 @@ var _return = function (r) {
         x = stepReturn(name, 2);
     }
     else if (e === THROW) {
-        x = rescan`throw ${name}`;
+        x = rescan.keep`throw ${name}`;
     }
     else if (e === YIELD) {
         x = stepReturn(name, 3);
@@ -781,7 +781,7 @@ var ternary = function (body, getname, ret) {
                 }
                 pushstep(d, stepReturn(1, 0, d));
                 pushstep(c, stepReturn(d.length + 1, 0, c));
-                pushstep(explist, rescan`if (${getCondition(b, function (b) {
+                pushstep(explist, rescan.keep`if (${getCondition(b, function (b) {
                     b = ternary(b, getnextname, true);
                     for (var b of b) pushstep(explist, b);
                     return b;
@@ -1323,10 +1323,10 @@ function toqueue(body, getname, ret = false, result = []) {
                 var n = getCondition(o, unblock, !isbr);
                 o = o.next;
                 if (isbr) {
-                    var c = rescan`if (${n})`;
+                    var c = rescan.keep`if (${n})`;
                 }
                 else {
-                    var c = rescan`if (${n}) return [0, 0]`;
+                    var c = rescan.keep`if (${n}) return [0, 0]`;
                 }
                 var ce = c[3];
                 pushstep(result, c);

package/coms/crypt/encode62.js

@@ -28,6 +28,16 @@ Object.assign(encode62, {
     src,
     map,
     time_delta: parseInt("zzzzz", 36),
+    pack: 'efront-encode62s',
+    packdecode(string) {
+        return this.timedecode(string, this.pack);
+    },
+    packencode(string) {
+        return this.timeencode(string, this.pack);
+    },
+    packupdate(string) {
+        return this.timeupdate(string, this.pack);
+    },
     safeencode(string, sign, offset) {
         string = encodeURIComponent(string).replace(/\./g, '..').replace(/[\!'\(\)~]/g, a => escape(a)).replace(/%/g, '.');
         return this.encode62(string, sign, offset);
@@ -36,23 +46,43 @@ Object.assign(encode62, {
         string = this.decode62(string, sign, offset).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
         return decodeURIComponent(string);
     },
-    timedecode(string) {
+    timedecode(string, pack) {
         var { time_delta } = this;
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
         var time_stamp = time_start + parseInt(time_rest, 36);
-        return this.safedecode(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36));
+        string = string.slice(0, string.length - time_delta.toString(36).length);
+        if (pack) {
+            string = this.decode62(string, time_stamp.toString(36) + pack);
+            var sign = string.slice(string.length - 7, string.length);
+            sign = parseInt(sign, 36);
+            sign -= 0x600000000 + (time_stamp & 0xffffffff);
+            string = string.slice(0, string.length - 7);
+            string = decode62S(string);
+            if (crc.string(time_stamp.toString(36) + pack + string) !== sign) throw new Error('数据校验不通过！');
+            return string;
+        }
+        return this.safedecode(string, time_stamp.toString(36));
     },
-    timeencode(string) {
+    timeencode(string, pack) {
         var { time_delta } = this;
         var time_free = time_delta / 6 | 0;
         var time_stamp = +new Date() - time_free;
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
-        return this.safeencode(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
+        if (pack) {
+            var sign = crc.string(time_stamp.toString(36) + pack + string);
+            sign += 0x600000000 + (time_stamp & 0xffffffff);
+            string = encode62S(string) + sign.toString(36);
+            string = this.encode62(string, time_stamp.toString(36) + pack);
+        }
+        else {
+            string = this.safeencode(string, time_stamp.toString(36));
+        }
+        return string + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
     },
-    timeupdate(string) {
+    timeupdate(string, pack) {
         var { time_delta } = this;
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
@@ -60,7 +90,7 @@ Object.assign(encode62, {
         if (time_stamp + (time_delta >> 1) > +new Date()) {
             return string;
         } else {
-            return this.timeencode(this.timedecode(string));
+            return this.timeencode(this.timedecode(string, pack), pack);
         }
     },
     encode62(data, sign, offset = 0) {

package/coms/crypt/encode62_test.js

@@ -1,51 +1,11 @@
 "use strict";
 // 中文编码 utf-8
-describe("encode62_test", function () {
-    var encode62, a, b, c, d;
-    var expect = require("chai").expect;
-    var timeencoded;
-    before(function () {
-        encode62 = require("./encode62");
-    });
-    it("encode62", function () {
-        console.log(encode62("你好啊"));
-    });
-    it("encode62.timeencode", function () {
-        console.log(timeencoded = encode62.timeencode("xiao"));
-    });
-    it("encode62.timedecode", function () {
-        console.log(encode62.timedecode(timeencoded));
-    });
-    it("encode62.encode", function () {
-        console.log(timeencoded = encode62.encode("adfasd", 'abcd'));
-    });
-    it("encode62.decode", function () {
-        console.log(encode62.decode(timeencoded, 'abcd').toString());
-    });
-    it("geta", function () {
-        a = encode62.geta("efront");
-    });
-    it("genb", function () {
-        b = encode62.genb();
-    });
-    it("ab2c", function () {
-        c = encode62.ab2c(a, b);
-    });
-    it("ba2d", function () {
-        // 注意，参数顺序已变更
-        d = encode62.ba2d(b, a);
-    });
-    it("ca2b", function () {
-        expect(encode62.ca2b(c, a)).to.be.eq(b);
-    });
-    it("cb2a", function () {
-        expect(encode62.cb2a(c, b)).to.be.eq(a);
-    });
-    it("da2b", function () {
-        expect(encode62.da2b(d, a)).to.be.eq(b);
-    });
-    it("db2a", function () {
-        expect(encode62.db2a(d, b)).to.be.eq(a);
-    })
+var test = function (string) {
+    var packed = encode62.packencode(string);
+    var unpacked = encode62.packdecode(packed);
+    assert(string, unpacked);
+}
 
-});
+test('adsfa');
+test('a');
+test('');

package/coms/explorer/main.less

@@ -59,11 +59,7 @@ fileitem {
         outline: 1.2px solid #28c;
     }
 
-    &:active {
-        color: #28c;
-        outline: 2px solid;
-    }
-
+    
     &.focused {
         background: #28c2;
         outline: 1.2px solid #28c;

package/coms/frame/chat.js

@@ -136,7 +136,7 @@ function chat(title = '会话窗口') {
                     break;
             }
             return false;
-        }).map(m => JSAM.parse(encode62.timedecode(m))).filter(m => {
+        }).map(m => JSAM.parse(encode62.packdecode(m))).filter(m => {
             if (m.type === 'accept') {
                 page.$scope.pushFile(m.content);
                 return false;
@@ -266,7 +266,7 @@ function chat(title = '会话窗口') {
             if (this.user && this.user.id !== this.localid && type !== "accept") {
                 addToMsgList(this.msglist, [msg]);
             }
-            data = encode62.timeencode(data);
+            data = encode62.packencode(data);
             cast(page, "send", data);
             this.body.lastElementChild.focus();
             this.text = '';

package/coms/frame/left.html

@@ -1,13 +1,14 @@
-<header ng-if="!user.isLogin" class="navbar-header">
+<header head ng-if="!user.isLogin" class="navbar-header">
     <!-- <avatar></avatar> -->
     <a @click="popup('#/user/login')" class="dashboard_text">请登录</a>
 </header>
-<header -else class="navbar-header">
+<header head -else class="navbar-header">
     <span class="dashboard_text" @click="go('/user/profile')">
         <avatar ng-src="user.avatar" size=30></avatar>
         <span ng-bind="user.name"></span>
         <span ng-bind="user.roles"></span>
     </span>
 </header>
-<ylist mode=inline ng-src="menu in menus" class="sidebar-menu" ng-active="menus.open(menu)">
-</ylist>
+<ylist body mode=inline ng-src="menu in menus" class="sidebar-menu" ng-active="menus.open(menu)">
+</ylist>
+<footer foot></footer>

package/coms/frame/left.js

@@ -17,5 +17,6 @@ function main() {
     on('append')(page, function () {
         frame$route.open();
     });
+    view(page)
     return page;
 }

package/coms/frame/left.less

@@ -1,16 +1,18 @@
 & {
-    padding: 50px 0 0 0;
+    padding: 0 0 0 0;
     position: relative;
 }
 
 .navbar-header {
+    &:before{
+        display: none;
+    }
     min-height: 50px;
     padding: 10px 15px 10px 25px;
     font-size: 25px;
     line-height: 25px;
     text-transform: uppercase;
     color: #b8c7ce;
-    margin-top: -50px;
     display: block;
 }
 
@@ -32,7 +34,7 @@ ylist {
     box-shadow: none;
 }
 
-.label {
+>.header .label {
     border-radius: 4px;
     height: 18px;
     line-height: 18px;

package/coms/frame/payment.js

@@ -22,7 +22,7 @@ function main(paytypes, price, subject = '网站扫码支付') {
             if (!pay) return 'about:blank';
             var url = pay.url;
             if (isFunction(url)) url = url.call(pay, this.finalpay, subject);
-            else if (url) url += encode62.timeencode(this.finalpay + "," + subject);
+            else if (url) url += encode62.packencode(this.finalpay + "," + subject);
             return url;
         },
         get finalpay() {
@@ -50,7 +50,7 @@ function main(paytypes, price, subject = '网站扫码支付') {
     var query = lazy(async function () {
         if (!tradeid || queryres) return;
         if (isFunction(queryurl)) var res = await queryurl(tradeid);
-        else if (isString(queryurl)) var res = await cross('get', queryurl + encode62.timeencode(tradeid)), res = JSAM.parse(res.response || res.responseText);
+        else if (isString(queryurl)) var res = await cross('get', queryurl + encode62.packencode(tradeid)), res = JSAM.parse(res.response || res.responseText);
         if (queryres) return;
         if (res) queryres = res, cast(page, 'payment', res._id);
     }, -200);

package/coms/pivot/acme2.js

@@ -253,12 +253,15 @@ var acme2 = new class {
         var termsOfService = data?.meta?.termsOfService;
         return termsOfService;
     }
-    async newAccount(params) {
+    getAccount(params) {
+        return this.newAccount(params, true);
+    }
+    async newAccount(params, onlyReturnExisting) {
         var account = await request("new-account", {
             "contact": [
                 "mailto:" + params.email
             ],
-            // onlyReturnExisting: false,// 可选
+            onlyReturnExisting: onlyReturnExisting,// 可选
             // externalAccountBinding: {},// 可选
             "termsOfServiceAgreed": params.termsOfServiceAgreed
         });
@@ -267,7 +270,7 @@ var acme2 = new class {
         this.kid = account;
         var a = data.getUrlParamsForApi(accountApi, account);
         this.aid = a.aid;
-        alert('创建成功！', 'success');
+        alert(onlyReturnExisting ? "账号存在" : '创建成功！', 'success');
         return account;
     }
     async newOrder(params) {
@@ -366,7 +369,7 @@ var acme2 = new class {
             o = await acme2.auditOrder(o, setauth);
         }
         if (o.status === 'ready') {
-            await this.finalizeOrder(o, upload);
+            o = await this.finalizeOrder(o, upload);
             o = await this.waitStatus(o);
         }
         if (o.status === 'valid') {

package/coms/pivot/left-footer.xht

@@ -0,0 +1,25 @@
+<style>
+    & {
+        position: absolute;
+        width: 100%;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        z-index: 1;
+        display: block;
+        text-align: center;
+    }
+</style>
+<div>
+    <a @click="logout">${i18n`退出登录`}</a>
+</div>
+
+<script>
+    var a = button;
+    async function logout() {
+        data.setSource({});
+        await user.Logout();
+        zimoli.switch();
+        zimoli();
+    }
+</script>