efront 3.8.4 → 3.8.5

package/coms/basic/loader.js

@@ -154,8 +154,8 @@ var readFile = function (names, then) {
     tryload();
 
 };
-var createFunction = function (name, body, args) {
-    return window.eval(`[function/*${name}*/(${args || ''}){\r\n${body}\r\n}][0]`);
+var createFunction = function (name, body, args, isAsync, isYield) {
+    return window.eval(`[${isAsync ? 'async ' : ''}function${isYield ? "*" : ""}/*${name}*/(${args || ''}){\r\n${body}\r\n}][0]`);
 };
 
 var FILE_NAME_REG = /^https?\:|\.(html?|css|asp|jsp|php)$/i;
@@ -269,13 +269,13 @@ var loadModule = function (name, then, prebuilds = {}) {
                 flushTree(loadedModules, key);
                 return;
             }
-            var [argNames, body, args, required, strs] = getArgs(data);
+            var [argNames, body, args, required, strs, isAsync, isYield] = getArgs(data);
             if (isProduction) {
                 strs = strs.map ? strs.map(toRem) : strs;
             } else {
                 body = toRem(body);
             }
-            var mod = createFunction(name, body, argNames);
+            var mod = createFunction(name, body, argNames, isAsync, isYield);
             if (!mod) console.log(name, mod);
             mod.args = args;
             mod.argNames = argNames;
@@ -399,8 +399,10 @@ var getArgs = function (text) {
     } else {
         functionBody = text;
     }
+    var [, isAsync, isYield] = /^(@?)(\*?)/.exec(functionBody);
+    if (isAsync || isYield) functionBody = functionBody.slice(+!!isAsync + +!!isYield);
     functionBody = functionBody.replace(/^(?:\s*(["'])user? strict\1;?[\r\n]*)*/i, "\"use strict\";\r\n");
-    return [argNames || [], functionBody, args || [], required || '', strs || []];
+    return [argNames || [], functionBody, args || [], required || '', strs || [], !!isAsync, !!isYield];
 };
 var get_relatives = function (name, required, prefix = "") {
     var required_base = name.replace(/[^\/\$]+$/, "");

package/coms/compile/common.js

@@ -112,7 +112,8 @@ var skipAssignment = function (o) {
 };
 var createScoped = function (parsed) {
     var used = Object.create(null); var vars = Object.create(null), lets = vars;
-    var scoped = [];
+    var scoped = [], funcbody = scoped;
+    scoped.isfunc = true;
     var run = function (o, id) {
         loop: while (o) {
             var isCatch = false;
@@ -120,6 +121,7 @@ var createScoped = function (parsed) {
             var isScope = false;
             var isArrow = false;
             var isDeclare = false;
+            var isYield = false;
             switch (o.type) {
                 case QUOTED:
                     if (o.length) {
@@ -145,6 +147,7 @@ var createScoped = function (parsed) {
                     if (/^\.\.\./.test(u)) u = u.slice(3);
                     var u = u.replace(/^([^\.\[]*)[\s\S]*$/, '$1');
                     if (!u) break;
+                    if (u === 'yield') funcbody.yield = false;
                     if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                         isScope = true;
                         isArrow = true;
@@ -164,6 +167,24 @@ var createScoped = function (parsed) {
                 case STRAP:
                     var s = o.text;
                     switch (s) {
+                        case "await":
+                            funcbody.async = funcbody.await = true;
+                            break;
+                        case "yield":
+                            if (!funcbody.yield) {
+                                var next = o.next;
+                                if (next) {
+
+                                    if (next.type === STAMP && !/[~!,;:]+$/.test(next.text)
+                                        || next.type === STRAP && /in|of|as|from|instanceof/.test(next.text)
+                                        || next.type === EXPRESS && /^\./.test(next.text)
+                                    ) {
+                                        funcbody.yield = false;
+                                    }
+                                }
+                                saveTo(used, 'yield', o);
+                            }
+                            break;
                         case "as":
                         case "from":
                             break;
@@ -186,7 +207,10 @@ var createScoped = function (parsed) {
                             continue loop;
                         case "function":
                             isFunction = true;
-                            if (o.next.type === STAMP) o = o.next;
+                            if (o.next.type === STAMP) {
+                                isYield = true;
+                                o = o.next;
+                            }
                         case "catch":
                             isCatch = true;
                         case "class":
@@ -209,11 +233,18 @@ var createScoped = function (parsed) {
                     break;
                 case SCOPED:
                     if (o.entry === "(") {
-                        if (o.next && o.next.type === STAMP && o.next.text === "=>"
-                            || o.prev && (o.prev.type === PROPERTY || o.prev.isprop)) {
+                        if (o.next && o.next.type === STAMP && o.next.text === "=>") {
                             isArrow = true;
                             isScope = true;
                         }
+                        else if (o.prev && (o.prev.type === PROPERTY || o.prev.isprop)) {
+                            isFunction = true;
+                            isScope = true;
+                            var pp = o.prev.prev;
+                            if (pp && pp.type === STAMP && pp.isprop) {
+                                isYield = true;
+                            }
+                        }
                         else {
                             run(o.first);
                         }
@@ -241,8 +272,13 @@ var createScoped = function (parsed) {
                     scoped.used = used;
                     scoped.vars = vars;
                     lets = vars;
-                    if (isFunction) vars.this = true, vars.arguments = true;
+                    if (isFunction) {
+                        vars.this = true, vars.arguments = true;
+                        scoped.yield = isYield;
+                    }
+                    scoped.isfunc = true;
                     isFunction = true;
+                    funcbody = scoped;
                 } else {
                     vars = _vars;
                     scoped.lets = lets;
@@ -335,6 +371,10 @@ var createScoped = function (parsed) {
                     delete vars.this;
                     delete vars.arguments;
                 }
+                if (_scoped.isfunc && !funcbody.yield) {
+                    if (used.yield) _scoped.yield = false;
+                    funcbody = _scoped;
+                }
                 used = _used;
                 lets = _lets;
                 vars = _vars;
@@ -354,6 +394,12 @@ var createScoped = function (parsed) {
             if (!/^(true|false|null|this|arguments)$/.test(u)) envs[u] = true;
         }
     }
+    if (vars.yield) scoped.yield = false;
+    if (scoped.yield !== false && envs.yield) {
+        scoped.yield = true;
+        delete envs.yield;
+        delete used.yield;
+    }
     scoped.envs = envs;
     return scoped;
 };

package/coms/compile/downLevel.js

@@ -0,0 +1,11 @@
+var typescript = require("../typescript");
+module.exports = function (data, isAsync, isYield) {
+    if (isYield || isAsync) {
+        data = `${isAsync ? "async " : ""}function${isYield ? "*" : ""}(){${data}}`;
+    }
+    data = typescript.transpile(data, { noEmitHelpers: true });
+    if (isYield || isAsync) {
+        data = data.replace(/^\s*function\s*\(\s*\)\s*\{\s*([\s\S]*?)\s*\}\s*$/, "$1");
+    }
+    return data;
+}

package/coms/compile/scanner2.js

@@ -365,6 +365,15 @@ class Program extends Array {
     get used() {
         return this.scoped.used;
     }
+    get yield() {
+        return this.scoped.yield;
+    }
+    get async() {
+        return this.scoped.async;
+    }
+    get await() {
+        return this.scoped.await;
+    }
     get scoped() {
         if (this._scoped) return this._scoped;
         return this._scoped = createScoped(this);
@@ -804,7 +813,14 @@ class Javascript {
                 if (m === 'yield') {
                     var temp = queue;
                     var type = STRAP;
-                    while (temp) {
+                    var last = queue.lastUncomment;
+                    if (queue.entry === '[' || queue.isClass || queue.isObject || last && (last.type === STAMP && (
+                        queue[queue.length - 1].type !== SPACE && /^(\+\+|\-\-)$/.test(last.text)
+                        || !/^(>>>?=|<<=|[^><!=]=|[,;])/.test(last.text)
+                    ) || last.type === STRAP)) {
+                        type = EXPRESS;
+                    }
+                    if (type === STRAP) while (temp) {
                         if (temp.entry != "{" || !temp.prev || temp.prev.type !== SCOPED || temp.prev.entry !== '(') {
                             temp = temp.queue;
                             continue;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.8.4",
+    "version": "3.8.5",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {