efront 4.4.13 → 4.5.0

package/coms/compile/common.js

@@ -1374,6 +1374,28 @@ var canbeTemp = function (body, strip = false) {
     if (!o) return false;
     return o.type === EXPRESS && (strip || !/[\.\[]/.test(o.text)) || o.type === VALUE || o.type === QUOTED && !o.length;
 };
+var canbeDuplicate = function (body) {
+    for (var b of body) {
+        switch (b.type) {
+            case EXPRESS:
+                if (/[\.\[]/.test(b.text)) return false;
+                break;
+            case SCOPED:
+                if (b.isObject || b.isClass || b.entry === '[') return false;
+                if (!isEval(b)) return false;
+                if (!canbeTemp(b)) return false;
+                break;
+            case QUOTED:
+                if (b.length && !canbeTemp(b)) return false;
+                break;
+            case STAMP:
+                if (/^(\+\+|\-\-)$|^([^\=\>\<]+|>>>?|<<)?\=$/.test(b.text)) return false;
+                break;
+            case ELEMENT: return false;
+        }
+    }
+    return true;
+};
 var pickArgument = function (o) {
     var res = [];
     var t = o && o.prev, p = o;
@@ -1457,6 +1479,7 @@ module.exports = {
     setqueue,
     replace,
     canbeTemp,
+    canbeDuplicate,
     skipFunction,
     isHalfSentence,
     splice,

package/coms/compile/translate.js

@@ -1,10 +1,16 @@
 var scanner2 = require("./scanner2");
-var { SCOPED, QUOTED, SCOPED, PROPERTY, STAMP, PIECE, setqueue, splice, relink, number_reg, replace, createString } = require("./common");
+var { SCOPED, QUOTED, SCOPED, PROPERTY, STAMP, PIECE, setqueue, splice, relink, number_reg, replace, canbeDuplicate, createString } = require("./common");
 var strings = require("../basic/strings");
 var program = null;
 var patchTranslate = function (c) {
     if (c.length) {
-        c.translate = c.map((o, i) => o.type === PIECE ? strings.decode(`\`${o.text}\``) : `$${i + 1 >> 1}`).join('').replace(/\r\n|\r|\n/g, '\r\n');
+        var canbeDup = true;
+        c.translate = c.map((o, i) => {
+            if (o.type === PIECE) return strings.decode(`\`${o.text}\``);
+            if (canbeDup && !canbeDuplicate(o)) canbeDup = false;
+            return `$${i + 1 >> 1}`;
+        }).join('').replace(/\r\n|\r|\n/g, '\r\n');
+        c.nodup = !canbeDup;
     }
     else {
         if (/^['"`]/.test(c.text) && c.text.length > 2) {
@@ -74,7 +80,7 @@ var ctn = function (tt, t) {
         if (a in t) return `\${${a}}`;
         return _;
     }));
-    tn[tn.length - 1].forEach(n => {
+    (tn[0].type === SCOPED ? tn[0] : tn[1]).forEach(n => {
         if (n.type !== QUOTED || !n.length) return;
         n.forEach((a, i) => {
             if (a.type !== SCOPED) return;
@@ -91,13 +97,25 @@ function translate([imap, supports], code) {
         if (a.start > b.start && a.end < b.end) return -1;
         return 0;
     });
-    var getm = function (tt, warn) {
-        tt = tt.trim();
-        if (!imap[tt]) {
+    var getm = function (tt, nodup, warn) {
+        var mq = /^(\s*)([\s\S]*?)(\s*)$/.exec(tt);
+        var mq = [mq[1] || '', mq[2], mq[3] || ''];
+        var tt = mq[1];
+        var wrap = m => {
+            mq[1] = m || tt;
+            return strings.encode(mq.join(''), '`');
+        };
+
+        var imp = imap[tt];
+        if (!imp) {
             if (warn !== false) console.warn(`<yellow>${i18n`国际化翻译缺失：`}</yellow>${tt}`);
-            imap[tt] = supports.map(_ => tt);
+            imp = imap[tt] = supports.map(_ => tt);
         }
-        return imap[tt].map(m => strings.encode(m || tt, '`'));
+        if (nodup && imp.length <= 1) nodup = false;
+        var mp = nodup ? m => "()=>" + wrap(m) : m => wrap(m);
+        var m = `(${imp.map(mp)})`;
+        if (nodup) m += '()';
+        return m;
     };
     var used = code.used;
     for (var t of texts) {
@@ -109,8 +127,8 @@ function translate([imap, supports], code) {
                 p.leave = ")";
             }
             var tt = t.translate;
-            var tn = ctn(`(${getm(tt)})`, t);
-            replace(t, tn[0]);
+            var tn = ctn(getm(tt, t.nodup), t);
+            replace(t, ...tn);
         }
         else if (t.transtype === 字段名) {
             var i = t.queue.indexOf(t.prev);
@@ -138,7 +156,7 @@ function translate([imap, supports], code) {
                         if (a in t) v = t[a];
                         else v = scanner2(JSON.stringify(v));
                     }
-                    else if (k === 'name') v = ctn(`i18n(${getm(v, t.warn)})`, t);
+                    else if (k === 'name') v = ctn('i18n' + getm(v, t.nodup, t.warn), t);
                     else v = scanner2(JSON.stringify(v));
                     o.push({ type: PROPERTY, isprop: true, text: JSON.stringify(k) }, { type: STAMP, text: ':' }, ...v, { type: STAMP, text: ',' });
                 })

package/coms/compile/translate_test.js

@@ -0,0 +1,8 @@
+var test = function (src, text, expact) {
+    var code = scanner2(text);
+    translate([src, Object.keys(src)], code);
+    assert(code.toString(), expact);
+};
+test({ "a$1b": ["a$1b", "c$1d"] }, 'i18n`a${a}b`', 'i18n(`a${a}b`, `c${a}d`)')
+test({ "a$1b": ["a$1b", "c$1d"] }, 'i18n`a${a++}b`', 'i18n(() => `a${a++}b`, () => `c${a++}d`)()')
+test({ "a$1b": ["c$1d"] }, 'i18n`a${a++}b`', 'i18n(`c${a++}d`)')

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

@@ -401,7 +401,6 @@ var getFromScopeList = function (name, varsList, value = name) {
 };
 var removeSelectorSpace = a => a.trim().replace(/\s*([\+~\>])\s*/g, "$1");
 var fixBase = function (b, a) {
-    var s = splitParams(a);
     return splitParams(a).map(a => {
         if (presets.test(a)) a = `@{${a}}`;
         var replaced = false;
@@ -426,9 +425,11 @@ function evalscoped(scoped, base = '') {
     base = removeSelectorSpace(base);
     var smaps = scoped.maps;
     var root = smaps[":root"], scope = smaps[":scope"];
+    var and = smaps["&"];
     var vars = extend(Object.create(null), scoped.vars);
     if (root) root.forEach(r => extend(vars, r.vars));
     if (scope) scope.forEach(s => extend(vars, s.vars));
+    if (and) and.forEach(a => extend(vars, a.vars));
     var vlist = [vars];
     var mlist = [macros];
     var clist = [smaps];

package/coms/docs/codetext.xht

@@ -109,8 +109,8 @@
                 case QUOTED:
                     if (o.length || !o.text) {
                         o.forEach(setcolor);
-                        o.entry = "<text>" + o.entry;
-                        o.leave = o.leave + "</text>";
+                        o.entry = "<text>" + o.entry + "</text>";
+                        o.leave = "<text>" + o.leave + "</text>";
                         break;
                     }
                 case PIECE:
@@ -299,7 +299,7 @@
             }
         }
         if (minSpace > 0) codes = codes.map(c => /^\s+/.test(c) ? c.slice(minSpace) : c);
-        return `<code type=${type}>${codes.join("<br/>").replace(/\t/g, Array(5).join('&ensp;')).replace(/\s/g, '&ensp;')}</code> `;
+        return `<code type=${type}>${codes.join("<br/>").replace(/\t/g, Array(5).join('&ensp;')).replace(/\s/g, '&ensp;')}</code>`;
     }
     codetext.encode = encode;
 </script>

package/coms/frame/chat.js

@@ -168,7 +168,7 @@ function chat(title = '会话窗口') {
             }
         }
     };
-    page.renders = [function () {
+    page.$renders = [function () {
         this.$scope.resize(this.$scope.body);
     }];
     page.localid = localid;

package/coms/kugou/bindScroll.js

@@ -53,6 +53,6 @@ function bindScroll(titlebar, page) {
         setOpacity(label, 1 - (titlebar.offsetHeight - topHeight) / (offsetHeight - topHeight));
         return {};
     };
-    if (!page.renders) page.renders = [];
+    if (!page.$renders) page.$renders = [];
     page.onscroll = refresh;
 }

package/coms/kugou/krc.js

@@ -72,7 +72,7 @@ function createLRC(lrc) {
                     setClass(krcList, index);
                 }
             }
-            if (ele && firstChild && firstChild.isMounted) {
+            if (ele && firstChild && firstChild.$mounted) {
                 var marginTop = (firstChild.parentNode.offsetHeight - ele.offsetHeight >> 1) - ele.offsetTop + firstChild.offsetTop;
                 css(firstChild, `margin-top:${marginTop | 0}px;`);
             }
@@ -140,7 +140,7 @@ function createKRC(krc) {
             var current_row_word = current_words[current_row_index];
             var ele = krcList[index];
             var firstChild = krcList[0];
-            if (ele && firstChild && firstChild.isMounted) {
+            if (ele && firstChild && firstChild.$mounted) {
                 var marginTop = (firstChild.parentNode.offsetHeight - ele.offsetHeight >> 1) - ele.offsetTop + firstChild.offsetTop;
                 if (index > 0) {
                     if (markerLabel.parentNode !== ele) {

package/coms/layer/leftCenter.js

@@ -38,12 +38,12 @@ function setCurrentPage(page) {
     var currentLayer = getCurrentLayer();
     if (page !== leftPage) {
         if (currentLayer !== leftLayer) {
-            if (!leftPage.isMounted) appendChild(leftLayer, leftPage);
+            if (!leftPage.$mounted) appendChild(leftLayer, leftPage);
         } else {
             remove(leftPage, false);
         }
         if (page.parentNode !== currentLayer) appendChild(currentLayer, page, false);
-    } else if (!leftPage.isMounted) {
+    } else if (!leftPage.$mounted) {
         appendChild(leftLayer, leftPage, false);
     }
 }
@@ -54,16 +54,16 @@ function main(_leftPage) {
 layer.layer = function (child, old) {
     remove(old);
     if (child === leftPage) {
-        if (!leftPage.isMounted) appendChild(leftLayer, child);
+        if (!leftPage.$mounted) appendChild(leftLayer, child);
     } else if (child) {
         var currentLayer = getCurrentLayer();
         appendChild(currentLayer, child);
         if (currentLayer === leftLayer) {
             if (arguments.length > 1) remove(leftPage);
-        } else if (!leftPage.isMounted) {
+        } else if (!leftPage.$mounted) {
             appendChild(leftLayer, leftPage);
         }
     } else {
-        if (!leftPage.isMounted) appendChild(leftLayer, leftPage);
+        if (!leftPage.$mounted) appendChild(leftLayer, leftPage);
     }
 };

package/coms/pivot/acme2.js

@@ -0,0 +1,185 @@
+var acmebase = `https://acme-v02.api.letsencrypt.org/`;
+// <!-- acmebase=`https://acme-staging-v02.api.letsencrypt.org/` -->
+var data1 = data.enrich(parseYML(`
+${acmebase}:
+  directory: get directory
+${acmebase}acme/ Content-Type=application/jose+json:
+  key-change: get key-change
+  new-account: post:^efront-location new-acct
+  get-account: get acct/:aid
+  new-order: post:^efront-location new-order
+  get-order|: get order/:aid/:oid
+  new-nonce: head:^Replay-Nonce new-nonce
+  revert-cert: post:^efront-location revert-cert
+`));
+var publicKey, privateKey;
+var private_key, public_key;
+var RSASSA_PKCS1_v1_5 = "RSASSA-PKCS1-v1_5";
+var base64url = function (params) {
+    var data = JSON.stringify(params);
+    return toBase64(encodeUTF8(data), true);
+};
+var accountApi = await data1.getApi('get-account');
+var orderApi = await data1.getApi('get-order');
+
+var request = async function (id, params) {
+    var api = await data1.getApi(id);
+    if (/^(get|head)$/i.test(api.method)) return data1.from(id, params);
+    var protected = {
+        url: api.base + api.path,
+    };
+    var rest;
+    [protected.url, rest] = data.prepareURL(protected.url, params);
+    var restparams = {};
+    rest.forEach(k => { restparams[k] = params[k]; delete params[k]; });
+    var jwk = await subtle.exportKey("jwk", publicKey);
+    protected.alg = jwk.alg;
+    if (/new-account|revert-cert/i.test(id)) {
+        protected.jwk = {
+            e: jwk.e,
+            kty: jwk.kty,
+            n: jwk.n
+        };
+    }
+    else {
+        protected.kid = acme2.kid;
+    }
+    protected.nonce = await data1.from("new-nonce");
+    var payload = isEmpty(params) ? '' : base64url(params);
+    protected = base64url(protected);
+    var params = {
+        protected,
+        payload,
+        signature: toBase64(new Uint8Array(await subtle.sign({ name: RSASSA_PKCS1_v1_5, saltLength: 32 }, privateKey, new Uint8Array(encodeUTF8([protected, '.', payload].join(''))))), true)
+    };
+    extend(params, restparams);
+    var account = await data1.from(id, params);
+    return account;
+};
+var subtle = this.crypto?.subtle;
+var acme2 = new class {
+    email = '';
+    kid = '';
+    aid = '';
+    oid = '';
+    domain = '';
+    termsOfServiceAgreed = false;
+    orders = [];
+    public_key = '';
+    get enabled() {
+        return !!subtle;
+    }
+    async initUnique() {
+        //https://www.w3.org/TR/WebCryptoAPI/ 第20章 只有RSASSA-PKCS1-v1_5的jwk的alg才是rs256
+        var k = await subtle.generateKey({
+            name: RSASSA_PKCS1_v1_5,
+            modulusLength: 4096,
+            publicExponent: new Uint8Array([1, 0, 1]),
+            hash: "SHA-256",
+        }, true, ["sign", "verify"]);
+        var { publicKey, privateKey } = k;
+        private_key = await subtle.exportKey("pkcs8", privateKey);
+        public_key = await subtle.exportKey("spki", publicKey);
+        private_key = toBase64(new Uint8Array(private_key));
+        public_key = toBase64(new Uint8Array(public_key));
+        var unique = [private_key, public_key].join(',');
+        await acme2.makeUnique(unique);
+    }
+    async makeUnique(unique) {
+        if (!unique) return;
+        var avme2 = 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;
+            if (extra.kid) {
+                var account = data.getUrlParamsForApi(accountApi, extra.kid);
+                avme2.aid = account.aid;
+            }
+            avme2.domain = extra.domain;
+            avme2.termsOfServiceAgreed = extra.termsOfServiceAgreed;
+            avme2.orders = extra.orders;
+        }
+        try {
+            privateKey = await subtle.importKey("pkcs8", new Uint8Array(fromBase64(private_key)), {
+                name: RSASSA_PKCS1_v1_5,
+                hash: "SHA-256",
+            }, true, ["sign"]);
+            publicKey = await subtle.importKey("spki", new Uint8Array(fromBase64(public_key)), {
+                name: RSASSA_PKCS1_v1_5,
+                hash: "SHA-256",
+            }, true, ["verify"]);
+
+            avme2.public_key = public_key;
+        } catch (e) { alert("加载服务器公钥异常！", "error"); throw e }
+    }
+    pickUnique() {
+        var avme2 = this;
+        var extra = {
+            kid: avme2.kid,
+            email: avme2.email,
+            domain: avme2.domain,
+            orders: avme2.orders,
+            termsOfServiceAgreed: avme2.termsOfServiceAgreed
+        };
+        return [private_key, public_key, base64url(extra)].join(",");
+    }
+    async getTermsOfService() {
+        var data = await data1.from("directory");
+        var termsOfService = data?.meta?.termsOfService;
+        return termsOfService;
+    }
+    async newAccount(params) {
+        var account = await request("new-account", {
+            "contact": [
+                "mailto:" + params.email
+            ],
+            // onlyReturnExisting: false,// 可选
+            // externalAccountBinding: {},// 可选
+            "termsOfServiceAgreed": params.termsOfServiceAgreed
+        });
+        this.email = params.email;
+        this.termsOfServiceAgreed = params.termsOfServiceAgreed;
+        this.kid = account;
+        var a = data.getUrlParamsForApi(accountApi, account);
+        this.aid = a.aid;
+        return account;
+    }
+    async newOrder(params) {
+        var params = {
+            "identifiers": params.domain.trim().split(/[,;+，；\r\n\u2029\u2028\s]+/).map(n => {
+                if (/^\d+(\.\d+){3}$|^\[[\da-f\:]+\]$|^[\da-f\:]+$/i.test(n)) return { type: "ipv4", value: n };
+                return { type: "dns", value: n };
+            })
+        };
+        var order = await request("new-order", params);
+        this.domain = params.domain;
+        if (!this.orders) this.orders = [];
+        if (this.orders.indexOf(order) < 0) this.orders.unshift(order);
+        return order;
+    }
+    parseOrder(o) {
+        if (typeof o !== 'string') return o;
+        var order = data.getUrlParamsForApi(orderApi, o);
+        order.name = order.oid;
+        return order;
+    }
+    async getOrder(o) {
+        var r = await data.from(orderApi, o);
+        if (r.expires) r.expires = new Date(r.expires);
+        return r;
+    }
+    async thumbprint() {
+        var jwk = await subtle.exportKey('jwk', publicKey);
+        jwk = `{"e":"${jwk.e}","kty":"${jwk.kty}","n":"${jwk.n}"}`;
+        console.log(JSON.parse(jwk))
+        var thumb = await subtle.digest("SHA-256", new Uint8Array(encodeUTF8(jwk)));
+        thumb = toBase64(new Uint8Array(thumb), true);
+        return thumb;
+    }
+    async audit(url) {
+        return data.fromURL(url);
+    }
+}

package/coms/reptile/colored_console.js

@@ -2,10 +2,12 @@
 var colored = Object.create(null);
 var lazy = require("../basic/lazy");
 var colors = require("./colors");
+var renderTags = require("../basic/renderTags");
 var strings = require("../basic/strings");
 var lastLogLength = 0;
 var needNextLine = false;
 var getColor = function (c) {
+    if (!c) return colors.Reset;
     switch (c) {
         case "red":
         case "error":
@@ -30,23 +32,9 @@ var getColor = function (c) {
     }
     return '';
 };
-var colorReg = /<(\/?)([a-z][\w]*)\>/ig;
+var colorReg = renderTags.reg;
 var renderColor = function (obj) {
-    var colorpath = [];
-    return String(obj).replace(colorReg, function (_, e, c) {
-        if (!c || c.length < 3 || !getColor(c)) return _;
-        if (e) {
-            colorpath.pop();
-            c = colorpath[colorpath.length - 1];
-        }
-        else colorpath.push(c);
-        if (c) var color = getColor(c);
-        var res = [];
-        if (e) res.push(colors.Reset);
-        if (color) res.push(color);
-        if (res.length) return res.join('');
-        return _;
-    });
+    return renderTags(obj, getColor);
 };
 
 var write = function (hasNewLine, str) {
@@ -195,7 +183,7 @@ var format = function (arg, deep = 0) {
         }
         if (arg instanceof Buffer || arg instanceof ArrayBuffer || arg instanceof SharedArrayBuffer) {
             var data = new Uint8Array(arg.buffer || arg, arg.byteOffset || 0, arg.byteLength);
-            return `<magenta><${arg.constructor.name} ${Array.prototype.slice.call(data, 0, 20).map(a => a < 16 ? "0" + a.toString(16) : a.toString(16)).join(' ')}${arg.byteLength > 20 ? ` ... 其他 ${arg.byteLength - 20} 字节` : ''}></megenta>`;
+            return `<magenta><${arg.constructor.name} ${Array.prototype.slice.call(data, 0, 20).map(a => a < 16 ? "0" + a.toString(16) : a.toString(16)).join(' ')}${arg.byteLength > 20 ? ` ... 其他 ${arg.byteLength - 20} 字节` : ''}></magenta>`;
         }
         else if (isFinite(arg.length)) {
             var entry = "[";

package/coms/zimoli/appendChild.js

@@ -9,9 +9,9 @@ function hasEnterStyle(e) {
 }
 
 function _onappend(node, append = createEvent("append"), mount = createEvent("mounted")) {
-    if (node.isMounted) return;
+    if (node.$mounted) return;
     if (node.nodeType !== 1 && node.nodeType !== 8) return;
-    node.isMounted = true;
+    node.$mounted = true;
     dispatch(node, append);
     var children = Array.apply(null, node.childNodes);
     for (var c of children) {
@@ -71,6 +71,7 @@ function insertAfter(alreadyMounted, obj, transition) {
     children = children.reverse();
     for (var cx = 0, dx = children.length; cx < dx; cx++) {
         var o = release(children[cx]);
+        if (!o) continue;
         if (o.removeTimer) clearTimeout(o.removeTimer);
         parent.insertBefore(o, alreadyMounted.nextSibling);
         o.with && insertBefore(alreadyMounted.nextSibling, o.with, transition);

package/coms/zimoli/autofocus.js

@@ -1,7 +1,7 @@
 function autofocus(e) {
-    if (!e.renders) e.renders = [];
+    if (!e.$renders) e.$renders = [];
     var savedElement;
-    e.renders.push(function () {
+    e.$renders.push(function () {
         var parent = rootElements[rootElements.length - 1] || document.body;
         if (savedElement === this) {
             if (this !== parent || getTargetIn(parent, document.activeElement)) return;

package/coms/zimoli/button.less

@@ -1,7 +1,10 @@
 @default-color: #0092cc;
 
+:not(button, a)& {
+    display: inline-block;
+}
+
 & {
-    font-size: 14px;
     width: auto;
     line-height: 28px;
     background-color: @default-color;
@@ -11,7 +14,6 @@
     position: relative;
     border: none;
     margin: 0;
-    display: inline-block;
     white-space: nowrap;
     text-align: center;
     overflow: hidden;
@@ -179,7 +181,6 @@
             content: "↻";
             font-family: 'Times New Roman', Times, serif;
             display: inline-block;
-            vertical-align: middle;
             position: absolute;
             animation: busy-pending 2s linear 0s infinite;
         }

package/coms/zimoli/checker.js

@@ -1,15 +1,34 @@
-function main(elem = document.createElement("check")) {
-    var page = elem;
-    page.innerHTML = checker;
-    page.setValue = function (value) {
-        value = !!value;
-        if (value === this.value) return;
-        this.value = value;
-        if (value) {
-            addClass(page, 'checked');
-        } else {
-            removeClass(page, 'checked');
-        }
-    };
-    return page;
-}
+var falseMap = Object.create(null);
+falseMap["off"] = "on";
+falseMap["false"] = "true";
+falseMap["null"] = "true";
+falseMap["0"] = "1";
+var trueMap = Object.create(null);
+for (var k in falseMap) trueMap[falseMap[k]] = falseMap[k];
+var isTrue = function (v) {
+    return !!+v || v in trueMap;
+};
+var changeValue = function (value) {
+    if (typeof value === 'boolean') return !value;
+    if (value & 1 === value) return 1 - value;
+    if (value in trueMap) return trueMap[value];
+    if (typeof value === 'number') return +!+value;
+    return !+value;
+};
+var setValue = function (value) {
+    if (value === this.value) return;
+    this.value = value;
+    value = isTrue(value);
+    if (value) {
+        addClass(this, 'checked');
+    } else {
+        removeClass(this, 'checked');
+    }
+};
+function checker(ck = document.createElement('check')) {
+    ck.innerHTML = template;
+    ck.setValue = setValue;
+    return ck;
+}
+checker.isTrue = isTrue;
+checker.changeValue = changeValue;

package/coms/zimoli/checker.less

@@ -3,14 +3,13 @@
     width: .8em;
     position: relative;
     border: .1em solid;
-    margin-right: .3em;
+    margin: -0.06em .3em -0.06em 0;
     font-family: sans-serif;
     display: inline-block;
     line-height: 1;
     text-align: center;
-    margin-top: .15em;
+    box-sizing: border-box;
     border-radius: .12em;
-    vertical-align: middle;
 
     >s {
         display: none;

package/coms/zimoli/container.js

@@ -1,34 +1,38 @@
-var change = async function (data) {
-    if (!data) remove(this.with);
-    else if (isNode(data)) {
-        if (isElement(data) && this.$struct.copys) {
+var change = lazy(async function (src) {
+    if (src !== this.$src) return;
+    if (!src) remove(this.with);
+    else if (isNode(src)) {
+        if (isElement(src) && this.$struct.copys) {
             for (var c of this.$struct.copys) {
                 if (c.name === 'class') {
-                    addClass(data, c.value);
+                    addClass(src, c.value);
                 }
                 else if (c.name === 'style') {
-                    css(data, c.value);
+                    css(src, c.value);
                 }
-                else data.setAttribute(c.name, c.value);
+                else src.setAttribute(c.name, c.value);
             }
         }
-        zimoli.global(data, this);
-    }
-    else if (isString(data) || +data < 0) zimoli.go(data, this.params, this);
-};
-var gosrc = function () {
-    var { src } = this;
-    if (this.hasAttribute && this.hasAttribute('src')) {
-        src = this.getAttribute('src');
+        zimoli.global(src, this);
     }
+    else if (isString(src) || +src < 0) zimoli.go(src, this.params, this);
+});
+var gosrc = function (src) {
     if (src !== this.$src) {
-        change.call(this, src);
         this.$src = src;
+        change.call(this, src);
     }
 };
 function container(element) {
     var comment = document.createComment('container');
     comment.$struct = element.$struct;
     care(comment, gosrc);
+    if (element.hasAttribute && element.hasAttribute('src')) {
+        var src = element.getAttribute('src');
+        if (src) oncemount(comment, function () {
+            if ("$src" in this) return;
+            gosrc.call(this, src);
+        });
+    }
     return comment;
 }