efront 3.31.2 → 3.32.0

package/coms/basic/getIndexFromOrderedArray_test.js

@@ -1,14 +1,12 @@
-function getIndexFromOrderedArray_test() {
-    if (getIndexFromOrderedArray([0, 0, 0], 0) !== 2) {
-        throw new Error("expect getIndexFromOrderedArray([0,0,0],0) to be equal 2");
-    }
-    if (getIndexFromOrderedArray([0, 1, 2], 0) !== 0) {
-        throw new Error("expect getIndexFromOrderedArray([0,1,2],0) to be equal 0");
-    }
-    if (getIndexFromOrderedArray([1, 2, 3], 0) !== -1) {
-        throw new Error("expect getIndexFromOrderedArray([1,2,3],0) to be equal -1");
-    }
-    if (getIndexFromOrderedArray([1, 2, 3], 2) !== 1) {
-        throw new Error("expect getIndexFromOrderedArray([1,2,3],2) to be equal 1");
-    }
+if (getIndexFromOrderedArray([0, 0, 0], 0) !== 2) {
+    throw new Error("expect getIndexFromOrderedArray([0,0,0],0) to be equal 2");
+}
+if (getIndexFromOrderedArray([0, 1, 2], 0) !== 0) {
+    throw new Error("expect getIndexFromOrderedArray([0,1,2],0) to be equal 0");
+}
+if (getIndexFromOrderedArray([1, 2, 3], 0) !== -1) {
+    throw new Error("expect getIndexFromOrderedArray([1,2,3],0) to be equal -1");
+}
+if (getIndexFromOrderedArray([1, 2, 3], 2) !== 1) {
+    throw new Error("expect getIndexFromOrderedArray([1,2,3],2) to be equal 1");
 }

package/coms/basic/saveToOrderedArray_test.js

@@ -0,0 +1,25 @@
+var float = function () {
+    return Math.random();
+};
+var int = function () {
+    return Math.random() * 10 | 0;
+};
+var str = function () {
+    return Math.random().toString(36).slice(2, 3);
+}
+var test = function (gen, isle, sort = isle) {
+    var array = [];
+    for (var cx = 0, dx = 10; cx < dx; cx++)saveToOrderedArray(array, gen(), isle);
+    var res = array.slice();
+    assert(res.join(','), array.sort(sort).join(','));
+    console.log(res)
+}
+test(float, undefined, (a, b) => a - b);
+test(float, (a, b) => a >= b, (a, b) => b - a);
+test(float, (a, b) => a > b, (a, b) => b - a);
+test(int, (a, b) => a <= b, (a, b) => a - b);
+test(int, (a, b) => a > b, (a, b) => b - a);
+test(int, (a, b) => a >= b, (a, b) => b - a);
+test(str, (a, b) => a > b);
+test(str, (a, b) => a <= b);
+

package/coms/reptile/colored_console.js

@@ -2,7 +2,9 @@
 var colored = Object.create(null);
 var lazy = require("../basic/lazy");
 var colors = require("./colors");
+var strings = require("../basic/strings");
 var lastLogLength = 0;
+var needNextLine = false;
 var getColor = function (c) {
     switch (c) {
         case "red":
@@ -28,14 +30,23 @@ var getColor = function (c) {
     }
     return '';
 };
+var colorReg = /<(\/?)([a-z][\w]*)[^\/\\\>]*\>/ig;
 var write = function (hasNewLine, str) {
-    str = String(str).replace(/<([a-z][\w]*)[^\>]*\>([\s\S]*?)<\/\1\>/ig, function (_, c, s) {
-        var color = getColor(c);
-        if (color) return color + s + colors.Reset;
-        return s;
+    var colorpath = [];
+    str = String(str).replace(colorReg, function (_, e, c) {
+        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);
+        return res.join('');
     });
     process.stdout.cork();
-    var hasNextLine = /[\r\n\u2028\u2029]/.test(str);
+    var hasNextLine = /[\r\n\u2028\u2029]$/.test(str);
     if (process.stdout.isTTY) {
         if (lastLogLength) {
             var width = process.stdout.columns;
@@ -48,7 +59,17 @@ var write = function (hasNewLine, str) {
     else {
         if (!hasNewLine && !hasNextLine) str = '';
     }
-    hasNewLine && !hasNextLine ? process.stdout.write(str + "\r\n") : process.stdout.write("\r" + str);
+    if (needNextLine && !/^[\r\n\u2028\u2029]/.test(str)) {
+        process.stdout.write("\r\n");
+    }
+    if (hasNewLine && !hasNextLine) {
+        process.stdout.write(str)
+        needNextLine = true;
+    }
+    else {
+        process.stdout.write("\r" + str);
+        needNextLine = false;
+    }
     if (hasNextLine) hasNewLine = true;
     if (hasNewLine) {
         lastLogLength = 0;
@@ -74,44 +95,173 @@ var write = function (hasNewLine, str) {
     var logger = function (...args) {
         var label = fgColor + bgColor + info + reset;
         var time_stamp = '';
-        var str = [time_stamp, label, ...args].join(" ");
-        if (queue.length > 1 && !queue[queue.length - 2] && !/[\r\n\u2028\u2029]/.test(queue[queue.length - 1])) {
-            queue.pop();
-            queue.pop();
-        }
+        var str = [time_stamp, label, ...args.map(a => format(a))].join(" ");
         write1(hasNewLine, str);
     };
     colored[log] = logger;
 });
-var queue = [];
-var flush = function () {
-    while (queue.length) write(queue.shift(), queue.shift());
-};
-// var write0 = lazy(flush, -60);
 var write1 = function (hasNewLine, str) {
-    writeid++;
-    // queue.push(hasNewLine, str);
+    drop.cancel();
     write(hasNewLine, str);
 };
-colored.flush = flush;
+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;
+    }
+    if (deepobjs.length === 0) circleobjs.splice(0, circleobjs.length);
+    var space = new Array(deep).join("    ");
+    var deepspace = new Array(deep + 1).join("    ");
+    var lens = rows.map(r => r.replace(colorReg, '').replace(/[\u00ff-\uffff]/g, '00').length);
+    var maxLength = Math.max(...lens) + 2;
+    var itemcount = (process.stdout.columns - deepspace.length - 10) / maxLength | 0;
+    if (itemcount * itemcount > rows.length) itemcount = Math.ceil(Math.sqrt(rows.length));
+    if (itemcount < 1) itemcount = 1;
+    var hasNextLine = false;
+    var isArray = arg instanceof Array;
+    for (var r of rows) {
+        if (/[\r\n\u2028\u2029]/.test(r)) {
+            itemcount = 1;
+            hasNextLine = true;
+            break;
+        }
+    }
+    if (!hasNextLine && deepspace.length + maxLength * rows.length < process.stdout.columns)
+        return `${entry} ${rows.join(", ")} ${leave}`;
+    var res;
+    if (itemcount <= 1) {
+        res = rows;
+    }
+    else {
+        var maxLength = Array(itemcount).fill(0);
+        for (var cy = 0, dy = itemcount; cy < dy; cy++) {
+            for (var cx = cy, dx = rows.length - 1; cx < dx; cx += itemcount) {
+                if (maxLength[cy] < lens[cx]) maxLength[cy] = lens[cx];
+            }
+        }
+        maxLength = maxLength.map(i => i + 2);
+        res = [];
+        if (isArray) {
+            for (var cx = 0, dx = rows.length; cx < dx; cx += itemcount) {
+                res.push(rows.slice(cx, cx + itemcount).map((r, i) => {
+                    return Array(maxLength[i] - lens[cx + i]).join(" ") + r;
+                }).join(', '));
+            }
+        }
+        else {
+            for (var cx = 0, dx = rows.length; cx < dx; cx += itemcount) {
+                res.push([rows[cx], ...rows.slice(cx + 1, cx + itemcount).map((r, i) => {
+                    return Array(maxLength[i] - lens[cx + i]).join(" ") + r;
+                })].join(', '));
+            }
+        }
+    }
+    return `${entry}\r\n${deepspace + res.join(",\r\n" + deepspace)}\r\n${space}${leave}`
+};
+var deepobjs = [];
+var circleobjs = [];
+var format = function (arg, deep = 0) {
+    deep++;
+    if (arg === null) return arg;
+    if (typeof arg === 'string') {
+        if (deep > 1) return "<green>" + strings.encode(arg) + "</green>";
+        return arg;
+    }
+    if (typeof arg === 'function') return `<cyan>[${arg.__proto__.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 === "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>`;
+        }
+        if (arg instanceof Array) {
+            if (arg.length === 0) return '[]';
+            if (deep > 3) return `${arg.__proto__.constructor.name}(${arg.length})[ ... ]`;
+            deepobjs.push(arg);
+            var res = arg.slice(0, 100).map(a => format(a, deep));
+            deepobjs.pop();
+            if (arg.length > res.length) res.push(`<gray>.. 其他 ${arg.length - res.length} 项</gray>`);
+            return formatRows(arg, res, deep, '[', ']');
+        }
+        if (arg.constructor === Date) {
+            return '<purple>' + formatDate.call(arg) + "</purple>";
+        }
+        if (arg.constructor === RegExp) {
+            return `<red2>/${arg.source}/</red2><cyan>${arg.flags}</cyan>`;
+        }
+        var keys = Object.keys(arg);
+        var ks = keys.slice(0, 100);
+        if (deep > 3) {
+            var kvs = [];
+            if (keys.length > 0) kvs.push(`<gray>.. 共 ${keys.length} 个属性</gray>`);
+        }
+        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>`);
+        }
+        var entry = '{';
+        if (arg.constructor && arg.constructor !== Object) entry = arg.constructor.name + entry;
+        return formatRows(arg, kvs, deep, entry, '}');
+    }
+    return String(arg);
+};
+var toLength = function (n, a = -1) {
+    n = String(n);
+    if (n.length < 2) {
+        n = '0' + n;
+    }
+    if (a === -1 && n.length < 3) {
+        n = '0' + n;
+    }
+    return n;
+};
+
+var formatDate = function () {
+    var year = this.getFullYear();
+    var month = this.getMonth() + 1;
+    var date = this.getDate();
+    var hours = this.getHours();
+    var minutes = this.getMinutes();
+    var seconds = this.getSeconds();
+    var milli = this.getMilliseconds();
+    milli = toLength(milli);
+    var offset = -this.getTimezoneOffset();
+    if (offset >= 0) {
+        offset = '+' + toLength(offset / 60 | 0, 0) + toLength(offset % 60, 0);
+    } else {
+        offset = '-' + toLength(-offset / 60 | 0, 0) + toLength(-offset % 60, 0);
+    }
+    return `${[year, month, date].map(toLength).join('-')} ${[hours, minutes, seconds].map(toLength).join(':')}.${milli} ${offset}`;
+};
+
+colored.time = function (date = new Date, str) {
+    write1(true, colors.BgGray + colors.FgWhite2 + formatDate.call(date) + str + colors.Reset);
+};
+
 colored.type = function (...args) {
-    write1(false, args.join(' '));
+    write1(false, args.map(a => format(a)).join(' '));
+};
+colored.line = function (...args) {
+    write1(true, args.map(a => format(a)).join(' '));
 };
 var _log = console.log;
 colored.log = function () {
-    flush();
+    if (lastLogLength > 0) write1(false, '');
+    if (needNextLine) needNextLine = false;
     _log.apply(console, arguments);
 };
 colored.begin = function (c) {
     return write1(false, getColor(c));
 };
-var writeid = 0;
-var drop = lazy(function (dropid) {
-    if (dropid === writeid) write1(false, "");
+var drop = lazy(function () {
+    write(false, "");
 }, 160);
-colored.drop = function () {
-    drop(++writeid);
-};
+colored.drop = drop;
 colored.end = function () {
     return write1(false, colors.Reset);
 };

package/coms/reptile/colored_console_test.js

@@ -0,0 +1,55 @@
+var console = require("./colored_console");
+var data = [
+    { a: 1 },
+    { b: [2] },
+    { c: null },
+    class c { },
+    { 匿名函数: function () { } },
+    { "arraw function": e => { } },
+    { "function a(){}": function a() { } },
+    { "astar function": function* b() { } },
+    { "async function": async function* d() { } },
+    { "二层对象": { c: 2, "三层对象": { d: 3 } } },
+    {
+        "多属性节点": {
+            a: 1,
+            b: 2,
+            c: 3,
+        }
+    },
+    {
+        "多属性节点": {
+            "属性1": 1,
+            "属性2": 1,
+            "属性3": 1,
+            "属性4": 1,
+            "属性5": 1,
+            "属性6": 1,
+            "属性7": 1,
+            "属性8": 1,
+            "属性10": 1,
+            "属性11": 1,
+            "属性12": 1,
+            "属性13": 1,
+            "属性14": 1,
+            "属性15": 1,
+            "属性16": 1,
+            "属性17": 1,
+        }
+    },
+    {
+        "多属性节点": function () {
+            var a = {};
+            for (var cx = 1; cx <= 101; cx++) {
+                a["属性" + cx] = cx;
+            }
+            return a;
+        }()
+    },
+    /Abcdefg/gimuy,
+    new Date,
+    { "循环对象": null },
+];
+data[data.length - 1].循环对象 = data[data.length - 1];
+console.log(data);
+console.line(data);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.31.2",
+    "version": "3.32.0",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {