efront 4.34.1 → 4.35.1

package/coms/basic/pinyin_test.js

@@ -0,0 +1,40 @@
+var saved = 0, lack = false;
+
+var ck = function (c) {
+    var py = pinyin.pinyin(c);
+    var code = c.codePointAt(0);
+    if (py === c) {
+        if (code - saved > 1 && lack) console.log(String.fromCodePoint(saved), saved, saved.toString(16), 'end');
+        if (code - saved > 1 || !lack) {
+            console.log(c, code, code.toString(16), 'start');
+        }
+        lack = true;
+    }
+    else {
+        if (lack) {
+            console.log(String.fromCodePoint(saved), saved, saved.toString(16), 'end');
+        }
+        lack = false;
+    }
+    saved = code;
+}
+var check = function (start, end = start) {
+    if (typeof start === 'string') {
+        for (var c of start) ck(c);
+    }
+    else for (var cx = start, dx = end; cx <= dx; cx++) {
+        var c = String.fromCodePoint(cx);
+        ck(c);
+    }
+}
+check(0x3105, 0x3129);// 注音
+check(0x3400, 0x4dbf);// cjk扩充A
+check(0x4e00, 0x9fff);// cjk汉字
+check(0x20000, 0x2A6Df);// cjk 扩充B
+check(0x2A700, 0x2B73F);// cjk 扩充C
+check(0x2B740, 0x2B81F);// cjk 扩充D
+check(0x2B820, 0x2CEAF);// cjk 扩充E
+check(0x2CEB0, 0x2EBEF);// cjk 扩充F
+check(0x30000, 0x3134F);// cjk 扩充G
+check(0x31350, 0x323AF);// cjk 扩充H
+check(0x3ebf0, 0x3ee5F);// cjk 扩充I

package/coms/basic/wait.js

@@ -1,4 +1,4 @@
-async function wait(call, time = 80, step = +time >>> 4 | 1) {
+async function wait(call, time = 80, step = +time >>> 8 | 20) {
     var res;
     if (isFunction(call)) while (!(res = await call()) && time > 0) await new Promise(ok => setTimeout(ok, step)), time -= step;
     else res = new Promise(ok => setTimeout(ok, call));

package/coms/basic_/JSON.js

@@ -25,7 +25,7 @@ var scan_number = function (str, start) {
     return false;
 };
 var scan_null = function (str, start) {
-    var reg = /null|false|true/g;
+    var reg = /null|false|true|\-?Infinity/g;
     reg.lastIndex = start;
     var match = reg.exec(str);
     if (match && match.index === start) {
@@ -38,6 +38,13 @@ var scan_null = function (str, start) {
                 break;
             case "t":
                 data = true;
+                break;
+            case "I":
+                data = Infinity;
+                break;
+            case "-":
+                data = -Infinity;
+                break;
         }
         return reg.lastIndex;
     }
@@ -121,9 +128,14 @@ var _safeparse = function (str, start) {
         case "n":
         case "f":
         case "t":
+        case "I":
             start = scan_null(str, start);
             break;
         default:
+            if (str.charAt(start + 1) === 'I') {
+                start = scan_null(str, start);
+                break;
+            }
             start = scan_number(str, start);
     }
     if (start === false)
@@ -153,7 +165,8 @@ var stringify = function (object, filter, space) {
     var res = getString(object, filter, space);
     if (res.length) return res.join('');
 }
-var toString = strings.encode;
+var toString = strings?.encode;
+var keepNaN = false;
 /**
  * 
  * @param {object} object 
@@ -188,7 +201,8 @@ var getString = function (object, filter, space) {
                     return object;
                 }
             case "number":
-                if (isNaN(object) || object === Infinity) {
+                if (keepNaN) return String(object);
+                if (isNaN(object) || object === Infinity || object === -Infinity) {
                     object = null;
                 }
             case "boolean":
@@ -252,6 +266,12 @@ var getString = function (object, filter, space) {
     return result;
 };
 var JSON = {
+    toJS(o, f, t) {
+        keepNaN = true;
+        var r = stringify(o, f, t);
+        keepNaN = false;
+        return r;
+    },
     parse: parse,
     stringify: stringify
-};
+};

package/coms/compile/Html.js

@@ -220,6 +220,7 @@ Html.prototype.createScoped = function (code) {
                 }
                 if (noTag || !c.text) break;
                 var t = strings.decode(c.text);
+                if (color.isColor(t)) break;
                 var p = c.prev;
                 var pp = p && p.prev;
                 if (pp && isDynamic(pp.text)) {

package/coms/compile/Javascript.js

@@ -32,6 +32,7 @@ const {
     replace,
     skipAssignment,
     insertAfter,
+    insertBefore,
     pickSentence,
     unshort,
 } = require("./common");
@@ -51,6 +52,11 @@ class Javascript extends Program {
     forceend_reg = /^(return|yield|break|continue|debugger|async)$/;
     defaultType = EXPRESS;
     lbtype = true;
+    constructor() {
+        super();
+        this.powermap = Object.assign({}, this.powermap);
+        delete this.powermap["#"];
+    }
 }
 var propresolve_reg = /^(static|get|set|async|readonly|private|pub)$/;
 
@@ -474,10 +480,16 @@ function detour(o, ie) {
                 }
                 var text = o.text.replace(/^\.\.\./, '');
                 var hasdot = o.text.length !== text.length;
+                if (text === 'new.target') text = 'undefined';
                 if (context.avoidMap) {
                     var m = /^[^\.\[\]]+/.exec(o.text);
                     if (m) { context.avoidMap[m[0]] = true; }
                 }
+                var match = /^([^\#\.]*)\.#/.exec(text);
+                if (match) {
+                    var [, varname] = match;
+                    o.hidden = varname;
+                }
                 text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || context.strap_reg.test(a) || /#/.test(a) ? `[${strings.recode(a)}]` : _);
                 if (hasdot) text = "..." + text;
                 o.text = text;
@@ -586,6 +598,8 @@ function detour(o, ie) {
                 }
                 else if (o.queue.isClass) {
                     if (o.text === 'constructor') break;
+                    var hidden = /^#/.test(o.text);
+                    if (hidden) o.hidden = true;
                     var text = strings.recode(o.text);
                     if (o.prev) {
                         var prev = o.prev;

package/coms/compile/Javascript_test.js

@@ -45,8 +45,8 @@ testDetour('1.e-10.a', '1e-10["a"]')
 testDetour('1.e+10.a', '1e+10["a"]')
 testDetour('0x1.a', '0x1["a"]')
 testDetour('0b1.a', '0b1["a"]')
-testDetour('01.a', '0o1["a"]')
-testDetour('08.a', '08["a"]')
+testDetour('01 .a', '0o1["a"]')
+testDetour('08 .a', '08["a"]')
 testDetour('0o1.a', '0o1["a"]')
 testDetour('0o1n.a', '0o1n["a"]')
 testDetour('0o1m.a', '0o1m["a"]')
@@ -150,4 +150,5 @@ testStar(`var a=class {a=1\r\nasync * a(){
     }
 }}`, {});
 
-assert(scanner2(`#`)[0].type, common.STAMP)
+assert(scanner2(`#`)[0].type, common.EXPRESS)
+assert(scanner2(`1*2`)[1].type, common.STAMP)

package/coms/compile/Program.js

@@ -11,11 +11,8 @@ const {
     /* 512 */LABEL,
     /*1024 */PROPERTY,
     /*2048 */ELEMENT,
-    pickAssignment,
-    createString,
     setqueue,
     number_reg,
-    digit_reg,
 } = require("./common");
 var combine = require("../basic/combine");
 var sortRegster = require("../basic/sortRegister");
@@ -70,18 +67,37 @@ var setObject = function (o) {
     var needproperty = true;
     for (var cx = 0; cx < o.length; cx++) {
         var m = o[cx];
-        if (!needproperty) {
-            if (m.type === SCOPED && m.entry === '{') {
-                if (!m.isObject) setObject(m);
-                continue;
+        var { type } = m;
+        switch (type) {
+            case STAMP: switch (m.text) {
+                case ",":
+                    var p = m.prev;
+                    if (p?.type === PROPERTY) p.short = true;
+                    needproperty = true;
+                    continue;
+                case "...":
+                    needproperty = false;
+                    continue;
+                case ":":
+                case "=":
+                    var p = m.prev;
+                    if (p?.isprop) needproperty = false;
+                default:
+                    if (needproperty) m.isprop = true;
+                    continue;
             }
-            if (m.type !== STAMP || m.text !== ',') continue;
-        }
-        if (m.type === STAMP && m.text === ':') {
-            needproperty = false;
-            continue;
+            case SCOPED:
+                if (m.entry === "{") {
+                    if (!needproperty) {
+                        if (!m.isObject) setObject(m);
+                    }
+                    continue;
+                }
+                if (needproperty) m.isprop = true;
+                continue;
         }
-        if (m.type === LABEL) {
+        if (!needproperty) continue;
+        if (type === LABEL) {
             o.splice(cx, 0, o[++cx].prev = m.next = m.next.prev = new Node({
                 prev: m,
                 text: ':',
@@ -95,16 +111,26 @@ var setObject = function (o) {
             needproperty = false;
             continue;
         }
-        m.isprop = true;
-        if (m.type === EXPRESS || m.type === STRAP) {
-            if (!/\./.test(m.text)) m.type = PROPERTY;
-        }
-        if (m.prev && m.prev.type === PROPERTY) {
-            m.prev.type = STRAP;
+
+        if (type & (EXPRESS | STRAP)) {
+            m.isprop = true;
+            m.type = PROPERTY;
+            var p = m.prev;
+            if (p && p.type === PROPERTY) {
+                p.type = STRAP;
+            }
         }
     }
+    var last = o.last;
+    if (last?.type === PROPERTY) last.short = true;
 };
 
+var setIon = function (last, powermap) {
+    while (last && last.type === STAMP && powermap[last.text] !== powermap["="]) {
+        last.ion = true;
+        last = last.prev;
+    }
+};
 
 var spaceDefined = require("../basic/spaces");
 
@@ -134,18 +160,17 @@ class Program {
         ["{", "}"],
         ["<%", "%>"],
     ]
-    stamps = "/=+;|:?<>-!~%^&*,".split("");
+    stamps = "/=+;|:?<>-!'~%^&*,".split("");
     prefix = '&^%?:'.split('');
     value_reg = /^(false|true|null)$/
     number_reg = number_reg;
-    digit_reg = digit_reg;
     Code = Array;
     powermap = powermap;
     transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|default|instanceof|throw|extends|import|from)$/;
     straps = "if,for".split(',');
     colonstrap_reg = /^(case|default)$/;
     forceend_reg = /^(return|break|continue|end[psm])$/;
-    funcstrap_reg = /^(class|function|fn|func|async|interface|struct|enum|impl|pub)$/;
+    funcstrap_reg = /^(class|function|fn|func|async|interface|struct|enum|impl|pub|define)$/;
     extends_reg = /^(extends|implements)$/;
     structstrap_reg = /^(class|interface|struct|enum)$/;
     control_reg = /^(if|else|switch|case|do|while|for|loop|break|continue|default|import|from|as|export|try|catch|finally|throw|await|yield|return)$/;
@@ -337,22 +362,19 @@ class Program {
         var type_reg = this.type_reg;
         var digit_reg = this.digit_reg;
         var comment_entry = this.comment_entry;
-        var rowsOf = m => m.replace(/[^\r\n\u2028\u2029]+/g, ';').replace(/\r\n|\r|\n|\u2028|\u2029/g, ' ').replace(/;/g, '').length;
-        var setRows = m => {
-            row += rowsOf(m);
-            var reg = /[\r\n\u2028\u2029]/g;
+        var setRows = (m, start) => {
+            var reg = /(\r\n|\n|\r|\u2028|\u2029)/g;
             reg.lastIndex = 0;
             var index = 0;
             do {
-                index = reg.lastIndex;
+                row++;
                 var match = reg.exec(m);
+                if (match) index = match.index + match[0].length;
             } while (match);
+            row--;
             colstart = start + index - 1;
         };
         var queue_push = (scope) => {
-            if (scope.type & (SPACE | COMMENT | PIECE | QUOTED)) {
-                if (scope.text) setRows(scope.text);
-            }
             var last = queue.last;
             scope.queue = queue;
             scope.prev = last;
@@ -404,10 +426,10 @@ class Program {
                 if (powermap[o.text] > powermap["="]) o.unary = true;
             }
             else if (last.type === STRAP && !last.isend
-                || last.type === STAMP && !last.istype && !/^(\+\+|\-\-)$/.test(last.text)
+                || last.type === STAMP && !last.istype && (last.unary || powermap[last.text] < powermap["++"])
                 || last.type === SCOPED && !last.isExpress && !last.istype
             ) {
-                o.unary = /^[^=;,\:]$/.test(o.text);
+                o.unary = /^[^=;,\:']$/.test(o.text);
                 if (o.unary && /^(\+|\-)$/.test(o.text) && last && last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) o.unary = !!last.unary;
             }
             if (/^(\+\+|\-\-)$/.test(o.text)) {
@@ -419,6 +441,7 @@ class Program {
                     p = queue[queue.length - ++i];
                 }
                 o.unary = !p || p.type & (SPACE | STAMP | STRAP) || p.type === EXPRESS && p.prev && p.prev.type === STAMP && /^(\+\+|\-\-)$/.test(p.prev.text) && p.prev.unary;
+                if (!o.unary) o.ion = true;
             }
 
             if (!o.unary && /^(\.\.\.|\*)$/.test(o.text)) {
@@ -439,6 +462,9 @@ class Program {
             else if (powermap[o.text] > powermap.void && !o.unary) {
                 o.needle = true;
             }
+            if (!o.unary && last?.type & STAMP && (powermap[last.text] < powermap[o.text] || powermap[o.text] >= powermap["*"])) {
+                setIon(last, powermap);
+            }
             queue_push(cache_stamp);
             if (cache_stamp.istype && cache_stamp.unary && powermap[cache_stamp.text] == powermap[":"]) cache_stamp.unary = false;
             if (cache_stamp === queue.last && cache_stamp.isExpress && cache_stamp.text in powermap && !cache_stamp.needle) queue.inExpress = true;
@@ -474,7 +500,6 @@ class Program {
                 last.end = end;
                 return;
             }
-
             var scope = new Node({
                 type,
                 start,
@@ -484,6 +509,9 @@ class Program {
                 isExpress: queue.inExpress,
                 text: m
             });
+            if (type & (SPACE | COMMENT | PIECE | QUOTED)) {
+                if (m) setRows(m, start);
+            }
             lasttype = type;
             if (type === STAMP) {
                 cache_stamp = scope;
@@ -696,6 +724,7 @@ class Program {
                 return;
             }
             var scope = queue;
+            setIon(scope.last, powermap);
             queue = parents.pop();
             queue_push(scope);
             lasttype = scope.type;
@@ -705,9 +734,9 @@ class Program {
             if (index > start) {
                 var piece = queue[queue.length - 1];
                 if (piece && piece.type === PIECE) {
-                    row -= rowsOf(piece.text);
+                    var pend = piece.end;
                     piece.text = text.slice(piece.start, index);
-                    setRows(piece.text);
+                    setRows(text.slice(pend, index), pend);
                     piece.end = index;
                 }
                 else {
@@ -822,10 +851,11 @@ class Program {
 
             var start = entry_reg.lastIndex = index;
             var match = entry_reg.exec(text);
-            if (!match) return null;
+            if (!match) throw console.log(text.charCodeAt(index), text.charAt(index), start, index, text.length), new Error('编译器内部异常');
             var end = match[0].length + match.index;
             index = end;
             var m = match[0];
+            if (!m) throw console.log(m, match.index), new Error('编译器内部异常，解析错误');
             if (cache_stamp && !stamp_reg.test(m)) push_stamp();
             var last = cache_stamp || queue.last;
 
@@ -854,6 +884,7 @@ class Program {
                     }
                 }
                 else if (stamp_reg.test(m) && last) {
+                    if (!quote.tag && lasttype === EXPRESS) break test;
                     if (last.type === STAMP && last === cache_stamp && powermap.hasOwnProperty(last.text + m)) break test;
                     if (last.istype || last.isprop || last.isargl) {
                         isTypeTag = true;
@@ -945,6 +976,7 @@ class Program {
                 queue.inExpress = true;
                 queue.end = index;
                 queue.text = text.slice(start, index);
+                setRows(queue.text, start);
                 pop_parents();
                 continue;
             }
@@ -1133,7 +1165,7 @@ class Program {
             if (this.scope_leave[m] && queue.entry === this.scope_leave[m]) {
                 if (last?.type === PROPERTY) {
                     var lp = last.prev;
-                    if (!lp || lp.type === STAMP && lp.text === ',') last.short = true;
+                    if (!lp && queue.isObject || lp?.type === STAMP && lp.text === ',') last.short = true;
                 }
 
                 queue.end = end;
@@ -1146,11 +1178,7 @@ class Program {
                 var last = queue.last;
                 if (!stamp_reg.test(m) || last && !last.isExpress) 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)
+                    i18n`\r\n文件位置：`, this.mindpath + ":" + `${row}`,
                 );
             }
             save(STAMP);
@@ -1173,10 +1201,9 @@ class Program {
         if (queue !== origin) {
             var last = queue.last || queue;
             console.warn(
-                "代码异常结束", createString(origin.slice(0, 30)),
+                "代码异常结束",
                 `\r\n - 祖先标记: ${parents.slice(1).map(p => `${p.entry || ""}<red2>${p.tag || p.text || ""}</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 = "代码异常结束";
@@ -1184,6 +1211,7 @@ class Program {
                 pop_parents();
             }
         }
+        setIon(origin.last, powermap);
         return origin;
     }
     commit() {
@@ -1250,7 +1278,16 @@ class Program {
         this.prefix_reg = prefix_reg;
         var numbers = number_reg.source.replace(/^\^|\$$/g, "");
         this.digit_reg = new RegExp(/^[+\-]?/.source + numbers, number_reg.flags);
-        this.entry_reg = new RegExp([`${spaceDefined.reg.source}|${quotes_entries}|${scopes}|${numbers}(?:${spaceDefined.avoid(tokens)})*|${express}|${powers_entries}|[${stamps}]`], "gi");
+        this.entry_reg = new RegExp([
+            spaceDefined.reg.source,
+            quotes_entries,
+            scopes,
+            numbers,
+            `(?:${spaceDefined.avoid(tokens)})+`,
+            express,
+            powers_entries,
+            stamps && `[${stamps}]`
+        ].filter(a => !!a).join("|"), "gi");
         var stamps = this.stamps.slice();
         for (var k in this.powermap) {
             if (k.length === 1 && stamps.indexOf(k) < 0) stamps.push(k);