datafolder 1.0.8 → 1.0.10

package/src/QyFileLogger.js

@@ -1,37 +1,40 @@
 import {
-    join as a
+    join as r
 } from "node:path";
 
 import {
-    setFileConsoleDateDirPath as e,
-    closeFileConsole as t
-} from "./QyLogger.js";
-
-import {
-    ensureDir as i
+    ensureDir as e
 } from "./QyUtils.js";
 
 import {
-    getDefaultOptions as s
+    getDefaultOptions as i
 } from "./QyDefaultOptions.js";
 
 import {
-    QyOpRunner as o
+    QyOpRunner as t
 } from "./QyOpRunner.js";
 
 import {
-    QyLogFileSaver as r
+    QyLogFileSaver as s
 } from "./QyLogFileSaver.js";
 
-class n extends o {
+import {
+    logger as o
+} from "./QyLogger.js";
+
+class a extends t {
+    qyLogFileSaver;
+    logFileFolder;
+    dateDirPath;
+    timeoutRef;
     constructor(t, e) {
         (e = {
-            ...s("QyFileLogger"),
+            ...i("QyFileLogger"),
             ...e
         }).append = !e.clearLogAtStart, super(e, [], [ "startFileConsole", "switchFileConsole" ]), 
         Object.assign(this, {
             logFileFolder: t,
-            qyLogFileSaver: new r(this, e)
+            qyLogFileSaver: new s(this, e)
         });
     }
     save(t, e) {
@@ -41,40 +44,41 @@ class n extends o {
         return this.dateDirPath;
     }
     async _op_start() {
-        var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), g(t)), 
-        this.dateDirPath = h(this, t));
-        this.qyLogFileSaver.start(a(t, "change.txt")), await this.startFileConsole(t);
+        var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), h(t)), 
+        this.dateDirPath = n(this, t));
+        this.qyLogFileSaver.start(r(t, "change.txt")), await this.startFileConsole(t);
     }
     switch() {
-        var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), g(t)), 
-        h(this, t));
-        return this.dateDirPath != t && (this.dateDirPath = t, this.qyLogFileSaver.switch(a(t, "change.txt")), 
+        var t = new Date(), t = (this.timeoutRef = setTimeout(this.switch.bind(this), h(t)), 
+        n(this, t));
+        return this.dateDirPath != t && (this.dateDirPath = t, this.qyLogFileSaver.switch(r(t, "change.txt")), 
         this.switchFileConsole(t)), this;
     }
     async _op_startFileConsole(t) {
-        await i(t), e(t, this.options.clearLogAtStart);
+        await e(t), o.setFileConsoleDateDirPath(t, this.options.clearLogAtStart);
     }
     async _op_stop() {
-        clearTimeout(this.timeoutRef), this.timeoutRef = void 0, t(), await this.qyLogFileSaver.stop();
+        this.timeoutRef && (clearTimeout(this.timeoutRef), this.timeoutRef = void 0), 
+        o.closeFileConsole(), await this.qyLogFileSaver.stop();
     }
     async _op_switchFileConsole(t) {
-        await i(t), e(t, this.options.clearLogAtStart);
+        await e(t), o.setFileConsoleDateDirPath(t, this.options.clearLogAtStart);
     }
 }
 
-function h(t, e) {
+function n(t, e) {
     var i = e.getUTCFullYear(), s = e.getUTCMonth() + 1, o = e.getUTCDate(), e = e.getUTCHours();
-    return a(t.logFileFolder, i.toString(), l(s), l(o), l(e));
+    return r(t.logFileFolder, i.toString(), l(s), l(o), l(e));
 }
 
 function l(t) {
     return t.toString().padStart(2, "0");
 }
 
-function g(t) {
+function h(t) {
     return 1e3 * (60 * (60 - t.getUTCMinutes()) - t.getUTCSeconds());
 }
 
 export {
-    n as QyFileLogger
+    a as QyFileLogger
 };

package/src/QyIndex.d.ts

@@ -1,6 +1,6 @@
 export declare function getIndexPropPaths(queryObj: any): any[] | undefined;
 export declare function calDifferenceList(indexPropDir: any, indexPropPath: any, fileName: any, oldValue: any, newValue: any, rawContent: any): {
-    toAddFileList: never[];
-    toDelFileList: never[];
+    toAddFileList: any[];
+    toDelFileList: any[];
 } | undefined;
 export declare function parseNamePathAndQuery(indexHostDirNamePath: any, parentDir: any, indexPropPaths: any, queryObj: any, resultList: any, queryCounter: any): void;

package/src/QyIndex.js

@@ -5,13 +5,13 @@ import {
     isString as s,
     isNotNullObj as c,
     SpecialOperators as i,
-    getSuffix as v,
+    getSuffix as p,
     fromSingleName as r,
     toSingleName as o
 } from "./QyUtils.js";
 
 import {
-    getValByNamePath as p
+    getValByNamePath as v
 } from "./QyFileContentUtils.js";
 
 import {
@@ -22,26 +22,30 @@ import {
     QyIntersectNode as y
 } from "./QyIntersectNode.js";
 
-let b = Array.isArray, {
-    $or: S,
-    $and: h
-} = i, N = new m(), t = [];
+import {
+    logger as b
+} from "./QyLogger.js";
+
+let S = Array.isArray, {
+    $or: h,
+    $and: N
+} = i, $ = new m(), l = [];
 
 function e(e) {
-    if (null != e && !s(e)) return function r(i, n, l, t) {
-        if (H(i)) 0 < l.length && (n[o(l)] = 1); else {
-            let e = i[S] || i[h];
-            if (null != e) if (b(e)) for (var f of e) r(f, n, l, t), l.length = t; else r(e, n, l, t), 
-            l.length = t; else for (var u in i) l.push(u), r(i[u], n, l, t + 1), 
-            l.length = t;
+    if (null != e && !s(e)) return function r(i, n, t, l) {
+        if (C(i)) 0 < t.length && (n[o(t)] = 1); else {
+            let e = i[h] || i[N];
+            if (null != e) if (S(e)) for (var f of e) r(f, n, t, l), t.length = l; else r(e, n, t, l), 
+            t.length = l; else for (var u in i) t.push(u), r(i[u], n, t, l + 1), 
+            t.length = l;
         }
     }(e, e = {}, [], 0), Object.keys(e).map(e => r(e));
 }
 
-function n(e, r, i, n, l, t) {
-    n = p(n, r), l = p(l, r);
-    if (n !== l) {
-        var f, u, o, a, t = b(l) || b(p(t, r)), s = Object.fromEntries(D(n, t).map(e => [ JSON.stringify(e), e ])), d = Object.fromEntries(D(l, t).map(e => [ JSON.stringify(e), e ])), g = [], c = [];
+function n(e, r, i, n, t, l) {
+    n = v(n, r), t = v(t, r);
+    if (n !== t) {
+        var f, u, o, a, l = S(t) || S(v(l, r)), s = Object.fromEntries(Q(n, l).map(e => [ JSON.stringify(e), e ])), d = Object.fromEntries(Q(t, l).map(e => [ JSON.stringify(e), e ])), g = [], c = [];
         for (f in s) d[f] || (u = s[f], (u = e.searchSubdir(u)) && (u = u.getFile(i)) && c.push(u));
         for (o in d) s[o] || (a = d[o], a = e.searchOrCreateSubdir(a), g.push(a.getOrCreateFile(i)));
         return {
@@ -51,76 +55,76 @@ function n(e, r, i, n, l, t) {
     }
 }
 
-function $(e, r, i, n, l, t) {
-    if (s(n) || c(n)) if (e.isDir) L(e, i, n, l, t); else {
+function F(e, r, i, n, t, l) {
+    if (s(n) || c(n)) if (e.isDir) O(e, i, n, t, l); else {
         var f = e.$or;
         if (f) {
-            for (var u of f) if ($(u, r, i, n, l, t), t?.isFull) return;
-        } else for (var o of F(e = s(e) ? a(e) : e, r)) if (L(o, i, n, l, t), t?.isFull) return;
+            for (var u of f) if (F(u, r, i, n, t, l), l?.isFull) return;
+        } else for (var o of L(e = s(e) ? a(e) : e, r)) if (O(o, i, n, t, l), l?.isFull) return;
     }
 }
 
-function* F(e, r, i = 0) {
-    i == e.length ? yield r : yield* function* r(i, n, l, t) {
+function* L(e, r, i = 0) {
+    i == e.length ? yield r : yield* function* r(i, n, t, l) {
         if (null == n) return;
         if ("**" == n) {
-            l.isHiddenFolder || (yield l);
-            for (var e of l.allSubdirs()) yield e;
-        } else if ("*" == n) for (var f of l.subdirList) yield* F(i, f, t + 1); else if (g(n)) for (var u of l.filterSubdirNames(n)) yield* F(i, u, t + 1); else if (b(n)) for (var o of n) yield* r(i, o, l, t); else {
+            t.isHiddenFolder || (yield t);
+            for (var e of t.allSubdirs()) yield e;
+        } else if ("*" == n) for (var f of t.subdirList) yield* L(i, f, l + 1); else if (g(n)) for (var u of t.filterSubdirNames(n)) yield* L(i, u, l + 1); else if (S(n)) for (var o of n) yield* r(i, o, t, l); else {
             let e = n.$or || n.$in;
-            if (b(e)) for (var a of e) yield* r(i, a, l, t); else if (j(n)) for (var s of C(l, n)) yield* F(i, s, t + 1); else {
-                let e = l.getSubdir(n);
-                e && (yield* F(i, e, t + 1));
+            if (S(e)) for (var a of e) yield* r(i, a, t, l); else if (H(n)) for (var s of R(t, n)) yield* L(i, s, l + 1); else {
+                let e = t.getSubdir(n);
+                e && (yield* L(i, e, l + 1));
             }
         }
     }(e, e[i], r, i);
 }
 
-function L(r, i, n, l, t) {
+function O(r, i, n, t, l) {
     var f = r.fileCount;
     if (!(f <= 0)) {
         let e = 0;
         if (s(n)) {
             var u = r.getFile(n);
-            u && t.countOne() && (l.push(u), ++e);
+            u && l.countOne() && (t.push(u), ++e);
         } else {
             var o, u = r.qyCache, i = (0 < i?.length && u.qyDB.createIndex(r, i), 
             u.getIndexDir(r));
             if (!i) return;
             for (o of function i(n, e) {
-                if (null == e) return N;
+                if (null == e) return $;
                 if (d(e)) return new m(n.getSubdir(e));
-                if (g(e)) return O(n.filterSubdirNames(e));
-                if (j(e)) return O(C(n, e));
+                if (g(e)) return j(n.filterSubdirNames(e));
+                if (H(e)) return j(R(n, e));
                 let {
-                    $link: l,
-                    $spec: t
+                    $link: t,
+                    $spec: l
                 } = e;
-                if (null != l) {
+                if (null != t) {
                     let e = new m(), {
                         qyCache: r,
                         subdirList: i
                     } = n;
-                    for (var f of i) R(r, l, f.name, t) && e.addDir(f);
+                    for (var f of i) D(r, t, f.name, l) && e.addDir(f);
                     return e;
                 }
                 let u = new y();
-                if (b(e)) for (var r of e) u.addNode(i(n, r)); else for (var o in e) {
+                if (S(e)) for (var r of e) u.addNode(i(n, r)); else for (var o in e) {
                     let r = e[o];
-                    if (o == S) if (b(r)) {
+                    if (o == h) if (S(r)) {
                         let e = new m();
                         for (var a of r) e.addNode(i(n, a));
                         u.addNode(e);
-                    } else u.addNode(i(n, r)); else if (o == h) if (b(r)) for (var s of r) u.addNode(i(n, s)); else u.addNode(i(n, r)); else {
+                    } else u.addNode(i(n, r)); else if (o == N) if (S(r)) for (var s of r) u.addNode(i(n, s)); else u.addNode(i(n, r)); else {
                         let e = n.getSubdir(o);
-                        if (null == e) return N;
+                        if (null == e) return $;
                         u.addNode(i(e, r));
                     }
                 }
                 return u;
-            }(i, n).getFiles(t)) l.push(r.getFile(o)), ++e;
+            }(i, n).getFiles(l)) t.push(r.getFile(o)), ++e;
         }
-        logger.info(`Checking ${f} file${v(f)}, result: ${e} file` + v(e));
+        b.info(`Checking ${f} file${p(f)}, result: ${e} file` + p(e));
     }
 }
 
@@ -129,85 +133,85 @@ function u(e) {
     return "number" == r || "boolean" == r || "string" == r && !(e in i);
 }
 
-function O(e) {
-    if (0 == e.length) return N;
+function j(e) {
+    if (0 == e.length) return $;
     var r, i = new m();
     for (r of e) i.addDir(r);
     return i;
 }
 
-function j(e) {
+function H(e) {
     return null != e && null != (e.$gt ?? e.$lt ?? e.$gte ?? e.$lte);
 }
 
-function H(e) {
-    return null == e || d(e) || g(e) || j(e);
+function C(e) {
+    return null == e || d(e) || g(e) || H(e);
 }
 
-function C(e, {
+function R(e, {
     $gt: r,
     $gte: i,
     $lte: n,
-    $lt: l
+    $lt: t
 }) {
-    if (null != r && null != i && (i <= r ? i = void 0 : r = void 0), null != l && null != n && (l <= n ? n = void 0 : l = void 0), 
-    null != r) if (null != l) {
-        if (r < l) return e.compareSubdirRangeL2H(e => r < e && e < l);
+    if (null != r && null != i && (i <= r ? i = void 0 : r = void 0), null != t && null != n && (t <= n ? n = void 0 : t = void 0), 
+    null != r) if (null != t) {
+        if (r < t) return e.compareSubdirRangeL2H(e => r < e && e < t);
     } else {
         if (null == n) return e.compareSubdirRangeH2L(e => r < e);
         if (r < n) return e.compareSubdirRangeL2H(e => r < e && e <= n);
-    } else if (null != i) if (null != l) {
-        if (i < l) return e.compareSubdirRangeL2H(e => i <= e && e < l);
+    } else if (null != i) if (null != t) {
+        if (i < t) return e.compareSubdirRangeL2H(e => i <= e && e < t);
     } else {
         if (null == n) return e.compareSubdirRangeH2L(e => i <= e);
         if (i < n) return e.compareSubdirRangeL2H(e => i <= e && e <= n);
         if (i == n) return [ e.getSubdir(i) ];
     } else {
-        if (null != l) return e.compareSubdirRangeL2H(e => e < l);
+        if (null != t) return e.compareSubdirRangeL2H(e => e < t);
         if (null != n) return e.compareSubdirRangeL2H(e => e <= n);
     }
-    return t;
+    return l;
 }
 
-function R(e, r, i, n) {
+function D(e, r, i, n) {
     var r = e.getDir(r);
-    return !!r && !!(r = r.getFile(i)) && (null == n || function r(i, n, l) {
+    return !!r && !!(r = r.getFile(i)) && (null == n || function r(i, n, t) {
         if (null == n) return !1;
-        if (d(l)) return b(n) ? n.includes(l) : c(n) ? n[l] : n == l;
-        if (g(l)) return l(n);
-        if (b(l)) {
-            if (!b(n)) return !1;
-            for (let e = 0; e < l.length; ++e) if (!r(i, n[e], l[e])) return !1;
+        if (d(t)) return S(n) ? n.includes(t) : c(n) ? n[t] : n == t;
+        if (g(t)) return t(n);
+        if (S(t)) {
+            if (!S(n)) return !1;
+            for (let e = 0; e < t.length; ++e) if (!r(i, n[e], t[e])) return !1;
         } else {
             var e, {
-                $link: t,
+                $link: l,
                 $spec: f
-            } = l;
-            if (t) {
-                if (d(n)) return R(i, t, n, f);
-                if (b(n)) {
-                    for (var u of n) if (R(i, t, u, f)) return !0;
-                } else for (var o in n) if (R(i, t, o, f)) return !0;
+            } = t;
+            if (l) {
+                if (d(n)) return D(i, l, n, f);
+                if (S(n)) {
+                    for (var u of n) if (D(i, l, u, f)) return !0;
+                } else for (var o in n) if (D(i, l, o, f)) return !0;
                 return !1;
             }
-            if (d(n) || b(n)) return !1;
-            for (e in l) if (!r(i, n[e], l[e])) return !1;
+            if (d(n) || S(n)) return !1;
+            for (e in t) if (!r(i, n[e], t[e])) return !1;
         }
         return !0;
     }(e, r.fileContent, n));
 }
 
-function D(e, r, i = [], n = [], l = 0) {
-    if (null != e) if (u(e = c(e) && r ? Object.values(e) : e)) n[l] = e, n.length = l + 1, 
-    i.push([ ...n ]); else if (b(e)) {
-        n.length = l + 1;
-        for (var t of e.filter(e => u(e))) n[l] = t, i.push([ ...n ]);
-    } else if (c(e)) for (var f in e) n[l] = f, n.length = l + 1, D(e[f], !1, i, n, l + 1);
+function Q(e, r, i = [], n = [], t = 0) {
+    if (null != e) if (u(e = c(e) && r ? Object.values(e) : e)) n[t] = e, n.length = t + 1, 
+    i.push([ ...n ]); else if (S(e)) {
+        n.length = t + 1;
+        for (var l of e.filter(e => u(e))) n[t] = l, i.push([ ...n ]);
+    } else if (c(e)) for (var f in e) n[t] = f, n.length = t + 1, Q(e[f], !1, i, n, t + 1);
     return i;
 }
 
 export {
     e as getIndexPropPaths,
     n as calDifferenceList,
-    $ as parseNamePathAndQuery
+    F as parseNamePathAndQuery
 };

package/src/QyIndexPropTree.d.ts

@@ -1,4 +1,8 @@
 export declare class QyIndexPropTree {
+    rootNode: any;
+    changeCount: any;
+    allIndexPropPaths: any;
+    _cachedChangeCount: any;
     constructor();
     insert(indexPropPath: any): void;
     remove(indexPropPath: any): any;

package/src/QyIndexPropTree.js

@@ -1,7 +1,12 @@
 let t = Array.isArray;
 
-class i {
-    constructor(e, t) {
+class o {
+    name;
+    parent;
+    children;
+    childCount;
+    indexPropPath;
+    constructor(e = void 0, t = void 0) {
         Object.assign(this, {
             name: e,
             parent: t,
@@ -14,7 +19,7 @@ class i {
         !0);
         var r = e[t];
         let h;
-        return n ? (h = n[r]) || (h = n[r] = new i(r, this), ++this.childCount) : (h = new i(r, this), 
+        return n ? (h = n[r]) || (h = n[r] = new o(r, this), ++this.childCount) : (h = new o(r, this), 
         this.children = {
             [r]: h
         }, ++this.childCount), h.insert(e, t + 1);
@@ -23,19 +28,19 @@ class i {
         var {
             parent: r,
             name: h,
-            children: i
+            children: o
         } = this;
         if (t == e.length) return this.indexPropPath && (n.removed = !0, delete this.indexPropPath), 
-        r && o(this) && function e(t, n) {
+        r && i(this) && function e(t, n) {
             let {
                 children: r,
                 parent: h,
-                name: i
+                name: o
             } = t;
-            r[n] && (delete r[n], 0 == --t.childCount && delete t.children, h) && o(t) && e(h, i);
+            r[n] && (delete r[n], 0 == --t.childCount && delete t.children, h) && i(t) && e(h, o);
         }(r, h), n;
         this.indexPropPath && (n.hasPrefix = !0);
-        r = i && i[e[t]];
+        r = o && o[e[t]];
         return r ? r.remove(e, t + 1, n) : n;
     }
     getAllIndexPropPaths(e) {
@@ -47,14 +52,18 @@ class i {
     }
 }
 
-function o(e) {
+function i(e) {
     return !e.indexPropPath && 0 == e.childCount;
 }
 
 class r {
+    rootNode;
+    changeCount;
+    allIndexPropPaths;
+    _cachedChangeCount;
     constructor() {
         Object.assign(this, {
-            rootNode: new i(),
+            rootNode: new o(),
             changeCount: 0,
             allIndexPropPaths: []
         });

package/src/QyIntersectNode.d.ts

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

package/src/QyIntersectNode.js

@@ -3,6 +3,7 @@ import {
 } from "./QyUnionNode.js";
 
 class n extends t {
+    sorted = !1;
     constructor() {
         super(), Object.assign(this, {
             fileCount: void 0

package/src/QyJsonSaver.d.ts

@@ -1,6 +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>;
+    processAfterLoad(binData: any): any;
+    processBeforeSave(json: any): Buffer<any>;
 }

package/src/QyJsonSaver.js

@@ -13,11 +13,11 @@ class r extends e {
             ...r
         });
     }
-    processAfterLoad(e, r) {
-        return JSON.parse(super.processAfterLoad(e, r));
+    processAfterLoad(e) {
+        return JSON.parse(super.processAfterLoad(e));
     }
-    processBeforeSave(e, r) {
-        return super.processBeforeSave(JSON.stringify(e), r);
+    processBeforeSave(e) {
+        return super.processBeforeSave(JSON.stringify(e));
     }
 }
 

package/src/QyKVData.d.ts

@@ -1,4 +1,21 @@
 export declare class QyKVData {
+    kvFolder: any;
+    snapshotFolder: any;
+    qyCache: any;
+    options: any;
+    qyKVDataSaver: any;
+    qySnapshotCompactor: any;
+    qyKVDataCleaner: any;
+    compactState: number;
+    compactMaxChangeId: number;
+    snapshotSavedChangeId: number;
+    maxChangeId: number;
+    emptySnapshotNumVersionList: any[];
+    isStopping: boolean;
+    qySnapshots: any;
+    aclKeyValueMap: any;
+    compactInterval: any;
+    unloadInterval: any;
     constructor(kvFolder: any, options: any, qyCache: any);
     start(maxChangeId: any, loadedMaxAclNum: any, qySnapshots: any, aclKeyValueMap: any): this;
     stop(): Promise<void>;
@@ -7,6 +24,6 @@ export declare class QyKVData {
     decreaseChangeId(): void;
     getValueSync(key: any): any;
     removeKey(key: any): any;
-    onSnapshotSavedChangeId(snapshotSavedChangeId: any, pMOnlySnapshot: any): void;
+    onSnapshotSavedChangeId(snapshotSavedChangeId: any, pMOnlySnapshot?: any): void;
     onCompactUpdates(compactUpdates: any): void;
 }