datafolder 1.0.10 → 1.0.12

package/src/QyFile.js

@@ -7,8 +7,9 @@ import {
     SpecialFilePaths as n,
     getContentKey as i,
     isNotNullObj as a,
-    isSimpleType as C,
-    fromSingleName as o
+    isSimpleType as d,
+    fromSingleName as o,
+    isEmptyObj as l
 } from "./QyUtils.js";
 
 import {
@@ -19,13 +20,18 @@ import {
     QyIndexPropTree as s
 } from "./QyIndexPropTree.js";
 
-let d = Array.isArray, f = n.IndexPropPathsFileName, {
-    $spec: h,
+import {
+    analyzeExpireInfo as f,
+    handleExpiredProps as u
+} from "./QyExpire.js";
+
+let C = Array.isArray, h = n.IndexPropPathsFileName, {
+    $spec: p,
     $raw: c,
-    $clone: l
+    $clone: y
 } = t;
 
-class u extends e {
+class m extends e {
     _fileContentKey;
     _fileContent;
     cChangeId = 0;
@@ -44,9 +50,14 @@ class u extends e {
         return this._fileContentKey || (this._fileContentKey = i(this.fullPathHash));
     }
     get fileContent() {
-        var e, t = this;
-        return t.created && null == t._fileContent && !t.fileContentLoaded && (t.fileContentLoaded = !0, 
-        e = t.qyCache) && (t._fileContent = e.qyKVData.getValueSync(t.fileContentKey)), 
+        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;
     }
     set fileContent(e) {
@@ -59,7 +70,7 @@ class u extends e {
             fileContent: n,
             underHiddenFolder: i
         } = this;
-        if (e && i && t == f) {
+        if (e && i && t == h) {
             e = this._qyIndexPropTree;
             if (e) return e;
             var r, l = this._qyIndexPropTree = new s();
@@ -80,17 +91,17 @@ class u extends e {
     setContent(e) {
         this.fileContent = e;
     }
-    view(e = l, t) {
+    view(e = y, t) {
         var n = this.fileContent;
-        return null == n || C(n) ? n : function t(n, i, r, l) {
+        return null == n || d(n) ? n : function t(n, i, r, l) {
             if (r === c) return i;
             if (null == r) return;
-            if (C(r)) return r ? l ? i : structuredClone(i) : void 0;
+            if (d(r)) return r ? l ? i : structuredClone(i) : void 0;
             let e = r.$link;
-            if (null != e) return y(n, i, e, r[h]);
-            if (C(i)) return i;
-            d(r) && (r = Object.fromEntries(r.filter(e => e).map(e => [ e, 1 ])));
-            let o = d(i) ? [] : {};
+            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) ? [] : {};
             let {
                 $all: s,
                 "**": a
@@ -105,9 +116,9 @@ class u extends e {
             return o;
         }(this, n, e, t);
     }
-    prop(e, t = l, n) {
+    prop(e, t = y, n) {
         var i;
-        if (t) return e = r(this.fileContent, d(e) ? e : [ e ]), i = t.$link, null != i ? y(this, e, i, t[h], n) : n || t === c ? e : structuredClone(e);
+        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);
     }
     unloadFileContent() {
         this.created && this.fileContentLoaded && null != this._fileContent && (this._fileContent = void 0, 
@@ -115,7 +126,7 @@ class u extends e {
     }
 }
 
-function p(e, t, n, i) {
+function g(e, t, n, i) {
     if (e) {
         e = e.getFile(t);
         if (e) return e.view(n, i);
@@ -123,17 +134,17 @@ function p(e, t, n, i) {
     return t;
 }
 
-function y(e, t, n, i, r = !1) {
+function _(e, t, n, i, r = !1) {
     let l = e.qyCache.getDir(n);
-    if (d(t)) return t.map(e => p(l, e, i, r));
+    if (C(t)) return t.map(e => g(l, e, i, r));
     if (a(t)) {
         var o, s = {};
-        for (o in t) s[o] = p(l, o, i, r);
+        for (o in t) s[o] = g(l, o, i, r);
         return s;
     }
-    return p(l, t, i, r);
+    return g(l, t, i, r);
 }
 
 export {
-    u as QyFile
+    m as QyFile
 };

package/src/QyFileContentUtils.js

@@ -1,6 +1,5 @@
 import {
     isNotNullObj as a,
-    arrayLast as t,
     trimArrayTail as g,
     isSimpleType as h,
     SpecialOperators as r
@@ -8,15 +7,15 @@ import {
 
 let p = Array.isArray, {
     $del: w,
-    $rpl: y,
-    $ext: m
+    $rpl: m,
+    $ext: y
 } = r;
 
 function i(r, n) {
     if (null == n) return r;
     if (n !== w) {
         if (h(n)) return n;
-        var l = n[y];
+        var l = n[m];
         if (null != l) return l;
         if (null == r || h(r)) return n;
         if (r != n) {
@@ -32,11 +31,11 @@ function i(r, n) {
 
 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 (null != n[m]) return n;
+    var l = r[m];
+    if (null != l) r[m] = i(l, n); else {
         if (r == w) return {
-            [y]: S(n)
+            [m]: S(n)
         };
         if (h(r) || h(n)) return n;
         for (var e in n) {
@@ -67,13 +66,14 @@ function u(r, n, l) {
         var u = n[r];
         a(e[u]) || (e[u] = {}), e = e[u];
     }
-    return e[t(n)] = l, r;
+    var t = n.at(-1);
+    return void 0 === l ? delete e[t] : e[t] = l, 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;
+    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;
         return r;
     }
 }
@@ -83,9 +83,9 @@ function S(r, n = !0, l = !1) {
         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];
+            let r = e[m];
             if (null != r) return l(r, u, t);
-            let n = e[m];
+            let n = e[y];
             if (null != n) return l(p(n) ? n : [ n ], u, t);
         }
         let n = p(e);
@@ -112,16 +112,16 @@ 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];
+        var i = l[m];
         if (null != i) return O(n, i, e, t);
-        let r = l[m];
+        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 : {
-                    [y]: t
+                    [m]: t
                 });
             }
             return $(e, r, n, u), n.concat(l);
@@ -144,9 +144,9 @@ function A(n, l, e, u, t) {
 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
+        [m]: n
     }) : $(e, l, r, h(r) ? n : {
-        [y]: n
+        [m]: n
     }), n) : void $(e, l, r, w);
 }
 
@@ -154,9 +154,9 @@ function $(r, n, l, e) {
     r.oldValue = u(r.oldValue, n, l), r.newValue = u(r.newValue, n, e);
 }
 
-function o(r) {
+function t(r) {
     if (null != r && r != w) {
-        for (;null != r[y]; ) if ((r = r[y]) == w) return;
+        for (;null != r[m]; ) if ((r = r[m]) == w) return;
         return r;
     }
 }

package/src/QyItem.d.ts

@@ -27,4 +27,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,38 +11,38 @@ 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);
+        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);
     }
     get subdirMapLoaded() {
-        return r(this, 4);
+        return i(this, 4);
     }
     set subdirMapLoaded(t) {
         n(this, 4, t);
     }
     get fileMapLoaded() {
-        return r(this, 8);
+        return i(this, 8);
     }
     set fileMapLoaded(t) {
         n(this, 8, t);
     }
     get fileContentLoaded() {
-        return r(this, 16);
+        return i(this, 16);
     }
     set fileContentLoaded(t) {
         n(this, 16, t);
     }
     get visited() {
-        return r(this, 32);
+        return i(this, 32);
     }
     set visited(t) {
         n(this, 32, t);
@@ -75,7 +75,7 @@ class e {
         return !0;
     }
     get underHiddenFolder() {
-        return r(this, 2);
+        return i(this, 2);
     }
     get parentList() {
         if (null == this._parentList) {
@@ -96,9 +96,15 @@ 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);
 }
 

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

@@ -10,20 +10,23 @@ export declare class QyKVData {
     compactMaxChangeId: number;
     snapshotSavedChangeId: number;
     maxChangeId: number;
-    emptySnapshotNumVersionList: any[];
+    emptySnapshotNumVerList: any[];
     isStopping: boolean;
     qySnapshots: any;
     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, flattedAbsSecondObj: any): void;
+    unmonitorContentExpire(file: any, flattedDelObj: any): void;
 }