efront 4.29.0 → 4.30.0

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

@@ -40,6 +40,15 @@
 - zh-CN: 禁用
   en:    Disable
 
+- zh-CN: 压缩算法不支持
+  en:    Compression algorithm not supported
+
+- zh-CN: 数据解码异常！
+  en:    Data decoding exception!
+
+- zh-CN: 压缩到zip文件
+  en:    Compress to zip file
+
 - zh-CN: 无法下载！
   en:    Cannot download!
 

package/apps/pivot/main.js

@@ -7,7 +7,8 @@ i18n.setReloader(function () {
     zimoli.reload(false);
 });
 data.loadConfig("api.yml");
-user.loginPath = 'frame$login';
+user.loginPath = 'pivot$login';
+pivot$login;
 cross.addReform(relogin(user.loginPath))
 data.setReporter(function (m, t) {
     alert(m, t);

package/coms/compile/Javascript.js

@@ -220,6 +220,10 @@ var fixType = function (o) {
                     type = EXPRESS;
                     break;
                 }
+                if (last.type === EXPRESS && last === queue[queue.length - 1]) {
+                    type = STRAP;
+                    break;
+                }
                 var qp = queue.prev;
                 if (qp?.type === STRAP && qp.text === 'await') qp = qp.prev;
                 if (qp?.type === STRAP && qp.text === 'for') type = STRAP;

package/coms/compile/Javascript_test.js

@@ -59,9 +59,9 @@ var ts = new Javascript;
 ts.straps.push('interface', 'implements', "declare", "module", "readonly", "enum", 'type');
 ts.tags[0].push("{")
 ts.lbtype = false;
-var testTypescript = function (text) {
+var testTypescript = function (text, exp = text) {
     var s = scanner2(text, ts);
-    return assert(s.toString(), text);
+    return assert(s.toString(), exp);
 }
 testTypescript(`const strict: Omit<typeof assert, 'equal' | 'notEqual' | 'deepEqual' | 'notDeepEqual' | 'ok' | 'strictEqual' | 'deepStrictEqual' | 'ifError' | 'strict'> & {
     (value: unknown, message?: string | Error): asserts value;
@@ -124,6 +124,7 @@ a ? function () {} : function () {}
 declare module 'buffer' {}
 a <= 1;
 `)
+testTypescript(`;(t=~~t)<0?(t+=r)<0&&(t=0):t>r&&(t=r)`, "; (t = ~~t) < 0 ? (t += r) < 0 && (t = 0) : t > r && (t = r)")
 testTypescript(`
     var a: TypeA
     var a: TypeA, b: TypeB

package/coms/compile/Program.js

@@ -852,7 +852,7 @@ class Program {
                     }
                 }
                 else if (stamp_reg.test(m) && last) {
-                    if (last.type === STAMP && m === last.text) 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;
                     }
@@ -891,6 +891,10 @@ class Program {
                         case EXPRESS:
                             break test;
                         case SCOPED:
+                            if (last.isExpress && powermap[m] <= powermap["++"]) {
+                                break test;
+                            }
+                            console.log(last.isExpress, queue.inExpress, last.entry, last.prev?.text, m);
                             if (queue.inExpress && !iscomment) break test;
                             break;
                         case STAMP:
@@ -952,6 +956,7 @@ class Program {
                 continue;
             }
             if (space_reg.test(m)) {
+                if (cache_stamp) push_stamp();
                 if (/[\r\n\u2028\u2029]/.test(m)) {
                     if (last && last.isend === false) {
                         last.isend = true;
@@ -1109,6 +1114,15 @@ class Program {
                         }
                     }
                     if (!last || last.type !== STRAP && last.isExpress || last.transive) queue.inExpress = true;
+                    else if (last.type === STAMP) {
+                        if (last.text === "*") {
+                            var lp = last.prev;
+                            if (lp.type !== STRAP || !/^(async|function)$/.test(lp.text)) queue.inExpress = true;
+                        }
+                        else {
+                            queue.inExpress = true;
+                        }
+                    }
                     scope.isExpress = queue.inExpress;
                     scope.inExpress = true;
                 }
@@ -1159,7 +1173,7 @@ class Program {
             var last = queue.last || queue;
             console.warn(
                 "代码异常结束", createString(origin.slice(0, 30)),
-                `\r\n - 祖先标记: ${parents.slice(1).map(p => `<red2>${p.tag || p.text || ""}${p.entry || ""}</red2><gray>${p.row}:${p.col}</gray>`).join('')}`,
+                `\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))}`,
             );

package/coms/compile/common.js

@@ -886,32 +886,20 @@ var createScoped = function (parsed, wash) {
                 else if (isArraw) {
                     var n = skipAssignment(o);
                     scoped.arraw = o;
-                    var u = o;
                     while (o !== n) {
                         var n1 = run(o, 0);
-                        if (o === n1 || n1 && n1.entry === '{') o = getnext(n1);
+                        if (n1 === o || n1?.entry === "{") o = getnext(n1);
                         else o = n1;
                     }
                 }
                 else {
-                    do {
-                        if (o.type === STAMP && o.text === ";") break;
-                        o = run(o, 0);
-                        if (!o) break;
-                        var n = getnext(o);
-                        if (!n) break;
-                        var e = o;
-                        var p = getprev(o);
-                        if (o.type === STAMP && /^(\+\+|\-\-)$/.test(o.text) && p?.type === EXPRESS
-                            || (VALUE | QUOTED | SCOPED) & o.type
-                            || EXPRESS === o.type && !needfoot_reg.test(o.text)) {
-                            if ((VALUE | QUOTED | PROPERTY | LABEL) & n.type) break;
-                            if (EXPRESS === n.type && !/^[\.\[]/.test(n.text)) break;
-                            if (n.type === SCOPED && n.brace) break;
-                            if (n.type === STRAP && !n.isExpress) break;
-                        }
-                        o = n;
-                    } while (o);
+                    var n = skipAssignment(o);
+                    var n1 = o;
+                    while (n1 && n1 !== n) {
+                        o = n1;
+                        n1 = run(n1, 0);
+                        if (n1) n1 = getnext(n1);
+                    }
                 }
                 var map = isFunction ? vars : lets;
                 var keepscope = !!scoped.body || !!scoped.head;

package/coms/compile/common_test.js

@@ -43,3 +43,4 @@ testPickSentence(`if(a)try{}catch{} else if(a);`, 0, "if (a) try {} catch {} els
 assert(common.createString(common.pickArgument(scanner2(`a={a:1,c:d}`)[2][4])), 'c: d')
 assert(common.createString(common.pickArgument(scanner2(`a=class{a=1\r\nc=d}`)[3][4])), 'c = d')
 assert(common.createString(common.pickArgument(scanner2(`(a=1,c=d)`)[0][4])), 'c = d')
+assert(scanner2(`for (let len of codeLengths) if (len) count[len]++;`).envs, { len: undefined })

package/coms/docs/helps.js

@@ -42,6 +42,7 @@ var helps = [
     ["-", i18n`从可执行文件的扫描路径中移除指定的路径`, "pathxrm PATHNAME"],
     ["-", i18n`设置远程访问的密码`, "password"],
     ["-", i18n`创建windows平台的一键安装包`, "packwin|packexe PUBLIC_PATH PACKAGE_PATH"],
+    ["-", i18n`压缩到zip文件`, "packzip|zip PUBLIC_PATH PACKAGE_PATH"],
     ["-", i18n`从压缩文件提取源文件`, "unpack PACKAGE_PATH PUBLIC_PATH"]
 ];
 helps.forEach((h, cx) => {

package/coms/kugou/krc.js

@@ -129,7 +129,7 @@ function createLRC(lrc) {
     krcList.rows = saved_rows;
     return krcList;
 }
-
+var metadata = hookmedia() || document;
 function setClass(krcList, index) {
     var ele = krcList[index];
     krcList.slice(0, index).map(function (a, cx, arr) {
@@ -139,7 +139,8 @@ function setClass(krcList, index) {
     removeClass(ele, "after before after-active before-active");
     addClass(krcList[index - 1], 'before-active');
     addClass(ele, "active");
-    if (ele.innerText) document.title = ele.innerText;
+    if (ele.innerText) metadata.title = ele.innerText;
+    else metadata.title = '';
     krcList.slice(index + 1).map(function (a) {
         removeClass(a, "before active after-active before-active");
         addClass(a, "after");

package/coms/kugou/musicList.js

@@ -16,6 +16,8 @@ var isSameSong = function (m1, m2) {
         m1.url && String(m1.url).replace(/#[\s\S]*$/, '') === String(m2.url).replace(/#[\s\S]*$/, '');
 };
 
+var metadata = hookmedia();
+
 function addMethod(name, func) {
     Object.defineProperty(musicList, name, {
         value: func,
@@ -29,6 +31,13 @@ addMethod("setActive", function (m) {
         }
         actived = m;
     }
+    if (actived && metadata) {
+        metadata.title = actived.songName || actived.name || actived.title;
+        metadata.artist = actived.singerName || actived.singer;
+        if (actived.avatar) metadata.artwork = [{
+            src: actived.avatar
+        }]
+    }
 });
 addMethod("remove", function (music) {
     for (var cx = this.length - 1; cx >= 0; cx--) {

package/coms/{frame → pivot}/login.xht

@@ -83,7 +83,7 @@
                     remove(page);
                 } else {
                     user.login({});
-                    go('/main');
+                    zimoli();
                 }
             } catch (e) {
                 console.log(e);

package/coms/zimoli/contextmenu.js

@@ -47,6 +47,7 @@ function contextmenu(target, menuItems) {
         start(event) {
             if (event.defaultPrevented || event.type === 'mousedown') return;
             clearTimeout(menuHandle);
+            if (tm) remove(tm);
             menuHandle = setTimeout(function () {
                 var e = createEvent("contextmenu", true);
                 e.clientX = event.clientX;
@@ -77,8 +78,15 @@ function contextmenu(target, menuItems) {
         if (document.activeElement === this) return;
         _remove(this);
     }, 60);
+    var lastMenuTime = 0;
     on("contextmenu")(target, function (event) {
         if (event.defaultPrevented) return;
+        var now = +new Date;
+        if (lastMenuTime + 300 > now) {
+            event.preventDefault();
+            return;
+        }
+        lastMenuTime = now;
         event.preventDefault();
         if (tm) remove(tm), tm = null;
         tm = showContext(event);

package/coms/zimoli/hookmedia.js

@@ -0,0 +1,29 @@
+var hooked = false;
+var keydown = code => function () {
+    var event = document.createEvent("KeyboardEvent");
+    Object.defineProperty(event, 'keyCode', { value: code });
+    event.initEvent("keydown", false, false);
+    dispatch(window, event);
+};
+try {
+    var { mediaSession } = navigator;
+} catch { }
+if (!mediaSession) return function () { };
+var metadata = window.MediaMetadata ? new window.MediaMetadata : null;
+return function () {
+    if (hooked) return metadata;
+    hooked = true;
+    var Next = 176;
+    var Prev = 177;
+    var pause = 179;
+    var play = 179;
+    var volumeup = 175;
+    var volumedown = 174;
+    var mute = 173;
+    mediaSession.setActionHandler('play', keydown(play));
+    mediaSession.setActionHandler('pause', keydown(pause));
+    mediaSession.setActionHandler("nexttrack", keydown(Next));
+    mediaSession.setActionHandler("previoustrack", keydown(Prev));
+    if (metadata) mediaSession.metadata = metadata;
+    return metadata;
+};

package/coms/zimoli/on.js

@@ -491,24 +491,34 @@ var invoke = function (event, type, pointerType) {
     var onclick = on("click");
     var onmousedown = on("mousedown");
     var onmousemove = on("mousemove");
-    var pointerX, pointerY, lasttime_click;
+    var mouseX, mouseY, touchX, touchY, lasttime_click;
     var needFireClick = false;
     var isClickWithPointer = false;
     var touchendFired = false;
-    function clickstart(event) {
+    function clickstart() {
         needFireClick = true;
         touchendFired = false;
         isClickWithPointer = true;
         onclick.preventClick = false;
-        pointerX = event.clientX, pointerY = event.clientY;
     }
     var dis = (a, b) => a * a + b * b
     function clickcancel(event) {
-        if (!event || (event.which || event.touches) && dis(event.clientX - pointerX, event.clientY - pointerY) >= MOVELOCK_DELTA * MOVELOCK_DELTA) {
+        if (!event
+            || event.touches && dis(event.clientX - touchX, event.clientY - touchY) >= MOVELOCK_DELTA * MOVELOCK_DELTA
+            || event.which && dis(event.clientX - mouseX, event.clientY - mouseY) >= MOVELOCK_DELTA * MOVELOCK_DELTA
+        ) {
             onclick.preventClick = true;
         }
     }
-    onmousedown(window, clickstart, true);
+    function mousestart(event) {
+        clickstart();
+        mouseX = event.clientX, mouseY = event.clientY;
+    }
+    function touchstart(event) {
+        clickstart();
+        touchX = event.clientX, touchY = event.clientY;
+    }
+    onmousedown(window, mousestart, true);
 
     onmousemove(window, clickcancel, true);
     if (window.addEventListener) {
@@ -522,7 +532,7 @@ var invoke = function (event, type, pointerType) {
                 return;
             }
             extendTouchEvent(event);
-            clickstart.call(this, event);
+            touchstart.call(this, event);
         }, true);
         window.addEventListener("touchend", function (event) {
             if (event.touches.length > 1) return;

package/coms/zimoli/vbox.js

@@ -148,12 +148,17 @@ function ybox(generator) {
         var wheelTime = 0;
         onmousewheel(_box, function (event) {
             event.preventDefault();
-            if (event.timeStamp - wheelTime > 40 && Math.abs(event.deltaY) < 12) {
-                wheelTime = event.timeStamp;
+            var isNew = event.timeStamp - wheelTime > 120;
+            wheelTime = event.timeStamp;
+            var absY = Math.abs(event.deltaY);
+            if (isNew && absY < 12) {
                 return;
             }
             if (event.moveLocked) return;
             var deltay = -event.deltaY;
+            if (isNew && absY > 80 && (absY | 0) === absY) {
+                deltay /= 3;
+            }
             if (!deltay && _box.bindX) deltay = -event.deltaX;
             event.moveLocked = true;
             var box;

package/coms/zimoli/zimoli.js

@@ -382,11 +382,11 @@ function create(pagepath, args, from, needroles, zimolidata) {
         _pageback_listener = handler;
     };
     var _page = pg.call(state, args, from);
-    _page.realpath = state.realpath;
-    _page.basepath = state.basepath;
-    _page.pagepath = pagepath;
     if (undefined === args || null === args) args = {};
     if (_page) {
+        _page.realpath = state.realpath;
+        _page.basepath = state.basepath;
+        _page.pagepath = pagepath;
         var page_with = _with_elements.splice(_with_length, _with_elements.length - _with_length);
         if (_page.with && _page.with !== _with_elements) {
             page_with = page_with.concat(_page.with);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.29.0",
+    "version": "4.30.0",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {
@@ -10,7 +10,7 @@
         "efront": "public/efront.js"
     },
     "scripts": {
-        "prepack": "node tools/build-efront.js --node --no-target"
+        "prepack": "node tools/build-efront.js --node --no-target&node public/efront build 文件系统.html"
     },
     "repository": {
         "type": "git",