efront 4.0.32 → 4.0.34

package/coms/compile/Javascript.js

@@ -21,6 +21,7 @@ const {
     snapExpressHead,
     splice,
     relink,
+    setqueue,
     replace,
     skipAssignment,
 } = require("./common");
@@ -57,7 +58,7 @@ Javascript.prototype.isProperty = function (o) {
             return /^(\+\+|\-\-|;)$/.test(prev.text);
         }
         if (prev.type === EXPRESS && !/\.$/.test(prev.text)) return true;
-        if (~[SCOPED, VALUE, QUOTED, PROPERTY].indexOf(prev.type)) return true;
+        if (prev.type & (SCOPED | VALUE | QUOTED | PROPERTY)) return true;
     }
     if (!prev) return false;
     if (prev.type === PROPERTY && propresolve_reg.test(prev.text)) {
@@ -206,7 +207,7 @@ var isShortMethodEnd = function (o) {
     if (o.type !== SCOPED || o.entry !== "(") return false;
     o = o.prev;
     if (!o) return false;
-    return o.type === PROPERTY;
+    return o.isprop;
 };
 
 Javascript.prototype.setType = function (o) {
@@ -225,7 +226,7 @@ Javascript.prototype.setType = function (o) {
         else if (o.type === SCOPED) {
             if (o.entry === '[') {
                 if (queue.isObject) o.isprop = this.isProperty(o);
-                if (queue.isClass) o.isprop = !last || last.isprop || last.type === STAMP && last.text === ';';
+                if (queue.isClass) o.isprop = !last || last.isprop || last.type === STAMP && last.text === ';' || isShortMethodEnd(last);
             }
             else if (o.entry === "{") {
                 if (last && last.type === PROPERTY && last.text === 'static') {
@@ -354,7 +355,7 @@ var hasComma = function (c) {
 var removeQuote = function (o, c, i) {
     if (hasComma(c)) return;
     if (!isFinite(i)) i = o.indexOf(c);
-    o.splice(i, 1, ...c);
+    splice(o, i, 1, ...c);
     var ch = c[0];
     var cf = c[c.length - 1];
     ch.prev = c.prev;
@@ -500,13 +501,13 @@ Javascript.prototype.detour = function detour(o, ie) {
 
 var removeImport = function (c, i, code) {
     var next = c.next;
+    var { used, envs, vars } = code;
     if (next && next.type !== QUOTED) {
-        var { used, envs, vars } = code;
         var [dec, map, o] = getDeclared(c.next);
         if (dec.length !== 1 || !o) throw new Error("代码结构异常！");
         if (o.type !== STRAP || o.text !== 'from') throw new Error("缺少from语句");
     }
-    else o = c;
+    else code.splice(i, 1), o = c;
     var n = o.next;
     var t = null;
     if (n && n.type === EXPRESS) {
@@ -523,7 +524,7 @@ var removeImport = function (c, i, code) {
     if (!n || n.type !== QUOTED) throw new Error("缺少导入路径！");
     var oi = code.indexOf(o, i);
     var ns = skipAssignment(n);
-    var nsi = code.indexOf(ns, i);
+    var nsi = ns ? code.indexOf(ns, i) : code.length;
     var q = scan(`require()`);
     if (!used.require) used.require = [], envs.require = true;
     used.require.push(q[0]);
@@ -531,6 +532,7 @@ var removeImport = function (c, i, code) {
     var cs = code.splice(oi + 1, nsi - oi - 1, ...q);
     q[1].push.apply(q[1], cs);
     relink(q[1]);
+    setqueue(q[1]);
     if (!dec) return;
     var name = dec[0];
     var na = dec.attributes[0];
@@ -695,6 +697,7 @@ Javascript.prototype.fix = function (code) {
         });
     }
     relink(code);
+    setqueue(code);
 }
 Javascript.prototype.createString = createString;
 Javascript.prototype.createScoped = createScoped;

package/coms/compile/Javascript_test.js

@@ -0,0 +1,11 @@
+// 导入
+var testFix = function (a, e) {
+    var c = scanner2(a);
+    c.fix();
+    assert(c.toString(), e);
+}
+testFix(`import a from "a";console.log(a)`, 'var a = require("a"); console.log(a.default)');
+testFix(`import {a} from "a";console.log(a)`, 'var a1 = require("a"); console.log(a1.a)');
+testFix(`console.log(import("a"))`, 'console.log(require("a"))');
+testFix(`import("a")`, 'require("a")');
+testFix(`import "windows.inc"`, 'require("windows.inc")');

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.0.32",
+    "version": "4.0.34",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {