efront 4.10.1 → 4.11.0

package/coms/compile/downLevel.js

@@ -30,7 +30,7 @@ var unslice = function (arr) {
                     continue;
                 }
                 var p = o.prev;
-                if (p && p.type === EXPRESS && p.text === '...') {
+                if (p?.type && (STAMP | EXPRESS) && p.text === '...') {
                     var px = arr.lastIndexOf(p, cx);
                     splice(arr, px, cx - px + 1, ...o);
                     cx += o.length - 1;
@@ -370,13 +370,13 @@ var killdec = function (queue, i, getobjname, _var = 'var', killobj, islet) {
 // 键值对重组
 var killmap = function (body, i, _getobjname, _getnewname, killobj) {
     var o = body[i];
-    if (!o.length) return indexof(body, o.next, i);
+    if (!o.length) return i + 1;
     var m = o.first;
     var s = m, p;
 
     loop: while (m) {
         s = m, p = m.prev;
-        if (m.type === EXPRESS) break;
+        if (m.type === STAMP && m.text === '...' || m.type === EXPRESS) break;
         while (m && (m.type === STRAP || m.type === STAMP)) m = m.next;
         if (!m || m.type & (PROPERTY | QUOTED | EXPRESS) && /^\[/.test(m.text) || m.isprop && (m.type === SCOPED || m.short || m.next && m.next.type === SCOPED)) {
             break;
@@ -425,7 +425,7 @@ var killmap = function (body, i, _getobjname, _getnewname, killobj) {
         }
         if (m && m.type === STAMP && /^[,;]$/.test(m.text)) m = m.next;
     }
-    if (!m) return indexof(body, o.next, i);
+    if (!m) return i + 1;
     m = s;
     if (p && p.type === STAMP && p.text === ',') {
         var mi = o.indexOf(m);
@@ -433,7 +433,6 @@ var killmap = function (body, i, _getobjname, _getnewname, killobj) {
         if (pi > 0) splice(o, pi, mi - pi);
     }
     var q;
-    var next = o.next;
     var l = 1;
     var initq = function () {
         q = scanner2(`(${_getobjname()} =)`)[0];
@@ -445,7 +444,7 @@ var killmap = function (body, i, _getobjname, _getnewname, killobj) {
     var tempname = null;
     var t;
     while (m) {
-        if (m.type === EXPRESS) {
+        if (m.type === EXPRESS || m.type === STAMP && m.text === '...') {
             var s = m;
             m = skipAssignment(m);
             if (/^\.\.\./.test(s.text)) {
@@ -501,7 +500,7 @@ var killmap = function (body, i, _getobjname, _getnewname, killobj) {
         q.push(...scanner2(_getobjname()));
         relink(q);
     }
-    return indexof(body, next, i);
+    return i + 1;
 };
 var getprop = function (o, m) {
     var prop = {};
@@ -733,6 +732,9 @@ var indexof = function (list, o, i) {
     else i = list.length;
     return i;
 };
+var is3dots = function (m) {
+    return m.type === STAMP && m.text === '...' || m.type === EXPRESS && /^\.\.\./.test(m.text);
+};
 // 数组或参数展开
 var killspr = function (body, i, _getobjname, killobj) {
     var o = body[i];
@@ -747,6 +749,7 @@ var killspr = function (body, i, _getobjname, killobj) {
         m = skipAssignment(m);
         s.text = s.text.replace(/^\.\.\./, '');
         var v = splice2(o, s, m);
+        if (!s.text) v.shift();
         if (m) splice2(o, m, m = m.next);
         killobj(v);
         var q = scanner2(`slice_["call"]()`);
@@ -761,14 +764,13 @@ var killspr = function (body, i, _getobjname, killobj) {
         return m;
     }
     while (m) {
-        if (m.type === EXPRESS && /^\.\.\./.test(m.text)) break;
+        if (is3dots(m)) break;
         m = killnext(m);
         if (m) m = m.next;
         index++;
     }
     if (!m) return i + 1;
     var c = scanner2('["concat"]()');
-    var next = o.next;
     if (o.entry === '(') {
         var r = snapExpressHead(o);
         if (r.type === STRAP && r.text === "new") {
@@ -788,20 +790,37 @@ var killspr = function (body, i, _getobjname, killobj) {
             relink(qt)
             return b;
         }
-        var rt = r.type === EXPRESS && r.text.replace(/^\.\.\./, '');
+        var rt = (r.type & (EXPRESS | STAMP)) && r.text.replace(/^\.\.\./, '');
         var p = o.prev;
-        if (r === o);
-        else if (
-            r === o.prev && r.type === EXPRESS && !/\.[\s\S]*\./.test(rt) && !/\[[^\]]*\]\[[^\]]*\]/.test(rt)) {
-            var p = r;
-            var n = /\.|\[/.test(rt) ? rt.replace(/\.[^\.]*|\[[^\]]*\]$/, '') : "null";
-            splice(o, 0, 0, ...scanner2(n + ","));
+        var pp = p?.prev;
+        var done = false;
+        var hasdot = false;
+        if (r === o) done = true;
+        else if (r === p) {
+            if (r.type === EXPRESS && !/\.[\s\S]*\./.test(rt) && !/\[[^\]]*\]\[[^\]]*\]/.test(rt)) {
+                var p = r;
+                hasdot = r.text.length !== rt.length;
+                var n = /\.|\[/.test(rt) ? rt.replace(/\.[^\.]*|\[[^\]]*\]$/, '') : "null";
+                splice(o, 0, 0, ...scanner2(n + ","));
+                done = true;
+            }
+        }
+        else if (r === pp) {
+            if (p.type === SCOPED && p.entry === "[" && !/[\.\[]/.test(rt)) {
+                splice(o, 0, 0, ...scanner2(rt + ","));
+                p = r;
+                done = true;
+            }
         }
-        else if (p && r === p.prev && p.type === SCOPED && p.entry === "[" && !/[\.\[]/.test(rt)) {
-            splice(o, 0, 0, ...scanner2(rt + ","));
-            p = r;
+        else if (r === pp.prev) {
+            var ppp = pp.prev;
+            if (pp.text === '.' && p.type === EXPRESS && !/[\.\[]/.test(p.text) && ppp.type === EXPRESS && !/[\.\[]]/.test(ppp.text)) {
+                splice(o, 0, 0, ...scanner2(ppp.text + ','));
+                p = pp.prev;
+                done = true;
+            }
         }
-        else {
+        if (!done) {
             var n = null, hasdot = false;
             var pt = p.type === EXPRESS && p.text.replace(/^\.\.\./, '');
             if (p.type === EXPRESS && (n = /^(?:[\s\S]*[^\.])?(\.[^\.]*|\[[^\]]*\])$/.exec(pt))) {
@@ -810,6 +829,9 @@ var killspr = function (body, i, _getobjname, killobj) {
                 p.text = pt.slice(0, pt.length - n.length);
                 splice(body, i++, 0, { type: EXPRESS, text: n });
             }
+            else if (pp && /\.$/.test(pp.text) && !/[\.\[]/.test(p.text)) {
+                p = pp.prev;
+            }
             else if (p.type === SCOPED && p.entry === '[') {
                 p = p.prev;
             }
@@ -827,7 +849,7 @@ var killspr = function (body, i, _getobjname, killobj) {
             }
             splice(h1, h1.length, 0, ...splice(body, cx, dx - cx, ...h));
             i += cx - dx + h.length;
-            if (p.type === EXPRESS && !p.text) {
+            if (p.type & (EXPRESS | STAMP) && !p.text) {
                 var cx = h0.lastIndexOf(p);
                 if (cx >= 0) splice(h1, cx, 1);
             }
@@ -835,16 +857,16 @@ 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);
             splice(o, o.length, 0, ...c);
-            return indexof(body, next, i);
+            return i + 1;
         };
-        killnext(m);
         m.text = m.text.replace(/^\.\.\./, '');
-        return indexof(body, next, i);
+        if (!m.text) splice2(o, m, m.next);
+        return i + 1;
     }
     if (index > 0) {
         if (m) splice2(o, m.prev, m);
@@ -856,7 +878,7 @@ var killspr = function (body, i, _getobjname, killobj) {
     }
     var d;
     while (m) {
-        if (m.type === EXPRESS && /^\.\.\./.test(m.text)) {
+        if (is3dots(m)) {
             if (c[1].length) insert1(c[1], null, { type: STAMP, text: "," });
             insert1(c[1], null, ...spr());
             d = null;
@@ -873,7 +895,7 @@ var killspr = function (body, i, _getobjname, killobj) {
         insert1(d[0], null, ...splice2(o, s, m));
         if (m) splice2(o, m, m = m.next);
     }
-    return indexof(body, next, i);
+    return i + 1;
 };
 
 var killobj = function (body, getobjname, getletname, getname_, letname_, deep = 0) {
@@ -918,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);
@@ -963,6 +983,14 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
                 case "async":
                     splice(body, i, 1);
                     break;
+                case "new":
+                    if (o.next?.needle) {
+                        o.text = 'undefined';
+                        o = o.next;
+                        var e = snapExpressFoot(o).next;
+                        splice2(o.queue, o, e);
+                        break;
+                    }
                 default:
                     i++;
             }
@@ -982,6 +1010,7 @@ var killobj = function (body, getobjname, getletname, getname_, letname_, deep =
             }
             else if (o.entry === '[') {
                 var a = snapExpressHead(o);
+
                 if (a === o && o.next && o.next.type === STAMP && o.next.text === '=' || o.next && o.next.type === STRAP && /^(in|of)$/.test(o.next.type) && body.entry === '(' && body.prev && body.prev.type === STRAP && body.prev.text === 'for') {
                     i = killdec(body, i, _getdeepname, '', deepkill);
                 }
@@ -1258,6 +1287,12 @@ var killarg = function (head, body, _getname, setarg = true) {
     var namemap = Object.create(null);
     while (o) {
         var aname = null;
+        var is3darg = false;
+        var a = o;
+        if (o.type === STAMP && o.text === '...') {
+            o = o.next;
+            is3darg = true;
+        }
         if (o.type === SCOPED) {
             aname = _getname(head.length > 1 ? 'arg' + index : 'arg');
             var dec = splice2(head, o, o = o.next, { type: EXPRESS, text: aname });
@@ -1266,10 +1301,11 @@ var killarg = function (head, body, _getname, setarg = true) {
             else argcodes.push(`var ` + dec);
         }
         else if (o.type & (EXPRESS | VALUE)) {
+            if (!is3darg) is3darg = is3dots(o);
             aname = o.text;
-            if (/^\.\.\./.test(aname)) {
+            if (is3darg) {
                 cname = aname.replace(/^\.\.\./, '');
-                splice2(head, o.prev ? o.prev : o, o = o.next);
+                splice2(head, a.prev || a, o = skipAssignment(o));
                 collect = index + 1;
             }
             else {
@@ -1280,7 +1316,13 @@ var killarg = function (head, body, _getname, setarg = true) {
                 index++;
             }
         }
-        else throw i18n`参数声明异常！`
+        else if (is3darg) {
+            splice2(head, a.prev || a, o = skipAssignment(o));
+            aname = '...';
+            cname = '';
+            collect = index + 1;
+        }
+        else throw i18n`参数声明异常！`;
         if (o && o.type === STAMP) {
             if (o.text === ',') {
                 o = o.next; continue;
@@ -1443,6 +1485,27 @@ var killret = function (body, labels = Object.create(null), gettmpname) {
     }
     return breakmap;
 }
+var puncLeft = function (o) {
+    var s = snapExpressHead(o.prev);
+    var p = Infinity;
+    while (o && o.prev) {
+        if (o.type !== STAMP || !(o.text in powermap) || powermap[o.text] < p) return s;
+        s = snapExpressHead(o.prev);
+        o = s.prev;
+    }
+    return s;
+}
+var puncRight = function (o) {
+    var s = snapExpressFoot(o.next);
+    var p = 0;
+    while (o && o.next) {
+        if (o.type !== STAMP || !(o.text in powermap) || powermap[o.text] <= p) return s;
+        s = snapExpressFoot(o.next);
+        o = s.next;
+    }
+    return s;
+}
+
 
 var newpunc = function (body, i, newname) {
     var o = body[i];
@@ -1465,29 +1528,44 @@ var newpunc = function (body, i, newname) {
         if (!h) return;
         var rt = h.type === EXPRESS && h.text;
         var p = o.prev;
+        var done = false;
         var hi = body.lastIndexOf(h, i);
-        if (
-            h === p && h.type === EXPRESS && !/\.[\s\S]*\./.test(rt) && !/\[[^\]]*\]\[[^\]]*\]/.test(rt)) {
-            splice(sentence, 0, 0, ...scanner2(rt + punc));
-            hi = i;
-        }
-        else if (p && h === p.prev && p.type === SCOPED && p.entry === "[" && !/[\.\[]/.test(rt)) {
-            if (canbeTemp(p)) {
-                var name = p.first.text;
+        var pp = p?.prev;
+        if (h === p) {
+            if (h.type === EXPRESS && !/\.[\s\S]*\./.test(rt) && !/\[[^\]]*\]\[[^\]]*\]/.test(rt)) {
+                splice(sentence, 0, 0, ...scanner2(rt + punc));
+                hi = i;
+                done = true;
             }
-            else {
-                var name = newname();
-                splice(p, 0, 0, ...scanner2(`${name}=`));
+        }
+        else if (h === pp) {
+            if (p.type === SCOPED && p.entry === "[" && !/[\.\[]/.test(rt)) {
+                if (canbeTemp(p)) {
+                    var name = p.first.text;
+                }
+                else {
+                    var name = newname();
+                    splice(p, 0, 0, ...scanner2(`${name}=`));
+                }
+                splice(sentence, 0, 0, ...scanner2(`${rt}[${name}]` + punc));
+                hi = i;
+                done = true;
             }
-            splice(sentence, 0, 0, ...scanner2(`${rt}[${name}]` + punc));
-            hi = i;
         }
-        else {
+        else if (h === pp.prev) {
+            var ppp = pp.prev;
+            if (pp.text === '.' && p.type === EXPRESS && ppp.type === EXPRESS && !/[\.\[]/.test(p.text) && !/[\.\[]/.test(ppp.text)) {
+                splice(sentence, 0, 0, ...scanner2(`${ppp.text}.${pp.text}+${punc}`));
+                hi = i;
+                done = true;
+            }
+        }
+        if (!done) {
             var n = null;
             var name = newname();
             var pt = p.type === EXPRESS && p.text;
             var hp = h.prev;
-            splice(body, i - 1, 1);
+            splice(body, i -= 1, 1);
             if (p.type === EXPRESS && (n = /^(?:[\s\S]*[^\.])?(\.[^\.]*|\[[^\]]*\])$/.exec(pt))) {
                 var n = n[1];
                 p.text = pt.slice(0, pt.length - n.length);
@@ -1501,14 +1579,17 @@ var newpunc = function (body, i, newname) {
                     var name2 = newname();
                     splice(p, 0, 0, ...scanner2(`${name2}=`));
                 }
-                splice(body, i - 2, 1);
+                splice(body, i -= 1, 1);
                 splice(sentence, 0, 0, ...scanner2(`,${name}`), p, ...scanner2(`=${name}[${name2}]${punc}`));
                 p = p.prev;
             }
             else {
                 var n = p.text.replace(/^\./, '');
                 var pp = p.prev;
-                if (pp.type === EXPRESS) pp.text = pp.text.replace(/\.$/, '');
+                if (n === p.text) {
+                    if (pp.text === '.') pp = pp.prev, splice(body, i -= 2, 2);
+                    else if (pp.type & EXPRESS) pp.text = pp.text.replace(/\.$/, ''), splice(body, i -= 1, 1);
+                }
                 splice(sentence, 0, 0, ...scanner2(`,${name}.${n}=${name}.${n}${punc}`));
             }
             splice(sentence, 0, 0, ...scanner2(`${name}=`), ...splice(body, hi, i));
@@ -1524,8 +1605,8 @@ var newpunc = function (body, i, newname) {
     else {
         hi = i;
         if (/^(\?\?|\*\*)$/.test(t)) {
-            var l = powermap.puncLeft(o);
-            var r = powermap.puncRight(o);
+            var l = puncLeft(o);
+            var r = puncRight(o);
             var li = body.lastIndexOf(l, i);
             var ri = body.indexOf(r, i);
             var name = t === '??' ? 'nullish_' : "power_";

package/coms/compile/downLevel_test.js

@@ -430,9 +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 _`)
+var _`);
+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"](path, pathlist);\r\n`);

package/coms/compile/powermap.js

@@ -1,25 +1,4 @@
-var { STAMP, snapExpressHead, snapExpressFoot } = require("./common");
-var powermap = new class {
-    puncLeft(o) {
-        var s = snapExpressHead(o.prev);
-        var p = Infinity;
-        while (o && o.prev) {
-            if (o.type !== STAMP || !(o.text in this) || this[o.text] < p) return s;
-            s = snapExpressHead(o.prev);
-            o = s.prev;
-        }
-        return s;
-    }
-    puncRight(o) {
-        var s = snapExpressFoot(o.next);
-        var p = 0;
-        while (o && o.next) {
-            if (o.type !== STAMP || !(o.text in this) || this[o.text] <= p) return s;
-            s = snapExpressFoot(o.next);
-            o = s.next;
-        }
-        return s;
-    }
+var powermap = {
 };
 
 [
@@ -27,9 +6,13 @@ var powermap = new class {
     '&&,||,^^,??'/* 4 */, '&,|,^'/* 5 */,
     'instanceof,in,==,>=,<=,>,<,!=,!==,===,!in,!instanceof'/* 6 */,
     '>>,>>>,<<'/* 7 */, '+,-'/* 8 */, '*,/,%'/* 9 */, '**'/* 10 */,
-    'typeof,await,yield,new,delete,void,!,~'/* 11 */, '++,--'/* 12 */,
+    '++,--'/* 11 */,
+    "typeof,await,yield,new,delete,void,..."/*12*/,
+    '!,~'/* 13 */,
+    "::,?.,->,."/*14*/,
 ].forEach((pp, i) => {
     pp.split(",").forEach(p => {
         powermap[p] = i + 1;
     })
 });
+module.exports = powermap;

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

@@ -541,7 +541,6 @@ var _invoke = function (t, getname) {
             continue;
         }
         if (needbreak(o)) {
-
             var s = splice(t, bx, cx + 1 - bx);
             if (cx > 0) s.name = [cloneNode(s[0])];
             else s.name = qname;
@@ -642,8 +641,8 @@ var _invoke = function (t, getname) {
     else if (t.length) {
         if (!isAequalA(t)) {
             var t0 = t[0];
-            if (t0.type === EXPRESS && /^[\.\[]/.test(t0.text) || t0.type & (STAMP | STRAP) && powermap[t0.text] < powermap.new) {
-                t.unshift(...rescan(`${qname}=${qname}`));
+            if ((t0.type === EXPRESS && /^[\.\[]/.test(t0.text) || t0.type & (STAMP | STRAP) && powermap[t0.text] < powermap.new) && result.length) {
+                t.unshift(...rescan`${qname}=${qname}`);
                 relink(t);
             }
             t = uncurve(t);
@@ -784,8 +783,7 @@ var ternary = function (body, getname, ret) {
                     b = ternary(b, getnextname, true);
                     for (var b of b) pushstep(explist, b);
                     return b;
-                }, true)
-                    }) return [1, 0]`);
+                }, true)}) return [1, 0]`);
                 var q = explist[explist.length - 1];
                 var qi = explist.length - 1;
                 var qe = q[q.length - 1];
@@ -872,6 +870,7 @@ var ternary = function (body, getname, ret) {
                 an = q2.name;
                 asn = cloneNode(an);
             }
+
             for (var e of explist2) pushstep(explist, e);
             eq.text = "=";
         }
@@ -970,6 +969,10 @@ var _express = function (body, getname, ret) {
             continue;
         }
         if (o.type & (STRAP | STAMP)) {
+            if (o.needle) {
+                exps.push(o);
+                continue;
+            }
             var p = 0;
             if (o.unary) p = powermap["!"];
             else p = powermap[o.text];

package/coms/compile/unstruct_test.js

@@ -96,9 +96,9 @@ test("if(1) function a(){}", 'if (false) return [1, 0]; a = function () {}; retu
 test("if(1) {function a(){}}", 'if (false) return [1, 0]; a = function () {}; return [1, 0]', true);
 test("if(a) a = 1;function a(){}", "a = function () {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
 test("if(a) a = 1;async function a(){}", "a = async function () {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
-test("if(a) a = 1;async function* a(){}", "a = async function* () {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("if(a) a = 1;async function* a(){}", "a = async function *() {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
 test("if(a) a = 1;class a{}", "a = class {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
-test("if(a) a = 1;function* a(){}", "a = function* () {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
+test("if(a) a = 1;function* a(){}", "a = function *() {}; if (!a) return [1, 0]; a = 1; return [1, 0]", true);
 test("await new Promise(function(){})", '_ = function () {}; _ = new Promise(_); return [_, 1]', true);
 test(`onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse })`, '_ = { status: xhr.status, response: "Cookie解析异常!", toString: toResponse }; onerror(_)', true);
 test(`if (!/^https\\:\\/\\/|^s\\/\\//.test(url)) console.warn("请使用https访问如下路径:" + url)`, '_ = /^https\\:\\/\\/|^s\\/\\//.test(url); if (_) return [1, 0]; _ = "请使用https访问如下路径:" + url; _ = console.warn(_); return [1, 0]', true);

package/coms/docs/codecolor.js

@@ -10,6 +10,26 @@ var codecolor = function (c, encode) {
     var envs = c.envs;
     var deep = 0;
     var used = c.used;
+    var scoped = c.scoped;
+    var setdefs = function (scoped) {
+        var { used } = scoped;
+        for (var k in used) {
+            var isdef = false;
+            for (var o of used[k]) {
+                if (o.next?.needle) {
+                    isdef = true;
+                    break;
+                }
+            }
+            if (isdef) {
+                for (var o of used[k]) {
+                    o.isdef = true;
+                }
+            }
+        }
+        scoped.forEach(setdefs);
+    };
+    setdefs(scoped);
     var isConstValue = () => false;
     if (c.program) {
         var { strap_reg, value_reg } = c.program;
@@ -19,6 +39,7 @@ var codecolor = function (c, encode) {
         var o = o.next;
         if (o?.type === EXPRESS && needhead_reg.test(o.text)) o = o.next;
         if (o?.type === ELEMENT && o.istype) o = o.next;
+        if (o?.type === STAMP && o.needle) o = o.next;
         if (o?.type === SCOPED && o.entry === "(") return true;
         return false;
     }
@@ -30,7 +51,7 @@ var codecolor = function (c, encode) {
         }
         var [name] = keys;
         if (/^[\<\?]/.test(name) || !name);
-        else if (!o.isprop && isConstValue(name)) name = `<strap>${name}</strap>`;
+        else if (!o.isprop && o.text !== name && isConstValue(name)) name = `<strap>${name}</strap>`;
         else name = `<${label}>${name}</${label}>`;
         keys[0] = name;
         o.text = keys.map(k => /^[\<\?]/.test(k) || !k ? k : `<express>${k}</express>`).join(".");
@@ -113,7 +134,7 @@ var codecolor = function (c, encode) {
 
                 break;
             case EXPRESS:
-                setExpress(o, o.istype ? 'predef' : 'express');
+                setExpress(o, o.istype || o.isdef || o.next?.needle ? 'predef' : 'express');
                 break;
             case STRAP:
                 if (control_reg?.test(text)) o.text = `<flow>${o.text}</flow>`;

package/coms/docs/codetext.xht

@@ -11,6 +11,7 @@
         font-family: Consolas, "Courier New", monospace;
         vertical-align: top;
         text-decoration-line: none;
+        tab-size: 4;
     }
 
     stamp {
@@ -124,7 +125,11 @@
         "step", "smoothstep",
         "mix", "clamp"
     );
-    var struct_reg = /^(while|do|for|with|switch|case|default|if|else|try|catch|finally)$/;
+    var rust = new compile$Javascript;
+    rust.powermap = Object.assign({}, rust.powermap);
+    rust.powermap["->"] = 0;
+    rust.straps = ["let", 'use', 'mut', 'fn', 'if', 'else', 'loop', 'while', 'for', 'in', 'break', 'true', 'false', 'struct', 'enum', 'impl', 'self', 'match', 'pub', 'mod', 'trait'];
+    var struct_reg = /^(while|do|for|with|switch|case|default|if|else|try|catch|finally|loop|import|export)$/;
 
     gl.setType = function (o) {
         var { type } = o;
@@ -160,6 +165,11 @@
             codecolor(c, encode);
             return c.toString();
         },
+        rs(a) {
+            var c = compile$scanner2(a, rust);
+            codecolor(c, encode);
+            return c.toString();
+        },
         glsl(a) {
             var c = compile$scanner2(a, gl);
             codecolor(c, encode);
@@ -200,7 +210,7 @@
     };
     codesupports.gl = codesupports.glsl;
     codesupports.cmd = codesupports.bat;
-    codesupports.jsx = codesupports.js = codesupports.javascript;
+    codesupports.cjs = codesupports.mjs = codesupports.jsx = codesupports.js = codesupports.javascript;
     codesupports.tsx = codesupports.ts = codesupports.typescript;
     codesupports.jsp = codesupports.asp = codesupports.php = codesupports.xml = codesupports.html;
     var { SCOPED, QUOTED, SPACE, STRAP, EXPRESS, PROPERTY } = compile$common;
@@ -271,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/coms/maps/gaode.js

@@ -1,3 +1,3 @@
 return {
-    url:'http://webst04.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}'
+    url:'http://webst0{1-4}.is.autonavi.com/appmaptile?style=6&x={x}&y={y}&z={z}'
 };

package/package.json

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