efront 3.37.0 → 3.38.2

package/coms/basic/#loader.js

@@ -24,6 +24,7 @@ var {
     parseFloat,
     encodeURI,
     preventFrame,
+    preventCodeStorage = true,
     PREVENT_FRAMEWORK_MODE = preventFrame,
     devicePixelRatio = 1,
     startPath: efrontPath,
@@ -764,7 +765,7 @@ var initPixelDecoder = function () {
 };
 var flush_to_storage_timer = 0,
     responseTree_storageKey = "zimoliAutoSavedResponseTree" + location.pathname;
-var saveResponseTreeToStorage = function () {
+var saveResponseTreeToStorage = preventCodeStorage ? function () { } : function () {
     var responseTextArray = [];
     for (var k in versionTree) {
         if (hasOwnProperty.call(responseTree, k)) responseTextArray.push(
@@ -774,7 +775,7 @@ var saveResponseTreeToStorage = function () {
     var data = responseTextArray.join("，");
     localStorage && localStorage.setItem(responseTree_storageKey, data);
 };
-var loadResponseTreeFromStorage = function () {
+var loadResponseTreeFromStorage = preventCodeStorage ? function () { } : function () {
     "use ./crc.js";
     var load = function (name) {
         var data = localStorage.getItem(responseTree_storageKey);

package/coms/basic/assert.js

@@ -1,9 +1,20 @@
 var mark = require("./mark");
 var dump = function (a, msg) {
     if (a instanceof Object) console.error('对象的属性不符合'), console.log(msg ? msg + " " : "  ", a);
-    else if (msg) console.error(msg + ":", a);
-    else console.error(a);
+    else if (msg) console.log(msg + ":", a);
+    else console.log(a);
 };
+var colorString = function (s, color) {
+    s = String(s);
+    var [c0, c1] = color;
+    if (s.indexOf(c1) === 0) s = s.slice(c1.length);
+    else s = c0 + s;
+    if (s.lastIndexOf(c0) === s.length - c0.length) {
+        s = s.slice(0, s.length - c0.length);
+    }
+    else s += c1;
+    return s;
+}
 var assert = function (result, expect, log = dump) {
     var errors = {}, hasCollect;
     var collect = function (k, args) {
@@ -12,14 +23,15 @@ var assert = function (result, expect, log = dump) {
             errors = `结果 (${args}) 应为 ${JSON.stringify(k)}`;
         }
         if (k === undefined) return function () {
-            var color1 = "bgred";
-            var color2 = "bgblue";
-            mark.setTag1(`</${color1}>`, `<${color1}>`);
-            mark.setTag2(`</${color2}>`, `<${color2}>`);
+            var color1 = console.format("<bgred>; </bgred>").split(";");
+            var color2 = console.format("<bgblue>; </bgblue>").split(";");
+            var color3 = console.format("<cyan>;</cyan>").split(";");
+            mark.setTag1(color1[1], color1[0]);
+            mark.setTag2(color2[1], color2[0]);
             var [r, e] = mark.pair(result, expect);
-            r = String(r).trim().replace(/><\//g, "> </");
-            e = String(e).trim().replace(/><\//g, "> </");
-            errors = `<cyan>结果  </cyan><${color1}>${r}</${color1}>\r\n      <cyan>应为  </cyan><${color2}>${e}</${color2}>\r\n`;
+            r = colorString(r, color1);
+            e = colorString(e, color2);
+            errors = `${color3[0]}结果  ${color3[1]}${r}\r\n      ${color3[0]}应为  ${color3[1]}${e}\r\n`;
         };
         return function (error) {
             if (error instanceof Object) {

package/coms/basic_/Array2.js

@@ -8,7 +8,8 @@ a: if (!setPrototypeOf) {
         if (!getOwnPropertyNames) throw '不支持';
         defineProperty({}, 'o', { value: 0 });
         setPrototypeOf = function (obj, proto) {
-            for (var n of getOwnPropertyNames(proto)) {
+            var names = getOwnPropertyNames(proto)
+            for (var n of names) {
                 var d = getOwnPropertyDescriptor(proto, n);
                 defineProperty(obj, n, d);
             }

package/coms/basic_/JSON.js

@@ -193,17 +193,17 @@ var getString = function (object, filter, space) {
         }
         var str = "";
         if (cx === 0) {
-            str += (ks ? "{" : "[");
+            str += ks ? "{" : "[";
         }
         var dx = (ks ? ks : object).length;
         while (cx < dx) {
             key = ks ? ks[cx] : cx;
             var backlength = str.length;
-            if (cx > 0) str += (',');
-            if (space) str += ('\n' + new Array(objects.length + 1).join(space));
+            if (cx > 0) str += ',';
+            if (space) str += '\n' + new Array(objects.length + 1).join(space);
             if (ks) {
-                str += (toString(key) + ":");
-                if (space) str += (" ");
+                str += toString(key) + ":";
+                if (space) str += " ";
             };
             var v = get(object[key]);
             if (isObject(v)) {
@@ -213,7 +213,7 @@ var getString = function (object, filter, space) {
                 keys.push([0]);
                 break;
             } else if (v) {
-                str += (v);
+                str += v;
             } else {
                 str = str.slice(0, backlength);
             }
@@ -221,9 +221,9 @@ var getString = function (object, filter, space) {
         }
         if (cx === dx) {
             if (dx > 0) {
-                if (space) str += ('\n' + new Array(objects.length).join(space))
+                if (space) str += '\n' + new Array(objects.length).join(space)
             }
-            str += (ks ? '}' : ']');
+            str += ks ? '}' : ']';
             pop();
         }
         result.push(str);

package/coms/basic_/JSON_test.js

@@ -64,7 +64,7 @@ var test = function (JSON) {
             var start = new Date();
             try {
                 var res = call(arg, null, space);
-            } catch{
+            } catch {
                 res = "error";
             }
             var delta = new Date - start;
@@ -79,10 +79,88 @@ var test = function (JSON) {
     });
 
 };
+var test2 = function (JSON) {
+    var data = [{
+        "name": i18n(`\u4ee3\u7406\u8def\u5f84`, `Proxy Path`),
+        "type": "input",
+        "key": "url",
+        "comment": "",
+        "size": "120",
+        "unit": "bit",
+        "ratio": 0.125,
+        "required": true
+    }, {
+        "name": i18n(`\u4e8c\u7ef4\u7801`, `QR code`),
+        "type": "1byte",
+        "key": "url",
+        "comment": "",
+        "size": "1",
+        "unit": "byte",
+        "ratio": 1,
+        "readonly": true
+    }, {
+        "name": i18n(`\u771f\u5b9e\u8def\u5f84`, `Real path`),
+        "type": "url",
+        "key": "realpath",
+        "comment": "",
+        "size": "300",
+        "unit": "bit",
+        "ratio": 0.125
+    }, {
+        "name": i18n(`\u52a8\u4f5c`, `action`),
+        "type": "select",
+        "key": "action",
+        "comment": "",
+        "options": [{
+            "name": "跳转",
+            "value": 0
+        }, {
+            "name": "转发",
+            "value": 1
+        }],
+        "size": "100",
+        "unit": "bit",
+        "ratio": 0.125
+    }, {
+        "name": i18n(`\u72b6\u6001`, `state`),
+        "type": "select",
+        "key": "status",
+        "comment": "",
+        "options": [{
+            "name": "启用",
+            "value": 0
+        }, {
+            "name": "禁用",
+            "value": 1
+        }],
+        "size": "100",
+        "unit": "bit",
+        "ratio": 0.125
+    }, {
+        "name": i18n(``, ``),
+        "type": "byte",
+        "key": "",
+        "comment": "",
+        "options": {
+            name: "访问",
+            do(o) {
+                var url = o.url;
+                if (!/^\//.test(url))
+                    url = "/" + url;
+                window.open(url, null);
+            }
+        },
+        "size": 1,
+        "unit": "byte",
+        "ratio": 1,
+        "readonly": true
+    }];
+    assert(JSON.stringify(data, null, 4), JSON0.stringify(data, null, 4))
+}
 function JSON_test() {
     window.JSON0 = JSON0;
     window.JSON = void 0;
     delete modules.JSON;
-    modules.init("JSON", test);
+    modules.init("JSON", test2);
     window.JSON = JSON0;
 }

package/coms/basic_/Symbol.js

@@ -19,7 +19,7 @@ var Symbol = this.Symbol || function () {
     Symbol.prototype = prototype;
     Symbol.iterator = Symbol('iterator');
     Symbol.asyncIterator = Symbol('asyncIterator');
-    Array.prototype[Symbol.iterator] = function () {
+    var iterator = function () {
         var arr = this, cx = 0, dx = arr.length;
         return {
             next() {
@@ -28,5 +28,8 @@ var Symbol = this.Symbol || function () {
             }
         }
     };
+    try {
+        Object.defineProperty(Array.prototype, Symbol.iterator, { value: iterator, enumerable: false })
+    } catch { }
     return Symbol;
 }();

package/coms/basic_/exec_.js

@@ -1,16 +1,24 @@
-var exec = function (args, ok, oh, int) {
+var exec_ = function (args, ok, oh, int) {
     var p = null, index = 0, r, finished = false, t = this;
     var next = function (arg) {
         p = arg;
         run();
     };
-    var catches = [];
+    var catches = [], catch_;
     var thro = function (err) {
-        if (catches.length) {
-            [index, p] = catches[catches.length - 1]
-            index += p >>> 16;
-            p = err;
-            next();
+        if (catch_) {
+            fina();
+        }
+        else if (catches.length) {
+            catch_ = catches.pop();
+            [index, p] = catch_;
+            index += p & 0xffff;
+            if (p >>> 16) {
+                next(err);
+            }
+            else {
+                fina();
+            }
         }
         else {
             oh(err);
@@ -24,17 +32,19 @@ var exec = function (args, ok, oh, int) {
     };
     var fina = function () {
         // 仅在try或catch未结束时使用
-        [index, p] = catches[catches.length - 1];
+        if (!catch_) catch_ = catches.pop();
+        [index, p] = catch_;
+        catch_ = null;
         index += (p >>> 16) + (p & 0xffff);
         next();
     };
     var fine = function () {
-        catches.pop();
+        index++;
         next();
     }
     var run = function () {
         var args_length = args.length, i;
-        if (finished && !catches.length || index > args_length) return ok(r);
+        if (finished && !catch_ || index >= args_length) return ok(r);
         while (index < args_length) {
             try {
                 [p, i] = args[index].call(t, p) || [1, 0];
@@ -56,6 +66,7 @@ var exec = function (args, ok, oh, int) {
                 default: throw "代码异常！";
             }
         }
+        catch_ = null;
         retn();
     };
     next();

package/coms/basic_/extends_.js

@@ -10,4 +10,5 @@ var setConstructor = Object.defineProperty ? function (a, c) {
 function extends_(A, B) {
     __static(A, B);
     A.prototype = B === null ? Object.create(null) : new (_ = function () { setConstructor(this, A) }, _.prototype = B.prototype, _);
+    var _;
 }

package/coms/compile/Javascript.js

@@ -19,21 +19,22 @@ const {
     getDeclared,
     createScoped,
     snapExpressHead,
+    splice,
     relink,
     replace,
     skipAssignment,
 } = require("./common");
 var straps = `if,in,do,as,of
 var,for,new,try,let,get,set
-else,case,void,with,enum,from,eval
-async,while,break,catch,throw,const,yield,class,await,super
+else,case,void,with,enum,from
+async,while,break,catch,throw,const,yield,class,await
 return,typeof,delete,switch,export,import,static
 default,finally,extends
 function,continue,debugger
 instanceof`.trim().split(/[,\s]+/);
 class Javascript extends Program {
     straps = straps;
-    value_reg = /^(false|true|null|Infinity|NaN|undefined)$/
+    value_reg = /^(false|true|null|Infinity|NaN|undefined|eval)$/
     transive_reg = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|export|default|instanceof|throw|extends|import|from)$/
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
     forceend_reg = /^(return|yield|break|continue|debugger)$/;
@@ -232,6 +233,23 @@ Javascript.prototype.setType = function (o) {
         }
     }
 };
+var insertBefore = function (o) {
+    var queue = this || o.queue;
+    var index = queue.indexOf(o);
+    var os = [].slice.call(arguments, 1);
+    queue.splice.apply(queue, [index, 0].concat(os));
+    var prev = o && o.prev, next = o;
+    for (var o of os) {
+        if (prev) prev.next = o;
+        else queue.first = o;
+        o.prev = prev;
+        Object.defineProperty(o, 'queue', { value: queue });
+        prev = o;
+    }
+    o.next = next;
+    if (next) next.prev = o;
+    else queue.last = o;
+}
 var insertAfter = function (o) {
     var queue = this || o.queue;
     var index = queue.indexOf(o) + 1;
@@ -240,12 +258,14 @@ var insertAfter = function (o) {
     var prev = o, next = o && o.next;
     for (var o of os) {
         if (prev) prev.next = o;
+        else queue.first = o;
         o.prev = prev;
         Object.defineProperty(o, 'queue', { value: queue });
         prev = o;
     }
     o.next = next;
     if (next) next.prev = o;
+    else queue.last = o;
 };
 var js = new Javascript;
 var scan = function (data) {
@@ -277,8 +297,8 @@ var collectProperty = function (o, text) {
         var start = p ? q.indexOf(p) + 1 : 0;
         var n = t.next;
         while (n && (n.type !== STAMP || n.text !== ',')) n = n.next;
-        var end = n ? q.indexOf(n) + 1 : q.length;
-        var s = q.splice(start, end - start);
+        var end = n ? q.indexOf(n, start) + 1 : q.length;
+        var s = splice(q, start, end - start);
         if (s.length) console.info(`属性<green>${text}</green>被后文覆盖，已移除<yellow>${createString(s)}</yellow>\r\n`);
         if (p && n) {
             var pp = p.prev;
@@ -295,7 +315,7 @@ var hasComma = function (c) {
     }
     return false;
 }
-var removeQoute = function (o, c, i) {
+var removeQuote = function (o, c, i) {
     if (hasComma(c)) return;
     if (!isFinite(i)) i = o.indexOf(c);
     o.splice(i, 1, ...c);
@@ -336,22 +356,26 @@ Javascript.prototype.detour = function detour(o, ie) {
                     if (!o.prev || o.prev.type & (STAMP | STRAP)) {
                         o.type = SCOPED;
                         o.entry = '[';
-                        o.leave = `]["join"]('')`;
+                        o.leave = `]["join"]("")`;
                         for (var cx = o.length - 1; cx >= 0; cx--) {
                             var c = o[cx];
                             if (c.type === PIECE) {
                                 c.type = QUOTED;
                                 c.text = strings.recode("`" + c.text + "`");
+                                splice(o, cx + 1, 0, { type: STAMP, text: ',' });
                             }
                             else {
-                                insertAfter.call(o, c.prev, { type: STAMP, text: ',' });
                                 c.entry = "(";
                                 c.leave = ")";
                                 this.detour(c.first, ie);
-                                insertAfter.call(o, c, { type: STAMP, text: ',' });
-                                removeQoute(o, c);
+                                splice(o, cx + 1, 0, { type: STAMP, text: ',' });
+                                removeQuote(o, c);
                             }
                         }
+                        if (o.length) {
+                            o.pop();
+                            o.last = o.last.prev;
+                        }
                     }
                     else {
                         var raw = [];
@@ -402,11 +426,11 @@ Javascript.prototype.detour = function detour(o, ie) {
                     if (ie === undefined || o.prev && (o.prev.type !== STAMP || o.prev.text !== ",") || this.strap_reg.test(o.text)) {
                         text = `[${text}]`;
                     }
-                    else {
+                    else if (ie !== false) {
                         collectProperty(o, text);
                     }
                     if (o.short) {
-                        insertAfter.call(o.queue, o.prev, { text: text, short: false, isprop: true, type: PROPERTY }, { text: ':', type: STAMP });
+                        insertBefore.call(o.queue, o, { text: text, short: false, isprop: true, type: PROPERTY }, { text: ':', type: STAMP });
                         o.isprop = false;
                         o.type = EXPRESS;
                         delete o.short;

package/coms/compile/Program.js

@@ -145,7 +145,7 @@ class Program {
     value_reg = /^(false|true|null)$/
     number_reg = number_reg;
     Code = Array;
-    transive_reg = /^(new|void|switch|case|break|continue|return|throw|extends|import)$/
+    transive_reg = /^(new|void|case|break|continue|return|throw|extends|import)$/
     straps = "if,for".split(',');
     colonstrap_reg = /^(case|default)$/;
     forceend_reg = /^(return|break|continue)$/;
@@ -238,13 +238,16 @@ class Program {
             }
             var last = queue.last;
             if (type === SPACE) {
-                if (last && last.type === STRAP && forceend_reg.test(last.text)) {
+                if (last && last.isend === false) {
                     last.isend = true;
                     queue.inExpress = false;
                 }
             }
             else if (type !== STAMP);
-            else if (m === ";") queue.inExpress = false;
+            else if (m === ";") {
+                if (last && last.isend === false) last.isend = true;
+                queue.inExpress = false;
+            }
             else if (last) check: switch (m) {
                 case "?":
                     queue.inExpress = true;
@@ -312,6 +315,10 @@ class Program {
                 isExpress: queue.inExpress,
                 text: m
             }
+            if (type === STRAP) {
+                if (forceend_reg.test(m)) scope.isend = false;
+                if (this.transive_reg.test(m)) scope.transive = true;
+            }
             if (isdigit) scope.isdigit = true;
             lasttype = type;
             queue_push(scope);
@@ -577,7 +584,7 @@ class Program {
                         else scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(last.text);
                     }
                     else if (last.type === STRAP) {
-                        if (queue[queue.length - 1].type === SPACE && forceend_reg.test(last.text));
+                        if (last.isend);
                         else if (this.export_reg.test(last.text));
                         else scope.isObject = queue.inExpress;
                     }

package/coms/compile/breakcode.js

@@ -63,19 +63,17 @@ var trimStringLiteral = function (block) {
     }
     return block_string;
 };
-var paramsMap = Object.create(null);
+var paramsMap = null;
 var module_string = '';
-function breakcode(data, args) {
-    if (!args) return [data];
+function breakcode(data, occurs) {
+    if (!occurs) return [data];
     module_string = data;
-    Object.keys(args).forEach(function (key) {
-        paramsMap[key] = true;
-    });
+    paramsMap = Object.assign(Object.create(null), occurs);
     var code_blocks = scanner(module_string);
     module_string = code_blocks.map(trimStringLiteral).join("");
-    var res = Object.keys(paramsMap).filter(k => !hasOwnProperty.call(args, k));
+    var res = Object.keys(paramsMap).filter(k => !hasOwnProperty.call(occurs, k));
     var val = res.map(k => paramsMap[k]);
-    paramsMap = Object.create(null);
+    paramsMap = null;
     data = module_string;
     module_string = '';
     return [data, res, val];