datafolder 1.0.12 → 1.0.13

package/src/QyFile.js

@@ -7,25 +7,25 @@ import {
     SpecialFilePaths as n,
     getContentKey as i,
     isNotNullObj as a,
-    isSimpleType as d,
-    fromSingleName as o,
-    isEmptyObj as l
+    isSimpleType as h,
+    fromSingleName as s,
+    isEmptyObj as r,
+    getNowTime as l
 } from "./QyUtils.js";
 
 import {
-    getValByNamePath as r
+    getValByNamePath as o
 } from "./QyFileContentUtils.js";
 
 import {
-    QyIndexPropTree as s
+    QyIndexPropTree as f
 } from "./QyIndexPropTree.js";
 
 import {
-    analyzeExpireInfo as f,
     handleExpiredProps as u
 } from "./QyExpire.js";
 
-let C = Array.isArray, h = n.IndexPropPathsFileName, {
+let d = Array.isArray, C = n.IndexPropPathsFileName, {
     $spec: p,
     $raw: c,
     $clone: y
@@ -50,15 +50,7 @@ class m extends e {
         return this._fileContentKey || (this._fileContentKey = i(this.fullPathHash));
     }
     get fileContent() {
-        var e, t, n, i, r = this;
-        return r.created && null == r._fileContent && !r.fileContentLoaded && (r.fileContentLoaded = !0, 
-        e = r.qyCache) && (r._fileContent = e.qyKVData.getValueSync(r.fileContentKey), 
-        !r.underHiddenFolder && (r = r, i = (e = e).getExpireInfoFile(r.fullPathHash)) && ({
-            expiredProps: i,
-            remainingExpireInfoObj: t,
-            toDeleteFile: n
-        } = f(i.fileContent), u(e.qyDB, r, i, n), l(t) || e.monitorContentExpire(r, t))), 
-        this.visited = !0, this._fileContent;
+        return this.ensureLoaded(), this.visited = !0, this._fileContent;
     }
     set fileContent(e) {
         this.visited = !0, this._fileContent = e;
@@ -70,12 +62,12 @@ class m extends e {
             fileContent: n,
             underHiddenFolder: i
         } = this;
-        if (e && i && t == h) {
+        if (e && i && t == C) {
             e = this._qyIndexPropTree;
             if (e) return e;
-            var r, l = this._qyIndexPropTree = new s();
-            for (r in n) l.insert(o(r));
-            return l;
+            var r, o = this._qyIndexPropTree = new f();
+            for (r in n) o.insert(s(r));
+            return o;
         }
     }
     get isFile() {
@@ -88,42 +80,65 @@ class m extends e {
     get clonedContent() {
         return structuredClone(this.fileContent);
     }
-    setContent(e) {
-        this.fileContent = e;
-    }
     view(e = y, t) {
         var n = this.fileContent;
-        return null == n || d(n) ? n : function t(n, i, r, l) {
+        return null == n || h(n) ? n : function t(n, i, r, o) {
             if (r === c) return i;
             if (null == r) return;
-            if (d(r)) return r ? l ? i : structuredClone(i) : void 0;
+            if (h(r)) return r ? o ? i : structuredClone(i) : void 0;
             let e = r.$link;
-            if (null != e) return _(n, i, e, r[p]);
-            if (d(i)) return i;
-            C(r) && (r = Object.fromEntries(r.filter(e => e).map(e => [ e, 1 ])));
-            let o = C(i) ? [] : {};
+            if (null != e) return v(n, i, e, r[p]);
+            if (h(i)) return i;
+            d(r) && (r = Object.fromEntries(r.filter(e => e).map(e => [ e, 1 ])));
+            let s = d(i) ? [] : {};
             let {
-                $all: s,
+                $all: l,
                 "**": a
             } = r;
-            if (s || a) for (var f in i) {
-                let e = r[f] ?? s ?? a;
-                e && (o[f] = t(n, i[f], e, l));
+            if (l || a) for (var f in i) {
+                let e = r[f] ?? l ?? a;
+                e && (s[f] = t(n, i[f], e, o));
             } else for (var u in r) {
                 let e = r[u];
-                e && (o[u] = t(n, i[u], e, l));
+                e && (s[u] = t(n, i[u], e, o));
             }
-            return o;
+            return s;
         }(this, n, e, t);
     }
     prop(e, t = y, n) {
         var i;
-        if (t) return e = r(this.fileContent, C(e) ? e : [ e ]), i = t.$link, null != i ? _(this, e, i, t[p], n) : n || t === c ? e : structuredClone(e);
+        if (t) return e = o(this.fileContent, d(e) ? e : [ e ]), i = t.$link, null != i ? v(this, e, i, t[p], n) : n || t === c ? e : structuredClone(e);
     }
     unloadFileContent() {
         this.created && this.fileContentLoaded && null != this._fileContent && (this._fileContent = void 0, 
         this.fileContentLoaded = !1);
     }
+    ensureLoaded() {
+        if (this.created && null == this._fileContent && !this.fileContentLoaded) {
+            this.fileContentLoaded = !0;
+            var e = this.qyCache;
+            if (!e) return;
+            if (this._fileContent = e.qyKVData.getValueSync(this.fileContentKey), 
+            !this.underHiddenFolder) {
+                var t, n, i = this;
+                !i.cExpireChecked && (i.cExpireChecked = !0, t = e.getExpireInfoFile(i.fullPathHash, "c")) && ({
+                    expiredProps: t,
+                    remainingExpireInfoObj: n
+                } = ((e, t = l()) => {
+                    let n, i = {};
+                    for (var r in e) {
+                        var o = e[r];
+                        o <= t ? n ? n.push(r) : n = [ r ] : i[r] = o;
+                    }
+                    return {
+                        expiredProps: n,
+                        remainingExpireInfoObj: i
+                    };
+                })(t.fileContent), t && u(e.qyDB, i, t), r(n) || e.monitorContentExpire(i, n));
+            }
+        }
+        return this;
+    }
 }
 
 function g(e, t, n, i) {
@@ -134,15 +149,15 @@ function g(e, t, n, i) {
     return t;
 }
 
-function _(e, t, n, i, r = !1) {
-    let l = e.qyCache.getDir(n);
-    if (C(t)) return t.map(e => g(l, e, i, r));
+function v(e, t, n, i, r = !1) {
+    let o = e.qyCache.getDir(n);
+    if (d(t)) return t.map(e => g(o, e, i, r));
     if (a(t)) {
-        var o, s = {};
-        for (o in t) s[o] = g(l, o, i, r);
-        return s;
+        var s, l = {};
+        for (s in t) l[s] = g(o, s, i, r);
+        return l;
     }
-    return g(l, t, i, r);
+    return g(o, t, i, r);
 }
 
 export {

package/src/QyFileContentUtils.d.ts

@@ -6,5 +6,6 @@ export declare function mergeContentAndGenDelta(oldContent: any, newContent: any
 };
 export declare function setValByNamePath(rootObj: any, namePath: any, value: any): any;
 export declare function getValByNamePath(obj: any, namePath: any): any;
+export declare function delValByNamePath(obj: any, propPath: any, keepEmptyObj?: boolean, idx?: number): any;
 export declare function cleanContent(obj: any, shouldCleanMark?: boolean, strict?: boolean): any;
 export declare function objToDelMarks(obj: any): any;

package/src/QyFileContentUtils.js

@@ -2,171 +2,185 @@ import {
     isNotNullObj as a,
     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: 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[m];
-        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[m]) return n;
-    var l = r[m];
-    if (null != l) r[m] = i(l, n); else {
-        if (r == w) return {
-            [m]: 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];
     }
-    var t = n.at(-1);
-    return void 0 === l ? delete e[t] : e[t] = 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 = t(r))) {
-        if (!p(n)) return "" == n ? r : t(r[n]);
-        if (0 != n.length && (1 != n.length || "" != n[0])) for (var l of n) if (null == (r = t(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[m];
-            if (null != r) return l(r, u, t);
-            let n = e[y];
-            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[m];
-        if (null != i) return O(n, i, e, t);
-        let r = l[y];
-        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 : {
-                    [m]: 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 : {
-        [m]: n
-    }) : $(e, l, r, h(r) ? n : {
-        [m]: 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 t(r) {
-    if (null != r && r != w) {
-        for (;null != r[m]; ) if ((r = r[m]) == 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;

package/src/QyItem.js

@@ -11,7 +11,7 @@ class e {
     flagInt;
     constructor(t, e = !1, a) {
         this.name = t.toString(), this.parentDir = a, this.flagInt = 0, this._created = e, 
-        a && (a.name == r || a.underHiddenFolder) && (this.flagInt |= 2);
+        (t == r || a && (a.name == r || a.underHiddenFolder)) && (this.flagInt |= 2);
     }
     get qyCache() {
         var t = this.parentDir;
@@ -21,31 +21,49 @@ class e {
         return i(this, 1);
     }
     set _created(t) {
-        n(this, 1, t);
+        s(this, 1, t);
     }
     get subdirMapLoaded() {
         return i(this, 4);
     }
     set subdirMapLoaded(t) {
-        n(this, 4, t);
+        s(this, 4, t);
     }
     get fileMapLoaded() {
         return i(this, 8);
     }
     set fileMapLoaded(t) {
-        n(this, 8, t);
+        s(this, 8, t);
     }
     get fileContentLoaded() {
         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 i(this, 32);
     }
     set visited(t) {
-        n(this, 32, t);
+        s(this, 32, t);
     }
     get nameNum() {
         var t = this._nameNum;
@@ -108,7 +126,7 @@ 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/QyKVData.d.ts

@@ -27,6 +27,8 @@ export declare class QyKVData {
     removeKey(key: any): any;
     onSnapshotSavedChangeId(snapshotSavedChangeId: any, pMOnlySnapshot?: any): void;
     onCompactUpdates(compactUpdates: any): void;
-    monitorContentExpire(file: any, flattedAbsSecondObj: any): void;
+    monitorContentExpire(file: any, flattedAbsTimeObj: any): void;
     unmonitorContentExpire(file: any, flattedDelObj: any): void;
+    monitorItemExpire(item: any, expireTime: any): void;
+    unmonitorItemExpire(item: any): void;
 }