efront 4.9.3 → 4.10.0

package/coms/basic/Item.js

@@ -15,7 +15,6 @@ class Item extends Array {
     extended = false;
     constructor(value) {
         super();
-        this.children = this;
         this.count = 0;//子项中的叶子节点数
         this.total = 0;//子项中的节点数
         this.crack = 0;
@@ -29,6 +28,7 @@ class Item extends Array {
         if (value && value.children instanceof Array) {
             var children = value.children.map(item => new Item(item));
             children.forEach(item => item.parent = item);
+            this.children = this;
             this.push.apply(this, children);
         }
         if (isObject(value)) {
@@ -82,6 +82,11 @@ class Item extends Array {
     setClosed(value) {
         if (isObject(this.value)) this.value.closed = value;
         else this.closed = value;
+        var c = this;
+        while (c.joined) {
+            c = c[0];
+            c.setClosed(value);
+        }
     }
     isActive() {
         if (isObject(this.value)) {

package/coms/basic/Tree.js

@@ -110,10 +110,13 @@ class Tree extends Array {
         }
         return root;
     }
-    static toArray(root, skipClosed = true) {
+    static toArray(root, skipClosed = 1) {
+        var autoJoin = typeof skipClosed === 'number' && skipClosed === skipClosed;
+        if (autoJoin) autoJoin = skipClosed < 0 ? -skipClosed : skipClosed;
         var path = [root], pathcx = [0];
         var result = [];
         var max_deep = 1;
+        var joined = 0;
         loop: while (pathcx.length) {
             var pathindex = pathcx.length - 1;
             var cx = pathcx[pathindex];
@@ -127,6 +130,17 @@ class Tree extends Array {
             elem.parent = item;
             result.push(elem);
             pathcx[pathindex] = ++cx;
+            if (autoJoin && elem.length === 1) {
+                joined = 1;
+                while (joined < autoJoin && elem.length === 1) {
+                    if (!elem[0].children) break;
+                    item = elem;
+                    elem = elem[0];
+                    elem.parent = item;
+                    item.joined = true;
+                    joined++;
+                }
+            }
             if (!skipClosed || !elem.isClosed()) {
                 if (elem.length) {
                     path.push(elem);

package/coms/basic_/JSON.js

@@ -145,11 +145,7 @@ var getString = function (object, filter, space) {
             object = object.toISOString();
         }
         if (hasFilter) {
-            var object1 = filter(key, object);
-            if (isObject(object1) && object !== object1) {
-                object1 = getString(object1, filter, space);
-            }
-            object = object1;
+            object = filter(key, object);
         }
         switch (typeof object) {
             case "object":

package/coms/basic_/JSON_test.js

@@ -155,7 +155,13 @@ var test2 = function (JSON) {
         "ratio": 1,
         "readonly": true
     }];
-    assert(JSON.stringify(data, null, 4), JSON0.stringify(data, null, 4))
+    var unicode = a => a.replace(/\\u([a-f\d]{4})/g, (_, a) => String.fromCharCode(parseInt(a, 16)));
+    assert(unicode(JSON.stringify(data, null, 4)), JSON0.stringify(data, null, 4))
+    var filter = function (k, o) {
+        if (typeof o !== 'object' || o.length) return o;
+        return { name: o.name };
+    }
+    assert(unicode(JSON.stringify(data, filter, 4)), JSON0.stringify(data, filter, 4));
 }
 function JSON_test() {
     window.JSON0 = JSON0;

package/coms/compile/Html_test.js

@@ -1,4 +1,6 @@
 var Html = require("./Html");
+var fs = require("fs");
+var path = require("path");
 var test = function (source, pick, value) {
     var h = new Html;
     var b = h.exec(source);
@@ -8,6 +10,10 @@ var test = function (source, pick, value) {
         assert(seek(b, pick), value);
     }
 };
+var test2 = function (source) {
+    var s = scanner2(source, 'html');
+    assert(s.toString(), source);
+}
 test("<h><a #c>b</a><c b=x>d</c><d/><e>2px</e></h>");
 test("<a>Let's Encrypt</a>");
 test("<style>{a-b:2}</style>");
@@ -23,4 +29,4 @@ test('<div>${`<div></div>`}</div>');
 test('<div>\\${${`<div></div>`}</div>');
 test('<div>$\\{${`<div></div>`}</div>');
 test('<div>$\\{${typeof `<div></div>`}</div>');
-test('<div>$\\{${\\a+typeof`<div></div>`}</div>','<div>$\\{${\\a + typeof `<div></div>`}</div>');
+test('<div>$\\{${\\a+typeof`<div></div>`}</div>', '<div>$\\{${\\a + typeof `<div></div>`}</div>');

package/coms/compile/Program.js

@@ -415,11 +415,11 @@ class Program {
                         if (this.comment_entry.test(m)) {
                             push_piece();
                             var start = match.index;
-                            var comment = this.quote_map[m];
-                            comment.lastIndex = index;
+                            var { reg: comment_reg,end:comment_end } = this.quote_map[m];
+                            comment_reg.lastIndex = index;
                             do {
-                                var match = comment.reg.exec(text);
-                            } while (match && !comment.end.test(match[0]));
+                                var match = comment_reg.exec(text);
+                            } while (match && !comment_end.test(match[0]));
                             if (match) end = index = match.index + match[0].length;
                             m = text.slice(start, index);
                             save(COMMENT);
@@ -558,8 +558,13 @@ class Program {
             }
             var isdigit = number_reg.exec(m);
             if (isdigit) {
-                m = isdigit[0];
-                index = match.index + m.length;
+                var m1 = isdigit[0];
+                if (m1.length < m.length) {
+                    if (m.charAt(m1.length) === ".") {
+                        m = m1;
+                        index = match.index + m.length;
+                    }
+                }
                 isdigit = true;
             }
             if (this.value_reg.test(m) || isdigit) {

package/coms/compile/common.js

@@ -14,7 +14,7 @@ const [
     /*2048 */ELEMENT,
 ] = new Array(20).fill(0).map((_, a) => 1 << a);
 // --------------//1//2/////////////////////////22/////////////2//2//3//4/////4////////3/////3//////3//3//////3///////211/////////////2//////2//////1///
-var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+|0[0-7]+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[ijklmnu]+)?/i;
+var number_reg = /^(?:(?:0x[0-9a-f]+|0b[01]+|0o?[0-7]+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[hijklmnu]+)?/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;
 var needhead_reg = /^\?\.|^\.(?:[^\.]|$)|^\[/;
 var skipAssignment = function (o, cx) {
@@ -320,7 +320,7 @@ function snapSentenceHead(o) {
                 o = p;
                 continue;
             }
-            if (o.type === STRAP && /^(in|instanceof|of|as|from)$/.test(o.text)) {
+            if (o.type === STRAP && /^(in|instanceof|of|as|from)$/.test(o.text) || o.type === STAMP && !o.unary) {
                 o = p;
                 continue;
             }

package/coms/docs/codecolor.js

@@ -18,7 +18,7 @@ var codecolor = function (c, encode) {
             if (!/^\</.test(keys[keys.length - 1])) keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
         }
         var [name] = keys;
-        if (/^\</.test(name));
+        if (/^[\<\?]/.test(name) || !name);
         else if (c.program?.strap_reg.test(name) || c.program?.value_reg.test(name) || /^(this|arguments)$/.test(name)) name = `<strap>${name}</strap>`;
         else name = `<${label}>${name}</${label}>`;
         keys[0] = name;
@@ -29,6 +29,15 @@ var codecolor = function (c, encode) {
     if (used) for (var k in envs) {
         used[k].forEach(k in predefs ? setPredef : setOutside);
     }
+    var spaceReg = c.program.space_exp;
+    var unspaceReg = new RegExp(spaceReg.source.replace(/^\[/, "[^"), spaceReg.flags + 'g');
+    var wraptext = function (t, l) {
+        t = t.replace(unspaceReg, a => {
+            a = encode(a);
+            return `<${l}>${a}</${l}>`
+        });
+        return t;
+    }
 
     var setcolor = function (o) {
         var text = o.text;
@@ -43,14 +52,23 @@ var codecolor = function (c, encode) {
                     o.leave = "<text>" + o.leave + "</text>";
                     break;
                 }
+                if (/^\//.test(o.text)) {
+                    var source = o.text;
+                    var flags = /[^\/]+$/.exec(source);
+                    if (flags) {
+                        flags = flags[0];
+                        source = source.slice(0, source.length - flags.length);
+                    }
+                    source = wraptext(source, 'regexp');
+                    if (flags) source = source + wraptext(flags, 'strap');
+                    o.text = source;
+                    break;
+                }
             case PIECE:
                 if (o.queue && o.queue.tag) {
                     o.text = encode(o.text);
                 }
-                else if (/^\//.test(o.text)) {
-                    o.text = `<regexp>${encode(o.text)}</regexp>`;
-                }
-                else o.text = `<text>${encode(o.text)}</text>`;
+                else o.text = wraptext(o.text, 'text');
                 break;
                 break;
             case ELEMENT:
@@ -95,7 +113,7 @@ var codecolor = function (c, encode) {
                 // else o.text = `<stamp>${encode(o.text)}</stamp>`;
                 break;
             case COMMENT:
-                o.text = `<comment>${encode(o.text)}</comment>`;
+                o.text = wraptext(o.text, 'comment');
                 break;
         }
     };

package/coms/docs/codetext.xht

@@ -1,5 +1,6 @@
 <style>
     :scope {
+        white-space: pre;
         padding: 10px 20px;
         border-radius: 3px;
         display: inline-block;
@@ -88,7 +89,7 @@
 </style>
 <script>
     var encode = function (text) {
-        return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`)
+        return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`);
     };
     var typescript = new compile$Javascript;
     typescript.straps = typescript.straps.concat("interface", "implements", "declare", "module", "readonly", "enum");
@@ -198,7 +199,7 @@
         if (c) return c.text += blink, true;
         return false;
     };
-    function codetext(type, text, blink) {
+    var rows = function (type, text, blink) {
         type = type.toLowerCase();
         if (type in codesupports) {
             text = codesupports[type](text, blink);
@@ -213,7 +214,12 @@
             }
         }
         if (minSpace > 0) codes = codes.map(c => /^\s+/.test(c) ? c.slice(minSpace) : c);
-        return `<code type=${type}>${codes.join("<br/>").replace(/\t/g, Array(5).join('&ensp;')).replace(/\s/g, '&ensp;')}</code>`;
+        return codes;
+    }
+    function codetext(type, text, blink) {
+        var ws = rows(type, text, blink);
+        return `<code type=${type}>${ws.join("<br/>")}</code>`;
     }
+    codetext.rows = rows;
     codetext.encode = encode;
 </script>

package/coms/zimoli/XMLHttpRequest.js

@@ -14,14 +14,11 @@ return class XMLHttpRequest {
         this.url = url;
     }
     send(data) {
-        var u = new URL(this.url);
-        if (!u.host) u.host = location.host || 'localhost'
-        this.fetch(this.url, { method: this.method }).then(d => {
-            
+        this.fetch(this.url, { method: this.method, headers: { referer: document.location.href.replace(/^#[\s\S]*$/g, '') } }).then(async d => {
             this.fetched = d;
             this.readyState = 4;
             this.status = d.status;
-            this.responseText = d.text();
+            this.responseText = await d.text();
             if (this.onreadystatechange) this.onreadystatechange({ target: this });
             if (this.onload) this.onload({ target: this });
         }, e => {

package/coms/zimoli/alert.js

@@ -71,8 +71,8 @@ function alert() {
         } else {
             elem = _text(elem, styles.log, [text]);
         }
-        if (!container.parentNode) popup(container);
-        if (!elem.parentNode) appendChild(container, elem);
+        if (!isMounted(container)) popup(container);
+        if (!isMounted(elem)) appendChild(container, elem);
         waitclose(autoclose, 400);
         return elem;
     };

package/coms/zimoli/confirm.js

@@ -141,7 +141,7 @@ function confirm() {
     element.tabIndex = -1;
 
     Promise.resolve().then(function () {
-        if (element.parentNode) return;
+        if (isMounted(element)) return;
         element.mask = true;
         popup(element, target || [.5, .5], target ? 'rhomb' : true);
         element.focus();

package/coms/zimoli/createEvent.js

@@ -2,16 +2,15 @@
  * 创建自定义事件
  */
 if ("createEvent" in document) var createEvent = function createEvent(eventName, canBubble = false, cancelable = true) {
-    var event = document.createEvent("Event");
+    var event = document.createEvent(/Events?$/.test(eventName) ? eventName : "Event");
     event.initEvent(eventName, canBubble, cancelable);
     return event;
 }
-else if ("createEventObject" in document) var createEvent = function createEventObject(eventName) {
-    var event = document.createEventObject();
+else var createEvent = function createEventObject(eventName) {
+    if ("createEventObject" in document) var event = document.createEventObject();
+    else if (window.Event) event = new Event(eventName);
+    else event = {};
     event.type = eventName;
-    return event;
-}
-else var Event = window.Event, createEvent = function (eventName) {
-    var event = new Event(eventName);
+    if (!event.initMouseEvent) event.initMouseEvent = function () { };
     return event;
 }

package/coms/zimoli/dispatch.js

@@ -1,11 +1,15 @@
-var dispatch = "dispatchEvent" in document ? function dispatchEvent(target, event) {
-    return target.dispatchEvent(event);
+var dispatch = "dispatchEvent" in document ? function dispatchEvent2(target, event) {
+    try {
+        return target.dispatchEvent(event);
+    } catch (e) {
+        return -1;
+    }
 } : function (target, event) {
     var fire = "on" + event.type;
     try {
         return target.fireEvent(fire, event);
     } catch (e) {
-        return target[fire] && target[fire](event);
+        return -1;
     }
 };
 var isWorseEnv = /MSIE\s([2-9]|10)|Presto/.test(navigator.userAgent);
@@ -16,7 +20,7 @@ function dispatch2(t, e) {
     var on = 'on' + e.type;
     var f = t[on];
     var res = dispatch(t, e);
-    if (f && (t.nodeType !== 1 || t.constructor === window.HTMLUnknownElement || isWorseEnv && !(on in t.constructor.prototype))) {
+    if (f && (res === -1 || t.nodeType && t.nodeType !== 1 || t.constructor === window.HTMLUnknownElement || isWorseEnv && !(on in t.constructor.prototype))) {
         return f.call(t, e) !== false;
     }
     return res;

package/coms/zimoli/getScreenPosition.js

@@ -1,4 +1,4 @@
-function getScreenPosition(target) {
+function getScreenPosition(target, bounding = true) {
     if (!target) {
         target = {
             offsetTop: 0,
@@ -12,7 +12,7 @@ function getScreenPosition(target) {
             top = target.offsetTop,
             width = target.offsetWidth,
             height = target.offsetHeight;
-        while (target.offsetParent) {
+        if (bounding) while (target.offsetParent) {
             target = target.offsetParent;
             left += target.offsetLeft - target.scrollLeft + target.clientLeft;
             top += target.offsetTop - target.scrollTop + target.clientTop;
@@ -30,10 +30,10 @@ function getScreenPosition(target) {
     }
     var rect = target.getBoundingClientRect();
     var { left, top, width, height, right, bottom } = rect;
-    rect = { left, top, width, height, right, bottom };
-    if (rect.width === undefined) {
-        rect.width = rect.right - rect.left;
-        rect.height = rect.bottom - rect.top;
+    if (width === undefined) {
+        width = right - left;
+        height = bottom - top;
     }
+    rect = { left, top, width, height, right, bottom };
     return rect;
 }

package/coms/zimoli/grid.js

@@ -485,28 +485,27 @@ var grid_prototype = {
             if (rest_height < 1) {
                 return (height - rest_height) / (grid_height - bounds_bottom - bounds_top) * 100 + "%";
             }
-            var rest_offset = fromOffset(rest_height / (bounds_top + bounds_bottom) * (parseFloat(grid_padding_top) + parseFloat(grid_padding_bottom)));
+            var rest_offset = rest_height / (bounds_top + bounds_bottom) * (grid_padding_top + grid_padding_bottom);
             if (rest_height < height) {
-                return `calc(${(height - rest_height) / (grid_height - bounds_bottom - bounds_top) * 100}% + ${rest_offset})`;
+                return `calc(${(height - rest_height) / (grid_height - bounds_bottom - bounds_top) * 100}% + ${fromOffset(rest_offset)})`;
             }
-            return rest_offset;
+            return height / rest_height * rest_offset;
         }
         var setRelativeDiv = function (_div, width, height, left, top) {
             var [bounds_top, bounds_right, bounds_bottom, bounds_left] = bounds;
-            var computed = getComputedStyle(grid);
             css(_div, {
-                width: getDivSize(left, width, bounds_left, bounds_right, grid.width, computed.paddingLeft, computed.paddingRight),
-                height: getDivSize(top, height, bounds_top, bounds_bottom, grid.height, computed.paddingTop, computed.paddingBottom)
+                width: getDivSize(left, width, bounds_left, bounds_right, grid.width, grid_left, grid_right),
+                height: getDivSize(top, height, bounds_top, bounds_bottom, grid.height, grid_top, grid_bottom)
             });
             if (top <= 0) {
-                css(_div, { marginTop: fromOffset(- parseFloat(computed.paddingTop)) });
+                css(_div, { marginTop: fromOffset(- grid_top) });
             } else if (top + height >= grid.height) {
-                css(_div, { marginBottom: fromOffset(-parseFloat(computed.paddingBottom)) });
+                css(_div, { marginBottom: fromOffset(-grid_bottom) });
             }
             if (left <= 0) {
-                css(_div, { marginLeft: fromOffset(-parseFloat(computed.paddingLeft)) });
+                css(_div, { marginLeft: fromOffset(-grid_left) });
             } else if (left + width >= grid.width) {
-                css(_div, { marginRight: fromOffset(-parseFloat(computed.paddingRight)) });
+                css(_div, { marginRight: fromOffset(-grid_right) });
             }
         }
         var append = function (point, index, points) {
@@ -607,6 +606,11 @@ var grid_prototype = {
                 }
             }
         };
+        var computed = getComputedStyle(grid);
+        var grid_top = parseFloat(computed.paddingTop);
+        var grid_bottom = parseFloat(computed.paddingBottom);
+        var grid_left = parseFloat(computed.paddingLeft);
+        var grid_right = parseFloat(computed.paddingRight);
         append(this.breakpoints);
         var reshapecount = 0;
         var store = function (point) {

package/coms/zimoli/list.js

@@ -72,6 +72,18 @@ function ylist(container, generator, $Y) {
         }
         return null;
     };
+    var getRelativeElement = function (element, delta) {
+        delta = +delta;
+        if (!delta || !isFinite(element.index)) return;
+        var target = element.index + delta;
+        if (!target) return;
+        if (delta < 0) var key = "previousElementSibling";
+        else key = "nextElementSibling";
+        while (element) {
+            if (element.index === target) return element;
+            element = element[key];
+        }
+    }
     var hasCover = function (child) {
         var scrollTop = list.scrollTop;
         if (child.offsetTop + child.offsetHeight < scrollTop || child.offsetTop >= scrollTop + list.clientHeight) return false;
@@ -581,6 +593,7 @@ function ylist(container, generator, $Y) {
         else if (emit) list.setFocus(e, true), dispatch(list, 'focused');
         else list.setFocus(e);
     };
+    list.getRelativeElement = getRelativeElement;
     return list;
 }
 var allArgumentsNames = arguments[arguments.length - 1];
@@ -667,6 +680,5 @@ function list() {
         if (src && old) children = Array.prototype.filter.call(children, c => src[c.index] !== old[c.index]);
         remove(children);
     };
-
     return list;
 }

package/coms/zimoli/on.js

@@ -416,7 +416,7 @@ var on = document.efronton = function (k) {
 var invoke = function (event, type, pointerType) {
     var target = event.target;
     var touch = event.changedTouches ? event.changedTouches[0] : event;
-    var clickEvent = document.createEvent("MouseEvents");
+    var clickEvent = createEvent("MouseEvents");
     clickEvent.touchend = true;
     clickEvent.pointerType = pointerType
     clickEvent.initMouseEvent(type, true, true, window, 1, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null);
@@ -426,6 +426,7 @@ var invoke = function (event, type, pointerType) {
 (function () {
     var pointeractive = null;
     if ("onpointerdown" in document) return;
+    document.onpointerdown = null;
     var getPointerType = function (event) {
         return event.type.replace(/(start|move|end|cancel|down|up|leave|out|over|enter)$/i, '');
     };

package/coms/zimoli/picture.js

@@ -163,7 +163,7 @@ function picture(url, to = 0, key) {
         var urls = [].concat(url);
         var p = slider(gen, false);
     }
-    p.go(to);
+    if (isFinite(to)) p.go(to);
     p.getScale = function () {
         if (p.current) return p.current.getScale();
         return 1;

package/coms/zimoli/slider.js

@@ -68,6 +68,8 @@ function slider() {
         direction,
         _speed = speed(1);
     var reshape = function (index, ising, emit) {
+        if (!isFinite(index)) return;
+        index = +index;
         outter.index = current_index = index;
         var width = outter.clientWidth || +innerWidth;
         var indexLeft = floor(index);
@@ -272,6 +274,8 @@ function slider() {
     })
 
     outter.go = lazy(function (index, cache) {
+        if (!isFinite(index)) return;
+        index = +index;
         if (outter.index === index && cache !== false) return;
         negative_index = -index;
         var _removingMain = _imageMain;