efront 4.0.51 → 4.0.53

package/coms/basic/decodeUTF16.js

@@ -5,7 +5,7 @@ function decodeUTF16(buff, be) {
     if (buff[0] === 0xfe && buff[1] === 0xff) {
         be = true;
     }
-    else if (buff[0] === 0xff && buff[1] === 0xfe) be = true;
+    else if (buff[0] === 0xff && buff[1] === 0xfe) be = false;
     else if (isEmpty(be)) be = false;
     var dec = be ? BE : LE;
     for (var cx = 0, dx = buff.length; cx < dx; cx += 2) {

package/coms/basic_/Promise.js

@@ -35,7 +35,9 @@ if (!Promise) {
                         // <!--
                         console.warn("在异步过程中发现未处理的异常：", t.ohed[0], t.ohed[1], t.ohed[2]);
                         // -->
-                        throw t.ohed[0];
+                        requestAnimationFrame(function () {
+                            throw t.ohed[0];
+                        })
                     }
                     for (var r of PromiseRejectReactions) {
                         r.apply(null, t.ohed);

package/coms/compile/autoenum.js

@@ -1,4 +1,4 @@
-var { skipAssignment, snapSentenceHead, EXPRESS, SCOPED, QUOTED, VALUE, STRAP, STAMP, number_reg, createString } = require("./common");
+var { skipAssignment, snapSentenceHead, snapExpressFoot, EXPRESS, SCOPED, QUOTED, VALUE, STRAP, STAMP, number_reg, createString } = require("./common");
 var strings = require("../basic/strings");
 
 var createRefId = function (o) {
@@ -50,6 +50,7 @@ var createRefId = function (o) {
     }
     return ids.join('');
 }
+var ignore = Symbol("ignore");
 var maplist = function (u) {
     var map = Object.create(null);
     for (var o of u) {
@@ -59,9 +60,33 @@ var maplist = function (u) {
             map[r].wcount = 0;
             map[r].ccount = 0;
         }
-        map[r].push(o);
-        if (o.equal || o.kind) map[r].wcount++;
-        if (o.called) map[r].ccount++;
+        var m = map[r];
+        m.push(o);
+        if (o.equal || o.kind) {
+            var typeref = o.typeref;
+            if (typeref && typeof typeref === 'object') {
+                typeref = typeref.typeref;
+                o.typeref = typeref;
+            }
+            if (typeref && typeref !== m.typeref) {
+                m.typeref = typeref;
+                m.wcount++;
+            }
+            else if (m.typeref) {
+                var n = o.next;
+                o[ignore] = true;
+                if (n.type === STAMP && /^(\+\+|\-\-)$/.test(n.text)) continue;
+                if (/^[\+\-]\=$/.test(n.text)) {
+                    var nn = n.next;
+                    if (nn && snapExpressFoot(nn) == nn && nn.isdigit && (nn.text & 0x1ff) === +nn.text) continue;
+                }
+                else if (!n || !/=$/.test(n.text)) continue;
+                o[ignore] = false;
+                m.wcount++;
+            }
+            else m.wcount++;
+        }
+        if (o.called) m.ccount++;
     }
     return map;
 }
@@ -69,7 +94,6 @@ function createRefMap(scoped) {
     var { used } = scoped;
     var refs = Object.create(null);
     for (var k in used) refs[k] = maplist(used[k]);
-    scoped.forEach(createRefMap);
     return scoped.refs = refs;
 }
 function removeRefs(o) {
@@ -126,53 +150,70 @@ function inCondition(o) {
 }
 
 function enumref(scoped) {
-    if (scoped.isfunc) {
-        var { refs } = scoped;
-        for (var k in refs) {
-            var rs = refs[k];
-            for (var rk in rs) {
-                var os = rs[rk];
-                if (os.wcount !== 1 || os.length < 2) continue;
-                var eq = null, em = null;
-                loop: for (var o of os) {
-                    if (o.equal) {
-                        if (o.equal.text !== '=') break;
-                        if (o.queue.kind) break;
-                        if (o.queue !== scoped.body) break;
-                        if (inCondition(o)) break;
-                        if (o.enumref) {
-                            em = o.enumref;
-                            continue;
-                        }
-                        o = o.equal.next;
-                        var n = skipAssignment(o);
-                        var exps = [];
-                        do {
-                            exps.push(o);
-                            o = o.next;
-                        } while (o && o !== n);
-                        if (exps.length !== 1) break loop;
-                        eq = exps[0];
-                        if (eq.type !== VALUE || !eq.isdigit) {
-                            eq = null;
+    var { refs } = scoped;
+    for (var k in refs) {
+        var rs = refs[k];
+        for (var rk in rs) {
+            var os = rs[rk];
+            if (os.wcount !== 1 || os.length < 2) continue;
+            var eq = null, em = null, tp = null;
+            loop: for (var o of os) {
+                if (o.equal && !o[ignore]) {
+                    if (o.equal.text !== '=') break;
+                    if (o.queue.kind) break;
+                    var q = o.queue;
+                    if (q !== scoped.body) {
+                        if (q.entry === '(' && q.queue === scoped.body) {
+                            var qp = q.prev;
+                            if (qp.type === EXPRESS) qp = qp.prev;
+                            if (qp && qp.type === STRAP && qp.text === "await") qp = qp.prev;
+                            if (qp && qp.type === STRAP && qp.text === 'for') {
+                                var f = q.first;
+                                var fc = 0;
+                                while (f && f !== o) {
+                                    if (f.type === STAMP && f.text === ";") {
+                                        fc++;
+                                        if (fc > 1) break loop;
+                                    }
+                                    f = f.next;
+                                }
+                            }
                         }
+                        else break;
                     }
-                    else {
-                        if (em) {
-                            o.enumref = em;
-                            continue;
-                        }
-                        if (!eq) break;
-                        o.type = eq.type;
-                        o.isdigit = true;
-                        o.text = eq.text;
-                        removeRefs(o);
+                    if (inCondition(o)) break;
+                    if (o.typeref) {
+                        tp = o.typeref;
+                        if (isObject(tp)) tp = tp.typeref;
+                        continue;
+                    }
+                    if (o.enumref) {
+                        em = o.enumref;
+                        continue;
                     }
+                    o = o.equal.next;
+                    var n = skipAssignment(o);
+                    if (!o || n !== o.next) break loop;
+                    if (o.type === VALUE && o.isdigit) eq = o;
+                }
+                else {
+                    if (tp) {
+                        o.typeref = tp;
+                        continue;
+                    }
+                    if (em) {
+                        o.enumref = em;
+                        continue;
+                    }
+                    if (!eq) break;
+                    o.type = eq.type;
+                    o.isdigit = true;
+                    o.text = eq.text;
+                    removeRefs(o);
                 }
             }
         }
     }
-    scoped.forEach(enumref)
 }
 
 function atuoenum(scoped) {
@@ -180,8 +221,14 @@ function atuoenum(scoped) {
     enumref(scoped);
 }
 var exports = module.exports = function main(code) {
-    atuoenum(code.scoped);
+    var rest = [code.scoped];
+    while (rest.length) {
+        var s = rest.pop();
+        if (s.length) rest.push(...s);
+        atuoenum(s);
+    }
     return code;
 }
 exports.createRefId = createRefId;
-exports.createRefMap = createRefMap;
+exports.createRefMap = createRefMap;
+exports.enumscoped = atuoenum;

package/coms/compile/autoenum_test.js

@@ -16,4 +16,14 @@ t("var {a=1};console.log(a)", "var { a = 1 }; console.log(a)");
 t("if(c) a=1;console.log(a)", "if (c) a = 1; console.log(a)");
 t("console.log(a);a=1;", "console.log(a); a = 1;");
 t("console.log(a);var a=1;", "console.log(a); var a = 1;");
+t("var a=1;console.log(a++);", "var a = 1; console.log(a++);");
+t("for(;;){let a =1; console.log(a)}", "for (;;) { let a = 1; console.log(1) }");
+t("for(;;){a =1; console.log(a)}", "for (;;) { a = 1; console.log(1) }");
+t("a=2;for(;;){var a =1; console.log(a)}", "a = 2; for (;;) { var a = 1; console.log(1) }");
+t("for(;;){var a =1; console.log(a)} console.log(a)", "for (;;) { var a = 1; console.log(1) } console.log(a)");
+t("for(;a=1;){ console.log(a)} console.log(a)", "for (; a = 1;) { console.log(1) } console.log(1)");
+t("for(;a=1;){ console.log(a)} console.log(a)", "for (; a = 1;) { console.log(1) } console.log(1)");
+t("for(;;a=1){ console.log(a)} console.log(a)", "for (;; a = 1) { console.log(a) } console.log(a)");
+t("for(var a = 1;;){ console.log(a)} console.log(a)", "for (var a = 1;;) { console.log(1) } console.log(1)");
+t("for(let a = 1;;){ console.log(a)} console.log(a)", "for (let a = 1;;) { console.log(a) } console.log(a)");
 // t(fs.readFileSync(path.join(__dirname,"../zimoli/spacechar_test.js")).toString())

package/coms/compile/downLevel.js

@@ -358,7 +358,7 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
     return i;
 };
 // 键值对重组
-var killmap = function (body, i, _getobjname, killobj) {
+var killmap = function (body, i, _getobjname, _getnewname, killobj) {
     var o = body[i];
     if (!o.length) return indexof(body, o.next, i);
     var m = o.first;
@@ -432,6 +432,7 @@ var killmap = function (body, i, _getobjname, killobj) {
         insert1(q, null, { type: STAMP, text: ',' });
     }
     var define_ = Object.create(null);
+    var tempname = null;
     var t;
     while (m) {
         if (m.type === EXPRESS) {
@@ -479,7 +480,8 @@ var killmap = function (body, i, _getobjname, killobj) {
         var [prop, m] = getprop(o, m);
         if (!prop.value.length) insert1(prop.value, null, { type: EXPRESS, text: prop.name })
         else if (prop.sfunc === false) killobj(prop.value);
-        setprop(prop, _getobjname(), define_, q);
+        if ((prop.get || prop.set) && !tempname) tempname = _getnewname();
+        setprop(prop, _getobjname(), define_, q, tempname);
     }
 
     if (q) {
@@ -538,7 +540,7 @@ var getprop = function (o, m) {
     else if (!prop.value) prop.value = [];
     return [prop, m];
 };
-var setprop = function (prop, k, d, q) {
+var setprop = function (prop, k, d, q, tempname) {
     if (prop.sfunc !== false)
         // insert1(prop.value, prop.value[0], ...scanner2(`${prop.async ? "async " : ""}function${prop["*"] ? "*" : ''}`));
         insert1(prop.value, prop.value[0], ...scanner2(`function`));
@@ -551,17 +553,14 @@ var setprop = function (prop, k, d, q) {
             else pe = null;
         }
         if (!d[prop.name]) {
-            let tmp = scanner2(`\r\nObject["defineProperty"](${k},${prop.name},{})`);
+            let tmp = scanner2(`\r\nObject["defineProperty"](${k},${prop.name},(${tempname}={},${tempname}))`);
             insert1(q, null, ...tmp);
             if (pe) insert1(q, null, pe);
             tmp = tmp[tmp.length - 1];
             tmp = tmp[tmp.length - 1];
             d[prop.name] = tmp;
         }
-        if (d[prop.name].length) insert1(d[prop.name], null, { type: STAMP, text: ',' });
-        insert1(d[prop.name], null, { type: PROPERTY, text: prop.get ? "get" : "set" });
-        insert1(d[prop.name], null, { type: STAMP, text: ":" });
-        if (pv && pv.length) insert1(d[prop.name], null, ...pv);
+        insert1(d[prop.name], null, ...rescan`[${prop.get ? '"get"' : '"set"'}]=${pv},${tempname}`);
     }
     else {
         insert1(q, null, ...scanner2(`${q && q.length ? "\r\n" : ''}${k}${prop.name}=`));
@@ -569,7 +568,7 @@ var setprop = function (prop, k, d, q) {
     }
 }
 var rootenvs = null, rootHyper;
-var killcls = function (body, i, getname_) {
+var killcls = function (body, i, letname_, getname_) {
     var extends_ = [];
     var o = body[i];
     var ishalf = isHalfSentence(body, i - 1);
@@ -610,13 +609,14 @@ var killcls = function (body, i, getname_) {
         var scoped = o.scoped;
         var m = o.first;
         var name = extends_.pop();
-        if (!name && (base || extends_.length)) name = getname_('cls' + index);
+        if (!name && (base || extends_.length)) name = letname_('cls' + index);
         var assign = [];
         var constructor = scanner2('(){}');
         var define_ = Object.create(null);
         var static_ = Object.create(null);
         var clz = { name };
-        if (!clz.name) clz.name = getname_("cls" + index);
+        if (!clz.name) clz.name = letname_("cls" + index);
+        var tempname = null;
         while (m) {
             var [prop, m] = getprop(o, m);
             if (!prop.value.length) prop.value = scanner2('undefined;');
@@ -624,7 +624,8 @@ var killcls = function (body, i, getname_) {
             var d = prop.static ? static_ : define_;
             if (prop.get || prop.set || prop.static) {
                 if (prop.name) {
-                    setprop(prop, k, d, defines);
+                    if ((prop.get || prop.set) && !tempname) tempname = getname_("tmp");
+                    setprop(prop, k, d, defines, tempname);
                 }
                 else if (prop.static) {
                     var value = scanner2(`(function(){}())`);
@@ -931,7 +932,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                     i++;
                     break;
                 case "class":
-                    i = killcls(body, i, letname_);
+                    i = killcls(body, i, letname_, getname_);
                     break;
                 case "for":
                 case "function":
@@ -964,7 +965,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                     continue;
                 }
                 else {
-                    i = killmap(body, i, _getobjname, deepkill);
+                    i = killmap(body, i, _getobjname, _getnewname, deepkill);
                     // i = indexof(body, o, i);
                     continue;
                 }
@@ -1100,7 +1101,7 @@ var unforin = function (o, getnewname_, killobj) {
     var s = scanner2(`${sname}=`);
     insert1(s, null, ...splice2(o, n));
     insert1(s, null,
-        ...scanner2(`,${tname}=[];for(${hasdeclare ? 'var ' : ''}${hasdeclare ? f.text : kname} in ${sname})${tname}.push(${hasdeclare ? f.text : kname});`)
+        ...scanner2(`,${tname}=[];for(${hasdeclare ? 'var ' : ''}${hasdeclare ? f.text : kname} in ${sname})${tname}["push"](${hasdeclare ? f.text : kname});`)
     );
     insert1(o.queue, o.prev, ...s);
     splice(o, 0, o.length, ...scanner2(`${kname}=0;${kname}<${tname}["length"]&&`));
@@ -1210,11 +1211,31 @@ var unarrow = function (body, i, killobj, letname_) {
     return nni;
 };
 var getname = function (vars, envs, k) {
-    if (!(k in vars) && !(k in envs)) return vars[k] = true, k;
+    var extra = this instanceof Array ? this : null;
+    a: if (!(k in vars) && !(k in envs)) {
+        if (extra) for (var e of extra) {
+            if (k in e) break a;
+        }
+        return vars[k] = true, k;
+    }
     var inc = /\d+$/.exec(k);
     if (inc) k = k.slice(0, k.length - inc[0].length), inc = 1 + +inc[0];
     else inc = 0;
-    while ((k + inc) in vars || (k + inc) in envs) inc++;
+    loop: while (true) {
+        var k0 = k + inc;
+        if (k0 in vars || k0 in envs) {
+            inc++;
+            continue;
+        }
+        if (extra) for (var e of extra) {
+            if (k0 in e) {
+                inc++;
+                continue loop;
+            }
+        }
+
+        break;
+    }
     vars[k + inc] = true;
     return k + inc;
 };
@@ -1659,7 +1680,7 @@ var down = function (scoped) {
         if (scoped.isfunc) return down(scoped);
         killlet(scoped);
         var saveddeep = fordeep;
-        var _getlocal = getname.bind(null, scoped.lets, scoped.envs);
+        var _getlocal = getname.bind([scoped.lets, scoped.envs], vars, envs);
         var getdeepname = function () {
             return gettmpname(--fordeep);
         };

package/coms/compile/downLevel_test.js

@@ -102,15 +102,19 @@ assert(downLevel(`class a extends class b{}{}`), `var a = function (b, a) { exte
 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", (tmp = {}, tmp["get"] = function () {}, tmp))
+var tmp`);
 assert(downLevel(`class a {set a(){}}`), `function a() {};
-Object["defineProperty"](a["prototype"], "a", { set: function () {} })`);
+Object["defineProperty"](a["prototype"], "a", (tmp = {}, tmp["set"] = function () {}, tmp))
+var tmp`);
 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", (tmp = {}, tmp["get"] = function () {}, tmp["set"] = function () {}, tmp));
+Object["defineProperty"](a["prototype"], "b", (tmp = {}, tmp["get"] = function () {}, tmp));
+var tmp`);
 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", (tmp = {}, tmp["set"] = function () {}, tmp["set"] = function () {}, tmp));
+Object["defineProperty"](a["prototype"], "b", (tmp = {}, tmp["get"] = function () {}, tmp));
+var tmp`);
 i++// 属性降级
 assert(downLevel(`return ({b,async a(){}})`), `return ((_ = {},
 _.b = b,
@@ -180,8 +184,9 @@ assert(downLevel(`={...{},...c,b}`), `= (_ = extend({}, {}, c),
 _.b = b, _)\r\nvar _`);
 assert(downLevel(`={a(){},get c(){},b}`), `= (_ = {},
 _.a = function () {},
-Object["defineProperty"](_, "c", { get: function () {} }),
-_.b = b, _)\r\nvar _`);
+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))`)

package/coms/compile/unstruct.js

@@ -226,12 +226,13 @@ var _for = function (body, cx, unblock, result) {
     var o = body[cx];
     var label = o;
     o = o.next;
+    if (o.type === STRAP && o.text === 'await') o = o.next;
     var m = o.first;
     if (m.type === STRAP && /^(let|const|var)$/.test(m.text)) {
         m = m.next;
     }
     var mn = m.next;
-    if (mn.type === STRAP && mn.text === 'in') {
+    if (mn.type === STRAP && /^(of|in)$/.test(mn.text)) {
         // 含有高级语法的 for in 语句在 ./downLevel.js 中预处理
         var dx = cx;
         var n = o.next;

package/coms/compile/unstruct_test.js

@@ -65,6 +65,9 @@ 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 in b)", "for (a in b)", true);
+test("for(a of b)", "for (a of b)", true);
+test("for await(a of b)", "for await (a of b)", 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())", "_ = Symbol.iterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.asyncIterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.iterator; _ = Array.prototype[_];\r\n a = _; a = a.call(os); b = a.next(); return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; o = b.value; _ = (true);\r\n if (!_) return [1, 0]; b = a.next(); return [-1, 0]", true);
 test("for(a=0;a<1;a++)if(a==0)continue\r\n else a=1", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (_) return [2, 0]; return [1, 0];\r\n a = 1; return [1, 0];\r\n _ = a++; return [-2, 0]`, true);
 test("for(a=0;a<1;a++)if(a==0){continue} else {a=1}", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [3, 0]; _ = a == 0; if (!_) return [1, 0]; return [2, 0];\r\n a = 1; return [1, 0];\r\n _ = a++; return [-2, 0]`, true);

package/package.json

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