efront 4.10.0 → 4.10.2

package/coms/compile/audit.js

@@ -37,7 +37,7 @@ var hasRupt = function (a) {
                 a = skipAssignment(a);
             }
             else if (a.type === SCOPED) {
-                if (a.entry === "{") {
+                if (a.brace) {
                     if (!a.isObject) {
                         if (hasRupt(a)) return true;
                     }

package/coms/compile/autoenum.js

@@ -37,6 +37,11 @@ var createRefId = function (o) {
             })
         }
         else {
+            if (o.needle) {
+                ids.push(o.text);
+                o = o.next;
+                continue;
+            }
             break;
         }
         var n = o.next;
@@ -199,7 +204,7 @@ function enumref(refitem, scoped) {
                 if (q !== scoped.body) {
                     if (q.entry === '(' && q.queue === scoped.body) {
                         var qp = q.prev;
-                        if (qp.type === EXPRESS) qp = qp.prev;
+                        if (qp?.type === EXPRESS) qp = qp.prev;
                         if (qp && qp.type === STRAP && qp.text === "await") qp = qp.prev;
                         if (qp && qp.type === STRAP && qp.text === 'for') {
                             var f = q.first;

package/coms/compile/cloneNode.js

@@ -6,6 +6,8 @@ var cloneNode = function (o) {
         c.entry = o.entry;
         c.leave = o.leave;
         c.type = o.type;
+        c.istype = o.istype;
+        c.brace = o.brace;
         c.isExpress = o.isExpress;
         relink(c);
     }

package/coms/compile/common.js

@@ -16,7 +16,8 @@ const [
 // --------------//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[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 needhead_reg = /^\?|^\.(?:[^\.]|$)|^\[/;
+var needfoot_reg = /(\:\:|([^\.]|^)\.)$/;
 var skipAssignment = function (o, cx) {
     if (!o) return;
     var next = arguments.length === 1 ? function () {
@@ -96,7 +97,7 @@ var skipAssignment = function (o, cx) {
             }
             break;
         case SCOPED:
-            if (needpunc && o.entry === "{") break loop;
+            if (needpunc && o.brace) break loop;
             next();
             needpunc = true;
             break;
@@ -104,18 +105,18 @@ var skipAssignment = function (o, cx) {
             if (needpunc) break loop;
             next();
             break;
-        case EXPRESS:
-            if (needhead_reg.test(o.text)) {
+        case ELEMENT:
+            if (o.istype) {
                 next();
                 break;
             }
-            if (/\.$/.test(o.text)) {
-                needpunc = false;
+        case EXPRESS:
+            if (needhead_reg.test(o.text)) {
                 next();
                 break;
             }
-            if (/^\[/.test(o.text)) {
-                needpunc = true;
+            var prev = o.prev;
+            if (prev?.type === EXPRESS && needfoot_reg.test(prev.text)) {
                 next();
                 break;
             }
@@ -299,7 +300,7 @@ function snapSentenceHead(o) {
     while (o && o.prev) {
         var p = o.prev;
         if (o.entry === '(') {
-            if (!(p.type & (STAMP | STRAP))) {
+            if (p.type & ~(STAMP | STRAP)) {
                 o = p;
                 p = o.prev;
                 if (!p) break;
@@ -314,9 +315,9 @@ function snapSentenceHead(o) {
                 continue
             };
         }
-        var maybeprop = o.type === SCOPED && o.entry !== "{" || o.type === EXPRESS && /^[\.\[]/.test(o.text);
+        var maybeprop = o.type === SCOPED && !o.brace || o.type === EXPRESS && /^[\.\[]/.test(o.text);
         if (p.type === EXPRESS) {
-            if (maybeprop || /\.$/.test(p.text)) {
+            if (maybeprop || p.needle || needfoot_reg.test(p.text)) {
                 o = p;
                 continue;
             }
@@ -329,7 +330,7 @@ function snapSentenceHead(o) {
         if (p.type & (VALUE | QUOTED)) {
             if (maybeprop) {
                 o = p;
-                if (p.entry === '`' && p.prev && !(p.prev.type & (STAMP | STRAP))) o = p.prev;
+                if (p.entry === '`' && p.prev && p.prev.type & ~(STAMP | STRAP)) o = p.prev;
                 continue;
             }
             break;
@@ -418,18 +419,22 @@ var getStrapHead = function (o) {
     return null;
 }
 var snapExpressHead = function (o) {
-    if (!o || o.type & ~(EXPRESS | SCOPED | QUOTED)) return o;
+    if (!o || o.type & ~(EXPRESS | SCOPED | QUOTED) && !o.needle) return o;
     var a = o;
     while (o && o.prev) {
         var p = o.prev;
+        if (p.type === STAMP && p.needle || o.type === STAMP && o.needle) {
+            o = p;
+            continue;
+        }
         if (p && p.type === STRAP && p.text === 'new') return p;
         if (o.type === SCOPED && o.entry === '(') {
             var h = getStrapHead(o);
             if (h) return h;
         }
         if (o.type === SCOPED && o.entry !== '{'
-            || o.type === EXPRESS && needhead_reg.test(o.text)
-            || /\.$/.test(p.text) && !p.isdigit
+            || needhead_reg.test(o.text) && !o.isdigit
+            || needfoot_reg.test(p.text) && !p.isdigit
             || o.type === QUOTED && (o.length || /^\`/.test(o.text))
         ) {
             if (p.type === SCOPED && p.entry === '(') {
@@ -477,6 +482,10 @@ var snapExpressHead = function (o) {
 
 var snapExpressFoot = function (o) {
     while (o && o.next) {
+        if (o.needle) {
+            o = o.next;
+            continue;
+        }
         var n = null;
         var isExpress = o.isExpress;
         if (o.type & STRAP) {
@@ -499,8 +508,8 @@ var snapExpressFoot = function (o) {
         }
         if (!n) break;
         if (n.type === SCOPED && (o.entry !== '{' || isExpress)
-            || /\.$/.test(o.text) && !o.isdigit
-            || n.type === EXPRESS && needhead_reg.test(n.text)
+            || needfoot_reg.test(o.text) && !o.isdigit
+            || n.needle || n.type === EXPRESS && needhead_reg.test(n.text)
             || n.type === QUOTED && (n.length || /^\`/.test(n.text))
         ) {
             o = n;
@@ -516,6 +525,23 @@ var createScoped = function (parsed, wash) {
     funcbody.isroot = true;
     scoped.body = parsed;
     scoped.isfunc = true;
+    var dec = function (map, o) {
+        var kind = o.text;
+        o = o.next;
+        while (o && o.type === STRAP) o = o.next;
+        var [declared, used0, o0, skiped] = getDeclared(o, kind);
+        if (o0 !== o) {
+            mergeTo(used, used0);
+            while (skiped.length) {
+                var o1 = run(skiped[0], 0);
+                let sindex = skiped.indexOf(o1);
+                if (sindex < 0) break;
+                skiped.splice(0, sindex + 1);
+            }
+            mapDeclared(map, declared);
+        }
+        return o0;
+    };
     var run = function (o, id, body) {
         loop: while (o) {
             var isCatch = false;
@@ -560,9 +586,21 @@ var createScoped = function (parsed, wash) {
                     if (o.isdigit || /^(null|false|true)$/.test(o.text)) break;
                 case EXPRESS:
                     if (needhead_reg.test(o.text)) break;
-                    // if (o.text === 'readFileAsync') console.log(o)
-                    if (o.prev && o.prev.type === EXPRESS) {
-                        if (/\.$/.test(o.prev.text)) break;
+
+                    var prev = o.prev;
+                    if (prev) {
+                        if (prev.needle || prev.type === EXPRESS && needfoot_reg.test(prev.text)) break;
+                        if (prev.type === STRAP && prev.istype) {
+                            var o0 = dec(lets, prev);
+                            if (o0 && o0.type === SCOPED && o0.entry === "(") {
+                                isFunction = true;
+                                isScope = true;
+                                break;
+                            }
+                            if (o === o0) o = o.next;
+                            else o = o0;
+                            continue;
+                        }
                     }
                     if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                         isScope = true;
@@ -572,7 +610,7 @@ var createScoped = function (parsed, wash) {
                     else {
                         var u = o.text;
                         if (/^\.\.\./.test(u)) u = u.slice(3);
-                        var u = u.replace(/^([^\.\[\?\s]*)[\s\S]*$/, '$1');
+                        var u = u.replace(/^([^\.\[\?\s\:]*)[\s\S]*$/, '$1');
                         if (!u) break;
                         var prev = o.prev;
                         if (prev && prev.type === STAMP && /^(?:\+\+|\-\-)$/.test(prev.text)) {
@@ -617,27 +655,27 @@ var createScoped = function (parsed, wash) {
                         case "let":
                         case "const":
                             m = lets;
-                            if (!o.next || o.next.type !== EXPRESS && (o.next.type !== SCOPED || o.next.entry === "(")) {
+                            if (!o.next || o.next.type & ~(EXPRESS | STRAP) && (o.next.type !== SCOPED || o.next.entry === "(")) {
                                 o.type = EXPRESS;
                                 continue;
                             }
                         case "import":
+                        case "use":
                             if (!o.next || o.next.type === QUOTED) break;
+                            if (o.next.needle) {
+                                o.type = EXPRESS;
+                                continue;
+                            }
                         case "var":
                             m = m || vars;
-                            var [declared, used0, o0, skiped] = getDeclared(o.next, s);
-                            mergeTo(used, used0);
-                            while (skiped.length) {
-                                var o1 = run(skiped[0], 0);
-                                let sindex = skiped.indexOf(o1);
-                                if (sindex < 0) break;
-                                skiped.splice(0, sindex + 1);
-                            }
-                            o = o0;
-                            mapDeclared(m, declared);
+                            var o0 = dec(m, o);
+                            if (o0 === o) o = o.next;
+                            else o = o0;
                             continue loop;
                         case "static":
                         case "function":
+                        case "fn":
+                        case "func":
                             isFunction = true;
                             var op = o.prev;
                             if (op?.type === STRAP && op.text === 'async') {
@@ -653,7 +691,8 @@ var createScoped = function (parsed, wash) {
                         case "catch":
                             if (s === 'catch') isCatch = true;
                         case "class":
-                            if (s === 'class') isClass = true;
+                        case "interface":
+                            if (/^interface|class$/.test(s)) isClass = true;
                             if (!o.isExpress) {
                                 o = o.next;
 
@@ -662,6 +701,7 @@ var createScoped = function (parsed, wash) {
                                     o.kind = isFunction ? 'function' : 'class';
                                     saveTo(used, o.text, o);
                                     o = o.next;
+                                    if (o?.type === ELEMENT) o = o.next;
                                 }
                             }
                             isScope = true;
@@ -680,14 +720,15 @@ var createScoped = function (parsed, wash) {
                     break;
                 case SCOPED:
                     if (o.entry === "(") {
+                        var prev = o.prev;
                         if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                             isArrow = true;
                             isScope = true;
-                            if (o.prev?.type === STRAP && o.prev.text === 'async') {
+                            if (prev?.type === STRAP && prev.text === 'async') {
                                 isAsync = true;
                             }
                         }
-                        else if (o.prev && (o.prev.type === PROPERTY || o.prev.isprop)) {
+                        else if (prev?.isprop) {
                             isFunction = true;
                             isScope = true;
                             var pp = o.prev.prev;
@@ -702,7 +743,7 @@ var createScoped = function (parsed, wash) {
                             run(o.first);
                         }
                     }
-                    else if (o.entry === "{" && !o.isObject) {
+                    else if (o.brace && !o.isObject) {
                         isScope = true;
                     }
                     else {
@@ -799,7 +840,7 @@ var createScoped = function (parsed, wash) {
                     o = o.next.next;
                 }
                 if (!o);
-                else if (o.type === SCOPED && o.entry === "{") {
+                else if (o.type === SCOPED && o.brace) {
                     scoped.body = o;
                     o.scoped = scoped;
                     o.isExpress = isExpress;
@@ -839,10 +880,10 @@ var createScoped = function (parsed, wash) {
                         var e = o;
                         if (o.type === STAMP && /^(\+\+|\-\-)$/.test(o.text) && o.prev && o.prev.type === EXPRESS
                             || (VALUE | QUOTED | SCOPED) & o.type
-                            || EXPRESS === o.type && !/\.$/.test(o.text)) {
+                            || EXPRESS === o.type && !needfoot_reg.test(o.text)) {
                             if ((VALUE | QUOTED | PROPERTY | LABEL) & next.type) break;
                             if (EXPRESS === next.type && !/^[\.\[]/.test(next.text)) break;
-                            if (next.type === SCOPED && next.entry === "{") break;
+                            if (next.type === SCOPED && next.brace) break;
                             if (next.type === STRAP && !next.isExpress) break;
                         }
                         o = next;
@@ -942,6 +983,11 @@ var getDeclared = function (o, kind, queue) {
             index--;
             break;
         }
+        var next = o.next;
+        if (next?.needle) {
+            o = next.next;
+            continue;
+        }
         if (o.isprop) {
             prop = createString([o]).trim();
             if (/^(['"`])[\s\S]*\1$/.test(prop)) {
@@ -970,13 +1016,19 @@ var getDeclared = function (o, kind, queue) {
                     break;
                 }
             case STAMP:
-                if (o.text === "*" && o.next) {
-                    if (o.next.type === STRAP && o.next.text === 'as') {
-                        o = o.next.next;
+                var next = o.next;
+                if (o.text === "*" && next) {
+                    if (next.type === STRAP && next.text === 'as') {
+                        o = next.next;
                         prop = "*";
                         continue;
                     }
                 }
+                if (o.text === '...') {
+                    o = o.next;
+                    continue;
+                }
+                break;
             case PROPERTY:
                 if (o.next) {
                     if (o.next.type === STAMP && o.next.text === ":" || o.next.type === STRAP && o.next.text === "as") {
@@ -993,6 +1045,12 @@ var getDeclared = function (o, kind, queue) {
                 var k = o.text;
                 if (isrest) declared.push(k = k.slice(3))
                 else if (o.text) declared.push(k);
+                if (!isrest) {
+                    var prev = o.prev;
+                    if (prev?.type === STAMP && prev.text === '...') {
+                        isrest = true;
+                    }
+                }
                 if (!isrest && !prop) {
                     if (queue && queue.entry === '{') {
                         if (o.type & (EXPRESS | STRAP)) {
@@ -1042,6 +1100,14 @@ var getDeclared = function (o, kind, queue) {
                     break;
                 }
                 break;
+            case EXPRESS:
+                if (o.text === '?') o = o.next;
+                break;
+        }
+        if (o?.type === STAMP) {
+            while (o?.istype) {
+                o = o.next;
+            }
         }
         if (!o) break;
         if (o.type !== STAMP) break;
@@ -1091,7 +1157,7 @@ var hasBreakBetween = function (prev, next) {
     if (!prev || !next) return true;
     if (prev.type === STAMP && /^[,;]/.test(prev.text)) return true;
     if (next.type === STAMP && /^[,;]/.test(next.text)) return true;
-    if (prev.type === EXPRESS && /\.$/.test(prev.text)) return true;
+    if (prev.type === EXPRESS && needfoot_reg.test(prev.text)) return true;
     if (next.type === EXPRESS && /^[\.\[]/.test(next.text)) return true;
 };
 var getSemicolonBetween = function (prev, next) {
@@ -1104,7 +1170,7 @@ var getSemicolonBetween = function (prev, next) {
     ) {
         if ((EXPRESS | VALUE | QUOTED | LABEL) & next.type) return ";";
         if (next.type === STRAP) {
-            if (!/^(in|of|extends|instanceof|as)$/.test(next.text)) return ";";
+            if (!/^(in|of|extends|implements|instanceof|as|is|from)$/.test(next.text)) return ";";
             return " ";
         }
         if (next.type === SCOPED && next.entry === '{') {
@@ -1119,7 +1185,7 @@ var getSemicolonBetween = function (prev, next) {
 }
 var needBreakBetween = function (prev, next) {
     if (hasBreakBetween(prev, next)) return;
-    return getSemicolonBetween(prev, next);
+    return getSemicolonBetween(prev, next) === ';' ? ';' : '';
 };
 var relink = function (list) {
     var pi = 0, p = null;
@@ -1164,7 +1230,6 @@ var setqueue = function (list, queue = list) {
     var v = { value: queue, configurable: true, enumerable: false };
     for (var o of list) delete o.queue, Object.defineProperty(o, 'queue', v);
 };
-
 var createString = function (parsed) {
     var autospace = parsed.autospace !== false;
     var keepspace = parsed.keepspace !== false;
@@ -1185,12 +1250,12 @@ var createString = function (parsed) {
     var intag = false;
     var run = (o, i, a) => {
         var prev = o.prev;
-        a: if (!((SPACE | COMMENT | STAMP | PIECE | SCOPED) & o.type) && prev && lasttype !== SPACE && patchspace) {
-            if ((QUOTED | SCOPED | STRAP | LABEL | COMMENT | ELEMENT) & lasttype
-                || prev.type === STAMP && !prev.unary
+        a: if (prev && lasttype !== SPACE && patchspace && ~(SPACE | COMMENT | STAMP | PIECE | SCOPED) & o.type) {
+            if ((QUOTED | SCOPED | STRAP | LABEL | COMMENT | ELEMENT | PROPERTY) & lasttype
+                || prev.type === STAMP && !prev.unary && !prev.needle && !prev.isprop
             ) {
                 if (intag || prev.type === ELEMENT && o.type === ELEMENT) break a;
-                if (o.type !== EXPRESS || !needhead_reg.test(o.text) && !prev.tag && !o.tag) {
+                if ((o.type & ~(EXPRESS | PROPERTY) || !needhead_reg.test(o.text)) && (!prev.tag && !o.tag || prev.type === STAMP || o.type === STAMP)) {
                     result.push(" ");
                     lasttype = SPACE
                 }
@@ -1245,6 +1310,7 @@ var createString = function (parsed) {
                 result.push(o.entry);
                 result.push(o.tag);
                 if (o.attributes) {
+                    var _intag = intag;
                     intag = 0;
                     var attributes = o.attributes;
                     var needvalue = false;
@@ -1256,14 +1322,14 @@ var createString = function (parsed) {
                         }
                         else {
                             if (a.type === PIECE && !a.text) continue;
-                            if (!needvalue && (a.type !== PIECE || !/^\=/.test(a.text))) result.push(" ");
+                            if (!needvalue && !/\s$/.test(result[result.length - 1]) && a.type !== ELEMENT && (a.type !== PIECE || !/^[\=\s]/.test(a.text))) result.push(" ");
                             run(a);
                             needvalue = a.type === PIECE && /[\=]$/.test(a.text);
                         }
                     }
-                    intag = 0;
-                    if (o.short && attributes.length > 0 && !(lasttype & (SPACE | QUOTED))) {
-                        if (!/[\s'"]$/.test(result[result.length - 1])) result.push(' ');
+                    intag = _intag;
+                    if (o.short && attributes.length > 0 && lasttype & ~(SPACE | QUOTED)) {
+                        if (!o.istype && !/[\s'"]$/.test(result[result.length - 1])) result.push(' ');
                     }
                 }
                 if (o.closed) {
@@ -1278,7 +1344,7 @@ var createString = function (parsed) {
                     result.push(o.leave);
                 }
                 else {
-                    result.push(o.tag_leave);
+                    if (o.tag_leave) result.push(o.tag_leave);
                     if (o.length) o.forEach(run);
                 }
                 break;
@@ -1289,14 +1355,15 @@ var createString = function (parsed) {
                     break;
                 }
             case SCOPED:
-                if (patchspace && o.type !== QUOTED && (lasttype & (STRAP | COMMENT | STAMP)
-                    && (!o.prev || !/[\+\-\~\!]$/.test(o.prev.text) || /[\+\-]$/.test(o.prev.text) && (!o.prev.prev || !((STAMP | STRAP) & o.prev.prev.type)))
-                    || lasttype === SCOPED && o.entry === "{"
+                var prev = o.prev;
+                if (patchspace && 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(" ");
                 result.push(o.entry);
                 if (o.length > 0) {
                     var fillspace = patchspace && lasttype !== PIECE && !intag;
-                    if (o.entry === "{" && o[0].type !== SPACE) {
+                    if (o.brace && o[0].type !== SPACE) {
                         if (fillspace) {
                             result.push(" ");
                         }
@@ -1314,7 +1381,7 @@ var createString = function (parsed) {
                             else result.pop();
                         }
                     }
-                    if (o.leave === "}" && o.entry === "{" && o[o.length - 1].type !== SPACE) {
+                    if (o.brace && o[o.length - 1].type !== SPACE) {
                         if (fillspace) result.push(" ");
                     }
                 }
@@ -1322,11 +1389,11 @@ var createString = function (parsed) {
                 break;
             default:
                 if (o && typeof o === "object") {
-                    if (intag || o.type === EXPRESS && (needhead_reg.test(o.text) || o.prev?.type === EXPRESS && /\.$/.test(o.prev.text))) {
-                        if (o.prev?.isdigit && /^\./.test(o.text) && !/^0[\dxbo]|[mni]$|[e\.]/.test(o.prev.text)) result.push(" ");
+                    if (intag || o.needle || o.type & (EXPRESS | PROPERTY) && (needhead_reg.test(o.text) || lasttype & EXPRESS && needfoot_reg.test(prev?.text))) {
+                        if (prev?.isdigit && !/^0[\dxbo]|[mni]$|[e\.]/.test(prev.text) && lasttype & ~(SPACE | COMMENT)) result.push(" ");
                     }
                     else if ((STRAP | EXPRESS | PROPERTY | COMMENT | VALUE) & lasttype && (STRAP | EXPRESS | PROPERTY | VALUE | LABEL) & o.type) {
-                        if (autospace) result.push(" ");
+                        if (autospace || o.prev?.isdigit) result.push(" ");
                     }
                     else if (o.prev && o.type === STAMP && !/^[,;]/.test(o.text)) {
                         if (result[result.length - 1] === " " || (lasttype === PROPERTY || !o.isExpress && o.prev && o.prev.type !== LABEL) && o.text === ':') { }
@@ -1344,11 +1411,8 @@ var createString = function (parsed) {
                             }
                         }
 
-                        else if (o.text === '*') {
-                            if (patchspace && lasttype !== SPACE && (lasttype !== STRAP || o.prev && o.prev.text !== 'function')) result.push(" ");
-                        }
                         else if (!/^(\+\+|\-\-)$/.test(o.text) || o.prev && o.prev.type & (STAMP | STRAP)) {
-                            if (patchspace && lasttype !== SPACE) result.push(" ");
+                            if (patchspace && lasttype !== SPACE && !o.needle) result.push(" ");
                         }
                     }
                     if (o.isdigit) {
@@ -1363,7 +1427,6 @@ var createString = function (parsed) {
                 }
         }
         lasttype = o.type;
-        if (o.isprop) lasttype = PROPERTY;
     };
     parsed.forEach(run);
     return finalresult.join("");
@@ -1632,7 +1695,7 @@ var unshort = function (o, text) {
 };
 var getFuncBody = function (o) {
     var q = o.queue;
-    while (q && !(q.scoped?.isfunc)) q = q.queue;
+    while (q && !q.scoped?.isfunc) q = q.queue;
     return q;
 };
 var getBodyWith = function (o, k) {
@@ -1710,6 +1773,8 @@ module.exports = {
     /*2048 */ELEMENT,
     number_reg,
     equal_reg,
+    needhead_reg,
+    needfoot_reg,
     unshort,
     skipAssignment,
     getDeclared,