efront 4.7.3 → 4.8.1

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

@@ -1,3 +1,33 @@
+- zh-CN: 这个文件内的测试代码暂不支持
+  en:    The test code in this file is currently not supported
+
+- zh-CN: onback中阻止跳转的功能在新老版本的chrome上及其他不同浏览器上的表现均不一致，建议更换实现方式！
+  en:    "The function of preventing redirection in onback performs differently on both new and old versions of Chrome, as well as on different browsers. It is recommended to change the implementation method!"
+
+- zh-CN: 加载中..
+  en:    Loading..
+
+- zh-CN: 查看
+  en:    check
+
+- zh-CN: 单击生成
+  en:    Click to generate
+
+- zh-CN: 同意
+  en:    agree
+
+- zh-CN: 每行一个，不支持泛域名
+  en:    "One per line, does not support generic domain names"
+
+- zh-CN: 订单状态已更新
+  en:    Order status updated
+
+- zh-CN: 无法通过http服务完成审核
+  en:    Unable to complete audit through HTTP service
+
+- zh-CN: 下载
+  en:    download
+
 - 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."
 

package/apps/pivot/cert/main.xht

@@ -164,7 +164,7 @@
             },
             fields: refilm`
             $账户/kid input
-            *当前服务器的域名/domain/每行一个 text
+            *当前服务器的域名/domain/每行一个，不支持泛域名 text
             `,
             actions: {
                 async 创建订单(actived) {

package/apps/pivot/cert/orders.xht

@@ -146,6 +146,12 @@
             async auditOrder(o) {
                 await acme2.auditOrder(o, setauth);
                 if (this.order === o) await this.openOrder(this.order);
+                if (this.order.status !== 'pendding') {
+                    alert(i18n`订单状态已更新`);
+                }
+                else {
+                    alert(i18n`无法通过http服务完成审核`, "warn");
+                }
             },
 
             async finalize(o) {

package/apps/pivot/main.js

@@ -83,6 +83,7 @@ on("drop")(document, function (event) {
     event.preventDefault();
 });
 remove(document.body.childNodes);
+zimoli.register('/wow/root');
 function main() {
     return layer;
 }

package/apps/pivot/wow/root.js

@@ -73,40 +73,12 @@ class File {
         p.abort();
     }
 }
-function main() {
+function main(path) {
+    var loaded = false;
     var page = explorer$main();
-    var backtime = 0;
-    page.onback = function () {
-        var $scope = this.$scope;
-        if (!$scope.pathlist.length) {
-            if (Date.now() - backtime < 2022) alert("已是根目录！");
-            backtime = Date.now();
-            return false;
-        }
-        if ($scope.pathlist) {
-            var name = $scope.pathlist.pop();
-            var base = data.getInstance("base").base;
-            var p = $scope.pathlist.join("/").replace(/^\/+|\/+$/g, '');
-            var bp = p ? base + p + '/' : base;
-            p = p + '/';
-            data.setInstance("pathlist", $scope.pathlist);
-            name = name.replace(/^\/+|\/+$/g, '');
-            $scope.selected = [{
-                name,
-                isfolder: true,
-                where: p,
-                host: base,
-                url: bp + name + "/",
-                fullpath: p + name + "/",
-                type: 'folder'
-            }];
-        }
-        $scope.open();
-        return false;
-    }
 
     extend(page.$scope, {
-        pathlist: data.getInstance("pathlist"),
+        pathlist: path ? path.split('/') : [],
         read(from, start, size) {
             var authorization = data.getSource(data.getInstance("base").base);
             var xhr = cross("get", from.url, { authorization: authorization });
@@ -116,7 +88,11 @@ function main() {
             return xhr;
         },
         load(p) {
-            data.setInstance("pathlist", this.pathlist);
+            if (loaded) {
+                location.href = "#/wow/root" + p;
+                return { then() { } };
+            }
+            loaded = true;
             var base = data.getInstance("base").base;
             var p = p.replace(/^\/+|\/+$/g, '');
             var bp = p ? base + p + "/" : base;

package/coms/basic/Timer.js

@@ -0,0 +1,15 @@
+class Timer {
+    capture = Date.now();
+    value = 0;
+    pause() {
+        this.value += Date.now() - this.capture;
+        this.capture = null;
+    }
+    resume() {
+        this.capture = Date.now();
+    }
+    valueOf() {
+        return this.capture !== null ? this.value + Date.now() - this.capture : this.value;
+    }
+}
+module.exports = Timer;

package/coms/compile/Html.js

@@ -46,9 +46,22 @@ var fixElement = function (o) {
     }
     o.attributes.forEach(a => {
         if (a.type === PIECE) {
-            for (var p of parseProperty(a.text)) {
-                push(p);
-            }
+            a.text.split(/\s+/).forEach(text => {
+                var ps = parseProperty(text);
+                for (var cx = 0, dx = ps.length; cx < dx; cx++) {
+                    if (needValue) break;
+                    push(ps[cx]);
+                }
+                ps = ps.slice(cx);
+                if (!ps.length);
+                else if (ps.length === 1) push(ps[0]);
+                else {
+                    ps.type = QUOTED;
+                    ps.entry = '"';
+                    ps.leave = '"';
+                    push(ps);
+                }
+            })
         }
         else {
             push(a);
@@ -66,6 +79,7 @@ class Html extends Javascript {
     // inTag = false;
     scriptTags = [];
     ignoreTags = ["SCRIPT", "STYLE"];
+    type = ELEMENT;
 }
 var property = new Program;
 property.stamps = "=".split('');
@@ -93,6 +107,7 @@ Html.prototype.createScoped = function (code) {
     var vars = Object.create(null);
     var scriptNodes = [], styleNodes = [], tempNodes = [];
     var inScript = false;
+    var noTag = true;
     var run = function (c) {
         switch (c.type) {
             case ELEMENT:
@@ -100,7 +115,9 @@ Html.prototype.createScoped = function (code) {
                 c.tagName = c.tag.toUpperCase();
                 if (!/^(script|style|template)$/i.test(c.tagName)) {
                     fixElement(c);
+                    noTag = false;
                     if (c.attributes) c.attributes.forEach(run);
+                    noTag = true;
                     if (!used[v]) used[v] = [];
                     used[v].push(c);
                     c.forEach(run);
@@ -142,7 +159,7 @@ Html.prototype.createScoped = function (code) {
                     c.forEach(run);
                     break;
                 }
-                if (!c.text) break;
+                if (noTag || !c.text) break;
                 var t = strings.decode(c.text);
                 var p = t.prev;
                 var pp = p && p.prev;
@@ -154,7 +171,7 @@ Html.prototype.createScoped = function (code) {
                 }
                 break;
             case EXPRESS:
-                if (inScript) return;
+                if (inScript || noTag) break;
                 var t = c.text;
                 t = parseExpress(t);
                 var envs = createScoped(t).envs;
@@ -181,7 +198,7 @@ Html.prototype.createScoped = function (code) {
     scoped.scripts = scripts;
     scoped.styles = styles;
     var rootNodes = code.filter(a => !/^(script|style)$/i.test(a.tagName) && !(a.type & (SPACE | COMMENT)));
-    if (rootNodes.length === 1) {
+    if (rootNodes.length === 1 && rootNodes[0].type === ELEMENT) {
         scoped.outerHTML = this.createString(rootNodes);
         var root = rootNodes[0];
         scoped.tagName = root.tagName;

package/coms/compile/Html_test.js

@@ -2,8 +2,9 @@ var Html = require("./Html");
 var test = function (source, pick, value) {
     var h = new Html;
     var b = h.exec(source);
+    if (arguments.length === 2) source = pick;
     assert(h.createString(b), source);
-    if (pick) {
+    if (arguments.length === 3) {
         assert(seek(b, pick), value);
     }
 };
@@ -12,3 +13,8 @@ test("<a>Let's Encrypt</a>");
 test("<style>{a-b:2}</style>");
 assert(scanner2("<a>Let's Encrypt</a>", Html).length, 1);
 test('<a href="${i18n``}">Let\'s Encrypt</a>');
+test('加载中..<a class="loading"></a>');
+test('<input ng-model=data.name />');
+test('<input ng-model=data.name/>', '<input ng-model=data.name />');
+test('<!--<input ng-model=data.name/>-->');
+test('<div><!--<input ng-model=data.name/>--></div>');

package/coms/compile/Javascript.js

@@ -81,25 +81,45 @@ Javascript.prototype.isProperty = function (o) {
     return false;
 };
 var setStrapExpress = function (mark_type, mark_text, prop, o, default_type) {
-    var temp = o.queue;
-    var type = o.type;
     var prev = o.prev;
     if (prev && prev.type === STRAP && /^(?:function|class|let|const|var)$/.test(prev.text)) {
         o.type = EXPRESS;
         return;
     }
-    if (type === STRAP) while (temp) {
-        if (temp.entry === '(') var pp = temp.prev;
-        else if (temp.entry === "{") {
-            if (!temp.prev || temp.prev.type !== SCOPED || temp.prev.entry !== '(') {
-                temp = temp.queue;
-                continue;
+    var type = o.type;
+    if (type !== STRAP) return;
+    var h = snapExpressHead(o);
+    var isfunc = h?.prev?.type === STAMP && h.prev.text === '=>';
+    var q = o.queue;
+    if (isfunc) var pp = h.prev.prev;
+    else while (q) {
+        h = snapExpressHead(q);
+        isfunc = h?.prev?.type === STAMP && h.prev.text === '=>';
+        if (isfunc) {
+            pp = h.prev.prev;
+            break;
+        }
+        if (q.entry === '(') {
+            var pp = q.prev;
+        }
+        else if (q.entry === "{") a: {
+            var p = q.prev;
+            if (p) {
+                if (p.type === STAMP && p.text === "=>") {
+                    isfunc = true;
+                    pp = p.prev;
+                    break;
+                }
+                if (p.type === SCOPED && p.entry === "(") {
+                    pp = p.prev;
+                    break a;
+                }
             }
-            temp = temp.prev;
-            pp = temp.prev;
+            q = q.queue;
+            continue;
         }
         else {
-            temp = temp.queue;
+            q = q.queue;
             continue;
         }
         if (pp && pp.isprop) {
@@ -112,27 +132,24 @@ var setStrapExpress = function (mark_type, mark_text, prop, o, default_type) {
             type = pp && pp.type === mark_type && pp.text === mark_text ? STRAP : EXPRESS;
             break;
         }
-        var tn = temp.next;
-        var isfunc = false;
-        if (tn && tn.type === STAMP && tn.text === '=>') isfunc = true;
-        if (!isfunc) {
-            if (pp && pp.type === EXPRESS) pp = pp.prev;
-            if (pp && pp.prev && pp.prev.type === STRAP && pp.prev.text === "function") {
-                pp = pp.prev;
-                isfunc = true;
-            }
-            else {
-                isfunc = pp && pp.type === STRAP && pp.text === 'function';
-            }
-        }
-        if (isfunc) {
-            var chk = pp[prop];
-            type = (chk && chk.type === mark_type && chk.text === mark_text) ? STRAP : EXPRESS;
+        var tn = q.next;
+        if (tn && tn.type === STAMP && tn.text === '=>') {
+            pp = q;
+            isfunc = true;
             break;
         }
-        temp = temp.queue;
+        if (pp && pp.type === EXPRESS) pp = pp.prev;
+        if (pp && pp.type === STAMP && pp.text === "*") pp = pp.prev;
+        isfunc = pp && pp.type === STRAP && pp.text === 'function';
+        if (isfunc) break;
+
+        q = q.queue;
+    }
+    if (isfunc) {
+        var chk = pp[prop];
+        type = (chk && chk.type === mark_type && chk.text === mark_text) ? STRAP : EXPRESS;
     }
-    if (!temp) type = default_type;
+    if (!q) type = default_type;
     o.type = type;
 }
 var setYieldExpress = setStrapExpress.bind(null, STAMP, "*", 'next');
@@ -338,7 +355,6 @@ Javascript.prototype.detectLabel = function (o) {
     }
     if (inExpress !== queue.inExpress) {
         o.isExpress = queue.inExpress = inExpress;
-        if (o.text === 'async') console.log(o.isExpress, queue.isExpress, 'label');
     }
 }
 
@@ -347,6 +363,8 @@ Javascript.prototype.setType = function (o) {
     var last = o.prev;
     if (o.type === EXPRESS && /^\.[^\.]|^\.$/.test(o.text) && last && last.type === STAMP && last.text === "?") {
         last.type = EXPRESS;
+        var q = o.queue;
+        q.question--;
         return false;
     }
     if (last) {

package/coms/compile/Program.js

@@ -15,7 +15,6 @@ const {
     number_reg,
 } = require("./common");
 var combine = require("../basic/combine");
-
 var sortRegExpSource = function (a, b) {
     if (a.indexOf(b) >= 0) return -1;
     if (b.indexOf(a) >= 0) return 1;
@@ -25,6 +24,7 @@ var createQuotedMap = function (entry) {
     var map = {};
     var end = {};
     entry.forEach(k => {
+        // if (k.length < 4) return;
         var [a, b] = k.slice(-2);
         if (a instanceof RegExp) a = stringsFromRegExp(a);
         if (b instanceof RegExp) b = stringsFromRegExp(b);
@@ -91,7 +91,7 @@ class Program {
         ["`", "`", /\\[\s\S]/, ["${", "}"]],
     ]
     tags = [
-        [["<", "</"], /\/?>/, null, ["'", '"', "{", "}"], [/<!--/, /--!?>/]]
+        [["<", "</"], /\/?>/, null, ["'", '"', "<!--", "{", "}"]]
     ];
     scriptTags = [];
     ignoreTags = ["STYLE", "SCRIPT"];
@@ -149,6 +149,7 @@ class Program {
         var lasttype;
         var Code = this.Code;
         var queue = new Code();
+        queue.type = this.type;
         var origin = queue;
         var forceend_reg = this.forceend_reg;
         var program = this;
@@ -343,6 +344,7 @@ class Program {
                         break loop;
                     }
                     var m = match[0];
+
                     index = match.index + m.length;
                     if (quote.tag && queue.inTag === 0) {
                         if (openTag()) {
@@ -373,6 +375,7 @@ class Program {
                         }
                         break;
                     }
+                    if (!quote.entry) continue;
                     a: if (quote.tag) {
                         var mi = quote.tag.indexOf(m);
                         if (mi < 0) {
@@ -405,6 +408,19 @@ class Program {
                         continue loop;
                     }
                     if (m in this.quote_map) {
+                        if (this.comment_entry.test(m)) {
+                            push_piece();
+                            var start = match.index;
+                            var comment = this.quote_map[m];
+                            comment.lastIndex = index;
+                            do {
+                                var match = comment.reg.exec(text);
+                            } while (match && !comment.end.test(match[0]));
+                            if (match) end = index = match.index + match[0].length;
+                            m = text.slice(start, index);
+                            save(COMMENT);
+                            continue loop;
+                        }
                         if (queue.tag && !queue.inTag) continue;
                         push_piece();
                         var scope = [];
@@ -441,7 +457,14 @@ class Program {
                     }
                 }
                 if (this.stamp_reg.test(m) && last) {
-                    if ((VALUE | EXPRESS) & last.type) break test;
+                    if ((VALUE | EXPRESS) & last.type) {
+                        if (queue.type !== ELEMENT) break test;
+                        var lp = last.prev;
+                        if (lp) {
+                            if (lp.type === STAMP && lp.text !== ';') break test;
+                            if (lp.type === STRAP && lp.transive) break test;
+                        }
+                    }
                     if (last.type === QUOTED && !last.tag) break test;
                     if (last.type === SCOPED && queue.inExpress) break test;
                     if (lasttype === STAMP && m === last.text) break test;
@@ -685,8 +708,8 @@ class Program {
                 }
                 return this.compile(q);
             });
-            if (q.tag) r = r.concat(q.tag.slice().sort(sortRegExpSource));
-            r = r.concat(ts.map(this.compile)).join("|");
+            if (q.tag) r = r.concat(q.tag);
+            r = r.concat(ts.map(this.compile)).sort(sortRegExpSource).join("|");
             q.reg = new RegExp(r, 'g');
             q.end = this.createRegExp([q[1]]);
             if (q.length >= 4) {

package/coms/compile/audit.js

@@ -1,4 +1,4 @@
-var { STAMP, getDeclared, VALUE, STRAP, SCOPED, QUOTED, snapSentenceHead, pickSentence, createString, getBodyWith } = require("./common");
+var { STAMP, EXPRESS, STRAP, isHalfSentence, skipAssignment, skipFunction, getDeclared, VALUE, STRAP, SCOPED, QUOTED, snapSentenceHead, pickSentence, createString, getBodyWith, getFuncBody } = require("./common");
 var addAccessedStart = function (matched, namedMap) {
     var start = +namedMap["#1"];
     var body = getBodyWith(matched[0], 'arguments');
@@ -24,18 +24,120 @@ var getLoop = function (c, root) {
         c = h.queue;
     } while (c?.type === SCOPED && c !== root)
     return loop;
+};
+var hasRupt = function (a) {
+    if (a.type === STRAP && /^(await|yield)$/.test(a.text)) return true;
+    if (a.length) {
+        var a = a.first;
+        while (a) {
+            if (a.type === STRAP && /^(class|function|async)$/.test(a.text)) {
+                a = skipFunction(a);
+            }
+            else if (a.type === STAMP && a.text === '=>') {
+                a = skipAssignment(a);
+            }
+            else if (a.type === SCOPED) {
+                if (a.entry === "{") {
+                    if (!a.isObject) {
+                        if (hasRupt(a)) return true;
+                    }
+                }
+                else {
+                    if (hasRupt(a)) return true;
+                }
+                a = a.next;
+            }
+            else a = a.next;
+        }
+    }
+    return false;
+};
+var getNodePath = function (a, body) {
+    var q = a;
+    var qs = [];
+    while (q && q !== body) {
+        qs.push(q);
+        q = q.queue;
+    }
+    return qs.reverse();
+};
+var hasRuptBetween = function (a1, a2) {
+    var qp1 = getNodePath(a1);
+    var qp2 = getNodePath(a2);
+    var qc = [];
+    for (var cx = 0, dx = Math.min(qp1.length, qp2.length); cx < dx; cx++) {
+        var q1 = qp1[cx];
+        if (q1 !== qp2[cx]) break;
+        qc.push(q1);
+    }
+    if (!qc.length) return false;
+    var qce = qc.pop();
+    var q2 = qp2[cx];
+    for (var cx = qce.indexOf(q1), dx = qce.indexOf(q2) + 1 || qce.length; cx < dx; cx++) {
+        var q = qce[cx];
+        if (hasRupt(q)) return true;
+    }
+    return false;
+}
+var unMultiple = function (matched) {
+    var body = getFuncBody(matched[0]);
+    if (!body?.prev || body.checked & 0b10) return;
+    body.checked |= 0b10;
+    var { envs, used } = body.scoped;
+    var undec = [];
+    for (var k in envs) {
+        var w = [];
+        for (var o of used[k]) {
+            if (o.text !== k) continue;
+            if (o.equal && o.next === o.equal) {
+                w.push(o);
+            }
+        }
+        if (!w.length) continue;
+        for (var cx = 0, dx = w.length; cx < dx; cx++) {
+            var loop = getLoop(w[cx]);
+            if (loop && hasRupt(loop)) {
+                undec.push(k);
+                break;
+            }
+            if (cx > 0 && hasRuptBetween(w[cx - 1], w[cx])) {
+                undec.push(k)
+                break;
+            }
+        }
+    }
+    if (!undec.length) return;
+    var h = snapSentenceHead(body.prev);
+    matched = [];
+    var declared = null;
+    while (h && h !== body) {
+        if (h.kind) {
+            declared = h.text;
+        }
+        matched.push(h);
+        h = h.next;
+    }
+    if (!declared) {
+        declared = h.type & (STRAP | EXPRESS) && /^(module|exports|return)$/.test(h.tack);
+        if (!declared) return;
+    }
+
+    matched.suggest = `${createString(matched)}{\r\n      // 不建议在可并行执行的函数中更改外部变量，以防并发调用时出现异常\r\n      // 建议在可并行函数内声明如下变量，并修改用到这些变量的代码\r\n      var ${undec.join(',')};\r\n  }`;
+    return matched;
 }
 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,
+    "await": unMultiple,
+    "yield": unMultiple,
     "arguments"(matched) {
         var m = matched[0];
         var body = getBodyWith(m, 'arguments');
         var head = body.prev;
-        if (!head?.length || body.checked) return;
-        body.checked = true;
+        if (!head?.length || body.checked & 1) return;
+        body.checked |= 1;
         var { used, args } = body.scoped;
         if (!args?.length) return;
         var access_start = body.reststart ?? args?.length;
@@ -93,7 +195,7 @@ var suggest = {
         }
         matched.suggest = `${createString(matched.slice(0, matched.length - 1))}(){\r\n      var[${createString(head)}]=arguments;\r\n      // ${i18n`后续代码`}..\r\n  }`;
         return matched;
-    }
+    },
 };
 
 var regSuggest = function (c) {

package/coms/compile/audit_test.js

@@ -26,6 +26,13 @@ async function c() {
 }
 
 // 正则表达式在步进函数中无法并发执行，是efront提取正则所致，目前要由用户手动处理
-async function *c() {
+async function* c() {
     var reg = /a/g;
+}
+
+var a;
+async function* c() {
+    a = 1;
+    await wait();
+    a = 2;
 }

package/coms/compile/autoenum.js

@@ -100,6 +100,9 @@ var maplist = function (u) {
                 }
                 else if (enumtype & REFMOVE) m.wcount++;
             }
+            else {
+                if (o.equal) m.wcount++;
+            }
         }
         else if (enumtype & REFSTRC) {
             if (o.enumref && o.enumref !== m.enumref) m.wcount++, m.enumref = o.enumref;
@@ -172,6 +175,18 @@ function inCondition(o) {
 }
 
 function enumref(refitem, scoped) {
+    if (enumtype === REFMOVE) {
+        var c = 0;
+        for (var rk in refitem) {
+            c++;
+            var a = refitem[rk];
+            if (a.ccount > 0) return;
+        }
+        var a = refitem[""];
+        if (a && c > 1) {
+            if (a.wcount < a.length) return;
+        }
+    }
     for (var rk in refitem) {
         var os = refitem[rk];
         if (os.wcount !== 1 || os.length < 2) continue;