efront 4.22.10 → 4.22.12

package/coms/reptile/colored_console.js

@@ -8,6 +8,7 @@ var strings = require("../basic/strings");
 var lastLogLength = 0;
 var needNextLine = false;
 var getColor = function (c) {
+    if (c === 'wrap') return;
     if (!c) return colors.Reset;
     switch (c) {
         case "red":
@@ -118,7 +119,7 @@ var formatRows = function (arg, rows, deep, entry, leave) {
     if (rows.length === 0) return entry + leave;
     var ci = circleobjs.indexOf(arg);
     if (ci >= 0) {
-        entry = `<cyan><引用点 *${ci + 1}></cyan> ` + entry;
+        entry = bindColor('cyan', `<引用点 *${ci + 1}> `) + entry;
     }
     if (deepobjs.length === 0) circleobjs.splice(0, circleobjs.length);
     var space = new Array(deep).join("    ");
@@ -180,17 +181,17 @@ var format = function (arg, deep = 0) {
     deep++;
     if (arg === null) return String(arg);
     if (typeof arg === 'string') {
-        if (deep > 1) return "<green>" + strings.encode(arg) + "</green>";
+        if (deep > 1) return bindColor("green", arg);
         return arg;
     }
-    if (typeof arg === 'function') return `<cyan>[${arg.constructor.name}${arg.name ? ": " + arg.name : " (匿名)"}]</cyan>`;
-    if (/^(number|boolean)$/.test(typeof arg)) return '<yellow>' + arg + "</yellow>";
-    if (arg === undefined) return "<gray>undefined</gray>";
+    if (typeof arg === 'function') return bindColor('cyan', `[${arg.constructor.name}${arg.name ? ": " + arg.name : " (匿名)"}]`);
+    if (/^(number|boolean)$/.test(typeof arg)) return bindColor('yellow', arg);
+    if (arg === undefined) return bindColor('gray', 'undefined');
     if (typeof arg === "object") {
         if (deepobjs.indexOf(arg) >= 0) {
             var ci = circleobjs.indexOf(arg);
             if (ci < 0) ci = circleobjs.length, circleobjs.push(arg);
-            return `<cyan>[循环点 *${ci + 1}]</cyan>`;
+            return bindColor("cyan", `[循环点 *${ci + 1}]`);
         }
         if (arg instanceof Error) {
             if (deep > 1) return String(arg.message);
@@ -198,7 +199,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} 字节` : ''}></magenta>`;
+            return bindColor('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} 字节` : ''}>`);
         }
         else if (isFinite(arg.length)) {
             var entry = "[";
@@ -209,26 +210,26 @@ var format = function (arg, deep = 0) {
             deepobjs.push(arg);
             var res = Array.prototype.slice.call(arg, 0, 100).map(a => format(a, deep));
             deepobjs.pop();
-            if (arg.length > res.length) res.push(`<gray>.. 其他 ${arg.length - res.length} 项</gray>`);
+            if (arg.length > res.length) res.push(bindColor('gray', `.. 其他 ${arg.length - res.length} 项`));
             return formatRows(arg, res, deep, entry, leave);
         }
         if (arg.constructor === Date) {
-            return '<purple>' + formatDate.call(arg) + "</purple>";
+            return bindColor('purple', formatDate.call(arg));
         }
         if (arg.constructor === RegExp) {
-            return `<red2>/${arg.source}/</red2><cyan>${arg.flags}</cyan>`;
+            return bindColor('red2', `/${arg.source}/`) + bindColor('cyan', arg.flags);
         }
         var keys = Object.keys(arg);
         var ks = keys.slice(0, 100);
         if (deep > 3 && deep + keys.length > 5) {
             var kvs = [];
-            if (keys.length > 0) kvs.push(`<gray>.. 共 ${keys.length} 个属性</gray>`);
+            if (keys.length > 0) kvs.push(bindColor('gray', `.. 共 ${keys.length} 个属性`));
         }
         else {
             deepobjs.push(arg);
             var kvs = ks.map(k => `${/[\:'"`\[\{\(\r\n\u2028\u2029]|^\s|\s$/.test(k) ? format(k, deep) : k}: ${format(arg[k], deep)}`);
             deepobjs.pop();
-            if (keys.length > ks.length) kvs.push(`<gray>.. 其他 ${keys.length - ks.length} 个属性</gray>`);
+            if (keys.length > ks.length) kvs.push(bindColor('gray', `.. 其他 ${keys.length - ks.length} 个属性`));
         }
         var entry = '{';
         if (arg.constructor && arg.constructor !== Object) entry = arg.constructor.name + entry;
@@ -281,7 +282,7 @@ colored.log = function () {
     if (needNextLine) needNextLine = false;
     _log.apply(console, arguments);
 };
-colored.wrap = function (c, content) {
+var bindColor = colored.wrap = function (c, content) {
     var c = getColor(c);
     if (!c) throw new Error(i18n`${c}不是有效的色彩信息`);
     return c + content + colors.Reset;
@@ -300,11 +301,7 @@ colored.clear = function (tag) {
     write1(false, '');
     if (tag) write1(true, tag);
 };
-colored.format = function (a) {
-    a = format(a);
-    a = renderColor(a);
-    return a;
-};
+colored.format = format;
 if (typeof i18n !== 'undefined') {
     colored.info.tip = i18n`提示`;
     colored.warn.tip = i18n`注意`;

package/coms/reptile/colored_console_test.js

@@ -54,4 +54,5 @@ var data = [
 data[data.length - 1].循环对象 = data[data.length - 1];
 console.log(data);
 console.line(data);
+console.log(compile$common.createString(茨菰$标签化(compile$scanner2("arguments.length"), colors.wrap)));
 throw new Error(2);

package/coms/reptile/colors.js

@@ -80,4 +80,10 @@ class Color {
 }
 for (var k in colors) {
     colors[k] = new Color(k, colors[k]);
-}
+}
+var reset = colors.Reset;
+colors.wrap = function (content, label) {
+    var c = colors[label];
+    if (!c) return content;
+    return c + content + reset;
+};

package/coms/zimoli/zimoli.js

@@ -36,6 +36,7 @@ onhashchange(window, function (event) {
         var currentHash = getCurrentHash();
         if (currentHash && currentHash === targetHash) return;
         var targetpath = pathFromHash(targetHash);
+        if (targetpath === popupHashlessPath) return fixurl();
         if (pathFromHash(currentHash) === popupHashlessPath) {
             backward();
             return;
@@ -419,6 +420,7 @@ function create(pagepath, args, from, needroles) {
 var createEmptyHistory = function (emptyState, allowForward = true) {
     var h = [emptyState];
     h.index = 0;
+    h.lastIndex = 0;
     h.wardable = allowForward;
     return h;
 }
@@ -484,10 +486,10 @@ var pushstate = function (path_name, history_name) {
             _history.index++;
         }
         if (_history[_history.index] !== path_name) {
-            _history.lastIndex = index;
             _history.splice(_history.index, _history.length - _history.index);
             _history[_history.index] = path_name;
         }
+        _history.lastIndex = index;
     }
     savestate();
     return isBack;
@@ -515,34 +517,40 @@ var getCurrentHash = function () {
     var targeturl = `#${history_name}${_historylist.length ? _historylist[_historylist.index] : ""}`;
     return encodeURI(targeturl);
 };
+var fixlock = false;
+var fixUnlock = function () {
+    fixlock = false;
+}
+var fixNext = function (d) {
+    fixlock = true;
+    var h = history[current_history];
+    h.lastIndex = h.index;
+    preventNextHashChange = true;
+    window_history.go(d);
+    setTimeout(fixUnlock, 60);
+    setTimeout(fixurl, 60);
+};
 var fixurl = function () {
+    if (fixlock) return;
     if (false === fullfill_is_dispatched) return;
     var zimoli_hash = getCurrentHash();
     var location_hash = getLocationHash();
     if (location_hash === zimoli_hash) return;
     var location_path = pathFromHash(location_hash);
     if (location_path === popupHashlessPath) {
-        preventNextHashChange = true;
-        window_history.go(-1);
-        location_hash = getCurrentHash();
-        location_path = pathFromHash(location_hash);
+        fixNext(-1);
+        return;
     };
-    if (zimoli_hash === location_hash) return;
     var zimoli_path = pathFromHash(zimoli_hash);
     if (zimoli_path === popupHashlessPath) return setLocationHash(zimoli_hash);
     if (zimoli_hash) {
         if (!location_hash) setLocationHash(zimoli_hash);
         else {
             var _history = history[current_history];
-            var b = _history.indexOf(location_path);
-            if (b >= 0) {
-                var c = _history.indexOf(zimoli_path);
-                if (c >= 0) {
-                    var d = c - b;
-                    preventNextHashChange = true;
-                    window_history.go(d);
-                    location_hash = getLocationHash();
-                }
+            var d = _history.index - _history.lastIndex;
+            if (d) {
+                fixNext(d);
+                return;
             }
             if (location_hash !== zimoli_hash) {
                 setLocationHash(zimoli_hash);
@@ -552,11 +560,8 @@ var fixurl = function () {
     else if (location_path !== getInitPath()) {
         var _history = history[current_history];
         var i = _history.indexOf(location_path);
-        if (i === -1) i = _history.lastIndex;
-        if (i > 0) {
-            preventNextHashChange = true;
-            window_history.go(-i);
-        }
+        if (i === -1) i = _history.lastIndex, _history.lastIndex = _history.index;
+        if (i > 0) fixNext(-i);
     }
 };
 var checkonback = function (elements) {

package/coms//350/214/250/350/217/260//346/240/207/347/255/276/345/214/226.js

@@ -6,7 +6,20 @@ predefs.exports = true;
 predefs["module.exports"] = true;
 predefs.Promise = true;
 [Boolean, Number, String, Function, Object, Array, Date, RegExp, Error].forEach(p => predefs[p.name] = true);
+var wrapLabel = function (content, typeName) {
+    return `<${typeName}>${content}</${typeName}>`;
+};
+var amp = a => `&#${a.charCodeAt()};`;
+var encodeAmp = function (a) {
+    return a.replace(/[\<\>\|&]/g, amp);
+};
 var codecolor = function (c, encode) {
+    var wrap = arguments[2];
+    if (encode?.length === 2) wrap = encode, encode = arguments[2];
+    if (!wrap) {
+        wrap = wrapLabel;
+        if (!encode) encode = encodeAmp;
+    }
     var envs = c.envs;
     var deep = 0;
     var used = c.used;
@@ -45,17 +58,25 @@ var codecolor = function (c, encode) {
         return false;
     };
     var setExpress = function (o, label) {
-        if (!o.text || /^</.test(o.text)) return;
+        if (!o.text || o.wraped) return;
+        o.wraped = true;
         var keys = o.text.split(".");
+        var invoked = null;
+        var endi = keys.length - 1;
         if (isInvoke(o)) {
-            if (!/^[\<\?]/.test(keys[keys.length - 1])) keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
+            if (!/^[\?]/.test(keys[endi])) invoked = wrap(keys[endi], "invoke");
         }
+        else endi++;
         var [name] = keys;
-        if (/^[\<\?]/.test(name) || !name);
-        else if (!o.isprop && o.text !== name && isConstValue(name)) name = `<strap>${name}</strap>`;
-        else name = `<${label}>${name}</${label}>`;
+        if (!o.isprop && o.text !== name && isConstValue(name)) name = wrap(name, "strap");
+        else name = wrap(name, label);
         keys[0] = name;
-        o.text = keys.map(k => /^[\<\?]/.test(k) || !k ? k : `<express>${k}</express>`).join(".");
+        for (var cx = 1, dx = endi; cx < dx; cx++) {
+            var k = keys[cx];
+            keys[cx] = /^[\?]/.test(k) || !k ? k : wrap(k, 'express');
+        }
+        if (endi === keys.length - 1) keys[endi] = invoked;
+        o.text = keys.join('.');
     };
     var setPredef = o => setExpress(o, 'predef');
     var setOutside = o => setExpress(o, 'outside');
@@ -66,11 +87,15 @@ var codecolor = function (c, encode) {
     if (spaceReg) var unspaceReg = new RegExp(`(?:[^${光标}])+`, 'g');
     var wraptext = function (t, l) {
         if (unspaceReg) t = t.replace(unspaceReg, a => {
-            a = encode(a);
-            return `<${l}>${a}</${l}>`
+            if (encode) a = encode(a);
+            return wrap(a, l);
         });
         return t;
     };
+    var wrapcode = encode ? function (t, l) {
+        t = encode(t);
+        return wrap(t, l);
+    } : wrap;
     c.colored = true;
     var setcolor = function (o) {
         if (o.colored) return;
@@ -78,13 +103,13 @@ var codecolor = function (c, encode) {
         var text = o.text;
         switch (o.type) {
             case LABEL:
-                o.text = `<label>${o.text}</label>`;
+                o.text = wrap(o.text, 'label');
                 break;
             case QUOTED:
                 if (o.length || !o.text) {
                     o.forEach(setcolor);
-                    o.entry = "<text>" + o.entry + "</text>";
-                    o.leave = "<text>" + o.leave + "</text>";
+                    o.entry = wrap(o.entry, 'text');
+                    o.leave = wrap(o.leave, 'text');
                     break;
                 }
                 if (/^\//.test(o.text)) {
@@ -101,30 +126,30 @@ var codecolor = function (c, encode) {
                 }
             case PIECE:
                 if (o.queue && o.queue.tag) {
-                    o.text = encode(o.text);
+                    if (encode) o.text = encode(o.text);
                 }
                 else o.text = wraptext(o.text, 'text');
                 break;
                 break;
             case ELEMENT:
                 if (o.attributes) o.attributes.forEach(setcolor);
-                if (o.tag_entry) o.tag_entry = `<stamp>${encode(o.tag_entry)}</stamp>`;
-                if (o.tag_leave) o.tag_leave = `<stamp>${encode(o.tag_leave)}</stamp>`;
-                if (o.entry) o.entry = `<stamp>${encode(o.entry)}</stamp>`;
-                if (o.leave) o.leave = `<stamp>${encode(o.leave)}</stamp>`;
-                o.tag = `<label>${o.tag}</label>`;
+                if (o.tag_entry) o.tag_entry = wrapcode(o.tag_entry, 'stamp');
+                if (o.tag_leave) o.tag_leave = wrapcode(o.tag_leave, 'stamp');
+                if (o.entry) o.entry = wrapcode(o.entry, 'stamp');
+                if (o.leave) o.leave = wrapcode(o.leave, 'stamp');
+                o.tag = wrapcode(o.tag, 'label');
                 o.forEach(setcolor);
                 break;
             case SCOPED:
                 deep++;
                 o.forEach(setcolor);
                 deep--;
-                o.entry = `<deep${deep}>${o.entry}</deep${deep}>`;
-                o.leave = `<deep${deep}>${o.leave}</deep${deep}>`;
+                o.entry = wrapcode(o.entry, 'deep' + deep);
+                o.leave = wrapcode(o.leave, 'deep' + deep);
                 break;
             case VALUE:
-                if (o.isdigit) o.text = `<digit>${o.text}</digit>`;
-                else o.text = `<value>${o.text}</value>`;
+                if (o.isdigit) o.text = wrap(o.text, 'digit');
+                else o.text = wrap(o.text, 'value');
                 break;
             case PROPERTY:
                 var next = o.next;
@@ -138,13 +163,11 @@ var codecolor = function (c, encode) {
                 setExpress(o, o.istype || o.isdef || o.next?.needle ? 'predef' : 'express');
                 break;
             case STRAP:
-                if (control_reg?.test(text)) o.text = `<flow>${o.text}</flow>`;
-                else o.text = `<strap>${o.text}</strap>`;
+                if (control_reg?.test(text)) o.text = wrap(o.text, 'flow');
+                else o.text = wrap(o.text, 'strap');
                 break;
             case STAMP:
-                if (/^(=>)$/.test(o.text) || o.text === "*" && o.prev && o.prev.type === STRAP) o.text = `<strap>${encode(o.text)}</strap>`;
-                // else if (!/^[<\/>]+$/.test(o.text));
-                // else o.text = `<stamp>${encode(o.text)}</stamp>`;
+                if (/^(=>)$/.test(o.text) || o.text === "*" && o.prev && o.prev.type === STRAP) o.text = wrapcode(o.text, 'strap');
                 break;
             case COMMENT:
                 o.text = wraptext(o.text, 'comment');
@@ -154,4 +177,5 @@ var codecolor = function (c, encode) {
     c.forEach(setcolor);
     return c;
 }
+codecolor.encode = encodeAmp;
 return codecolor;

package/coms//350/214/250/350/217/260//346/270/262/346/237/223.js

@@ -1,8 +1,5 @@
 
 var { SCOPED, QUOTED, SPACE, STAMP, STRAP, EXPRESS, PROPERTY } = compile$common;
-var encode = function (text) {
-    return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`);
-};
 
 var rows = function (type, text) {
     if (typeof text !== 'string') {
@@ -12,11 +9,11 @@ var rows = function (type, text) {
     type = String(type).toLowerCase();
     if (type in 语言) {
         var c = 语言[type](text);
-        标签化(c, encode);
+        标签化(c);
         text = c.toString();
 
     }
-    else text = encode(text);
+    else text = 标签化.encode(text);
 
     var codes = text.split(/\r\n|\r|\n/);
     var minSpace = Infinity;
@@ -41,5 +38,5 @@ function 茨菰(type, text) {
 };
 
 茨菰.rows = rows;
-茨菰.encode = encode;
+茨菰.encode = 标签化.encode;
 return 茨菰;

package/package.json

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