datafolder 1.0.10 → 1.0.12

package/src/QyBatch.js

@@ -1,37 +1,40 @@
 import {
-    isDeepStrictEqual as o
+    isDeepStrictEqual as s
 } from "node:util";
 
 import {
     mergeContentAndGenDelta as c,
-    objToDelMarks as i
+    objToDelMarks as r
 } from "./QyFileContentUtils.js";
 
 import {
     pathSplit as n,
-    propNameSplit as a,
-    isString as s,
+    ensurePropNamePathList as a,
+    isString as o,
     SpecialOperators as e,
     getSuffix as g,
     SpecialFilePaths as t,
     toSingleName as C,
-    isSimpleType as l
+    isSimpleType as l,
+    getNowSeconds as h,
+    isEmptyObj as d
 } from "./QyUtils.js";
 
 import {
-    QyAclCmdGenerator as r
+    QyAclCmdGenerator as i,
+    CmdNames as m
 } from "./QyAcl.js";
 
 import {
-    calDifferenceList as h
+    calDifferenceList as u
 } from "./QyIndex.js";
 
 import {
-    getDefaultOptions as d
+    getDefaultOptions as f
 } from "./QyDefaultOptions.js";
 
 import {
-    QyCD as m
+    QyCD as p
 } from "./QyCD.js";
 
 import {
@@ -39,17 +42,21 @@ import {
 } from "./QyIndexPropTree.js";
 
 import {
-    logger as D
+    logger as v
 } from "./QyLogger.js";
 
-let u = Array.isArray, f = e.$del, v = t.IndexPropPathsFileName, p = {
+import {
+    flatObj as _
+} from "./QyExpire.js";
+
+let D = Array.isArray, x = e.$del, O = t.IndexPropPathsFileName, F = {
     none: 0,
     basic: 1,
     delta: 2,
     all: 3
 };
 
-class _ extends m {
+class L extends p {
     fileLogLevel;
     actionQueue;
     changeId;
@@ -57,153 +64,144 @@ class _ extends m {
     syncList;
     qyAclCmdGenerator;
     qyCmdObjHistory;
+    running;
     constructor(e, t) {
         super(e), t = {
-            ...d("QyBatch"),
+            ...f("QyBatch"),
             ...t
         };
-        e = p[t.fileLogLevel.toLowerCase()];
+        e = F[t.fileLogLevel.toLowerCase()];
         Object.assign(this, {
             options: t,
             fileLogLevel: e ?? 1,
-            qyAclCmdGenerator: new r(),
-            qyCmdObjHistory: new O(t.maxHistoryCmdObjCount),
+            qyAclCmdGenerator: new i(),
+            qyCmdObjHistory: new j(t.maxHistoryCmdObjCount),
             actionQueue: [],
             changeList: [],
             syncList: []
         });
     }
     createDir(e, t = this.currentDir) {
-        return s(e) && (e = n(e)), this.createDirP(e, t);
-    }
-    createDirP(e, t = this.currentDir) {
-        return P(this, "createDir", this.qyCache?.getOrCreateDir(e, t));
+        return o(e) && (e = n(e)), q(this, "createDir", this.qyCache?.getOrCreateDir(e, t));
     }
     delDir(e, t = this.currentDir) {
-        return s(e) && (e = n(e)), this.delDirP(e, t);
-    }
-    delDirP(e, t = this.currentDir) {
-        return P(this, "delDir", this.qyCache.getOrCreateDir(e, t));
+        return o(e) && (e = n(e)), q(this, "delDir", this.qyCache.getOrCreateDir(e, t));
     }
     createFile(e, t = this.currentDir) {
-        return s(e) && (e = n(e)), this.createFileP(e, t);
-    }
-    createFileP(e, t = this.currentDir) {
-        return P(this, "createFile", this.qyCache.getOrCreateFile(e, t));
+        return o(e) && (e = n(e)), q(this, "createFile", this.qyCache.getOrCreateFile(e, t));
     }
     delFile(e, t = this.currentDir) {
-        return s(e) && (e = n(e)), this.delFileP(e, t);
+        return o(e) && (e = n(e)), q(this, "delFile", this.qyCache.getOrCreateFile(e, t));
     }
-    delFileP(e, t = this.currentDir) {
-        return P(this, "delFile", this.qyCache.getOrCreateFile(e, t));
+    expireFile(e, t, i = this.currentDir) {
+        return o(e) && (e = n(e)), this.expireContent(e, {
+            "": t
+        }, i);
     }
-    createIndex(e, t, r = this.currentDir) {
-        return s(e) && (e = n(e)), this.createIndexP(e, t, r);
-    }
-    createIndexP(e, t, r = this.currentDir) {
-        return u(t) || (t = [ t ]), P(this, "createIndex", this.qyCache?.getOrCreateDir(e, r), {
-            indexPropPathList: t
+    expireContent(e, t, i = this.currentDir) {
+        return o(e) && (e = n(e)), q(this, "expireContent", this.qyCache.getOrCreateFile(e, i), {
+            expireInfoObj: t
         });
     }
-    delIndex(e, t, r = this.currentDir) {
-        return s(e) && (e = n(e)), this.delIndexP(e, t, r);
+    removeFileExpire(e, t = this.currentDir) {
+        return this.removeContentExpire(e, {
+            "": 1
+        }, !1, t);
     }
-    delIndexP(e, t, r = this.currentDir) {
-        return P(this, "delIndex", this.qyCache.getOrCreateDir(e, r), {
-            indexPropPath: t
+    removeContentExpire(e, t, i = !1, r = this.currentDir) {
+        return o(e) && (e = n(e)), q(this, "removeContentExpire", this.qyCache.getOrCreateFile(e, r), {
+            expireInfoObj: t,
+            infoFileOnly: i
         });
     }
-    insert(e, t, r = this.currentDir) {
-        return s(e) && (e = n(e)), this.insertP(e, t, r);
+    createIndex(e, t, i = this.currentDir) {
+        return o(e) && (e = n(e)), D(t) || (t = [ t ]), q(this, "createIndex", this.qyCache?.getOrCreateDir(e, i), {
+            indexPropPathList: t
+        });
     }
-    insertP(e, t, r = this.currentDir) {
-        return P(this, "insert", this.qyCache.getOrCreateFile(e, r), {
-            content: l(t) ? t : structuredClone(t)
+    delIndex(e, t, i = this.currentDir) {
+        return o(e) && (e = n(e)), q(this, "delIndex", this.qyCache.getOrCreateDir(e, i), {
+            indexPropPath: t
         });
     }
-    remove(e, t, r = this.currentDir) {
-        return this.insert(e, i(t), r);
+    insert(e, t, i = !1, r = this.currentDir) {
+        return o(e) && (e = n(e)), q(this, "insert", this.qyCache.getOrCreateFile(e, r), {
+            content: i || l(t) ? t : structuredClone(t)
+        });
     }
-    removeP(e, t, r = this.currentDir) {
-        return this.insertP(e, i(t), r);
+    remove(e, t, i = this.currentDir) {
+        return this.insert(e, r(t), !0, i);
     }
-    replace(e, t, r = this.currentDir) {
+    replace(e, t, i = this.currentDir) {
         return this.insert(e, {
             $rpl: t
-        }, r);
-    }
-    replaceP(e, t, r = this.currentDir) {
-        return this.insertP(e, {
-            $rpl: t
-        }, r);
+        }, !0, i);
     }
     delContent(e, t = this.currentDir) {
-        return s(e) && (e = n(e)), this.delContentP(e, t);
-    }
-    delContentP(e, t = this.currentDir) {
-        return P(this, "delContent", this.qyCache.getOrCreateFile(e, t));
+        return o(e) && (e = n(e)), q(this, "delContent", this.qyCache.getOrCreateFile(e, t));
     }
-    insertTrigger(e, t, r, i) {
-        return s(t) && (t = n(t)), r = (r = s(r) ? [ r ] : r).map(e => s(e) ? a(e) : e), 
-        P(this, "insertTrigger", this.qyCache.getOrCreateTriggerFile(e), {
+    insertTrigger(e, t, i, r) {
+        return o(t) && (t = n(t)), i = a(i), q(this, "insertTrigger", this.qyCache.getOrCreateTriggerFile(e), {
             fileNamePath: t,
-            propNamePathList: r,
-            modCode: i
+            propNamePathList: i,
+            modCode: r
         });
     }
     removeTrigger(e) {
-        return P(this, "removeTrigger", this.qyCache.getOrCreateTriggerFile(e));
+        return q(this, "removeTrigger", this.qyCache.getOrCreateTriggerFile(e));
     }
     insertRpc(e, t) {
-        return P(this, "insertRpc", this.qyCache.getOrCreateRpcFile(e), {
+        return q(this, "insertRpc", this.qyCache.getOrCreateRpcFile(e), {
             modCode: t
         });
     }
     removeRpc(e) {
-        return P(this, "removeRpc", this.qyCache.getOrCreateRpcFile(e));
+        return q(this, "removeRpc", this.qyCache.getOrCreateRpcFile(e));
     }
     run(e = !1) {
         var {
-            actionQueue: t,
+            running: t,
+            actionQueue: i,
             fileLogLevel: r,
-            qyCache: i
+            qyCache: n
         } = this;
-        if (0 == t.length) return 0;
-        var n, a = this.changeId = i.increaseChangeId();
-        for (n of t) this["_action_" + n.actionName](n);
-        t.length = 0, this.resetCurrentDir();
+        if (t || 0 == i.length) return 0;
+        this.running = !0;
+        var a, t = this.changeId = n.increaseChangeId();
+        for (a of i) this["_action_" + a.actionName](a);
+        i.length = 0, this.running = !1, this.resetCurrentDir();
         var {
-            changeList: t,
-            qyAclCmdGenerator: s,
-            qyCmdObjHistory: o,
+            changeList: i,
+            qyAclCmdGenerator: o,
+            qyCmdObjHistory: s,
             syncList: c
-        } = this, l = t.length;
-        if (0 == l) return i.decreaseChangeId(), 0;
-        var h = g(l), s = s.takeCmdArgAsListObj();
+        } = this, l = i.length;
+        if (0 == l) return n.decreaseChangeId(), 0;
+        var h = g(l), o = o.takeCmdArgAsListObj();
         let d;
-        0 < r && (r = t.map(({
+        0 < r && (r = i.map(({
             logStr: e
         }) => e).join("\n"), d = new Date().toISOString() + `: ${l} change${h}:
 ${r}
 `);
-        var m, u, l = i.save(a, s, d, (e => {
-            var t = e.syncList, r = t.length;
-            for (let e = 0; e < r; e += 2) {
-                var i, n = e + 1, a = t[e], s = t[n];
-                a.startsWith("d") ? (i = s.subdirNameList, t[n] = 0 < i.length ? i : void 0) : a.startsWith("f") ? (i = s.fileNameList, 
-                t[n] = 0 < i.length ? i : void 0) : t[n] = s.fileContent;
+        var m, u, l = n.save(t, o, d, (e => {
+            var t = e.syncList, i = t.length;
+            for (let e = 0; e < i; e += 2) {
+                var r, n = e + 1, a = t[e], o = t[n];
+                a.startsWith("d") ? (r = o.subdirNameList, t[n] = 0 < r.length ? r : void 0) : a.startsWith("f") ? (r = o.fileNameList, 
+                t[n] = 0 < r.length ? r : void 0) : t[n] = o.fileContent;
             }
-            if (0 < r) return t;
-        })(this), e), h = (c.length = 0, o.push(s), t.filter(({
+            if (0 < i) return t;
+        })(this), e), h = (c.length = 0, s.push(o), i.filter(({
             item: e,
             delta: t
         }) => t && 0 < e.triggerNodes?.length));
-        t.length = 0;
+        i.length = 0;
         for ({
             item: m,
             delta: u
         } of h) for (var f of m.triggerNodes) f.checkTrigger(m, u);
-        return e ? l : a;
+        return e ? l : t;
     }
     getTopHistoryCmdObj() {
         return this.qyCmdObjHistory.top();
@@ -212,43 +210,39 @@ ${r}
         e.actionName = "insertTrigger";
         var t, {
             item: e,
-            fileNamePath: r,
-            propNamePathList: i,
+            fileNamePath: i,
+            propNamePathList: r,
             modCode: n
         } = e, {
             name: a,
-            fileContent: s
-        } = e, e = this._action_insert({
+            fileContent: o
+        } = e, o = o && o[0], e = this._action_insert({
             item: e,
-            content: {
-                fileNamePath: r,
-                propNamePathList: i,
-                modCode: n
-            }
+            content: [ i, r, n ]
         });
-        return e && (t = this.qyCache, s && !o(s.fileNamePath, r) && t.removeTriggerFromTree(a, s.fileNamePath), 
-        t.insertTriggerToTree(a, r, i, n)), e;
+        return e && (t = this.qyCache, o && !s(o, i) && t.removeTriggerFromTree(a, o), 
+        t.insertTriggerToTree(a, i, r, n)), e;
     }
     _action_removeTrigger(e) {
         e.actionName = "removeTrigger";
         var e = e.item, {
             fileContent: t,
-            name: r
+            name: i
         } = e;
         return !!this._action_delFile({
             item: e
-        }) && (this.qyCache.removeTriggerFromTree(r, t.fileNamePath), !0);
+        }) && (this.qyCache.removeTriggerFromTree(i, t[0]), !0);
     }
     _action_insertRpc(e) {
         e.actionName = "insertRpc";
         var {
             item: e,
             modCode: t
-        } = e, r = this._action_insert({
+        } = e, i = this._action_insert({
             item: e,
             content: t
         });
-        return r && this.qyCache.insertRpc(e.name, t), r;
+        return i && this.qyCache.insertRpc(e.name, t), i;
     }
     _action_removeRpc(e) {
         e.actionName = "removeRpc";
@@ -261,26 +255,26 @@ ${r}
         t.actionName = "createIndex";
         var e, {
             item: t,
-            indexPropPathList: r
-        } = t, i = this.qyCache.getOrCreateIndexDir(t), n = i.getOrCreateFile(v), {
+            indexPropPathList: i
+        } = t, r = this.qyCache.getOrCreateIndexDir(t), n = r.getOrCreateFile(O), {
             fileContent: a,
-            qyIndexPropTree: s
+            qyIndexPropTree: o
         } = (n.created || this._action_createFile({
             item: n
-        }), n), o = [], c = {};
-        for (e of r) {
+        }), n), s = [], c = {};
+        for (e of i) {
             var l = C(e);
-            a && a[l] || (o.push(e), c[l] = 1, s.insert(e));
+            a && a[l] || (s.push(e), c[l] = 1, o.insert(e));
         }
-        if (0 != o.length) {
-            D.log(`Creating index ${JSON.stringify(o)} for ` + t.fullPath), this._action_insert({
+        if (0 != s.length) {
+            v.log(`Creating index ${JSON.stringify(s)} for ` + t.fullPath), this._action_insert({
                 item: n,
                 content: c
             });
             {
-                var h, d = this, m = t, u = i, r = y(o);
+                var h, d = this, m = t, u = r, i = y(s);
                 let e;
-                for (h of r) {
+                for (h of i) {
                     var f = u.searchOrCreateSubdir(h);
                     if (!f.created) {
                         d._action_createDir({
@@ -291,7 +285,7 @@ ${r}
                                 fileContent: g,
                                 name: p
                             } = g;
-                            null != g && N(d, f, h, p, void 0, g);
+                            null != g && I(d, f, h, p, void 0, g);
                         }
                     }
                 }
@@ -300,33 +294,33 @@ ${r}
     }
     _action_delIndex(e) {
         e.actionName = "delIndex";
-        var t, r, {
+        var t, i, {
             item: e,
-            indexPropPath: i
+            indexPropPath: r
         } = e, e = this.qyCache.getIndexDir(e);
-        e && ((r = e.getFile(v)) ? (t = r.qyIndexPropTree, this._action_insert({
-            item: r,
+        e && ((i = e.getFile(O)) ? (t = i.qyIndexPropTree, this._action_insert({
+            item: i,
             content: {
-                [C(i)]: f
+                [C(r)]: x
             }
-        }), t.remove(i).hasPrefix || (r = e.getSubdir(i)) && this._action_delDir({
-            item: r
+        }), t.remove(r).hasPrefix || (i = e.getSubdir(r)) && this._action_delDir({
+            item: i
         })) : this._action_delDir({
             item: e
         }));
     }
     _action_delFile(e, t = !1) {
         e.actionName = "delFile";
-        var r = e.item;
-        if (!r.created) return !1;
-        null != r.fileContent && this._action_delContent({
-            item: r
+        var i = e.item;
+        if (!i.created) return !1;
+        null != i.fileContent && this._action_delContent({
+            item: i
         });
         var {
-            parentDir: i,
+            parentDir: r,
             name: n
-        } = r;
-        return r.created = !1, x(this, e), t || L(this, i, "R", i.fileMapKey, n), 
+        } = i;
+        return i.created = !1, N(this, e), t || P(this, r, m.R, r.fileMapKey, n), 
         !0;
     }
     _action_delDir(e) {
@@ -334,178 +328,212 @@ ${r}
         var t = e.item;
         if (!t.created) return !1;
         let {
-            parentDir: r,
-            name: i,
+            parentDir: i,
+            name: r,
             subdirMap: n,
             fileMap: a,
-            subdirMapKey: s,
-            fileMapKey: o
+            subdirMapKey: o,
+            fileMapKey: s
         } = t;
         if (a) {
-            L(this, t, "D", o);
+            P(this, t, m.D, s);
             for (var c of t.fileList) this._action_delFile({
                 item: c
             }, !0);
         }
         if (n) {
-            L(this, t, "D", s);
+            P(this, t, m.D, o);
             for (var l of t.allSubdirs()) {
                 let {
                     subdirMap: e,
                     fileMap: t,
-                    subdirMapKey: r,
-                    fileMapKey: i
+                    subdirMapKey: i,
+                    fileMapKey: r
                 } = l;
-                if (e && L(this, l, "D", r), t) {
-                    L(this, l, "D", i);
+                if (e && P(this, l, m.D, i), t) {
+                    P(this, l, m.D, r);
                     for (var h of l.fileList) this._action_delFile({
                         item: h
                     }, !0);
                 }
-                x(this, {
+                N(this, {
                     actionName: "delDir",
                     item: l
                 }), l.created = !1;
             }
         }
-        return !!r && (t.created = !1, x(this, e), L(this, r, "R", r.subdirMapKey, i), 
+        return !!i && (t.created = !1, N(this, e), P(this, i, m.R, i.subdirMapKey, r), 
         !0);
     }
     _action_delContent(e) {
         e.actionName = "delContent";
-        var t = e.item, r = t.fileContent;
-        return null != r && (t.setContent(void 0), Object.assign(e, {
-            content: r,
+        var t = e.item, i = t.fileContent;
+        return null != i && (t.setContent(void 0), Object.assign(e, {
+            content: i,
             delta: {
-                oldValue: r,
-                newValue: f
+                oldValue: i,
+                newValue: x
             }
-        }), x(this, e), L(this, t, "D", t.fileContentKey), F(this, t, r), !0);
+        }), N(this, e), P(this, t, m.D, t.fileContentKey), b(this, t, i), !0);
     }
     _action_insert(e) {
         e.actionName = "insert";
         var {
             item: t,
-            content: r
+            content: i
         } = e;
-        if (null == r) return D.warn(`Saving undefined to ${t.fullPath}. Not making any change.`), 
+        if (null == i) return v.warn(`Saving undefined to ${t.fullPath}. Not making any change.`), 
         !1;
         t.created || this._action_createFile({
             item: t
         });
-        var i, n, r = c(t.fileContent, r), {
+        var r, n, i = c(t.fileContent, i), {
             merged: a,
-            delta: s
-        } = r;
-        return !!s && ({
-            oldValue: s,
-            newValue: i
-        } = s, !!i) && (n = t.fileContentKey, null == a ? L(this, t, "D", n) : L(this, t, "M", n, i), 
-        Object.assign(e, r), x(this, e), t.setContent(a), F(this, t, s, i, a), !0);
+            delta: o
+        } = i;
+        return !!o && ({
+            oldValue: o,
+            newValue: r
+        } = o, !!r) && (n = t.fileContentKey, null == a ? P(this, t, m.D, n) : P(this, t, m.M, n, r), 
+        Object.assign(e, i), N(this, e), t.setContent(a), b(this, t, o, r, a), !0);
     }
     _action_createFile(e) {
         e.actionName = "createFile";
-        var t, r = e.item;
-        return !r.created && (t = r.parentDir, this._action_createDir({
+        var t, i = e.item;
+        return !i.created && (t = i.parentDir, this._action_createDir({
             item: t
-        }), Object.assign(r, {
+        }), Object.assign(i, {
             created: !0,
             fileContentLoaded: !0
-        }), x(this, e), L(this, t, "A", t.fileMapKey, r.name), !0);
+        }), N(this, e), P(this, t, m.A, t.fileMapKey, i.name), !0);
     }
     _action_createDir(e) {
         e.actionName = "createDir";
         let t = e.item;
         if (t.created) return !1;
-        for (var r = []; !t.created; ) r.push(t), t = t.parentDir;
-        for (let e of r.reverse()) {
+        for (var i = []; !t.created; ) i.push(t), t = t.parentDir;
+        for (let e of i.reverse()) {
             Object.assign(e, {
                 created: !0,
                 subdirMapLoaded: !0,
                 fileMapLoaded: !0
-            }), x(this, {
+            }), N(this, {
                 actionName: "createDir",
                 item: e
             });
-            var i = e.parentDir;
-            L(this, i, "A", i.subdirMapKey, e.name);
+            var r = e.parentDir;
+            P(this, r, m.A, r.subdirMapKey, e.name);
         }
         return !0;
     }
+    _action_expireContent(e) {
+        e.actionName = "expireContent";
+        var t, {
+            item: e,
+            expireInfoObj: i
+        } = e, r = h(), n = _(i);
+        for (t in n) n[t] += r;
+        var i = this.qyCache, a = i.getOrCreateExpireInfoFile(e.fullPathHash), a = this._action_insert({
+            item: a,
+            content: {
+                ...n
+            }
+        });
+        return a && i.monitorContentExpire(e, n), a;
+    }
+    _action_removeContentExpire(t) {
+        t.actionName = "removeContentExpire";
+        var {
+            item: t,
+            expireInfoObj: i,
+            infoFileOnly: r
+        } = t, n = this.qyCache, a = n.getExpireInfoFile(t.fullPathHash);
+        if (a.created) {
+            let e;
+            if (D(i)) e = Object.fromEntries(i.map(e => [ e, x ])); else for (var o in e = _(i)) e[o] ? e[o] = x : delete e[o];
+            i = this._action_insert({
+                item: a,
+                content: e
+            });
+            return i && (d(a.fileContent) && this._action_delFile({
+                item: a
+            }), r || n.unmonitorContentExpire(t, e)), i;
+        }
+    }
 }
 
-function P(e, t, r, i) {
+function q(e, t, i, r) {
     return e.actionQueue.push({
         actionName: t,
-        item: r,
-        ...i
+        item: i,
+        ...r
     }), e;
 }
 
-function x(e, t) {
+function N(e, t) {
     var {
         changeList: e,
-        fileLogLevel: r
+        fileLogLevel: i
     } = e;
-    0 < r && (t.logStr = ((e, t) => {
+    0 < i && (t.logStr = ((e, t) => {
         var {
             actionName: e,
-            item: r,
-            content: i,
+            item: i,
+            content: r,
             merged: n,
             delta: a
-        } = e, r = e + ` "${r.fullPath ?? r}"`;
+        } = e, i = e + ` "${i.fullPath ?? i}"`;
         if ("delContent" === e) {
-            if (3 == t) return r + " " + JSON.stringify(i);
+            if (3 == t) return i + " " + JSON.stringify(r);
         } else if ("insert" === e && 2 <= t) return {
-            oldValue: i,
+            oldValue: r,
             newValue: e
-        } = a, a = `${null == i ? "" : "delta:"} ${JSON.stringify(i)} -> ` + JSON.stringify(e), 
-        2 == t ? r + " " + a : r + ` ${a}. ` + (null != i ? "new: " + JSON.stringify(n) : "");
-        return r;
-    })(t, r)), e.push(t);
+        } = a, a = `${null == r ? "" : "delta:"} ${JSON.stringify(r)} -> ` + JSON.stringify(e), 
+        2 == t ? i + " " + a : i + ` ${a}. ` + (null != r ? "new: " + JSON.stringify(n) : "");
+        return i;
+    })(t, i)), e.push(t);
 }
 
-function L(e, t, r, i, n = void 0) {
+function P(e, t, i, r, n = void 0) {
     var {
         qyAclCmdGenerator: e,
         qyCache: a,
-        syncList: s,
-        changeId: o
+        syncList: o,
+        changeId: s
     } = e;
-    e.pushCmd(r, i, n), i.startsWith("d") ? t.dChangeId = o : i.startsWith("f") ? t.fChangeId = o : t.cChangeId = o, 
-    a && a.qyKVData.removeKey(i) && s.push(i, t);
+    e.pushCmd(i, r, n), r.startsWith("d") ? t.dChangeId = s : r.startsWith("f") ? t.fChangeId = s : t.cChangeId = s, 
+    a && a.qyKVData.removeKey(r) && o.push(r, t);
 }
 
-function F(e, t, r, i = void 0, n = void 0) {
+function b(e, t, i, r = void 0, n = void 0) {
     var {
         underHiddenFolder: t,
         name: a,
-        parentDir: s
+        parentDir: o
     } = t;
     if (!t) {
-        var o = e.qyCache.getIndexDir(s);
-        if (o) {
-            t = o.getFile(v);
-            if (t) for (var c of t.qyIndexPropTree.getAllIndexPropPaths()) N(e, o.searchOrCreateSubdir(c), c, a, r, i, n);
+        var s = e.qyCache.getIndexDir(o);
+        if (s) {
+            t = s.getFile(O);
+            if (t) for (var c of t.qyIndexPropTree.getAllIndexPropPaths()) I(e, s.searchOrCreateSubdir(c), c, a, i, r, n);
         }
     }
 }
 
-function N(t, e, r, i, n, a, s = void 0) {
-    e = h(e, r, i, n, a, s);
+function I(t, e, i, r, n, a, o = void 0) {
+    e = u(e, i, r, n, a, o);
     if (e) {
-        var o, c, l, {
-            toAddFileList: r,
-            toDelFileList: i
+        var s, c, l, {
+            toAddFileList: i,
+            toDelFileList: r
         } = e;
-        for (o of r) t._action_createFile({
-            item: o
+        for (s of i) t._action_createFile({
+            item: s
         });
-        for (c of i) t._action_delFile({
+        for (c of r) t._action_delFile({
             item: c
         });
-        for (l of i) {
+        for (l of r) {
             let e = l.parentDir;
             for (;e.created && !e.isHiddenFolder && e.isEmpty; ) t._action_delDir({
                 item: e
@@ -514,7 +542,7 @@ function N(t, e, r, i, n, a, s = void 0) {
     }
 }
 
-class O {
+class j {
     maxLength;
     actionQueue;
     nextPos;
@@ -528,20 +556,20 @@ class O {
     push(e) {
         var {
             maxLength: t,
-            nextPos: r
+            nextPos: i
         } = this;
-        this.actionQueue[r] = e, this.nextPos = ((e, t) => (t += 1) < e ? t : 0)(t, r);
+        this.actionQueue[i] = e, this.nextPos = ((e, t) => (t += 1) < e ? t : 0)(t, i);
     }
     top() {
         var {
             actionQueue: e,
             maxLength: t,
-            nextPos: r
+            nextPos: i
         } = this;
-        return e[e = t, (0 < (t = r) ? t : e) - 1];
+        return e[e = t, (0 < (t = i) ? t : e) - 1];
     }
 }
 
 export {
-    _ as QyBatch
+    L as QyBatch
 };