efront 4.1.6 → 4.1.8

package/coms/basic/#loader.js

@@ -279,6 +279,7 @@ var loadModule = function (url, then, prebuilds = {}) {
             var data = responseTree[url];
             if (typeof data === "function") {
                 var mod = data;
+                mod.noenv = true;
                 flushTree(loadedModules, key, mod);
                 return;
             }
@@ -494,7 +495,6 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
         if (created) return result;
         return promise;
     });
-
     var _this = isModuleInit ? exports : window;
     var argsPromises = argsList.filter(isThenable);
     argsList = argsList.concat(exec.strs);
@@ -609,7 +609,12 @@ var init = function (url, then, prebuilds) {
         if (error) return crack(error);
 
         var module = loadedModules[key];
-        if (!module) return;
+        if (!module || module.noenv) {
+            // <!--
+            undefinedModules[key] = true;
+            // -->
+            return then();
+        }
         var args = module.args || [];
 
         if (!args || !args.length) {

package/coms/compile/Javascript.js

@@ -853,7 +853,7 @@ Javascript.prototype.fix = function (code) {
         });
         delete code.used.import;
         delete code.envs.import;
-        if (imports.length) code.used.import_meta = imports;
+        if (imports.length) code.used["import_meta"] = imports, code.envs["import_meta"] = true;
     }
     if (code.exportDecs) {
         var exportDecs = code.exportDecs;

package/coms/compile/autoenum.js

@@ -91,9 +91,13 @@ var maplist = function (u) {
             }
             if (enumtype & (REFSTRC | REFMOVE)) {
                 if (o.property) o[ignore] = true;
-                else m.wcount++;
+                else if (o.equal) m.enumref = o.enumref, m.wcount++;
+                else if (enumtype & REFMOVE) m.wcount++;
             }
         }
+        else if (enumtype & REFSTRC) {
+            if (o.enumref && o.enumref !== m.enumref) m.wcount++, m.enumref = o.enumref;
+        }
         if (o.called) m.ccount++;
     }
     return map;
@@ -220,6 +224,12 @@ function enumref(refitem, scoped) {
                     }
                 }
             }
+            else if (o.enumref) {
+                if (enumtype & REFSTRC) {
+                    em = o.enumref;
+                    continue;
+                }
+            }
             else {
                 if (enumtype & REFTYPE) {
                     if (tp) {

package/coms/compile/common.js

@@ -277,6 +277,11 @@ function snapSentenceHead(o) {
         }
         break;
     }
+    while (o) {
+        var p = o.prev;
+        if (!p || p.type !== LABEL) break;
+        o = p;
+    }
     return o;
 }
 var getStrapHead = function (o) {

package/package.json

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