efront 4.32.4 → 4.33.1

package/coms/compile/Javascript.js

@@ -877,6 +877,206 @@ Javascript.prototype.newVar = function (used, string_template) {
     used[name] = [];
     return name;
 }
+var newSpreadDeclared = false;
+var newSpread = function (code) {
+    var c = code.first;
+    while (c) {
+        var n = c.next, q = null;
+        if (c.type === STRAP && c.text === "new") {
+            var t = snapExpressFoot(c);
+            if (n) do {
+                if (n.type === SCOPED) {
+                    if (n.entry === '{') break;
+                    if (n.entry === "(") {
+                        q = n;
+                        break;
+                    }
+                }
+                if (n === t) break;
+                n = n.next;
+            } while (n);
+            if (q) {
+                convertNewSpread(c, q);
+                c = q;
+                continue;
+            }
+            c = c.next;
+            continue;
+        }
+        if (c.type & (SCOPED | QUOTED) && c.length) {
+            newSpread(c);
+        }
+        c = n;
+    }
+};
+var convertNewSpread = function (c, q) {
+    var qf = q.first;
+    if (!qf) return;
+    if (qf.text !== "...") return;
+    var qfn = qf.next;
+    if (qfn.type !== SCOPED || qfn.entry !== "{" || qfn !== q.last) return;
+    var qfi = q.indexOf(qf);
+    var qni = q.indexOf(qfn, qfi);
+    splice(q, qfi, qni + 1 - qfi);
+    var o = qfn.first;
+    if (!o) {
+        splice(q, qfi, 0, ...qfn);
+        setqueue(q);
+        return;
+    }
+    var nq = [];
+    var dist = nq;
+    var pushProps = function (qfn) {
+        var inProperty = true;
+        var doted = function () {
+            var ext = scan(`&extend("\\new",)`);
+            nq.push(ext[0], ext[1]);
+            dist = ext[1];
+            inProperty = false;
+        }
+        var defines = Object.create(null);
+        var get = false, set = false, async = null, aster = null, name;
+        for (var o of qfn) {
+            if (o.type === STAMP && o.text === ',') {
+                inProperty = true;
+                get = false, set = false, async = false, aster = false;
+                name = undefined;
+                if (dist !== nq) relink(dist), setqueue(dist), dist = nq;
+                nq.push(o);
+                continue;
+            }
+            if (!inProperty) {
+                dist.push(o);
+                continue;
+            }
+            if (o.type & (STRAP | STAMP)) {
+                switch (o.text) {
+                    case "get": get = true; break;
+                    case "set": set = true; break;
+                    case "async": async = o; break;
+                    case "*": aster = o; break;
+                    case "...":
+                        doted();
+                        break;
+                    case ":":
+                        inProperty = false;
+                        nq.push(
+                            { type: EXPRESS, text: "\\new" },
+                            name,
+                            { type: STAMP, text: '=' }
+                        );
+                        break;
+                }
+                continue;
+            }
+            if (o.type & (PROPERTY | EXPRESS)) {
+                if (/^\.\.\./.test(o.text)) {
+                    o.text = o.text.slice(3);
+                    doted();
+                    dist.push(o);
+                    continue;
+                }
+                if (o.short) {
+                    delete o.short;
+                    nq.push(
+                        { type: EXPRESS, text: "\\new." + o.text },
+                        { type: STAMP, text: "=" },
+                        o
+                    );
+                }
+                else {
+                    o.type = EXPRESS;
+                    o.text = "." + o.text;
+                    name = o;
+                }
+                continue;
+            }
+            if (o.type === SCOPED) {
+                if (o.entry = "[") {
+                    name = o;
+                    continue;
+                }
+                if (o.entry = "(") {
+                    if (get || set) {
+                        var key = name.type !== SCOPED || name.first === name.last ? createString(name) : null;
+                        dist = key ? defines[key] : null;
+                        if (!dist) {
+                            dist = scan(`&defineProperty(\\new,,{})`);
+                            nq.push(dist[0], dist[1]);
+                            if (name.type === SCOPED) {
+                                if (name.first === name.last) dist[1].splice(2, 0, ...name);
+                                else {
+                                    name.entry = "(";
+                                    name.leave = ")";
+                                    dist[1].splice(2, 0, name);
+                                    relink(dist[1]);
+                                    setqueue(dist[1]);
+                                }
+                            }
+                            dist = dist[1].last;
+                            if (key) defines[key] = dist;
+                        }
+                        if (dist.length) {
+                            dist.push({ type: STAMP, text: ',' });
+                        }
+                        if (get) {
+                            dist.push(
+                                { type: PROPERTY, text: "get" }
+                            );
+                        }
+                        if (set) {
+                            dist.push(
+                                { type: PROPERTY, text: "set" }
+                            )
+                        }
+                        dist.push(
+                            { type: STAMP, text: ":" },
+                        )
+                    }
+                    else {
+                        nq.push(
+                            { type: EXPRESS, text: '\\new' },
+                            name,
+                            { type: STAMP, text: "=" }
+                        );
+                    }
+                    if (async) dist.push(async);
+                    dist.push(
+                        { type: STRAP, text: "function" },
+                    )
+                    if (aster) dist.push(aster);
+                    inProperty = false;
+                    continue;
+                }
+            }
+            if (o.type & (COMMENT | SPACE)) {
+                nq.push(o);
+                continue;
+            }
+            throw new Error('代码结构异常！');
+        }
+    }
+    pushProps(qfn);
+    var i = nq.length - 1;
+    while (i > 0 && nq[i].type & (COMMENT | SPACE)) i--;
+    var nqe = nq[i];
+    if (nqe.type !== STAMP || nqe.text !== ',') nq.push({ type: STAMP, text: ',' });
+    newSpreadDeclared = true;
+    var cq = c.queue;
+    var ci = cq.indexOf(c);
+    var qi = cq.indexOf(q, ci);
+    var cn = splice(cq, ci, qi - ci);
+    splice(q, 0, 0, { type: EXPRESS, text: "\\new" }, { type: STAMP, text: "=" }, ...cn, { type: STAMP, text: ',' }, ...nq, { type: EXPRESS, text: '\\new' });
+    relink(q);
+    setqueue(q);
+};
+Javascript.prototype.newSpread = function (code) {
+    newSpreadDeclared = false;
+    newSpread(code);
+    if (newSpreadDeclared) {
+        splice(code, code.length, 0, { type: STRAP, text: 'var' }, { type: EXPRESS, text: "\\new" }, { type: STAMP, text: ";" });
+    }
+};
 Javascript.prototype.fix = function (code) {
     var hasExport = false;
     backEach(code, function (o, i) {

package/coms/compile/scanner2.js

@@ -102,6 +102,9 @@ class Code extends Array {
         var last = skipSentenceQueue(this.first);
         return this.last === last || !last;
     }
+    newSpread() {
+        return this.program.newSpread(this);
+    }
     fix() {
         return this.program.fix(this);
     }

package/coms/compile/unstruct.js

@@ -821,14 +821,17 @@ var ternary = function (body, getname, ret) {
                 }
                 pushstep(d, stepReturn(1, 0, d));
                 pushstep(c, stepReturn(d.length + 1, 0, c));
+                var qe = new Node({
+                    type: VALUE,
+                    text: "1",
+                    isdigit: true,
+                });
                 pushstep(explist, rescan.keep`if (${getCondition(b, function (b) {
                     b = ternary(b, getnextname, true);
                     for (var b of b) pushstep(explist, b);
                     return b;
-                }, true)}) return [1, 0]`);
-                var q = explist[explist.length - 1];
+                }, true)}) return [${qe}, 0]`);
                 var qi = explist.length - 1;
-                var qe = q[q.length - 1];
                 if (c.length) {
                     pushstep(explist, c[0]);
                     explist.push(...c.slice(1));

package/coms/compile/unstruct_test.js

@@ -12,9 +12,9 @@ function test(codetext, expect, ret = false) {
 test('var o = loaded[f.name] = f.isFile() ? new File(p, rebuild, limit) : new Directory(p, rebuild, limit)', "_ = f.name; _0 = f.isFile(); if (!_0) return [1, 0]; _0 = new File(p, rebuild, limit); loaded[_] = _0; o = _0; return [2, 0];\r\n _0 = new Directory(p, rebuild, limit); loaded[_] = _0; o = _0; return [1, 0]");
 test('a+b', "a + b");
 test('var a = b', "a = b");
-test('if(this){}',`if (!this) return [1, 0]; return [1, 0]`);
-test('if(!this){}',`if (this) return [1, 0]; return [1, 0]`);
-test('if(arguments){}',`if (!arguments) return [1, 0]; return [1, 0]`);
+test('if(this){}', `if (!this) return [1, 0]; return [1, 0]`);
+test('if(!this){}', `if (this) return [1, 0]; return [1, 0]`);
+test('if(arguments){}', `if (!arguments) return [1, 0]; return [1, 0]`);
 test('a | c & b', "_ = c & b, a | _");
 test('a + !c', "_ = !c, a + _");
 test('a + b * c', "_ = b * c, a + _");
@@ -71,6 +71,7 @@ test("for(var a in b) a.push()", "for (var a in b) a.push()", true);
 test("for(;;)", "return [0, 0]", true);
 test("for(a in b)", "for (a in b)", true);
 test("for(a of b)", "for (a of b)", true);
+test(`var [size, names] = memery.SIGNITEMS? await enpack(readfrom, hd, 7, key, cert) : await enpack(readfrom, hd, 7);`, 'if (!memery.SIGNITEMS) return [2, 0]; _ = enpack(readfrom, hd, 7, key, cert); return [_, 1];\r\n _ = @; [size, names] = _; return [3, 0];\r\n _ = enpack(readfrom, hd, 7); return [_, 1];\r\n _ = @; [size, names] = _; return [1, 0] ', true)
 test("for await(a of b)", "for await (a of b)", true);
 test("for(a = os[Symbol.iterator] || os[Symbol.asyncIterator] || Array.prototype[Symbol.iterator], a = a.call(os), b = a.next(); !b.done && (o = b.value, true); b = a.next())", "_ = Symbol.iterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.asyncIterator; _ = os[_]; if (_) return [1, 0]; _ = Symbol.iterator; _ = Array.prototype[_];\r\n a = _; a = a.call(os); b = a.next(); return [1, 0];\r\n _ = !b.done; if (!_) return [1, 0]; o = b.value; _ = true;\r\n if (!_) return [1, 0]; b = a.next(); return [-1, 0]", true);
 test("for(a=0;a<1;a++)if(a==0)continue\r\n else a=1", `a = 0; return [1, 0];\r\n _ = a < 1; if (!_) return [2, 0]; _ = a == 0; if (_) return [1, 0]; a = 1; return [1, 0];\r\n _ = a++; return [-1, 0]`, true);
@@ -157,7 +158,7 @@ test(`c=b+ !a`, "_ = !a, c = b + _");
 test(`do {var loadcount = 0;} while (loadcount !== 0);`, `loadcount = 0; _ = loadcount !== 0; if (_) return [0, 0]`);
 test("if(a)try{a}catch{};a;", 'if (!a) return [4, 0]; return [1, 7];\r\n a; return [0, 9];\r\n return [1, 9];\r\n return [1, 0];\r\n a');
 test("url = (o===void 0||o===null?void 0:o.url)", '_ = void 0, _ = o === _; if (_) return [1, 0]; _ = o === null;\r\n if (!_) return [1, 0]; _ = void 0; return [2, 0];\r\n _ = o.url; return [1, 0];\r\n url = _', true);
-test("p ? (ishttps ? `https` : `http`).toUpperCase() + i18n`端口` + (ishttps ? ': ' : ':  ') + p : ''", "if (!p) return [1, 0]; if (!ishttps) return [1, 0]; _1 = `https`; return [2, 0];\r\n _1 = `http`; return [1, 0];\r\n _ = _1.toUpperCase(); _0 = i18n`端口`, _ = _ + _0; if (!ishttps) return [1, 0]; _2 = ': '; return [2, 0];\r\n _2 = ':  '; return [1, 0];\r\n _0 = _2, _ = _ + _0, _ = _ + p; return [2, 0];\r\n ''; return [1, 0]")
+test("p ? (ishttps ? `https` : `http`).toUpperCase() + i18n`端口` + (ishttps ? ': ' : ':  ') + p : ''", "if (!p) return [5, 0]; if (!ishttps) return [1, 0]; _1 = `https`; return [2, 0];\r\n _1 = `http`; return [1, 0];\r\n _ = _1.toUpperCase(); _0 = i18n`端口`, _ = _ + _0; if (!ishttps) return [1, 0]; _2 = ': '; return [2, 0];\r\n _2 = ':  '; return [1, 0];\r\n _0 = _2, _ = _ + _0, _ = _ + p; return [2, 0];\r\n ''; return [1, 0]")
 r++// test("if(a)else {}",'')
 test("if(a){if(b){c}d}else{e}", `if (!a) return [2, 0]; if (!b) return [1, 0]; c; return [1, 0];\r\n d; return [2, 0];\r\n e; return [1, 0]`)
 test("if(a){if(b){c}else{d}}else{e}", `if (!a) return [3, 0]; if (!b) return [1, 0]; c; return [2, 0];\r\n d; return [1, 0];\r\n return [2, 0];\r\n e; return [1, 0]`)

package/coms/frame/route.js

@@ -16,7 +16,7 @@
     var parseName = function (k) {
         var icon, name, hotkey;
         if (/(^|\s+)\./.test(k)) {
-            k = k.replace(/(?:^|\s+)\.([^\s,"'`]+)/, (_, m) => {
+            k = k.replace(/(^\s*\.[^\s,"'`]+\s*|\s+\.[^\s,"'`]+)/, (_, m) => {
                 icon = m;
                 return '';
             });
@@ -41,7 +41,7 @@
         }
         if (!name) name = k;
         var item = {};
-        if (icon) item.icon = icon.replace(/\./g, ' ');
+        if (icon) item.icon = icon.replace(/\./g, ' ').trim();
         item.name = name;
         if (hotkey) {
             hotkey = hotkey.split(',');

package/coms/pivot/acme2.js

@@ -57,32 +57,7 @@ var request = async function (id, params) {
     var account = await data1.from(id, params);
     return account;
 };
-var ASN1 = function (type) {
-    var length = 0;
-    var bytesarr = [];
-    for (var cx = 1, dx = arguments.length; cx < dx; cx++) {
-        var bytes = arguments[cx];
-        if (bytes.constructor !== Array) {
-            bytes = Array.apply(null, bytes);
-        }
-        bytesarr.push(bytes);
-        length += bytes.length;
-    }
-    var asn1 = [type];
-    if (length > 127) {
-        var nums = [];
-        while (length > 0) {
-            nums.unshift(length & 0xff);
-            length = length >>> 8;
-        }
-        asn1.push(0x80 | nums.length, ...nums);
-    }
-    else {
-        asn1.push(length);
-    }
-    asn1 = asn1.concat(...bytesarr);
-    return asn1;
-};
+
 var packUint = function (bytes) {
     if (bytes[0] & 0x80) {
         return ASN1(0x02, [0], bytes);

package/coms/third-party/lzma.js

@@ -1,4 +1,4 @@
-
+var URL = this.URL;
 var Module = typeof Module != "undefined" ? Module : {};
 var quit_ = (status, toThrow) => { throw toThrow };
 var scriptDirectory = "";
@@ -19,8 +19,6 @@ readAsync = async (filename, binary = true) => {
     var ret = fs.readFileSync(filename, binary ? undefined : "utf8");
     return ret
 };
-if (process.argv.length > 1) { thisProgram = process.argv[1].replace(/\\/g, "/") }
-arguments_ = process.argv.slice(2);
 if (typeof module != "undefined") { module["exports"] = Module }
 quit_ = (status, toThrow) => {
     process.exitCode = status;
@@ -45,7 +43,6 @@ function preRun() {
     callRuntimeCallbacks(onPreRuns)
 }
 function initRuntime() {
-    runtimeInitialized = true;
     wasmExports["c"]()
 }
 function postRun() {

package/coms/zimoli/menu.less

@@ -101,10 +101,10 @@ body:active & {
     menu-item {
         line-height: 24px;
         display: inline-block;
-
+        
         &.has-children:after {
-            padding-top: 3px;
             content: "﹀";
+            padding-top: .3em;
         }
     }
 
@@ -155,7 +155,8 @@ body:active & {
         line-height: 20px;
         font-size: 14px;
         border-radius: 0;
-/*
+
+        /*
 狗物业弄了电子门禁还嫌不够，连人行道也弄个一人一杆。
 住在这里就像住在监狱，随时都可能被限制人身自由。
 狗日的共产党还和狗物业尿到一个壶里。
@@ -190,12 +191,12 @@ body:active & {
 
         &.open {
             background: #1e282c;
-            
+
             & s:after {
                 top: -9.2px;
             }
         }
-        
+
         &.checked,
         &.actived,
         &.selected {

package/coms/zimoli/menuList.less

@@ -46,6 +46,7 @@
             padding-left: 16px;
 
             &:after {
+                font-family: monospace;
                 content: ">";
                 display: block;
                 width: 20px;

package/coms/zimoli/popup.js

@@ -329,7 +329,7 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
             css(_rhomb, temp);
             _rhomb.setSide(side);
         }
-        var targetX = position.left - parseFloat(getComputedStyle(element).paddingLeft);
+        var targetX = position.left;
         if (targetX < 0) {
             css(element, `left:0;right:auto`);
             if (_rhomb) css(_rhomb, `left:${fromOffset(position.left + position.width / 2)};right:auto`);

package/debug.log

@@ -0,0 +1,3 @@
+[1106/041816.465:ERROR:registration_protocol_win.cc(102)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
+[1114/175715.384:ERROR:registration_protocol_win.cc(102)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)
+[1115/022347.226:ERROR:registration_protocol_win.cc(102)] CreateFile: ϵͳ�Ҳ���ָ�����ļ��� (0x2)

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.32.4",
+    "version": "4.33.1",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {