efront 4.0.20 → 4.0.23

package/coms/basic/queue.js

@@ -11,7 +11,7 @@ function queue(list, count = 1, context = null) {
         context = temp;
     }
     return new Promise(function (ok, oh) {
-        var cx = 0;
+        var cx = list.skip || 0;
         var result = [];
         var promised = false;
         var error_count = 0;
@@ -22,8 +22,9 @@ function queue(list, count = 1, context = null) {
         var next = function () {
             run();
         };
+        var _count = count;
         var run = function () {
-            if (error_count && count === 1) return promised = null;
+            if (error_count >= _count) return promised = null;
             if (cx >= list.length) return promised = null, count = 0, Promise.all(result).then(ok, oh);
             var saved_cx = cx;
             var args = list[cx];

package/coms/basic_/Symbol.js

@@ -20,10 +20,10 @@ var Symbol = this.Symbol || function () {
     Symbol.iterator = Symbol('iterator');
     Symbol.asyncIterator = Symbol('asyncIterator');
     var iterator = function () {
-        var arr = this, cx = 0, dx = arr.length;
+        var arr = this, cx = 0;
         return {
             next() {
-                if (cx < dx) return { value: arr[cx++], done: false };
+                if (cx < arr.length) return { value: arr[cx++], done: false };
                 return { value: undefined, done: true };
             }
         }

package/coms/basic_/aster_.js

@@ -1,7 +1,7 @@
 class Generator {
     constructor(f) {
         this.state = "suspended";
-        this.exec = f.bind(this, this.return, this.throw, function (value, next) {
+        this.exec = f.bind(this, this.return.bind(this), this.throw.bind(this), function (value, next) {
             this.exec = next;
             this.value = value;
         });
@@ -14,21 +14,21 @@ class Generator {
     return(value) {
         delete this.exec;
         this.state = "closed";
-        return { value: undefined, done: true };
+        this.value = value;
     }
     next(arg) {
+        delete this.value;
         if (this.exec) {
             var exec = this.exec;
             delete this.exec;
-            delete this.value;
             exec(arg);
         }
         return { value: this.value, done: !this.exec };
     }
+    [Symbol.iterator]() {
+        return this;
+    }
 }
-Generator.prototype[Symbol.iterator] = function () {
-    return this;
-};
 
 function aster_() {
     return new Generator(exec_.bind(this, arguments));

package/coms/basic_/asyncAster_.js

@@ -1,30 +1,37 @@
 class AsyncGenerator {
     constructor(f) {
         this.state = "suspended";
-        this.exec = f.bind(this, this.return, this.throw, (value, next) => {
-            this.exec = next;
+        this.exec = f.bind(this, this.return.bind(this), this.throw.bind(this), (value, next) => {
             delete this.promise;
-            this.resolve({ value, done: false });
+            this.exec = next;
+            this.resolve(value);
         })
     };
     throw(e) {
         delete this.exec;
         this.state = "closed";
-        return Promise.reject(e);
+        this.reject(e);
     }
-    return(value) {
+    return(v) {
         delete this.exec;
         this.state = "closed";
-        return Promise.resolve({ value: undefined, done: true });
+        this.value = v;
+        this.resolve(v);
     }
     next(a) {
+        delete this.value;
         if (this.exec) {
             var exec = this.exec;
             delete this.exec;
-            delete this.value;
-            this.promise = new Promise(ok => {
+            this.promise = new Promise((ok, oh) => {
                 this.resolve = ok;
+                this.reject = oh;
                 exec(a);
+            }).then((v) => {
+                return {
+                    value: v,
+                    done: !!this.exec
+                }
             });
             return this.promise;
         }
@@ -32,12 +39,11 @@ class AsyncGenerator {
             var next = () => this.next(a);
             return this.promise.then(next, next);
         }
-        return Promise.resolve({ value: undefined, done: true });
+        return Promise.resolve({ value: this.value, done: true });
+    }
+    [Symbol.asyncIterator]() {
+        return this;
     }
-
-}
-Generator.prototype[Symbol.asyncIterator] = function () {
-    return this;
 }
 function asyncAster_() {
     return new AsyncGenerator(exec_.bind(this, arguments));

package/coms/basic_/exec_.js

@@ -1,3 +1,4 @@
+var tick = Promise.resolve();
 var exec_ = function (args, ok, oh, int) {
     var p = null, index = 0, r, e, finished = false, t = this;
     var next = function (arg) {
@@ -46,12 +47,17 @@ var exec_ = function (args, ok, oh, int) {
     var run = function () {
         var args_length = args.length, i;
         if (!catch_ || index >= args_length) {
-            if (throwed) return oh();
+            if (throwed) {
+                return oh(e);
+            }
             if (finished) return ok(r);
         }
+        catch_ = null;
         while (index < args_length) {
             try {
-                [p, i] = args[index].call(t, p) || [1, 0];
+                var a = args[index].call(t, p) || [1, 0];
+                p = a[0];
+                i = a[1];
             } catch (e) {
                 p = null;
                 thro(e);
@@ -61,18 +67,28 @@ var exec_ = function (args, ok, oh, int) {
                 case 0: index += p; break; // reflow
                 case 1:
                     index++; // await p;
-                    if (p && isFunction(p.then)) return p.then(next, thro);
+                    if (p && isFunction(p.then)) {
+                        try {
+                            return p.then(next, thro);
+                        } catch (e) {
+                            return Promise.reject(e).then(next, thro);
+                        }
+                    }
                     else return next(p);
                 case 2: return finished = true, retn(p); // return p;
                 case 3: return index++, int(p, next); // yield p;
                 case 7: index++; catches.push([index, p]); break; // try catch finally?
                 case 8: index++; catches.push([index, p, 1]); break; // try finally
                 case 9: return p ? fine() : fina(); // finally
-                default: throw "代码异常！";
+                default: throw console.log(a), "代码异常！";
             }
         }
-        catch_ = null;
         retn();
     };
+    var ticked = false;
+    tick.then(() => {
+        if (ticked) return oh(e);
+        ticked = true;
+    })
     next();
 };

package/coms/compile/Javascript.js

@@ -39,6 +39,7 @@ class Javascript extends Program {
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
     forceend_reg = /^(return|yield|break|continue|debugger)$/;
     classstrap_reg = /^(class|function|async)$/;
+    defaultType = EXPRESS;
 }
 var propresolve_reg = /^(static|get|set|async)$/;
 
@@ -67,38 +68,70 @@ Javascript.prototype.isProperty = function (o) {
     }
     return false;
 };
-Javascript.prototype.fixType = function (o) {
+var setStrapExpress = function (mark_type, mark_text, prop, o, default_type) {
+    var temp = o.queue;
     var type = o.type;
-    var queue = o.queue;
-    var m = o.text;
-    var last = o.prev;
-    if (m === 'yield') {
-        var temp = queue;
-        var type = STRAP;
-        if (type === STRAP) while (temp) {
-            if (temp.entry != "{" || !temp.prev || temp.prev.type !== SCOPED || temp.prev.entry !== '(') {
-                temp = temp.queue;
-                continue;
-            }
-            var pp = temp.prev.prev;
-            var isprop = pp.isprop;
-            if (pp && pp.type === EXPRESS || pp.isprop) pp = pp.prev;
-            if (!pp || pp.type === STRAP && pp.text !== 'function') {
+    var prev = o.prev;
+    if (prev && prev.type === STRAP && /^(?:function|class|let|const|var)$/.test(prev.text)) {
+        o.type = EXPRESS;
+        return;
+    }
+    if (type === STRAP) while (temp) {
+        if (temp.entry === '(') var pp = temp.prev;
+        else if (temp.entry === "{") {
+            if (!temp.prev || temp.prev.type !== SCOPED || temp.prev.entry !== '(') {
                 temp = temp.queue;
                 continue;
             }
-            if (pp.type === STAMP && pp.text === "*" && (pp.isprop || pp.prev && pp.prev.type === STRAP && pp.prev.text === "function")) {
+            temp = temp.prev;
+            pp = temp.prev;
+        }
+        else {
+            temp = temp.queue;
+            continue;
+        }
+        if (pp && pp.isprop) {
+            pp = pp.prev;
+            if (pp && pp.type === mark_type && pp.text === mark_text) {
                 type = STRAP;
                 break;
             }
-            if (isprop || pp.type === STRAP && pp.text === "function") {
-                type = EXPRESS;
-                break;
+            if (pp && pp.type === STAMP && pp.text === '*') pp = pp.prev;
+            type = pp && pp.type === mark_type && pp.text === mark_text ? STRAP : EXPRESS;
+            break;
+        }
+        var tn = temp.next;
+        var isfunc = false;
+        if (tn && tn.type === STAMP && tn.text === '=>') isfunc = true;
+        if (!isfunc) {
+            if (pp && pp.type === EXPRESS) pp = pp.prev;
+            if (pp && pp.prev && pp.prev.type === STRAP && pp.prev.text === "function") {
+                pp = pp.prev;
+                isfunc = true;
+            }
+            else {
+                isfunc = pp && pp.type === STRAP && pp.text === 'function';
             }
-            temp = temp.queue;
         }
+        if (isfunc) {
+            var chk = pp[prop];
+            type = (chk && chk.type === mark_type && chk.text === mark_text) ? STRAP : EXPRESS;
+            break;
+        }
+        temp = temp.queue;
     }
-
+    if (!temp) type = default_type;
+    o.type = type;
+}
+var setYieldExpress = setStrapExpress.bind(null, STAMP, "*", 'next');
+var setAwaitExpress = setStrapExpress.bind(null, STRAP, "async", 'prev');
+Javascript.prototype.fixType = function (o) {
+    var m = o.text;
+    if (m === 'yield') setYieldExpress(o, this.defaultType);
+    else if (m === 'await') setAwaitExpress(o, this.defaultType);
+    var last = o.prev;
+    var type = o.type;
+    var queue = o.queue;
     switch (type) {
         case QUOTED:
             if (this.isProperty(o)) type = PROPERTY;
@@ -230,7 +263,7 @@ Javascript.prototype.setType = function (o) {
     }
     if (o.type === STAMP) {
         if (!last || last.type & (STAMP | STRAP)) {
-            o.unary = /^[^=;,\*]$|.[^\=]$/.test(o.text);
+            o.unary = /^[^=;,\*]$|.[^\=\>\<\|\&\^]$/.test(o.text);
         }
     }
 };
@@ -240,11 +273,12 @@ var insertBefore = function (o) {
     var os = [].slice.call(arguments, 1);
     queue.splice.apply(queue, [index, 0].concat(os));
     var prev = o && o.prev, next = o;
+    var desc = { value: queue, configurable: true, enumerable: false }
     for (var o of os) {
         if (prev) prev.next = o;
         else queue.first = o;
         o.prev = prev;
-        Object.defineProperty(o, 'queue', { value: queue });
+        Object.defineProperty(o, 'queue', desc);
         prev = o;
     }
     o.next = next;
@@ -257,11 +291,12 @@ var insertAfter = function (o) {
     var os = [].slice.call(arguments, 1);
     queue.splice.apply(queue, [index, 0].concat(os));
     var prev = o, next = o && o.next;
+    var desc = { value: queue, configurable: true, enumerable: false }
     for (var o of os) {
         if (prev) prev.next = o;
         else queue.first = o;
         o.prev = prev;
-        Object.defineProperty(o, 'queue', { value: queue });
+        Object.defineProperty(o, 'queue', desc);
         prev = o;
     }
     o.next = next;
@@ -464,10 +499,14 @@ Javascript.prototype.detour = function detour(o, ie) {
 };
 
 var removeImport = function (c, i, code) {
-    var { used, envs, vars } = code;
-    var [dec, map, o] = getDeclared(c.next);
-    if (dec.length !== 1 || !o) throw new Error("代码结构异常！");
-    if (o.type !== STRAP || o.text !== 'from') throw new Error("缺少from语句");
+    var next = c.next;
+    if (next && next.type !== QUOTED) {
+        var { used, envs, vars } = code;
+        var [dec, map, o] = getDeclared(c.next);
+        if (dec.length !== 1 || !o) throw new Error("代码结构异常！");
+        if (o.type !== STRAP || o.text !== 'from') throw new Error("缺少from语句");
+    }
+    else o = c;
     var n = o.next;
     if (!n || n.type !== QUOTED) throw new Error("缺少导入路径！");
     var oi = code.indexOf(o, i);
@@ -478,7 +517,8 @@ var removeImport = function (c, i, code) {
     used.require.push(q[0]);
     var cs = code.splice(oi + 1, nsi - oi - 1, ...q);
     q[1].push.apply(q[1], cs);
-    relink(q[1])
+    relink(q[1]);
+    if (!dec) return;
     var name = dec[0];
     var na = dec.attributes[0];
     o.type = STAMP;

package/coms/compile/Program.js

@@ -190,7 +190,7 @@ class Program {
         var program = this;
         var queue_push = function (scope) {
             var last = queue.last;
-            Object.defineProperty(scope, 'queue', { value: queue, enumerable: false });
+            Object.defineProperty(scope, 'queue', { value: queue, enumerable: false, configurable: true });
             scope.prev = last;
             if (scope.type !== COMMENT && scope.type !== SPACE) {
                 var keeplast = program.setType(scope) === false;
@@ -200,6 +200,7 @@ class Program {
                     while (queue[queue.length - 1] !== last) queue.pop();
                     last.end = scope.end;
                     last.text = text.slice(last.start, last.end);
+                    queue.last = last;
                     return;
                 }
                 if (queue.last !== last && queue.last !== o) {
@@ -227,7 +228,7 @@ class Program {
                     /[=>]$/.test(scope.text) && /[^>=]/.test(m) ||
                     /[?]$/.test(scope.text) && /[^?\.=\:]/.test(m) ||
                     /[,;]$/.test(scope.text) ||
-                    scope.end !== start) {
+                    /^[!~]$/.test(m) || scope.text !== m && /^[\+\-]$/.test(m)) {
                 } else {
                     scope.end = end;
                     scope.text = text.slice(scope.start, scope.end);
@@ -254,6 +255,7 @@ class Program {
                     else queue.question++;
                     break;
                 case "=":
+                    queue.inExpress = true;
                     if (last.type === SCOPED && last.entry === "{") {
                         if (!last.isObject) {
                             setObject(last);
@@ -293,7 +295,7 @@ class Program {
                         temp = temp.prev;
                     }
                     queue.inExpress = false;
-                    if (last.type === EXPRESS) {
+                    if (last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
                         // label
                         last.type = LABEL;
                         last.text += ":";
@@ -315,8 +317,8 @@ class Program {
                 text: m
             }
             if (type === STRAP) {
-                if (forceend_reg.test(m)) scope.isend = false;
-                if (this.transive_reg.test(m)) scope.transive = true;
+                if (forceend_reg.test(m)) scope.isend = false, queue.inExpress = false;
+                if (this.transive_reg.test(m)) scope.transive = true, queue.inExpress = true;
             }
             if (isdigit) scope.isdigit = true;
             lasttype = type;
@@ -430,6 +432,7 @@ class Program {
                             scope.entry = m;
                             scope.type = QUOTED;
                             scope.start = index;
+                            scope.isExpress = queue.inExpress;
                             push_parents(scope);
                             queue.inTag = 0;
                             start = index;
@@ -467,6 +470,7 @@ class Program {
                 var scope = [];
                 var quote = this.quote_map[m];
                 scope.type = this.comment_entry.test(m) ? COMMENT : QUOTED;
+                scope.isExpress = queue.inExpress;
                 scope.start = start;
                 push_parents(scope);
                 if (quote.tag) {
@@ -592,7 +596,10 @@ class Program {
                         if (last.text === ':') {
                             scope.isObject = queue.inExpress;
                         }
-                        else scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(last.text);
+                        else queue.inExpress = scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(last.text);
+                    }
+                    else if (last.type === EXPRESS && last.text === '...') {
+                        scope.isObject = true;
                     }
                     else if (last.type === STRAP) {
                         if (last.isend);