efront 4.9.4 → 4.10.1

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/shallowClone.js

@@ -1,7 +1,11 @@
-var shallowClone = function (origin, deep) {
-    if (--deep < 0) return origin;
+var shallowClone = function (origin, deep = /^[^\$\_]/) {
     if (!isObject(origin)) return origin;
     var temp = origin instanceof Array ? [] : {};
+    if (deep instanceof RegExp) {
+        for (var k in origin) if (deep.test(k)) temp[k] = origin[k];
+        return temp;
+    }
+    if (--deep < 0) return origin;
     if (deep > 0) for (var k in origin) temp[k] = shallowClone(origin[k], deep);
     else for (var k in origin) temp[k] = origin[k];
     return temp;

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,9 @@ 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>');
+test('${i18n`加载中..`}<div class="loader"></div>');
+test('${a +typeof i18n`加载中..`}<div class="loader"></div>','${a + typeof i18n`加载中..`}<div class="loader"></div>');
+test('${a > 1}');
+test('a>1','a > 1');
+test('a><a></a>','a > <a></a>');

package/coms/compile/Javascript.js

@@ -40,31 +40,33 @@ return,typeof,delete,switch,export,import,static
 default,finally,extends
 function,continue,debugger
 instanceof`.trim().split(/[,\s]+/);
+var colonstrap_reg = /^(case|default)$/;
 class Javascript extends Program {
     straps = straps;
     value_reg = /^(false|true|null|Infinity|NaN|undefined|eval)$/
     transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|default|instanceof|throw|extends|import|from)$/
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
     forceend_reg = /^(return|yield|break|continue|debugger|async)$/;
-    classstrap_reg = /^(class|function|async)$/;
-    colonstrap_reg = /^(case|default)$/;
-
+    type_reg = /^(var|let|const|function|class|interface|type)$/;
     defaultType = EXPRESS;
 }
-var propresolve_reg = /^(static|get|set|async)$/;
+var propresolve_reg = /^(static|get|set|async|readonly|private)$/;
 
-Javascript.prototype.isProperty = function (o) {
+var isProperty = function (o) {
     var queue = o.queue;
     var prev = o.prev;
     if (queue.isObject) {
-        if (!prev || prev.type === STAMP && prev.text === ",") return true;
+        if (!prev || prev.type === STAMP && /^[,;]$/.test(prev.text)) return true;
         if (prev.type === STAMP && prev.isprop) return true;
     }
     if (queue.isClass) {
         if (!prev) return true;
+        if (o.type === SCOPED && o.entry !== '{') {
+            return prev.isprop || prev.type === STAMP && prev.text === ';' || isShortMethodEnd(prev);
+        }
         if (prev.type === STAMP) {
             if (prev.isprop) return true;
-            return /^(\+\+|\-\-|;)$/.test(prev.text);
+            return /^(\+\+|\-\-|[,;])$/.test(prev.text) && (o.type !== STAMP || !/^[,;\=\:]$/.test(o.text));
         }
         if (prev.type === EXPRESS && !/\.$/.test(prev.text)) {
             return prev.text !== 'async' || o.text !== 'function';
@@ -102,7 +104,7 @@ var setStrapExpress = function (mark_type, mark_text, prop, o, default_type) {
         if (q.entry === '(') {
             var pp = q.prev;
         }
-        else if (q.entry === "{") a: {
+        else if (q.brace) a: {
             var p = q.prev;
             if (p) {
                 if (p.type === STAMP && p.text === "=>") {
@@ -154,16 +156,14 @@ var setStrapExpress = function (mark_type, mark_text, prop, o, default_type) {
 }
 var setYieldExpress = setStrapExpress.bind(null, STAMP, "*", 'next');
 var setAwaitExpress = setStrapExpress.bind(null, STRAP, "async", 'prev');
-Javascript.prototype.fixType = function (o) {
+var fixType = function (o) {
     var m = o.text;
-    if (m === 'yield') setYieldExpress(o, this.defaultType);
-    else if (m === 'await') setAwaitExpress(o, this.defaultType);
     var last = o.prev;
     var type = o.type;
     var queue = o.queue;
     switch (type) {
         case QUOTED:
-            if (this.isProperty(o)) type = PROPERTY;
+            if (isProperty(o)) o.isprop = true;
             break;
         case SCOPED:
             if (o.entry === '(') {
@@ -173,14 +173,14 @@ Javascript.prototype.fixType = function (o) {
             }
             break;
         case EXPRESS:
-            if ((!/^\./.test(m)) && this.isProperty(o)) type = PROPERTY;
+            if ((!/^\./.test(m)) && isProperty(o)) type = PROPERTY;
             break;
         case STRAP:
         case VALUE:
             if (last && last.type === EXPRESS && /[^\.]\.$/.test(last.text)) {
                 type = EXPRESS;
             }
-            else if (this.isProperty(o)) type = PROPERTY;
+            else if (isProperty(o)) type = PROPERTY;
             else if (m === 'from') {
                 if (!last || last.type === STRAP && !/^(im|ex)port$/.test(last.text)) {
                     type = EXPRESS;
@@ -218,12 +218,13 @@ Javascript.prototype.fixType = function (o) {
             }
             break;
     }
-    if (type === STRAP && m === "class" && !queue.classed) {
-        queue.classed = 1;
+    if (type === STRAP && /^(class|interface)$/.test(m) && !queue.classed) {
+        queue.classed = [m];
     }
-    else if (queue.classed > 0) {
-        if (type === STRAP && /^(class|function)$/.test(m)) queue.classed++;
+    else if (queue.classed) {
+        if (type === STRAP && /^(class|function|interface)$/.test(m)) queue.classed.push(m);
     }
+    if (type === PROPERTY) o.isprop = true;
     o.type = type;
 
 };
@@ -278,12 +279,11 @@ var setObject = function (o) {
         }
     }
 };
-Javascript.prototype.detectLabel = function (o) {
+var detectLabel = function (o) {
     var queue = o.queue;
     var last = queue.last;
     var m = o.text;
     var type = o.type;
-    var colonstrap_reg = this.colonstrap_reg;
     var end = o.end;
     var inExpress = queue.inExpress;
     if (type === SPACE);
@@ -294,17 +294,25 @@ Javascript.prototype.detectLabel = function (o) {
     }
     else if (last) check: switch (m) {
         case "?":
+            if (last.isprop) {
+                o.type = EXPRESS;
+                o.isprop = true;
+                break;
+            }
             inExpress = true;
             if (!queue.question) queue.question = 1;
             else queue.question++;
             break;
         case "=":
-            inExpress = true;
-            if (last.type === SCOPED && last.entry === "{") {
+            if (last.type === SCOPED && last.brace) {
                 if (!last.isObject) {
                     setObject(last);
                 }
             }
+            var lp = last.prev;
+            if (lp?.type === STRAP && lp.text === 'type') {
+                o.istype = true;
+            }
         case ",":
             if (queue.isObject) {
                 if (last.type === PROPERTY) {
@@ -316,36 +324,48 @@ Javascript.prototype.detectLabel = function (o) {
         case ":":
             if (queue.question) {
                 queue.question--;
-                inExpress = true;
+                if (last.type === STAMP && last.text === '?') {
+                    inExpress = false;
+                    o.istype = true;
+                    last.type = EXPRESS;
+                }
+                else {
+                    inExpress = true;
+                }
                 break;
             }
             if (queue.isObject) {
-                if (last.type === PROPERTY || last.isprop) {
-                    inExpress = true;
-                    break;
-                }
-                if (last.type === SCOPED && (!last.prev || !last.prev.type === STAMP && last.prev.text === ",")) {
-                    inExpress = true;
+                if (last.isprop) {
+                    o.isExpress = false;
+                    queue.inExpress = true;
+                    return;
                 }
+            }
+            inExpress = false;
+            if (queue.entry && (!queue.brace || queue.isClass)) {
+                o.istype = true;
                 break;
             }
             var temp = last;
             while (temp) {
                 if (temp.type === STRAP && colonstrap_reg.test(temp.text)) {
-                    inExpress = false;
                     break check;
                 }
                 if (!temp.isExpress) break;
                 temp = temp.prev;
             }
-            inExpress = false;
             if (last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
                 // label
-                last.type = LABEL;
-                last.text += ":";
-                last.end = end;
-                return o;
+                var lp = last.prev;
+                if (!lp || lp.type !== STRAP || lp.isend) {
+                    last.type = LABEL;
+                    last.text += ":";
+                    last.end = end;
+                    queue.inExpress = false;
+                    return o;
+                }
             }
+            o.istype = true;
             break;
         default:
             inExpress = true;
@@ -359,31 +379,46 @@ Javascript.prototype.detectLabel = function (o) {
 }
 
 Javascript.prototype.setType = function (o) {
-    if (this.detectLabel(o)) return false;
-    var last = o.prev;
-    if (o.type === EXPRESS && /^\.[^\.]|^\.$/.test(o.text) && last && last.type === STAMP && last.text === "?") {
-        last.type = EXPRESS;
-        var q = o.queue;
-        q.question--;
-        return false;
+    if (detectLabel(o)) return false;
+    switch (o.text) {
+        case "yield": setYieldExpress(o, this.defaultType); break;
+        case "await": setAwaitExpress(o, this.defaultType); break;
     }
+    var last = o.prev;
+    var queue = o.queue;
+
     if (last) {
+        if (last.type === STAMP && last.text === "?") {
+            if (o.type === EXPRESS && /^\.[^\.]|^\.$/.test(o.text)) {
+                last.type = EXPRESS;
+                var q = o.queue;
+                q.question--;
+                return false;
+            }
+        }
         if (o.type === STRAP && o.text === "function") {
             if (last.text === 'async' && !last.isend) last.type = STRAP;
         }
+        if ((o.type & (EXPRESS | STRAP) && last.type === STAMP || o.type === STAMP && /^([\|\&]|\=\>)$/.test(o.text)) && (last.istype || queue.istype)) {
+            o.istype = true;
+        }
     }
-    this.fixType(o);
-    var queue = o.queue;
+    else {
+        if (queue.istype) {
+            o.istype = true;
+        }
+    }
+
+    fixType(o);
     if (queue.isObject || queue.isClass) {
-        if (o.type & (VALUE | QUOTED | STRAP)) {
-            o.isprop = this.isProperty(o);
+        if (o.type & (VALUE | QUOTED | STRAP | ELEMENT)) {
+            o.isprop = isProperty(o);
         }
         else if (o.type === SCOPED) {
-            if (o.entry === '[') {
-                if (queue.isObject) o.isprop = this.isProperty(o);
-                if (queue.isClass) o.isprop = !last || last.isprop || last.type === STAMP && last.text === ';' || isShortMethodEnd(last);
+            if (o.entry === '[' || o.entry === '(') {
+                o.isprop = isProperty(o);
             }
-            else if (o.entry === "{") {
+            else if (o.brace) {
                 if (last && last.type === PROPERTY && last.text === 'static') {
                     last.type = STRAP;
                 }
@@ -396,26 +431,27 @@ Javascript.prototype.setType = function (o) {
             o.isprop = true;
         }
         if (o.isprop) {
-            if (last && last.type === PROPERTY && propresolve_reg.test(last.text)) {
+            if (last && last.type === PROPERTY && propresolve_reg.test(last.text) && (o.type !== SCOPED || o.entry === "[")) {
                 last.type = STRAP;
             }
             if (queue.isClass) o.isend = false;
         }
     }
-    if (o.type === PROPERTY || o.isprop);
-    else if (o.type === STRAP && /^(get|set|static|async)$/.test(o.text)) {
-        o.type = EXPRESS;
+    if (o.isprop);
+    else if (o.type === STRAP) {
+        if (this.type_reg.test(o.text)) o.istype = true;
+        if (propresolve_reg.test(o.text)) o.type = EXPRESS;
     }
     if (last) {
         if (o.type === STAMP && o.text === "=>") {
             var pp = last.prev;
-            if (pp && pp.type === EXPRESS && pp.text === 'async') {
+            if (pp?.type === EXPRESS && pp.text === 'async') {
                 if (!pp.isend) pp.type = STRAP;
             }
         }
     }
     if (o.type === STAMP) {
-        if (!last || last.type & (STAMP | STRAP) && !/^(\+\+|\-\-)$/.test(last.text) || last.type === SCOPED && /^[\{\[]$/.test(last.entry) && !last.isExpress) {
+        if (!last || last.type & (STAMP | STRAP) && !/^(\+\+|\-\-)$/.test(last.text) && !last.istype || last.type === SCOPED && /^[\{\[]$/.test(last.entry) && !last.isExpress) {
             o.unary = /^[^=;,\*]$|.[^\=\>\<\|\&\^]$/.test(o.text);
             if (o.unary && /^(\+|\-)$/.test(o.text) && last && last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) o.unary = !!last.unary;
         }
@@ -614,7 +650,7 @@ function detour(o, ie) {
                 }
                 if (!o.isprop) break;
             case PROPERTY:
-                if (!o.isend && /^(get|set|async|static)$/.test(o.text) && o.next && (o.next.type === PROPERTY || o.next.isprop)) break;
+                if (!o.isend && propresolve_reg.test(o.text) && o.next && (o.next.type === PROPERTY || o.next.isprop)) break;
                 if (o.text === 'static' && o.next && o.next.type === SCOPED && o.next.entry === '{') break;
                 if (/^\[/.test(o.text)) break;
                 if (o.queue.isObject) {
@@ -637,7 +673,7 @@ function detour(o, ie) {
                     var text = strings.recode(o.text);
                     if (o.prev) {
                         var prev = o.prev;
-                        if (prev && prev.isprop && !prev.isend && /^(get|set|static|async)$/.test(prev.text)) {
+                        if (prev && prev.isprop && !prev.isend && propresolve_reg.test(prev.text)) {
                             prev = prev.prev;
                         }
                         if (prev && prev.type === STAMP && prev.isprop) prev = prev.prev;

package/coms/compile/Javascript_test.js

@@ -33,7 +33,7 @@ testDetour('1.e+10.a', '1e+10["a"]')
 testDetour('0x1.a', '0x1["a"]')
 testDetour('0b1.a', '0b1["a"]')
 testDetour('01.a', '0o1["a"]')
-testDetour('08.a', '08 a')
+testDetour('08.a', '08["a"]')
 testDetour('0o1.a', '0o1["a"]')
 testDetour('0o1n.a', '0o1n["a"]')
 testDetour('0o1m.a', '0o1m["a"]')
@@ -41,4 +41,72 @@ testDetour('0o1i.a', '0o1i["a"]')
 testDetour('0o1j.a', '0o1j["a"]')
 testDetour('0o1k.a', '0o1k["a"]')
 testDetour('0o1l.a', '0o1l["a"]')
-testDetour('0o1ll.a', '0o1ll["a"]')
+testDetour('0o1ll.a', '0o1ll["a"]')
+var ts = new Javascript;
+ts.straps.push('interface', 'implements', "declare", "module", "readonly", "enum", 'type');
+ts.tags[0].push("{")
+var testTypescript = function (text) {
+    var s = scanner2(text, ts);
+    return assert(s.toString(), text);
+}
+testTypescript(`const strict: Omit<typeof assert, 'equal' | 'notEqual' | 'deepEqual' | 'notDeepEqual' | 'ok' | 'strictEqual' | 'deepStrictEqual' | 'ifError' | 'strict'> & {
+    (value: unknown, message?: string | Error): asserts value;
+    equal: typeof strictEqual;
+    notEqual: typeof notStrictEqual;
+    deepEqual: typeof deepStrictEqual;
+    notDeepEqual: typeof notDeepStrictEqual;
+    // Mapped types and assertion functions are incompatible?
+    // TS2775: Assertions require every name in the call target
+    // to be declared with an explicit type annotation.
+    ok: typeof ok;
+    strictEqual: typeof strictEqual;
+    deepStrictEqual: typeof deepStrictEqual;
+    ifError: typeof ifError;
+    strict: typeof strict;
+};`);
+testTypescript(`
+type ExecFileException =
+& Omit<ExecException, 'code'>
+& Omit<NodeJS.ErrnoException, 'code'>
+& { code?: string | number | undefined | null };
+function rejects(block: (() => Promise<unknown>) | Promise<unknown>, message?: string | Error): Promise<void>;
+const exit<R, TArgs extends any[]>(callback: (...args: TArgs) => R, ...args: TArgs): R;
+`)
+testTypescript(`class AsyncLocalStorage<T> {
+    static snapshot(): (<R, TArgs extends any[]>(fn: (...args: TArgs) => R, ...args: TArgs) => R) & {
+        asyncResource: AsyncResource;
+    };
+}`);
+
+testTypescript(`interface AsyncResourceOptions {
+    triggerAsyncId?: number | undefined;
+    requireManualDestroy?: boolean | undefined;
+    arrayBuffer(): Promise<ArrayBuffer>;
+    from(data: WithImplicitCoercion<Uint8Array | ReadonlyArray<number> | string>): Buffer;
+    getRandomValues<T extends Exclude<NodeJS.TypedArray, Float32Array | Float64Array>>(typedArray: T): T;
+    preopens?: NodeJS.Dict<string> | undefined;
+    function rejects(block: (() => Promise<unknown>) | Promise<unknown>, message?: string | Error): Promise<void>;
+}`);
+
+testTypescript(`
+interface WritableOptions extends StreamOptions<Writable> {
+    decodeStrings?: boolean | undefined;
+    defaultEncoding?: BufferEncoding | undefined;
+    write?(this: Writable, chunk: any, encoding: BufferEncoding, callback: (error?: Error | null) => void): void;
+    writev?(
+        this: Writable,
+        chunks: Array<{
+            chunk: any;
+            encoding: BufferEncoding;
+        }>,
+        callback: (error?: Error | null) => void
+    ): void;
+    final?(this: Writable, callback: (error?: Error | null) => void): void;
+}`);
+common.debug=true;
+testTypescript(`
+while(++i < 2) {}
+a ? function() {} : function() {}
+declare module 'buffer' {}
+
+`)