efront 3.37.0 → 3.38.2

package/coms/compile/common.js

@@ -91,18 +91,27 @@ var skipAssignment = function (o, cx) {
             next();
             needpunc = true;
             break;
+        case PROPERTY:
+            if (needpunc) break loop;
+            next();
+            break;
         case EXPRESS:
-            if (/^\.|\.$/.test(o.text)) {
+            if (/^\.[^\.]/.test(o.text)) {
+                next();
+                break;
+            }
+            if (/\.$/.test(o.text)) {
+                needpunc = false;
                 next();
                 break;
             }
-            else if (/^\[/.test(o.text)) {
+            if (/^\[/.test(o.text)) {
                 needpunc = true;
                 next();
                 break;
             }
         case QUOTED:
-            if (needpunc && /^`/.test(o.text || o.entry)) {
+            if (needpunc && /^`/.test(o.entry || o.text)) {
                 needpunc = false;
             }
         case VALUE:
@@ -127,7 +136,7 @@ var skipAssignment = function (o, cx) {
                 next();
                 needpunc = false;
             }
-            else if (/^(do|if|while|for|switch|with)/.test(o.text)) {
+            else if (/^(do|if|while|for|switch|with)$/.test(o.text)) {
                 if (o.text === 'if') ifdeep++;
                 next();
                 next();
@@ -218,7 +227,7 @@ function snapSentenceHead(o) {
                 o = p;
                 continue;
             }
-            if (/^(in|instanceof)/.test(p.text)) {
+            if (/^(in|instanceof)$/.test(p.text)) {
                 o = p.prev;
                 continue;
             }
@@ -241,28 +250,88 @@ function snapSentenceHead(o) {
 }
 
 var snapExpressHead = function (o) {
-    if (!o || o.type !== EXPRESS) return;
+    if (!o || o.type & ~(EXPRESS | SCOPED | QUOTED)) return o;
+    var a = o;
     while (o && o.prev) {
         var p = o.prev;
-        if (p.type & (EXPRESS | VALUE)) {
-            if (o.type === SCOPED && o.entry === '[' || o.type === EXPRESS && /^\??\.[^\.]/.test(o.text) || /\.$/.test(p.text) && !p.isdigit) {
+        if (p && p.type === STRAP && p.text === 'new') return p;
+        if (o.type === SCOPED && o.entry !== '{'
+            || o.type === EXPRESS && /^(\??\.[^\.]|\[)/.test(o.text)
+            || /\.$/.test(p.text) && !p.isdigit
+            || o.type === QUOTED && (o.length || /^\`/.test(o.text))
+        ) {
+            if (p.type === SCOPED && p.entry === '(') {
+                var pp = p.prev;
+                if (pp && pp.type === STRAP && !p.transive) return o;
+            }
+            if (p.type & (EXPRESS | VALUE | QUOTED | SCOPED)) {
+                a = o;
                 o = p;
                 continue;
             }
         }
+        else if (o.type === SCOPED) {
+            var isclass = 0;
+            if (o.isObject) return o;
+            if (!o.isClass) {
+                if (p.type === SCOPED && p.entry === "(") {
+                    p = p.prev;
+                    if (p && p.type === EXPRESS) p = p.prev;
+                    if (p && p.type === STAMP && p.text === '*') p = p.prev;
+                    if (!p || p.type !== STRAP || !/^function$/.test(p.text)) return a;
+                    if (p && p.type === STRAP && p.text === "new") p = p.prev;
+                    return p;
+                }
+                return a;
+            }
+            while (o.isClass) {
+                isclass++;
+                o = o.prev;
+            }
+            var p = o;
+            while (o && isclass > 0) {
+                var p = o;
+                if (o.type === STRAP && o.text === 'class') {
+                    isclass--;
+                }
+                o = o.prev;
+            }
+            if (p && p.type === STRAP && p.text === 'new') return p;
+            return p;
+        }
         break;
     }
     return o;
 };
+
 var snapExpressFoot = function (o) {
-    if (!o || !(o.type & (EXPRESS | VALUE))) return;
     while (o && o.next) {
-        var n = o.next;
-        if (n.type === SCOPED && o.entry === '[' || /\.$/.test(o.text) && !o.isdigit || n.type === EXPRESS && /^\??\.[^\.]/.test(n.text)) {
-            if (n.type & (EXPRESS | SCOPED)) {
-                o = n;
-                continue;
+        var n = null;
+        if (o.type & STRAP) {
+            n = o;
+            if (n.text === 'new') n = n.next;
+            if (n.text === 'function') {
+                while (n && n.type !== SCOPED || n.entry !== '{') n = n.next;
+            }
+            else if (n.text === 'class') {
+                var n = o;
+                while (n && !n.isClass) n = n.next;
+                while (n && n.isClass) n = n.next;
             }
+            else break;
+            o = n;
+        }
+        else if (o.type & (EXPRESS | QUOTED | VALUE | SCOPED)) {
+            n = o.next;
+        }
+        if (!n) break;
+        if (n.type === SCOPED && o.entry !== '{'
+            || /\.$/.test(o.text) && !o.isdigit
+            || n.type === EXPRESS && /^\??\.[^\.]/.test(n.text)
+            || n.type === QUOTED && (n.length || /^\`/.test(n.text))
+        ) {
+            o = n;
+            continue;
         }
         break;
     }
@@ -270,7 +339,7 @@ var snapExpressFoot = function (o) {
 };
 var createScoped = function (parsed, wash) {
     var used = Object.create(null); var vars = Object.create(null), lets = vars;
-    var scoped = [], funcbody = scoped;
+    var scoped = [], funcbody = scoped, argscope = scoped, thisscope = scoped;
     scoped.body = parsed;
     scoped.isfunc = true;
     var run = function (o, id, body) {
@@ -324,24 +393,31 @@ var createScoped = function (parsed, wash) {
                     if (o.prev && o.prev.type === EXPRESS) {
                         if (/\.$/.test(o.prev.text)) break;
                     }
-                    var u = o.text;
-                    if (/^\.\.\./.test(u)) u = u.slice(3);
-                    var u = u.replace(/^([^\.\[]*)[\s\S]*$/, '$1');
-                    if (!u) break;
-                    if (u === 'await' && funcbody.async !== false) {
+                    if (o.text === 'await' && funcbody.async !== false) {
                         o.type = STRAP;
                         funcbody.async = true;
                         continue;
                     }
-                    if (u === 'yield' && funcbody.aster === true) {
-                        o.type = STRAP;
-                        continue;
+                    if (o.text === 'yield') {
+                        if (funcbody.aster === true) {
+                            o.type = STRAP;
+                            continue;
+                        }
+                        if ((!o.prev || o.prev.type !== STAMP || o.prev.text === ';') && (!o.next || o.next.type !== STAMP || o.next.text === '*')) {
+                            o.type = STRAP;
+                            funcbody.aster = true;
+                            continue;
+                        }
                     }
                     if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                         isScope = true;
                         isArrow = true;
                     }
                     else {
+                        var u = o.text;
+                        if (/^\.\.\./.test(u)) u = u.slice(3);
+                        var u = u.replace(/^([^\.\[]*)[\s\S]*$/, '$1');
+                        if (!u) break;
                         var prev = o.prev;
                         if (prev && prev.type === STAMP && /^(?:\+\+|\-\-)$/.test(prev.text)) {
                             var pp = prev.prev;
@@ -493,6 +569,8 @@ var createScoped = function (parsed, wash) {
                 var _vars = vars;
                 var _scoped = scoped;
                 var _funcbody = funcbody;
+                var _argscope = argscope;
+                var _thisscope = thisscope;
                 used = Object.create(null);
                 lets = Object.create(null);
                 vars = Object.create(null);
@@ -506,6 +584,8 @@ var createScoped = function (parsed, wash) {
                     if (isFunction) {
                         vars.this = true, vars.arguments = true;
                         scoped.aster = isAster;
+                        thisscope = scoped;
+                        argscope = scoped;
                     }
                     scoped.async = isAsync;
                     scoped.isfunc = true;
@@ -518,6 +598,8 @@ var createScoped = function (parsed, wash) {
                     scoped.used = used;
                     if (isClass) {
                         lets.super = true;
+                        lets.this = true;
+                        thisscope = scoped;
                     }
                 }
                 if (isArrow);
@@ -570,6 +652,7 @@ var createScoped = function (parsed, wash) {
                 if (!o);
                 else if (o.type === SCOPED && o.entry === "{") {
                     scoped.body = o;
+                    o.scoped = scoped;
                     o.isExpress = isExpress;
                     run(o.first);
                     if (isArrow && id >= 0 && o) o = o.next;
@@ -592,7 +675,7 @@ var createScoped = function (parsed, wash) {
                     var u = o;
                     while (o !== next) {
                         var n = run(o, 0);
-                        if (o === n) o = n.next;
+                        if (o === n || n && n.entry === '{') o = n.next;
                         else o = n;
                     }
                 }
@@ -638,14 +721,20 @@ var createScoped = function (parsed, wash) {
                     mergeTo(_used, used);
                     if (scoped.length) _scoped.push(scoped);
                 }
-                if (isFunction && vars.this) {
-                    delete vars.this;
-                    delete vars.arguments;
+                if (isArrow) {
+                    if (!thisscope.insett && used.this) thisscope.insett = true;
+                    if (!argscope.inseta && used.arguments) argscope.inseta = true;
                 }
-                if (isClass) delete lets.super;
-                if (scoped.isfunc) {
+                if (isClass) delete lets.super, delete lets.this, thisscope = _thisscope;
+                if (isFunction) {
                     if (used.yield) _scoped.yield = false;
                     funcbody = _funcbody;
+                    if (!isArrow) {
+                        delete vars.this;
+                        delete vars.arguments;
+                        thisscope = _thisscope;
+                        argscope = _argscope;
+                    }
                 }
                 used = _used;
                 lets = _lets;
@@ -672,6 +761,7 @@ var createScoped = function (parsed, wash) {
         delete envs.yield;
         delete used.yield;
     }
+    delete envs.eval;
     scoped.envs = envs;
     return scoped;
 };
@@ -716,13 +806,26 @@ var getDeclared = function (o, kind, queue) {
                         continue;
                     }
                 }
+            case EXPRESS:
             case STRAP:
             case VALUE:
-            case EXPRESS:
                 var n = o.text.replace(/^\.\.\.|\.\.\.$/g, '');
                 declared.push(n);
-                if (!prop) prop = declared["..."] ? declared["..."][1] - index : `[${index}]`;
-                if (n !== o.text) declared["..."] = [n, index];
+                var isdots = n !== o.text;
+                if (!isdots && !prop) {
+                    if (queue && queue.entry === '{') {
+                        if (o.type & (EXPRESS | STRAP)) {
+                            if (/^\[/.test(o.text)) prop = o.text;
+                            else if (!/\./.test(o.text)) prop = '.' + o.text;
+                            else prop = `[${strings.encode(o.text)}]`;
+                        }
+                        else {
+                            prop = `[${n}]`;
+                        }
+                    }
+                    else prop = declared["..."] ? declared["..."][1] - index : `[${index}]`;
+                }
+                if (isdots) declared["..."] = [n, index];
                 else attributes.push([prop, n]);
                 o.kind = kind;
                 saveTo(used, n, o);
@@ -856,7 +959,11 @@ var relink = function (list) {
     while (pi < cx) list[pi++].next = null;
     list.last = p;
     return list;
-}
+};
+var setqueue = function (list, queue = list) {
+    var v = { value: queue }
+    for (var o of list) Reflect.deleteProperty(o, 'queue'), Reflect.defineProperty(o, 'queue', v);
+};
 
 var createString = function (parsed) {
     var keepspace = parsed.keepspace !== false;
@@ -870,8 +977,9 @@ var createString = function (parsed) {
             if ((QUOTED | SCOPED | STRAP | LABEL | COMMENT) & lasttype
                 || prev.type === STAMP && !prev.unary
             ) {
-                if (o.type !== EXPRESS || !/^\.[^\.]/.test(o.text) && !prev.tag && !o.tag) {
+                if (o.type !== EXPRESS || !/^(\.[^\.]|\[)/.test(o.text) && !prev.tag && !o.tag) {
                     result.push(" ");
+                    if (createString.debug && !o.text) console.log(o.type, o.text, o)
                     lasttype = SPACE
                 }
             }
@@ -950,7 +1058,7 @@ var createString = function (parsed) {
                             else result.pop();
                         }
                     }
-                    if (o.leave === "}" && (!o.next || o.next.type !== PIECE) && o[o.length - 1].type !== SPACE) {
+                    if (o.leave === "}" && o.entry === "{" && o[o.length - 1].type !== SPACE) {
                         if (keepspace) result.push(" ");
                     }
                 }
@@ -1004,6 +1112,7 @@ var rename = function (used, from, to) {
     if (list) for (var u of list) {
         if (!u) continue;
         var text = u.text;
+        if (!u.origin) u.origin = from;
         var doted = /^\.\.\./.test(text);
         if (doted) text = text.slice(3);
         text = to + text.replace(/^[^\.\:\[]+/i, "");
@@ -1045,25 +1154,33 @@ var createExpressList = function (code) {
     }
     return list;
 };
+var splice = function (queue, index, size, ...args) {
+    if (index < 0) index += queue.length;
+    var p = queue[index];
+    var n = queue[index + size - 1];
+    var prev = p && p.prev;
+    var next = n && n.next;
+    var res = queue.splice(index, size, ...args);
+    var previ = queue.lastIndexOf(prev, index);
+    var nexti = queue.indexOf(next, index + args.length);
+    if (previ < 0) previ = 0;
+    if (nexti < 0) nexti = queue.length;
+    else nexti++;
+    var changedargs = queue.slice(previ, nexti);
+    var pp = prev && prev.prev;
+    var nn = next && next.next;
+    relink(changedargs);
+    if (prev) prev.prev = pp;
+    else queue.first = changedargs.first;
+    if (next) next.next = nn;
+    else queue.last = changedargs.last;
+    setqueue(args, queue);
+    return res;
+};
 var replace = function (o, ...args) {
     var queue = o.queue;
     var i = queue.indexOf(o);
-    if (i >= 0) queue.splice(i, 1, ...args);
-    var prev = o.prev;
-    var next = o.next;
-    if (!args.length) {
-        if (prev) prev.next = next;
-        else queue.first = next;
-        if (next) next.prev = prev;
-        else queue.last = prev;
-    }
-    else {
-        if (prev) prev.next = args[0], args[0].prev = prev;
-        else queue.first = args[0];
-        if (next) next.prev = args[args.length - 1], args[args.length - 1].next = next;
-        else queue.last = args[args.length - 1];
-    }
-    return args.length ? args[0] : next;
+    if (i >= 0) splice(queue, i, 1, ...args);
 };
 
 module.exports = {
@@ -1093,6 +1210,8 @@ module.exports = {
     saveTo,
     rename,
     relink,
+    setqueue,
     replace,
+    splice,
     mergeTo
 };