efront 2.42.0 → 2.42.1

package/coms/compile/scanner2.js

@@ -147,9 +147,13 @@ var getDeclared = function (o, kind) {
             }
         }
         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 PROPERTY:
             case EXPRESS:
                 declared[o.text] = true;
                 o.kind = kind;
@@ -225,6 +229,7 @@ var compress = function (scoped, maped) {
         for (var cx = 0, dx = keys.length; cx < dx; cx++) {
             var k = keys[cx];
             var name = names[cx];
+            map[k] = name;
             var list = used[k];
             if (list) for (var u of list) {
                 if (!u) continue;
@@ -241,6 +246,7 @@ var compress = function (scoped, maped) {
     }
 };
 
+
 class Program extends Array {
     COMMENT = COMMENT
     SPACE = SPACE
@@ -254,6 +260,21 @@ class Program extends Array {
     LABEL = LABEL
     PROPERTY = PROPERTY
     pressed = false
+    _scoped = null;
+    isExpress() {
+        if (!this.first) return false;
+        var first = this.first;
+        if (first.type === SCOPED) {
+            if (first.entry === '{') return false;
+        }
+        else if (first.type === STRAP) {
+            if (!/^(new|void|typeof|delete|class|function|await)/.test(first.text)) return false;
+        }
+        else if (!~[EXPRESS, STAMP, QUOTED, SCOPED, VALUE].indexOf(first.type)) return false;
+        var last = skipAssignment(this.first);
+        return this.lastUncomment === last || !last;
+    }
+
     toString() {
         var lasttype;
         var result = [];
@@ -294,7 +315,7 @@ class Program extends Array {
                     result.push(o.leave);
                     break;
                 default:
-                    if ([STRAP, EXPRESS, VALUE].indexOf(lasttype) >= 0 && [STRAP, EXPRESS, VALUE].indexOf(o.type) >= 0) result.push(" ");
+                    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);
@@ -328,8 +349,20 @@ class Program extends Array {
         this.forEach(run);
         return result.join("");
     }
-    toScoped() {
-        var used = Object.create(null); var vars = Object.create(null), lets = vars; var scoped = [];
+    get envs() {
+        return this.scoped.envs;
+    }
+    get vars() {
+        return this.scoped.vars;
+    }
+    get used() {
+        return this.scoped.used;
+    }
+    get scoped() {
+        if (this._scoped) return this._scoped;
+        var used = Object.create(null); var vars = Object.create(null), lets = vars;
+        var scoped = this._scoped = [];
+        scoped.code = this;
         var run = function (o, id) {
             loop: while (o) {
                 var isCatch = false;
@@ -550,15 +583,23 @@ class Program extends Array {
             }
         }
         scoped.envs = envs;
-        return scoped;
+        return this._scoped;
     }
     getUndecleared() {
-        return this.toScoped().envs;
+        return this.envs;
     }
+    // 绕开低版本ie的异常属性
+    detour() {
+    }
+    // 标记要保留的代码
+    ahchor() { }
+    // 清理无效的代码
+    clean() {
+    }
+    // 压缩
     press() {
         this.pressed = true;
-        var scoped = this.toScoped();
-        compress(scoped);
+        compress(this.scoped);
         return this;
     }
 }
@@ -582,7 +623,7 @@ class Javascript {
     stamps = "/=+;|:?<>-!~@#%^&*,".split("")
     value_reg = /^(false|true|null|Infinity|NaN|undefined|arguments|this)$/
     number_reg = /^[\+\-]?(0x[0-9a-f]+|0b\d+|0o\d+|(\d*\.\d+|\d+\.?)(e[\+\-]?\d+|[mn])?)$/i;
-    transive = /^(new|void|in|of|typeof|delete|case|return|await|export|default|instanceof|throw|extends|import|from)$/
+    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
     else,case,void,with,enum,from
@@ -937,12 +978,17 @@ class Javascript {
                     else if (!queue.lastUncomment) {
                         scope.isObject = queue.inExpress;
                     }
-                    else if (~[STAMP, STRAP].indexOf(queue.lastUncomment.type)) {
-                        if (queue.lastUncomment.type === STAMP && queue.lastUncomment.text === ':') {
+                    else if (queue.lastUncomment.type === STAMP) {
+                        if (queue.lastUncomment.text === ':') {
                             scope.isObject = queue.inExpress;
                         }
-                        else if (!/try|do|=>|;|else|catch/i.test(queue.lastUncomment.text)) scope.isObject = true;
+                        else scope.isObject = !/^(;|\+\+|\-\-|=>)$/.test(queue.lastUncomment.text);
+                    }
+                    else if (STRAP === queue.lastUncomment.type) {
+                        if (queue[queue.length - 1].type === SPACE && queue.lastUncomment.text === 'return');
+                        else scope.isObject = queue.inExpress;
                     }
+                    queue.inExpress = scope.isObject;
                 }
                 else {
                     scope.isExpress = queue.inExpress;

package/coms/compile/scanner2_test.js

@@ -63,7 +63,7 @@ function testVariables() {
 
     })
 }
-// testSpeed();
+testSpeed();
 testVariables();
 // var typescript = require("../typescript/index");
 // typescript.transpile(data.toString(), { noEmitHelpers: true });

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "2.42.0",
+    "version": "2.42.1",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {