efront 3.3.7 → 3.4.2

package/coms/compile/scanner2.js

@@ -1,6 +1,6 @@
 var createNamelist = require("./namelist");
 
-const [
+const {
     /*-1 */COMMENT,
     /* 0 */SPACE,
     /* 1 */STRAP,
@@ -12,104 +12,12 @@ const [
     /* 7 */SCOPED,
     /* 8 */LABEL,
     /* 9 */PROPERTY,
-] = new Array(20).fill(0).map((_, a) => a - 1);
+    number_reg,
+    skipAssignment,
+    createScoped,
+} = require("./common");
 
-var saveTo = function (used, k, o) {
-    if (!(used[k] instanceof Array)) used[k] = [];
-    used[k].push(o);
-};
 
-var mergeTo = function (used, used0) {
-    for (var k in used0) {
-        var v = used0[k];
-        for (var s of v) saveTo(used, k, s);
-    }
-};
-var skipAssignment = function (o) {
-    var needpunc = false;
-    var o0 = o;
-    loop: while (o) switch (o.type) {
-        case STAMP:
-            switch (o.text) {
-                case ",":
-                case ";":
-                    break loop;
-                case "++":
-                case "--":
-                    o = o.next;
-                    break;
-                case "!":
-                case "~":
-                case "+":
-                case "-":
-                    o = o.next;
-                    needpunc = false;
-                    break;
-                default:
-                    if (/^[!~\+\-]+$/.test(o.text)) {
-                        needpunc = false;
-                        o = o.next;
-                        break;
-                    }
-                    if (!needpunc) break loop;
-                    needpunc = false;
-                    o = o.next;
-            }
-            break;
-        case SCOPED:
-            if (needpunc && o.entry === "{") break loop;
-            o = o.next;
-            needpunc = true;
-            break;
-        case EXPRESS:
-            if (/^\.|\.$/.test(o.text)) {
-                o = o.next;
-                break;
-            }
-            else if (/^\[/.test(o.text)) {
-                needpunc = true;
-                o = o.next;
-                break;
-            }
-        case VALUE:
-        case QUOTED:
-            if (needpunc) break loop;
-            needpunc = true;
-            o = o.next;
-            break;
-        case STRAP:
-            if (needpunc) {
-                if (!/^(in|instanceof)$/.test(o.text)) break loop;
-                o = o.next;
-                needpunc = false;
-            }
-            else if (o.text === "class") {
-                o = o.next;
-                while (o && !o.isClass) o = o.next;
-                while (o && o.isClass) o = o.next;
-                needpunc = true;
-                break;
-            }
-            else if (o.text === "function") {
-                o = o.next;
-                if (o && o.type === EXPRESS) o = o.next;
-                if (o) o = o.next;
-                if (o) o = o.next;
-                needpunc = true;
-                break;
-            }
-            else {
-                o = o.next;
-                needpunc = false;
-            }
-            break;
-        default:
-            console.log(o);
-            throw new Error('代码结构异常！');
-            o = o.next;
-    }
-    return o;
-};
 
 var needBreak = function (prev, next) {
     if (!prev || !next) return;
@@ -139,78 +47,6 @@ var needBreak = function (prev, next) {
     }
 };
 
-var getDeclared = function (o, kind) {
-    var declared = Object.create(null), used = Object.create(null); var skiped = [];
-    loop: while (o) {
-        while (o && o.type === STAMP && o.text === ',') o = o.next;
-        if (!o) break;
-        if (o.isprop) {
-            skiped.push(o);
-            if (o.next && o.next.type === STAMP && o.next.text === ":") {
-                o = o.next;
-                o = o.next;
-            }
-        }
-        switch (o.type) {
-            case PROPERTY:
-                if (o.next && o.next.type === STAMP && o.next.text === ":") {
-                    o = o.next.next;
-                    continue;
-                }
-            case STRAP:
-            case VALUE:
-            case EXPRESS:
-                var n = o.text.replace(/^\.\.\.|\.\.\.$/g, '');
-                declared[n] = true;
-                o.kind = kind;
-                saveTo(used, n, o);
-                o = o.next;
-                break;
-            case SCOPED:
-                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);
-                o = o.next;
-                break;
-
-            default:
-                console.log(o);
-                throw new Error("代码结构异常");
-        }
-        if (!o) break;
-        switch (o.type) {
-            case STRAP:
-                if (/^(in|of)$/.test(o.text)) {
-                    o = o.next;
-                    var o0 = skipAssignment(o);
-                    do {
-                        skiped.push(o);
-                        o = o.next;
-                    } while (o !== o0);
-                    o = o0;
-                    break;
-                }
-                break loop;
-            case STAMP:
-                if (o.text === "=") {
-                    o = o.next;
-                    var o0 = skipAssignment(o);
-                    do {
-                        skiped.push(o);
-                        o = o.next;
-                    } while (o !== o0);
-                    o = o0;
-                    break;
-                }
-                break;
-        }
-        if (!o) break;
-        if (o.type !== STAMP) break;
-        if (o.text !== ',') break;
-    }
-    return [declared, used, o, skiped];
-}
 
 var compress = function (scoped, maped) {
     var { lets, vars, used } = scoped;
@@ -316,7 +152,7 @@ var detour = function (o, ie) {
 class Program extends Array {
     COMMENT = COMMENT
     SPACE = SPACE
-    STAMP = STRAP
+    STRAP = STRAP
     STAMP = STAMP
     VALUE = VALUE
     QUOTED = QUOTED
@@ -443,240 +279,7 @@ class Program extends Array {
     }
     get scoped() {
         if (this._scoped) return this._scoped;
-        var used = Object.create(null); var vars = Object.create(null), lets = vars;
-        var scoped = this._scoped = [];
-        var run = function (o, id) {
-            loop: while (o) {
-                var isCatch = false;
-                var isFunction = false;
-                var isScope = false;
-                var isArrow = false;
-                switch (o.type) {
-                    case QUOTED:
-                        if (o.length) {
-                            run(o.first);
-                        }
-                        break;
-                    case STAMP:
-                        break;
-                    case PROPERTY:
-                        if (o.next) {
-                            if (o.next.type !== STAMP || o.next.text !== ",") break;
-                        }
-                    case VALUE:
-                        if (program.number_reg.test(o.text)) break;
-                    case EXPRESS:
-                        if (o.prev && o.prev.type === EXPRESS) {
-                            if (/\.$/.test(o.prev.text)) break;
-                        }
-                        var u = o.text.replace(/^([^\.\[]*)[\s\S]*$/, '$1');
-                        if (!u) break;
-                        if (o.next && o.next.type === STAMP && o.next.text === "=>") {
-                            isScope = true;
-                            isArrow = true;
-                        }
-                        else {
-                            saveTo(used, u, o);
-                        }
-                        break;
-                    case LABEL:
-                        var name = o.text;
-                        name = name.slice(0, name.length - 1);
-                        vars[name] = true;
-                        o.kind = "label";
-                        saveTo(used, name, o);
-                        break;
-
-                    case STRAP:
-                        var s = o.text;
-                        switch (s) {
-                            case "var":
-                            case "import":
-                                var m = vars;
-                            case "let":
-                            case "const":
-                                m = m || lets;
-                                var [declared, used0, o0, skiped] = getDeclared(o.next, s);
-                                while (skiped.length) {
-                                    var o1 = run(skiped[0], 0);
-                                    let sindex = skiped.indexOf(o1);
-                                    if (sindex < 0) break;
-                                    skiped.splice(0, sindex + 1);
-                                }
-                                o = o0;
-                                mergeTo(used, used0);
-                                Object.assign(m, declared);
-                                continue loop;
-                            case "function":
-                                isFunction = true;
-                            case "catch":
-                                isCatch = true;
-                            case "class":
-                                if (!o.isExpress) {
-                                    o = o.next;
-
-                                    if (o.type === EXPRESS) {
-                                        vars[o.text] = true;
-                                        o.kind = isFunction ? 'function' : 'class';
-                                        saveTo(used, o.text, o);
-
-                                        o = o.next;
-                                    }
-                                }
-                                isScope = true;
-                                break;
-
-                        }
-                        break;
-                    case SCOPED:
-                        if (o.entry === "(") {
-                            if (o.next && o.next.type === STAMP && o.next.text === "=>"
-                                || o.prev && (o.prev.type === PROPERTY || o.prev.isprop)) {
-                                isArrow = true;
-                                isScope = true;
-                            }
-                            else {
-                                run(o.first);
-                            }
-                        }
-                        else if (o.entry === "{") {
-                            isScope = true;
-                        }
-                        else {
-                            run(o.first);
-                        }
-                        break;
-                }
-                if (isScope) {
-                    var _used = used;
-                    var _lets = lets;
-                    var _vars = vars;
-                    var _scoped = scoped;
-                    used = Object.create(null);
-                    lets = Object.create(null);
-                    vars = Object.create(null);
-                    scoped = [];
-                    var isExpress = o.isExpress;
-
-                    if (isFunction || isArrow) {
-                        scoped.used = used;
-                        scoped.vars = vars;
-                        lets = vars;
-                        if (isFunction) vars.this = true, vars.arguments = true;
-                        isFunction = true;
-                    } else {
-                        vars = _vars;
-                        scoped.lets = lets;
-                        scoped.used = used;
-                    }
-                    if (isArrow);
-                    else if (o.isExpress && o.type !== SCOPED) {
-                        o = o.next;
-                        if (o.type === EXPRESS) {
-                            vars[o.text] = true;
-                            o.kind = isFunction ? 'function' : 'class';
-                            saveTo(used, o.text, o);
-                            o = o.next;
-                        }
-                    }
-                    if (!isFunction) while (o.type !== SCOPED) {
-                        // if (o.next && o.next.type === STAMP && o.next.text === "=>") break;
-                        o = run(o, 0);
-                        o = o.next;
-                        if (!o) break loop;
-                    }
-
-                    if (o.entry === "(") {
-                        o.isExpress = isExpress;
-                        if (isFunction || isCatch) {
-                            var [declared, used0, o0, skiped] = getDeclared(o.first, 'argument');
-                            mergeTo(used, used0);
-                            while (skiped.length) {
-                                var o1 = run(skiped[0], 0);
-                                var sindex = skiped.indexOf(o1);
-                                if (sindex < 0) break;
-                                skiped.splice(0, sindex + 1);
-                            }
-                            Object.assign(isCatch ? lets : vars, declared);
-                        }
-                        else {
-                            run(o.first);
-                        }
-                        o = o.next;
-                        if (!o) break;
-                        if (o.type === STAMP && o.text === "=>") o = o.next;
-                    }
-                    else if (isArrow) {
-                        vars[o.text] = true;
-                        o.kind = 'argument';
-                        saveTo(used, o.text, o);
-                        o = o.next.next;
-                    }
-                    if (!o) break;
-                    if (o.type === SCOPED && o.entry === "{") {
-                        o.isExpress = isExpress;
-                        run(o.first);
-                    }
-                    else {
-                        do {
-                            if (o.type === STAMP && o.text === ";") break;
-                            o = run(o, 0);
-                            var next = o.next;
-                            if (!next) break;
-                            var e = o;
-                            if (o.type === STAMP && /^(\+\+|\-\-)$/.test(o.text) || ~[VALUE, QUOTED, SCOPED].indexOf(o.type) || EXPRESS === o.type && !/\.$/.test(o.text)) {
-                                if (~[VALUE, QUOTED, PROPERTY, LABEL].indexOf(next.type)) break;
-                                if (EXPRESS === next.type && !/^\./.test(next.text)) break;
-                                if (next.type === SCOPED && next.entry === "{") break;
-                            }
-                            o = next;
-                        } while (o);
-                    }
-                    var map = isFunction ? vars : lets;
-                    var keepscope = false;
-                    for (var k in map) {
-                        keepscope = true;
-                        break;
-                    }
-                    if (keepscope) {
-                        for (var k in used) {
-                            if (!(k in map)) {
-                                for (var u of used[k]) {
-                                    saveTo(_used, k, u);
-                                }
-                            }
-                        }
-                        _scoped.push(scoped);
-                    }
-                    else {
-                        mergeTo(_used, used);
-                        if (scoped.length) _scoped.push(scoped);
-                    }
-                    if (vars.this) {
-                        delete vars.this;
-                        delete vars.arguments;
-                    }
-                    used = _used;
-                    lets = _lets;
-                    vars = _vars;
-                    scoped = _scoped;
-                }
-                if (id >= 0) break;
-                if (o) o = o.next;
-            }
-            return o;
-        };
-        run(this.first);
-        scoped.used = used;
-        scoped.vars = vars;
-        var envs = Object.create(null);
-        for (var u in used) {
-            if (!(u in vars)) {
-                if (!/^(true|false|null|this|arguments)$/.test(u)) envs[u] = true;
-            }
-        }
-        scoped.envs = envs;
-        return this._scoped;
+        return this._scoped = createScoped(this);
     }
     getUndecleared() {
         return this.envs;
@@ -717,7 +320,7 @@ class Javascript {
     ]
     stamps = "/=+;|:?<>-!~@#%^&*,".split("")
     value_reg = /^(false|true|null|Infinity|NaN|undefined|arguments|this|eval)$/
-    number_reg = /^[\+\-]?(0x[0-9a-f]+|0b\d+|0o\d+|(\d*\.\d+|\d+\.?)(e[\+\-]?\d+|[mn])?)$/i;
+    number_reg = number_reg;
     transive = /^(new|var|let|const|yield|void|in|of|typeof|delete|case|return|await|export|default|instanceof|throw|extends|import|from)$/
     straps = `if,in,do,as,of
     var,for,new,try,let,get,set

package/coms/crypt/encode62.js

@@ -7,7 +7,7 @@ src.split("").forEach((s, i) => map[s] = i);
 function encode62(string) {
     string = String(string)
     string = string.length + string + "2017-08-19";
-    var buff = Buffer.from(src);
+    var buff = src.split('');
     for (var cx = 0, dx = buff.length + src.length, sl = string.length, cl = buff.length; cx < dx; cx++) {
         var s1 = string.charCodeAt(cx % sl) % cl;
         var s2 = cx % cl;
@@ -15,7 +15,7 @@ function encode62(string) {
         buff[s1] = buff[s2];
         buff[s2] = btemp;
     }
-    return buff.toString();
+    return buff.join('');
 };
 
 
@@ -35,9 +35,23 @@ Object.assign(encode62, {
     },
     timeencode(string) {
         var { time_delta } = this;
-        var time_stamp = +new Date();
+        var time_free = time_delta / 6 | 0;
+        var time_stamp = +new Date() - time_free;
         var time_rest = time_stamp % time_delta;
-        return this.encode62(string, time_stamp.toString(36)) + time_rest.toString(36).padStart(time_delta.toString(36).length, '0');
+        var time_rest_str = time_rest.toString(36);
+        var time_delta_str = time_delta.toString(36);
+        return this.encode62(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
+    },
+    timeupdate(string) {
+        var { time_delta } = this;
+        var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
+        var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
+        var time_stamp = time_start + parseInt(time_rest, 36);
+        if (time_stamp + (time_delta >> 1) > +new Date()) {
+            return string;
+        } else {
+            return this.timeencode(this.timedecode(string));
+        }
     },
     encode62(data, sign) {
         if (!sign) return data;
@@ -53,15 +67,6 @@ Object.assign(encode62, {
         });
         return result;
     },
-    encode(data, sign) {
-        if (!sign) return data;
-        var result = Buffer.from(data);
-        sign = Buffer.from(sign);
-        for (var cx = 0, dx = data.length; cx < dx; cx++) {
-            result[cx] = result[cx] ^ sign[cx % sign.length];
-        }
-        return result;
-    },
     decode(data, sign) {
         if (!sign) return data;
         var result = Buffer.from(data);
@@ -75,7 +80,7 @@ Object.assign(encode62, {
         return encode62(string);
     },
     genb() {
-        return encode62(Date.now() + "" + Math.random());
+        return encode62(Date.now() * Math.random() + "" + Math.random().toString(36) + Math.random().toString(36).toUpperCase());
     },
     huan(x, y) {
         return x.split("").map(s => y[map[s]]).join("");
@@ -90,24 +95,9 @@ Object.assign(encode62, {
         y.split("").forEach((a, j) => y_map[a] = j);
         return z.split("").map(c => src[y_map[c]]).join("");
     },
-    ab2c(a, b) {
-        return this.huan(a, b);
-    },
-    ba2d(a, b) {
-        return this.huan(b, a);
-    },
-    ca2b(c, a) {
-        return this.yuan(c, a);
-    },
-    cb2a(c, b) {
-        return this.suan(c, b);
-    },
-    da2b(d, a) {
-        return this.suan(d, a);
-    },
-    db2a(d, b) {
-        return this.yuan(d, b);
-    }
 });
-
+encode62.ab2c = encode62.ba2d = encode62.huan;
+encode62.db2a = encode62.ca2b = encode62.yuan;
+encode62.da2b = encode62.cb2a = encode62.suan;
+encode62.encode = encode62.decode;
 encode62.decode62 = encode62.encode62;

package/coms/crypt/encode62_test.js

@@ -32,7 +32,8 @@ describe("encode62_test", function () {
         c = encode62.ab2c(a, b);
     });
     it("ba2d", function () {
-        d = encode62.ba2d(a, b);
+        // 注意，参数顺序已变更
+        d = encode62.ba2d(b, a);
     });
     it("ca2b", function () {
         expect(encode62.ca2b(c, a)).to.be.eq(b);

package/coms/frame/left.html

@@ -1,8 +1,13 @@
-<div class="navbar-header">
-    <span class="fa fa-area-chart"></span>
-    GRINCH
-    <span class="dashboard_text">efront.cc</span>
+<div ng-if="!user.isLogin" class="navbar-header">
+    <!-- <avatar></avatar> -->
+    <a @click="popup('#/user/login')" class="dashboard_text">请登录</a>
+</div>
+<div -else class="navbar-header">
+    <span class="dashboard_text" @click="go('/user/profile')">
+        <avatar ng-src="user.avatar" size=30></avatar>
+        <span ng-bind="user.name"></span>
+        <span ng-bind="user.roles"></span>
+    </span>
 </div>
 <ylist mode=inline ng-src="menu in menus" class="sidebar-menu" ng-active="menus.open(event.value)">
-</ylist>
-<btn class="setting" ng-click="go('/user/setting')"><i class="fa fa-gear"></i>设置</btn>
+</ylist>

package/coms/frame/left.js

@@ -1,12 +1,15 @@
-var page = div();
+var page = document.createElement("都说我负天下人_可你们天下人_又何曾善待过我");
 page.innerHTML = left;
-var route = frame$route;
+if (!user.avatar) user.avatar = "user/avatar.png";
+frame$route.fetch('menu.yml')
 render(page, {
     ylist: menu,
     btn: button,
     go,
     user,
-    menus: route,
+    avatar,
+    popup,
+    menus: frame$route,
 });
 function main() {
     return page;