datafolder 1.0.6 → 1.0.8

package/src/QyIndexPropTree.js

@@ -9,41 +9,41 @@ class i {
         });
     }
     insert(e, t) {
-        var r = this.children;
+        var n = this.children;
         if (t == e.length) return !this.indexPropPath && (this.indexPropPath = e, 
         !0);
-        var n = e[t];
+        var r = e[t];
         let h;
-        return r ? (h = r[n]) || (h = r[n] = new i(n, this), ++this.childCount) : (h = new i(n, this), 
+        return n ? (h = n[r]) || (h = n[r] = new i(r, this), ++this.childCount) : (h = new i(r, this), 
         this.children = {
-            [n]: h
+            [r]: h
         }, ++this.childCount), h.insert(e, t + 1);
     }
-    remove(e, t = 0, r = {}) {
+    remove(e, t = 0, n = {}) {
         var {
-            parent: n,
+            parent: r,
             name: h,
             children: i
         } = this;
-        if (t == e.length) return this.indexPropPath && (r.removed = !0, delete this.indexPropPath), 
-        n && o(this) && function e(t, r) {
+        if (t == e.length) return this.indexPropPath && (n.removed = !0, delete this.indexPropPath), 
+        r && o(this) && function e(t, n) {
             let {
-                children: n,
+                children: r,
                 parent: h,
                 name: i
             } = t;
-            n[r] && (delete n[r], 0 == --t.childCount && delete t.children, h) && o(t) && e(h, i);
-        }(n, h), r;
-        this.indexPropPath && (r.hasPrefix = !0);
-        n = i && i[e[t]];
-        return n ? n.remove(e, t + 1, r) : r;
+            r[n] && (delete r[n], 0 == --t.childCount && delete t.children, h) && o(t) && e(h, i);
+        }(r, h), n;
+        this.indexPropPath && (n.hasPrefix = !0);
+        r = i && i[e[t]];
+        return r ? r.remove(e, t + 1, n) : n;
     }
     getAllIndexPropPaths(e) {
         var {
             children: t,
-            indexPropPath: r
+            indexPropPath: n
         } = this;
-        if (r) e.push(r); else for (var n in t) t[n].getAllIndexPropPaths(e);
+        if (n) e.push(n); else for (var r in t) t[r].getAllIndexPropPaths(e);
     }
 }
 
@@ -51,7 +51,7 @@ function o(e) {
     return !e.indexPropPath && 0 == e.childCount;
 }
 
-class n {
+class r {
     constructor() {
         Object.assign(this, {
             rootNode: new i(),
@@ -71,22 +71,22 @@ class n {
         var {
             _cachedChangeCount: e,
             allIndexPropPaths: t,
-            rootNode: r,
-            changeCount: n
+            rootNode: n,
+            changeCount: r
         } = this;
-        return e != n && (t.length = 0, r.getAllIndexPropPaths(t), this._cachedChangeCount = n), 
+        return e != r && (t.length = 0, n.getAllIndexPropPaths(t), this._cachedChangeCount = r), 
         t;
     }
 }
 
 function e(e) {
     if (0 == e.length) return [];
-    var t, r = new n();
-    for (t of e) r.insert(t);
-    return r.getAllIndexPropPaths();
+    var t, n = new r();
+    for (t of e) n.insert(t);
+    return n.getAllIndexPropPaths();
 }
 
 export {
-    n as QyIndexPropTree,
+    r as QyIndexPropTree,
     e as getPrefixPropPaths
 };

package/src/QyIntersectNode.d.ts

@@ -0,0 +1,7 @@
+import { QyQueryNode } from "./QyUnionNode.ts";
+export declare class QyIntersectNode extends QyQueryNode {
+    constructor();
+    containsFile(fileName: any): any;
+    getFiles(queryCounter: any, resultMap?: {}): Generator<any, void, unknown>;
+    addNode(node: any): void;
+}

package/src/QyIntersectNode.js

@@ -2,7 +2,7 @@ import {
     QyQueryNode as t
 } from "./QyUnionNode.js";
 
-class i extends t {
+class n extends t {
     constructor() {
         super(), Object.assign(this, {
             fileCount: void 0
@@ -11,28 +11,28 @@ class i extends t {
     containsFile(t) {
         var {
             nodeList: e,
-            fileCount: n
+            fileCount: i
         } = this;
-        if (0 != e.length && 0 != n) return s(this), e[0].containsFile(t) && l(e, t);
+        if (0 != e.length && 0 != i) return s(this), e[0].containsFile(t) && l(e, t);
     }
     *getFiles(t, e = {}) {
         var {
-            nodeList: n,
-            fileCount: i
+            nodeList: i,
+            fileCount: n
         } = this;
-        if (0 != n.length && 0 != i) {
+        if (0 != i.length && 0 != n) {
             s(this);
-            for (var o of n[0].getFiles()) if (!(o in e) && l(n, o) && this.encounterOne(e, o, t) && (yield o, 
+            for (var o of i[0].getFiles()) if (!(o in e) && l(i, o) && this.encounterOne(e, o, t) && (yield o, 
             t?.isFull)) return;
         }
     }
     addNode(t) {
-        var e, n;
+        var e, i;
         t && null != t.fileCount && ({
             fileCount: e,
-            nodeList: n
-        } = this, 0 < n.length && 0 == e || (t instanceof i ? (n.push(...t.nodeList), 
-        this.sorted = !1) : n.push(t), (null == e || e > t.fileCount) && (this.fileCount = t.fileCount)));
+            nodeList: i
+        } = this, 0 < i.length && 0 == e || (t instanceof n ? (i.push(...t.nodeList), 
+        this.sorted = !1) : i.push(t), (null == e || e > t.fileCount) && (this.fileCount = t.fileCount)));
     }
 }
 
@@ -40,12 +40,12 @@ function s(t) {
     t.sorted || (t.nodeList.sort((t, e) => t.fileCount - e.fileCount), t.sorted = !0);
 }
 
-function l(e, n) {
-    var i = e.length;
-    for (let t = 1; t < i; ++t) if (!e[t].containsFile(n)) return !1;
+function l(e, i) {
+    var n = e.length;
+    for (let t = 1; t < n; ++t) if (!e[t].containsFile(i)) return !1;
     return !0;
 }
 
 export {
-    i as QyIntersectNode
+    n as QyIntersectNode
 };

package/src/QyItem.d.ts

@@ -0,0 +1,30 @@
+import type { QyDir } from "./QyDir.ts";
+import type { QyCache } from "./QyCache.ts";
+export declare class QyItem {
+    name: string;
+    parentDir: QyDir | undefined;
+    flagInt: number;
+    constructor(name: string | number, created?: boolean, parentDir?: QyDir);
+    get qyCache(): QyCache | undefined;
+    get _created(): boolean;
+    set _created(val: boolean);
+    get subdirMapLoaded(): boolean;
+    set subdirMapLoaded(val: boolean);
+    get fileMapLoaded(): boolean;
+    set fileMapLoaded(val: boolean);
+    get fileContentLoaded(): boolean;
+    set fileContentLoaded(val: boolean);
+    get visited(): boolean;
+    set visited(val: boolean);
+    get nameNum(): number | string;
+    cmp({ nameNum: num2 }: {
+        nameNum: any;
+    }): 1 | 0 | -1;
+    get fullPath(): string;
+    get fullPathHash(): string;
+    get isItem(): boolean;
+    get underHiddenFolder(): boolean;
+    get parentList(): QyDir[];
+    get parentNamePath(): string[];
+    get namePath(): string[];
+}

package/src/QyItem.js

@@ -3,59 +3,53 @@ import {
     SpecialFilePaths as t
 } from "./QyUtils.js";
 
-let s = t.HiddenFolderName;
+let i = t.HiddenFolderName;
 
 class e {
-    constructor(t, e, a) {
-        t = t.toString(), Object.assign(this, {
-            name: t,
-            parentDir: a,
-            flagInt: 0
-        }), this._created = e, a && (a.name == s || a.underHiddenFolder) && (this.flagInt |= 2);
-    }
-    _getFlag(t) {
-        return 0 != (this.flagInt & t);
-    }
-    _setFlag(t, e) {
-        e ? this.flagInt |= t : this.flagInt &= ~t;
+    name;
+    parentDir;
+    flagInt;
+    constructor(t, e = !1, a) {
+        this.name = t.toString(), this.parentDir = a, this.flagInt = 0, this._created = e, 
+        a && (a.name == i || a.underHiddenFolder) && (this.flagInt |= 2);
     }
     get qyCache() {
         var t = this.parentDir;
         return t ? t.qyCache : this._qyCache;
     }
     get _created() {
-        return this._getFlag(1);
+        return r(this, 1);
     }
     set _created(t) {
-        this._setFlag(1, t);
+        n(this, 1, t);
     }
     get subdirMapLoaded() {
-        return this._getFlag(4);
+        return r(this, 4);
     }
     set subdirMapLoaded(t) {
-        return this._setFlag(4, t);
+        n(this, 4, t);
     }
     get fileMapLoaded() {
-        return this._getFlag(8);
+        return r(this, 8);
     }
     set fileMapLoaded(t) {
-        this._setFlag(8, t);
+        n(this, 8, t);
     }
     get fileContentLoaded() {
-        return this._getFlag(16);
+        return r(this, 16);
     }
     set fileContentLoaded(t) {
-        this._setFlag(16, t);
+        n(this, 16, t);
     }
     get visited() {
-        return this._getFlag(32);
+        return r(this, 32);
     }
     set visited(t) {
-        this._setFlag(32, t);
+        n(this, 32, t);
     }
     get nameNum() {
-        var t;
-        return this._nameNum || (t = +this.name, this._nameNum = isNaN(t) ? this.name : t);
+        var t = this._nameNum;
+        return null != t ? t : (t = +this.name, this._nameNum = isNaN(t) ? this.name : t);
     }
     cmp({
         nameNum: t
@@ -81,14 +75,16 @@ class e {
         return !0;
     }
     get underHiddenFolder() {
-        return 2 & this.flagInt;
+        return r(this, 2);
     }
     get parentList() {
         if (null == this._parentList) {
             var e = this._parentList = [];
             let t = this.parentDir;
-            for (;t.parentDir; ) e.push(t), t = t.parentDir;
-            e.reverse();
+            if (null != t) {
+                for (;t.parentDir; ) e.push(t), t = t.parentDir;
+                e.reverse();
+            }
         }
         return this._parentList;
     }
@@ -102,6 +98,14 @@ class e {
     }
 }
 
+function r(t, e) {
+    return 0 != (t.flagInt & e);
+}
+
+function n(t, e, a) {
+    a ? t.flagInt |= e : t.flagInt &= ~e;
+}
+
 export {
     e as QyItem
 };

package/src/QyJsonSaver.d.ts

@@ -0,0 +1,6 @@
+import { QySaver } from "./QySaver.ts";
+export declare class QyJsonSaver extends QySaver {
+    constructor(dataFolder: any, options: any);
+    processAfterLoad(binData: any, fileName: any): any;
+    processBeforeSave(json: any, fileName: any): Buffer<any>;
+}

package/src/QyKVData.d.ts

@@ -0,0 +1,12 @@
+export declare class QyKVData {
+    constructor(kvFolder: any, options: any, qyCache: any);
+    start(maxChangeId: any, loadedMaxAclNum: any, qySnapshots: any, aclKeyValueMap: any): this;
+    stop(): Promise<void>;
+    save(changeId: any, cmdArgAsListObj: any, syncList: any, needPromise: any): any;
+    increaseChangeId(): number;
+    decreaseChangeId(): void;
+    getValueSync(key: any): any;
+    removeKey(key: any): any;
+    onSnapshotSavedChangeId(snapshotSavedChangeId: any, pMOnlySnapshot: any): void;
+    onCompactUpdates(compactUpdates: any): void;
+}

package/src/QyKVData.js

@@ -24,7 +24,7 @@ import {
 
 import {
     arrayLast as y,
-    readBufferAsync as C,
+    readBufferAsync as g,
     sleep as c
 } from "./QyUtils.js";
 
@@ -83,7 +83,12 @@ class a {
             compactInterval: s,
             unloadInterval: r
         }), n.bgLoadPosMaps ? (async a => {
-            for (var t of Object.keys(a.qySnapshots.numToSnapshotMap).sort((a, t) => t - a)) {
+            var t, {
+                qySnapshots: o,
+                options: e
+            } = a;
+            console.time("bgLoadPosMaps");
+            for (t of Object.keys(o.numToSnapshotMap).sort((a, t) => t - a)) {
                 if (await async function s(p, i, r, h, c, l) {
                     if (p.isStopping) return void (l && l.close());
                     let d = p.qySnapshots;
@@ -101,7 +106,7 @@ class a {
                     for (;0 < r.length; ) {
                         let e = y(r), n = f[e];
                         if (n) {
-                            let [ a, t ] = n, o = await C(c, l, a, t);
+                            let [ a, t ] = n, o = await g(c, l, a, t);
                             if (p.isStopping || !m[i]) return void l.close();
                             if (h != S.pMVersion) return l.close(), s(p, i, r);
                             e in f && d.loadPartialPosMapBuffer(u, e, o);
@@ -113,7 +118,7 @@ class a {
                 }(a, t), a.isStopping) break;
                 if (await c(0), a.isStopping) break;
             }
-            !a.isStopping && a.options.compactAtStart && l(a);
+            console.timeEnd("bgLoadPosMaps"), !a.isStopping && e.compactAtStart && l(a);
         })(this) : n.compactAtStart && l(this), this;
     }
     async stop() {
@@ -126,8 +131,8 @@ class a {
             unloadInterval: n,
             qyKVDataCleaner: s
         } = this;
-        clearInterval(e), clearInterval(n), await a.stop(), o && o.closeAllFDs(), 
-        await t.stop(), await s.stop();
+        clearInterval(e), clearInterval(n), this.onSnapshotSavedChangeId(await a.stop()), 
+        o && o.closeAllFDs(), await t.stop(), await s.stop();
     }
     save(a, t, o, e) {
         var n = this.qyKVDataSaver;
@@ -156,15 +161,20 @@ class a {
         o[a] = void 0;
     }
     onSnapshotSavedChangeId(a, t) {
-        if (this.snapshotSavedChangeId = a, 3 == this.compactState && a >= this.compactMaxChangeId && (K(this), 
-        this.compactState = 1), t) {
-            var o, a = t, e = this.qySnapshots, n = e.keyToSnapshotMap;
-            for (o in a.posMap) {
-                var s = n[o];
-                s && e.removeKeyFromSnapshot(s, o);
+        this.snapshotSavedChangeId = a;
+        var {
+            compactState: o,
+            compactMaxChangeId: e,
+            qyKVDataSaver: n
+        } = this;
+        if (3 == o && e <= a && (x(this), this.compactState = 1), t) {
+            var s, o = t, p = this.qySnapshots, i = p.keyToSnapshotMap;
+            for (s in o.posMap) {
+                var r = i[s];
+                r && p.removeKeyFromSnapshot(r, s);
             }
-            e.addMaxSnapshot(a), logger.info("addPMOnlySnapshot: " + e.snapshotMaxChangeId), 
-            this.qyKVDataSaver.releaseSnapshot(t.snapshotNum);
+            p.addMaxSnapshot(o), logger.info("addPMOnlySnapshot: " + p.snapshotMaxChangeId), 
+            n.releaseSnapshot(t.snapshotNum);
         }
     }
     onCompactUpdates(a) {
@@ -199,12 +209,12 @@ class a {
                         prefixPM: f
                     } = r[v], v = h[v], {
                         posMap: y,
-                        prefixPM: C,
-                        info: g
+                        prefixPM: g,
+                        info: C
                     } = v;
                     for (c in y) y[c] = S[c];
-                    for (u in C) C[u] = f[u];
-                    ++g.pMVersion, ++g.vLVersion, V(v);
+                    for (u in g) g[u] = f[u];
+                    ++C.pMVersion, ++C.vLVersion, V(v);
                 }
             }
             if (m) {
@@ -234,7 +244,7 @@ class a {
                 }
                 ++o.pMVersion, ++o.vLVersion, o.totalCount = h, i.outdatedCount = c;
             }
-            this.snapshotSavedChangeId >= this.compactMaxChangeId ? (K(this), this.compactState = 1) : this.compactState = 3;
+            this.snapshotSavedChangeId >= this.compactMaxChangeId ? (x(this), this.compactState = 1) : this.compactState = 3;
         }
     }
 }
@@ -290,7 +300,7 @@ function h(a) {
     0 < t.length && (a.removeSnapshotsFiles(t), t.length = 0);
 }
 
-function K(a) {
+function x(a) {
     a.qySnapshotCompactor.saveSnapshotInfos(), h(a);
 }
 

package/src/QyKVDataCleaner.d.ts

@@ -0,0 +1,4 @@
+import { QyMessager } from "./QyMessager.ts";
+export declare class QyKVDataCleaner extends QyMessager {
+    constructor(parent: any, kvFolder: any, options: any);
+}

package/src/QyKVDataCleaner.js

@@ -8,7 +8,7 @@ import {
 
 class s extends e {
     constructor(e, s, a) {
-        super(e, "QyKVDataCleaner_Worker.js", {
+        super(e, "QyKVDataCleaner_Worker", {
             kvFolder: s,
             options: a = {
                 ...r("QyKVDataCleaner"),

package/src/QyKVDataCleaner_Worker.d.ts

@@ -0,0 +1,13 @@
+import { QyMessageWorker } from "./QyMessageWorker.ts";
+export default class QyKVDataCleaner_Worker extends QyMessageWorker {
+    constructor({ kvFolder, options }: {
+        kvFolder: any;
+        options: any;
+    });
+    _op_start(): void;
+    _op_stop(): void;
+    _op_cleanAclFiles(maxSnapshotNum: any): Promise<void>;
+    _op_cleanPMFiles(pMChangeList: any): Promise<void>;
+    _op_cleanVLFiles(snapshotNum: any, vLVersion: any): Promise<void>;
+    _op_removeSnapshotsFiles(snapshotNumList: any): Promise<void>;
+}

package/src/QyKVDataCleaner_Worker.js

@@ -26,7 +26,7 @@ import {
     Zip_File_Extension as i
 } from "./QyCompressor.js";
 
-class s extends e {
+export default class extends e {
     constructor({
         kvFolder: e,
         options: s
@@ -108,6 +108,4 @@ async function l(s, a, o, r) {
         }
         0 < n.length && await Promise.allSettled(n);
     }
-}
-
-export default s;
+}

package/src/QyKVDataLoader.d.ts

@@ -0,0 +1,9 @@
+export declare class QyKVDataLoader {
+    constructor(kvFolder: any, options: any);
+    load(): Promise<{
+        maxChangeId: any;
+        loadedMaxAclNum: any;
+        qySnapshots: any;
+        aclKeyValueMap: any;
+    }>;
+}

package/src/QyKVDataLoader.js

@@ -1,5 +1,5 @@
 import {
-    readFile as u,
+    readFile as y,
     readdir as x
 } from "node:fs/promises";
 
@@ -20,13 +20,13 @@ import {
 } from "./QySnapshots.js";
 
 import {
-    getDefaultOptions as r
+    getDefaultOptions as l
 } from "./QyDefaultOptions.js";
 
 class a {
     constructor(a, s) {
         s = {
-            ...r("QyKVDataLoader"),
+            ...l("QyKVDataLoader"),
             ...s
         };
         var t = o(a, "snapshot");
@@ -49,15 +49,15 @@ class a {
             snapshotMaxChangeId: o
         } = a;
         if (this.maxChangeId = o, s) {
-            var e = this, r = s.filter(a => a > t), {
-                aclKeyValueMap: l,
+            var e = this, l = s.filter(a => a > t), {
+                aclKeyValueMap: r,
                 qySnapshots: i,
                 options: s
-            } = (r.sort((a, s) => a - s), e), n = s.autoRepairAclFile, p = await Promise.all(r.map(async a => u(F(e, a))));
-            for (let a = 0; a < r.length; ++a) {
-                var d = r[a], m = F(e, d), m = await M(m, p[a], n, e.maxChangeId);
+            } = (l.sort((a, s) => a - s), e), n = s.autoRepairAclFile, p = await Promise.all(l.map(async a => y(F(e, a))));
+            for (let a = 0; a < l.length; ++a) {
+                var d = l[a], m = F(e, d), m = await M(m, p[a], n, e.maxChangeId);
                 if (0 < m.length) {
-                    for (var [ h, c ] of m) i.applyCmdObj(c, l), e.maxChangeId = h;
+                    for (var [ h, c ] of m) i.applyCmdObj(c, r), e.maxChangeId = h;
                     e.loadedMaxAclNum = d;
                 }
             }
@@ -66,13 +66,13 @@ class a {
         var {
             maxChangeId: s,
             loadedMaxAclNum: f,
-            aclKeyValueMap: y
+            aclKeyValueMap: u
         } = this;
         return {
             maxChangeId: s,
             loadedMaxAclNum: f,
             qySnapshots: a,
-            aclKeyValueMap: y
+            aclKeyValueMap: u
         };
     }
 }

package/src/QyKVDataSaver.d.ts

@@ -0,0 +1,4 @@
+import { QyMessager } from "./QyMessager.ts";
+export declare class QyKVDataSaver extends QyMessager {
+    constructor(parent: any, kvFolder: any, options: any);
+}

package/src/QyKVDataSaver.js

@@ -1,15 +1,15 @@
 import {
-    QyMessager as a
+    QyMessager as e
 } from "./QyMessager.js";
 
 import {
     getDefaultOptions as r
 } from "./QyDefaultOptions.js";
 
-class e extends a {
-    constructor(a, e, s) {
-        super(a, "QyKVDataSaver_Worker.js", {
-            kvFolder: e,
+class a extends e {
+    constructor(e, a, s) {
+        super(e, "QyKVDataSaver_Worker", {
+            kvFolder: a,
             options: s = {
                 ...r("QyKVDataSaver"),
                 ...s
@@ -19,5 +19,5 @@ class e extends a {
 }
 
 export {
-    e as QyKVDataSaver
+    a as QyKVDataSaver
 };

package/src/QyKVDataSaver_Worker.d.ts

@@ -0,0 +1,13 @@
+import { QyMessageWorker } from "./QyMessageWorker.ts";
+export default class QyKVDataSaver_Worker extends QyMessageWorker {
+    constructor({ kvFolder, options }: {
+        kvFolder: any;
+        options: any;
+    });
+    _op_start(maxChangeId: any, maxSnapshotNum: any, loadedMaxAclNum: any, aclKeyValueMap: any): void;
+    _op_stop(): Promise<any>;
+    callSave(changeId: any, cmdArgAsListObj: any, syncList: any): any;
+    castSave(changeId: any, cmdArgAsListObj: any, syncList: any): any;
+    releaseSnapshot(snapshotNum: any): void;
+    onSnapshotSavedChangeId(snapshotSavedChangeId: any, pMOnlySnapshot: any): void;
+}