efront 4.7.0 → 4.7.2

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1,3 +1,6 @@
+- zh-CN: 以后不会再测试是否兼容vue了，也不准备增加对vue3及后续版本的支持，望知悉。
+  en:    "We will no longer test whether it is compatible with Vue in the future, and we are not planning to add support for Vue3 and subsequent versions. Please be informed."
+
 - zh-CN: 检查完毕！
   en:    Check completed!
 
@@ -227,7 +230,7 @@
   en:    !
 
 - zh-CN: https://letsencrypt.org/zh-cn/
-  en:    
+  en:    https://letsencrypt.org/
 
 - zh-CN: 没有发现上传函数
   en:    No upload function found

package/apps/moue/home/index2.vue

@@ -109,7 +109,7 @@ tip {
       </div>
     </div>
     <div2 class="main" ref="content">
-      <tip>内容区</tip>
+      <tip>这个项目是我以前在某些公司上班时为了兼容vue开的，以后不会再维护了，也不准备增加对vue3及后续版本的支持，望知悉。</tip>
     </div2>
   </div1>
 </template>

package/coms/basic_/exec_.js

@@ -21,7 +21,6 @@ var exec_ = function (args, ok, oh, int) {
                 next(err);
             }
             else {
-                catches.pop();
                 fina();
             }
         }
@@ -32,7 +31,7 @@ var exec_ = function (args, ok, oh, int) {
     var retn = function (p) {
         r = p;
         finished = true;
-        if (catches.length) fina();
+        if (catch_ || catches.length) fina();
         else ok(r);
     };
     var fina = function () {
@@ -44,7 +43,6 @@ var exec_ = function (args, ok, oh, int) {
         next();
     };
     var fine = function () {
-        catches.pop();
         if (throwed) thro(e);
         else if (finished) retn(r);
         else {
@@ -57,11 +55,9 @@ var exec_ = function (args, ok, oh, int) {
         while (index < args_length) {
             try {
                 var a = args[index](p) || [1, 0];
-                catch_ = null;
                 p = a[0];
                 i = a[1];
             } catch (e) {
-                p = null;
                 thro(e);
                 return;
             }
@@ -73,12 +69,13 @@ var exec_ = function (args, ok, oh, int) {
                         try {
                             return p.then(next, thro);
                         } catch (e) {
-                            return Promise.reject(e).then(next, thro);
+                            return Promise.reject(e).then(null, thro);
                         }
                     }
                     else return next(p);
                 case 2: return finished = true, retn(p); // return p;
                 case 3: return index++, int(p, next); // yield p;
+                case 4: return thro(p); // throw p; 目前无此返回值
                 case 7: index++; catches.push([index, p]); break; // try catch finally?
                 case 8: index++; catches.push([index, p, 1]); break; // try finally
                 case 9: return p ? fine() : fina(); // finally

package/coms/basic_/exec_test.js

@@ -11,7 +11,14 @@ var b = async function () {
     console.log(3, process.uptime())
     try {
         console.log(4, 'try');
-        throw 5
+        try {
+            throw "这个错误不该出现";
+        } catch {
+            await Promise.reject('这个错误不该出现');
+        }
+        finally {
+            throw await Promise.resolve(5)
+        }
     } catch (e) {
         console.log(e, 'catched')
         throw 7;
@@ -27,22 +34,41 @@ var c = async function () {
 
         await b();
     } catch (e) {
-        console.log(e)
+        console.log(e, 'catched')
         return 9;
     }
     finally {
-        console.log(8)
+        console.log(8, 'finally')
     }
 };
 var d = async function () {
     try {
-        throw new Error(10);
+        throw new Error("不该出现此错误");
     }
     catch (e) {
+        console.log(10, 'catched');
         throw e;
     }
+    finally {
+        console.log(11);
+        return 12;
+    }
+}
+var e = async function () {
+    try {
+        throw new Error("不该出现此错误");
+    }
+    catch (e) {
+        console.log(13, 'catched');
+        throw e;
+    }
+    finally {
+        console.log(14);
+        throw new Error("这是最后的报错");
+    }
 }
 console.log(0, process.uptime())
 await a();
 console.log(await c());
-await d();
+console.log(await d());
+await e();

package/coms/compile/audit.js

@@ -1,7 +1,35 @@
-var { STAMP, EXPRESS, snapSentenceHead, pickSentence, createString, getBodyWith } = require("./common");
+var { STAMP, getDeclared, VALUE, STRAP, SCOPED, QUOTED, snapSentenceHead, pickSentence, createString, getBodyWith } = require("./common");
+var addAccessedStart = function (matched, namedMap) {
+    var start = +namedMap["#1"];
+    var body = getBodyWith(matched[0], 'arguments');
+    if (body.reststart < start) return;
+    body.reststart = start;
+};
+var getLoop = function (c, root) {
+    var loop = null;
+    do {
+        var h = snapSentenceHead(c);
+        if (h.type === STRAP && /^(do|while|for)$/.test(h.text)) {
+            loop = h;
+        }
+        var p = h.prev;
+        while (p?.type === SCOPED && p.entry === "(") {
+            h = snapSentenceHead(p);
+            if (/^(while|for)$/.test(h.text)) {
+                loop = h;
+            }
+            if (!/^(if|with)$/.test(h.text)) break;
+            p = h.prev;
+        }
+        c = h.queue;
+    } while (c?.type === SCOPED && c !== root)
+    return loop;
+}
 var suggest = {
     "while($2[$1++]!==$3)": "while($1<$2.length&&$2[$1++]!==$3)",
     "while($2[$1]!==$3)$1++": "while($1<$2.length&&$2[$1]!==$3)$1++",
+    "for(var $1=#1,$2=arguments.length;$1<$2;$1++)": addAccessedStart,
+    "for(var $1=#1;$1<arguments.length;$1++)": addAccessedStart,
     "arguments"(matched) {
         var m = matched[0];
         var body = getBodyWith(m, 'arguments');
@@ -10,19 +38,53 @@ var suggest = {
         body.checked = true;
         var { used, args } = body.scoped;
         if (!args?.length) return;
+        var access_start = body.reststart ?? args?.length;
+        a: if (access_start > 0) {
+            for (var a of used.arguments) {
+                if (a.text !== 'arguments') continue;
+                var n = a.next;
+                if (!n || n.type !== SCOPED || n.entry !== '[') {
+                    access_start = 0;
+                    break a;
+                }
+                if (n.last && n.last === n.first) {
+                    if (n.last.isdigit) {
+                        var i = +n.last.text;
+                        if (i < access_start) access_start = i;
+                    }
+                }
+            }
+        }
+        if (access_start >= args.length) return;
         var broken = false;
+        var arguments = used.arguments;
+        var arg_start = Infinity;
         a: for (var a of args) {
-            if (!used[a]) {
+            if (access_start > 0) {
+                access_start--;
                 continue;
             }
+            if (typeof a !== 'string') continue;
             for (var u of used[a]) {
                 if (u.equal) {
+                    var loop = getLoop(u, body);
+                    var astart;
+                    if (loop) {
+                        astart = loop.start;
+                    }
+                    else {
+                        var s = pickSentence(u);
+                        astart = s[s.length - 1].end;
+                    }
+                    if (astart < arg_start) arg_start = astart;
                     broken = true;
                     break a;
                 }
             }
         }
         if (!broken) return;
+        arguments = arguments.filter(a => a.start >= arg_start);
+        if (!arguments.length) return;
         var h = snapSentenceHead(body);
         var matched = [];
         while (h && h !== body) {
@@ -33,23 +95,58 @@ var suggest = {
         return matched;
     }
 };
+
+var regSuggest = function (c) {
+    if (c.type !== QUOTED) return;
+    var flag = /\/(\w+)$/.exec(c.text)?.[1];
+    if (!flag || !/g\w*$/.test(flag)) return;
+    var h = snapSentenceHead(c);
+    if (h.type === STRAP || /^(var|let|const)$/.test(h)) {
+        h = h.next;
+    }
+    if (!h.equal) return;
+    var [args] = getDeclared(h);
+    var scoped = getBodyWith(c, args[0]).scoped;
+    if (!scoped?.await && !scoped.yield) return;
+    var matched = [c];
+    matched.suggest = `new RegExp(${c.text.slice(0, c.text.length - flag.length)}.source,"${flag}")`;
+    return matched;
+};
+
 var roles = Object.keys(suggest).map(s => {
     var r = scanner2(s);
-    var { used, envs } = r;
-    for (var k in envs) {
+    var { used } = r;
+    for (var k in used) {
         used[k].forEach(f => {
-            f.sname = /^\$\d+$/.test(f.text) ? f.text : null;
+            if (/^\#\d+$/.test(f.text)) {
+                f.isdigit = true;
+                f.type = VALUE;
+                f.sname = f.text;
+            }
+            else if (/^\$\d+$/.test(f.text)) {
+                f.sname = f.text;
+            }
         });
     }
+    r.matcher = s;
     s = suggest[s];
     if (typeof s === 'string') r.suggest = scanner2(s);
     else r.suggest = s;
     return r;
-});
+}).concat(regSuggest);
 var match = function (role, c, nameMap = {}) {
     var temp = role.first;
     var matched = [];
+    if (typeof role === 'function') {
+        return role(c);
+    }
     while (temp) {
+        if (temp.type === STRAP && /^(var|let|const)$/.test(temp.text)) {
+            if (!c) return;
+            temp = temp.next;
+            if (!temp) return;
+            if (c.type === STRAP && /^(var|let|const)$/.test(c.text)) c = c.next;
+        }
         if (!c || c.type !== temp.type) return;
         if (temp.sname) {
             var name = temp.sname;
@@ -71,7 +168,7 @@ var match = function (role, c, nameMap = {}) {
     }
     if (role.suggest) {
         if (isFunction(role.suggest))
-            return role.suggest(matched);
+            return role.suggest(matched, nameMap);
         var { used } = role.suggest;
         for (var k in nameMap) {
             if (used[k]) patchlist('', used[k], nameMap[k]);
@@ -88,7 +185,8 @@ var audit = function (code) {
         while (rest.length) {
             var c = rest.pop();
             if (c.length) {
-                rest.push.apply(rest, c);
+                var a = c.slice().reverse();
+                rest.push.apply(rest, a);
             }
             var m = match(r, c);
             if (!m) continue;

package/coms/compile/audit_test.js

@@ -7,10 +7,25 @@ function a(a) {
     console.log(arguments);
 }
 
-class a{
+class a {
     a
-    b(c){
-        c=2;
+    b(c) {
+        c = 2;
         arguments;
     }
+}
+
+
+// 正则表达式在异步函数中无法并发执行，是efront提取正则所致，目前要由用户手动处理
+async function c() {
+    var reg = /a/g;
+    while (true) {
+        await wait(20);
+        reg.exec("aaa");
+    }
+}
+
+// 正则表达式在步进函数中无法并发执行，是efront提取正则所致，目前要由用户手动处理
+async function *c() {
+    var reg = /a/g;
 }

package/coms/compile/autoenum_test.js

@@ -11,7 +11,7 @@ t("var a=1;console.log(a)", "var a = 1; console.log(1)");
 t("a.b = 2;console.log(a.b)", "a.b = 2; console.log(2)");
 t("a/*a*/.b = 2;console.log(a.b)", "a/*a*/.b = 2; console.log(2)");
 t("a.b = 2;console.log(a/*aaaa*/.b)", "a.b = 2; console.log(2)");
-t("a.b = 2;console.log(/*bbbb*/a.b)", "a.b = 2; console.log(/*bbbb*/ 2)");
+t("a.b = 2;console.log(/*bbbb*/a.b)", "a.b = 2; console.log(/*bbbb*/2)");
 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;");

package/coms/compile/common.js

@@ -16,7 +16,7 @@ const [
 // --------------//1//2/////////////////////////22/////////////2//2//3//4/////4////////3/////3//////3//3//////3///////211/////////////2//////2//////1///
 var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+|0[0-7]+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[ijklmnu]+)?/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;
-var needhead_reg = /^\?\.|^\.[^\.]|^\[/;
+var needhead_reg = /^\?\.|^\.(?:[^\.]|$)|^\[/;
 var skipAssignment = function (o, cx) {
     if (!o) return;
     var next = arguments.length === 1 ? function () {
@@ -219,14 +219,82 @@ function skipFunction(o) {
     }
     return o;
 }
+var getDoBeforeWhile = function (while_) {
+    var p = while_.prev;
+    if (!p || p.type !== SCOPED || p.entry !== '{') return;
+    p = p.prev;
+    if (p.type === STRAP && p.text === "do") return p;
+};
+var getIfElseHead = function (if_) {
+    var p = if_;
+    do {
+        if_ = p;
+        p = if_.prev;
+        if (!p || p.type !== STRAP || p.text !== 'else') {
+            return if_;
+        }
+        while (p && (p.type !== STRAP || p.text !== 'if')) p = p.prev;
+    } while (p);
+};
+var getContitionHeadBeforeScoped = function (p, nodo) {
+    var pp = p.prev;
+    if (pp.type !== STRAP) return;
+    if (pp.text === 'await') {
+        pp = pp.prev;
+        if (pp?.type === STRAP && pp.text === "for") {
+            return pp;
+        };
+    }
+    else switch (pp.text) {
+        case "with":
+        case "for":
+            return pp;
+        case "while":
+            p = getDoBeforeWhile(pp);
+            if (p) {
+                if (nodo) return;
+                return p;
+            }
+            return pp;
+        case "if":
+            return getIfElseHead(pp);
+    }
+};
+var getFunctionHeadBeforeScoped = function (p) {
+    var pp = p.prev;
+    if (pp && pp.type === EXPRESS) pp = pp.prev;
+    if (pp && pp.text === '*') pp = pp.prev;
+    if (pp && pp.type === STRAP && pp.text === 'function') {
+        p = pp;
+        pp = pp.prev;
+        if (pp && pp.type === STRAP && pp.text === 'async') {
+            p = pp;
+        }
+        return p;
+    }
+    while (pp?.isprop) {
+        p = pp;
+        pp = pp.prev;
+        if (pp?.isend) break;
+    }
+    if (p.isprop) return p;
+}
 function snapSentenceHead(o) {
     // 只检查一级
     while (o && o.prev) {
         var p = o.prev;
-        if (o.entry === '(' && !(p.type & (STAMP | STRAP))) {
-            o = p;
-            p = o.prev;
-            if (!p) break;
+        if (o.entry === '(') {
+            if (!(p.type & (STAMP | STRAP))) {
+                o = p;
+                p = o.prev;
+                if (!p) break;
+            }
+            else if (p.type === STRAP) {
+                var pp = getContitionHeadBeforeScoped(o, false);
+                if (pp) { o = pp; break; }
+                pp = getFunctionHeadBeforeScoped(o);
+                if (pp) { o = pp; continue };
+            }
         }
         var maybeprop = o.type === SCOPED && o.entry !== "{" || o.type === EXPRESS && /^[\.\[]/.test(o.text);
         if (p.type === EXPRESS) {
@@ -254,18 +322,10 @@ function snapSentenceHead(o) {
                 continue;
             }
             if (p.entry === "(" && o.type === SCOPED) {
-                var pp = p.prev;
-                if (pp && pp.type === EXPRESS) pp = pp.prev;
-                if (pp && pp.type === STRAP && pp.text === 'function') {
-                    o = pp;
-                    pp = pp.prev;
-                    continue;
-                }
-                while (pp?.isprop) {
-                    o = pp;
-                    pp = pp.prev;
-                    if (pp?.isend) break;
-                }
+                var pp = getContitionHeadBeforeScoped(p, true);
+                if (pp) { o = pp; break; }
+                var pp = getFunctionHeadBeforeScoped(p);
+                if (pp) { o = pp; continue; }
             }
             break;
         }
@@ -434,7 +494,7 @@ var snapExpressFoot = function (o) {
 };
 var createScoped = function (parsed, wash) {
     var used = Object.create(null); var vars = Object.create(null), lets = vars;
-    var scoped = [], funcbody = scoped, argscope = scoped, thisscope = scoped;
+    var scoped = [], funcbody = scoped, argscope = scoped, thisscope = scoped, labelused = used;
     funcbody.isroot = true;
     scoped.body = parsed;
     scoped.isfunc = true;
@@ -492,7 +552,7 @@ var createScoped = function (parsed, wash) {
                     else {
                         var u = o.text;
                         if (/^\.\.\./.test(u)) u = u.slice(3);
-                        var u = u.replace(/^([^\.\[\?]*)[\s\S]*$/, '$1');
+                        var u = u.replace(/^([^\.\[\?\s]*)[\s\S]*$/, '$1');
                         if (!u) break;
                         var prev = o.prev;
                         if (prev && prev.type === STAMP && /^(?:\+\+|\-\-)$/.test(prev.text)) {
@@ -506,7 +566,7 @@ var createScoped = function (parsed, wash) {
                     break;
                 case LABEL:
                     var name = o.text;
-                    name = name.slice(0, name.length - 1);
+                    name = name.replace(/\s*\:$/, '');
                     vars[name] = true;
                     o.kind = "label";
                     saveTo(used, name, o);
@@ -516,11 +576,20 @@ var createScoped = function (parsed, wash) {
                     var s = o.text;
                     var m = null;
                     switch (s) {
+                        case "break":
+                        case "continue":
+                            if (o.isend) break;
+                            o = o.next;
+                            if (o?.type === EXPRESS) {
+                                saveTo(labelused, o.text, o);
+                            }
+                            break;
                         case "return":
                             if (!funcbody.return) funcbody.return = [];
                             funcbody.return.push(o);
                             break;
                         case "await":
+                            funcbody.async = funcbody.await = true;
                             break;
                         case "as":
                         case "from":
@@ -629,6 +698,7 @@ var createScoped = function (parsed, wash) {
                 var _funcbody = funcbody;
                 var _argscope = argscope;
                 var _thisscope = thisscope;
+                var _labelused = labelused;
                 used = Object.create(null);
                 lets = Object.create(null);
                 vars = Object.create(null);
@@ -645,7 +715,8 @@ var createScoped = function (parsed, wash) {
                         thisscope = scoped;
                         argscope = scoped;
                     }
-                    scoped.await = scoped.async = isAsync;
+                    labelused = used;
+                    scoped.async = isAsync;
                     scoped.isfunc = true;
                     isFunction = true;
                     if (function_obj) function_obj.scoped = scoped;
@@ -764,6 +835,7 @@ var createScoped = function (parsed, wash) {
                 }
                 if (keepscope) {
                     var envs = Object.create(null);
+                    var caps = Object.create(null);
                     for (var k in used) {
                         if (!(k in map)) {
                             envs[k] = true;
@@ -771,7 +843,11 @@ var createScoped = function (parsed, wash) {
                                 saveTo(_used, k, u);
                             }
                         }
+                        else {
+                            caps[k] = used[k];
+                        }
                     }
+                    scoped.caps = caps;
                     scoped.envs = envs;
                     _scoped.push(scoped);
                 }
@@ -787,6 +863,7 @@ var createScoped = function (parsed, wash) {
                 if (isClass) delete lets.super, delete lets.this, thisscope = _thisscope;
                 if (isFunction) {
                     funcbody = _funcbody;
+                    labelused = _labelused;
                     if (!isArrow) {
                         delete vars.this;
                         delete vars.arguments;
@@ -807,6 +884,7 @@ var createScoped = function (parsed, wash) {
     run(parsed.first);
     scoped.used = used;
     scoped.vars = vars;
+    scoped.caps = used;
     var envs = Object.create(null);
     for (var u in used) {
         if (!(u in vars)) {
@@ -1257,12 +1335,8 @@ var rename = function (used, from, to) {
         if (doted) text = "..." + text;
         if (u.type === PROPERTY) {
             if (u.short) {
-                var q = u.queue;
-                q.splice(q.indexOf(u), 0, { type: PROPERTY, text: u.text }, { type: STAMP, text: ":" });
-                u.short = false;
-                u.type = EXPRESS;
+                unshort(u);
                 u.text = text;
-                relink(q);
             }
             continue;
         }
@@ -1493,21 +1567,21 @@ var unshort = function (o, text) {
 };
 var getBodyWith = function (o, k) {
     var q = o.queue;
-    while (q && (!q.scoped || !q.scoped.used[k])) q = q.queue;
+    while (q && (!q.scoped || !q.scoped.caps[k])) q = q.queue;
     return q;
 };
 
 var patchArrawScope = function (arraw, origin) {
     var s1 = createScoped(arraw);
-    if (s1.used.this) {
+    if (s1.caps.this) {
         var s = getBodyWith(origin, 'this').scoped;
-        s.used.this.push(...s1.used.this);
+        s.caps.this.push(...s1.caps.this);
         s.insett = true;
     }
-    if (s1.used.arguments) {
+    if (s1.caps.arguments) {
         s.inseta = true;
         var s = getBodyWith(origin, 'arguments').scoped;
-        s.used.arguments.push(...s1.used.arguments);
+        s.caps.arguments.push(...s1.caps.arguments);
     };
 };
 

package/coms/compile/downLevel.js

@@ -666,13 +666,13 @@ var killcls = function (body, i, letname_, getname_) {
             relink(constructor[1]);
             var cs = createScoped(constructor[1]);
             var newt = getname(cs.vars, cs.envs, 'this_');
-            if (cs.used.this) rename(cs.used, 'this', newt);
+            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 (cs.used.super) {
-                cs.used.super.forEach(o => {
+            if (cs.caps.super) {
+                cs.caps.super.forEach(o => {
                     if (o.text !== 'super') return;
                     var n = o.next;
                     if (!n || n.type !== SCOPED || n.entry !== "(") return;
@@ -687,8 +687,8 @@ var killcls = function (body, i, letname_, getname_) {
                     insert1(o.queue, n.next, ...scanner2(`||this;`));
                 })
             }
-            if (scoped.used.super) {
-                scoped.used.super.forEach(o => {
+            if (scoped.caps.super) {
+                scoped.caps.super.forEach(o => {
                     if (!/^super(\.|\[|$)/.test(o.text)) return;
                     o.text = `${base}["prototype"]` + o.text.replace(/^super/, '');
                     insert1(o.queue, o.next, ...scanner2('["bind"](this)'));
@@ -1674,16 +1674,16 @@ var down = function (scoped) {
     };
 
     var markcodes = [];
-    if (scoped.isfunc && scoped.used.this && (funcMark && !scoped.isArrow || scoped.insett)) {
+    if (scoped.isfunc && scoped.caps.this && (funcMark && !scoped.isArrow || scoped.insett)) {
         let tn = _getname("this_");
-        rename(scoped.used, "this", tn);
-        scoped.used.this.forEach(o => o.origin = 'this');
+        rename(scoped.caps, "this", tn);
+        scoped.caps.this.forEach(o => o.origin = 'this');
         markcodes.push(`${tn}=this`);
     }
-    if (scoped.isfunc && scoped.used.arguments && (funcMark && !scoped.isArrow || scoped.inseta)) {
+    if (scoped.isfunc && scoped.caps.arguments && (funcMark && !scoped.isArrow || scoped.inseta)) {
         let an = _getname("arguments_");
-        scoped.used.arguments.forEach(o => o.origin = 'arguments');
-        rename(scoped.used, "arguments", an);
+        scoped.caps.arguments.forEach(o => o.origin = 'arguments');
+        rename(scoped.caps, "arguments", an);
         markcodes.push(`${an}=arguments`);
     }
     var fordeep = 0;