efront 4.3.10 → 4.3.14

package/coms/basic/assert.js

@@ -1,7 +1,14 @@
 var mark = require("./mark");
-var gray = console.format('<gray>;</gray>').split(';');
-var green = console.format('<green>;</green>').split(';');
-var crack = console.format('<red2>;</red2>').split(';');
+if (console.format) {
+    var gray = console.format('<gray>;</gray>').split(';');
+    var green = console.format('<green>;</green>').split(';');
+    var crack = console.format('<red2>;</red2>').split(';');
+}
+else {
+    var gray = [, ,];
+    var green = [, ,];
+    var crack = [, ,];
+}
 var dump = function (a, msg) {
     if (a instanceof Object) console.error('属性错误'), console.log(msg ? msg + " " : "  {\r\n", Object.keys(a).map(k => `  ${k}${gray.join(':')}\r\n      ${a[k]}`).join('\r\n') + "\r\n }");
     else if (msg) console.log(msg + ":", a);

package/coms/basic_/exec_.js

@@ -1,24 +1,26 @@
 var tick = Promise.resolve();
 var exec_ = function (args, ok, oh, int) {
-    var p = null, index = 0, r, e, finished = false, t = this;
+    var p = null, index = 0, r, e, finished = false;
     var next = function (arg) {
         p = arg;
         run();
     };
-    var catches = [], catch_, throwed;
+    var catches = [], catch_, throwed = false;
     var thro = function (err) {
+        e = err;
         if (catch_) {
+            throwed = true;
             fina();
         }
         else if (catches.length) {
-            catch_ = catches[catches.length - 1];
-            [index, p, throwed] = catch_;
+            catch_ = catches.pop();
+            [index, p] = catch_;
+            throwed = false;
             index += p & 0xffff;
             if (p >>> 16) {
                 next(err);
             }
             else {
-                e = err;
                 catches.pop();
                 fina();
             }
@@ -42,27 +44,26 @@ var exec_ = function (args, ok, oh, int) {
         next();
     };
     var fine = function () {
-        index++;
-        next();
+        catches.pop();
+        if (throwed) thro(e);
+        else if (finished) retn(r);
+        else {
+            index++;
+            next();
+        }
     }
     var run = function () {
         var args_length = args.length, i;
-        if (!catch_ || index >= args_length) {
-            if (throwed) {
-                return oh(e);
-            }
-            if (finished) return ok(r);
-        }
         while (index < args_length) {
             try {
-                var a = args[index].call(t, p) || [1, 0];
+                var a = args[index](p) || [1, 0];
                 catch_ = null;
                 p = a[0];
                 i = a[1];
             } catch (e) {
                 p = null;
                 thro(e);
-                break;
+                return;
             }
             switch (i) {
                 case 0: index += p; break; // reflow

package/coms/basic_/exec_test.js

@@ -0,0 +1,48 @@
+var a = async function () {
+    console.log(1);
+    for (var a = 0; a < 10; a++) {
+        await new Promise(ok => setTimeout(ok, 20));
+    }
+    console.log(2);
+    await new Promise(ok => setTimeout(ok, 20));
+    await new Promise(ok => setTimeout(ok, 20));
+};
+var b = async function () {
+    console.log(3, process.uptime())
+    try {
+        console.log(4, 'try');
+        throw 5
+    } catch (e) {
+        console.log(e, 'catched')
+        throw 7;
+    }
+    finally {
+        console.log(6, 'finally')
+    }
+    console.fail('<red>这一行不应出现！</red>');
+};
+var c = async function () {
+
+    try {
+
+        await b();
+    } catch (e) {
+        console.log(e)
+        return 9;
+    }
+    finally {
+        console.log(8)
+    }
+};
+var d = async function () {
+    try {
+        throw new Error(10);
+    }
+    catch (e) {
+        throw e;
+    }
+}
+console.log(0, process.uptime())
+await a();
+console.log(await c());
+await d();

package/coms/compile/Javascript.js

@@ -384,9 +384,9 @@ Javascript.prototype.setType = function (o) {
         }
     }
     if (o.type === STAMP) {
-        if (!last || last.type & (STAMP | STRAP) || last.type === SCOPED && /^[\{\[]$/.test(last.entry) && !last.isExpress) {
+        if (!last || last.type & (STAMP | STRAP) && !/^(\+\+|\-\-)$/.test(last.text) || last.type === SCOPED && /^[\{\[]$/.test(last.entry) && !last.isExpress) {
             o.unary = /^[^=;,\*]$|.[^\=\>\<\|\&\^]$/.test(o.text);
-            if (o.unary && last && last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) o.unary = !/^[\+\-]$/.test(o.text);
+            if (o.unary && /^(\+|\-)$/.test(o.text) && last && last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) o.unary = !!last.unary;
         }
         if (last && /^(\+\+|\-\-)$/.test(o.text)) {
             var i = 1;
@@ -658,7 +658,7 @@ var removeImport = function (c, i, code) {
     var next = c.next;
     var { used, envs, vars } = code;
     if (next && next.type !== QUOTED) {
-        var [dec, map, o] = getDeclared(c.next);
+        var [dec, map, o] = getDeclared(c.next, 'remove');
         if (!o) throw new Error(i18n`代码结构异常！`);
         if (o.type !== STRAP || o.text !== 'from') throw new Error(i18n`缺少from语句`);
         var oi = code.indexOf(o, i);
@@ -730,7 +730,7 @@ var removeImport = function (c, i, code) {
             if (used[dn]) used[dn].forEach(u => {
                 if (used[name].indexOf(u) >= 0) return;
                 patchname(name, u, da);
-                used[name].push(u);
+                if (u.kind !== 'remove') used[name].push(u);
             });
             delete used[dn];
             delete vars[dn];

package/coms/compile/downLevel.js

@@ -1722,6 +1722,7 @@ var down = function (scoped) {
             var argname = _letname("_");
             unstruct.debug = downLevel.debug;
             var body = scanner2(`return ${funcMark}()`);
+            var body3 = body[body.length - 1];
             var code = unawait(scoped.body, _getname, argname);
             code.forEach(function (c) {
                 revar(c);
@@ -1729,8 +1730,8 @@ var down = function (scoped) {
                 if (!c.length) f[2].push(...scanner2('return [1,0]'));
                 else f[2].push(...c);
                 f[2].push({ type: SPACE, text: "\r\n" });
-                if (body[2].length) body[2].push({ type: STAMP, text: "," });
-                body[2].push({ type: SPACE, text: '\r\n' }, ...f);
+                if (body3.length) body3.push({ type: STAMP, text: "," });
+                body3.push({ type: SPACE, text: '\r\n' }, ...f);
             });
             splice(scoped.body, 0, scoped.body.length);
             if (markcodes.length || argcodes.length) {

package/coms/compile/unstruct.js

@@ -435,6 +435,7 @@ var _do = function (body, cx, unblock, result) {
     if (label.continue) ifpatch(result), label.contat = result.length;
     var b = rescan`if (${getCondition(o, unblock)}) return [${i - result.length}, 0]`;
     pushstep(result, b);
+    b[b.length - 1][0].text = String(i - result.length + 1);
     while (body[cx] !== o) cx++;
     return cx + 1;
 };
@@ -938,7 +939,6 @@ var _express = function (body, getname, ret) {
     }
     var result = [];
     var q = [];
-    var needpunc = false;
     var bx = 0;
     var cache = [];
     var n = null;
@@ -966,10 +966,8 @@ var _express = function (body, getname, ret) {
         }
         if (o.type & (STRAP | STAMP)) {
             var p = 0;
-            if (/^([!~]|\+\-|\-\+)*$/.test(o.text)) p = powermap["!"];
-            if (!p && /^[\+\-]$/.test(o.text)) p = needpunc ? powermap["+"] : powermap["!"];
-            if (!p) p = powermap[o.text];
-            if (o.unary) needpunc = false;
+            if (o.unary) p = powermap["!"];
+            else p = powermap[o.text];
             var b = body.slice(bx, cx + 1);
             bx = cx + 1;
             b.index = nameindex;
@@ -1021,7 +1019,6 @@ var _express = function (body, getname, ret) {
             }
         }
         else {
-            needpunc = true;
             if (o.type === EXPRESS) {
                 exps.push(o);
             }

package/coms/compile/unstruct_test.js

@@ -144,7 +144,12 @@ test(`a[0]-- + 1`, "_ = a[0]--, _ + 1");
 test(`a[0]-- +1`, "_ = a[0]--, _ + 1");
 test(`a[0]--+1`, "_ = a[0]--, _ + 1");
 test(`a[0]+++1`, "_ = a[0]++, _ + 1");
-unstruct.debug = true; r++;
+test(`a[0]++ > 1`, "_ = a[0]++, _ > 1");
+test(`a[0]-- > 1`, "_ = a[0]--, _ > 1");
 test(`c=b\r\n++a`, "c = b; ++a");
 test(`c=b+\r\n++a`, "_ =\r\n++a, c = b + _");
 test(`c=b+ ++a`, "_ = ++a, c = b + _");
+unstruct.debug = true; r++;
+test(`c=b+ +a`, "_ = +a, c = b + _");
+test(`c=b+ !a`, "_ = !a, c = b + _");
+test(`do {var loadcount = 0;} while (loadcount !== 0);`, `loadcount = 0; _ = loadcount !== 0; if (_) return [0, 0]`);

package/coms/crypt/prime.js

@@ -11,14 +11,72 @@ var updatePrime = function (m) {
         prime.push(n);
     }
 }
-var isPrime = function (s) {
+var isPrime = function (s, int) {
+    return 最小素约数(s, int) === s;
+};
+
+var 分解因数 = function (s) {
+    var r = [];
+    do {
+        var d = 最小素约数(s);
+        r.push(d);
+        s = s / d;
+    } while (s >= d);
+    return r;
+};
+var 公约数 = function (a, b) {
+    var r1 = 分解因数(a);
+    var r2 = 分解因数(b);
+    var i1 = 0, i2 = 0;
+    var s = [];
+    while (i1 < r1.length && i2 < r2.length) {
+        var a1 = r1[i1], a2 = r2[i2];
+        if (a1 === a2) {
+            i1++, i2++;
+            s.push(a1);
+            continue;
+        }
+        if (a1 < a2) {
+            i1++;
+        }
+        else {
+            i2++;
+        }
+    }
+    return s;
+};
+
+var 最小素约数 = function (s, int = typeof s === 'bigint' ? BigInt : Number) {
     var n = Math.sqrt(Number(s));
-    s = BigInt(s);
+    var 零 = int(0);
     if (n > prime[prime.length - 1]) updatePrime(n);
-    for (var cx = 0; prime[cx] < n; cx++)if (s % BigInt(prime[cx]) === 0n) return false;
-    return true;
+    for (var cx = 0; prime[cx] <= n; cx++)if (s % int(prime[cx]) === 零) return int(prime[cx]);
+    return s;
+};
+
+var 测试梅森素数 = function (p) {
+    // 仅bigint;
+    if (!isPrime(p)) return false;
+    if (typeof p !== 'bigint') p = BigInt(p);
+    var 二 = BigInt(2);
+    var 一 = BigInt(1);
+    var 零 = BigInt(0);
+    var Mp = 二 ** p - 一;
+    var 四 = BigInt(4);
+    var L0 = 四;
+    var Lm = n => (n * n - 二) % Mp;
+    var Ln = L0;
+    for (var cx = 一, dx = p - 一; cx < dx; cx++) {
+        Ln = Lm(Ln);
+    }
+    return Ln === 零;
 };
 prime.isPrime = isPrime;
+prime.mtest = 测试梅森素数;
+prime.minFactor = 最小素约数;
+prime.factorize = 分解因数;
+prime.cd = 公约数;
+
 prime.find = function (start, delta, end) {
     var isBigInt = typeof start === 'bigint' || typeof end === 'bigint';
     var n = [0, 1, 2];

package/coms/crypt/prime_test.js

@@ -1,10 +1,37 @@
 var test = function (a, b, c) {
     var start = new Date;
-    prime.find(a, b, c)
+    var r = prime.find(a, b, c)
     var end = new Date;
-    console.log(a, b, c, '用时', end - start);
-}
+    var n = console.format("<yellow>;</yellow>").split(';');
+    var p = console.format("<green>;</green>").split(';');
+
+    if (r && r.length) console.log(console.format(`从${n.join(a)}每次加${n.join(b)}到${n.join(c)}，用时${n.join(end - start)}毫秒，共找到${n.join(r.length)}个素数，最后一个是${p.join(r[r.length - 1])}`));
+    else console.log(`从${n.join(a)}每次加${n.join(b)}到${n.join(c)}，用时${n.join(end - start)}毫秒，没找到素数`);
+};
+var testFactorize = function (s) {
+    var is = prime.factorize(s);
+    console.log(s, "因数分解为：", is);
+};
+testFactorize(2n * 3n * 5n * 7n * 11n * 13n + 1n);
+testFactorize(2n * 3n * 5n * 7n * 11n * 13n);
+testFactorize(2n ** 4n * 3n * 5n * 7n ** 2n * 11n * 13n);
+testFactorize(2n * 3n * 5n * 7n * 11n * 13n - 1n);
+testFactorize(2n * 3n * 5n * 7n * 11n * 13n * 17n * 19n * 23n * 29n * 31n - 1n);
+testFactorize(2n * 3n * 5n * 7n * 11n * 13n * 17n * 19n * 23n * 29n * 31n + 1n);
+testFactorize(2n * 3n * 5n * 7n * 11n * 13n * 17n * 19n * 23n * 29n * 31n * 37n * 41n - 1n);
+testFactorize(2n * 3n * 5n * 7n * 11n * 13n * 17n * 19n * 23n * 29n * 31n * 37n * 41n + 1n);
+console.log(prime.cd(9, 9))
+console.log(prime.cd(9, 27))
+console.log(prime.cd(9, 12))
+console.log(prime.cd(2024, 1992))
 test(19000000n, 1, 21000000n);
 test(19000000, 1, 21000000);
-test(19000000, 1, 21000000);
-test(19000000n, 1, 21000000n);
+test(0x1ffffffffff0ff, 2, 0x1fffffffffffff);
+test(0x1f202403050355n, 2, 0x1f2024030503f5n);
+console.log("已缓存的素数的个数", prime.length);
+for (var p of prime) {
+    console.test("正在测试：", console.format(`<yellow>M(<gray>${p}</gray>)</yellow>`));
+    var a = prime.mtest(p);
+    if (a) console.pass("发现梅森素数：", console.format(`<yellow>M(<green>${p}</green>)</yellow>`));
+}
+

package/coms/explorer/main.js

@@ -21,7 +21,6 @@ var touch = {
          */
         var t = this;
         var start = () => {
-            if (onclick.preventClick) return;
             var a = t.$scope.toActive(e);
             touchitems = t.querySelectorAll("fileitem");
             if (a && t.$scope.selected.indexOf(a.$scope.d) >= 0) {
@@ -38,7 +37,10 @@ var touch = {
             css(rect, { left: e.clientX - pos.left - t.clientLeft, top: e.clientY - t.clientTop, width: 0, height: 0 })
         };
         if (/^touch/.test(e.type)) {
-            touch.ing = setTimeout(start, 600);
+            touch.ing = setTimeout(function () {
+                if (onclick.preventClick) return;
+                start();
+            }, 600);
         }
         else {
             start();

package/package.json

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