efront 4.0.25 → 4.0.29

package/coms/basic/#loader.js

@@ -9,7 +9,6 @@ var {
     Error,
     Function,
     Array,
-    localStorage,
     Promise,
     setTimeout,
     clearTimeout,
@@ -164,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;
@@ -248,7 +247,7 @@ var hasOwnProperty = {}.hasOwnProperty;
 var loadModule = function (url, then, prebuilds = {}) {
     var name = url.replace(/[\*~][\s\S]*$/, '');
     if (/^(?:module|exports|define|require|window|global|undefined)$/.test(name)) return then();
-    if ((hasOwnProperty.call(prebuilds, url)) || hasOwnProperty.call(modules, url) || (!/^on/.test(name) && window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name))
+    if ((hasOwnProperty.call(prebuilds, url)) || hasOwnProperty.call(modules, url) || (!hasOwnProperty.call(forceRequest, name) && !/^on/.test(name) && window[name] !== null && window[name] !== void 0)
     ) return then();
     preLoad(url);
     var key = keyprefix + url;
@@ -512,10 +511,17 @@ var init = function (url, then, prebuilds) {
         return modules[url];
     }
     var name = url.replace(/[\*~][\s\S]*$/, '');
-    if (!/^on/.test(name) && window[name] !== null && window[name] !== void 0 && !hasOwnProperty.call(forceRequest, name)) {
-        modules[name] = window[name]
-        if (then) then(modules[name]);
-        return modules[name];
+    if (!hasOwnProperty.call(forceRequest, name) && name in window && !/^on/.test(name)) {
+        try {
+            var value = window[name];
+            if (value !== null && value !== void 0) {
+                modules[name] = value;
+                if (then) then(value);
+                return value;
+            }
+        } catch {
+            window.alert(name);
+        }
     }
     var oks = [];
     if (then) oks.push(then);
@@ -764,52 +770,6 @@ var initPixelDecoder = function () {
     modules.pt2offset = modules.freeOffset;
 
 };
-var flush_to_storage_timer = 0,
-    responseTree_storageKey = "zimoliAutoSavedResponseTree" + location.pathname;
-var saveResponseTreeToStorage = preventCodeStorage ? function () { } : function () {
-    var responseTextArray = [];
-    for (var k in versionTree) {
-        if (hasOwnProperty.call(responseTree, k)) responseTextArray.push(
-            k + "：" + versionTree[k] + "：" + responseTree[k]
-        );
-    }
-    var data = responseTextArray.join("，");
-    localStorage && localStorage.setItem(responseTree_storageKey, data);
-};
-var loadResponseTreeFromStorage = preventCodeStorage ? function () { } : function () {
-    "use ./crc.js";
-    var load = function (name) {
-        var data = localStorage.getItem(responseTree_storageKey);
-        if (!data) return;
-        var responseTextArray = data.split("，");
-        for (var cx = 0, dx = responseTextArray.length; cx < dx; cx++) {
-            var kv = responseTextArray[cx].split("：");
-            var [responseName, version, responseText] = kv;
-            preLoadVersionTree[responseName] = version;
-            preLoadResponseTree[responseName] = responseText;
-        }
-    };
-    var preLoadResponseTree = {};
-    var preLoadVersionTree = {};
-    if (localStorage) load();
-    else init("localStorage", function (_localStorage) {
-        localStorage = _localStorage;
-        load();
-    });
-    preLoad = function (responseName) {
-        if (hasOwnProperty.call(responseTree, responseName)) return;
-        var version = preLoadVersionTree[responseName];
-        if (!version) return;
-        var responseText = preLoadResponseTree[responseName];
-        var sum = [];
-        for (var i in responseText) sum[i] = responseText.charCodeAt(i);
-        var sum = crc(sum).toString(36);
-        if (sum + version.slice(sum.length) === versionTree[responseName])
-            responseTree[responseName] = responseText;
-        // else window.console.log(responseName, sum, version, versionTree[responseName]);
-    };
-};
-var preLoad = function () { };
 var start_time = efront_time / 1000 | 0;
 var errored = {};
 // modules 的代码不可出现多层
@@ -871,8 +831,52 @@ var initIfNotDefined = function (defined, path, onload) {
     if (defined === void 0) init(path, a => onload(a) | hook(--requires_count));
     else hook(--requires_count);
 };
+try { var localStorage = window.localStorage; } catch { forceRequest.localStorage = forceRequest.sessionStorage = true }
+var flush_to_storage_timer = 0,
+    responseTree_storageKey = "zimoliAutoSavedResponseTree" + location.pathname;
+var loadResponseTreeFromStorage = preventCodeStorage ? function () { } : function () {
+    "use ./crc.js";
+    var load = function (name) {
+        var data = localStorage.getItem(responseTree_storageKey);
+        if (!data) return;
+        var responseTextArray = data.split("，");
+        for (var cx = 0, dx = responseTextArray.length; cx < dx; cx++) {
+            var kv = responseTextArray[cx].split("：");
+            var [responseName, version, responseText] = kv;
+            preLoadVersionTree[responseName] = version;
+            preLoadResponseTree[responseName] = responseText;
+        }
+    };
+    var preLoadResponseTree = {};
+    var preLoadVersionTree = {};
+    load();
+    preLoad = function (responseName) {
+        if (hasOwnProperty.call(responseTree, responseName)) return;
+        var version = preLoadVersionTree[responseName];
+        if (!version) return;
+        var responseText = preLoadResponseTree[responseName];
+        var sum = [];
+        for (var i in responseText) sum[i] = responseText.charCodeAt(i);
+        var sum = crc(sum).toString(36);
+        if (sum + version.slice(sum.length) === versionTree[responseName])
+            responseTree[responseName] = responseText;
+        // else window.console.log(responseName, sum, version, versionTree[responseName]);
+    };
+};
+var preLoad = function () { };
 
 if (localStorage) loadResponseTreeFromStorage();
+var saveResponseTreeToStorage = preventCodeStorage || !localStorage ? function () { } : function () {
+    var responseTextArray = [];
+    for (var k in versionTree) {
+        if (hasOwnProperty.call(responseTree, k)) responseTextArray.push(
+            k + "：" + versionTree[k] + "：" + responseTree[k]
+        );
+    }
+    var data = responseTextArray.join("，");
+    localStorage.setItem(responseTree_storageKey, data);
+};
+
 initIfNotDefined([].map, "[]map", map => map);
 "use ../basic_/#checkPromise.js";
 initIfNotDefined(Promise, "Promise", promise => Promise = promise);

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))
@@ -1028,7 +1030,7 @@ var createString = function (parsed) {
                         tmp = tmp.replace(/^\/[\/\*]\s*\<\!--\s*/, '');
                         cacheresult = [];
                         result = cacheresult;
-                        result.push("/* <!-- 开发辅助代码: */");
+                        result.push("/* [[ 开发辅助代码: */");
                     }
                     if (/--\!?\>\s*(?:\*\/)?$/.test(tmp) && result !== finalresult) {
                         if (!opentmp) tmp = tmp.replace(/^\/[\/\*]\s*/, '');
@@ -1036,7 +1038,7 @@ var createString = function (parsed) {
                         if (tmp) {
                             result.push(tmp);
                         }
-                        result.push("/* --> */");
+                        result.push("/* ]] */");
                         opentmp = true;
                         if (helpcode && cacheresult) finalresult = finalresult.concat(cacheresult), cacheresult = [];
                         result = finalresult;

package/coms/compile/downLevel.js

@@ -571,6 +571,7 @@ var killcls = function (body, i, getname_) {
     var extends_ = [];
     var o = body[i];
     var ishalf = isHalfSentence(body, i - 1);
+    var hasnew = o.prev && o.prev.type === STRAP && o.prev.text === 'new';
     var start = o;
     var decName = !o.isExpress && o.next.type === EXPRESS && o.next.text;
     var isExpress = o.isExpress;
@@ -592,7 +593,7 @@ var killcls = function (body, i, getname_) {
         }
         if (o.type !== STRAP || o.text !== 'class') break;
     }
-    var func = scanner2("function(){}()");
+    var func = scanner2("(function(){}())")[0];
     var [, head, defines, invokes] = func;
     var foot = [];
     var base = '';
@@ -699,7 +700,8 @@ var killcls = function (body, i, getname_) {
     if (head.length > 1 || start.isExpress && (defines.length) || ishalf && defines.length) {
         splice(defines, defines.length, 0, ...scanner2(`\r\nreturn ${clz.name}`))
         if (decName) splice(func, 0, 0, ...scanner2(`var ${decName}=`));
-        splice(body, s, i - s, ...func);
+        if (hasnew) splice(body, s, i - s, func);
+        else splice(body, s, i - s, ...func);
     }
     else {
         if (defines.length) {

package/coms/zimoli/localStorage.js

@@ -21,13 +21,49 @@ if (globalStorage) {
     };
     documentElement.addBehavior('#default#userdata');
 } else {
-    localStorage = window.localStorage || {
-        setItem() {
-        },
-        getItem() {
-            return null;
-        },
-        removeItem() {
+    try {
+
+        localStorage = window.localStorage
+    }
+    catch { }
+    var _localStorageKeys = [];
+    var _values = Object.create(null);
+
+    if (!localStorage) localStorage = new class Storage {
+        setItem(key, value) {
+            value = String(value);
+            key = String(key);
+            if (!(key in _values)) {
+                if (!(key in this)) Object.defineProperty(this, key, {
+                    get() {
+                        return _values[key];
+                    }, configurable: true
+                });
+                _localStorageKeys.push(key);
+            }
+            _values[key] = value;
+        }
+        getItem(key) {
+            return key in _values ? _values[key] : null;
+        }
+        clear() {
+            _localStorageKeys.forEach(k => {
+                delete this[k];
+                delete _values[k];
+            });
+            _localStorageKeys.splice(0, _localStorageKeys.length);
+        }
+        key(i) {
+            return _localStorageKeys[i] || null;
+        }
+        get length() {
+            return _localStorageKeys.length;
+        }
+        removeItem(key) {
+            if (delete _values[key]) {
+                delete this[key];
+                removeFromList(_localStorageKeys, key);
+            }
         }
     };
 }

package/coms/zimoli/sessionStorage.js

@@ -2,7 +2,7 @@
  * ie5-7专享，不兼容多选项卡的浏览器
  */
 var session_storage_prefix = "_zimoli_session_prefix";
-var _sessionStorage = {};
+var _sessionStorage = Object.create(null);
 var clear = function () {
     for (var cx = 0, dx = localStorage.length; cx < dx; cx++) {
         var key = localStorage.key(cx);
@@ -21,28 +21,41 @@ var read = function () {
 var save = function () {
     clear();
     for (var k in _sessionStorage) {
-        if (_sessionStorage.hasOwnProperty(k)) {
-            var key = session_storage_prefix + k;
-            localStorage.setItem(key, _sessionStorage[key]);
-        }
+        var key = session_storage_prefix + k;
+        localStorage.setItem(key, _sessionStorage[key]);
     }
 };
-var sessionStorage = window.sessionStorage || {
-    length: 0,
-    removeItem: function (key) {
-        if (_sessionStorage.hasOwnProperty(key))
-            sessionStorage.length--;
+try { var sessionStorage = window.sessionStorage } catch { }
+var _sessionStorageKeys = [];
+if (!sessionStorage) sessionStorage = new class Storage {
+    get length() {
+        return _sessionStorageKeys.length;
+    };
+    removeItem(key) {
+        if (key in _sessionStorage) removeFromList(_sessionStorageKeys, key);
+        delete this[key];
         delete _sessionStorage[key];
-    },
-    setItem: function (key, data) {
-        if (!_sessionStorage.hasOwnProperty(key))
-            sessionStorage.length++;
-        _sessionStorage[key] = Object.prototype.toString.call(data);
-    },
-    getItem: function (key) {
-        return _sessionStorage[key];
-    },
-    clear: function () {
+    }
+    setItem(key, data) {
+        key = String(key);
+        data = String(data);
+        if (!(key in _sessionStorage)) {
+            _sessionStorageKeys.push(key);
+            Object.defineProperty(this, key, {
+                get() {
+                    return _sessionStorage[key];
+                }
+            })
+        }
+        _sessionStorage[key] = data;
+    }
+    getItem(key) {
+        return key in _sessionStorage ? _sessionStorage[key] : null;
+    }
+    key(i) {
+        return _sessionStorageKeys[i];
+    }
+    clear() {
         _sessionStorage = {};
     }
 };
@@ -51,5 +64,4 @@ if (!document.cookie) {
 } else {
     read();
 }
-
-window.onbeforeunload = save;
+on("beforeunload")(window, save);

package/package.json

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