efront 4.6.3 → 4.7.1

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

@@ -1,3 +1,12 @@
+- zh-CN: 检查完毕！
+  en:    Check completed!
+
+- zh-CN: 在$1个文件中找到$2处易错代码！
+  en:    Found $2 error prone codes in $1 files!
+
+- zh-CN: 后续代码
+  en:    Subsequent code
+
 - zh-CN: 文件$1中暂未发现已记录的问题
   en:    No recorded issues have been found in file $1 yet
 

package/coms/basic/Table.js

@@ -78,6 +78,9 @@ class Table extends Array {
                         if (s.length === 1) return s[0];
                         return i18n`共${this.$summary[i].length}个不同的项`;
                     },
+                    set(v) {
+                        this.$summary[i] = [v];
+                    }
                 })
                 return [];
             });

package/coms/basic/data.js

@@ -453,6 +453,9 @@ function createApiMap(data) {
         if (headers && !reg.test(headers)) {
             _headers = parseKV(headers);
         }
+        else {
+            _headers = undefined;
+        }
         if (!base) continue;
         href = /(https?\:)?|\.?\//i.test(base) ? base : '';
         var item1 = items1[key];

package/coms/basic/i18n.js

@@ -1,7 +1,8 @@
 "use strict";
 var languageMap = {};
 var languageIndex = 0;
-function i18n(arg) {
+function i18n() {
+    var [arg] = arguments;
     if (typeof arg === 'string' || !isArrayLike(arg)) arg = arguments;
     return arg[isFinite(this) ? this : languageIndex];
 };

package/coms/basic/refilm.js

@@ -1,4 +1,5 @@
-function refilm(str) {
+function refilm() {
+    var [str] = arguments;
     if (str.raw) str = str.raw;
     return refilm_decode.apply(null, [str].concat([].slice.call(arguments, 1)));
 }

package/coms/basic/sortname.js

@@ -114,7 +114,8 @@ var compare = function (a, b) {
     if (delta) return delta;
     return 0;
 }
-function sortname(list = this) {
+function sortname() {
+    var [list = this] = arguments;
     if (this !== arguments[1] && arguments.length === 2) {
         return compare(arguments[0], arguments[1]);
     }

package/coms/basic_/exec_.js

@@ -21,7 +21,6 @@ var exec_ = function (args, ok, oh, int) {
                 next(err);
             }
             else {
-                catches.pop();
                 fina();
             }
         }
@@ -32,7 +31,7 @@ var exec_ = function (args, ok, oh, int) {
     var retn = function (p) {
         r = p;
         finished = true;
-        if (catches.length) fina();
+        if (catch_ || catches.length) fina();
         else ok(r);
     };
     var fina = function () {
@@ -44,7 +43,6 @@ var exec_ = function (args, ok, oh, int) {
         next();
     };
     var fine = function () {
-        catches.pop();
         if (throwed) thro(e);
         else if (finished) retn(r);
         else {
@@ -57,11 +55,9 @@ var exec_ = function (args, ok, oh, int) {
         while (index < args_length) {
             try {
                 var a = args[index](p) || [1, 0];
-                catch_ = null;
                 p = a[0];
                 i = a[1];
             } catch (e) {
-                p = null;
                 thro(e);
                 return;
             }
@@ -73,17 +69,19 @@ var exec_ = function (args, ok, oh, int) {
                         try {
                             return p.then(next, thro);
                         } catch (e) {
-                            return Promise.reject(e).then(next, thro);
+                            return Promise.reject(e).then(null, thro);
                         }
                     }
                     else return next(p);
                 case 2: return finished = true, retn(p); // return p;
                 case 3: return index++, int(p, next); // yield p;
+                case 4: return thro(p); // throw p; 目前无此返回值
                 case 7: index++; catches.push([index, p]); break; // try catch finally?
                 case 8: index++; catches.push([index, p, 1]); break; // try finally
                 case 9: return p ? fine() : fina(); // finally
                 default: throw console.log(a), i18n`代码异常！`;
             }
+            catch_ = null;
         }
         retn();
     };

package/coms/basic_/exec_test.js

@@ -27,22 +27,41 @@ var c = async function () {
 
         await b();
     } catch (e) {
-        console.log(e)
+        console.log(e, 'catched')
         return 9;
     }
     finally {
-        console.log(8)
+        console.log(8, 'finally')
     }
 };
 var d = async function () {
     try {
-        throw new Error(10);
+        throw new Error("不该出现此错误");
     }
     catch (e) {
+        console.log(10, 'catched');
         throw e;
     }
+    finally {
+        console.log(11);
+        return 12;
+    }
+}
+var e = async function () {
+    try {
+        throw new Error("不该出现此错误");
+    }
+    catch (e) {
+        console.log(13, 'catched');
+        throw e;
+    }
+    finally {
+        console.log(14);
+        throw new Error("这是最后的报错");
+    }
 }
 console.log(0, process.uptime())
 await a();
 console.log(await c());
-await d();
+console.log(await d());
+await e();

package/coms/compile/Javascript.js

@@ -381,6 +381,7 @@ Javascript.prototype.setType = function (o) {
             if (last && last.type === PROPERTY && propresolve_reg.test(last.text)) {
                 last.type = STRAP;
             }
+            if (queue.isClass) o.isend = false;
         }
     }
     if (o.type === PROPERTY || o.isprop);
@@ -519,6 +520,15 @@ function detour(o, ie) {
                 if (hasdot) text = "..." + text;
                 o.text = text;
                 break;
+            case VALUE:
+                o.text = String(o.text).replace(/_/g, '')
+                    .replace(/\.e/, 'e')
+                    .replace(/\.$/, '')
+                    .replace(/^\./, '0.');
+                if (/^0[0-7]+$/.test(o.text)) {
+                    o.text = '0o' + o.text.slice(1);
+                }
+                break;
             case QUOTED:
                 if (o.length) {
                     if (!o.prev || o.prev.type & (STAMP | STRAP)) {
@@ -586,7 +596,7 @@ function detour(o, ie) {
                 }
                 if (!o.isprop) break;
             case PROPERTY:
-                if (/^(get|set|async|static)$/.test(o.text) && o.next && (o.next.type === PROPERTY || o.next.isprop)) break;
+                if (!o.isend && /^(get|set|async|static)$/.test(o.text) && o.next && (o.next.type === PROPERTY || o.next.isprop)) break;
                 if (o.text === 'static' && o.next && o.next.type === SCOPED && o.next.entry === '{') break;
                 if (/^\[/.test(o.text)) break;
                 if (o.queue.isObject) {
@@ -609,7 +619,7 @@ function detour(o, ie) {
                     var text = strings.recode(o.text);
                     if (o.prev) {
                         var prev = o.prev;
-                        if (prev && prev.isprop && /^(get|set|static|async)$/.test(prev.text)) {
+                        if (prev && prev.isprop && !prev.isend && /^(get|set|static|async)$/.test(prev.text)) {
                             prev = prev.prev;
                         }
                         if (prev && prev.type === STAMP && prev.isprop) prev = prev.prev;

package/coms/compile/Javascript_test.js

@@ -14,4 +14,31 @@ testFix(`import("a")`, 'require("a")');
 testFix(`import "windows.inc"`, 'require("windows.inc")');
 testFix(`import "windows.inc";import "abc.inc";`, 'require("windows.inc"); require("abc.inc");');
 testFix(`import "windows.inc";\r\nimport "abc.inc";`, 'require("windows.inc");\r\nrequire("abc.inc");');
-testFix(`console.log(import.meta)`, `console.log(import_meta)`);
+testFix(`console.log(import.meta)`, `console.log(import_meta)`);
+var testDetour = function (a, e) {
+    var c = scanner2(a);
+    c.break();
+    assert(c.toString(), e);
+}
+testDetour('1.1', '1.1')
+testDetour('1.1.a', '1.1["a"]')
+testDetour('-1e10.a', '-1e10["a"]')
+testDetour('1e10.a', '1e10["a"]')
+testDetour('1e1_0.a', '1e10["a"]')
+testDetour('1_20e1_0.a', '120e10["a"]')
+testDetour('1_2.0_3e1_0.a', '12.03e10["a"]')
+testDetour('1.e10.a', '1e10["a"]')
+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('0o1.a', '0o1["a"]')
+testDetour('0o1n.a', '0o1n["a"]')
+testDetour('0o1m.a', '0o1m["a"]')
+testDetour('0o1i.a', '0o1i["a"]')
+testDetour('0o1j.a', '0o1j["a"]')
+testDetour('0o1k.a', '0o1k["a"]')
+testDetour('0o1l.a', '0o1l["a"]')
+testDetour('0o1ll.a', '0o1ll["a"]')

package/coms/compile/Program.js

@@ -144,6 +144,7 @@ class Program {
     exec(text) {
         if (!this.entry_reg) this.commit();
         var index = this.lastIndex;
+        this.lastIndex = text.length;
         var parents = [];
         var lasttype;
         var Code = this.Code;
@@ -423,7 +424,7 @@ class Program {
             var match = reg.exec(text);
             if (!match) return null;
             var end = match[0].length + match.index;
-            this.lastIndex = index = end;
+            index = end;
             var m = match[0];
             test: if (this.quote_map.hasOwnProperty(m)) {
                 var last = queue.last;
@@ -467,7 +468,7 @@ class Program {
                         break;
                     }
                     var m = match[0];
-                    index = this.lastIndex = match.index + m.length;
+                    index = match.index + m.length;
                     if (quote.length === 2) {
                         break;
                     }
@@ -532,7 +533,12 @@ class Program {
                 save(STRAP);
                 continue;
             }
-            var isdigit = this.number_reg.test(m);
+            var isdigit = number_reg.exec(m);
+            if (isdigit) {
+                m = isdigit[0];
+                index = match.index + m.length;
+                isdigit = true;
+            }
             if (this.value_reg.test(m) || isdigit) {
                 queue.inExpress = true;
                 if (isdigit && lasttype === STAMP) {
@@ -633,6 +639,7 @@ class Program {
                 queue_push(p);
             }
         };
+        this.lastIndex = index;
         if (queue !== origin) {
             throw console.log(createString(origin), `\r\n------ deep: ${parents.length}\r\n  --- enrty: ${queue.entry}\r\n  -- length: ${queue.length}\r\n  ---- last: ${createString([queue.last])}\r\n------- end\r\n --parents: ${parents.map(p => p.tag || p.entry || p.text).join('->')}`, createString([queue]).slice(-200)), "代码异常结束";
         }
@@ -713,7 +720,7 @@ class Program {
         this.space_reg = new RegExp(`^[${spaces}]+$`, flagUnicode);
         this.space_exp = new RegExp(`[${spaces}]+`, flagUnicode);
         var quotes = this.createRegExp(quoteslike.map(q => q[0]), true).source;
-        this.entry_reg = new RegExp([`[${spaces}]+|${quotes}|[${scopes}]|${this.number_reg.source.replace(/^\^|\$$/g, "")}[^${tokens}]*|${express}|[${stamps}]`], "gi" + flagUnicode);
+        this.entry_reg = new RegExp([`[${spaces}]+|${quotes}|[${scopes}]|${number_reg.source.replace(/^\^|\$$/g, "")}[^${tokens}]*|${express}|[${stamps}]`], "gi" + flagUnicode);
     }
 }
 module.exports = Program;

package/coms/compile/audit.js

@@ -1,17 +1,49 @@
-var { STAMP, STRAP, createString } = require("./common");
+var { STAMP, EXPRESS, snapSentenceHead, pickSentence, createString, getBodyWith } = require("./common");
 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++"
+    "while($2[$1]!==$3)$1++": "while($1<$2.length&&$2[$1]!==$3)$1++",
+    "arguments"(matched) {
+        var m = matched[0];
+        var body = getBodyWith(m, 'arguments');
+        var head = body.prev;
+        if (!head?.length || body.checked) return;
+        body.checked = true;
+        var { used, args } = body.scoped;
+        if (!args?.length) return;
+        var broken = false;
+        a: for (var a of args) {
+            if (!used[a]) {
+                continue;
+            }
+            for (var u of used[a]) {
+                if (u.equal) {
+                    broken = true;
+                    break a;
+                }
+            }
+        }
+        if (!broken) return;
+        var h = snapSentenceHead(body);
+        var matched = [];
+        while (h && h !== body) {
+            matched.push(h);
+            h = h.next;
+        }
+        matched.suggest = `${createString(matched.slice(0, matched.length - 1))}(){\r\n      var[${createString(head)}]=arguments;\r\n      // ${i18n`后续代码`}..\r\n  }`;
+        return matched;
+    }
 };
 var roles = Object.keys(suggest).map(s => {
     var r = scanner2(s);
     var { used, envs } = r;
     for (var k in envs) {
         used[k].forEach(f => {
-            f.suggest = /^\$\d+$/.test(f.text) ? f.text : null;
+            f.sname = /^\$\d+$/.test(f.text) ? f.text : null;
         });
     }
-    r.suggest = scanner2(suggest[s]);
+    s = suggest[s];
+    if (typeof s === 'string') r.suggest = scanner2(s);
+    else r.suggest = s;
     return r;
 });
 var match = function (role, c, nameMap = {}) {
@@ -19,15 +51,15 @@ var match = function (role, c, nameMap = {}) {
     var matched = [];
     while (temp) {
         if (!c || c.type !== temp.type) return;
-        if (temp.suggest) {
-            var name = temp.suggest;
+        if (temp.sname) {
+            var name = temp.sname;
             if (name in nameMap) {
                 if (nameMap[name] !== c.text) return;
             }
             else nameMap[name] = c.text;
         }
         else {
-            if (temp.entry !== c.entry && temp.leave !== c.leave && temp.text !== c.text) return;
+            if (temp.entry !== c.entry || temp.leave !== c.leave || temp.text !== c.text) return;
             if (temp.length) {
                 if (temp.length !== c.length) return;
                 if (!match(temp, c.first, nameMap)) return;
@@ -38,6 +70,8 @@ var match = function (role, c, nameMap = {}) {
         c = c.next;
     }
     if (role.suggest) {
+        if (isFunction(role.suggest))
+            return role.suggest(matched);
         var { used } = role.suggest;
         for (var k in nameMap) {
             if (used[k]) patchlist('', used[k], nameMap[k]);
@@ -47,6 +81,7 @@ var match = function (role, c, nameMap = {}) {
     return matched;
 }
 var audit = function (code) {
+    code.scoped;
     var checked = [];
     for (var r of roles) {
         var rest = [code];

package/coms/compile/audit_test.js

@@ -1,2 +1,16 @@
 // 执行 efront audit compile/audit_test，检查本文件中的错误
-while (body[i] !== b) i++;
+// body中不一定有b
+while (body[i] !== b) i++;
+// 参数有修改并使用了arguments
+function a(a) {
+    a = 1;
+    console.log(arguments);
+}
+
+class a{
+    a
+    b(c){
+        c=2;
+        arguments;
+    }
+}

package/coms/compile/common.js

@@ -14,7 +14,7 @@ const [
     /*2048 */ELEMENT,
 ] = new Array(20).fill(0).map((_, a) => 1 << a);
 // --------------//1//2/////////////////////////22/////////////2//2//3//4/////4////////3/////3//////3//3//////3///////211/////////////2//////2//////1///
-var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[mniul]|ll)?$/i;
+var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+|0[0-7]+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[ijklmnu]+)?/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;
 var needhead_reg = /^\?\.|^\.[^\.]|^\[/;
 var skipAssignment = function (o, cx) {
@@ -261,6 +261,11 @@ function snapSentenceHead(o) {
                     pp = pp.prev;
                     continue;
                 }
+                while (pp?.isprop) {
+                    o = pp;
+                    pp = pp.prev;
+                    if (pp?.isend) break;
+                }
             }
             break;
         }
@@ -1193,7 +1198,9 @@ var createString = function (parsed) {
                 break;
             default:
                 if (o && typeof o === "object") {
-                    if (intag || o.type === EXPRESS && (needhead_reg.test(o.text) || o.prev?.type === EXPRESS && /\.$/.test(o.prev.text)));
+                    if (intag || o.type === EXPRESS && (needhead_reg.test(o.text) || o.prev?.type === EXPRESS && /\.$/.test(o.prev.text))) {
+                        if (o.prev?.isdigit && /^\./.test(o.text) && !/^0[\dxbo]|[mni]$|[e\.]/.test(o.prev.text)) result.push(" ");
+                    }
                     else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type) {
                         if (autospace) result.push(" ");
                     }
@@ -1220,10 +1227,7 @@ var createString = function (parsed) {
                             if (patchspace && lasttype !== SPACE) result.push(" ");
                         }
                     }
-                    if (o.type === VALUE) {
-                        if (/^0[0-7]+$/.test(o.text)) {
-                            o.text = '0o' + o.text.slice(1);
-                        }
+                    if (o.isdigit) {
                         if (+o.text < 0 && /\-$/.test(result[result.length - 1])) {
                             result.push(" ");
                         }
@@ -1443,7 +1447,8 @@ var pickSentence = function (o) {
     } while (h !== e);
     return res;
 };
-var insertBefore = function (o) {
+var insertBefore = function () {
+    var [o] = arguments;
     var queue = this || o.queue;
     var index = queue.indexOf(o);
     var os = [].slice.call(arguments, 1);
@@ -1461,7 +1466,8 @@ var insertBefore = function (o) {
     if (next) next.prev = o;
     else queue.last = o;
 }
-var insertAfter = function (o) {
+var insertAfter = function () {
+    var [o] = arguments;
     var queue = this || o.queue;
     var index = queue.indexOf(o) + 1;
     var os = [].slice.call(arguments, 1);

package/coms/compile/downLevel_test.js

@@ -48,7 +48,7 @@ assert(downLevel(`var {1:a}`), 'var a');
 assert(downLevel(`var {c:a}`), 'var a');
 assert(downLevel(`var {a}=b`), 'var a = b.a');
 assert(downLevel(`var {a}=1`), 'var a = 1 .a');
-assert(downLevel(`var {a}=1.1`), 'var a = 1.1 .a');
+assert(downLevel(`var {a}=1.1`), 'var a = 1.1.a');
 assert(downLevel(`var {c:a}=b`), 'var a = b.c');
 assert(downLevel(`[...[a]]=[1]`), 'a = [1][0]');
 assert(downLevel(`[...[a]]=[...[1]]`), 'a = [1][0]');

package/coms/compile/scanner2.js

@@ -184,7 +184,8 @@ class Code extends Array {
 
 var avoidMap = null;
 var typeMap = Object.create(null);
-function scan(text, type = "js", lastIndex = 0) {
+function scan() {
+    var [text, type = "js", lastIndex = 0] = arguments;
     if (isFinite(type)) lastIndex = +type, type = arguments[2] || type;
     var program = typeMap[type];
     if (!program) switch (type) {

package/coms/docs/execute.js

@@ -5,7 +5,8 @@ var execute = function (commName, then, logpad) {
     window[commName] = null;
     delete modules[commName];
     var logs = [];
-    var log = function (color, type, text, ...extra) {
+    var log = function () {
+        var [color, type, text, ...extra] = arguments;
         if (text instanceof Error) text = text.message;
         window.console.log.apply(window.console, [].slice.call(arguments, 1));
         logs.push([color, type, text, ...extra]);

package/coms/third-party/qrcode.js

@@ -491,8 +491,8 @@ var qrcode = function (typeNumber, errorCorrectionLevel) {
         return qrHtml;
     };
 
-    _this.createSvgTag = function (cellSize, margin, alt, title) {
-
+    _this.createSvgTag = function () {
+        var [cellSize, margin, alt, title] = arguments;
         var opts = {};
         if (typeof arguments[0] == 'object') {
             // Called by options.

package/coms/zimoli/care.js

@@ -5,7 +5,7 @@
  * @param {Function|string} type 
  * @param {Function} listener 
  */
-function care(target, type, listener) {
+function care() {
     var [target, type, listener, allowMultiHandle] = parse.apply(this, arguments);
     if (!target[type]) {
         target[type] = [];
@@ -17,7 +17,8 @@ function care(target, type, listener) {
         listeners.push(listener);
     }
 }
-function parse(target, type, listener) {
+function parse() {
+    var [target, type, listener] = arguments;
     var allowMultiHandle = arguments[arguments.length - 1];
     if (typeof allowMultiHandle !== "boolean") {
         allowMultiHandle = true;
@@ -48,7 +49,7 @@ function parse(target, type, listener) {
     type = `care(${type})`;
     return [target, type, listener, allowMultiHandle];
 }
-function clean(target, type, listener) {
+function clean() {
     var [target, type, listener] = parse.apply(this, arguments);
     var listeners = target[type];
     if (listener instanceof Function) {

package/coms/zimoli/field.js

@@ -1,5 +1,5 @@
-function main(elem) {
-    elem = optionbar.apply(null, arguments);
+function main() {
+    var elem = optionbar.apply(null, arguments);
     var scope = {};
     if (!elem.childNodes.length) care(elem, function (p) {
         var [f, data] = p;

package/coms/zimoli/grid.js

@@ -330,7 +330,8 @@ class Point extends Array {
         return this.value;
     }
 }
-var createPoints = function (values, direction = "x", result = new Point(0)) {
+var createPoints = function () {
+    var [values, direction = "x", result = new Point(0)] = arguments;
     if (!(values instanceof Array)) values = arguments;
     for (var cx = 0, dx = values.length; cx < dx; cx++) {
         var value = values[cx];

package/coms/zimoli/table.js

@@ -540,7 +540,7 @@ function table(elem) {
             rowClick(d, i, event) {
                 active(table, i, d, event.target);
             },
-            tbody(e) {
+            tbody() {
                 var e = list.apply(null, arguments);
                 css(e, tbodyHeight(e, this.hasFoot));
                 css(e, { width: this.adapter.offsetWidth, display: 'block' });

package/coms/zimoli/zimoli.js

@@ -300,7 +300,8 @@ function prepare(pgpath, ok) {
         }
         return url;
     };
-    state.init = function (a) {
+    state.init = function () {
+        var [a] = arguments;
         a = state.path(a);
         return init.apply(this, [a].concat([].slice.call(arguments, 1)));
     };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.6.3",
+    "version": "4.7.1",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {