efront 4.27.0 → 4.28.1

package/coms/basic/$split.js

@@ -1,13 +1,23 @@
-module.exports = function (p) {
+var split = function (reg, p) {
     var s = [];
+    reg.lastIndex = 0;
+    var lastIndex = 0;
     while (p) {
-        var reg = /[\$\/\\]/g;
-        reg.lastIndex = 1;
+        reg.lastIndex++;
         var m = reg.exec(p);
-        var i = m ? m.index : p.length;
-        s.push(p.slice(0, i));
-        p = p.slice(i + 1);
+        if (!m) {
+            s.push(p.slice(lastIndex, p.length));
+            break;
+        }
+        s.push(p.slice(lastIndex, m.index));
+        lastIndex = m.index + m.length;
     }
     if (m) s.push('');
     return s;
+
+}
+module.exports = function (p) {
+    var s = split(/[\\\/]/g, p);
+    if (s.length > 1) return s;
+    return split(/\$/g, p);
 }

package/coms/basic/removeFromList.js

@@ -7,4 +7,5 @@ function removeFromList(list, item) {
         cx = list.indexOf(item, cx);
     }
     return count;
-}
+}
+module.exports = removeFromList;

package/coms/basic/strings.js

@@ -63,4 +63,4 @@ function recode(s) {
     s = encode(s);
     return s;
 }
-module.exports = { encode, decode, recode, kicode, uncode };
+export { encode, decode, recode, kicode, uncode };

package/coms/compile/Javascript.js

@@ -3,6 +3,8 @@ var strings = require("../basic/strings");
 var Program = require("./Program");
 var backEach = require("../basic/backEach");
 var parseNumber = require('../basic/parseNumber');
+var removeFromList = require("../basic/removeFromList");
+var patchname = require("./patchname");
 const {
     /*   1 */COMMENT,
     /*   2 */SPACE,
@@ -713,6 +715,7 @@ var removeExport = function (c, i, code) {
         }
         var o = n.first;
         var allexports = [];
+        var exports = used.exports;
         while (o) {
             var name = o, prop = o.text;
             if (from) {
@@ -734,6 +737,15 @@ var removeExport = function (c, i, code) {
             o = n && n.next;
             var exp = scan(`\r\nexports.${prop}=`);
             exp.push(name);
+            var exported = exp.first;
+            var u0 = used[name.tack][0];
+            var kind = u0.kind;
+            exports.push(exported);
+            if (kind === "const") {
+                exported.tack = 'exports';
+                exported.origin = name.tack;
+                exported.kind = kind;;
+            }
             name.isExpress = true;
             allexports.push(exp);
         }
@@ -743,10 +755,11 @@ var removeExport = function (c, i, code) {
             i = ni;
         }
         else {
-            code.splice(i, ni - i);
+            splice(code, i, ni - i);
         }
         for (var exp of allexports) {
-            code.splice(i, 0, ...exp);
+            splice(code, i, 0, ...exp);
+            i += exp.length;
         }
         if (!allexports.length) code.exportEmpty = true;
         return;
@@ -809,14 +822,17 @@ var removeExport = function (c, i, code) {
         }
     }
     var oi = code.indexOf(nn, i);
-    if (!code.exportDecs) {
-        code.exportDecs = [];
+    var exportDecs = code.exportDecs;
+    if (!exportDecs) {
+        exportDecs = code.exportDecs = [];
     }
+    var kind = n.text;
     dec.forEach(function rm(d) {
         if (d instanceof Array) return d.forEach(rm);
         for (var a of used[d]) {
             if (a.kind && a.kind !== 'export') continue;
-            if (!a.export) code.exportDecs.push(a), a.export = true;
+            a.kind = kind;
+            if (!a.export) exportDecs.push(a), a.export = true;
         }
     });
     dec.forEach(d => {
@@ -906,22 +922,23 @@ Javascript.prototype.fix = function (code) {
     }
     if (code.exportDecs) {
         var exportDecs = code.exportDecs;
-        delete code.exportDecs;
-        var exports = code.used.exports;
         var used = code.used;
+        var exports = used.exports;
         var envs = code.envs;
         if (!exports) {
-            exports = code.used.exports = [];
+            exports = used.exports = [];
         }
         exportDecs.forEach(e => {
             e.text = 'exports.' + e.text;
             exports.push(e);
-            removeFromList(used[e.tack], e);
-            if (!used[e.tack].length) {
-                delete used[e.tack];
-                delete envs[e.tack];
+            var tack = e.tack;
+            var ud = used[tack];
+            removeFromList(ud, e);
+            if (!ud.length) {
+                delete used[tack];
+                delete envs[tack];
             }
-            e.origin = e.tack;
+            e.origin = tack;
             e.tack = 'exports';
             if (e.needEqual) {
                 var n = e.next;

package/coms/compile/auto-const.js

@@ -0,0 +1,212 @@
+var isConst = a => a.kind === 'const';
+var autoiota = require("./autoiota");
+var removeFromList = require("../basic/removeFromList");
+var scanner2 = require("./scanner2");
+var strings = require("../basic/strings");
+var split = require("../basic/$split");
+var path = require("path");
+var fs = require('fs');
+var { STAMP, QUOTED, SCOPED, EXPRESS, COMMENT, pickArgument, remove, splice, insertBefore, VALUE, pickAssignment, createString } = require("./common");
+var getExported = function (code) {
+    var used = code.used;
+    var exports = used.exports;
+    if (!exports) {
+        if (used.module || code.return) return;
+        var consts = [];
+        for (var k in used) {
+            var u = used[k];
+            var o = u[0];
+            if (isConst(o)) {
+                o.name = o.text;
+                consts.push(o);
+            }
+        }
+        return consts;
+    }
+    var consts = [];
+    for (var a of exports) {
+        if (isConst(a)) {
+            a.name = a.origin;
+            consts.push(a);
+        }
+    }
+    return consts;
+};
+var getAssignedConst = function (a, used) {
+    var exp = pickAssignment(a);
+    var n = a.next;
+    if (!n || n.type !== STAMP || n.text !== "=") return;
+    var nn = n.next;
+    if (!nn) return;
+    if (nn !== exp[exp.length - 1]) return;
+    if (nn.type === EXPRESS) {
+        var a = nn.text;
+        if (/[\.\[]/.test(a)) return;
+        var u0 = used[a][0];
+        if (u0.kind === 'const') {
+            return getAssignedConst(u0, used);
+        }
+        return;
+    }
+    if (nn.type !== QUOTED && !nn.isdigit) return;
+    return nn;
+
+}
+var findConsts = function (text) {
+    var code = scanner2(text);
+    code.fix();
+    var consts = getExported(code);
+    if (!consts) return;
+    autoiota(code);
+    var used = code.used;
+    var vmap = Object.create(null);
+    for (var a of consts) {
+        var name = a.name;
+        if (/[\.\[]/.test(name)) continue;
+        var c = getAssignedConst(a, used);
+        if (c) vmap[name] = c;
+    }
+    return vmap;
+};
+var setEnvDefinedConsts = function (used, k, v) {
+    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);
+        }
+        removeFromList(uk, a);
+        a.type = v.type;
+        a.text = v.text;
+    }
+};
+var setMapDefinedConsts = function (u, m) {
+
+};
+var getMaped = require("./getMaped");
+var maped = Object.create(null);
+var loadConsts = function (fullpath) {
+    if (fullpath in maped) return maped[fullpath];
+    var data = fs.readFileSync(fullpath);
+    var consts = findConsts(String(data));
+    maped[fullpath] = consts;
+    return consts;
+};
+
+
+var getOnlyString = function (q) {
+    var f = q.first;
+    if (f !== q.last || f?.type !== QUOTED || f.length) return;
+    var t = strings.decode(f.text);
+    return t;
+};
+var getCopy = function (o) {
+    var a = { type: o.type, text: o.text };
+    if (o.isdigit) a.isdigit = true;
+    return a;
+}
+
+var setRequiredConsts = function (code, fullpath, commap) {
+    var mmap = commap["?"]
+    if (!mmap) return code;
+    var url = mmap[fullpath];
+    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;
+        var t = getOnlyString(q);
+        if (!t) continue;
+        var p = getMaped(upath, commap, t);
+        if (!p) continue;
+        var consts = loadConsts(p);
+        if (!consts) continue;
+        var exp = pickAssignment(r);
+        var e = exp[exp.length - 1];
+        if (e !== q) {
+            if (e.prev !== q) continue;
+            var t = null;
+            switch (e.type) {
+                default: continue;
+                case EXPRESS:
+                    t = e.text;
+                    t = t.replace(/^\./, '');
+                    if (/[\.\[]/.test(t)) continue;
+                    break;
+                case SCOPED:
+                    if (e.entry !== "[" || e.first !== e.last) continue;
+                    var t = getOnlyString(e);
+                    break;
+            }
+            if (!t || !(t in consts)) continue;
+            insertBefore(r, getCopy(consts[t]), { type: STAMP, text: ',' });
+            continue;
+        }
+        var f = exp[0];
+        if (f.type === EXPRESS) {
+            setMapDefinedConsts(f.text, consts);
+            continue;
+        }
+        if (f.type === SCOPED && f.entry === "{") {
+            var o = f.first;
+            var collected = [];
+            while (o) {
+                var exp = pickArgument(o);
+                var e = exp[exp.length - 1].next;
+                if (exp.length === 1) a: {
+                    var t = o.text;
+                    if (/[\.\[]/.test(t)) break a;
+                    if (!(t in consts)) break a;
+                    remove(o, e);
+                    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;
+            }
+            insertBefore(f, ...collected);
+        }
+    }
+    return code;
+}
+var autoConst = function (code, fullpath, ignoreImported) {
+    var vmap = 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) {
+        if (!ignoreImported) return setRequiredConsts(code, fullpath, this);
+        return code;
+    }
+    for (var k in envs) {
+        if (k === 'require') {
+            if (!ignoreImported) setRequiredConsts(code, fullpath, this);
+            continue;
+        }
+        if (k in mp) setEnvDefinedConsts(used, k, mp[k]), delete envs[k];
+    }
+    return code;
+};
+autoConst.findConsts = findConsts;
+module.exports = autoConst;

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/common.js

@@ -299,7 +299,7 @@ var getFunctionHeadBeforeScoped = function (p) {
     }
     if (p.isprop) return p;
 }
-function snapSentenceHead(o) {
+function snapAssignmentHead(o) {
     // 只检查一级
     while (o && getprev(o)) {
         var p = getprev(o);
@@ -358,7 +358,7 @@ function snapSentenceHead(o) {
             break;
         }
         if (p.type === STRAP) {
-            if (/^(?:new|void|typeof|delete|await|var|let|const|class|function|async)$/.test(p.text)) {
+            if (/^(?:new|void|typeof|delete|await|class|function|async)$/.test(p.text)) {
                 o = p;
                 continue;
             }
@@ -383,7 +383,7 @@ function snapSentenceHead(o) {
             break;
         }
         if (p.type === STAMP) {
-            if (/=>|;/.test(p.text)) {
+            if (/^(=>|;|,)$/.test(p.text)) {
                 break;
             }
             if (/^[\?\:]$/.test(p.text)) {
@@ -408,11 +408,6 @@ function snapSentenceHead(o) {
         }
         break;
     }
-    while (o) {
-        var p = getprev(o);
-        if (!p || p.type !== LABEL) break;
-        o = p;
-    }
     return o;
 }
 var getStrapHead = function (o) {
@@ -1228,7 +1223,7 @@ var mapDeclared = function (map, declared) {
     }
     return map;
 };
-var { uncode } = require("../basic/strings");
+import { uncode } from "../basic/strings.js";
 var saveTo = function (used, k, o) {
     k = uncode(k);
     if (!(used[k] instanceof Array)) used[k] = [];
@@ -1593,7 +1588,7 @@ var createExpressList = function (code) {
             if (/^[,;]$/.test(c.text)) {
                 ex++;
             }
-            else if (c.text === ':' && !c.isExpress && c.prev?.type !== PROPERTY) {
+            else if (c.text === ':' && !c.isExpress && getprev(c)?.type !== PROPERTY) {
                 ex++;
             }
         }
@@ -1655,11 +1650,13 @@ var remove = function (o, end) {
     var i = q.indexOf(o);
     var length = 1;
     if (arguments.length === 2) {
-        end = q.indexOf(end, i) + 1;
-        if (end < 0) end = i;
+        var e = q.indexOf(end, i);
+        if (e < 0) end = end ? i : q.length;
+        else end = e + 1;
         length = end - i;
     }
     if (i >= 0) splice(q, i, length);
+    return length;
 };
 var replace = function (o, ...args) {
     var queue = o.queue;
@@ -1739,6 +1736,29 @@ var pickArgument = function (o) {
     }
     return res;
 };
+var snapSentenceHead = function (o) {
+    while (o) {
+        o = snapAssignmentHead(o)
+        var p = getprev(o);
+        if (p?.type === STAMP && p.text === ',') {
+            var pp = getprev(p);
+            if (!pp) break;
+            o = pp;
+            continue;
+        }
+        break;
+    }
+    var p = getprev(o);
+    if (p?.type === STRAP && /^(var|let|const)$/.test(p.text)) {
+        o = p;
+    }
+    while (o) {
+        var p = getprev(o);
+        if (!p || p.type !== LABEL) break;
+        o = p;
+    }
+    return o;
+};
 var pickSentence = function (o) {
     if (!o) return [];
     if (o && o.type & (SPACE | COMMENT) && getprev(o)) o = getprev(o);
@@ -1775,6 +1795,7 @@ var pickExpress = function (o) {
     return os;
 };
 var pickAssignment = function (n) {
+    n = snapAssignmentHead(n);
     var e = skipAssignment(n);
     var values = [];
     while (n && n !== e) {
@@ -1905,7 +1926,7 @@ var isDeclareOnly = function (o) {
     return false;
 }
 
-module.exports = {
+export {
     /*   1 */COMMENT,
     /*   2 */SPACE,
     /*   4 */STRAP,
@@ -1937,6 +1958,7 @@ module.exports = {
     pickArgument,
     pickSentence,
     pickExpress,
+    snapAssignmentHead,
     pickAssignment,
     snapExpressHead,
     snapExpressFoot,

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/coms/compile/getMaped.js

@@ -0,0 +1,36 @@
+var split = require("../basic/$split");
+function getMaped(refpath, mmap, m) {
+    var refs = refpath.slice();
+    refs.pop();
+    var a = split(m);
+    for (var cx = 0; cx < a.length; cx++) switch (a[cx]) {
+        case "..":
+            if (cx > 0) {
+                a.splice(cx - 1, 2);
+                cx -= 2;
+            }
+            else {
+                refs.pop();
+            }
+            break;
+        case ".":
+        case "":
+            a.splice(cx, 1);
+            cx--;
+            break;
+    }
+    while (refs.length) {
+        var tmp = refs.concat(a);
+        var r = tmp.join("$");
+        if (r in mmap) {
+            r = mmap[r];
+            return r;
+        }
+        refs.pop();
+    }
+    if (m in mmap) {
+        var r = mmap[m];
+        return r;
+    }
+}
+module.exports = getMaped;

package/coms/compile/patchname.js

@@ -1,4 +1,4 @@
-var { QUOTED, unshort } = common;
+var { QUOTED, unshort } = require("./common");
 var patchname = function (prefix, node, alias) {
     if (node.isprop && node.short) {
         unshort(node);
@@ -11,3 +11,4 @@ var patchname = function (prefix, node, alias) {
     if (hasdot) t = "..." + t;
     node.text = t;
 };
+module.exports = patchname;

package/coms/zimoli/alert.js

@@ -1,3 +1,9 @@
+// 早上梦到我的小学同学，我知道那不是真的她。
+// 因为真的她长什么样，我已十分模糊了。
+// 梦中的她只是集合了我所有喜欢过的人的优点，然后被扣上了她的身份和名字。
+// 然而，当她没带手机充电线，我想要把充电线借给她时，看到她那厌恶的眼神。
+// 我知道，那是真的厌恶，不是调皮。
+// 离开时，她为了避开我，还故意将她的物品托付给另一个男的。
 var styles = {
     blue: "#2a83cd",
     green: "#228B22",

package/package.json

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