efront 4.10.1 → 4.11.0

package/coms/basic/i18n.md

@@ -1,4 +1,4 @@
-国际化工具的时的语法如下：
+国际化工具的使用时的语法如下：
 ```javascript
     i18n`中文内容${参数}`
 ```

package/coms/basic/sortRegister.js

@@ -0,0 +1,16 @@
+var sortRegister = function (list) {
+    var found = 0;
+    a: for (var cx = 0, dx = list.length; cx < dx; cx++) {
+        for (var cy = found + 1, dy = dx; cy < dy; cy++) {
+            if (cy !== cx && list[cy].indexOf(list[cx]) >= 0) continue a;
+        }
+        if (found !== cx) {
+            var temp = list[found];
+            list[found] = list[cx];
+            list[cx] = temp;
+        }
+        cx = found++;
+    }
+    return list;
+}
+module.exports = sortRegister;

package/coms/basic_/nullish_.js

@@ -1,3 +1,3 @@
 function nullish_(a, b) {
-    return a === null || a === undefined ? b : a;
+    return a == null ? b : a;
 }

package/coms/compile/Html.js

@@ -83,7 +83,7 @@ class Html extends Javascript {
 }
 var property = new Program;
 property.stamps = "=".split('');
-var p = new Program;
+var p = new Javascript;
 var replaceISO8859 = function (data) {
     return String(data).replace(/<\!--([\s\S]*)--\>$/g, '$1').replace(/&\w+;/g, a => iso8859[a] || a).replace(/&#(\d+);/g, (_, a) => String.fromCodePoint(a))
 };
@@ -109,6 +109,7 @@ Html.prototype.createScoped = function (code) {
     var inScript = false;
     var noTag = true;
     var run = function (c) {
+
         switch (c.type) {
             case ELEMENT:
                 var v = toCamelCase(c.tag);
@@ -155,6 +156,7 @@ Html.prototype.createScoped = function (code) {
                 break;
             case QUOTED:
             case PIECE:
+
                 if (c.length) {
                     c.forEach(run);
                     break;
@@ -181,6 +183,7 @@ Html.prototype.createScoped = function (code) {
                 break;
         }
     };
+
     code.forEach(run);
     var envs = Object.create(null);
     for (var k in used) {
@@ -227,6 +230,7 @@ Html.prototype.createScoped = function (code) {
     scoped.envs = envs;
     scoped.vars = vars;
     scoped.used = used;
+
     return scoped;
 };
 Html.prototype.createString = common.createString;

package/coms/compile/Javascript.js

@@ -47,10 +47,9 @@ class Javascript extends Program {
     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)$/;
-    type_reg = /^(var|let|const|function|class|interface|type)$/;
     defaultType = EXPRESS;
 }
-var propresolve_reg = /^(static|get|set|async|readonly|private)$/;
+var propresolve_reg = /^(static|get|set|async|readonly|private|pub)$/;
 
 var isProperty = function (o) {
     var queue = o.queue;
@@ -83,13 +82,7 @@ var isProperty = function (o) {
     return false;
 };
 var setStrapExpress = function (mark_type, mark_text, prop, o, default_type) {
-    var prev = o.prev;
-    if (prev && prev.type === STRAP && /^(?:function|class|let|const|var)$/.test(prev.text)) {
-        o.type = EXPRESS;
-        return;
-    }
     var type = o.type;
-    if (type !== STRAP) return;
     var h = snapExpressHead(o);
     var isfunc = h?.prev?.type === STAMP && h.prev.text === '=>';
     var q = o.queue;
@@ -218,12 +211,6 @@ var fixType = function (o) {
             }
             break;
     }
-    if (type === STRAP && /^(class|interface)$/.test(m) && !queue.classed) {
-        queue.classed = [m];
-    }
-    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;
 
@@ -322,11 +309,13 @@ var detectLabel = function (o) {
             inExpress = true;
             break;
         case ":":
+
             if (queue.question) {
                 queue.question--;
                 if (last.type === STAMP && last.text === '?') {
                     inExpress = false;
                     o.istype = true;
+                    last.istype = true;
                     last.type = EXPRESS;
                 }
                 else {
@@ -354,7 +343,7 @@ var detectLabel = function (o) {
                 if (!temp.isExpress) break;
                 temp = temp.prev;
             }
-            if (last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
+            if (!queue.isargl && last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
                 // label
                 var lp = last.prev;
                 if (!lp || lp.type !== STRAP || lp.isend) {
@@ -380,11 +369,17 @@ var detectLabel = function (o) {
 
 Javascript.prototype.setType = function (o) {
     if (detectLabel(o)) return false;
-    switch (o.text) {
+    var last = o.prev;
+    if (last?.type === STRAP && o.type === STRAP && this.type_reg.test(last.text)) {
+        if (/^(yield|await|async)$/.test(o.text)) o.type = EXPRESS;
+    }
+    if (o.type === STRAP) switch (o.text) {
         case "yield": setYieldExpress(o, this.defaultType); break;
         case "await": setAwaitExpress(o, this.defaultType); break;
     }
-    var last = o.prev;
+    if (o.type === EXPRESS && last?.type === EXPRESS && !last.isend && /^(async|await|yield)$/.test(last.text)) {
+        last.type = STRAP;
+    }
     var queue = o.queue;
 
     if (last) {
@@ -399,15 +394,29 @@ Javascript.prototype.setType = function (o) {
         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)) {
+        if ((o.type & (EXPRESS | STRAP) && last.type === STAMP || o.type === STAMP && /^([\|\&]|\=\>)$/.test(o.text)) && (last.istype || last.isargl)) {
             o.istype = true;
         }
+        if (queue.isargl) {
+            if (last.type === STAMP && /^[,;]$/.test(last.text)) {
+                o.isarg = true;
+            };
+        }
+        if (o.type === STAMP && o.needle) {
+            // o.type = EXPRESS;
+        }
     }
     else {
-        if (queue.istype) {
+        if (queue.isargl) {
+            o.isarg = true;
+        }
+        else if (queue.istype) {
             o.istype = true;
         }
     }
+    if (o.isarg && o.type === STRAP) {
+        o.type = EXPRESS;
+    }
 
     fixType(o);
     if (queue.isObject || queue.isClass) {
@@ -434,12 +443,17 @@ Javascript.prototype.setType = function (o) {
             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.isprop);
     else if (o.type === STRAP) {
-        if (this.type_reg.test(o.text)) o.istype = true;
+        if (this.type_reg.test(o.text) && !this.funcstrap_reg.test(o.text)) {
+            if (last) {
+                if (last.type === STRAP && last.transive && !last.isend || last.type === STAMP && queue.inExpress) {
+                    o.type = EXPRESS;
+                }
+            }
+        }
         if (propresolve_reg.test(o.text)) o.type = EXPRESS;
     }
     if (last) {
@@ -450,22 +464,6 @@ Javascript.prototype.setType = function (o) {
             }
         }
     }
-    if (o.type === STAMP) {
-        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;
-        }
-        if (last && /^(\+\+|\-\-)$/.test(o.text)) {
-            var i = 1;
-            var p = queue[queue.length - i];
-            if (p === o) p = queue[queue.length - ++i];
-            while (p && p.type & (SPACE | COMMENT)) {
-                if (p.type === SPACE && /[\r\n\u2028\u2029]/.test(p.text)) break;
-                p = queue[queue.length - ++i];
-            }
-            o.unary = !p || p.type & (SPACE | STAMP | STRAP) || p.type === EXPRESS && p.prev && p.prev.type === STAMP && /^(\+\+|\-\-)$/.test(p.prev.text) && p.prev.unary;
-        }
-    }
 };
 
 var js = new Javascript;
@@ -538,38 +536,60 @@ Javascript.prototype.detour = function (body, ie) {
     return envs;
 }
 var context = null, rootenvs = null;
+var detourNullishSeek = function (o, ie) {
+    var h = snapExpressHead(o);
+    var f = snapExpressFoot(o);
+    o = h;
+    var rest = [o];
+    while (o !== f) {
+        o = o.next;
+        rest.push(o);
+    }
+    var text = createString(rest);
+    var text1 = text.replace(/^\.\.\./, '');
+    var hasdot = text1.length !== text.length;
+    remove(h, f.prev);
+    text = renderExpress(text1, false);
+    if (hasdot) text = "..." + text;
+    var o1 = scan(text);
+    detour(o1.first, ie);
+    patchArrawScope(o1, o);
+    replace(o, ...o1);
+    o = o1.last;
+    return o;
+}
 function detour(o, ie) {
     while (o) {
         switch (o.type) {
             case SCOPED:
                 detour(o.first, ie);
                 break;
+            case STAMP:
+                if (o.text === "?.") {
+                    o = detourNullishSeek(o, ie);
+                    continue;
+                }
+                else if (o.text === '.') {
+                    var n = o.next;
+                    remove(o);
+                    if (n.type === EXPRESS) {
+                        n.text = `[${strings.recode(n.text)}]`;
+                    }
+                    o = n;
+                    continue;
+                }
+                break;
             case EXPRESS:
+                if (/^\?\./.test(o.text)) {
+                    o = detourNullishSeek(o, ie);
+                    continue;
+                }
                 var text = o.text.replace(/^\.\.\./, '');
                 var hasdot = o.text.length !== text.length;
                 if (context.avoidMap) {
                     var m = /^[^\.\[\]]+/.exec(o.text);
                     if (m) { context.avoidMap[m[0]] = true; }
                 }
-                if (/\?\.|\?\?/.test(text)) {
-                    o = snapExpressHead(o);
-                    var f = snapExpressFoot(o);
-                    var rest = [o];
-                    remove(o, f.prev);
-                    while (o !== f) {
-                        o = o.next;
-                        rest.push(o);
-                    }
-                    text = createString(rest);
-                    text = renderExpress(text, false);
-                    if (hasdot) text = "..." + text;
-                    var o1 = scan(text);
-                    detour(o1.first, ie);
-                    patchArrawScope(o1, o);
-                    replace(o, ...o1);
-                    o = o1.last;
-                    continue;
-                }
                 text = text.replace(/\.([^\.\[\!\=\:]+)/g, (_, a) => ie === undefined || context.strap_reg.test(a) || /#/.test(a) ? `[${strings.recode(a)}]` : _);
                 if (hasdot) text = "..." + text;
                 o.text = text;
@@ -719,14 +739,21 @@ var removeImport = function (c, i, code) {
     var t = null;
     if (n && n.type === EXPRESS) {
         t = Object.create(null);
-        var ts = n.text.split(".")
-        for (var e of ts) {
-            t[e] = true;
+        removeFromList(used[n.tack], n);
+        while (n?.type === EXPRESS) {
+            var ts = n.text.split(".")
+            for (var e of ts) {
+                t[e] = true;
+            }
+            var ni = code.indexOf(n, i);
+            n = n.next;
+            if (n?.needle) {
+                n = n.next;
+                var ne = code.indexOf(n, ni);
+                splice(code, ni, ne - ni);
+            }
+            else splice(code, ni, 1);
         }
-        var ni = code.indexOf(n, i);
-        removeFromList(used[ts[0]], n);
-        splice(code, ni, 1);
-        n = n.next;
     }
     if (!n || n.type !== QUOTED) throw new Error(i18n`缺少导入路径！`);
     var ns = skipAssignment(n);
@@ -906,6 +933,17 @@ Javascript.prototype.fix = function (code) {
         }
         var requires = code.used.require;
         imports = imports.filter(m => {
+            if (m.next?.text === '.') {
+                var o = m;
+                var s = snapExpressFoot(o);
+                var a = [o];
+                while (o !== s) {
+                    o = o.next;
+                    a.push(o);
+                }
+                m.text = createString(a);
+                remove(m.next, s);
+            }
             if (/^import\.meta($|\.)/.test(m.text)) {
                 m.text = m.text.replace(/\./, '_');
                 return true;

package/coms/compile/Javascript_test.js

@@ -1,9 +1,11 @@
 // 导入
+var js = new Javascript;
 var testFix = function (a, e) {
-    var c = scanner2(a);
+    var c = scanner2(a, js);
     c.fix();
     assert(c.toString(), e);
 }
+js.debug = true;
 testFix(`import a from "a";console.log(a)`, 'var a = require("a"); console.log(a.default)');
 testFix(`import {a} from "a";console.log(a)`, 'var a1 = require("a"); console.log(a1.a)');
 testFix(`import a,{a as b} from "a";console.log(a,b)`, 'var a = require("a"); console.log(a.default, a.a)');
@@ -103,10 +105,20 @@ interface WritableOptions extends StreamOptions<Writable> {
     ): void;
     final?(this: Writable, callback: (error?: Error | null) => void): void;
 }`);
-common.debug=true;
+common.debug = true;
 testTypescript(`
-while(++i < 2) {}
-a ? function() {} : function() {}
+while (++i < 2) {}
+a ? function () {} : function () {}
 declare module 'buffer' {}
+a <= 1;
+`)
 
-`)
+var testPress = function (text, expect) {
+    var code = scanner2(text);
+    code.press(false);
+    assert(code.toString(), expect);
+};
+testPress(`if(){}\r\nelse {}`, `if(){}else{}`)
+testPress(`if(a)a={}\r\nelse{}`, `if(a)a={};else{}`)
+testPress(`if()a=function(){}\r\nelse {}`,`if()a=function(){};else{}`)
+testPress(`if()function a(){}\r\nelse {}`,`if()function a(){}else{}`)