efront 4.21.2 → 4.21.4

package/coms/compile/Program.js

@@ -11,7 +11,9 @@ const {
     /* 512 */LABEL,
     /*1024 */PROPERTY,
     /*2048 */ELEMENT,
+    pickAssignment,
     createString,
+    setqueue,
     number_reg,
     digit_reg,
 } = require("./common");
@@ -53,6 +55,16 @@ var stringsFromRegExp = function (reg) {
     var res = combine(...queue).map(a => a.join(""));
     return res;
 }
+
+var trimDulp = function (list) {
+    var dist = [];
+    for (var a of list) {
+        if (dist.indexOf(a) >= 0) continue;
+        dist.push(a);
+    }
+    return dist;
+}
+
 var spaceDefined = require("../basic/spaces");
 
 var powermap = require("./powermap");
@@ -64,7 +76,7 @@ class Program {
         ["`", "`", /\\[\s\S]/, ["${", "}"]],
     ]
     tags = [
-        [["<", "</"], /\/?>/, /\\[\s\S]|\=\>/, "'", '"', "<!--", ["${", "}"]]
+        [["<", "</"], /\/?>/, /\\[\s\S]/, "'", '"', "<!--", ["${", "}"]]
     ];
     scriptTags = [];
     ignoreTags = ["STYLE", "SCRIPT"];
@@ -323,10 +335,10 @@ class Program {
         var scriptTags = this.scriptTags;
         var ignoreTags = this.ignoreTags;
         var structstrap_reg = this.structstrap_reg;
+        var mindpath = this.mindpath;
         var openTag = function () {
             var m1 = text.slice(start, match.index);
             var s = space_exp.exec(m1);
-
             if (s) var tag = m1.slice(0, s.index);
             else {
                 tag = m1;
@@ -373,7 +385,10 @@ class Program {
                 if (scope) queue = scope;
                 return true;
             }
-
+            if (s && !tag) {
+                undefTag();
+                return;
+            }
             queue.inTag = true;
             queue.tag = tag;
             var tagName = tag.toUpperCase();
@@ -386,7 +401,8 @@ class Program {
             }
             if (s) {
                 m = m1.slice(s[0].length + s.index);
-                if (m) save(PIECE);
+                start += s[0].length + s.index;
+                push_piece();
             }
             queue.first = null;
             queue.last = null;
@@ -405,12 +421,60 @@ class Program {
                 }
             }
             return istype;
+        };
+        var undefTag = () => {
+            var scope = {
+                type: STAMP,
+                text: queue.entry,
+                col: queue.col,
+                row: queue.row,
+                start: queue.start,
+            };
+            if (queue[0]) {
+                queue.splice(0, queue.length);
+                start = index = queue[0].start;
+            }
+            else {
+                queue = parents.pop();
+                start = index = scope.start + scope.text.length;
+            }
+            var last = queue.last;
+            if (last.type === PIECE) {
+                this.lastIndex = 0;
+                var thist = this.type;
+                this.type = undefined;
+                var res = this.exec(last.text);
+                this.type = thist;
+                this.lastIndex = index;
+                var prev = last.prev;
+                if (prev) {
+                    prev.next = res.first;
+                }
+                if (res.first) {
+                    res.first.prev = prev;
+                }
+                queue.last = res.last;
+                queue.splice(queue.length - 1, 1, ...res);
+                setqueue(res, queue);
+
+            }
+            queue_push(scope);
+
         }
         var closeTag = function () {
             queue.inTag = false;
+            if (text.charAt(index) === m) {
+                if ((m + m) in powermap) {
+                    if (!parents[parents.length - 1].tag) {
+                        undefTag();
+                        return false;
+                    }
+                }
+            }
             if (queue.closed) return;
             if (queue.length) queue.attributes = queue.splice(0, queue.length);
             if (/^\//.test(m) || queue.istype) return queue.short = true, queue.closed = true;
+            queue.tag_leave = m;
             return false;
         };
         var push_quote = function () {
@@ -506,10 +570,8 @@ class Program {
                             start = index = match.index;
                         }
                         else queue.inTag = false;
-
-                        continue;
+                        continue loop;
                     }
-
                     if (quote.end.test(m)) {
                         end = match.index;
                         if (queue.tag) {
@@ -517,7 +579,6 @@ class Program {
                             if (!queue.inTag) continue;
                             if (closeTag() === false) {
                                 start = index;
-                                queue.tag_leave = m;
                                 continue loop;
                             }
                             queue.type = ELEMENT;
@@ -542,7 +603,7 @@ class Program {
                             scope.entry = m;
                             scope.type = QUOTED;
                             if (queue.istype) scope.istype = queue.istype;
-                            scope.start = index;
+                            scope.start = match.index;
                             scope.isExpress = queue.inExpress;
                             push_parents(scope);
                             queue.inTag = 0;
@@ -708,7 +769,7 @@ class Program {
                 }
                 queue.inExpress = true;
                 queue.end = index;
-                queue.text = text.slice(queue.start, index);
+                queue.text = text.slice(start, index);
                 pop_parents();
                 continue;
             }
@@ -746,13 +807,15 @@ class Program {
                 }
                 save(STRAP);
                 var last = queue.last;
-                if (last.type === STRAP && structstrap_reg.test(last.text) && !queue.classed) {
-                    queue.classed = [last.text];
+                m = last.text;
+                if (last.type === STRAP && structstrap_reg.test(m) && !queue.classed) {
+                    queue.classed = [m];
                 }
                 else if (queue.classed) {
-                    if (last.type === STRAP && funcstrap_reg.test(last.text)) queue.classed.push(last.text);
+                    if (last.type === STRAP && funcstrap_reg.test(m)) queue.classed.push(m);
                 }
                 if (funcstrap_reg.test(m)) {
+                    last.isExpress = queue.inExpress;
                     last.isargl = true;
                 }
                 else if (type_reg.test(m)) {
@@ -874,7 +937,7 @@ class Program {
                             scope.istype = true;
                         }
                     }
-                    if (!last || (last.type !== STRAP && (!last.isObject || m === '(') || last.transive)) queue.inExpress = true;
+                    if (!last || last.type !== STRAP && last.isExpress || last.transive) queue.inExpress = true;
                     scope.isExpress = queue.inExpress;
                     scope.inExpress = true;
                 }
@@ -893,7 +956,16 @@ class Program {
                 pop_parents();
                 continue;
             }
-            if (this.scope_leave[m]) console.warn(i18n`标记不匹配`, queue.entry, m, "queue-start:", queue.start, "position:", `${row}:${index - colstart}\r\n`, index - queue.start < 200 ? text.slice(queue.start, index) : text.slice(queue.start, queue.start + 100) + "..." + text.slice(index - 97, index));
+            if (this.scope_leave[m]) {
+                console.warn(
+                    i18n`标记不匹配：`, queue.entry, m,
+                    i18n`\r\n文件位置：`, this.mindpath + ":" + `${row}:${index - colstart}`,
+                    i18n`\r\n摘要：\r\n`,
+                    index - queue.start < 200
+                        ? text.slice(queue.start, index)
+                        : text.slice(queue.start, queue.start + 100) + "..." + text.slice(index - 97, index)
+                );
+            }
             save(STAMP);
         }
         while (queue.tag && parents.length) {
@@ -912,16 +984,12 @@ class Program {
         if (cache_stamp) push_stamp();
         this.lastIndex = index;
         if (queue !== origin) {
-            console.log(
-                "代码异常结束",
-                createString(origin.slice(0, 30)),
-                `\r\n ----- deep: ${parents.length}`,
-                `\r\n ---- enrty: ${queue.entry}`,
-                `\r\n --- length: ${queue.length}`,
-                `\r\n ----- last: ${queue.last ? createString([queue.last]).slice(0, 30) : createString(queue).slice(0, 30)}`,
-                `\r\n -- parents: ${parents.map(p => `${p.row}:${p.col}-${p.tag || p.text || p.entry} `).join('-)> ')}`,
-                `\r\n ----- snap: ${createString([queue]).slice(-200)}`,
-                `\r\n ------ end. `
+            var last = queue.last || queue;
+            console.warn(
+                "代码异常结束", createString(origin.slice(0, 30)),
+                `\r\n - 祖先标记: ${parents.slice(1).map(p => `<red2>${p.tag || p.text || ""}${p.entry || ""}</red2><gray>${p.row}:${p.col}</gray>`).join('')}`,
+                `\r\n - 内层入口: <yellow>${this.mindpath}</yellow>:${last.row}:${last.col} ${last.text || last.entry}`,
+                `\r\n ----- 快照: ${createString(pickAssignment(queue.last || queue))}`,
             );
             while (queue !== origin) {
                 queue.error = "代码异常结束";
@@ -957,24 +1025,6 @@ class Program {
             }
         });
         quoteslike.forEach(q => {
-            var ts = [];
-            var r = q.slice(q[2] ? 2 : 3).concat(q[1]).map(q => {
-                if (q instanceof Array) {
-                    if (q.length > 2) {
-                        ts.push(...q.slice(0, q.length - 2));
-                    }
-                    else if (q.length !== 2) throw new Error(i18n`配置错误！`);
-                    q = q[q.length - 2];
-                }
-                if (q instanceof RegExp) {
-                    return q.source;
-                }
-                return this.compile(q);
-            });
-            if (q.tag) r = r.concat(q.tag);
-            r = r.concat(ts.map(this.compile));
-            r = sortRegster(r).join("|");
-            q.reg = new RegExp(r, 'g');
             q.end = this.createRegExp([q[1]]);
             if (q.length >= 4) {
                 var entry = q.slice(3);
@@ -1019,6 +1069,32 @@ class Program {
         for (var k in this.powermap) if (k.length === 1 && stamps.indexOf(k) < 0) stamps.push(k);
         stamps.push.apply(stamps, powers);
         this.stamp_reg = new RegExp(`^(${stamps.map(this.compile).join('|')})$`);
+        quoteslike.forEach(q => {
+            var ts = [];
+            var r = q.slice(q[2] ? 2 : 3).concat(q[1]).map(q => {
+                if (q instanceof Array) {
+                    if (q.length > 2) {
+                        ts.push(...q.slice(0, q.length - 2));
+                    }
+                    else if (q.length !== 2) throw new Error(i18n`配置错误！`);
+                    q = q[q.length - 2];
+                }
+                if (q instanceof RegExp) {
+                    return q.source;
+                }
+                return this.compile(q);
+            });
+            if (q.tag) r = r.concat(q.tag, powers.filter(p => {
+                var tagentries = q.tag[0];
+                for (var t of tagentries) {
+                    if (p.indexOf(t) >= 0) return true;
+                }
+                return false;
+            }).map(this.compile));
+            r = r.concat(ts.map(this.compile));
+            r = sortRegster(trimDulp(r)).join("|");
+            q.reg = new RegExp(r, 'g');
+        })
     }
 }
 module.exports = Program;

package/coms/compile/common.js

@@ -1233,7 +1233,13 @@ var getSemicolonBetween = function (prev, next) {
     if (
         (EXPRESS | VALUE | QUOTED) & prev.type
         || prev.type === STAMP && /^(\+\+|\-\-)$/.test(prev.text)
-        || prev.type === SCOPED && (prev.isExpress || prev.isObject)
+        || prev.type === SCOPED && (prev.isExpress || prev.isObject || prev.entry === '(' && (
+            // 这两种分号不存在时efront的解析器可以识别，v8的识别不了，为了兼容追加分号
+            // do{}while(); return
+            // =function(){}(); return
+            prev.perv?.type === STRAP && prev.prev.text === 'while' || prev.prev?.type === SCOPED
+        )
+        )
     ) {
         if ((EXPRESS | VALUE | QUOTED | LABEL) & next.type) return ";";
         if (next.type === STRAP) {

package/coms/compile/scanner2.js

@@ -203,17 +203,62 @@ class Code extends Array {
 
 var avoidMap = null;
 var typeMap = Object.create(null);
-function scan() {
-    var [text, type = "js", lastIndex = 0] = arguments;
-    if (isFinite(type)) lastIndex = +type, type = arguments[2] || type;
-    var program = typeMap[type];
+function scan(text) {
+    var fullpath, type, lastIndex = 0, program;
+    for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
+        var a = arguments[cx];
+        switch (typeof a) {
+            case "number":
+                lastIndex = a;
+                break;
+            case "string":
+                if (!fullpath) {
+                    fullpath = a;
+                    break;
+                }
+                else if (!type) {
+                    type = a;
+                    break;
+                }
+            case "object":
+            case "function":
+                type = a;
+                break;
+            default:
+                throw new Error('无效参数: ' + type);
+        }
+    }
+    if (!type) {
+        if (/\.[^\.\/\\]+$/i.test(fullpath)) {
+            type = /[^\.\/\\]+$/.exec(fullpath)[0].toLowerCase();
+        }
+        else {
+            type = fullpath || 'js';
+        }
+    }
     if (!program) switch (type) {
         case "html":
-            program = typeMap[type] = new Html;
+        case "xht":
+        case "htm":
+        case "jsp":
+        case "asp":
+        case "php":
+        case "hta":
+        case "vue":
+            type = 'html';
+            program = typeMap[type];
+            if (!program) program = typeMap[type] = new Html;
             break;
         case "js":
+        case "ts":
+        case "jsx":
+        case "tsx":
+        case "mjs":
+        case "cjs":
         case "javascript":
-            program = typeMap[type] = new Javascript;
+            type = "js";
+            program = typeMap[type];
+            if (!program) program = typeMap[type] = new Javascript;
             break;
         default:
             if (type instanceof Function) {
@@ -223,12 +268,13 @@ function scan() {
                 program = type;
             }
             else {
-                console.log(i18n`类型不支持`, type)
+                throw new Error(i18n`类型不支持: ${console.format(`<red2>${type}</red2>`)}`);
             }
             break;
     }
     program.Code = Code;
     program.lastIndex = lastIndex;
+    program.mindpath = fullpath;
     var res = program.exec(text);
     res.autospace = !program.keepspace;
     Object.defineProperty(res, "program", { value: program, enumerable: false })

package/coms/compile/translate.js

@@ -100,7 +100,7 @@ function translate([imap, supports], code) {
         return 0;
     });
     var getm = function (tt, nodup, warn) {
-        var mq = /^(\s*)([\s\S]*?)(\s*)$/.exec(tt);
+        var mq = /^(\s*)([\s\S]*?)([\:\：]?\s*)$/.exec(tt);
         var mq = [mq[1] || '', mq[2], mq[3] || ''];
         var tt = mq[1];
         var wrap = m => {

package/coms/zimoli/XMLHttpRequest.js

@@ -1,4 +1,4 @@
-if (this.XMLHttpRequest) return this.XMLHttpRequest;
+if (this.XMLHttpRequest?.prototype && "onreadystatechange" in this.XMLHttpRequest.prototype) return this.XMLHttpRequest;
 if (this.ActiveXObject) return this.ActiveXObject.bind(null, 'Microsoft.XMLHTTP');
 if (!this.fetch) return;
 var window = this;
@@ -17,18 +17,21 @@ XMLHttpRequest.prototype.open = function (method, url) {
 XMLHttpRequest.prototype.send = function (data) {
     var params = { method: this.method, headers: { referer: document.location.href.replace(/^#[\s\S]*$/g, '') } };
     if (data != null) params.body = data;
-    this.fetch(this.url, params).then(function (d) {
-        this.fetched = d;
-        this.readyState = 4;
-        this.status = d.status;
+    var fetched = this.fetch(this.url, params);
+    var xhr = this;
+    fetched.then(function (d) {
+        xhr.fetched = d;
+        xhr.readyState = 4;
+        xhr.status = d.status;
         return d.text();
     }).then(function (d) {
-        this.responseText = d;
-        if (this.onreadystatechange) this.onreadystatechange({ target: this });
-        if (this.onload) this.onload({ target: this });
-    }, function (e) {
-        this.readyState = 4;
-        if (this.onreadystatechange) this.onreadystatechange({ target: this });
-        if (this.onerror) this.onerror({ target: this });
+        xhr.responseText = d;
+        if (xhr.onreadystatechange) xhr.onreadystatechange({ target: xhr });
+        if (xhr.onload) xhr.onload({ target: xhr });
+    }).catch(function (e) {
+        xhr.readyState = 4;
+        if (xhr.onreadystatechange) xhr.onreadystatechange({ target: xhr });
+        if (xhr.onerror) xhr.onerror({ target: xhr });
     });
-}
+}
+return XMLHttpRequest;

package/coms/zimoli/table.html

@@ -20,7 +20,7 @@
             <mask></mask>
             <model -if="!isEmpty(f.key)" :field=f :data=d readonly></model>
             <template -else>&nbsp;</template>
-            <a on-click="o.do(d)" -if="isEmpty(f.key)&&f.options&&(!o.when||o.when(d))"
+            <a on-click="o.do(d,event)" -if="isEmpty(f.key)&&f.options&&(!o.when||o.when(d))"
                 _type="o.type instanceof Function?o.type(d):o.type" -repeat="o in f.options">
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>

package/coms/zimoli/zimoli.js

@@ -136,9 +136,6 @@ function go(pagepath, args, history_name, oldpagepath) {
     if (realpath.length > 1) var [pgpath, args0] = realpath;
     else pgpath = pagepath;
     setZimoliParams(pagepath, { data: args, from: oldpagepath, options, roles, id });
-    prepare(pgpath, function (res) {
-        if (!res.roles || res.roles === true) res.roles = !!roles;
-    });
     if (!page_generators[pgpath]) {
         return zimoli(pagepath, args, history_name, oldpagepath);
     }
@@ -349,36 +346,27 @@ function prepare(pgpath, ok) {
         }
     };
     var emit = function (pg) {
-        if (pg) {
-            page_generators[pgpath] = {
-                pg,
-                roles,
-                state,
-                with: _with_elements,
-                onback: _pageback_listener,
-                prepares
-            };
-        }
+        page_generators[pgpath] = {
+            pg,
+            roles,
+            state,
+            with: _with_elements,
+            onback: _pageback_listener,
+            prepares
+        };
         var res = page_generators[pgpath];
         var emiters = loading_tree[pgpath];
         delete loading_tree[pgpath];
-        if (emiters) {
-            var noRoles = !res.roles;
-            if (noRoles && res.roles) {
-                prepare(user.loginPath, () => emit());
-                return;
-            }
-            while (emiters.length) {
-                var ok = emiters.shift();
-                if (isFunction(ok)) {
-                    ok(res);
-                }
+        if (emiters) while (emiters.length) {
+            var ok = emiters.shift();
+            if (isFunction(ok)) {
+                ok(res);
             }
         }
+
     };
     return init(pgpath, function (pg) {
-        if (!pg) return;
-        extendIfNeeded(pg, state);
+        if (pg) extendIfNeeded(pg, state);
         if (roles) return prepare(user.loginPath, () => emit(pg));
         emit(pg);
     }, state, true);
@@ -402,6 +390,7 @@ function create(pagepath, args, from, needroles) {
         }
         return alert(i18n`没有权限！`, 0);
     }
+    if (!pg) return;
     var _with_length = _with_elements.length;
     state.onback = function (handler) {
         _pageback_listener = handler;
@@ -442,7 +431,7 @@ function create(pagepath, args, from, needroles) {
 var zimoliid = 0, zimoliad = 0;
 function zimoli(pagepath, args, history_name, oldpagepath) {
     if (arguments.length === 0) {
-        if (zimoliid !== zimoliad) return;
+        if (zimoliid !== zimoliad && zimoli.caller === go) return;
         history_name = current_history;
         var _history = history[history_name] || [];
         root_path = _history[0] || "/main";

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -616,6 +616,7 @@
         已找到的字符串.is_loading = true;
         var addTranslate = function (translate) {
             if (!isHandled(translate)) return;
+            translate = translate.replace(/^\s*([\s\S]*?)([：\:]?\s*)$/, '$1');
             var tmap = textMap[translate];
             if (!tmap) tmap = textMap[translate] = Object.create(null), tmap["#count"] = 0;
             if (!tmap[e.path]) tmap[e.path] = [];
@@ -646,6 +647,9 @@
             var data = await readText(e);
             data = parseYML(data);
             loop: for (var d of data) {
+                for (var k in d) {
+                    d[k] = d[k].replace(/^\s*([\s\S]*?)([：\:]?\s*)$/, '$1');
+                }
                 var liang = 0, fanyi = {};
                 for (var { lang: k, id } of supports) {
                     if (!d[k]) continue;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.21.2",
+    "version": "4.21.4",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {