efront 4.28.0 → 4.28.1

package/coms/compile/Javascript.js

@@ -759,6 +759,7 @@ var removeExport = function (c, i, code) {
         }
         for (var exp of allexports) {
             splice(code, i, 0, ...exp);
+            i += exp.length;
         }
         if (!allexports.length) code.exportEmpty = true;
         return;
@@ -931,10 +932,9 @@ Javascript.prototype.fix = function (code) {
             e.text = 'exports.' + e.text;
             exports.push(e);
             var tack = e.tack;
-            var u = used[tack];
-            if (u[0].kind === 'const') e.kind = 'const';
-            removeFromList(u, e);
-            if (!used[tack].length) {
+            var ud = used[tack];
+            removeFromList(ud, e);
+            if (!ud.length) {
                 delete used[tack];
                 delete envs[tack];
             }

package/coms/compile/auto-const.js

@@ -1,6 +1,6 @@
 var isConst = a => a.kind === 'const';
 var autoiota = require("./autoiota");
-var autoenum = require("./autoenum");
+var removeFromList = require("../basic/removeFromList");
 var scanner2 = require("./scanner2");
 var strings = require("../basic/strings");
 var split = require("../basic/$split");
@@ -69,20 +69,22 @@ var findConsts = function (text) {
     return vmap;
 };
 var setEnvDefinedConsts = function (used, k, v) {
-    for (var a of used[k]) {
+    var uk = used[k];
+    for (var a of uk) {
         var t = a.text;
         var dots = /^\.+/.exec(t);
         if (dots) t = t.slice(dots[0].length);
         t = t.slice(a.tack.length);
         var comment = { type: COMMENT, text: `/*${k}*/` };
-        // if (t) {
-        //     insertBefore(a, comment, { type: EXPRESS, text: t });
-        // }
-        // else {
-        //     insertBefore(a, comment);
-        // }
-        // a.type = v.type;
-        // a.text = v.text;
+        if (t) {
+            insertBefore(a, comment, { type: EXPRESS, text: t });
+        }
+        else {
+            insertBefore(a, comment);
+        }
+        removeFromList(uk, a);
+        a.type = v.type;
+        a.text = v.text;
     }
 };
 var setMapDefinedConsts = function (u, m) {
@@ -106,7 +108,9 @@ var getOnlyString = function (q) {
     return t;
 };
 var getCopy = function (o) {
-    return { type: o.type, text: o.text };
+    var a = { type: o.type, text: o.text };
+    if (o.isdigit) a.isdigit = true;
+    return a;
 }
 
 var setRequiredConsts = function (code, fullpath, commap) {
@@ -116,6 +120,7 @@ var setRequiredConsts = function (code, fullpath, commap) {
     var upath = split(url);
     var requires = code.used.require;
     if (!requires) return code;
+    var used = code.used;
     for (var r of requires) {
         var q = r.next;
         if (q?.type !== SCOPED || q.entry !== '(') continue;
@@ -162,7 +167,16 @@ var setRequiredConsts = function (code, fullpath, commap) {
                     if (/[\.\[]/.test(t)) break a;
                     if (!(t in consts)) break a;
                     remove(o, e);
-                    collected.push(o, { type: STAMP, text: '=' }, getCopy(consts[t]), { type: STAMP, text: ',' });
+                    o.kind = 'const';
+                    var eq = { type: STAMP, text: '=' };
+                    o.equal = eq;
+                    o.type = EXPRESS;
+                    delete o.short;
+                    collected.push(o, eq, getCopy(consts[t]), { type: STAMP, text: ',' });
+                    var name = o.origin || o.tack;
+                    var u = used[name];
+                    removeFromList(u, o);
+                    u.unshift(o);
                 }
                 if (e?.type === STAMP && e.text === ',') e = e.next;
                 o = e;
@@ -172,19 +186,25 @@ var setRequiredConsts = function (code, fullpath, commap) {
     }
     return code;
 }
-var autoConst = function (code, fullpath) {
+var autoConst = function (code, fullpath, ignoreImported) {
     var vmap = this?.["&"];
-    var { envs, used } = code;
-    if (!vmap) return setRequiredConsts(code, fullpath, this);
+    var { envs, used, envs } = code;
+    if (!vmap) {
+        if (!ignoreImported) return setRequiredConsts(code, fullpath, this);
+        return code;
+    }
     var p = path.dirname(fullpath);
     var mp = vmap[p];
-    if (!mp) return setRequiredConsts(code, fullpath, this);
+    if (!mp) {
+        if (!ignoreImported) return setRequiredConsts(code, fullpath, this);
+        return code;
+    }
     for (var k in envs) {
         if (k === 'require') {
-            setRequiredConsts(code, fullpath, this);
+            if (!ignoreImported) setRequiredConsts(code, fullpath, this);
             continue;
         }
-        if (k in mp) setEnvDefinedConsts(used, k, mp[k]);
+        if (k in mp) setEnvDefinedConsts(used, k, mp[k]), delete envs[k];
     }
     return code;
 };

package/coms/compile/autoenum.js

@@ -1,4 +1,4 @@
-var { skipAssignment, snapSentenceHead, snapExpressFoot, EXPRESS, SPACE, SCOPED, QUOTED, VALUE, STRAP, STAMP, number_reg, createString } = require("./common");
+var { skipAssignment, snapSentenceHead, snapExpressFoot, pickAssignment, EXPRESS, SPACE, SCOPED, QUOTED, VALUE, STRAP, STAMP, number_reg, createString } = require("./common");
 var strings = require("../basic/strings");
 
 var createRefId = function (o) {
@@ -59,6 +59,8 @@ var ignore = Symbol("ignore");
 var maplist = function (u) {
     var map = Object.create(null);
     for (var o of u) {
+        if (o.maped) continue;
+        o.maped = true;
         var r = createRefId(o);
         if (!map[r]) {
             map[r] = [];

package/coms/compile/autoiota.js

@@ -1,4 +1,4 @@
-var { skipAssignment, createString, createScoped, relink, STRAP, STAMP, SCOPED, EXPRESS, VALUE, SPACE, COMMENT } = require("./common");
+var { skipAssignment, createString, createScoped, splice, relink, STRAP, STAMP, SCOPED, EXPRESS, VALUE, SPACE, COMMENT } = require("./common");
 var backEach = require("../basic/backEach");
 var scanner2 = require("./scanner2");
 
@@ -6,7 +6,7 @@ var removeNew = function (a, ai) {
     var p = a.prev;
     if (p && p.type === STRAP && p.text === 'new') {
         ai = a.queue.lastIndexOf(p, ai);
-        a.queue.splice(ai, 1);
+        splice(a.queue, ai, 1);
     }
     return ai;
 };
@@ -60,6 +60,7 @@ var assignIota = function (v) {
     ppmap.forEach((ppm, i) => {
         if (!ppm) return;
         var eq = { type: STAMP, text: '=' };
+        ppm[0].equal = eq;
         if (vmap[i]) res.push(...ppm, eq, ...vmap[i]);
         else if (ppval[i]) res.push(...ppm, eq, ...ppval[i]);
         else res.push(...ppm);
@@ -68,8 +69,7 @@ var assignIota = function (v) {
     res.pop();
     var ppi = p.queue.indexOf(pp);
     var vi = p.queue.indexOf(v, ppi);
-    p.queue.splice(ppi, vi - ppi + 1, ...res);
-    relink(p.queue);
+    splice(p.queue, ppi, vi - ppi + 1, ...res);
 }
 var arrayFillMap = function (a, i, as) {
     if (a.text !== 'Array' || !a.next) return;
@@ -89,20 +89,17 @@ var arrayFillMap = function (a, i, as) {
         var ni = a.queue.indexOf(n);
         var nnni = a.queue.indexOf(nnn, ni);
         if (!f) {
-            a.queue.splice(n + 1, nnni - ni);
-            relink(a.queue);
+            splice(a.queue, n + 1, nnni - ni);
             return;
         }
-        a.queue.splice(ni, nnni - ni);
+        splice(a.queue, ni, nnni - ni);
         nnn.unshift({ type: STAMP, text: ',' });
         nnn.unshift.apply(nnn, n);
         a.text = "ArrayFill";
-        as.splice(i, 1);
+        splice(as, i, 1);
         if (!this.envs.ArrayFill) this.envs.ArrayFill = true;
         if (!this.used.ArrayFill) this.used.ArrayFill = [];
         this.used.ArrayFill.push(a);
-        relink(nnn);
-        relink(a.queue);
         return;
     }
     var ai = a.queue.indexOf(a);

package/coms/compile/const.js

@@ -0,0 +1,14 @@
+export const [
+    /*   1 */COMMENT,
+    /*   2 */SPACE,
+    /*   4 */STRAP,
+    /*   8 */STAMP,
+    /*  16 */VALUE,
+    /*  32 */QUOTED,
+    /*  64 */PIECE,
+    /* 128 */EXPRESS,
+    /* 256 */SCOPED,
+    /* 512 */LABEL,
+    /*1024 */PROPERTY,
+    /*2048 */ELEMENT,
+] = new Array(20).fill(0).map((_, a) => 1 << a);

package/coms/compile/const_test.js

@@ -0,0 +1 @@
+console.log(SPACE, COMMENT);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.28.0",
+    "version": "4.28.1",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {