efront 4.35.8 → 4.36.1

package/coms/basic/math_test.xht

@@ -34,6 +34,16 @@
         }
     </div>
 </p>
+<p>
+    <h2>
+        求根公式
+    </h2>
+    <div>
+        ${
+            math`x=(-b+-sqrt(b**2-4*a*c))/(2*a)`
+        }
+    </div>
+</p>
 <p>
     ${
         math`cos(theta,2)*E+(1 - cos(theta))*K'*K+sin(theta)*[0,-K_2,K_1;K_2,0,-K_0;-K_1,K_0,0]`

package/coms/basic/refilm_decode.js

@@ -272,28 +272,26 @@ var getComment = function (piece) {
     return '';
 };
 function spreadkey(name) {
-    if (/^\([\s\S]*\)$/.test(name) && /,/.test(name)) {
-        var [, name, rest_piece] = /^([\s\S]*?),([^\]]*)$/.exec(name.slice(1, name.length - 1));
+    var repeat = /^\[/.test(name) ? true : void 0;
+    if (/^\([\s\S]*\)$|^\[[\s\S]*\]$/.test(name)) {
+        name = name.slice(1, name.length - 1);
+        if (/,/.test(name)) var [, name, rest_piece] = /^([\s\S]*?),([^\]]*)$/.exec(name);
     }
-    if (/^\[[\s\S]*\]$/.test(name)) {
-        repeat = true;
-        name = name.replace(/^\[|\]$/g, '');
-        if (/\,/.test(name)) {
-            var commaindex = name.indexOf(",");
-            var endwith = parseKV(name.slice(commaindex + 1));
+    if (repeat) {
+        if (rest_piece) {
+            var endwith = parseKV(rest_piece);
             endwith = parseValue(endwith);
-            name = name.slice(0, commaindex);
         }
     }
     var [name, key, holder] = scanSlant(name, '/', 0, name.length + 1);
-    if (rest_piece) {
+    if (!repeat && rest_piece) {
         if (rest_piece && !/=/.test(rest_piece)) {
             var needs = { [key || name]: parseValue(rest_piece) };
         } else {
             var needs = scanNeeds(rest_piece);
         }
     }
-    return [name, key, needs, holder];
+    return [name, key, needs, holder, repeat, endwith];
 }
 function parseOptions(size, options) {
     if (typeof options === "string" && !/^[\$&]+\d+$/.test(options)) {
@@ -394,7 +392,7 @@ function parse(piece) {
                     last_type = type;
                 }
             }
-            [name, key, needs, holder] = spreadkey(name);
+            [name, key, needs, holder, repeat, endwith] = spreadkey(name);
             if (key === undefined && !/^(title|label|headline)$/i.test(type)) key = name;
         }
         var value = /\/?\=([^\/\\]+)/.exec(type);
@@ -405,10 +403,10 @@ function parse(piece) {
             if (d & 0b111 === 0) type = (d >>> 3) + 'byte/' + t;
             else type = d + 'bit/' + t;
         }
-        var sizematch = /^(\-?\d+|\-?\d*\.\d+)?([YZEPTGMK]i?b?|bytes?|bits?|words?|dword|real[48]|long|B|[^\/]*)([\/]|$|\s|\=)/i.exec(type);
+        var sizematch = !/^\:/.test(type) && /^(\-?\d+|\-?\d*\.\d+)?([YZEPTGMK]i?b?|bytes?|bits?|words?|dword|real[48]|long|B|[^\/]*)([\/]|$|\s|\=)/i.exec(type);
         if (!sizematch[1] && /^\$\d/.test(sizematch[2])) sizematch = null;
         if (sizematch) {
-            var [size_text, size = 1, unit, eq] = sizematch;
+            var [size_text, size, unit, eq] = sizematch;
             if (unit && /^i?b?$/i.test(unit.slice(1))) {
                 let ratio = KMGT.indexOf(unit.toUpperCase().charAt(0));
                 size *= Math.pow(1024, ratio + 1);
@@ -470,7 +468,7 @@ function parse(piece) {
             var size = /^\:[^\/\:\-\,\/]+/.exec(type)[0];
             type = type.slice(size.length + 1);
             if (!type) {
-                type = size.slice(1);
+                type = "bytes";
             }
         } else if (/^[\/]/.test(type)) {
             type = type.slice(1);
@@ -485,9 +483,9 @@ function parse(piece) {
         key = is(key);
     }
     else if (typeof name === 'string') {
-        [name, key = name, needs, holder] = spreadkey(name);
+        [name, key = name, needs, holder, repeat, endwith] = spreadkey(name);
     }
-    if (typeof size === 'string') size = parseFloat(size);
+    if (typeof size === 'string' && !/^\:/.test(size)) size = parseFloat(size);
     if (unit === type) unit = '';
     var field = {
         name, type, key, value, comment, options,
@@ -504,7 +502,11 @@ function parse(piece) {
     };
     var parent = piecepath[piecepath.length - 1];
     if (parent) {
-        field.parent = parent;
+        Object.defineProperty(field, 'parent', {
+            value: parent,
+            configurable: true,
+            enumerable: false
+        });
         if (parent.options) {
             parent.options.push(field);
         } else {

package/coms/basic/refilm_parse.js

@@ -106,7 +106,6 @@ var getUnaryRest = function (buff, index, flag) {
     var binc = index * 8;
     var savedb = binc;
     do {
-
         var i = binc / 8 | 0;
         var b = binc - i * 8;
         if (i >= buff.length) break;
@@ -127,7 +126,7 @@ var readFromIndex = function (data, index, offset) {
         byteOffset++;
         bitOffset = 8 - bitOffset;
     }
-    var bytes = data.slice(byteIndex, byteOffset);
+    var bytes = data.subarray(byteIndex, byteOffset);
     if (bitOffset > 0 || bitIndex > 0) bytes = bytes.map(copy);
     if (bitOffset > 0) {
         bytes[bytes.length - 1] = bytes[bytes.length - 1] >> bitOffset << bitOffset;
@@ -139,7 +138,7 @@ var readFromIndex = function (data, index, offset) {
         bytes[bytes.length - 1] = bytes[bytes.length - 1] << bitIndex;
     }
     if (bitIndex + bitOffset >= 8) {
-        bytes = bytes.slice(0, bytes.length - 1);
+        bytes = bytes.subarray(0, bytes.length - 1);
     }
     return bytes;
 };
@@ -232,13 +231,13 @@ function refilm_parse(data, start = 0) {
                 bytes = readFromIndex(data, index, offset);
                 value = bufferToUTF8String(bytes, 0);
             }
-            else if (/^(small|little|small-end|litte-end|end)$/i.test(field.type)) {
+            else if (/^(small|little|small-end|litte-end|end|le)\d*$/i.test(field.type)) {
                 value = numberFromSmallEnd(value);
             }
             else if (/^(string|str)$/i.test(field.type)) {
                 value = bufferToUTF8String(value);
             }
-            else if (/^num$|^number$|^int$|^integer$|^float$|^uint$/i.test(field.type)) {
+            else if (/^(num|number|int|integer|float|uint|double|real)\d*$/i.test(field.type)) {
                 value = numberFromBuffer(value, 0, field.size * field.ratio * 8);
             }
             else if (/^bool$|^boolean$/i.test(field.type)) {
@@ -248,7 +247,7 @@ function refilm_parse(data, start = 0) {
                 value = 1 + numberFromBuffer(value, 0, field.size * field.ratio * 8);
             }
             else {
-                value = bytes.map(copy);
+                value = bytes;
             }
             index = offset;
         }
@@ -268,7 +267,7 @@ function refilm_parse(data, start = 0) {
     };
     var readone = function (field) {
         var inc = 0;
-        var value = read(field, inc);
+        var value = read(field, field.repeat && inc);
         if (field.repeat) {
             var result = [value];
             var { size } = field;

package/coms/basic/strings.js

@@ -10,8 +10,17 @@ var escapeMap = {
 };
 var unescapeFun = a => escapeMap[a];
 var unescapeUnc = function (a) {
-    if (escapeMap.hasOwnProperty(a)) return escapeMap[a];
-    var code = a.charCodeAt(0).toString(16);
+    if (a.length !== 1) a: {
+        var a1 = a[1];
+        if (escapeMap.hasOwnProperty(a1)) {
+            return escapeMap[a1];
+        }
+        var code = a1.charCodeAt(0);
+        if (code <= 0x001f || code >= 0x80) break a;
+        return a;
+    }
+    else if (escapeMap.hasOwnProperty(a)) return escapeMap[a];
+    else var code = a.charCodeAt(0).toString(16);
     switch (code.length) {
         case 1:
             return "\\u000" + code;
@@ -27,9 +36,13 @@ var unescapeMap = {
 };
 for (var k in escapeMap) unescapeMap[escapeMap[k]] = k;
 var unescapeReg = new RegExp(`[${Object.keys(escapeMap).map(a => escapeMap[a]).join('')}]`, 'g');
+function escape(str) {
+    str = str.replace(/\\[\s\S]|[\r\n\t\v\f\u0008\u0000-\u001f\u007f-\uffff]/g, unescapeUnc);
+    return str;
+}
 function encode(str, q = "\"", escapeUnicode = true) {
     str = str.replace(new RegExp(`[\\\\${q}]`, 'g'), "\\$&");
-    if (escapeUnicode) str = str.replace(/[\r\n\t\v\f\u0008\u0000-\u001f\u007f-\uffff]/g, unescapeUnc);
+    if (escapeUnicode) str = escape(str);
     else str = str.replace(unescapeReg, unescapeFun);
     return q + str + q;
 }
@@ -73,10 +86,34 @@ function decode(s, singleSlash) {
     if (!r) return s;
     return kicode(r[2], singleSlash ? r[1] : null);
 }
-
+var forbiddens = {
+    "极兔与狗": "jtexpress.cn",
+    "狗府与狗共": "gov.cn",
+    "淘宝与狗": "taobao.com",
+    "支付宝与狗": "alipay.com",
+    "华为与狗": "huawei.com",
+    "京东与狗": "jd.com",
+    "美团与狗": "meituan.com",
+    "美团公司与狗": "sankuai.com",
+    "腾讯与狗": "tencent.com",
+    "QQ团队与狗": "qq.com",
+    "微信团队与狗": "wechat.com",
+};
+var regs = recode.name === 'recode' ? [] : Object.keys(forbiddens).map(k => {
+    var r = forbiddens[k];
+    r = new RegExp("(?:^|\\:|\\/\\/|\\.)" + escapeRegExp(r) + "(\\/|$\\:)", 'i');
+    r.name = k;
+    return r;
+});
 function recode(s, singleSlash) {
     s = decode(s, singleSlash);
-    s = encode(s);
+    for (var r of regs) {
+        if (r.test(s)) {
+            s = r.name + "不得使用";
+            console.error(s);
+        }
+    }
+    s = encode(s, '"', false);
     return s;
 }
-export { encode, decode, recode, kicode, uncode };
+export { encode, decode, recode, escape, kicode, uncode };

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|\-?Infinity/g;
+    var reg = /null|false|true|\-?Infinity|NaN/g;
     reg.lastIndex = start;
     var match = reg.exec(str);
     if (match && match.index === start) {
@@ -45,6 +45,9 @@ var scan_null = function (str, start) {
             case "-":
                 data = -Infinity;
                 break;
+            case "N":
+                data = NaN;
+                break;
         }
         return reg.lastIndex;
     }
@@ -129,6 +132,7 @@ var _safeparse = function (str, start) {
         case "f":
         case "t":
         case "I":
+        case "N":
             start = scan_null(str, start);
             break;
         default:

package/coms/compile/Html.js

@@ -135,7 +135,27 @@ var property = new Program;
 property.stamps = "=".split('');
 var progExp = new Javascript;
 var replaceISO8859 = function (data) {
-    return String(data).replace(/<\!--([\s\S]*)--\>$/g, '$1').replace(/&\w+;/g, a => iso8859[a] || a).replace(/&#(\d+);/g, (_, a) => String.fromCodePoint(a))
+    return String(data)
+        .replace(/<\!--([\s\S]*)--\>$/g, '$1')
+        .replace(/&\w+;/g, a => iso8859[a] || a)
+        .replace(/&#([0-9a-f]+);/ig, (_, x, a) => {
+            if (x) switch (x) {
+                case "u":
+                    a = parseInt(a, 16);
+                    break;
+                case "x":
+                    a = parseInt(a, 16);
+                    break;
+                case "b":
+                    a = parseInt(a, 2);
+                    break;
+                case "o":
+                    a = parseInt(a, 8);
+                    break;
+            }
+            else a = +a;
+            return String.fromCodePoint(a);
+        });
 };
 var parseExpress = function (data, mayberepeat) {
     if (mayberepeat && /\s+(in|of)\s+/.test(data)) {

package/coms/compile/Program.js

@@ -1031,7 +1031,9 @@ class Program {
                 else if (type_reg.test(m)) {
                     last.istype = true;
                 }
-                if (this.transive_reg.test(m)) {
+                var power = powermap[m];
+                last.unary = power >= powermap.new;
+                if (this.transive_reg.test(m) || power >= 0) {
                     last.transive = queue.inExpress = true;
                 }
                 else {
@@ -1079,8 +1081,12 @@ class Program {
 
             if (scope_entry[m]) scope: {
                 if (stamp_reg.test(m)) {
+                    if (cache_stamp) {
+                        if (cache_stamp.text + m in powermap) break scope;
+                        push_stamp();
+                    }
                     var last = queue.last;
-                    if (last) {
+                    if (last && last.type & ~(STAMP | STRAP) && !last.ion) {
                         if (last.isExpress && !last.istype) break scope;
                     }
                 }
@@ -1099,7 +1105,7 @@ class Program {
                         if (last.type !== STAMP || last.text !== "=>") {
                             var classed = queue.classed;
                             var clsd = classed.pop();
-                            scope.isClass = true;
+                            scope.isClass = /^(class|interface)$/.test(clsd);
                             if (!classed.length) queue.classed = null;
                             scope.istype = clsd !== 'class';
                             scope.extend += extends_reg.test(last.text);

package/coms/compile/common.js

@@ -287,6 +287,21 @@ var getContitionHeadBeforeScoped = function (p, nodo) {
             return getIfElseHead(pp);
     }
 };
+var getClassHeadBeforeScoped = function (p) {
+    var i = 0;
+    while (p && p.isClass) {
+        p = p.prev;
+        i++;
+    }
+    while (p && i > 0) {
+        var o = p;
+        if (p.type === STRAP && /^(class|interface)$/.test(p.text)) {
+            i--;
+        }
+        p = p.prev;
+    }
+    return o;
+}
 var getFunctionHeadBeforeScoped = function (p) {
     var pp = getprev(p);
     if (pp && pp.type === EXPRESS) pp = getprev(pp);
@@ -1282,9 +1297,25 @@ var getSemicolonBetween = function (prev, next) {
         }
         return;
     }
+    if (prev.brace) {
+        if (pp.type === SCOPED && pp.entry === '(' ||
+            pp.type === STAMP && pp.text === '=>'
+        ) pp = getFunctionHeadBeforeScoped(pp);
+        else if (prev.isClass) {
+            pp = getClassHeadBeforeScoped(prev);
+        }
+        else pp = null;
+        if (pp) pp = getprev(pp);
+        if (!pp) return;
+        if (pp.type === STAMP && (
+            !/^([,;]|\+\+|\-\-)$/.test(pp.text)
+            || pp.unary
+        ) || pp.type === STRAP && pp.transive && !pp.isend) return ';';
+        return;
+    }
     if (prev.type === STRAP) {
         if ((STRAP | EXPRESS | VALUE | QUOTED) & next.type) return " ";
-        if (next.type === LABEL) return ";";
+        if (next.type === LABEL) return /^(do|else|try|catch|finally)$/.test(prev.text) ? " " : ";";
     }
 }
 var needBreakBetween = function (prev, next) {
@@ -1475,7 +1506,7 @@ var createString = function (parsed) {
                 var prev = getprev(o);
                 if (patchspace && !intag && prev && o.type !== QUOTED && (lasttype === STAMP && !prev.unary && !prev.needle
                     || lasttype & ~(SPACE | STAMP | COMMENT) && o.brace
-                    || lasttype === STRAP && !/^(this|arguments|import)$/.test(prev.text)
+                    || lasttype === STRAP && !/^(this|arguments|import)$/.test(prev.text) && (!prev.unary || o.brace)
                 )) result.push(" ");
                 result.push(o.entry);
                 if (o.length > 0) {
@@ -1554,6 +1585,10 @@ var createString = function (parsed) {
         lasttype = o.type;
     };
     parsed.forEach(run);
+    var pend = parsed[parsed.length - 1];
+    if (pend?.type === COMMENT && /^\/\//.test(pend.text)) {
+        finalresult.push('\r\n');
+    }
     return finalresult.join("");
 }
 var rename = function (used, from, to) {

package/coms/compile/common_test.js

@@ -60,3 +60,51 @@ assert(common.number_reg.test("1.1920928955078125e-07F"), true)
 assert(new RegExp(common.number_reg.source.replace(/^\^|\$$/g, ''), 'ig').exec("00080000h"), ["00080000h"])
 assert(new RegExp(common.number_reg.source.replace(/^\^|\$$/g, ''), 'ig').exec("2A3h"), ["2A3h"])
 assert(new RegExp(common.number_reg.source.replace(/^\^|\$$/g, ''), 'ig').exec("1.1920928955078125e-07F"), ["1.1920928955078125e-07F"])
+function testCrateString(text, want = text) {
+    var code = scanner2(text);
+    code.keepspace = false;
+    var res = common.createString(code);
+    assert(res, want);
+}
+testCrateString('else\r\na:{break a}', 'else a:{break a}')
+testCrateString('do\r\na:{break a}', 'do a:{break a}')
+testCrateString('try\r\na:{break a}', 'try a:{break a}')
+testCrateString('finally\r\na:{break a}', 'finally a:{break a}')
+testCrateString('catch\r\na:{break a}', 'catch a:{break a}')
+testCrateString(
+    'a = function () {}\r\n a: do { break a } white(true)',
+    'a=function(){};a:do{break a}white(true)'
+)
+testCrateString(
+    'function a() {}\r\nreturn',
+    'function a(){}return'
+)
+testCrateString(
+    'a = function () {}()\r\n return',
+    'a=function(){}();return'
+)
+testCrateString(
+    'a = class{}\r\n return',
+    'a=class{};return'
+)
+testCrateString(
+    'class a{}\r\n return',
+    'class a{}return'
+)
+testCrateString(
+    'class a extends class b{}{}\r\n return',
+    'class a extends class b{}{}return'
+)
+testCrateString(
+    'new class a extends class b{}{}\r\n return',
+    'new class a extends class b{}{};return'
+)
+testCrateString(
+    'new class a extends function b(){}{}\r\n return',
+    'new class a extends function b(){}{};return'
+)
+testCrateString(
+    'new class a extends()=>{}{}\r\n return',
+    'new class a extends()=>{}{};return'
+)
+testCrateString('if(true){}a:do{break a}white(true)')

package/coms/compile/namekill.js

@@ -0,0 +1,13 @@
+function till(kill, i, arr) {
+    var s = kill = "_" + i + kill.replace(/[&\^%\?@#\\]/g, '_');
+    var i = 1;
+    while (kill in this) {
+        kill = s + "_" + i++;
+    }
+    return kill;
+}
+module.exports = function nametill(names, prevent) {
+    prevent = Object.create(prevent);
+    names.forEach(n => prevent[n] = true);
+    return names.map(till, prevent);
+}

package/coms/compile/powermap.js

@@ -12,7 +12,7 @@ var powermap = {
     'instanceof,in,==,>=,<=,>,<,!=,!==,===,!in,!instanceof'/* 6 */,
     '>>,>>>,<<'/* 7 */, '+,-'/* 8 */, '*,/,%,\\'/* 9 */, '**'/* 10 */,
     '++,--'/* 11 */,
-    "typeof,await,yield,delete,void,..."/*12*/,
+    "typeof,import,await,yield,delete,void,..."/*12*/,
     "',!,~,#,new"/* 13 */,
     "::,?.,->,."/*14*/,
 ].forEach((pp, i) => {

package/coms/compile/scanner2.js

@@ -4,6 +4,7 @@ var createShortList = function (keys, prevent) {
     return createShortName(keys.length, prevent);
 };
 var renameHashName = require("./nametill");
+var renameBothName = require('./namekill');
 var createNameList = createShortList;
 var Html = require("./Html");
 var Javascript = require("./Javascript");
@@ -190,11 +191,16 @@ class Code extends Array {
         createNameList = createShortList;
     }
     // 压缩
-    press(keepspace) {
+    press(keepspace, pressMethod) {
         this.keepspace = keepspace;
         this.pressed = true;
         this.helpcode = false;
-        compress(this.scoped);
+        if (pressMethod < 0) {
+            createNameList = renameBothName;
+            compress(this.scoped);
+            createShortList = createShortList;
+        }
+        else compress(this.scoped);
         return this;
     }
     getNodeAt(row, col) {