efront 3.26.16 → 3.27.1

package/coms/basic/encodePack.js

@@ -77,7 +77,7 @@ function tohuff(buff, result = [], type_limit) {
     b.sort(function (m, n) {
         return a[n] - a[m];
     });
-    var size = getIndexFromOrderedArray(b, 1, (m, n) => a[m] >= n);
+    var size = getIndexFromOrderedArray(b, 1, (m, n) => a[m] >= n, false);
     if (a[b[size]] > 0) size++;
     if (size + 1 > b.length) console.log(a.slice(420), buff.filter(a => a > 512), b.slice(420))
 
@@ -285,7 +285,7 @@ function pack2(buff) {
                 range_compress,
                 other_compress << 5 | el.length,
             ],
-            el,  e]));
+            el, e]));
     }
     result = concatTypedArray(result);
     return pack0(buff, result);

package/coms/basic/getIndexFromOrderedArray.js

@@ -19,7 +19,7 @@ var defaultIsLE = (sample, search) => isArray(sample) && isArray(search) ? array
  * @param {Array} orderArray 
  * @param {string|number} searchItem 
  */
-module.exports = function (orderArray, searchItem, isLE = typeof searchItem === "function" ? searchItem : defaultIsLE) {
+module.exports = function (orderArray, searchItem, isLE = typeof searchItem === "function" ? searchItem : defaultIsLE, findEqual = true) {
     for (var cx = 0, dx = orderArray.length, ci = cx + dx >>> 1; cx < dx; ci = cx + dx >>> 1) {
         var orderItem = orderArray[ci];
         if (isLE(orderItem, searchItem)) {
@@ -28,8 +28,8 @@ module.exports = function (orderArray, searchItem, isLE = typeof searchItem ===
             dx = ci;
         }
     }
-    var index = dx - 1;
-    if (index < orderArray.length) {
+    if (findEqual && dx <= orderArray.length) {
+        var index = dx - 1;
         while (index >= 0 && isLE(searchItem, orderArray[index])) {
             if (orderArray[index] === searchItem) return index;
             index--;

package/coms/basic/isArrayLike.js

@@ -1,5 +1,5 @@
 function isArrayLike(a) {
-    if (a === null || typeof a !== 'object' || isNode(a)) return false;
+    if (a === null || a === window || typeof a !== 'object' || isNode(a)) return false;
     if (isFinite(a.length)) {
         if (a.length > 0) {
             return a.length - 1 in a;

package/coms/basic/isSame.js

@@ -0,0 +1,3 @@
+function isSame(o1, o2) {
+    return o1 === o2 || isNumber(o1) && isNumber(o2) && isNaN(o1) && isNaN(o2);
+}

package/coms/basic/loader.js

@@ -299,7 +299,7 @@ var loadModule = function (name, then, prebuilds = {}) {
                 if (error) {
                     if (!errored[error]) errored[error] = [];
                     errored[error].push(key);
-                    _errored.push(error);
+                    if (_errored.indexOf(error) < 0) _errored.push(error);
                 }
                 if (loadingCount === args.length) {
                     if (_errored.length) loadedModules[key].error = _errored;

package/coms/basic/mark.js

@@ -84,41 +84,64 @@ var power = function (source, search) {
     return [0, source];
 };
 
-
 var power2 = function (src1, src2) {
+    var c = compare(src1, src2);
+    var p = c.pop();
+    if (!p) return [src1, src2, 0];
+    src1 = src1.slice(0, 0);
+    src2 = src2.slice(0, 0);
+    for (var a of c) {
+        if (a.different) src1 = src1.concat(a[0]), src2 = src2.concat(a[1]);
+        else src1 = src1.concat(MARK_PRE1, a, MARK_AFT1), src2 = src2.concat(MARK_PRE2, a, MARK_AFT2);
+    }
+    return [src1, src2, p];
+};
 
-    if (!src2 || !src1) {
-        return [src1, src2, 0];
+var different = function (src1, src2) {
+    var res = [src1, src2];
+    res.different = true;
+    return res;
+};
+
+var compare = function (src1, src2, min = 0) {
+    if (!src2 || !src1 || !src1.slice || !src2.slice) {
+        if (isSame(src1, src2)) return [src1, 1];
+        return [different(src1, src2), 0];
     }
     var matchers = couple(src1, src2);
     var [match_text, match_start1, match_start2] = matchers;
-    if (match_text.length > 0) {
+    if (match_text.length > min) {
         var src1_pre = src1.slice(0, match_start1);
         var src1_aft = src1.slice(match_start1 + match_text.length);
         var src2_pre = src2.slice(0, match_start2);
         var src2_aft = src2.slice(match_start2 + match_text.length);
         var pp = 0, ap = 0;
         var p = match_text.length;
+        var pre, aft;
         if (src1_pre.length) p += .1 / src1_pre.length - .2;
         if (src1_aft.length) p += .1 / src1_aft.length - .1;
-        if (src1_pre.length > 0 && src2_pre.length > 0) {
-            [src1_pre, src2_pre, pp] = power2(src1_pre, src2_pre);
+        if (src1_pre.length > 0 || src2_pre.length > 0) {
+            pre = compare(src1_pre, src2_pre);
+            pp = pre.pop();
         }
-        if (src1_aft.length > 0 && src2_aft.length > 0) {
-            [src1_aft, src2_aft, ap] = power2(src1_aft, src2_aft);
+        else {
+            pre = [];
         }
-        p += (pp + ap) * .01;
-        return [
-            src1_pre.concat(MARK_PRE1, match_text, MARK_AFT1, src1_aft),
-            src2_pre.concat(MARK_PRE2, match_text, MARK_AFT2, src2_aft),
-            p
-        ];
+        if (src1_aft.length > 0 || src2_aft.length > 0) {
+            aft = compare(src1_aft, src2_aft);
+            ap = aft.pop();
+        }
+        else {
+            aft = [];
+        }
+        p += (pp + ap) / src1.length / src2.length * .01;
+        pre.push(match_text);
+        return pre.concat(aft, p);
     }
-    return [src1, src2, 0];
+    return [different(src1, src2), 0];
 
 };
 
-
 var setTag1 = function (pre, aft) {
     if (arguments.length === 1) {
         if (pre instanceof Array) {
@@ -153,5 +176,10 @@ mark.setTag1 = setTag1;
 mark.setTag2 = setTag2;
 mark.power = power;
 mark.power2 = power2;
+mark.compare = function (a, b) {
+    var c = compare(a, b);
+    c.power = c.pop();
+    return c;
+};
 mark.pair = pair;
 mark.couple = couple;

package/coms/reptile/colored_console.js

@@ -0,0 +1,122 @@
+"use strict";
+var colored = Object.create(null);
+var lazy = require("../basic/lazy");
+var colors = require("./colors");
+var lastLogLength = 0;
+var getColor = function (c) {
+    switch (c) {
+        case "red":
+        case "error":
+        case "danger":
+            return colors.FgRed;
+        case "info":
+        case "tip":
+        case "blue":
+            return colors.FgBlue;
+        case "green":
+            return colors.FgGreen;
+        default:
+            if (c in colors) return colors[c];
+            c = c[0].toUpperCase() + c.slice(1).toLowerCase();
+            if (c in colors) return colors[c];
+            var k = "Fg" + c;
+            if (k in colors) {
+                return colors[k];
+            }
+            c = c.slice(0, 2) + c[2].toUpperCase() + c.slice(3);
+            if (c in colors) return colors[c];
+    }
+    return '';
+};
+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;
+    });
+    process.stdout.cork();
+    var hasNextLine = /[\r\n\u2028\u2029]/.test(str);
+    if (process.stdout.isTTY) {
+        if (lastLogLength) {
+            var width = process.stdout.columns;
+            var dx = lastLogLength % width;
+            var dy = (lastLogLength - 1) / width | 0;
+            process.stdout.moveCursor(-dx, -dy);
+            process.stdout.clearScreenDown();
+        }
+    }
+    else {
+        if (!hasNewLine && !hasNextLine) str = '';
+    }
+    hasNewLine && !hasNextLine ? process.stdout.write(str + "\r\n") : process.stdout.write("\r" + str);
+    if (hasNextLine) hasNewLine = true;
+    if (hasNewLine) {
+        lastLogLength = 0;
+    } else {
+        str = str.replace(/\x1b\[\d+m/g, '').replace(/\b/g, '');
+        lastLogLength = str.length + str.replace(/[\x20-\xff]/g, "").length;
+    }
+    process.stdout.uncork();
+};
+[
+    "pass:[ ✔ ]:FgGreen:",
+    "fail:[ ✘ ]:FgRed2:",
+    "test:[ ∞ ]:FgYellow:",
+    "info:提示:FgCyan:",
+    "warn:注意:FgYellow:",
+    "error:错误:FgRed2:"
+].forEach(function (config) {
+    var [log, info = log.toUpperCase(), fg, bg] = config.split(":");
+    var fgColor = colors[fg] || "",
+        bgColor = colors[bg] || "",
+        reset = colors.Reset;
+    var hasNewLine = /^(warn|error|pass|fail)$/.test(log);
+    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();
+        }
+        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);
+    write(hasNewLine, str);
+};
+colored.flush = flush;
+colored.type = function (...args) {
+    write1(false, args.join(' '));
+};
+var _log = console.log;
+colored.log = function () {
+    flush();
+    _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, "");
+}, 160);
+colored.drop = function () {
+    drop(++writeid);
+};
+colored.end = function () {
+    return write1(false, colors.Reset);
+};
+colored.clear = function (tag) {
+    write1(false, '');
+    if (tag) write1(true, tag);
+};
+module.exports = colored;

package/coms/reptile/colors.js

@@ -0,0 +1,54 @@
+var colors = module.exports = {
+    Reset: "\x1b[0m",
+    Bright: "\x1b[1m",
+    Dim: "\x1b[2m",
+    Underscore: "\x1b[4m",
+    Blink: "\x1b[5m",
+    Reverse: "\x1b[7m",
+    Hidden: "\x1b[8m",
+    FgBlack: "\x1b[30m",
+    FgRed: "\x1b[31m",
+    FgGreen: "\x1b[32m",
+    FgYellow: "\x1b[33m",
+    FgBlue: "\x1b[34m",
+    FgMagenta: "\x1b[35m",
+    FgCyan: "\x1b[36m",
+    FgWhite: "\x1b[37m",
+    BgBlack: "\x1b[40m",
+    BgRed: "\x1b[41m",
+    BgGreen: "\x1b[42m",
+    BgYellow: "\x1b[43m",
+    BgBlue: "\x1b[44m",
+    BgMagenta: "\x1b[45m",
+    BgCyan: "\x1b[46m",
+    BgWhite: "\x1b[47m",
+    FgGray: "\x1b[90m",
+    FgRed2: "\x1b[91m",
+    FgGreen2: "\x1b[92m",
+    FgYellow2: "\x1b[93m",
+    FgBlue2: "\x1b[94m",
+    FgPurple: "\x1b[95m",
+    FgCyan2: "\x1b[96m",
+    FgWhite2: "\x1b[97m",
+    // test: "\x1b[97m",
+    BgGray: "\x1b[100m",
+    BgRed2: "\x1b[102m",
+    BgGreen2: "\x1b[102m",
+    BgYellow2: "\x1b[103m",
+    BgBlue2: "\x1b[104m",
+    BgMagenta2: "\x1b[105m",
+    BgCyan2: "\x1b[106m",
+    BgWhite2: "\x1b[107m",
+};
+class Color {
+    constructor(name, value) {
+        this.name = name;
+        this.value = value;
+    }
+    toString() {
+        return this.value;
+    }
+}
+for (var k in colors) {
+    colors[k] = new Color(k, colors[k]);
+}

package/coms/zimoli/bindGlobalkey.js

@@ -4,7 +4,8 @@
  */
 var emitEvent = function (item, event) {
     if (event.defaultPrevented) return;
-    if (!getTargetIn(this, event.target) && !getTargetIn(event.target, this)) return;
+    var target = this.target || this;
+    if (!getTargetIn(target, event.target) && !getTargetIn(event.target, target)) return;
     event.preventDefault(true);
     if (item.disabled) return;
     active(this, item, "global", this.$src ? createItemTarget.call(this, item) : this);
@@ -31,7 +32,7 @@ function bindGlobalkey(elem, keymap, item) {
     if (!keymap) return;
     var keyoff = [];
     for (let k in keymap) {
-        keyoff.push(bindonly(elem, k, item));
+        keyoff.push(bindonly(elem, k, keymap[k]));
     }
     elem.$keyoff = keyoff;
 }

package/coms/zimoli/deepEqual.js

@@ -1,6 +1,4 @@
-var singleEqual = function (o1, o2) {
-    return o1 === o2 || isNumber(o1) && isNumber(o2) && isNaN(o1) && isNaN(o2);
-};
+var singleEqual = isSame;
 var deepEqualMarkLabel = "__zimo1i_deep_equal_mark_label";
 var restcompare = [];
 var ALLOW_CACHE_LENGTH = Math.min(SAFE_CIRCLE_DEPTH, 1024) * Math.min(SAFE_CIRCLE_DEPTH, 1024);

package/coms/zimoli/getGenerator.js

@@ -25,12 +25,16 @@ var getGenerator = function (container, tagName = 'item') {
     container.$generatorScopes = scopes;
     if (container.$generator) return container.$generator;
     var template = document.createElement(container.tagName);
-    var templates = [].concat.apply([], container.childNodes).filter(a => {
+    var templates = [];
+    for (let a of container.childNodes) {
         if (a.hasAttribute('insert')) {
-            return false;
+            if (!templates.length) a.$isbefore = true;
+            else a.$isafter = true;
         }
-        return true;
-    });
+        else {
+            templates.push(a);
+        }
+    }
     if (templates.length < container.childNodes.length && templates.length >= 1) {
         var c = document.createComment('lattice');
         c.index = null;

package/coms/zimoli/list.js

@@ -145,6 +145,10 @@ function ylist(container, generator, $Y) {
         var ratio = itemIndex - index || 0;
         var childrenMap = getChildrenMap();
         var offsetBottom = 0, ratioTop = 0, offset = index, last_item = getFirstElement(0) || null, last_index = last_item && last_item.index || offset;
+        if (!last_item) {
+            last_item = list.lastChild;
+            while (last_item && last_item.$isafter) last_item = last_item.previousSibling;
+        }
         if (last_item) last_item = getNodeTarget(last_item);
         var count = 0, delta = 1, bottom_item, offsett = offset, offsetb = offset, top_item;
         var indexed_item;

package/coms/zimoli/menu.js

@@ -206,7 +206,7 @@ function main(elem, mode) {
     }
     if (!elem.hasAttribute('mode')) elem.setAttribute('mode', mode);
     if (!elem.hasAttribute(mode)) elem.setAttribute(mode, '');
-
+    elem.target = document.body;
     return elem;
 
 }

package/coms/zimoli/spacechar_test.js

@@ -0,0 +1,38 @@
+// 以前我骂防疫人员，在别人亲切的喊他们白衣天使的时候，我冷冷地说他们是白面无常。
+// 后来我骂共产党，因为听到退疫的大白说的故事，无辜的打工人是怎么被它们圈禁至死的，他说的活灵活现，我不得不信。
+// 想想自己被锁在楼里的岁月，我们合租的9个人，平均每星期收到一棵白菜两根萝卜，后来连白菜萝卜也要别人拿着个人信息去交换，就像为了活下去就不得不跪舔高高在上的它们.....刚正不阿的人被逼到跳楼也属正常。
+// 政府只顾着大肆宣扬自己的功绩，对枉死之人置若罔闻。是怪大白没有上报？还是抢来的府权本就带贼的属性？
+// 如果没有共产党，也许是另一翻罪恶的景象，但是为恶之人，天未诛之，还要我去赞颂它吗？
+
+function findAllSpace(start = 0, end = start + 256) {
+    // #<--
+    var canvas = document.createElement("canvas");
+    canvas.height = 32;
+    canvas.width = 32;
+    css(canvas, 'right:0;bottom:80px;position:absolute;background-color:#fff;');
+    document.body.appendChild(canvas);
+    var context = canvas.getContext("2d", { willReadFrequently: true });
+    context.font = "16px";
+    context.textBaseline = "top";
+    var res = [], total = 0;
+    for (var cx = start, dx = end; cx < dx; cx++) {
+        context.clearRect(0, 0, canvas.width, canvas.height);
+        // 判断字符串是否由空格组成
+        var s = String.fromCodePoint(cx);
+        context.fillText(s, canvas.width >> 2, canvas.height >> 2);
+        context.strokeText(s, canvas.width >> 2, canvas.height >> 2);
+        var imgdata = context.getImageData(0, 0, canvas.width, canvas.height).data;
+        if (imgdata.findIndex(a => a !== 0) >= 0) continue;
+        res[cx] = s;
+        total++;
+    }
+    context.clearRect(0, 0, 14, 14);
+    context.fillText(String.fromCodePoint(65), 0, 7);
+    res.total = total;
+    // -->
+    return res;
+}
+var startTime = performance.now();
+var spaces = findAllSpace(0, 0x7fff);
+console.log(performance.now() - startTime);
+console.log(spaces);

package/coms/zimoli/view.js

@@ -93,7 +93,7 @@ var init = function () {
 var isType = function (target, type) {
     // 记得小时候，不论是苍蝇还是蚊子，飞起来都是有声音的。最近看到的一种像蚊子一样小的飞虫，喜欢像苍蝇一样趴在食物上，飞起来却听不到声音。
     // 是我的听力下降了？还是外界太过嘈杂？还是飞虫拍打翅膀的频率超出了我的听觉范围？还是飞行可以不产生声音？
-    return target.hasAttribute(type) || hasClass(type);
+    return target.hasAttribute(type) || hasClass(target, type);
 }
 var resize2 = function () {
     var head, body, foot;

package/package.json

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