datafolder 1.0.3 → 1.0.4

package/src/QySnapshots.js

@@ -1,11 +1,11 @@
 import {
-    close as e,
+    close as o,
     readSync as i,
     openSync as p
 } from "node:fs";
 
 import {
-    readdir as f,
+    readdir as l,
     readFile as d
 } from "node:fs/promises";
 
@@ -21,29 +21,30 @@ import {
     Hash_Key_Length as u,
     folderOrFileExists as m,
     listToMap as r,
-    isEmptyObj as h
+    isEmptyObj as h,
+    isString as v
 } from "./QyUtils.js";
 
 import {
-    QyBinWriter as v
+    QyBinWriter as M
 } from "./QyBinWriter.js";
 
 import {
-    bufferToNums as M,
-    numsToBuffer as g,
-    applyAclChange as l,
-    iterCmdKeys as y
+    bufferToNums as g,
+    numsToBuffer as y,
+    applyAclChange as f,
+    iterCmdKeys as S
 } from "./QyAcl.js";
 
 import {
-    QyJsonSaver as S
+    QyJsonSaver as c
 } from "./QyJsonSaver.js";
 
 import {
-    logger as c
+    logger as C
 } from "./QyLogger.js";
 
-let C = Array.isArray;
+let P = Array.isArray, x = Buffer.from("\n"), O = Buffer.from("'");
 
 class t {
     constructor(t, a) {
@@ -51,12 +52,12 @@ class t {
             ...n("QySnapshots"),
             ...a
         }).vLOutdatedPercent = 2 * a.pMOutdatedPercent;
-        var o = s(t, "info");
+        var e = s(t, "info");
         Object.assign(this, {
             snapshotFolder: t,
-            snapshotInfoFolder: o,
+            snapshotInfoFolder: e,
             options: a,
-            qyJsonSaver: new S(o, a),
+            qyJsonSaver: new c(e, a),
             numToSnapshotMap: {},
             keyToSnapshotMap: {},
             fDMap: {},
@@ -70,70 +71,72 @@ class t {
         let {
             snapshotInfoFolder: t,
             qyJsonSaver: h,
-            numToSnapshotMap: l
+            numToSnapshotMap: f
         } = this;
         if (await m(t)) {
-            var a = (await f(t)).filter(t => /^[1-9]/.test(t)).map(t => parseInt(t)).sort((t, a) => t - a);
+            var a = (await l(t)).filter(t => /^[1-9]/.test(t)).map(t => parseInt(t)).sort((t, a) => t - a);
             let p = 0, u = 0;
             await Promise.all(a.map(async t => {
-                var a = await h.loadFromFile(t + ".json"), o = l[t] = {
+                var a = await h.loadFromFile(t + ".json"), e = f[t] = {
                     snapshotNum: t,
                     info: a,
                     posMap: {},
                     outdatedCount: 0
                 };
                 ++this.snapshotCount, t > p && (p = t, u = a.maxChangeId);
-                var t = o, a = O(a = this, t), e = (c.info("Loading " + a), await d(a)), s = e.length, n = t.prefixPM = {};
+                var t = e, a = L(a = this, t), o = (C.info("Loading " + a), await d(a)), s = o.length, n = t.prefixPM = {};
                 for (let t = 0; t < s; ) {
-                    var r = t + j, i = e.toString("latin1", t, r), i = n[i] = [];
-                    t = M(e, r, i);
+                    var r = t + V, i = o.toString("latin1", t, r), i = n[i] = [];
+                    t = g(o, r, i);
                 }
             })), Object.assign(this, {
                 maxSnapshotNum: p,
                 snapshotMaxChangeId: u
             });
             var {
-                numToSnapshotMap: o,
-                prefixMap: e
+                numToSnapshotMap: e,
+                prefixMap: o
             } = this;
             for (r of a) {
-                var s, n = o[r], r = n.prefixPM;
+                var s, n = e[r], r = n.prefixPM;
                 for (s in r) {
-                    var i = e[s];
-                    i ? i.push(n) : e[s] = [ n ];
+                    var i = o[s];
+                    i ? i.push(n) : o[s] = [ n ];
                 }
             }
         }
     }
     closeAllFDs() {
         var t, a = this.fDMap;
-        for (t in a) e(a[t]), delete a[t];
+        for (t in a) o(a[t]), delete a[t];
     }
     saveKeyValueMap(t) {
         var a, {
-            keyValueMap: o,
-            info: e
-        } = t, s = (++e.vLVersion, new v()), n = (s.start(this.getVLFilePath(t)), 
-        Object.keys(o).sort()), r = {};
-        let i = 0, p = 0;
+            keyValueMap: e,
+            info: o
+        } = t, s = (++o.vLVersion, new M()), n = (s.start(this.getVLFilePath(t)), 
+        Object.keys(e).sort()), r = {};
+        let i = 0, p = 0, u;
         for (a of n) {
-            var u, h = o[a];
+            var h, f = e[a];
             let t;
-            null == h ? t = F : (u = Buffer.isBuffer(h) ? h : (u = a, h = h, Buffer.from(JSON.stringify(N(u) && !C(h) ? Object.keys(h) : h) + "\n")), 
-            h = (s.save(u), u).length, t = [ i, h ], i += h), r[a] = t, ++p;
+            null == f ? t = N : (u = Buffer.isBuffer(f) ? (s.save(f), f.length) : v(f) ? (h = Buffer.from(f), 
+            s.save(O), s.save(h), s.save(x), h.length + 2) : (h = Buffer.from(JSON.stringify(B(a) && !P(f) ? Object.keys(f) : f)), 
+            s.save(h), s.save(x), h.length + 1), t = [ i, u ], i += u), r[a] = t, 
+            ++p;
         }
         return Object.assign(t, {
             posMap: r,
             outdatedCount: 0
-        }), Object.assign(e, {
+        }), Object.assign(o, {
             totalCount: p,
             outdatedCount: 0
         }), Promise.all([ this.savePosMap(t, n), s.stop() ]);
     }
     addMaxSnapshot(t) {
         var a, {
-            numToSnapshotMap: o,
-            keyToSnapshotMap: e
+            numToSnapshotMap: e,
+            keyToSnapshotMap: o
         } = this, {
             posMap: s,
             keyValueMap: n,
@@ -143,77 +146,77 @@ class t {
             maxSnapshotNum: r,
             snapshotMaxChangeId: i
         }), n || s);
-        for (a in i) e[a] = t;
-        o[r] = t, ++this.snapshotCount;
+        for (a in i) o[a] = t;
+        e[r] = t, ++this.snapshotCount;
     }
     removeKey(t) {
-        var a = this.keyToSnapshotMap, o = a[t];
-        if (o) return this.removeKeyFromSnapshot(o, t), delete a[t], !0;
+        var a = this.keyToSnapshotMap, e = a[t];
+        if (e) return this.removeKeyFromSnapshot(e, t), delete a[t], !0;
     }
-    applyCmdObj(t, a, o) {
-        if (null != o) {
-            var e = o.length;
-            for (let t = 0; t < e; t += 2) {
-                var s = o[t], n = o[t + 1];
-                a[s] = null != n && N(s) ? r(n) : n;
+    applyCmdObj(t, a, e) {
+        if (null != e) {
+            var o = e.length;
+            for (let t = 0; t < o; t += 2) {
+                var s = e[t], n = e[t + 1];
+                a[s] = null != n && B(s) ? r(n) : n;
             }
         }
-        y(t, t => {
+        S(t, t => {
             t in a || (a[t] = this.getValueSync(t)), this.removeKey(t);
-        }), l(a, t);
+        }), f(a, t);
     }
     getValueSync(t) {
         var a = ((t, a) => {
             let {
-                keyToSnapshotMap: o,
-                prefixMap: e
-            } = t, s = o[a];
+                keyToSnapshotMap: e,
+                prefixMap: o
+            } = t, s = e[a];
             if (s) return s;
-            var n = L(a), r = e[n];
+            var n = b(a), r = o[n];
             if (r) for (;0 < r.length; ) {
                 s = r.pop();
-                var i = ((t, a, o) => {
-                    var e, {
+                var i = ((t, a, e) => {
+                    var o, {
                         posMap: s,
                         prefixPM: n
                     } = a;
-                    if (n = n[o]) return [ n, e ] = n, n = P(t, t.getPMFilePath(a), n, e), 
-                    t.loadPartialPosMapBuffer(a, o, n), s;
+                    if (n = n[e]) return [ n, o ] = n, n = F(t, t.getPMFilePath(a), n, o), 
+                    t.loadPartialPosMapBuffer(a, e, n), s;
                 })(t, s, n);
                 if (i && a in i) return s;
             }
         })(this, t);
         if (a) {
             var {
-                keyValueMap: o,
-                posMap: e
+                keyValueMap: e,
+                posMap: o
             } = a;
-            if (o) return o[t];
-            o = e[t];
-            if (o) {
-                var [ e, o ] = o;
-                if (0 != o) {
+            if (e) return e[t];
+            e = o[t];
+            if (e) {
+                var [ o, e ] = e;
+                if (0 != e) {
                     var s = this;
-                    if (a = s.getVLFilePath(a), s = P(s, a, e, o)) return a = t, 
-                    e = s, e = JSON.parse(e), N(a) ? r(e) : e;
+                    if (a = s.getVLFilePath(a), s = F(s, a, o, e)) return s[0] == O[0] ? s.toString("utf8", 1, s.length - 1) : (a = JSON.parse(s), 
+                    B(t) ? r(a) : a);
                 }
             }
         }
     }
-    iterPMBuffer(a, o) {
-        var e = a.length;
-        for (let t = 0; t < e; ) {
+    iterPMBuffer(a, e) {
+        var o = a.length;
+        for (let t = 0; t < o; ) {
             var s = t + u, n = a.toString("latin1", t, s), r = [];
-            t = M(a, s, r), o(n, r);
+            t = g(a, s, r), e(n, r);
         }
     }
-    loadPartialPosMapBuffer(o, t, a) {
+    loadPartialPosMapBuffer(e, t, a) {
         let {
-            posMap: e,
+            posMap: o,
             prefixPM: s
-        } = o, n = (delete s[t], this).keyToSnapshotMap;
+        } = e, n = (delete s[t], this).keyToSnapshotMap;
         this.iterPMBuffer(a, (t, a) => {
-            t in n ? ++o.outdatedCount : (e[t] = a, n[t] = o);
+            t in n ? ++e.outdatedCount : (o[t] = a, n[t] = e);
         });
     }
     delSnapshot(t) {
@@ -221,7 +224,7 @@ class t {
         a(this, this.getPMFilePath(t));
     }
     calOutdates() {
-        var t, a = [], o = [], e = [], s = [], {
+        var t, a = [], e = [], o = [], s = [], {
             options: n,
             numToSnapshotMap: r
         } = this, {
@@ -230,23 +233,23 @@ class t {
         } = n;
         for (t in r) {
             var u, h = r[t];
-            h.isOut || (100 == (u = V(h)) ? (this.delSnapshot(h), a.push(t)) : p < u ? (x(h) ? o : s).push(h) : Math.round(h.outdatedCount / h.info.totalCount * 100) > i ? e.push(h) : (u = this, 
-            h.info.totalCount < u.options.minSnapshotKeyCount && x(h) && o.push(h)));
+            h.isOut || (100 == (u = T(h)) ? (this.delSnapshot(h), a.push(t)) : p < u ? (j(h) ? e : s).push(h) : Math.round(h.outdatedCount / h.info.totalCount * 100) > i ? o.push(h) : (u = this, 
+            h.info.totalCount < u.options.minSnapshotKeyCount && j(h) && e.push(h)));
         }
-        return 1 == o.length && V(o[0]) < p && (o.length = 0), 0 < e.length && c.log("pMCompacts:" + e.map(t => t.snapshotNum)), 
-        0 < s.length && c.log("vLCompacts:" + s.map(t => t.snapshotNum)), 0 < o.length && c.log("combiningSnapshots:" + o.map(t => t.snapshotNum)), 
+        return 1 == e.length && T(e[0]) < p && (e.length = 0), 0 < o.length && C.log("pMCompacts:" + o.map(t => t.snapshotNum)), 
+        0 < s.length && C.log("vLCompacts:" + s.map(t => t.snapshotNum)), 0 < e.length && C.log("combiningSnapshots:" + e.map(t => t.snapshotNum)), 
         {
             emptySnapshotNumList: a,
-            combiningSnapshotList: o,
-            pMCompactSnapshotList: e,
+            combiningSnapshotList: e,
+            pMCompactSnapshotList: o,
             vLCompactSnapshotList: s
         };
     }
     getMaxCombinedSnapshot(t) {
-        let a, o;
-        for (var e of t) {
-            var s = e.snapshotNum;
-            (!o || o < s) && (a = e, o = s);
+        let a, e;
+        for (var o of t) {
+            var s = o.snapshotNum;
+            (!e || e < s) && (a = o, e = s);
         }
         return a;
     }
@@ -266,30 +269,30 @@ class t {
     }
     saveSnapshotInfo(t, a) {
         var {
-            outdatedCount: o,
-            totalCount: e
+            outdatedCount: e,
+            totalCount: o
         } = a;
-        return a.outdated = Math.round(100 * o / e) + "%", c.log("Saving snapshotInfo:" + t), 
+        return a.outdated = Math.round(100 * e / o) + "%", C.log("Saving snapshotInfo:" + t), 
         this.qyJsonSaver.saveToFile(a, t + ".json", !0);
     }
     savePosMap(t, a) {
-        var o, {
-            outdatedCount: e,
+        var e, {
+            outdatedCount: o,
             info: s,
             posMap: n
-        } = t, r = (s.outdatedCount += e, t.outdatedCount = 0, ++s.pMVersion, new v()), i = (r.start(this.getPMFilePath(t)), 
+        } = t, r = (s.outdatedCount += o, t.outdatedCount = 0, ++s.pMVersion, new M()), i = (r.start(this.getPMFilePath(t)), 
         t.prefixPM = {});
         let p = 0, u = 0, h;
-        for (o of a = a || Object.keys(n).sort()) {
-            null == h ? h = L(o) : o.startsWith(h) || (i[h] = [ p, u ], h = L(o), 
+        for (e of a = a || Object.keys(n).sort()) {
+            null == h ? h = b(e) : e.startsWith(h) || (i[h] = [ p, u ], h = b(e), 
             p += u, u = 0);
-            var l = Buffer.from(o), f = g(n[o]);
-            r.save(l), r.save(f), u += l.length + f.length;
+            var f = Buffer.from(e), l = y(n[e]);
+            r.save(f), r.save(l), u += f.length + l.length;
         }
         return null != h && (i[h] = [ p, u ]), Promise.all([ r.stop(), ((t, a) => {
-            var o, e = new v(), s = (e.start(O(t, a)), a).prefixPM;
-            for (o in s) e.save(Buffer.from(o)), e.save(g(s[o]));
-            return e.stop();
+            var e, o = new M(), s = (o.start(L(t, a)), a).prefixPM;
+            for (e in s) o.save(Buffer.from(e)), o.save(y(s[e]));
+            return o.stop();
         })(this, t) ]);
     }
     isEmptySnapshot(t) {
@@ -301,71 +304,71 @@ class t {
     }
     removeKeyFromSnapshot(t, a) {
         var {
-            posMap: o,
-            keyValueMap: e
+            posMap: e,
+            keyValueMap: o
         } = t;
-        e && delete e[a], o && delete o[a], ++t.outdatedCount;
+        o && delete o[a], e && delete e[a], ++t.outdatedCount;
     }
 }
 
-function P(t, a, o, e) {
+function F(t, a, e, o) {
     var s = ((t, a) => {
-        let o = t.fDMap, e = o[a];
-        if (!e) {
-            c.info("Opening " + a);
+        let e = t.fDMap, o = e[a];
+        if (!o) {
+            C.info("Opening " + a);
             try {
-                e = o[a] = p(a, "r");
+                o = e[a] = p(a, "r");
             } catch (t) {
-                throw c.error(`Opening ${a} failed:`, t), t;
+                throw C.error(`Opening ${a} failed:`, t), t;
             }
         }
-        return e;
-    })(t, a), n = Buffer.allocUnsafe(e);
-    for (let t = 0; t < e; ) {
-        var r = i(s, n, t, e - t, o + t);
-        if (0 == r) return void c.error(`readSync ${a} at ${o + t} returning 0 byte`);
+        return o;
+    })(t, a), n = Buffer.allocUnsafe(o);
+    for (let t = 0; t < o; ) {
+        var r = i(s, n, t, o - t, e + t);
+        if (0 == r) return void C.error(`readSync ${a} at ${e + t} returning 0 byte`);
         t += r;
     }
     return n;
 }
 
-function x(t) {
+function j(t) {
     var {
         keyValueMap: a,
-        prefixPM: o
+        prefixPM: e
     } = t;
-    return a || null == o || h(t.prefixPM);
+    return a || null == e || h(t.prefixPM);
 }
 
-function O(t, a) {
+function L(t, a) {
     var {
         snapshotNum: a,
-        info: o
+        info: e
     } = a;
-    return s(t.snapshotFolder, "" + a, o.pMVersion + "_prefixPM.txt");
+    return s(t.snapshotFolder, "" + a, e.pMVersion + "_prefixPM.txt");
 }
 
 function a(t, a) {
-    var t = t.fDMap, o = t[a];
-    null != o && (e(o), delete t[a]);
+    var t = t.fDMap, e = t[a];
+    null != e && (o(e), delete t[a]);
 }
 
-let F = [ 0, 0 ], j = 3;
+let N = [ 0, 0 ], V = 3;
 
-function L(t) {
-    return t.substring(0, j);
+function b(t) {
+    return t.substring(0, V);
 }
 
-function N(t) {
+function B(t) {
     return !t.startsWith("c");
 }
 
-function V(t) {
+function T(t) {
     var {
         outdatedCount: t,
         info: a
-    } = t, o = a.totalCount, t = t + a.outdatedCount;
-    return t == o ? 100 : Math.round(t / o * 100);
+    } = t, e = a.totalCount, t = t + a.outdatedCount;
+    return t == e ? 100 : Math.round(t / e * 100);
 }
 
 export {

package/src/rpc/getSubItems.js

@@ -1,32 +1,16 @@
-let t = new Error("No such dir");
+let h = new Error("No such dir");
 
 module.exports = ({
     dirPath: e,
     dChangeId: a,
     fChangeId: d
 }) => {
-    e = qyDB.dirP(e);
-    if (!e) return t;
-    var r = {};
-    if (a || d || (r.fullPathHash = e.fullPathHash), a != e.dChangeId) {
-        var s, a = e.sortedSubdirList, h = [];
-        for ({
-            name: s
-        } of a) h.push(s);
-        Object.assign(r, {
-            subdirList: h,
-            dChangeId: e.dChangeId
-        });
-    }
-    if (d != e.fChangeId) {
-        var i, a = e.sortedFileList, n = [];
-        for ({
-            name: i
-        } of a) n.push(i);
-        Object.assign(r, {
-            fileList: n,
-            fChangeId: e.fChangeId
-        });
-    }
-    return r;
+    var s, e = qyDB.dirP(e);
+    return e ? (s = {}, a || d || (s.fullPathHash = e.fullPathHash), a != e.dChangeId && Object.assign(s, {
+        subdirList: e.sortedSubdirList.map(e => e.name),
+        dChangeId: e.dChangeId
+    }), d != e.fChangeId && Object.assign(s, {
+        fileList: e.sortedFileList.map(e => e.name),
+        fChangeId: e.fChangeId
+    }), s) : h;
 };

package/src/rpc/queryFiles.js

@@ -5,29 +5,6 @@ module.exports = queryText => {
         view,
         limit,
         cursor
-    } = eval("((x)=>x)(" + queryText + ")"), fileList = qyDB.queryFiles(folder, value, limit, cursor), tree = {};
-    for (var file of fileList) {
-        let {
-            parentList
-        } = file, node = tree;
-        for (var dir of parentList) {
-            let {
-                name,
-                fullPathHash
-            } = dir, subdirMap = node.subdirMap;
-            subdirMap = subdirMap || (node.subdirMap = {}), node = subdirMap[name], 
-            node = node || (subdirMap[name] = {
-                fullPathHash: fullPathHash
-            });
-        }
-        let fileMap = node.fileMap;
-        fileMap = fileMap || (node.fileMap = {}), fileMap[file.name] = {
-            fileContent: file.view(view, !0),
-            fileContentKey: file.fileContentKey
-        };
-    }
-    return {
-        tree: tree,
-        count: fileList.length
-    };
+    } = eval("((x)=>x)(" + queryText + ")");
+    return qyDB.fileListToTree(qyDB.queryFiles(folder, value, limit, cursor), view);
 };

package/static/datafolderui/query-editor.js

@@ -49,7 +49,7 @@ customElements.define("query-editor", class extends HTMLElement {
         super();
     }
     compose() {
-        this.append(h("div", {
+        this.append(this._createEditor(), h("div", {
             classList: "btn-toolbar",
             role: "toolbar",
             style: {
@@ -121,6 +121,11 @@ customElements.define("query-editor", class extends HTMLElement {
             }
         }) ]);
     }
+    _createEditor() {
+        return h("textarea", {
+            style: "height:50px;width:100%"
+        });
+    }
     _createDropDownButton() {
         return h("div", {
             classList: "btn-group btn-grou-sm"