efront 3.36.3 → 3.36.5

package/coms/basic/#loader.js

@@ -244,12 +244,13 @@ var killCircle = function () {
 };
 // -->
 var hasOwnProperty = {}.hasOwnProperty;
-var loadModule = function (name, then, prebuilds = {}) {
+var loadModule = function (url, then, prebuilds = {}) {
+    var name = url.replace(/[\*~][\s\S]*$/, '');
     if (/^(?:module|exports|define|require|window|global|undefined)$/.test(name)) return then();
-    if ((hasOwnProperty.call(prebuilds, name)) || hasOwnProperty.call(modules, name) || (!/^on/.test(name) && window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name))
+    if ((hasOwnProperty.call(prebuilds, url)) || hasOwnProperty.call(modules, url) || (!/^on/.test(name) && window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name))
     ) return then();
-    preLoad(name);
-    var key = keyprefix + name;
+    preLoad(url);
+    var key = keyprefix + url;
     if (loadedModules[key] instanceof Function) {
         then();
         return;
@@ -267,15 +268,15 @@ var loadModule = function (name, then, prebuilds = {}) {
             }.bind(null, responseTree[name]));
         };
         if (/\.json([\#\?].*?)?$/i.test(name)) {
-            readFile(["JSON", name], saveModule);
+            readFile(["JSON", url], saveModule);
         } else {
-            readFile(name, saveModule);
+            readFile(url, saveModule);
         };
     }
     else {
 
         var saveModule = function (error) {
-            var data = responseTree[name];
+            var data = responseTree[url];
             if (typeof data === "function") {
                 var mod = data;
                 flushTree(loadedModules, key, mod);
@@ -289,7 +290,8 @@ var loadModule = function (name, then, prebuilds = {}) {
             // <!--
             if (!data) undefinedModules[name] = true;
             // -->
-            var [argNames, body, args, required, strs, isAsync, isYield] = getArgs(data);
+            var afterfix = url.slice(name.length);
+            var [argNames, body, args, required, strs, isAsync, isYield] = getArgs(data, afterfix);
             if (isProduction) {
                 strs = strs.map ? strs.map(toRem) : strs;
             } else {
@@ -300,7 +302,10 @@ var loadModule = function (name, then, prebuilds = {}) {
             mod.argNames = argNames;
             mod.strs = strs;
             var loadingCount = 0;
-            if (required) required = required.split(';').filter(a => !!a);
+            if (required) {
+                required = required.split(';').filter(a => !!a);
+                if (afterfix) required = required.map(r => r + afterfix);
+            }
             required = required ? get_relatives(name, required) : [];
             mod.required = required;
             mod.file = name;
@@ -328,13 +333,15 @@ var loadModule = function (name, then, prebuilds = {}) {
                 });
             }
         };
-        readFile(name, saveModule);
+        readFile(url, saveModule);
     }
 };
 var toRem = text => pixelDecoder && typeof text === 'string' ? text.replace(/(\:\s*)?\b((?:\d*\.)?\d+)px(\s*\))?/ig, (m, h, d, quote) => (h || "") + (d !== '1' ? h && quote ? renderPixelRatio * d + "pt" : pixelDecoder(d) : renderPixelRatio > 1 ? ".78pt" : 0.78 / devicePixelRatio + "pt") + (quote || "")) : text;
 "use ./#decrypt.js";
-var getArgs = function (text) {
-    "use ./#decrypt_.js";
+var getArgs = function (text, aftfix) {
+    if (!aftfix || /^\*/.test(aftfix)) {
+        "use ./#decrypt_.js";
+    }
     var args, functionBody;
     //依赖项名称部分的长度限制为36*36*18=23328
     var doublecount = parseInt(text.slice(0, 3), 36);
@@ -365,6 +372,9 @@ var getArgs = function (text) {
         var argNames = args.slice(argsstart, argsend);
         var required = args[argsend];
         args = args.slice(0, argsstart);
+        if (aftfix) {
+            args = args.map(a => a + aftfix);
+        }
     } else {
         functionBody = text;
     }
@@ -422,7 +432,8 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
     var isModuleInit = false;
     var required = exec.required;
     if (required) required = required.map(a => loadedModules[keyprefix + a]);
-    var argsList = originNames.map(function (argName) {
+    var argsList = originNames.map(function (aName) {
+        var argName = aName.replace(/[\*~][\s\S]*$/, '');
         if (hasOwnProperty.call(prebuilds, argName)) {
             return prebuilds[argName];
         }
@@ -465,11 +476,8 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
             var prebuilds2 = Object.create(null);
             for (var k in prebuilds) if (hasOwnProperty.call(prebuilds, k)) prebuilds2[k] = prebuilds[k];
             prebuilds = prebuilds2;
-            delete prebuilds.popup;
-            delete prebuilds.action;
-            delete prebuilds.init;
         }
-        var promise = init(argName, function (res) {
+        var promise = init(aName, function (res) {
             result = res;
             created = true;
         }, prebuilds);
@@ -489,19 +497,20 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
     });
 };
 
-var init = function (name, then, prebuilds) {
+var init = function (url, then, prebuilds) {
     // then = bindthen(then);
-    var key = keyprefix + name;
+    var key = keyprefix + url;
     if (prebuilds) {
-        if (hasOwnProperty.call(prebuilds, name)) {
-            if (then) then(prebuilds[name]);
-            return prebuilds[name];
+        if (hasOwnProperty.call(prebuilds, url)) {
+            if (then) then(prebuilds[url]);
+            return prebuilds[url];
         }
     }
-    if (hasOwnProperty.call(modules, name)) {
-        if (then) then(modules[name]);
-        return modules[name];
+    if (hasOwnProperty.call(modules, url)) {
+        if (then) then(modules[url]);
+        return modules[url];
     }
+    var name = url.replace(/[\*~][\s\S]*$/, '');
     if (!/^on/.test(name) && window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name)) {
         modules[name] = window[name]
         if (then) then(modules[name]);
@@ -540,17 +549,17 @@ var init = function (name, then, prebuilds) {
     };
     var crack = function (error) {
         if (res.resolved || res.errored) return;
-        var ed = errored[name];
+        var ed = errored[url];
         res.errored = true;
         res.error = error;
         res.fire();
-        var rest = [name];
+        var rest = [url];
         var track = [];
         var length = 0;
         var deep = 0;
         // <!--
         var map = Object.create(null);
-        map[name] = true;
+        map[url] = true;
         do {
             deep++;
             var rest2 = Object.create(null);
@@ -573,11 +582,11 @@ var init = function (name, then, prebuilds) {
         track = track.map(([d, a, e]) => ` ${new Array(d + 1).join("•")} ${new Array(2 + length - a.length - d).join("-")} ${a} 溃于: ${e.reverse().join(", ")}`)
         // -->
         var report = window.performance || !window.alert ? console.error : window.alert;
-        report(`加载 ${name} 失败，${ed && ed.length ? `${ed.join(', ')} 等 ${ed.length} 个模块` : "没有其他模块"}受到影响。\r\n${track.join("\r\n")}`);
+        report(`加载 ${url} 失败，${ed && ed.length ? `${ed.join(', ')} 等 ${ed.length} 个模块` : "没有其他模块"}受到影响。\r\n${track.join("\r\n")}`);
     };
-    loadModule(name, function (error) {
-        if (hasOwnProperty.call(modules, name)) {
-            then(modules[name]);
+    loadModule(url, function (error) {
+        if (hasOwnProperty.call(modules, url)) {
+            then(modules[url]);
             return;
         }
         if (error) return crack(error);
@@ -587,7 +596,7 @@ var init = function (name, then, prebuilds) {
 
         if (!args || !args.length) {
             var created = module.call(window);
-            then(module.created = modules[name] = created);
+            then(module.created = modules[url] = created);
             return;
         }
         var filteredArgs = prebuilds ? args.filter(a => !hasOwnProperty.call(prebuilds, a)) : args;
@@ -611,12 +620,12 @@ var init = function (name, then, prebuilds) {
             if (saveAsModule) {
                 penddings[key] = created;
                 created.then(function (res) {
-                    then(modules[name] = res);
+                    then(modules[url] = res);
                 });
                 return;
             }
         } else {
-            if (saveAsModule) module.created = modules[name] = created;
+            if (saveAsModule) module.created = modules[url] = created;
         }
         then(created);
     }, prebuilds);
@@ -820,6 +829,12 @@ var modules = {
     createFunction,
     efrontsign: "",
 };
+modules["set request"] = function (req) {
+    request = req;
+};
+modules["get request"] = function () {
+    return request;
+};
 modules.debug = function () {
     document.addEventListener("blur", e => e.stopPropagation(), true);
 };

package/coms/compile/Program.js

@@ -194,7 +194,8 @@ class Program {
             Object.defineProperty(scope, 'queue', { value: queue, enumerable: false });
             scope.prev = last;
             if (scope.type !== COMMENT && scope.type !== SPACE) {
-                if (program.setType(scope) === false) {
+                var keeplast = program.setType(scope) === false;
+                if (keeplast) {
                     if (queue.last !== last) last = queue.last;
                     else if (scope.prev !== last) last = scope.prev;
                     while (queue[queue.length - 1] !== last) queue.pop();
@@ -202,6 +203,10 @@ class Program {
                     last.text = text.slice(last.start, last.end);
                     return;
                 }
+                if (queue.last !== last && queue.last !== o) {
+                    last = queue.last, scope.prev = last;
+                    if (last) last.text = text.slice(last.start, last.end);
+                }
                 if (last) last.next = scope;
                 queue.last = scope;
                 for (var cx = queue.length - 1; cx >= 0; cx--) {

package/coms/compile/richcss.js

@@ -26,13 +26,11 @@ Richcss.prototype.setType = function (o) {
         }
         if (pps.length > 1) {
             var i = q.lastIndexOf(p = pps.pop());
-            q.splice(i + 1, q.length, o);
-            p.next = o;
+            q.splice(i + 1, q.length);
             p.type = PROPERTY;
             p.end = pps[0].end;
-            o.prev = p;
-            q.last = o;
-            return false;
+            q.last = p;
+            return;
         }
     }
     if (!q.entry && o.type !== SCOPED) {

package/coms/compile/richcss_test.js

@@ -10,4 +10,5 @@ test(`a{ >b{a:1}}`,`a>b{a:1;}`);
 test(`a{ &>b{a:1}}`,`a>b{a:1;}`);
 test(`a{ &b{a:1}}`,`ab{a:1;}`);
 test(`a{ &.b{a:1}}`,`a.b{a:1;}`);
-test(`a{ &[b]{a:1}}`,`a[b]{a:1;}`);
+test(`a{ &[b]{a:1}}`,`a[b]{a:1;}`);
+test(`a{ &[b]:nth-child(1){a:1}}`,`a[b]:nth-child(1){a:1;}`);

package/coms/docs/codetext.xht

@@ -84,7 +84,7 @@
     var encode = function (text) {
         return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`)
     };
-    var codecolor = function (c) {
+    var codecolor = function (c, blink) {
         var envs = c.envs;
         var predefs = Object.create(null);
         predefs.module = true;
@@ -95,6 +95,8 @@
         var { STRAP, SCOPED, QUOTED, LABEL, COMMENT, STAMP, VALUE, EXPRESS, PROPERTY, PIECE } = c;
         var deep = 0;
         var setcolor = function (o) {
+            var text = o.text;
+            if (o.blink >= 0) o.text = o.text.slice(0, o.blink) + blink + o.text.slice(o.blink);
             switch (o.type) {
                 case LABEL:
                     o.text = `<label>${o.text}</label>`;
@@ -137,16 +139,16 @@
                     if (next && next.type === c.SCOPED && next.entry === '(') {
                         keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
                     }
+                    var [name0] = text.split(".");
                     var [name] = keys;
-                    if (/^</.test(name));
-                    else if (/^(arguments|this|super|Infinity|NaN)$/.test(name)) name = `<strap>${name}</strap>`;
-                    else if (name in envs) name = name in predefs ? `<predef>${name}</predef>` : `<outside>${name}</outside>`;
-
+                    if (/^</.test(name0));
+                    else if (/^(arguments|this|super|Infinity|NaN)$/.test(name0)) name = `<strap>${name}</strap>`;
+                    else if (name0 in envs) name = name0 in predefs ? `<predef>${name}</predef>` : `<outside>${name}</outside>`;
                     keys[0] = name;
                     o.text = keys.map(k => /^\</.test(k) || !k ? k : `<express>${k}</express>`).join(".");
                     break;
                 case STRAP:
-                    if (/^(if|else|switch|case|do|while|for|break|continue|default|import|from|as|export|try|catch|finally|await|yield|return)/.test(o.text))
+                    if (/^(if|else|switch|case|do|while|for|break|continue|default|import|from|as|export|try|catch|finally|await|yield|return)/.test(text))
                         o.text = `<flow>${o.text}</flow>`;
                     else o.text = `<strap>${o.text}</strap>`;
                     break;
@@ -166,10 +168,17 @@
     var typescript = new compile$Javascript;
     typescript.straps = typescript.straps.concat("interface", "implements", "declare", "module", "readonly", "enum");
     var codesupports = {
-        javascript(a) {
+        javascript(a, blink) {
+            if (blink) var index = a.indexOf(blink);
+            if (index >= 0) a = a.slice(0, index) + a.slice(index + 1);
             var c = compile$scanner2(a);
-            codecolor(c);
-            return c.toString();
+            if (index >= 0) {
+                var patched = patchBlink(c, index, blink);
+            }
+            codecolor(c, blink);
+            a = c.toString();
+            if (index >= 0 && !patched) a = blink + a;
+            return a;
         },
         typescript(a) {
             var c = compile$scanner2(a, typescript);
@@ -199,15 +208,67 @@
     codesupports.jsx = codesupports.js = codesupports.javascript;
     codesupports.tsx = codesupports.ts = codesupports.typescript;
     codesupports.xml = codesupports.html;
-    function codetext(type, text) {
-        try {
-            type = type.toLowerCase();
-            if (type in codesupports) text = codesupports[type](text);
-            else text = encode(text);
-
-        } catch (e) {
-            console.error(e);
+    var { SCOPED, QUOTED } = compile$common;
+    var patchBlink = function (code, index, blink) {
+        for (var cx = 0, dx = code.length; cx < dx; cx++) {
+            var c = code[cx];
+            var haschildren = c => c.type === SCOPED || c.type === QUOTED && c.length;
+            if (c.start === index) {
+                if (haschildren(c)) {
+                    c.entry = blink + c.entry;
+                }
+                else {
+                    c.blink = 0;
+                }
+                return true;
+            }
+            else if (c.start < index && c.end > index) {
+                if (haschildren(c)) {
+                    return patchBlink(c, index, blink);
+                }
+                else {
+                    c.blink = index - c.start;
+                    return true;
+                }
+            }
+            else if (c.end === index) {
+                if (haschildren(c)) {
+                    c.leave += blink;
+                }
+                else {
+                    c.blink = c.text.length;
+                }
+                return true;
+            }
+            else if (c.start > index) {
+                if (cx === 0) {
+                    if (code.entry) return code.entry += blink, true;
+                    return false;
+                }
+                else {
+                    var p = code[cx - 1];
+                    if (haschildren(p)) {
+                        p.leave += blink;
+                    }
+                    else {
+                        p.blink = p.text.length;
+                    }
+                    return true;
+                }
+            }
+        }
+        if (code.leave) {
+            code.leave = blink + code.leave;
+            return true;
+        }
+        return false;
+    };
+    function codetext(type, text, blink) {
+        type = type.toLowerCase();
+        if (type in codesupports) {
+            text = codesupports[type](text, blink);
         }
+        else text = encode(text);
         var codes = text.split(/\r\n|\r|\n/);
         var minSpace = 0;
         for (var c of codes) {

package/coms/docs/markdown.js

@@ -99,7 +99,12 @@ function markdown(text) {
         if (q.length === 1) return `<m>${_}</m>`;
         var t = /^\S+/.exec(c);
         if (t) t = t[0]; c = c.slice(t.length).replace(/^(\r\n|\r|\n)|\s+$/g, '');
-        return codetext(t, c);
+        try {
+            return codetext(t, c);
+        } catch (e) {
+            console.error(e);
+            return c;
+        }
     }).replace(/\s*((&nbsp;\s*)+)/g, "$1").split(/\r\n|\r|\n/).forEach(richtext);
     list_elem = null;
     list_tag = null;

package/coms/zimoli/AudioContext_test.less

@@ -60,7 +60,7 @@
             }
 
             span {
-                writing-mode: horizontal-tb;
+                writing-mode: vertical-rl;
             }
 
 

package/coms/zimoli/alert.js

@@ -12,10 +12,11 @@ styles.default = '#000a';
 var fontSize = 16;
 var singleHeight = fontSize * 3.125 | 0;
 var container = document.createElement('alert-container');
-css(container, 'height:0;left:0;right:0;transition:all 0.2s ease-out;position:absolute;')
+css(container, 'top:0;height:0;left:0;right:0;transition:all 0.2s ease-out;position:absolute;')
 var _text = function (bgcolor, parameters) {
     var box = document.createElement('div');
-    box.innerHTML = `<div style='padding:${fromPixel(10)} ${fromPixel(20)};background-color:${bgcolor};color:${color.pair(bgcolor, 1)};'>${[].slice.call(parameters, 0).join(", ")}</div>`;
+    css(box, `background-color:${bgcolor};color:${color.pair(bgcolor, 1)};`);
+    box.innerHTML = [].slice.call(parameters, 0).join(", ");
     box.initialStyle = `margin-top:-${fromPixel(singleHeight)};`;
     return box;
 };
@@ -55,13 +56,12 @@ function alert() {
     } else {
         elem = _text(styles.log, [text]);
     }
-    var _onclose = function (event) {
+    var _onclose = lazy(function (event) {
         if (onclose) {
             onclose.call(this, event);
         }
         if (close_timer) clearTimeout(close_timer);
-        if (!container.children.length) remove(container);
-    }
+    });
     onremove(elem, _onclose);
     var close_timer;
     var waitclose = function (autoclose, deltaTime) {
@@ -87,7 +87,7 @@ function alert() {
         }
     };
     if (!container.parentNode) popup(container);
-    appendChild(container, elem);
+    if (!elem.parentNode) appendChild(container, elem);
     return elem;
 }
 for (var k in styles) {

package/coms/zimoli/alert.less

@@ -6,5 +6,7 @@
     margin: 0 auto;
     height: auto;
     line-height: 1.2;
+    padding: 10px 20px;
     text-align: center;
+    position: relative;
 }

package/coms/zimoli/getGenerator.js

@@ -24,7 +24,7 @@ var getGenerator = function (container, tagName = 'item') {
     var template = document.createElement(container.tagName);
     var templates = [];
     for (let a of container.childNodes) {
-        if (a.hasAttribute('insert')) {
+        if (a.nodeType === 1 && a.hasAttribute('insert')) {
             if (!templates.length) a.$isbefore = true;
             else a.$isafter = true;
         }

package/coms/zimoli/render.js

@@ -886,6 +886,7 @@ class Struct {
 function createStructure(element) {
     if (isArrayLike(element)) return Array.prototype.map.call(element, createStructure);
     if (element.$struct) return element.$struct;
+    if (element.nodeType !== 1) return;
     // 处理结构流
     var attributes = element.attributes;
     var attrs = Array.apply(null, attributes);

package/coms/zimoli/zimoli.js

@@ -58,7 +58,8 @@ if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
             if (currentHash && currentHash === targetHash) return;
             var targetHashIndex = targetHash.indexOf("#" + current_history);
             if (targetHashIndex < 0) return;
-            var targetpath = targetHash.slice(targetHashIndex + current_history.length);
+            var targetpath = targetHash.slice(targetHashIndex + current_history.length + 1);
+            targetpath = decodeURI(targetpath);
             go(targetpath);
             return;
         }

package/docs/main.xht

@@ -150,7 +150,7 @@
             var map = Object.create(null);
             var children = [];
             for (var a of c.children) {
-                if (/_test\.([tj]sx?|xht|html|less|md)$/i.test(a)) {
+                if (/_test\.([tj]sx?|xht|html|less|css|md)$/i.test(a)) {
                     var testName = a.replace(/\.\w+$/g, '');
                     if (!map[testName]) map[testName] = [];
                     map[testName].push(a);
@@ -175,7 +175,7 @@
             c.children = children;
             c.closed = true;
         }
-
+        data.setInstance('components', m);
         menus[2].children = m;
     };
     var initMenus = async function () {