efront 4.10.2 → 4.11.0

package/coms/basic/i18n.md

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

package/coms/compile/Javascript.js

@@ -383,6 +383,14 @@ Javascript.prototype.setType = function (o) {
     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;
         }
@@ -528,6 +536,28 @@ 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) {
@@ -536,23 +566,7 @@ function detour(o, ie) {
                 break;
             case STAMP:
                 if (o.text === "?.") {
-                    var h = snapExpressHead(o);
-                    var f = snapExpressFoot(o);
-                    o = h;
-                    var rest = [o];
-                    while (o !== f) {
-                        o = o.next;
-                        rest.push(o);
-                    }
-                    text = createString(rest);
-                    remove(h, f.prev);
-                    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;
+                    o = detourNullishSeek(o, ie);
                     continue;
                 }
                 else if (o.text === '.') {
@@ -566,6 +580,10 @@ function detour(o, ie) {
                 }
                 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) {
@@ -721,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;
-        }
-        var ni = code.indexOf(n, i);
-        removeFromList(used[ts[0]], n);
-        splice(code, ni, 1);
-        n = n.next;
+        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);
+        }
     }
     if (!n || n.type !== QUOTED) throw new Error(i18n`缺少导入路径！`);
     var ns = skipAssignment(n);

package/coms/compile/Javascript_test.js

@@ -111,4 +111,14 @@ 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{}`)

package/coms/compile/Program.js

@@ -102,7 +102,7 @@ class Program {
         ["[", "]"],
         ["{", "}"],
     ]
-    stamps = "/=+;|:?<>-!~%^&*,.".split("")
+    stamps = "/=+;|:?<>-!~%^&*,".split("")
     value_reg = /^(false|true|null)$/
     number_reg = number_reg;
     Code = Array;
@@ -726,7 +726,7 @@ class Program {
                     save(SPACE);
                 }
                 else {
-                    if (this.keepspace) save(SPACE);
+                    if (this.keepspace || start === 0) save(SPACE);
                 }
                 lasttype = SPACE;
                 continue;
@@ -999,8 +999,10 @@ class Program {
         this.space_reg = new RegExp(`^[${spaces}]+$`, flagUnicode);
         this.space_exp = new RegExp(`[${spaces}]+`, flagUnicode);
         var quotes_entries = this.createRegExp(this.comments.concat(this.quotes).map(q => q[0]), true).source;
-        var powers = Object.keys(this.powermap).filter(k => this.stamp_reg.test(k));
+        var powers = Object.keys(this.powermap).filter(k => k.length > 1 && this.stamp_reg.test(k));
         var powers_entries = this.createRegExp(this.tags.map(t => t[0]).concat(powers), true).source;
+        var entries_reg = new RegExp(`^(${powers_entries}|${quotes_entries}|${scopes})$`, this.nocase ? 'iu' : '');
+        stamps = this.compile(this.stamps.filter(s => !entries_reg.test(s)).join(''));
         this.entry_reg = new RegExp([`[${spaces}]+|${quotes_entries}|[${scopes}]|${number_reg.source.replace(/^\^|\$$/g, "")}[^${tokens}]*|${express}|${powers_entries}|[${stamps}]`], "gi" + flagUnicode);
     }
 }

package/coms/compile/common.js

@@ -17,7 +17,7 @@ const [
 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 needfoot_reg = /(\:\:|([^\.]|^)\.)$/;
+var needfoot_reg = /(\:\:|\.)$/;
 var skipAssignment = function (o, cx) {
     if (!o) return;
     var next = arguments.length === 1 ? function () {
@@ -115,6 +115,10 @@ var skipAssignment = function (o, cx) {
                 next();
                 break;
             }
+            if (needfoot_reg.test(o.text)) {
+                next();
+                break;
+            }
             var prev = o.prev;
             if (prev?.type === EXPRESS && needfoot_reg.test(prev.text)) {
                 next();
@@ -1356,7 +1360,7 @@ var createString = function (parsed) {
                 }
             case SCOPED:
                 var prev = o.prev;
-                if (patchspace && prev && o.type !== QUOTED && (lasttype === STAMP && !prev.unary && !prev.needle
+                if (patchspace && !intag && prev && o.type !== QUOTED && (lasttype === STAMP && !prev.unary && !prev.needle
                     || lasttype & ~(SPACE | STAMP | COMMENT) && o.brace
                     || lasttype === STRAP && !/^(this|arguments|import)$/.test(prev.text)
                 )) result.push(" ");

package/coms/compile/downLevel.js

@@ -30,7 +30,7 @@ var unslice = function (arr) {
                     continue;
                 }
                 var p = o.prev;
-                if (p && is3dots(p)) {
+                if (p?.type && (STAMP | EXPRESS) && p.text === '...') {
                     var px = arr.lastIndexOf(p, cx);
                     splice(arr, px, cx - px + 1, ...o);
                     cx += o.length - 1;
@@ -857,7 +857,7 @@ var killspr = function (body, i, _getobjname, killobj) {
         splice(body, i++, 0, ...scanner2('["apply"]'));
         var m1 = skipAssignment(m);
         if (index > 0 || m1 && m1.next) {
-            var h = splice(o, 2, o.length);
+            var h = splice(o, 2, o.length - 2);
             var c = scanner2(`[]`);
             splice(c[0], 0, 0, ...h);
             killobj(c);
@@ -940,9 +940,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                         var name = getname_("_");
                         var y = scanner2(`for await(var ${name} of)yield ${name}`, innerJs);
                         splice(y[2], y[2].length, 0, ...splice(body, i, n - i));
-                        splice.debug = true;
                         splice(body, i - 1, 1, ...y);
-                        splice.debug = false;
                         innerJs.setType(y[1]);
                         if (y[1].type === EXPRESS) splice(body, i, 1);
                         unforof(y[0], getname_.bind(null, '_'), y.used, deepkill);

package/coms/compile/downLevel_test.js

@@ -160,7 +160,7 @@ textSpan: highlightSpan.textSpan,
 isWriteAccess: highlightSpan.kind === "writtenReference" /* writtenReference */ }, highlightSpan.isInString && { isInString: true }, highlightSpan.contextSpan && { contextSpan: highlightSpan.contextSpan })) }`);
 assert(downLevel(`async()=>({ [argitem.sort ? argitem.sort : 'date']: "desc" })`), `function () { return async_(
 function () {
-_ = {}; _1 = argitem.sort; if (!_1) return [1, 0]; _1 = argitem.sort; return [2, 0]
+_ = {}; if (!argitem.sort) return [1, 0]; _1 = argitem.sort; return [2, 0]
 },
 function () {
 _1 = 'date'; return [1, 0]
@@ -430,15 +430,16 @@ function () {
 _0 = a; return [_0, 1]
 })
 var a, _0 }`)
-
 assert(downLevel(`function(a=b=>b,c){c}`), 'function (a, c) { if (a === undefined) a = function (b) { return b }; c }')
 assert(downLevel(`Object.defineProperty(dis, f.key, {get() {}, set(v) {}})`), `Object.defineProperty(dis, f.key, (_ = {},
 _.get = function () {},
 _.set = function (v) {}, _))
 var _`);
-common.debug = true;
+downLevel.debug = true; i++;
+assert(downLevel(`var restq = splice(queue, i, i2 - i, ...a[1], { type: STAMP, text: "=" });`), `var slice_ = Array["prototype"]["slice"];
+var restq = splice["apply"](null, [queue, i, i2 - i]["concat"](slice_["call"](a[1]), [{ type: STAMP, text: "=" }]));`)
 var c = scanner2(`\r\n    if (search.length) return null;\r\n    return path.join(...pathlist);\r\n`);
 c.fix();
 c.break();
 assert(c.toString(), `\r\n    if (search["length"]) return null;\r\n    return path["join"](...pathlist);\r\n`)
-assert(downLevel.code(c).toString(), `\r\n    if (search["length"]) return null;\r\n    return (_ = path)["join"]["apply"](_, pathlist);\r\n\r\nvar _`);
+assert(downLevel.code(c).toString(), `\r\n    if (search["length"]) return null;\r\n    return path["join"]["apply"](path, pathlist);\r\n`);

package/coms/compile/rescan.js

@@ -24,10 +24,12 @@ function rescan(strs, ...args) {
     var dist = [];
     var i = 0;
     for (var s of strs) {
-        dist.push(s, '#\\' + i++);
+        if (s) dist.push(s, ' ');
+        dist.push('#\\' + i++, " ");
     }
+    dist.pop();
     if (i > args.length) dist.pop();
-    dist = scanner2(dist.join(' '));
+    dist = scanner2(dist.join(''));
     patchObject(dist, args);
     return dist;
 }

package/coms/compile/unstruct_test.js

@@ -126,7 +126,7 @@ test(`switch(a){default: a;case 1:b;}`, 'if (a === 1) return [2, 0]; return [1,
 test("loop:{a=b;if(a) continue loop}", "a = b; if (a) return [0, 0]", true);
 test("if(a)try{}finally{}else a;", 'if (!a) return [4, 0]; return [1, 8];\r\n return [0, 9];\r\n return [1, 9];\r\n return [2, 0];\r\n a; return [1, 0]')
 test("b:while(t){switch(a){case c:break b;}}", 'if (!t) return [1, 0]; if (a === c) return [1, 0]; return [0, 0]');
-test("predef[key[1]](r.slice(key[0].length).trim())", '_ = key[1]; _0 = key[0]; _0 = _0.length; _0 = r.slice(_0); _0 = _0.trim(); predef[_](_0)');
+test("predef[key[1]](r.slice(key[0].length).trim())", '_ = key[1]; _0 = key[0].length; _0 = r.slice(_0); _0 = _0.trim(); predef[_](_0)');
 test("predef[key[1]](r.slice())(r.slice())", '_ = key[1]; _0 = r.slice(); _ = predef[_](_0); _0 = r.slice(); _(_0)');
 test("predef[key[1]][key[2]][key[3]]", '_ = key[1]; _ = predef[_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _[_0]');
 test("[key[1]][key[2]][key[3]]", '_ = key[1]; _ = [_]; _0 = key[2]; _ = _[_0]; _0 = key[3]; _[_0]');

package/coms/docs/codetext.xht

@@ -281,14 +281,18 @@
         }
         else text = encode(text);
         var codes = text.split(/\r\n|\r|\n/);
-        var minSpace = 0;
+        var minSpace = Infinity;
         for (var c of codes) {
-            var m = /^\s*/.exec(c);
-            if (m && m[0].length < minSpace) {
+            var m = /^\s+/.exec(c);
+            if (!m) {
+                minSpace = 0;
+                break;
+            }
+            if (m[0].length < minSpace) {
                 minSpace = m[0].length;
             }
         }
-        if (minSpace > 0) codes = codes.map(c => /^\s+/.test(c) ? c.slice(minSpace) : c);
+        if (minSpace > 0 && minSpace < Infinity) codes = codes.map(c => /^\s+/.test(c) ? c.slice(minSpace) : c);
         return codes;
     }
     function codetext(type, text, blink) {

package/package.json

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