efront 3.26.16 → 3.27.0

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/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/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/package.json

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