efront 3.0.9 → 3.2.1

package/coms/basic/lazy.js

@@ -1,35 +1,44 @@
+// 1.如果time大于0，传的和函数会延迟time执行，如果期间有新的调用，前一个调用会被忽略
+// 2.如果time小于0，传入的函数会立即执行，并忽略-time内的连续调用，time时间后触发最后一次调用
+// 如果time传false或0 使用requestAnimationFrame代替setTimeout按第1步执行
+// 如果time传null或undefined或NaN使用requestAnimationFrame代替setTimeout按第2步执行
 function lazy(run, time = false) {
-    var fireing, args, that;
+    var wait = +time ? setTimeout : requestAnimationFrame;
+    var ing, args, that;
     var fire = function () {
-        if (time > 17) {
-            if (fireing === true) {
-                fireing = setTimeout(fire, +time);
+        if (time >= 0) {
+            if (ing === true) {
+                ing = wait(fire, +time);
             }
-            else if (isFinite(fireing)) {
-                fireing = run.apply(that, args);
+            else if (isFinite(ing)) {
+                ing = run.apply(that, args);
             }
             else {
-                fireing = false;
+                ing = false;
             }
-        } else {
-            if (fireing === true) {
-                fireing = run.apply(that, args);
+        }
+        else {
+            if (ing === true) {
+                ing = run.apply(that, args);
+                wait(fire, -time);
+                if (!ing) ing = 1;
             } else {
-                fireing = false;
+                ing = false;
             }
         }
-        if (fireing instanceof Promise) fireing.then(fire, fire);
+        if (ing instanceof Promise) ing.then(fire, fire);
     };
     return function () {
         args = arguments;
         that = this;
-        if (fireing) return fireing = true;
-        if (time > 0) {
-            fireing = setTimeout(fire, +time);
-        } else {
-            fireing = requestAnimationFrame(fire);
-            if (time === false || time === 0) fireing = true;
-            else run();
+        if (ing) return ing = true;
+        if (time >= 0) {
+            ing = wait(fire, +time);
+        }
+        else {
+            ing = run.apply(that, args);
+            if (ing instanceof Promise) ing.then(fire, fire);
+            ing = wait(fire, -time);
         }
     };
 }

package/coms/basic/loader.js

@@ -36,7 +36,8 @@ if (PREVENT_FRAMEWORK_MODE !== false) {
     } catch (e) {
         document.write(message);
         top.location.reload();
-        throw message;
+        console.error(message);
+        return;
     }
 }
 var _devicePixelRatio = devicePixelRatio;

package/coms/basic/seek.js

@@ -23,7 +23,8 @@ var seek = function (object, seeker) {
     if (isObject(seeker)) {
         var dist = {};
         for (var k in seeker) {
-            var o = seek(object, seeker[k]);
+            var { k: v = k } = seeker;
+            var o = seek(object, v);
             if (o === undefined) return;
             dist[k] = o;
         }

package/coms/compile/breakcode.js

@@ -41,6 +41,21 @@ var trimStringLiteral = function (block) {
     if (block.type === block.regexp_quote_scanner) {
         return setMatchedConstRegExp(block_string);
     }
+    if (block.type === block.template_quote_scanner) {
+        var { start, end } = block;
+        if (block.children) {
+            var res = [];
+            for (var c of block.children) {
+                res.push(
+                    module_string.slice(start, c.start),
+                    trimStringLiteral(c)
+                );
+                start = c.end;
+            }
+            res.push(module_string.slice(start, end));
+            return res.join('');
+        }
+    }
     return block_string;
 };
 var paramsMap = Object.create(null);

package/coms/compile/scanner.js

@@ -158,7 +158,7 @@ function template_quote_scanner(index, blocks) {
             return this.length;
         }
         if (res[0] === "${") {
-            index = block_code_scanner.call(this, res.index + 2, blocks) + 1;
+            index = block_code_scanner.call(this, res.index + 2, blocks);
         } else if (res[0].length === 1) {
             return res.index + 1;
         } else {
@@ -294,9 +294,9 @@ function single_comment_scanner2(index) {
 // }, count); //3354+
 // console.log(t1, t2);
 function block_code_scanner(index, blocks = []) {
-    var save = (blocks instanceof Array) ? function (scanner) {
+    var save = (blocks instanceof Array) ? function (scanner, children) {
         if (saved_index < index) {
-            blocks.push(new Block(scanner, saved_index, index));
+            blocks.push(new Block(scanner, saved_index, index, children));
             saved_index = index;
         }
     } : function () { };
@@ -374,8 +374,9 @@ function block_code_scanner(index, blocks = []) {
                 break;
             case "`": //     `
                 save(block_code_scanner);
-                index = template_quote_scanner.call(this, index);
-                save(template_quote_scanner);
+                var children = [];
+                index = template_quote_scanner.call(this, index, children);
+                save(template_quote_scanner, children);
                 break;
             case "'": //         '
                 save(block_code_scanner);
@@ -459,7 +460,7 @@ function block_code_scanner2(index, blocks) {
                 break;
             case "`": //     `
                 save(block_code_scanner);
-                index = template_quote_scanner.call(this, index);
+                index = template_quote_scanner.call(this, index, blocks);
                 save(template_quote_scanner);
                 break;
             case "'": //         '
@@ -629,9 +630,10 @@ var scanner = module.exports = function (s) {
     // console.log(blocks.map(a => s.slice(a.start, a.end)).join())
     return blocks;
 };
-function Block(scanner, start, end) {
+function Block(scanner, start, end, children) {
     this.type = scanner;
     this.start = start;
+    if (children) this.children = children;
     this.end = end;
 }
 Block.prototype = {

package/coms/compile/scanner2.js

@@ -104,10 +104,10 @@ var skipAssignment = function (o) {
             }
             break;
         default:
+            console.log(o);
             throw new Error('代码结构异常！');
             o = o.next;
     }
-    if (o === o0) throw new Error("代码结构异常！");
     return o;
 };
 
@@ -140,12 +140,12 @@ 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;
@@ -259,6 +259,23 @@ var compress = function (scoped, maped) {
 
 var strings = require("../basic/strings");
 
+var insertAfter = function (o,) {
+    var queue = o.queue;
+    var index = queue.indexOf(o) + 1;
+    var os = [].slice.call(arguments, 1);
+    queue.splice.apply(queue, [index, 0].concat(os));
+    var prev = o, next = o.next;
+    for (var o of os) {
+        prev.next = o;
+        o.prev = prev;
+        prev = o;
+    }
+    if (next) {
+        o.next = next;
+        next.prev = o;
+    }
+};
+
 var detour = function (o, ie) {
     while (o) {
         switch (o.type) {
@@ -277,17 +294,23 @@ var detour = function (o, ie) {
                 }
                 if (!o.isprop) break;
             case PROPERTY:
-                if (/^(get|set|async)$/.test(o.text) && o.next && o.next.type === PROPERTY) break;
+                if (/^(get|set|async|static)$/.test(o.text) && o.next && (o.next.type === PROPERTY || o.next.isprop)) break;
+                if (o.text === 'static' && o.next && o.next.type === SCOPED && o.next.entry === '{') break;
                 if (!ie || program.strap_reg.test(o.text)) {
-                    if (!/^\[/.test(o.text)) {
-                        o.text = `[${strings.encode(strings.decode(o.text))}]`;
+                    if (!/^\[/.test(o.text) && o.queue.isObject) {
+                        if (o.short) {
+                            insertAfter(o, { text: ':', type: STAMP }, { text: o.text, type: EXPRESS, isExpress: true });
+                            o.short = false;
+                        }
+                        var text = strings.encode(strings.decode(o.text));
+                        o.text = ie ? text : `[${text}]`;
                     }
                 }
                 break;
         }
         o = o.next;
     }
-}
+};
 
 class Program extends Array {
     COMMENT = COMMENT
@@ -321,6 +344,16 @@ class Program extends Array {
         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 !== EXPRESS || !/^\./.test(o.text)) {
+                        result.push(" ");
+                        lasttype = SPACE
+                    }
+                }
+            }
             switch (o.type) {
                 case COMMENT:
                     // 每一次要远行，我都不得不对自己的物品去粗取精。取舍之间，什么重要，什么不是那么重要，都有了一道明显的分界线。
@@ -336,7 +369,6 @@ class Program extends Array {
                         result.push(o.text);
                         break;
                     }
-                    if (!o.prev || !o.next) break;
                     var b = needBreak(o.prev, o.next);
                     if (b) result.push(b);
                     break;
@@ -348,23 +380,31 @@ class Program extends Array {
                 case SCOPED:
                     if (!this.pressed && o.entry !== "[" && (lasttype === STRAP || lasttype === SCOPED) && o.type !== QUOTED) result.push(" ");
                     result.push(o.entry);
-                    if (o.entry === "{" && result[0] && result[0].type !== SPACE) {
-                        if (!this.pressed) result.push(" ");
-                    }
-                    lasttype = undefined;
-                    o.forEach(run);
-                    if (o.leave === "}" && (!o.next || o.next.type !== PIECE) && o.length > 0 && o[o.length - 1].type !== SPACE) {
-                        result.push(" ");
+                    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) {
+                            result.push(" ");
+                        }
                     }
                     result.push(o.leave);
                     break;
                 default:
-                    if ([STRAP, EXPRESS, PROPERTY, VALUE].indexOf(lasttype) >= 0 && [STRAP, EXPRESS, PROPERTY, VALUE].indexOf(o.type) >= 0) result.push(" ");
                     if (o instanceof Object) {
-                        // var broker = needBreak(o.prev, o);
-                        // if (broker) result.push(broker);
-                        if (o.prev && o.type === STAMP && !/^([,;])$/.test(o.text) && result[result.length - 1] !== " ") {
-                            if (lasttype === STAMP) {
+                        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) {
@@ -375,13 +415,10 @@ class Program extends Array {
                                     || prev_prev.type === VALUE
                                 ) result.push(";");
                             }
-                            else if (o.text !== ":" || o.prev.type !== STRAP && o.prev.prev && o.prev.prev.type !== STRAP) {
+                            else if (!/^(\+\+|\-\-)$/.test(o.text)) {
                                 if (!this.pressed) result.push(" ");
                             }
                         }
-                        else if (lasttype === SCOPED && !~[SPACE, COMMENT, STAMP, PIECE].indexOf(o.type)) {
-                            if (!this.pressed) if (o.type !== EXPRESS || !/^\./.test(o.text)) result.push(" ");
-                        }
                         result.push(o.text);
                     }
                     else {
@@ -389,6 +426,7 @@ class Program extends Array {
                     }
             }
             lasttype = o.type;
+            if (o.isprop) lasttype = PROPERTY;
         };
         this.forEach(run);
         return result.join("");
@@ -517,7 +555,6 @@ class Program extends Array {
                     lets = Object.create(null);
                     vars = Object.create(null);
                     scoped = [];
-                    _scoped.push(scoped);
                     var isExpress = o.isExpress;
 
                     if (isFunction || isArrow) {
@@ -595,12 +632,24 @@ class Program extends Array {
                         } while (o);
                     }
                     var map = isFunction ? vars : lets;
-                    for (var k in used) {
-                        if (!(k in map)) {
-                            for (var u of used[k]) {
-                                saveTo(_used, k, u);
+                    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;
@@ -641,11 +690,6 @@ class Program extends Array {
         detour(this.first, true);
         return this;
     }
-    // 标记要保留的代码
-    ahchor() { }
-    // 清理无效的代码
-    clean() {
-    }
     // 压缩
     press() {
         this.pressed = true;
@@ -675,9 +719,9 @@ class Javascript {
     number_reg = /^[\+\-]?(0x[0-9a-f]+|0b\d+|0o\d+|(\d*\.\d+|\d+\.?)(e[\+\-]?\d+|[mn])?)$/i;
     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
+    var,for,new,try,let,get,set
     else,case,void,with,enum,from,eval
-    async,while,break,catch,throw,const,yield,class,await
+    async,while,break,catch,throw,const,yield,class,await,super
     return,typeof,delete,switch,export,import,static
     default,finally,extends
     function,continue,debugger
@@ -717,16 +761,24 @@ class Javascript {
             }
             else if (scope.type === SCOPED && scope.entry === '[') {
                 if (queue.isObject) {
-                    scope.isprop = !last || last.type === STAMP && /^(\+\+|\-\-|;)$/.test(last.text)
+                    scope.isprop = !last || last.type === STAMP && last.text === ','
                 }
                 else if (queue.isClass) {
-                    scope.isprop = !last || last.type === STAMP && last.text === ','
+                    scope.isprop = !last || last.type === STAMP && /^(\+\+|\-\-|;)$/.test(last.text)
                 }
             }
             if (scope.type !== COMMENT && scope.type !== SPACE) {
+                if (scope.type === PROPERTY || scope.isprop) scope.queue = queue;
+                else if (scope.type === STRAP && /^(get|set|static)$/.test(scope.text)) {
+                    scope.type = EXPRESS;
+                }
                 if (last) {
                     scope.prev = last;
                     last.next = scope;
+                    if (!scope.isprop && last.type === STRAP) {
+                        if (last.text === 'async' && scope.text !== "function")
+                            last.type = EXPRESS;
+                    }
                 }
                 if (!queue.first) queue.first = scope;
                 queue.lastUncomment = scope;
@@ -744,10 +796,18 @@ class Javascript {
         var save = (type) => {
             if (lasttype === STAMP && type === STAMP && !/[,;\:\?]/.test(m)) {
                 var scope = queue[queue.length - 1];
-                if (/=>$/i.test(scope.text) || /=$/.test(scope.text) && /[^>=]/.test(m)) {
+                if (/=>$/i.test(scope.text) || /=$/.test(scope.text) && /[^>=]/.test(m) || scope.end !== start) {
                 } else {
                     scope.end = end;
                     scope.text = text.slice(scope.start, scope.end);
+                    if (scope.text === '=>') {
+                        if (scope.prev && scope.prev.prev) {
+                            var pp = scope.prev.prev;
+                            if (pp.type === EXPRESS && pp.text === 'async') {
+                                pp.type = STRAP;
+                            }
+                        }
+                    }
                     queue.inExpress = true;
                     return;
                 }
@@ -757,6 +817,11 @@ class Javascript {
                 case QUOTED:
                     if (isProperty()) type = PROPERTY;
                     break;
+                case SPACE:
+                    if (last && last.type === STRAP && last.text === 'retrun') {
+                        queue.inExpress = false;
+                    }
+                    break;
                 case EXPRESS:
                     if (!/^\./.test(m) && isProperty()) type = PROPERTY;
                     else if (this.number_reg.test(m)) type = VALUE;
@@ -791,6 +856,7 @@ class Javascript {
                         }
                         if (~[EXPRESS, VALUE].indexOf(last.type)) {
                             last.type = PROPERTY;
+                            last.queue = queue;
                         } else {
                             type = EXPRESS;
                         }
@@ -805,19 +871,13 @@ class Javascript {
                             else queue.question++;
                             break;
                         case ",":
+                        case "=":
                             if (queue.isObject) {
                                 if (last.type === PROPERTY) {
-                                    var _m = m;
-                                    var _end = end;
-                                    end = start;
-                                    m = ":";
-                                    save(STAMP);
-                                    m = last.text;
-                                    save(EXPRESS);
-                                    m = _m;
-                                    end = _end;
+                                    last.short = true;
                                 }
                             }
+                            queue.inExpress = true;
                             break;
                         case ":":
                             if (queue.question) {
@@ -894,12 +954,17 @@ class Javascript {
         var isProperty = function () {
             var prev = queue.lastUncomment;
             if (queue.isObject) {
-                return !prev || prev.type === STAMP && prev.text === "," || prev.type === PROPERTY && /^(get|set|async)$/.test(prev.text);
+                if (!prev || prev.type === STAMP && prev.text === ",") return true;
             }
             if (queue.isClass) {
                 if (!prev) return true;
                 if (prev.type === STAMP) return /^(\+\+|\-\-|;)$/.test(prev.text);
-                return prev.type === EXPRESS && !/\.$/.test(prev.text) || ~[SCOPED, VALUE, QUOTED, PROPERTY].indexOf(prev.type);
+                if (prev.type === EXPRESS && !/\.$/.test(prev.text)) return true;
+                if (~[SCOPED, VALUE, QUOTED, PROPERTY].indexOf(prev.type)) return true;
+            }
+            if (!prev) return false;
+            if (prev.type === PROPERTY && /^(get|set|async|static)$/.test(prev.text)) {
+                return true;
             }
             return false;
         };
@@ -907,9 +972,10 @@ class Javascript {
         loop: while (index < text.length) {
             if (queue.type === QUOTED) {
                 var quote = this.quote_map[queue.entry];
+                var reg = quote.reg;
+                start = index;
                 while (index < text.length) {
-                    var reg = quote.reg;
-                    start = reg.lastIndex = index;
+                    reg.lastIndex = index;
                     var match = reg.exec(text);
                     if (!match) {
                         index = text.length;
@@ -926,6 +992,7 @@ class Javascript {
                     }
                     if (m in quote.entry) {
                         push_quote();
+                        start = index;
                         continue loop;
                     }
                 }
@@ -1007,8 +1074,18 @@ class Javascript {
                 continue;
             }
             if (this.strap_reg.test(m)) {
+                if (!/^(async|function|class)$/.test(m)) queue.inExpress = this.transive.test(m);
+                else {
+                    var last = queue.lastUncomment;
+                    if (!last) queue.inExpress = false;
+                    else if (last.type === STAMP) {
+                        queue.inExpress = !/^(;|\+\+|\-\-)$/.test(last.text);
+                    }
+                    else if (last.type !== STRAP) {
+                        queue.inExpress = false;
+                    }
+                }
                 save(STRAP);
-                queue.inExpress = this.transive.test(m);
                 continue;
             }
             if (this.value_reg.test(m) || this.number_reg.test(m)) {
@@ -1018,6 +1095,7 @@ class Javascript {
             }
             if (this.express_reg.test(m)) {
                 save(EXPRESS);
+                queue.inExpress = true;
                 continue;
             }
 
@@ -1027,7 +1105,10 @@ class Javascript {
                 scope.type = SCOPED;
                 var last = queue.lastUncomment;
                 if (m === "{") {
-                    if (last && queue.classed > 0) {
+                    if (!last) {
+                        scope.isObject = queue.inExpress;
+                    }
+                    else if (queue.classed > 0) {
                         if (last.type !== STAMP || last.text !== "=>") {
                             queue.classed--;
                             scope.isClass = true;
@@ -1035,20 +1116,16 @@ class Javascript {
                             scope.inExpress = false;
                         }
                     }
-                    else if (!queue.lastUncomment) {
-                        scope.isObject = queue.inExpress;
-                    }
-                    else if (queue.lastUncomment.type === STAMP) {
-                        if (queue.lastUncomment.text === ':') {
+                    else if (last.type === STAMP) {
+                        if (last.text === ':') {
                             scope.isObject = queue.inExpress;
                         }
-                        else scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(queue.lastUncomment.text);
+                        else scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(last.text);
                     }
-                    else if (STRAP === queue.lastUncomment.type) {
-                        if (queue[queue.length - 1].type === SPACE && queue.lastUncomment.text === 'return');
+                    else if (last.type === STRAP) {
+                        if (queue[queue.length - 1].type === SPACE && last.text === 'return');
                         else scope.isObject = queue.inExpress;
                     }
-                    queue.inExpress = scope.isObject;
                 }
                 else {
                     scope.isExpress = queue.inExpress;
@@ -1066,15 +1143,7 @@ class Javascript {
                 var lastUncomment = queue.lastUncomment;
                 if (lastUncomment) {
                     if (lastUncomment.type === PROPERTY) {
-                        var _start = start;
-                        var _m = m;
-                        start = end;
-                        m = ":";
-                        save(STAMP);
-                        m = lastUncomment.text;
-                        save(EXPRESS);
-                        m = _m;
-                        start = _start;
+                        lastUncomment.short = true;
                     }
                 }
 
@@ -1090,6 +1159,7 @@ class Javascript {
             }
 
         }
+        if (queue !== origin) throw new Error("代码异常结束");
         return queue;
     }
     commit() {

package/coms/compile/scanner2_test.js

@@ -67,8 +67,19 @@ function testRegexp() {
     var m = scanner(`/${/[^\u0130\u0131\u00DFa-z0-9\\/:\-_\. ]+/g.source}/g/** a */`)
     console.log(m)
 }
-testSpeed();
-testVariables();
-testRegexp();
+function testStatic() {
+    var m = scanner(`class a{static{console.log(1)}}`);
+    console.log(m);
+}
+function testAssign() {
+    var m = scanner(`a=function(){}
+    a()`);
+    console.log(m.press().toString());
+}
+// testSpeed();
+// testVariables();
+// testRegexp();
+// testStatic();
+testAssign();
 // var typescript = require("../typescript/index");
 // typescript.transpile(data.toString(), { noEmitHelpers: true });

package/coms/zimoli/button.js

@@ -39,7 +39,7 @@ var active = function () {
     __addClass(this, "hover active");
 };
 var checkclick = function () {
-    if (this.hasAttribute("disabled") || this.disabled || this.hasAttribute("loading") || this.loading) onclick.preventClick = true;
+    if (this.hasAttribute("disabled") || this.disabled || this.hasAttribute("loading") || this.loading || this.hasAttribute("pending") || this.pending) onclick.preventClick = true;
 };
 var resetactive = function () {
     removeClass(this, "active");

package/coms/zimoli/button.less

@@ -94,6 +94,7 @@
 }
 
 &.active,
+&[pending],
 &[loading] {
     >.track {
         background: #0003;
@@ -102,6 +103,7 @@
     box-shadow: 0 0 2px rgba(0, 0, 0, 0.3) inset;
 }
 
+&[pending],
 &[loading] {
     @keyframes ltr {
         0% {