efront 4.5.4 → 4.5.8

package/coms/compile/Javascript.js

@@ -27,6 +27,8 @@ const {
     setqueue,
     replace,
     skipAssignment,
+    insertAfter,
+    unshort,
 } = require("./common");
 var straps = `if,in,do,as,of
 var,for,new,try,let,get,set
@@ -409,42 +411,7 @@ Javascript.prototype.setType = function (o) {
         }
     }
 };
-var insertBefore = function (o) {
-    var queue = this || o.queue;
-    var index = queue.indexOf(o);
-    var os = [].slice.call(arguments, 1);
-    queue.splice.apply(queue, [index, 0].concat(os));
-    var prev = o && o.prev, next = o;
-    var desc = { value: queue, configurable: true, enumerable: false }
-    for (var o of os) {
-        if (prev) prev.next = o;
-        else queue.first = o;
-        o.prev = prev;
-        Object.defineProperty(o, 'queue', desc);
-        prev = o;
-    }
-    o.next = next;
-    if (next) next.prev = o;
-    else queue.last = o;
-}
-var insertAfter = function (o) {
-    var queue = this || o.queue;
-    var index = queue.indexOf(o) + 1;
-    var os = [].slice.call(arguments, 1);
-    queue.splice.apply(queue, [index, 0].concat(os));
-    var prev = o, next = o && o.next;
-    var desc = { value: queue, configurable: true, enumerable: false }
-    for (var o of os) {
-        if (prev) prev.next = o;
-        else queue.first = o;
-        o.prev = prev;
-        Object.defineProperty(o, 'queue', desc);
-        prev = o;
-    }
-    o.next = next;
-    if (next) next.prev = o;
-    else queue.last = o;
-};
+
 var js = new Javascript;
 var scan = function (data) {
     js.lastIndex = 0;
@@ -506,10 +473,10 @@ var removeQuote = function (o, c, i) {
     if (c.next) c.next.prev = cf;
 }
 
-Javascript.prototype.detour = function (o, ie) {
+Javascript.prototype.detour = function (body, ie) {
     context = this;
     var envs = rootenvs = Object.create(null);
-    detour(o, ie);
+    detour(body.first, ie);
     rootenvs = null;
     context = null;
     return envs;
@@ -556,7 +523,8 @@ function detour(o, ie) {
                         var s = getfunc(o, 'arguments').scoped;
                         s.used.arguments.push(...s1.used.arguments);
                     };
-                    o = replace(o, ...o1);
+                    replace(o, ...o1);
+                    o = o1.last;
                     continue;
                 }
                 text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || context.strap_reg.test(a) || /#/.test(a) ? `[${strings.recode(a)}]` : _);
@@ -642,10 +610,7 @@ function detour(o, ie) {
                         collectProperty(o, text);
                     }
                     if (o.short) {
-                        insertBefore.call(o.queue, o, { text: text, short: false, isprop: true, type: PROPERTY }, { text: ':', type: STAMP });
-                        o.isprop = false;
-                        o.type = EXPRESS;
-                        delete o.short;
+                        unshort(o);
                     }
                     else {
                         o.text = text;

package/coms/compile/common.js

@@ -471,12 +471,7 @@ var createScoped = function (parsed, wash) {
                 case STAMP:
                     break;
                 case PROPERTY:
-                    if (o.next) {
-                        if (o.next.type !== STAMP || o.next.text !== ",") break;
-                    }
-                    if (o.prev && o.prev.type === STRAP && o.prev.text === 'as') {
-                        break;
-                    }
+                    if (!o.short) break;
                 case VALUE:
                     if (o.isdigit || /^(null|false|true)$/.test(o.text)) break;
                 case EXPRESS:
@@ -973,7 +968,11 @@ var saveTo = function (used, k, o) {
 var mergeTo = function (used, used0) {
     for (var k in used0) {
         var v = used0[k];
-        for (var s of v) saveTo(used, k, s);
+        if (!used[k]) used[k] = [];
+        var u = used[k];
+        for (var s of v) {
+            u.push(s);
+        }
     }
 };
 var breakSpace = function (o) {
@@ -1443,7 +1442,48 @@ var pickSentence = function (o) {
     } while (h !== e);
     return res;
 };
-
+var insertBefore = function (o) {
+    var queue = this || o.queue;
+    var index = queue.indexOf(o);
+    var os = [].slice.call(arguments, 1);
+    queue.splice.apply(queue, [index, 0].concat(os));
+    var prev = o && o.prev, next = o;
+    var desc = { value: queue, configurable: true, enumerable: false }
+    for (var o of os) {
+        if (prev) prev.next = o;
+        else queue.first = o;
+        o.prev = prev;
+        Object.defineProperty(o, 'queue', desc);
+        prev = o;
+    }
+    o.next = next;
+    if (next) next.prev = o;
+    else queue.last = o;
+}
+var insertAfter = function (o) {
+    var queue = this || o.queue;
+    var index = queue.indexOf(o) + 1;
+    var os = [].slice.call(arguments, 1);
+    queue.splice.apply(queue, [index, 0].concat(os));
+    var prev = o, next = o && o.next;
+    var desc = { value: queue, configurable: true, enumerable: false }
+    for (var o of os) {
+        if (prev) prev.next = o;
+        else queue.first = o;
+        o.prev = prev;
+        Object.defineProperty(o, 'queue', desc);
+        prev = o;
+    }
+    o.next = next;
+    if (next) next.prev = o;
+    else queue.last = o;
+};
+var unshort = function (o) {
+    insertBefore.call(o.queue, o, { text: o.text, short: false, isprop: true, type: PROPERTY }, { text: ':', type: STAMP });
+    o.isprop = false;
+    o.type = EXPRESS;
+    delete o.short;
+}
 module.exports = {
     /*   1 */COMMENT,
     /*   2 */SPACE,
@@ -1459,6 +1499,7 @@ module.exports = {
     /*2048 */ELEMENT,
     number_reg,
     equal_reg,
+    unshort,
     skipAssignment,
     getDeclared,
     remove,
@@ -1483,5 +1524,7 @@ module.exports = {
     skipFunction,
     isHalfSentence,
     splice,
+    insertAfter,
+    insertBefore,
     mergeTo
 };

package/coms/compile/patchlist.js

@@ -1,5 +1,9 @@
 var patchlist = function (prefix, list, alias) {
+    var cap = [];
     for (var o of list) {
+        if (cap.indexOf(o) < 0) cap.push(o);
+    }
+    for (var o of cap) {
         patchname(prefix, o, alias);
     }
 };

package/coms/compile/patchname.js

@@ -1,4 +1,8 @@
+var { QUOTED, unshort } = common;
 var patchname = function (prefix, node, alias) {
+    if (node.isprop && node.short) {
+        unshort(node);
+    }
     var t = node.text;
     var hasdot = /^\.\.\./.test(t);
     if (hasdot) t = t.slice(3);

package/coms/compile/scanner2.js

@@ -156,14 +156,14 @@ class Code extends Array {
     // 提前处理属性
     break() {
         this.program.avoidMap = avoidMap;
-        var envs = this.program.detour(this.first);
+        var envs = this.program.detour(this);
         if (this._scoped) extend(this.envs, envs);
         return this;
     }
     // 绕开低版本ie的异常属性
     detour(ie) {
         this.program.avoidMap = avoidMap;
-        var envs = this.program.detour(this.first, ie !== false);
+        var envs = this.program.detour(this, ie !== false);
         if (this._scoped) extend(this.envs, envs);
         return this;
     }

package/coms/compile/translate.js

@@ -91,6 +91,7 @@ var ctn = function (tt, t) {
     })
     return tn;
 }
+var warningMap = Object.create(null);
 function translate([imap, supports], code) {
     var texts = getI18nPrefixedText(code);
     texts.sort((a, b) => {
@@ -108,7 +109,7 @@ function translate([imap, supports], code) {
 
         var imp = imap[tt];
         if (!imp) {
-            if (warn !== false) console.warn(`<yellow>${i18n`国际化翻译缺失：`}</yellow>${tt}`);
+            if (warn !== false && !warningMap[tt]) warningMap[tt] = true, console.warn(`<yellow>${i18n`翻译缺失：`}</yellow>${tt}`);
             imp = imap[tt] = supports.map(_ => tt);
         }
         if (nodup && imp.length <= 1) nodup = false;

package/coms/compile//347/264/240/351/246/250.js

@@ -536,10 +536,11 @@ function evalscoped(scoped, base = '') {
                 k = removeSelectorSpace(k);
                 if (base && !p.rooted) p.base = fixBase(base, k);
                 else p.base = presets.test(k) ? `@{${k}}` : k;
-                if (p.vars) vlist.push(p.vars);
-                initvars(p.vars);
+                var vars = shallowClone(p.vars);
+                if (vars) vlist.push(vars);
+                initvars(vars);
                 var value = evalthis(p);
-                if (p.vars) vlist.pop();
+                if (vars) vlist.pop();
                 if (value.rest.length) rest = rest.concat(value.rest);
                 if (value.length) rest.push([p.base, '{', value.join(""), "}"]);
             }

package/coms/compile//347/264/240/351/246/250_test.js

@@ -73,3 +73,4 @@ assert(素馨(`a{@a:1px;@margin-x:@a+10px;m:-@margin-x}`), `a{m:-11px;}`);
 assert(素馨(`@media screen{&.a{b:1}}`,'a'), `@media screen{a.a{b:1;}}`);
 assert(素馨(`@media screen and(max-width:100px){&.a{b:1}}`,'a'), `@media screen and (max-width:100px){a.a{b:1;}}`);
 assert(素馨(`b{:not([resizing], [dragging]) {transition: padding .2s, margin .2s;}}`), `b :not([resizing], [dragging]){transition:padding .2s, margin .2s;}`);
+assert(素馨(`@a(@b){a@b{@w:@b/2;c:@w;}} @a(1); @a(2); @a(3)`),`a1{c:0.5;}\r\na2{c:1;}\r\na3{c:1.5;}`);

package/coms/docs/helps.js

@@ -1,5 +1,5 @@
 // <!--
-if (typeof i18n === "undefined") i18n = a => a;
+if (typeof i18n === "undefined") i18n = (a, ...b) => a[0] + b.map((c, i) => c + a[i + 1]).join(',');
 // -->
 var helps = [
     ["f", i18n`显示版本号`, "version", "-v", "--version"],

package/coms/pivot/acme2.js

@@ -155,7 +155,7 @@ var makeKeyPair = async function (modulusLength = 2048) {
     public_key = toBase64(new Uint8Array(public_key));
     return [private_key, public_key];
 };
-var subtle = this.crypto?.subtle;
+var subtle = globalThis.crypto?.subtle;
 var acme2 = new class {
     email = '';
     kid = '';
@@ -164,6 +164,11 @@ var acme2 = new class {
     domain = '';
     termsOfServiceAgreed = false;
     orders = [];
+    schadulePeriod = 90
+    nextUpdateTime = "";
+    lastUpdateTime = '';
+    schaduleEnabled = false;
+    enabled = !!subtle;
     public_key = '';
     get enabled() {
         return !!subtle;
@@ -179,22 +184,43 @@ var acme2 = new class {
         var unique = [private_key, public_key].join(',');
         await acme2.makeUnique(unique);
     }
+    async updateTime(update) {
+        if (!acme2.nextUpdateTime || update) {
+            if (!acme2.lastUpdateTime || new Date(acme2.lastUpdateTime) + 86400000 + acme2.schadulePeriod * 86400000 < Date.now()) {
+                acme2.nextUpdateTime = parseDate(Date.now() + +acme2.schadulePeriod * 86400000);
+            }
+            else {
+                acme2.nextUpdateTime = parseDate(new Date(acme2.lastUpdateTime) + +acme2.schadulePeriod * 86400000);
+            }
+        }
+        return new Date(acme2.nextUpdateTime);
+    }
     async makeUnique(unique) {
         if (!unique) return;
-        var avme2 = this;
+        var acme2 = this;
         var extra;
         [private_key, public_key, extra] = unique.split(',');
         if (extra) {
             extra = JSON.parse(decodeUTF8(fromBase64(extra)));
-            avme2.email = extra.email;
-            avme2.kid = extra.kid;
+            acme2.email = extra.email;
+            acme2.kid = extra.kid;
             if (extra.kid) {
                 var account = data.getUrlParamsForApi(accountApi, extra.kid);
-                avme2.aid = account.aid;
+                acme2.aid = account.aid;
             }
-            avme2.domain = extra.domain;
-            avme2.termsOfServiceAgreed = extra.termsOfServiceAgreed;
-            avme2.orders = extra.orders;
+            acme2.domain = extra.domain;
+            acme2.termsOfServiceAgreed = extra.termsOfServiceAgreed;
+            acme2.orders = extra.orders;
+            acme2.lastUpdateTime = parseDate(extra.lastUpdateTime);
+            acme2.nextUpdateTime = parseDate(extra.nextUpdateTime);
+            acme2.schadulePeriod = +extra.schadulePeriod || 80;
+            acme2.schaduleEnabled = extra.schaduleEnabled;
+            this.updateTime();
+        }
+        if (!this.enabled) {
+            public_key = null;
+            private_key = null;
+            return;
         }
         try {
             privateKey = await subtle.importKey("pkcs8", new Uint8Array(fromBase64(private_key)), {
@@ -205,18 +231,21 @@ var acme2 = new class {
                 name: RSASSA_PKCS1_v1_5,
                 hash: "SHA-256",
             }, true, ["verify"]);
-
-            avme2.public_key = public_key;
+            acme2.public_key = public_key;
         } catch (e) { alert("加载服务器公钥异常！", "error"); throw e }
     }
     pickUnique() {
-        var avme2 = this;
+        var acme2 = this;
         var extra = {
-            kid: avme2.kid,
-            email: avme2.email,
-            domain: avme2.domain,
-            orders: avme2.orders,
-            termsOfServiceAgreed: avme2.termsOfServiceAgreed
+            kid: acme2.kid,
+            email: acme2.email,
+            domain: acme2.domain,
+            orders: acme2.orders,
+            schadulePeriod: acme2.schadulePeriod,
+            nextUpdateTime: acme2.nextUpdateTime && +new Date(acme2.nextUpdateTime),
+            lastUpdateTime: acme2.lastUpdateTime && +new Date(acme2.lastUpdateTime),
+            schaduleEnabled: acme2.schaduleEnabled,
+            termsOfServiceAgreed: acme2.termsOfServiceAgreed
         };
         return [private_key, public_key, base64url(extra)].join(",");
     }
@@ -256,7 +285,7 @@ var acme2 = new class {
         var i = this.orders.indexOf(order);
         if (i >= 0) this.orders.splice(i, 1);
         this.orders = [order].concat(this.orders);
-        return order;
+        return this.parseOrder(order);
     }
     parseOrder(o) {
         if (typeof o !== 'string') return o;
@@ -268,6 +297,7 @@ var acme2 = new class {
     async getOrder(o) {
         var r = await data.fromURL(o.url);
         if (r.expires) r.expires = new Date(r.expires);
+        r = extend({}, o, r);
         return r;
     }
     async thumbprint() {
@@ -284,7 +314,61 @@ var acme2 = new class {
         var csr = await createCSR(domains, private_key);
         return toBase64(csr, true);
     }
-    async audit(url) {
-        return data.fromURL(url);
+    async waitStatus(o) {
+        if (!/ing$/i.test(o.status)) return o;
+        o = await this.getOrder(o);
+        while (/ing$/i.test(o.status)) {
+            wait(600);
+            o = await this.getOrder(o);
+        }
+        return o;
+    }
+    async auditOrder(o, setauth) {
+        if (o.status !== 'pending') return o;
+        a: for (var a of o.authorizations) {
+            var b = await data.fromURL(a);
+            if (b.challenges) {
+                for (var c of b.challenges) {
+                    if (c.type === 'http-01') {
+                        if (c.status !== 'pending') continue a;
+                        await setauth(`/.well-known/acme-challenge/${c.token}`, c.token + "." + await acme2.thumbprint());
+                        await acme2.requestURL(c.url, {});
+                        continue a;
+                    }
+                }
+            }
+        }
+        o = await this.waitStatus(o);
+        return o;
+    }
+    async finalizeOrder(o, upload) {
+        if (o.status !== 'ready') return o;
+        var domains = o.identifiers.map(d => d.value);
+        var kp = await this.createKeyPair();
+        var csr = await this.createCSR(domains, kp[0]);
+        var order = await this.requestURL(o.finalize, { csr });
+        o = extend({}, o, order);
+        upload(o, { oid: o.oid, private: kp[0], public: kp[1] });
+        return o;
+    }
+    async autoUpdate(domain, setauth, upload) {
+        if (!domain.length) return;
+        if (acme2.orders.length >= 20) acme2.orders.pop();
+        this.lastUpdateTime = parseDate(Date.now());
+        this.updateTime();
+        var o = await acme2.newOrder({ domain });
+        o = await acme2.getOrder(o);
+        if (o.status === 'pending') {
+            o = await acme2.auditOrder(o, setauth);
+        }
+        if (o.status === 'ready') {
+            await this.finalizeOrder(o, upload);
+            o = await this.waitStatus();
+        }
+        if (o.status === 'valid') {
+            var cert = await data.fromURL(o.certificate);
+            upload(o, { cert });
+        }
+        return o;
     }
 }

package/coms/pivot/pedit.js

@@ -1,5 +1,5 @@
 function send(type, key, value, origin) {
-    return data.from(origin ? "edit" : "add", {
+    return data.from(origin, {
         type,
         key: encode62.timeencode(key),
         value: isHandled(value) ? encode62.timeencode(JSON.stringify(value)) : '',
@@ -10,21 +10,19 @@ function pedit(title, type, params, idkey = params.fields[0].key) {
     return frame$edit(title, {
         submit(a, fields) {
             a = submit(fields, a);
-            return send(type, a[idkey], a, pdata);
+            return send(type, a[idkey], a, pdata ? "edit" : "add");
         },
     }, params);
 }
 pedit.create = function (type, key, value) {
-    return send(type, key, value, false);
+    return send(type, key, value, "add");
 }
 var query = pedit.query = function (type, key) {
-    return send(type, key, null, true);
+    return send(type, key, null, "edit");
 }
 var update = pedit.update = function (type, key, value) {
-    return send(type, key, value, true);
+    return send(type, key, value, "edit");
 }
-pedit.merge = async function (type, key, params) {
-    var data = await query(type, key);
-    extendIfNeeded(params, data);
-    return update(type, key, params);
+pedit.patch = async function (type, key, params) {
+    return send(type, key, params, 'patch');
 }

package/coms/reptile/alert.js

@@ -0,0 +1 @@
+a => console.warn(a);

package/coms/reptile/detectWithExtension.js

@@ -2,6 +2,7 @@ var path = require("path");
 var fs = require("fs").promises;
 var $split = require("../basic/$split");
 var str2array = require("../basic/str2array");
+var colors = require('./colors');
 async function detectWithExtension(filenames, extensions = [""], folders = [""]) {
     if (typeof filenames === 'string') filenames = str2array(filenames);
     if (typeof extensions === 'string') extensions = str2array(extensions);
@@ -31,7 +32,7 @@ async function detectWithExtension(filenames, extensions = [""], folders = [""])
             if (!findedFolder) findedFolder = f + params;
         } catch { }
     }
-    if (!findedFolder) throw new Error(i18n`路径<gray>${filenames}</gray>不存在`);
+    if (!findedFolder) throw new Error(`路径${filenames.map(f => colors.FgYellow + f[0] + colors.Reset).join(', ')}不存在`);
     return findedFolder;
 }
 module.exports = detectWithExtension;

package/coms/reptile/localStorage.js

@@ -0,0 +1,4 @@
+return globalThis.localStorage || {
+    getItem() { },
+    setItem() { }
+}

package/coms/reptile/on.js

@@ -0,0 +1,4 @@
+function on(k) {
+    return function (element, listener) {
+    }
+}

package/coms/reptile/onmounted.js

@@ -0,0 +1 @@
+function onmounted(target, handler) { }

package/coms/reptile/sessionStorage.js

@@ -0,0 +1 @@
+return globalThis.sessionStorage || { getItem() { }, setItem() { } };

package/coms/reptile/window.js

@@ -0,0 +1,65 @@
+var global1 = typeof globalThis !== 'undefined' ? globalThis : typeof global !== "undefined" ? global : {};
+var extendIfNeeded = require("../basic/extendIfNeeded");
+if (global1.window) {
+    module.exports = global1.window;
+}
+else {
+    var Window = function () {
+    };
+    var window = new Window;
+    Object.assign(window, {
+        Date,
+        Promise,
+        Function,
+        RegExp,
+        Object,
+        String,
+        Array,
+        Number,
+        Boolean,
+        Error,
+        TypeError,
+        Uint8Array,
+        Uint16Array,
+        Uint32Array,
+        Uint8ClampedArray,
+        ArrayBuffer,
+        Int8Array,
+        Int16Array,
+        Int32Array,
+        Float32Array,
+        Float64Array,
+        Map,
+        Set,
+        Proxy,
+        WeakMap,
+        Reflect,
+        console,
+        Math,
+        JSON,
+        NaN,
+        Infinity,
+        isNaN,
+        isFinite,
+        parseInt,
+        parseFloat,
+        decodeURI,
+        encodeURI,
+        decodeURIComponent,
+        encodeURIComponent,
+        document: global1.document,
+        navigator: global1.navigator,
+        process: global1.process,
+        BigInt64Array: global1.BigInt64Array,
+        Buffer: global1.Buffer,
+        Intl: global1.Intl,
+        BigInt: global1.BigInt,
+        Symbol: global1.Symbol,
+        SharedArrayBuffer: global1.SharedArrayBuffer,
+        escape: global1.escape,
+        unescape: global1.unescape,
+    });
+    window.globalThis = window.global = window.top = window.window = window;
+    extendIfNeeded(window, global1);
+    module.exports = window;
+}