efront 4.9.4 → 4.10.1

package/coms/compile/Program.js

@@ -91,7 +91,7 @@ class Program {
         ["`", "`", /\\[\s\S]/, ["${", "}"]],
     ]
     tags = [
-        [["<", "</"], /\/?>/, /\\[\s\S]/, "'", '"', "<!--", ["${", "}"]]
+        [["<", "</"], /\/?>/, /\\[\s\S]|\=\>/, "'", '"', "<!--", ["${", "}"]]
     ];
     scriptTags = [];
     ignoreTags = ["STYLE", "SCRIPT"];
@@ -112,8 +112,9 @@ class Program {
     transive_reg = /^(new|void|case|break|continue|return|throw|extends|import)$/
     straps = "if,for".split(',');
     forceend_reg = /^(return|break|continue)$/;
-    classstrap_reg = /^(class)$/;
-    extends_reg = /^(extends)$/;
+    classstrap_reg = /^(class|function|async|interface)$/;
+    extends_reg = /^(extends|implements)$/;
+    control_reg = /^(if|else|switch|case|do|while|for|break|continue|default|import|from|as|export|try|catch|finally|throw|await|yield|return)$/;
     spaces = spaceDefined;
     nocase = false
     keepspace = false;
@@ -150,10 +151,33 @@ class Program {
         var Code = this.Code;
         var queue = new Code();
         queue.type = this.type;
+        queue.inExpress = this.inExpress;
+        if (this.type === ELEMENT) {
+            queue.entry = this.tags[0].tag[0];
+        }
         var origin = queue;
         var forceend_reg = this.forceend_reg;
         var program = this;
+        var quote_map = this.quote_map;
+        var space_reg = this.space_reg;
+        var strap_reg = this.strap_reg;
+        var stamp_reg = this.stamp_reg;
+        var scope_entry = this.scope_entry;
+        var express_reg = this.express_reg;
+        var value_reg = this.value_reg;
+        var extends_reg = this.extends_reg;
+        var classstrap_reg = this.classstrap_reg;
+        var entry_reg = this.entry_reg;
+        var comment_entry = this.comment_entry;
+        var rowsOf = m => m.replace(/[^\r\n\u2028\u2029]+/g, ';').replace(/\r\n|\r|\n|\u2028|\u2029/g, ' ').replace(/;/g, '').length;
+        var setRows = m => {
+            row += rowsOf(m);
+            colstart = start + m.length - m.replace(/^[\s\S]*?([^\r\n\u2028\u2029]*)$/, '$1').length - 1;
+        };
         var queue_push = function (scope) {
+            if (scope.type & (SPACE | COMMENT | PIECE | QUOTED)) {
+                if (scope.text) setRows(scope.text);
+            }
             var last = queue.last;
             Object.defineProperty(scope, 'queue', { value: queue, enumerable: false, configurable: true });
             scope.prev = last;
@@ -181,16 +205,10 @@ class Program {
                 }
                 if (!queue.first) queue.first = scope;
             }
-            scope.row = row;
-            scope.col = scope.start - colstart;
             queue.push(scope);
         };
         var row = 1, colstart = -1;
         var save = (type) => {
-            if (type & (SPACE | COMMENT | PIECE | QUOTED)) {
-                row += m.replace(/[^\r\n\u2028\u2029]+/g, '').replace(/\r\n|\r|\n|\u2028|\u2029/g, ' ').length;
-                colstart = start + m.length - m.replace(/^[\s\S]*?([^\r\n\u2028\u2029]*)$/, '$1').length - 1;
-            }
             if (lasttype === STAMP && type === STAMP && !/[,;\:]/.test(m)) {
                 var scope = queue[queue.length - 1];
                 if (/=>$/i.test(scope.text) ||
@@ -210,6 +228,8 @@ class Program {
                 type,
                 start,
                 end,
+                row,
+                col: start - colstart,
                 isExpress: queue.inExpress,
                 text: m
             }
@@ -253,6 +273,9 @@ class Program {
                     scope.entry = queue.tag_entry;
                     scope.tag_leave = queue.tag_leave;
                     scope.tag = tag;
+                    scope.row = row;
+                    scope.col = scope.start - colstart;
+
                     scope.inTag = true;
                     scope.type = ELEMENT;
                 }
@@ -290,11 +313,25 @@ class Program {
             queue.last = null;
             return true;
         };
+        var isTypedColon = function (qp) {
+            var istype = false;
+            if (qp?.type === STAMP && qp.text === ':' && !qp.isExpress) {
+                if (qp.istype) return true;
+                var qpp = qp.prev;
+                if (qpp.type === SCOPED && qpp.entry === '(') {
+                    var qppp = qpp.prev;
+                    if (qppp && (qppp.isprop)) {
+                        istype = true;
+                    }
+                }
+            }
+            return istype;
+        }
         var closeTag = function () {
             queue.inTag = false;
             if (queue.closed) return;
             if (queue.length) queue.attributes = queue.splice(0, queue.length);
-            if (/^\//.test(m)) return queue.short = true, queue.closed = true;
+            if (/^\//.test(m) || queue.istype) return queue.short = true, queue.closed = true;
             return false;
         };
         var push_quote = function () {
@@ -311,11 +348,35 @@ class Program {
         var push_parents = function (scope) {
             scope.queue = queue;
             scope.prev = queue.last;
+            scope.row = row;
+            scope.col = match.index - colstart;
             parents.push(queue);
             queue = scope;
             lasttype = null;
         }
         var pop_parents = function () {
+            if (!parents.length) {
+                delete queue.end;
+                var last = queue.last;
+                if (last) {
+                    while (queue[queue.length - 1] !== last) {
+                        queue.pop();
+                    }
+                    queue.pop();
+                    index = queue.last.start;
+                    queue.last = last.prev;
+                }
+                else {
+                    var m = queue.leave;
+                    index = queue.end - m.length;
+                }
+                delete queue.start;
+                delete queue.end;
+                delete queue.leave;
+                delete queue.type;
+                delete queue.entry;
+                return;
+            }
             var scope = queue;
             queue = parents.pop();
             queue_push(scope);
@@ -325,19 +386,21 @@ class Program {
             if (index > start) {
                 var piece = queue[queue.length - 1];
                 if (piece && piece.type === PIECE) {
+                    row -= rowsOf(piece.text);
                     piece.text = text.slice(piece.start, index);
-                    piece.end = match.index;
+                    setRows(piece.text);
+                    piece.end = index;
                 }
                 else {
                     m = text.slice(start, index);
-                    save(PIECE);
+                    save(space_reg.test(m) ? SPACE : PIECE);
                 }
             }
             m = match[0];
         }
         loop: while (index < text.length) {
-            if (queue.type === QUOTED) {
-                var quote = this.quote_map[queue.entry];
+            if (queue.type & (QUOTED | ELEMENT)) {
+                var quote = quote_map[queue.entry];
                 var reg = quote.reg;
                 start = index;
                 while (index < text.length) {
@@ -359,12 +422,12 @@ class Program {
 
                         continue;
                     }
+
                     if (quote.end.test(m)) {
                         end = match.index;
                         if (queue.tag) {
                             push_piece();
                             if (!queue.inTag) continue;
-
                             if (closeTag() === false) {
                                 start = index;
                                 queue.tag_leave = m;
@@ -391,6 +454,7 @@ class Program {
                             var scope = [];
                             scope.entry = m;
                             scope.type = QUOTED;
+                            if (queue.istype) scope.istype = queue.istype;
                             scope.start = index;
                             scope.isExpress = queue.inExpress;
                             push_parents(scope);
@@ -411,15 +475,15 @@ class Program {
                         push_quote();
                         continue loop;
                     }
-                    if (m in this.quote_map) {
-                        if (this.comment_entry.test(m)) {
+                    if (m in quote_map) {
+                        if (comment_entry.test(m)) {
                             push_piece();
                             var start = match.index;
-                            var comment = this.quote_map[m];
-                            comment.lastIndex = index;
+                            var { reg: comment_reg, end: comment_end } = quote_map[m];
+                            comment_reg.lastIndex = index;
                             do {
-                                var match = comment.reg.exec(text);
-                            } while (match && !comment.end.test(match[0]));
+                                var match = comment_reg.exec(text);
+                            } while (match && !comment_end.test(match[0]));
                             if (match) end = index = match.index + match[0].length;
                             m = text.slice(start, index);
                             save(COMMENT);
@@ -439,16 +503,15 @@ class Program {
                 continue;
             }
 
-            var reg = this.entry_reg;
-            var start = reg.lastIndex = index;
-            var match = reg.exec(text);
+            var start = entry_reg.lastIndex = index;
+            var match = entry_reg.exec(text);
             if (!match) return null;
             var end = match[0].length + match.index;
             index = end;
             var m = match[0];
-            test: if (this.quote_map.hasOwnProperty(m)) {
+            test: if (quote_map.hasOwnProperty(m)) {
                 var last = queue.last;
-                var quote = this.quote_map[m];
+                var quote = quote_map[m];
                 if (queue.tag && quote.tag) {
                     var tagend = end + queue.tag.length
                     var leavem = quote.entry[m];
@@ -460,22 +523,63 @@ class Program {
                         break test;
                     }
                 }
-                if (this.stamp_reg.test(m) && last) {
-                    if ((VALUE | EXPRESS) & last.type) {
-                        if (queue.type !== ELEMENT) break test;
+
+                var isTypeTag = false;
+                if (queue.istype) {
+                    isTypeTag = true;
+                }
+                else if (!last) {
+                    if (!queue.brace) {
+                        isTypeTag = isTypedColon(queue.prev);
+                    }
+                }
+                else if (stamp_reg.test(m) && last) {
+                    if (lasttype === STAMP && m === last.text) break test;
+                    if (last.istype || last.isprop) {
+                        isTypeTag = true;
+                    }
+                    else if ((VALUE | EXPRESS | PROPERTY) & last.type) a: {
+                        if (queue.classed) {
+                            isTypeTag = true;
+                            break a;
+                        }
                         var lp = last.prev;
                         if (lp) {
-                            if (lp.type === STAMP && lp.text !== ';') break test;
-                            if (lp.type === STRAP && lp.transive) break test;
+                            if (lp.type === STAMP) {
+                                if (lp.text === ':') {
+                                    if (isTypedColon(lp)) {
+                                        last.istype = true;
+                                        isTypeTag = true;
+                                        break a;
+                                    }
+                                }
+                                break test;
+                            }
+                            if (lp.type === STRAP) {
+                                if (lp.istype) {
+                                    isTypeTag = true;
+                                    break a;
+                                }
+                                if (lp.transive) break test;
+                            }
                         }
+                        if (queue.type !== ELEMENT) break test;
+                    }
+                    else switch (last.type) {
+                        case QUOTED:
+                            if (!last.tag) break test;
+                            break;
+                        case SCOPED:
+                            if (queue.inExpress) break test;
+                            break;
+                        case STAMP:
+                            if (/^(\+\+|\-\-)$/.test(last.text)) break test;
+                            break;
                     }
-                    if (last.type === QUOTED && !last.tag) break test;
-                    if (last.type === SCOPED && queue.inExpress) break test;
-                    if (lasttype === STAMP && m === last.text) break test;
-                    if (last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) break test;
                 }
                 var scope = [];
-                scope.type = this.comment_entry.test(m) ? COMMENT : QUOTED;
+                scope.type = comment_entry.test(m) ? COMMENT : QUOTED;
+                if (isTypeTag && scope.type === QUOTED) scope.istype = isTypeTag;
                 scope.isExpress = queue.inExpress;
                 scope.start = start;
                 push_parents(scope);
@@ -519,14 +623,14 @@ class Program {
                 continue;
             }
             var parent = parents[parents.length - 1];
-            if (parent && this.quote_map[parent.entry] && queue.leave_map?.[m] === queue.entry) {
+            if (parent && quote_map[parent.entry] && queue.leave_map?.[m] === queue.entry) {
                 delete queue.leave_map;
                 queue.end = end;
                 queue.leave = m;
                 pop_parents();
                 continue;
             }
-            if (this.space_reg.test(m)) {
+            if (space_reg.test(m)) {
                 if (/[\r\n\u2028\u2029]/.test(m)) {
                     var last = queue.last;
                     if (last && last.isend === false) {
@@ -541,8 +645,8 @@ class Program {
                 lasttype = SPACE;
                 continue;
             }
-            if (this.strap_reg.test(m)) {
-                if (!this.classstrap_reg.test(m)) queue.inExpress = this.transive_reg.test(m);
+            if (strap_reg.test(m)) {
+                if (!classstrap_reg.test(m)) queue.inExpress = this.transive_reg.test(m);
                 else {
                     var last = queue.last;
                     if (!last);
@@ -558,11 +662,20 @@ class Program {
             }
             var isdigit = number_reg.exec(m);
             if (isdigit) {
-                m = isdigit[0];
-                index = match.index + m.length;
+                var m1 = isdigit[0];
+                if (m1.length < m.length) {
+                    if (m.charAt(m1.length) === ".") {
+                        m = m1;
+                        index = match.index + m.length;
+                    }
+                    else if (/\.$/.test(m1)) {
+                        m = m1.slice(0, m1.length - 1);
+                        index = match.index + m.length;
+                    }
+                }
                 isdigit = true;
             }
-            if (this.value_reg.test(m) || isdigit) {
+            if (value_reg.test(m) || isdigit) {
                 queue.inExpress = true;
                 if (isdigit && lasttype === STAMP) {
                     var last = queue.last;
@@ -579,15 +692,15 @@ class Program {
                 save(VALUE);
                 continue;
             }
-            if (this.express_reg.test(m)) {
+            if (express_reg.test(m)) {
                 var last = queue.last;
-                if (last && last.type === STRAP && this.classstrap_reg.test(last.text));
+                if (last && last.type === STRAP && classstrap_reg.test(last.text));
                 else queue.inExpress = true;
                 save(EXPRESS);
                 continue;
             }
 
-            if (this.scope_entry[m]) {
+            if (scope_entry[m]) {
                 var scope = [];
                 scope.entry = m;
                 scope.type = SCOPED;
@@ -597,18 +710,25 @@ class Program {
                 var last = queue.last;
                 if (m === "{") {
                     if (!last) {
-                        scope.isObject = queue.inExpress;
+                        if (queue.istype) scope.isClass = true;
+                        else scope.isObject = queue.inExpress;
                     }
-                    else if (queue.classed > 0) {
+                    else if (queue.classed) {
                         if (last.type !== STAMP || last.text !== "=>") {
-                            queue.classed--;
+                            var classed = queue.classed;
+                            var clsd = classed.pop();
                             scope.isClass = true;
-                            scope.extend += this.extends_reg.test(last.text);
+                            if (!classed.length) queue.classed = null;
+                            scope.istype = clsd === 'interface';
+                            scope.extend += extends_reg.test(last.text);
                             scope.inExpress = false;
                         }
                     }
                     else if (last.type === STAMP) {
-                        if (last.text === ':') {
+                        if (last.istype) {
+                            scope.isClass = true;
+                        }
+                        else if (last.text === ':') {
                             scope.isObject = queue.inExpress;
                         }
                         else queue.inExpress = scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(last.text);
@@ -620,11 +740,16 @@ class Program {
                         if (last.isend);
                         else scope.isObject = queue.inExpress;
                     }
+                    scope.brace = true;
+                    scope.isExpress = queue.inExpress;
                 }
                 else {
                     if (!last || (last.type & (SCOPED | STAMP))) queue.inExpress = true;
                     scope.isExpress = queue.inExpress;
                     scope.inExpress = true;
+                    if (last?.istype && last.type === STAMP) {
+                        scope.istype = true;
+                    }
                 }
                 push_parents(scope);
                 continue;
@@ -644,7 +769,7 @@ class Program {
                 continue;
             }
             if (this.scope_leave[m]) console.warn(i18n`标记不匹配`, queue.entry, m, "queue-start:", queue.start, "position:", `${row}:${index - colstart}\r\n`, index - queue.start < 200 ? text.slice(queue.start, index) : text.slice(queue.start, queue.start + 100) + "..." + text.slice(index - 97, index));
-            if (this.stamp_reg.test(m)) {
+            if (stamp_reg.test(m)) {
                 save(STAMP);
             }
 
@@ -664,7 +789,16 @@ class Program {
         };
         this.lastIndex = index;
         if (queue !== origin) {
-            throw console.log(createString(origin), `\r\n------ deep: ${parents.length}\r\n  --- enrty: ${queue.entry}\r\n  -- length: ${queue.length}\r\n  ---- last: ${createString([queue.last])}\r\n------- end\r\n --parents: ${parents.map(p => p.tag || p.entry || p.text).join('->')}`, createString([queue]).slice(-200)), "代码异常结束";
+            throw console.log(
+                createString(origin),
+                `\r\n ----- deep: ${parents.length}`,
+                `\r\n ---- enrty: ${queue.entry}`,
+                `\r\n --- length: ${queue.length}`,
+                `\r\n ----- last: ${queue.last ? createString([queue.last]) : createString(queue)}`,
+                `\r\n -- parents: ${parents.map(p => `${p.row}:${p.col}-${p.tag || p.text || p.entry} `).join('-)> ')}`,
+                `\r\n ----- snap: ${createString([queue]).slice(-200)}`,
+                `\r\n ------ end. `
+            ), "代码异常结束";
         }
         return queue;
     }

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

@@ -199,7 +199,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);
     }