efront 4.21.3 → 4.22.0

package/coms/basic/refilm.js

@@ -35,7 +35,10 @@ var writeField = refilm.writeField = function (data, field, value, offset = fiel
         var limit = byteLimit;
         while (limit-- > 0) {
             v.push(value & 0xff);
-            value = value >>> 8;
+            if (limit >= 4) {
+                value = value / 256;
+            }
+            else value = value >>> 8;
         }
         if (value) throw new Error(i18n`数据过大`);
         value = v;
@@ -56,21 +59,37 @@ var writeFields = refilm.writeFields = function (data, fields, values, offset =
 };
 var toint = function (buf) {
     var n = 0;
-    for (var cx = 0, dx = buf.length; cx < dx; cx++) {
-        n += buf[cx] << (cx << 3);
+    if (buf.length >= 7 && (buf[7] || buf[6] > 0x1f)) return buf;
+    switch (buf.length) {
+        default:
+        case 3:
+            n |= buf[2] << 16;
+        case 2:
+            n |= buf[1] << 8;
+        case 1:
+            n |= buf[0];
+        case 0:
+    }
+    for (var cx = 3, dx = buf.length; cx < dx; cx++) {
+        n += buf[cx] * 2 ** (cx << 3);
     }
     return n;
 };
-var readField = refilm.readField = function (data, field, offset = field.offset, size = field.size * field.ratio) {
+var readBuffer = refilm.readBuffer = function (data, field, offset = field.offset, size = field.size * field.ratio) {
     return data.slice(offset, offset + size);
 };
 
+var readField = refilm.readField = function (data, field, offset, size) {
+    var v = readBuffer(data, field, offset, size);
+    if (/^([us]?int|byte|word|dword|qword|long)/i.test(field.type)) v = toint(v);
+    return v;
+};
+
 refilm.readFields = function (data, fields, offset = fields.offset || 0) {
     var res = Object.create(null);
     for (var f of fields) {
         var size = f.size * f.ratio;
         var v = readField(data, f, offset, size);
-        if (size <= 4) v = toint(v);
         res[f.key] = v;
         offset += size;
     }

package/coms/basic/refilm_decode.js

@@ -1,7 +1,7 @@
 "use ./KMGT.txt"
 function scanBlock(piece) {
     if (!piece) return [];
-    var reg = /\\[\s\S]|^\s*[#\-]\s*|\s+|"|'/mg;
+    var reg = /\\[\s\S]|^\s*[#\-]\s*|\s+|"|'|\^/mg;
     var res = [];
     var lastIndex = 0;
     var save = function (a) {
@@ -18,13 +18,19 @@ function scanBlock(piece) {
         });
         res.push(a);
     };
+    var avoid = false;
     for (var cx = 0, dx = piece.length; cx < dx; cx++) {
         reg.lastIndex = cx;
         var m = reg.exec(piece);
         if (m) {
             var s = m[0];
-            if (/^\s+$/.test(s)) {
-                save(piece.slice(lastIndex, reg.lastIndex));
+            if (/^(\s+|\^)$/.test(s)) {
+                if (s === '^') {
+                    avoid = res.length;
+                }
+                else {
+                    save(piece.slice(lastIndex, reg.lastIndex));
+                }
                 lastIndex = reg.lastIndex;
             } else if (/^["']$/i.test(s)) {
                 var i = piece.indexOf(s, cx + 1);
@@ -39,6 +45,7 @@ function scanBlock(piece) {
             break;
         }
     }
+    if (avoid !== false) res.avoid = avoid;
     return res;
 }
 
@@ -262,7 +269,22 @@ function spreadkey(name) {
     }
     return [name, key, needs, holder];
 }
+function parseOptions(options) {
+    if (typeof options === "string" && !/^[\$#]+\d+$/.test(options)) {
+        var needUnfold = /^\[|\]$/.test(options);
+        options = options.replace(/^\[|\]$/g, '');
+        if (needUnfold || /,/.test(options)) options = scanSlant(options, ',');
+        else options = scanSlant(options, "");
+        if (needUnfold) unfoldOptions(size, options);
+    }
+    return options;
+}
 function parse(piece) {
+    var avoid1 = null;
+    if (piece.avoid != null) {
+        avoid1 = piece[piece.avoid];
+        piece.splice(piece.avoid, 1);
+    }
     if (/^[\-#]+$/.test(piece[0])) {
         var piece0 = piece.pop();
         piece[0] = piece0 + (piece[0] || '').trim();
@@ -293,7 +315,8 @@ function parse(piece) {
             holder,
             do: action,
             editable,
-            needs, checks, repeat, endwith,
+            avoid,
+            needs, valid, repeat, endwith,
             required, inlist, hidden, readonly,
             delete_onempty, delete_onsubmit,
         } = name;
@@ -338,9 +361,13 @@ function parse(piece) {
             [name, key, needs, holder] = spreadkey(name);
             if (key === undefined && !/^(title|label|headline)$/i.test(type)) key = name;
         }
-        if (/^[a-z\d]+\/?\d+$/i.test(type)) {
+        var value = /\/?\=([^\/\\]+)/.exec(type);
+        if (value) type = type.slice(0, value.index) + type.slice(value.index + value[0].length), value = parseValue(value[1]);
+        if (/^[a-z]+(\d+|\d*\/\d+)$/i.test(type)) {
             let [_, t, d] = /^(\w*?)\/?(\d+)$/.exec(type);
-            type = d + 'bit/' + t;
+            if (_.length === t.length + d.length) t = _;
+            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);
         if (!sizematch[1] && /^\$\d/.test(sizematch[2])) sizematch = null;
@@ -412,18 +439,12 @@ function parse(piece) {
         } else if (/^[\/]/.test(type)) {
             type = type.slice(1);
         }
-        if (typeof options === "string" && !/^[\$#]+\d+$/.test(options)) {
-            var editable = false;
-            if (/^[\+\-\*]|[\+\-\*]$/.test(options)) {
-                editable = true;
-                options = options.replace(/^[\+\-\*]|[\+\*\-]$/g, '');
-            }
-            var needUnfold = /^\[|\]$/.test(options);
-            options = options.replace(/^\[|\]$/g, '');
-            if (needUnfold || /,/.test(options)) options = scanSlant(options, ',');
-            else options = scanSlant(options, "");
-            if (needUnfold) unfoldOptions(size, options);
+        if (typeof options === 'string' && /^[\+\-\*]|[\+\-\*]$/.test(options)) {
+            editable = true;
+            options = options.replace(/^[\+\-\*]|[\+\*\-]$/g, '');
         }
+        options = parseOptions(options);
+        avoid = parseOptions(avoid1 || avoid);
         name = is(name);
         key = is(key);
     }
@@ -436,8 +457,9 @@ function parse(piece) {
         name, type, key, value, comment, options,
         editable,
         size, unit, ratio, holder,
-        needs, checks, repeat, endwith,
+        needs, valid, repeat, endwith,
         required, inlist, hidden, readonly,
+        avoid,
         do: action,
         delete_onempty, delete_onsubmit,
     };
@@ -477,11 +499,13 @@ function refilm_decode(str) {
             if (!m) break;
             var piece = s.slice(lastIndex, m.index);
             piece = scanBlock(piece);
+            if (piece.avoid != null) {
+                rest.avoid = rest.length + piece.avoid;
+            }
+            if (piece) rest.push.apply(rest, piece);
             if (m[0].length || cx + 1 === dx) {
-                result.push(rest.concat(piece));
-                rest.splice(0, rest.length);
-            } else {
-                if (piece) rest.push.apply(rest, piece);
+                result.push(rest);
+                rest = [];
             }
             lastIndex = m.index + m[0].length;
         } while (lastIndex < s.length);

package/coms/basic/refilm_decode_test.js

@@ -6,6 +6,7 @@ var test = function (fields, key, expect) {
     if (!valid) console.log(fields)
 };
 test(refilm`启动时间/time $1`, 'key', 'time');
+test(refilm`启动时间/time int64/=1`, 'type', 'int64');
 test(refilm`启动时间/time $1`, 'type', '$1');
 test(refilm`启动时间/time ${test}`, 'key', "time");
 test(refilm`启动时间/time ${test}`, 'type', test);
@@ -17,3 +18,7 @@ test(refilm`连城剑法 别名 [唐诗剑法,躺尸剑法]`, ['options', 1, 'na
 test(refilm`连城剑法 别名 [唐诗剑法,躺尸剑法]`, ['options', 1, 'key'], "躺尸剑法");
 test(refilm`连城剑法 别名 [唐诗剑法,躺尸剑法]`, ['options', 1, 'value'], 1);
 test(refilm`连城剑法 别名 [唐诗剑法/0,躺尸剑法/1]`, ['options', 1, 'key'], 1);
+test(refilm`连城剑法 别名 ^[唐诗剑法/0,躺尸剑法/1]`, ['avoid', 1, 'key'], 1);
+test(refilm`连城剑法 别名 [唐诗剑法/0,躺尸剑法/1] ^[a,b]`, ['options', 1, 'key'], 1);
+test(refilm`连城剑法 别名 [唐诗剑法/0,躺尸剑法/1] ^[a,b]`, ['avoid', 1, 'key'], 'b');
+test(refilm`连城剑法 别名 [唐诗剑法/0,躺尸剑法/1] ^${[{ key: 'a' }, { key: 'c' }]}`, ['avoid', 1, 'key'], 'c');

package/coms/basic/valid.js

@@ -14,6 +14,10 @@ function valid(field, data) {
         }
         return;
     }
+    if (field.avoid) for (var a of field.avoid) {
+        if (a === data) continue;
+        if (a[field.key] === data[field.key]) return i18n`已存在${field.name}为${data[field.key]}的项`;
+    }
     var tmp = validators[field.type];
     if (tmp) {
         var value = data[field.key];

package/coms/basic_/&Array.js

@@ -1,67 +1,82 @@
-var hasOwnProperty = {}.__proto__ === Object ? function (k) {
+var hasOwnProperty = {}.__proto__ === Object.prototype ? function (k) {
     var proto = this.__proto__;
     return k in this && (!proto || !(k in proto));
 } : Object.prototype.hasOwnProperty;
 var setPrototypeOf = Object.setPrototypeOf;
+var wrapMethod = function (f) {
+    return function () {
+        var res = f.apply(this, arguments);
+        setPrototypeOf(res, this.constructor.prototype);
+        return res;
+    }
+};
 a: if (!setPrototypeOf) {
-    var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
-    var getOwnPropertyNames = Object.getOwnPropertyNames;
-    var defineProperty = Object.defineProperty;
-    try {
-        if (!getOwnPropertyNames) throw i18n`不支持`;
-        defineProperty({}, 'o', { value: 0 });
+    if ({}.__proto__ === Object.prototype) {
         setPrototypeOf = function (obj, proto) {
-            var names = getOwnPropertyNames(proto)
-            for (var n of names) {
-                var d = getOwnPropertyDescriptor(proto, n);
-                defineProperty(obj, n, d);
-            }
-            return obj;
+            obj.__proto__ = proto;
         }
-        break a;
-    } catch (e) {
-        getOwnPropertyDescriptor = null;
-        defineProperty = null;
-        getOwnPropertyNames = null;
     }
-    // <!--
-    console.error(i18n`当前运行环境使用class extends Array会有难以解决的不兼容性问题，请更换代码的实现方式！`);
-    // -->
-    setPrototypeOf = function (obj, proto) {
-        for (var p in proto) if (hasOwnProperty.call(proto, p) && !(p in obj)) obj[p] = proto[p];
-        obj.constructor = proto.constructor;
-        return obj;
+    else if (Object.getOwnPropertyDescriptors) {
+        setPrototypeOf = function (obj, proto) {
+            var descriptors = Object.getOwnPropertyDescriptors(proto);
+            Object.defineProperties(obj, descriptors);
+        }
     }
-}
-var wrapMethod = method => function () {
-    var res = method.apply(this, arguments);
-    var res0 = this.constructor.apply(this, []);
-    res0.length = res.length;
-    for (var k in res) {
-        k = +k;
-        if ((k & 0x7fffffff) !== k) break;
-        res0[k] = res[k];
+    else {
+
+        if (Object.getOwnPropertyNames) {
+            setPrototypeOf = function (obj, proto) {
+                var keys = Object.getOwnPropertyNames(proto);
+                methods.forEach(k => {
+                    obj[k] = wrapMethod(proto[k]);
+                });
+                keys.forEach(k => {
+                    var dp = Object.getOwnPropertyDescriptor(proto, k);
+                    Object.defineProperty(obj, k, dp);
+                })
+                obj.constructor = proto.constructor;
+                return obj;
+            }
+        }
+        else {
+            // <!--
+            console.error(i18n`当前运行环境使用class extends Array会有难以解决的不兼容性问题，请更换代码的实现方式！`);
+            // -->
+            setPrototypeOf = function (obj, proto) {
+                var keys = Object.keys(proto);
+                methods.forEach(k => {
+                    obj[k] = wrapMethod(proto[k]);
+                });
+                obj.constructor = proto.constructor;
+                keys.forEach(k => {
+                    if (!(k in obj)) obj[k] = proto[k];
+                })
+                return obj;
+            }
+        }
     }
-    return res0;
-};
-var map = wrapMethod([].map);
-var slice = wrapMethod([].slice);
-var filter = wrapMethod([].filter);
-var splice = wrapMethod([].splice);
-var concat = wrapMethod([].concat);
+}
 
 function Array2() {
-    var proto = this.constructor.prototype;
+    var res = Array.apply(this, arguments);
     /**
      * @type {PropertyDescriptor}
      */
-    if (!hasOwnProperty.call(proto, 'map')) proto.map = map;
-    if (!hasOwnProperty.call(proto, 'slice')) proto.slice = slice;
-    if (!hasOwnProperty.call(proto, 'filter')) proto.filter = filter;
-    if (!hasOwnProperty.call(proto, 'splice')) proto.splice = splice;
-    if (!hasOwnProperty.call(proto, 'concat')) proto.concat = concat;
-    var obj = setPrototypeOf(Array.apply(this, arguments), proto);
-    return obj;
+    setPrototypeOf(res, this.constructor.prototype);
+    return res;
 }
+var methods = [
+    'concat',
+    'slice',
+    'splice',
+    'filter',
+    'flat',
+    'flatMap',
+    'map',
+    'toReversed',
+    'toSorted',
+    'toSpliced',
+    'with',
+].filter(k => k in Array.prototype);
 Array2.prototype = Array.prototype;
 return Array2;

package/coms/basic_/&extends.js

@@ -2,14 +2,21 @@ var __static = Object.setPrototypeOf || { __proto__: [] } instanceof Array && fu
     d.__proto__ = b;
 } || extend;
 var setConstructor = Object.defineProperty ? function (a, c) {
-    Object.defineProperty(a, "constructor", { value: c });
+    try {
+        Object.defineProperty(a, "constructor", { value: c });
+    } catch (e) {
+        setConstructor = function (a, c) {
+            a.constructor = c;
+        };
+        setConstructor(a, c);
+    }
 } : function (a, c) {
     a.constructor = c;
 };
 // class A extends B {}
 function extends_(A, B) {
+    A.prototype = B === null ? Object.create(null) : (_ = new B, setConstructor(_, A), _);
     __static(A, B);
-    A.prototype = B === null ? Object.create(null) : new (_ = function () { setConstructor(this, A) }, _.prototype = B.prototype, _);
     var _;
 }
 return extends_;

package/coms/compile/Html_test.js

@@ -37,6 +37,11 @@ test('${i18n`加载中..`}<div class="loader"></div>');
 test('${a +typeof i18n`加载中..`}<div class="loader"></div>', '${a + typeof i18n`加载中..`}<div class="loader"></div>');
 test('${a > 1}');
 test('a>1', 'a > 1');
+test('a<1>>1', 'a < 1 >> 1');
+test('a<b>>1', 'a < b >> 1');
+test('a < b >> 1', '1.type', 8);
+test('a < z >> 1', '2.type', 128);
+test('a<<z>1', 'a << z > 1');
 test(`<meta charset="utf-8" />`);
 test('a><a></a>', 'a > <a></a>');
 test('X', 'X');

package/coms/compile/Javascript.js

@@ -2,7 +2,7 @@
 var strings = require("../basic/strings");
 var Program = require("./Program");
 var backEach = require("../basic/backEach");
-
+var parseNumber = require('../basic/parseNumber');
 const {
     /*   1 */COMMENT,
     /*   2 */SPACE,
@@ -43,7 +43,7 @@ instanceof`.trim().split(/[,\s]+/);
 var colonstrap_reg = /^(case|default)$/;
 class Javascript extends Program {
     straps = straps;
-    value_reg = /^(false|true|null|Infinity|NaN|undefined|eval)$/
+    value_reg = /^(false|true|null|Infinity|NaN|undefined|eval|this|arguments)$/
     transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|instanceof|throw|extends|import|from)$/
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
     forceend_reg = /^(return|yield|break|continue|debugger|async)$/;
@@ -172,7 +172,9 @@ var fixType = function (o) {
             if (last && last.type === EXPRESS && /[^\.]\.$/.test(last.text)) {
                 type = EXPRESS;
             }
-            else if (isProperty(o)) type = PROPERTY;
+            else if (isProperty(o)) {
+                if (!o.isdigit) type = PROPERTY;
+            }
             else if (m === 'from') {
                 if (!last || last.type === STRAP && !/^(im|ex)port$/.test(last.text)) {
                     type = EXPRESS;
@@ -621,6 +623,14 @@ function detour(o, ie) {
                 if (/^0[0-7]+$/.test(o.text)) {
                     o.text = '0o' + o.text.slice(1);
                 }
+                if (o.isprop) {
+                    if ((o.isdigit)) {
+                        var value = parseNumber(o.text);
+                        if (Number.isNaN(value) || value < 0)
+                            console.warn(i18n`发现异常属性：${`<yellow>${o.text}</yellow>`}`);
+                        else o.text = String(value);
+                    }
+                }
                 break;
             case QUOTED:
                 if (o.length) {

package/coms/compile/Javascript_test.js

@@ -26,6 +26,9 @@ var testDetour = function (a, e) {
     c.break();
     assert(c.toString(), e);
 }
+testDetour('={0x1:1}', '= { 1: 1 }')
+testDetour('={-0x1:1}', '= { -0x1: 1 }')
+testDetour('={false:1}', '= { ["false"]: 1 }')
 testDetour('1.1', '1.1')
 testDetour('1.1.a', '1.1["a"]')
 testDetour('-1e10.a', '-1e10["a"]')