efront 3.13.4 → 3.14.0

package/apps/pivot/log/boot.js

@@ -4,10 +4,15 @@ var fields = refilm`
         var ip = e.data[e.field.key];
         var m = /(\d+\.){3}\d+$/.exec(ip);
         if (m) {
-            data.from("iplocation", { ip: m[0] }, function (a) {
+            var setAddress = function (a) {
                 var l = document.createElement('label');
-                l.innerText = a.address;
+                l.innerText = a;
                 appendChild(e, l);
+            };
+            if (e.data.address) setAddress(e.data.address);
+            else data.from("iplocation", { ip: m[0] }, function (a) {
+                e.data.address = a.address;
+                setAddress(a.address);
             });
         }
         return e;

package/coms/compile/common.js

@@ -110,7 +110,7 @@ var skipAssignment = function (o) {
     }
     return o;
 };
-var createScoped = function (parsed) {
+var createScoped = function (parsed, wash) {
     var used = Object.create(null); var vars = Object.create(null), lets = vars;
     var scoped = [], funcbody = scoped;
     scoped.isfunc = true;
@@ -206,7 +206,7 @@ var createScoped = function (parsed) {
                             }
                             o = o0;
                             mergeTo(used, used0);
-                            Object.assign(m, declared);
+                            mapDeclared(m, declared);
                             continue loop;
                         case "function":
                             isFunction = true;
@@ -308,6 +308,7 @@ var createScoped = function (parsed) {
                     o.isExpress = isExpress;
                     if (isFunction || isCatch) {
                         var [declared, used0, o0, skiped] = getDeclared(o.first, 'argument');
+                        scoped.args = declared;
                         mergeTo(used, used0);
                         while (skiped.length) {
                             var o1 = run(skiped[0], 0);
@@ -315,7 +316,7 @@ var createScoped = function (parsed) {
                             if (sindex < 0) break;
                             skiped.splice(0, sindex + 1);
                         }
-                        Object.assign(isCatch ? lets : vars, declared);
+                        mapDeclared(isCatch ? lets : vars, declared);
                     }
                     else {
                         run(o.first);
@@ -334,6 +335,19 @@ var createScoped = function (parsed) {
                 if (o.type === SCOPED && o.entry === "{") {
                     o.isExpress = isExpress;
                     run(o.first);
+                    if (wash && isFunction) {
+                        var e = o.next;
+                        if (e && e.type === EXPRESS && /^[\.\[]/.test(e.text) || e && e.type === SCOPED && e.entry === "[") {
+                            scoped.target = true;
+                            e = e.next;
+                        }
+                        if (e && e.type === SCOPED && e.entry === '(') {
+                            if (e.first) {
+                                scoped.pass = getDeclared(e.first)[0];
+                            }
+                            if (scoped.target) scoped.target = scoped.pass.shift();
+                        }
+                    }
                 }
                 else {
                     do {
@@ -407,7 +421,8 @@ var createScoped = function (parsed) {
     return scoped;
 };
 var getDeclared = function (o, kind) {
-    var declared = Object.create(null), used = Object.create(null); var skiped = [];
+    var declared = [], used = Object.create(null); var skiped = [];
+    var prop = null;
     loop: while (o) {
         while (o && o.type === STAMP && o.text === ',') o = o.next;
         if (!o) break;
@@ -423,12 +438,14 @@ var getDeclared = function (o, kind) {
                 if (o.text === "*" && o.next) {
                     if (o.next.type === STRAP && o.next.text === 'as') {
                         o = o.next.next;
+                        prop = "*";
                         continue;
                     }
                 }
             case PROPERTY:
                 if (o.next) {
                     if (o.next.type === STAMP && o.next.text === ":" || o.next.type === STRAP && o.next.text === "as") {
+                        prop = "." + o.text;
                         o = o.next.next;
                         continue;
                     }
@@ -437,7 +454,9 @@ var getDeclared = function (o, kind) {
             case VALUE:
             case EXPRESS:
                 var n = o.text.replace(/^\.\.\.|\.\.\.$/g, '');
-                declared[n] = true;
+                declared.push(n);
+                if (n !== o.text) declared["..."] = n;
+                else if (prop) declared[prop] = n;
                 o.kind = kind;
                 saveTo(used, n, o);
                 o = o.next;
@@ -446,7 +465,8 @@ var getDeclared = function (o, kind) {
                 var [d, u, _, s] = getDeclared(o.first, kind);
                 while (s.length) skiped.push.apply(skiped, s.splice(0, 1024));
                 mergeTo(used, u);
-                Object.assign(declared, d);
+                declared.push(d);
+                if (prop) declared[prop] = d;
                 o = o.next;
                 break;
             default:
@@ -483,9 +503,21 @@ var getDeclared = function (o, kind) {
         if (!o) break;
         if (o.type !== STAMP) break;
         if (o.text !== ',') break;
+        prop = null;
     }
     return [declared, used, o, skiped];
 };
+var mapDeclared = function (map, declared) {
+    var rest = [declared];
+    while (rest.length) {
+        var r = rest.pop();
+        for (var d of r) {
+            if (d instanceof Array) rest.push(d);
+            else map[d] = true;
+        }
+    }
+    return map;
+};
 var saveTo = function (used, k, o) {
     if (!(used[k] instanceof Array)) used[k] = [];
     used[k].push(o);
@@ -498,6 +530,132 @@ var mergeTo = function (used, used0) {
     }
 };
 
+var needBreak = function (prev, next) {
+    if (!prev || !next) return;
+    if (prev.type === STAMP && /^[,;]$/.test(prev.text)) return;
+    if (next.type === STAMP && /^[,;]$/.test(next.text)) return;
+    if (prev.type === EXPRESS && /\.$/.test(prev.text)) return;
+    if (next.type === EXPRESS && /^\./.test(next.text)) return;
+    if (next.type === PROPERTY) return ";";
+    if (next.type === STAMP && next.text === "*") return ";";
+    if (
+        [EXPRESS, VALUE, QUOTED].indexOf(prev.type) >= 0
+        || prev.type === STAMP && /^(\+\+|\-\-)$/.test(prev.text)
+        || prev.type === SCOPED && (prev.isExpress || prev.isObject)
+    ) {
+        if ([EXPRESS, VALUE, QUOTED, LABEL].indexOf(next.type) >= 0) return ";";
+        if (next.type === STRAP) {
+            if (!/^(in|of|extends|instanceof|as)$/.test(next.text)) return ";";
+            return " ";
+        }
+        if (next.type === SCOPED) {
+            if (!next.isExpress) return ";";
+        }
+        return;
+    }
+    if (prev.type === STRAP) {
+        if ([STRAP, EXPRESS, VALUE, QUOTED].indexOf(next.type) >= 0) return " ";
+        if (next.type === LABEL) return ";";
+    }
+};
+
+var createString = function (parsed) {
+    var pressed = parsed.pressed;
+    var lasttype;
+    var result = [];
+    var run = (o, i, a) => {
+        var prev = o.prev;
+        if (!~[SPACE, COMMENT, STAMP, PIECE].indexOf(o.type) && prev && lasttype !== SPACE && !pressed) {
+            if (~[QUOTED, SCOPED, STRAP, LABEL, COMMENT].indexOf(lasttype)
+                || prev.type === STAMP
+                && (!/[\+\-\~\!]$/.test(prev.text) || /[\+\-]$/.test(prev.text) && prev.prev
+                    && (!~[STAMP, STRAP, SCOPED].indexOf(prev.prev.type) || prev.prev.type === SCOPED && prev.prev.isExpress)
+                )) {
+                if (o.type !== SCOPED && (o.type !== EXPRESS || !/^\./.test(o.text))) {
+                    result.push(" ");
+                    lasttype = SPACE
+                }
+            }
+        }
+        switch (o.type) {
+            case COMMENT:
+                // 每一次要远行，我都不得不对自己的物品去粗取精。取舍之间，什么重要，什么不是那么重要，都有了一道明显的分界线。
+                if (!pressed) {
+                    if (lasttype !== SPACE && o.prev) result.push(' ');
+                    result.push(o.text);
+                }
+                break;
+            case SPACE:
+                if (!pressed) {
+                    result.push(o.text);
+                    lasttype = SPACE;
+                    break;
+                }
+                var b = needBreak(o.prev, o.next);
+                if (b) result.push(b);
+                break;
+            case QUOTED:
+                if (!o.length) {
+                    result.push(o.text);
+                    break;
+                }
+            case SCOPED:
+                if (!pressed && o.type !== QUOTED && (lasttype === STRAP || lasttype === COMMENT || lasttype === STAMP
+                    && (!o.prev || !/[\+\-\~\!]$/.test(o.prev.text) || /[\+\-]$/.test(o.prev.text) && (!o.prev.prev || !~[STAMP, STRAP].indexOf(o.prev.prev.type)))
+                    || lasttype === SCOPED && o.entry === "{"
+                )) result.push(" ");
+                result.push(o.entry);
+                if (o.length > 0) {
+                    if (o.entry === "{" && result[0].type !== SPACE) {
+                        if (!pressed) {
+                            result.push(" ");
+                        }
+                    }
+                    lasttype = undefined;
+                    o.forEach(run);
+                    if (/^[,;]$/.test(result[result.length - 1]) && pressed) {
+                        if (!o.prev || o.prev.text !== 'for') result.pop();
+                    }
+                    if (o.leave === "}" && (!o.next || o.next.type !== PIECE) && o[o.length - 1].type !== SPACE) {
+                        if (!pressed) result.push(" ");
+                    }
+                }
+                result.push(o.leave);
+                break;
+            default:
+                if (o instanceof Object) {
+                    if ([STRAP, EXPRESS, PROPERTY, VALUE, COMMENT].indexOf(lasttype) >= 0 && [STRAP, EXPRESS, PROPERTY, VALUE].indexOf(o.type) >= 0) {
+                        result.push(" ");
+                    }
+                    else if (o.prev && o.type === STAMP && !/^([,;])$/.test(o.text)) {
+                        if (result[result.length - 1] === " " || (lasttype === PROPERTY || !o.isExpress && o.prev && o.prev.type !== LABEL) && o.text === ':') { }
+                        else if (lasttype === STAMP) {
+                            result.push(" ");
+                        }
+                        else if (/^(\+\+|\-\-)$/.test(o.prev.text) && o.prev.prev) {
+                            var prev_prev = o.prev.prev;
+                            if (
+                                prev_prev.type === STRAP && !prev_prev.isExpress
+                                || prev_prev.type === EXPRESS
+                                || prev_prev.type === VALUE
+                            ) result.push(";");
+                        }
+                        else if (!/^(\+\+|\-\-)$/.test(o.text)) {
+                            if (!pressed && lasttype !== SPACE) result.push(" ");
+                        }
+                    }
+                    result.push(o.text);
+                }
+                else {
+                    result.push(o);
+                }
+        }
+        lasttype = o.type;
+        if (o.isprop) lasttype = PROPERTY;
+    };
+    parsed.forEach(run);
+    return result.join("");
+}
 
 module.exports = {
     /*-1 */COMMENT,
@@ -514,6 +672,7 @@ module.exports = {
     number_reg,
     skipAssignment,
     getDeclared,
+    createString,
     createScoped,
     saveTo,
     mergeTo

package/coms/compile/scanner.js

@@ -293,9 +293,9 @@ function single_comment_scanner2(index) {
 //     single_comment_scanner2.call(string, 0);
 // }, count); //3354+
 // console.log(t1, t2);
-function block_code_scanner(index, blocks = []) {
+function block_code_scanner(index, blocks = [], keepdeep = Infinity) {
     var save = (blocks instanceof Array) ? function (scanner, children) {
-        if (saved_index < index) {
+        if (deep < keepdeep && saved_index < index) {
             blocks.push(new Block(scanner, saved_index, index, children));
             saved_index = index;
         }
@@ -618,7 +618,7 @@ function lookback_scanner(blockIndex, blocks) {
     return tempIndex;
 }
 
-var scanner = module.exports = function (s) {
+var scanner = module.exports = function (s, keepdeep) {
     var blocks = [];
     var s = String(s);
     // var time = Date.now();
@@ -626,10 +626,13 @@ var scanner = module.exports = function (s) {
     //     block_code_scanner.call(s, 0, blocks);
     // }//angular 1.5.3 x1000 7.0s
     // console.log(Date.now() - time);
-    block_code_scanner.call(s, 0, blocks);
+    block_code_scanner.call(s, 0, blocks, keepdeep);
     // console.log(blocks.map(a => s.slice(a.start, a.end)).join())
     return blocks;
 };
+scanner.autoskip = function (code, start) {
+    return block_code_scanner.call(code, start, null);
+};
 function Block(scanner, start, end, children) {
     this.type = scanner;
     this.start = start;

package/coms/compile/scanner2.js

@@ -15,38 +15,11 @@ const {
     number_reg,
     skipAssignment,
     createScoped,
+    createString,
 } = require("./common");
 
 
 
-var needBreak = function (prev, next) {
-    if (!prev || !next) return;
-    if (prev.type === STAMP && /^[,;]$/.test(prev.text)) return;
-    if (next.type === STAMP && /^[,;]$/.test(next.text)) return;
-    if (prev.type === EXPRESS && /\.$/.test(prev.text)) return;
-    if (next.type === EXPRESS && /^\./.test(next.text)) return;
-    if (next.type === PROPERTY) return ";";
-    if (next.type === STAMP && next.text === "*") return ";";
-    if (
-        [EXPRESS, VALUE, QUOTED].indexOf(prev.type) >= 0
-        || prev.type === STAMP && /^(\+\+|\-\-)$/.test(prev.text)
-        || prev.type === SCOPED && (prev.isExpress || prev.isObject)
-    ) {
-        if ([EXPRESS, VALUE, QUOTED, LABEL].indexOf(next.type) >= 0) return ";";
-        if (next.type === STRAP) {
-            if (!/^(in|of|extends|instanceof|as)$/.test(next.text)) return ";";
-            return " ";
-        }
-        if (next.type === SCOPED) {
-            if (!next.isExpress) return ";";
-        }
-        return;
-    }
-    if (prev.type === STRAP) {
-        if ([STRAP, EXPRESS, VALUE, QUOTED].indexOf(next.type) >= 0) return " ";
-        if (next.type === LABEL) return ";";
-    }
-};
 
 
 var compress = function (scoped, maped) {
@@ -266,95 +239,7 @@ class Program extends Array {
     }
 
     toString() {
-        var lasttype;
-        var result = [];
-        var run = (o, i, a) => {
-            if (!~[SPACE, COMMENT, STAMP, PIECE].indexOf(o.type) && lasttype !== SPACE && !this.pressed) {
-                var prev = o.prev;
-                if (~[QUOTED, SCOPED, STRAP].indexOf(lasttype)
-                    || prev && prev.type === STAMP && !/(\+\+|\-\-|~|!)$/.test(prev.text) && prev.prev && prev.prev.type !== STAMP) {
-                    if (o.type !== SCOPED && (o.type !== EXPRESS || !/^\./.test(o.text))) {
-                        result.push(" ");
-                        lasttype = SPACE
-                    }
-                }
-            }
-            switch (o.type) {
-                case COMMENT:
-                    // 每一次要远行，我都不得不对自己的物品去粗取精。取舍之间，什么重要，什么不是那么重要，都有了一道明显的分界线。
-                    if (!this.pressed) {
-                        result.push(o.text);
-                        if (this.pressed && /^\/\//.test(o.text)) {
-                            result.push("\r\n");
-                        }
-                    }
-                    break;
-                case SPACE:
-                    if (!this.pressed) {
-                        result.push(o.text);
-                        break;
-                    }
-                    var b = needBreak(o.prev, o.next);
-                    if (b) result.push(b);
-                    break;
-                case QUOTED:
-                    if (!o.length) {
-                        result.push(o.text);
-                        break;
-                    }
-                case SCOPED:
-                    if (!this.pressed && (lasttype === STRAP || lasttype === STAMP || lasttype === SCOPED && o.entry === "{") && o.type !== QUOTED) result.push(" ");
-                    result.push(o.entry);
-                    if (o.length > 0) {
-                        if (o.entry === "{" && result[0].type !== SPACE) {
-                            if (!this.pressed) {
-                                result.push(" ");
-                            }
-                        }
-                        lasttype = undefined;
-                        o.forEach(run);
-                        if (/^[,;]$/.test(result[result.length - 1]) && this.pressed) {
-                            if (!o.prev || o.prev.text !== 'for') result.pop();
-                        }
-                        if (o.leave === "}" && (!o.next || o.next.type !== PIECE) && o[o.length - 1].type !== SPACE) {
-                            if (!this.pressed) result.push(" ");
-                        }
-                    }
-                    result.push(o.leave);
-                    break;
-                default:
-                    if (o instanceof Object) {
-                        if ([STRAP, EXPRESS, PROPERTY, VALUE].indexOf(lasttype) >= 0 && [STRAP, EXPRESS, PROPERTY, VALUE].indexOf(o.type) >= 0) {
-                            result.push(" ");
-                        }
-                        else if (o.prev && o.type === STAMP && !/^([,;])$/.test(o.text)) {
-                            if (result[result.length - 1] === " " || lasttype === PROPERTY && o.text === ':') { }
-                            else if (lasttype === STAMP) {
-                                result.push(" ");
-                            }
-                            else if (/^(\+\+|\-\-)$/.test(o.prev.text) && o.prev.prev) {
-                                var prev_prev = o.prev.prev;
-                                if (
-                                    prev_prev.type === STRAP && !prev_prev.isExpress
-                                    || prev_prev.type === EXPRESS
-                                    || prev_prev.type === VALUE
-                                ) result.push(";");
-                            }
-                            else if (!/^(\+\+|\-\-)$/.test(o.text)) {
-                                if (!this.pressed && lasttype !== SPACE) result.push(" ");
-                            }
-                        }
-                        result.push(o.text);
-                    }
-                    else {
-                        result.push(o);
-                    }
-            }
-            lasttype = o.type;
-            if (o.isprop) lasttype = PROPERTY;
-        };
-        this.forEach(run);
-        return result.join("");
+        return createString(this);
     }
     get envs() {
         return this.scoped.envs;