efront 4.0.28 → 4.0.29

package/coms/basic/#loader.js

@@ -163,7 +163,7 @@ var readFile = function (names, then) {
 
 };
 var createFunction = function (name, body, args, isAsync, isYield) {
-    return window.eval(`[${isAsync ? 'async ' : ''}function${isYield ? "*" : ""}/*${name}*/(${args || ''}){\r\n${body}\r\n}][0]`, name);
+    return window.eval(`[${isAsync ? 'async ' : ''}function${isYield ? "*" : ""}/*${name}*/(${args || ''}){${body}\r\n}][0]`, name);
 };
 
 var FILE_NAME_REG = /^https?\:|\.(html?|css|asp|jsp|php)$/i;

package/coms/compile/Javascript.js

@@ -613,7 +613,7 @@ var removeExport = function (c, i, code) {
         var nn = n.next;
         var d = nn.text;
         if (used[d]) used[d].forEach(a => {
-            if (!a.kind) a.text = `exports.${d}`;
+            if (!a.kind) a.text = `exports.` + a.text;
         });
         delete used[d];
         delete envs[d];

package/coms/compile/Program.js

@@ -535,7 +535,7 @@ class Program {
                 if (!this.classstrap_reg.test(m)) queue.inExpress = this.transive_reg.test(m);
                 else {
                     var last = queue.last;
-                    if (!last) queue.inExpress = false;
+                    if (!last);
                     else if (last.type === STAMP) {
                         queue.inExpress = !/^(;|\+\+|\-\-)$/.test(last.text);
                     }

package/coms/compile/common.js

@@ -344,11 +344,12 @@ var snapExpressHead = function (o) {
 var snapExpressFoot = function (o) {
     while (o && o.next) {
         var n = null;
+        var isExpress = o.isExpress;
         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;
+                while (n && (n.type !== SCOPED || n.entry !== '{')) n = n.next;
             }
             else if (n.text === 'class') {
                 var n = o;
@@ -357,12 +358,13 @@ var snapExpressFoot = function (o) {
             }
             else break;
             o = n;
+            n = o && o.next;
         }
         else if (o.type & (EXPRESS | QUOTED | VALUE | SCOPED)) {
             n = o.next;
         }
         if (!n) break;
-        if (n.type === SCOPED && (o.entry !== '{' || o.isObject)
+        if (n.type === SCOPED && (o.entry !== '{' || isExpress)
             || /\.$/.test(o.text) && !o.isdigit
             || n.type === EXPRESS && /^\??\.[^\.]/.test(n.text)
             || n.type === QUOTED && (n.length || /^\`/.test(n.text))

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.0.28",
+    "version": "4.0.29",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {