datafolder 1.0.11 → 1.0.13

package/src/QyFileContentUtils.js

@@ -1,172 +1,186 @@
 import {
     isNotNullObj as a,
-    arrayLast as t,
     trimArrayTail as g,
     isSimpleType as h,
-    SpecialOperators as r
+    SpecialOperators as r,
+    isEmptyObj as i
 } from "./QyUtils.js";
 
 let p = Array.isArray, {
-    $del: w,
-    $rpl: y,
-    $ext: m
+    $del: m,
+    $rpl: w,
+    $ext: y
 } = r;
 
-function i(r, n) {
+function f(r, n) {
     if (null == n) return r;
-    if (n !== w) {
+    if (n !== m) {
         if (h(n)) return n;
-        var l = n[y];
-        if (null != l) return l;
+        var e = n[w];
+        if (null != e) return e;
         if (null == r || h(r)) return n;
         if (r != n) {
-            var e, u = p(r);
-            for (e in n) {
-                var t = i(r[e], n[e]);
-                null == t ? (delete r[e], u && g(r)) : r[e] = t;
+            var l, t = p(r);
+            for (l in n) {
+                var u = f(r[l], n[l]);
+                null == u ? (delete r[l], t && g(r)) : r[l] = u;
             }
         }
         return r;
     }
 }
 
-function f(r, n) {
-    if (n == w) return w;
-    if (null != n[y]) return n;
-    var l = r[y];
-    if (null != l) r[y] = i(l, n); else {
-        if (r == w) return {
-            [y]: S(n)
+function o(r, n) {
+    if (n == m) return m;
+    if (null != n[w]) return n;
+    var e = r[w];
+    if (null != e) r[w] = f(e, n); else {
+        if (r == m) return {
+            [w]: O(n)
         };
         if (h(r) || h(n)) return n;
-        for (var e in n) {
-            var u = n[e], t = r[e];
-            r[e] = null == t ? u : f(t, u);
+        for (var l in n) {
+            var t = n[l], u = r[l];
+            r[l] = null == u ? t : o(u, t);
         }
     }
     return r;
 }
 
 function n(r, n) {
-    let l = {
+    let e = {
         oldValue: {},
         newValue: {}
     };
-    r = A(r, n, [], 0, l);
-    return l.oldValue = S(l.oldValue, !0, !0), l.newValue = S(l.newValue, !1, !1), 
+    r = S(r, n, [], 0, e);
+    return e.oldValue = O(e.oldValue, !0, !0), e.newValue = O(e.newValue, !1, !1), 
     {
         merged: r,
-        delta: l = l.oldValue || l.newValue ? l : void 0
+        delta: e = e.oldValue || e.newValue ? e : void 0
     };
 }
 
-function u(r, n, l) {
-    if (!n || 0 == n.length) return l;
-    let e = r;
+function t(r, n, e) {
+    if (!n || 0 == n.length) return e;
+    let l = r;
     for (let r = 0; r < n.length - 1; ++r) {
-        var u = n[r];
-        a(e[u]) || (e[u] = {}), e = e[u];
+        var t = n[r];
+        a(l[t]) || (l[t] = {}), l = l[t];
     }
-    return e[t(n)] = l, r;
+    var u = n.at(-1);
+    return void 0 === e ? delete l[u] : l[u] = e, r;
 }
 
-function l(r, n) {
-    if (null != n && null != (r = o(r))) {
-        if (!p(n)) return "" == n ? r : o(r[n]);
-        if (0 != n.length && (1 != n.length || "" != n[0])) for (var l of n) if (null == (r = o(r[l]))) return;
+function e(r, n) {
+    if (null != n && null != (r = u(r))) {
+        if (!p(n)) return "" == n ? r : u(r[n]);
+        if (0 != n.length && (1 != n.length || "" != n[0])) for (var e of n) if (null == (r = u(r[e]))) return;
         return r;
     }
 }
 
-function S(r, n = !0, l = !1) {
-    return function l(e, u, t) {
-        if (e instanceof Date) return e.toISOString();
-        if (!a(e)) return (t ? void 0 === e : null == e) || u && e === w ? void 0 : e;
-        if (u) {
-            let r = e[y];
-            if (null != r) return l(r, u, t);
-            let n = e[m];
-            if (null != n) return l(p(n) ? n : [ n ], u, t);
+function v(r, n, e = !1, l = 0) {
+    var t = n[l];
+    if (l == n.length - 1) return delete r[t], !e && i(r) ? void 0 : r;
+    var u = r[t];
+    if (a(u)) {
+        u = v(u, n, e, l + 1);
+        if (null == u && !e) return delete r[t], i(r) ? void 0 : r;
+        r[t] = u;
+    }
+    return r;
+}
+
+function O(r, n = !0, e = !1) {
+    return function e(l, t, u) {
+        if (l instanceof Date) return l.toISOString();
+        if (!a(l)) return (u ? void 0 === l : null == l) || t && l === m ? void 0 : l;
+        if (t) {
+            let r = l[w];
+            if (null != r) return e(r, t, u);
+            let n = l[y];
+            if (null != n) return e(p(n) ? n : [ n ], t, u);
         }
-        let n = p(e);
+        let n = p(l);
         let i = !0;
-        for (var f in e) {
-            let r = l(e[f], u, t);
-            (t ? void 0 === r : null == r) ? (delete e[f], n && g(e)) : (e[f] = r, 
+        for (var f in l) {
+            let r = e(l[f], t, u);
+            (u ? void 0 === r : null == r) ? (delete l[f], n && g(l)) : (l[f] = r, 
             i = !1);
         }
-        return i ? void 0 : e;
-    }(r, n, l);
+        return i ? void 0 : l;
+    }(r, n, e);
 }
 
-function e(r) {
-    if (h(r)) return r ? w : void 0;
+function l(r) {
+    if (h(r)) return r ? m : void 0;
     for (var n in r) {
-        var l = e(r[n]);
-        l ? r[n] = l : delete r[n];
+        var e = l(r[n]);
+        e ? r[n] = e : delete r[n];
     }
     return p(r) && g(r), r;
 }
 
-function A(n, l, e, u, t) {
-    if (null == l) return n;
-    if (l !== w) {
-        if (null == n || h(n) || h(l)) return O(n, l, e, t);
-        var i = l[y];
-        if (null != i) return O(n, i, e, t);
-        let r = l[m];
-        if (null != r) return p(r) || (r = [ r ]), (p(n) ? (n, l, r, e) => {
-            l = S(l);
-            var u = {};
-            for (let r = 0; r < l.length; ++r) {
-                var t = l[r];
-                null != t && (u[r + n.length] = h(t) ? t : {
-                    [y]: t
+function S(n, e, l, t, u) {
+    if (null == e) return n;
+    if (e !== m) {
+        if (null == n || h(n) || h(e)) return j(n, e, l, u);
+        var i = e[w];
+        if (null != i) return j(n, i, l, u);
+        let r = e[y];
+        if (null != r) return p(r) || (r = [ r ]), (p(n) ? (n, e, r, l) => {
+            e = O(e);
+            var t = {};
+            for (let r = 0; r < e.length; ++r) {
+                var u = e[r];
+                null != u && (t[r + n.length] = h(u) ? u : {
+                    [w]: u
                 });
             }
-            return $(e, r, n, u), n.concat(l);
-        } : O)(n, r, e, t);
-        if (p(n) && !p(l) || !p(n) && p(l)) return O(n, l, e, t);
-        var f = n, a = l, o = e, v = u, d = t;
+            return A(l, r, n, t), n.concat(e);
+        } : j)(n, r, l, u);
+        if (p(n) && !p(e) || !p(n) && p(e)) return j(n, e, l, u);
+        var f = n, a = e, o = l, v = t, d = u;
         if (f != a) {
             var c, s = p(f);
             for (c in a) {
                 o[v] = c, o.length = v + 1;
-                var V = A(f[c], a[c], o, v + 1, d);
+                var V = S(f[c], a[c], o, v + 1, d);
                 null == V ? (delete f[c], s && g(f)) : f[c] = V;
             }
         }
         return f;
     }
-    null != n && $(t, e, n, w);
+    null != n && A(u, l, n, m);
 }
 
-function O(r, n, l, e) {
-    n = S(n);
-    return r === n ? r : null != n ? (null == r ? $(e, l, 0 == l.length ? void 0 : null, h(n) ? n : {
-        [y]: n
-    }) : $(e, l, r, h(r) ? n : {
-        [y]: n
-    }), n) : void $(e, l, r, w);
+function j(r, n, e, l) {
+    n = O(n);
+    return r === n ? r : null != n ? (null == r ? A(l, e, 0 == e.length ? void 0 : null, h(n) ? n : {
+        [w]: n
+    }) : A(l, e, r, h(r) ? n : {
+        [w]: n
+    }), n) : void A(l, e, r, m);
 }
 
-function $(r, n, l, e) {
-    r.oldValue = u(r.oldValue, n, l), r.newValue = u(r.newValue, n, e);
+function A(r, n, e, l) {
+    r.oldValue = t(r.oldValue, n, e), r.newValue = t(r.newValue, n, l);
 }
 
-function o(r) {
-    if (null != r && r != w) {
-        for (;null != r[y]; ) if ((r = r[y]) == w) return;
+function u(r) {
+    if (null != r && r != m) {
+        for (;null != r[w]; ) if ((r = r[w]) == m) return;
         return r;
     }
 }
 
 export {
-    i as mergeContent,
-    f as mergeContentChanges,
+    f as mergeContent,
+    o as mergeContentChanges,
     n as mergeContentAndGenDelta,
-    u as setValByNamePath,
-    l as getValByNamePath,
-    S as cleanContent,
-    e as objToDelMarks
+    t as setValByNamePath,
+    e as getValByNamePath,
+    v as delValByNamePath,
+    O as cleanContent,
+    l as objToDelMarks
 };

package/src/QyItem.d.ts

@@ -14,6 +14,12 @@ export declare class QyItem {
     set fileMapLoaded(val: boolean);
     get fileContentLoaded(): boolean;
     set fileContentLoaded(val: boolean);
+    get dExpireChecked(): boolean;
+    set dExpireChecked(val: boolean);
+    get fExpireChecked(): boolean;
+    set fExpireChecked(val: boolean);
+    get cExpireChecked(): boolean;
+    set cExpireChecked(val: boolean);
     get visited(): boolean;
     set visited(val: boolean);
     get nameNum(): number | string;
@@ -27,4 +33,5 @@ export declare class QyItem {
     get parentList(): QyDir[];
     get parentNamePath(): string[];
     get namePath(): string[];
+    relativeNamePath(parent: any): any[] | undefined;
 }

package/src/QyItem.js

@@ -3,7 +3,7 @@ import {
     SpecialFilePaths as t
 } from "./QyUtils.js";
 
-let i = t.HiddenFolderName;
+let r = t.HiddenFolderName;
 
 class e {
     name;
@@ -11,41 +11,59 @@ class e {
     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);
+        (t == r || a && (a.name == r || a.underHiddenFolder)) && (this.flagInt |= 2);
     }
     get qyCache() {
         var t = this.parentDir;
         return t ? t.qyCache : this._qyCache;
     }
     get _created() {
-        return r(this, 1);
+        return i(this, 1);
     }
     set _created(t) {
-        n(this, 1, t);
+        s(this, 1, t);
     }
     get subdirMapLoaded() {
-        return r(this, 4);
+        return i(this, 4);
     }
     set subdirMapLoaded(t) {
-        n(this, 4, t);
+        s(this, 4, t);
     }
     get fileMapLoaded() {
-        return r(this, 8);
+        return i(this, 8);
     }
     set fileMapLoaded(t) {
-        n(this, 8, t);
+        s(this, 8, t);
     }
     get fileContentLoaded() {
-        return r(this, 16);
+        return i(this, 16);
     }
     set fileContentLoaded(t) {
-        n(this, 16, t);
+        s(this, 16, t);
+    }
+    get dExpireChecked() {
+        return i(this, 64);
+    }
+    set dExpireChecked(t) {
+        s(this, 64, t);
+    }
+    get fExpireChecked() {
+        return i(this, 128);
+    }
+    set fExpireChecked(t) {
+        s(this, 128, t);
+    }
+    get cExpireChecked() {
+        return i(this, 256);
+    }
+    set cExpireChecked(t) {
+        s(this, 256, t);
     }
     get visited() {
-        return r(this, 32);
+        return i(this, 32);
     }
     set visited(t) {
-        n(this, 32, t);
+        s(this, 32, t);
     }
     get nameNum() {
         var t = this._nameNum;
@@ -75,7 +93,7 @@ class e {
         return !0;
     }
     get underHiddenFolder() {
-        return r(this, 2);
+        return i(this, 2);
     }
     get parentList() {
         if (null == this._parentList) {
@@ -96,13 +114,19 @@ class e {
         return null == this._namePath && (this._namePath = [ ...this.parentNamePath, this.name ]), 
         this._namePath;
     }
+    relativeNamePath(t) {
+        var e = [ this.name ];
+        let a = this.parentDir;
+        for (;a && a != t; ) e.push(a.name), a = a.parentDir;
+        if (a == t) return e.reverse();
+    }
 }
 
-function r(t, e) {
+function i(t, e) {
     return 0 != (t.flagInt & e);
 }
 
-function n(t, e, a) {
+function s(t, e, a) {
     a ? t.flagInt |= e : t.flagInt &= ~e;
 }
 

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);
+    constructor(dataFolder: any, options?: any);
     processAfterLoad(binData: any): any;
     processBeforeSave(json: any): Buffer<any>;
 }

package/src/QyJsonSaver.js

@@ -7,7 +7,7 @@ import {
 } from "./QySaver.js";
 
 class r extends e {
-    constructor(e, r) {
+    constructor(e, r = void 0) {
         super(e, {
             ...s("QyJsonSaver"),
             ...r

package/src/QyKVData.d.ts

@@ -16,14 +16,19 @@ export declare class QyKVData {
     aclKeyValueMap: any;
     compactInterval: any;
     unloadInterval: any;
+    qyExpire: any;
     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;
+    save(changeId: any, cmdArgAsListChanges: 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;
+    monitorContentExpire(file: any, flattedAbsTimeObj: any): void;
+    unmonitorContentExpire(file: any, flattedDelObj: any): void;
+    monitorItemExpire(item: any, expireTime: any): void;
+    unmonitorItemExpire(item: any): void;
 }