datafolder 1.0.27 → 1.0.28

package/ChangeLog.md

@@ -1,3 +1,5 @@
+1.0.28 Rewrite delta generation to improve insertion performance.
+
 1.0.24 Add HNSW test cases (test/testQyHNSW.ts).
 
 1.0.23 Add ChangeLog.md

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datafolder",
-	"version": "1.0.27",
+	"version": "1.0.28",
 	"author": {
 		"name": "lysh",
 		"email": "datafolderdev@outlook.com"

package/scripts/flights2.js

@@ -19,7 +19,7 @@ function insertAirports() {
     const { batch } = qyDB;
     for (const record of data) {
         const { country, state, city } = record;
-        batch.put(`airports/${country}/${state}/${city}/${record._key}`, record);
+        batch.insert(`airports/${country}/${state}/${city}/${record._key}`, record);
     }
     batch.run();
     console.timeEnd("insertAirports");
@@ -32,8 +32,8 @@ function insertFlights() {
     for (let i = 0; i < data.length; ++i) {
         const record = data[i];
         const { Year, Month, Day } = record;
-        batch.put(`flights/${Year}/${Month}/${Day}/${i}`, record);
-        // batch.insertP(["flights", Year, Month, Day, i], record);
+        // batch.insert(`flights/${Year}/${Month}/${Day}/${i}`, record);
+        batch.insert(["flights", Year, Month, Day, i], record);
     }
     batch.run();
     console.timeEnd("insertFlights");

package/src/QyAcl.d.ts

@@ -4,10 +4,11 @@ export declare const CmdNames: {
     R: number;
     D: number;
 };
-export declare function applyAclChange(aclKeyValueMap: any, cmdArgAsListObj: any): void;
+export declare function applyAclCmdObj(aclKeyValueMap: any, cmdArgAsListObj: any): void;
 export declare function iterCmdKeys(cmdArgAsListObj: any, fun: any): void;
+export declare function applyChange(oldContent: any, newValue: any): any;
 export declare class QyAclCmdGenerator {
-    cmdArgAsMapChanges: any[];
+    cmdArgAsMapChangeObj: any[];
     cmdCount: number;
     batchSize: number;
     constructor();

package/src/QyAcl.js

@@ -1,38 +1,34 @@
 import c from "node:fs/promises";
 
 import {
-    cleanContent as s,
-    mergeContent as g,
     setValByNamePath as a
 } from "./QyFileContentUtils.js";
 
 import {
-    isEmptyObj as m,
+    isEmptyObj as g,
     toBuffer as n,
-    SpecialOperators as r,
-    isSimpleType as o
+    isSimpleType as i,
+    isArray as s,
+    trimArrayTail as o
 } from "./QyUtils.js";
 
 import {
     logger as h
 } from "./QyLogger.js";
 
-let {
-    $del: f,
-    $rpl: l
-} = r, u = {
+let f = {
     M: 0,
     A: 1,
     R: 2,
     D: 3
 };
 
-function t(r, t) {
+function r(r, t) {
     var e, a, n, i, [ s, o, f, t ] = t;
     for (e in t) null != r[e] && (r[e] = void 0);
     for (a in o) {
-        var l, u = r[a] || (r[a] = {});
-        for (l of o[a]) u[l] = 1;
+        var u, l = r[a] || (r[a] = {});
+        for (u of o[a]) l[u] = 1;
     }
     for (n in f) {
         var c = r[n];
@@ -40,57 +36,60 @@ function t(r, t) {
             var h = f[n];
             if (h) {
                 for (var d of h) delete c[d];
-                m(c) && (r[n] = void 0);
+                g(c) && (r[n] = void 0);
             }
         }
     }
-    for (i in s) r[i] = g(r[i], s[i]);
+    for (i in s) r[i] = v(r[i], s[i]);
 }
 
-function e(r, t) {
+function t(r, t) {
     for (var e of r) for (var a in e) t(a);
 }
 
-class i {
-    cmdArgAsMapChanges = [];
+function v(r, t) {
+    if (null !== t) {
+        var e, a = t.$u8;
+        if (a) return new Uint8Array(a);
+        if (null == r || i(r) || i(t) || s(t) || t.$rpl) return t;
+        for (e in t) {
+            var n = v(r[e], t[e]);
+            null != n ? r[e] = n : delete r[e];
+        }
+        return s(r) && o(r), r;
+    }
+}
+
+class e {
+    cmdArgAsMapChangeObj = [];
     cmdCount = 0;
     batchSize = 0;
     constructor() {}
     pushCmd(r, t, e = void 0) {
         switch (++this.cmdCount, r) {
-          case u.A:
-            d(this, [ u.A, t, e ]), v(this, [ u.R, t, e ]);
+          case f.A:
+            u(this, [ f.A, t, e ]), l(this, [ f.R, t, e ]);
             break;
 
-          case u.R:
-            d(this, [ u.R, t, e ]), v(this, [ u.A, t, e ]);
+          case f.R:
+            u(this, [ f.R, t, e ]), l(this, [ f.A, t, e ]);
             break;
 
-          case u.D:
-            if (d(this, [ u.D, t ]), t.startsWith("c")) v(this, [ u.M, t ]); else for (var a of [ u.A, u.R ]) v(this, [ a, t ]);
+          case f.D:
+            if (u(this, [ f.D, t ]), t.startsWith("c")) l(this, [ f.M, t ]); else for (var a of [ f.A, f.R ]) l(this, [ a, t ]);
             break;
 
-          case u.M:
+          case f.M:
             {
-                var n = this.cmdArgAsMapChanges;
+                var n = this.cmdArgAsMapChangeObj;
                 let [ r ] = n;
-                n = (r = null == r ? n[u.M] = {} : r)[t];
-                r[t] = null != n ? function e(a, n) {
-                    if (n == f) return f;
-                    let r = n.$rpl;
-                    if (null != r) return n;
-                    let t = a.$rpl;
-                    if (null != t) return a[l] = g(t, n), a;
-                    if (a == f) return {
-                        [l]: s(n)
-                    };
-                    if (o(a) || o(n)) return n;
-                    if (n.$u8) return n;
-                    for (var i of Object.keys(n)) {
-                        let r = n[i], t = a[i];
-                        null == t ? a[i] = r : a[i] = e(t, r);
-                    }
-                    return a;
+                n = (r = null == r ? n[f.M] = {} : r)[t];
+                r[t] = null != n ? function r(t, e) {
+                    if (null === e) return null;
+                    if (void 0 === t || i(e) || s(e) || e.$rpl || e.$u8) return e;
+                    if (null === t || i(t)) return e.$rpl = 1, e;
+                    for (var a in e) t[a] = r(t[a], e[a]);
+                    return t;
                 }(n, e) : e;
                 break;
             }
@@ -101,101 +100,101 @@ class i {
     }
     pushCmdArgAsListObj(r) {
         if (r) {
-            for (var t in ++this.batchSize, r[u.D]) this.pushCmd(u.D, t);
-            for (var e of [ u.A, u.R ]) {
+            for (var t in ++this.batchSize, r[f.D]) this.pushCmd(f.D, t);
+            for (var e of [ f.A, f.R ]) {
                 var a, n = r[e];
                 for (a in n) for (var i of n[a]) this.pushCmd(e, a, i);
             }
             var s, [ o ] = r;
-            for (s in o) this.pushCmd(u.M, s, o[s]);
+            for (s in o) this.pushCmd(f.M, s, o[s]);
         }
         return this;
     }
     takeCmdArgAsListObj() {
-        var r, t = this.cmdArgAsMapChanges;
+        var r, t = this.cmdArgAsMapChangeObj;
         Object.assign(this, {
-            cmdArgAsMapChanges: [],
+            cmdArgAsMapChangeObj: [],
             cmdCount: 0,
             batchSize: 0
         });
-        for (r of [ u.A, u.R ]) {
+        for (r of [ f.A, f.R ]) {
             var e, a = t[r];
             for (e in a) {
                 var n = Object.keys(a[e]);
                 0 < n.length ? a[e] = n : delete a[e];
             }
-            m(a) && delete t[r];
+            g(a) && delete t[r];
         }
-        var i = t[u.D], i = (i && m(i) && delete t[u.D], t[u.M]);
-        return i && m(i) && delete t[u.M], t;
+        var i = t[f.D], i = (i && g(i) && delete t[f.D], t[f.M]);
+        return i && g(i) && delete t[f.M], t;
     }
     toAclBuffer(r) {
         var t = this.batchSize;
-        if (0 < t) return w(r, t, JSON.stringify(this.takeCmdArgAsListObj()));
+        if (0 < t) return b(r, t, JSON.stringify(this.takeCmdArgAsListObj()));
     }
 }
 
-function d(r, t, e = 1) {
-    a(r.cmdArgAsMapChanges, t, e);
+function u(r, t, e = 1) {
+    a(r.cmdArgAsMapChangeObj, t, e);
 }
 
-function v(r, t) {
-    let e = r.cmdArgAsMapChanges;
+function l(r, t) {
+    let e = r.cmdArgAsMapChangeObj;
     if (e && t && !(t.length <= 1)) {
         for (let r = 0; r < t.length - 1; ++r) if (null == (e = e[t[r]])) return;
         delete e[t.at(-1)];
     }
 }
 
-async function p(t, r = !1, e = 0) {
+async function d(t, r = !1, e = 0) {
     try {
-        return await y(t, await c.readFile(t), r, e);
+        return await w(t, await c.readFile(t), r, e);
     } catch (r) {
         throw h.error(`Reading ${t} failed:`, r), r;
     }
 }
 
-let A = [ 1, 2, 4, 8 ];
+let m = [ 1, 2, 4, 8 ];
 
-function b(t) {
+function A(t) {
     var e = t.length, a = new Array(e), n = new Array(e);
     let i = e << 6, s = 1;
     for (let r = 0; r < e; ++r) {
         var o = a[r] = (o = t[r]) <= 255 ? 0 : o <= 65535 ? 1 : o <= 4294967295 ? 2 : 3, o = (i |= o << (r << 1), 
-        n[r] = A[o]);
+        n[r] = m[o]);
         s += o;
     }
     var f = Buffer.allocUnsafe(s);
     f.writeUInt8(i);
-    let l = 1;
+    let u = 1;
     for (let r = 0; r < e; ++r) {
-        d = h = c = u = void 0;
-        var [ u, c, h, d = 0 ] = [ f, t[r], n[r], l ];
+        d = h = c = l = void 0;
+        var [ l, c, h, d = 0 ] = [ f, t[r], n[r], u ];
         switch (h) {
           case 1:
-            u.writeUInt8(c, d);
+            l.writeUInt8(c, d);
             break;
 
           case 2:
-            u.writeUInt16BE(c, d);
+            l.writeUInt16BE(c, d);
             break;
 
           case 4:
-            u.writeUInt32BE(c, d);
+            l.writeUInt32BE(c, d);
             break;
 
           default:
-            u.writeBigUInt64BE(BigInt(c), d);
+            l.writeBigUInt64BE(BigInt(c), d);
         }
-        l += n[r];
+        u += n[r];
     }
     return f;
 }
 
-function C(t, e, a) {
+function p(t, e, a) {
     var n = t.readUInt8(e), i = (++e, n >> 6 & 3);
     for (let r = 0; r < i; ++r) {
-        var s = A[n >> (r << 1) & 3];
+        var s = m[n >> (r << 1) & 3];
         a[r] = ((r, t, e = 0) => {
             switch (t) {
               case 1:
@@ -215,21 +214,21 @@ function C(t, e, a) {
     return e;
 }
 
-function w(r, t, e) {
+function b(r, t, e) {
     e = n(e);
-    return Buffer.concat([ b([ r, t, e.length ]), e ]);
+    return Buffer.concat([ A([ r, t, e.length ]), e ]);
 }
 
-async function y(e, r, a, n) {
+async function w(e, r, a, n) {
     var i = [];
     for (let t = 0; t < r.length; ) {
-        var s = [], o = C(r, t, s), [ s, f, l ] = s;
+        var s = [], o = p(r, t, s), [ s, f, u ] = s;
         if (s <= n) h.warn(`changeId ${s} <= currentChangeId ${n} at ${e}:${t}. Ignored.`), 
-        t = o + l; else {
+        t = o + u; else {
             n + f != s && h.warn(`currentChangeId ${n} + batchSize ${f} != changeId ` + s);
             try {
-                var u = JSON.parse(r.subarray(o, o + l));
-                i.push([ s, u ]), n = s, t = o + l;
+                var l = JSON.parse(r.subarray(o, o + u));
+                i.push([ s, l ]), n = s, t = o + u;
             } catch (r) {
                 if (h.error(`Parse ${e} failed at ${t}:`, r), a) return h.warn(`Autorepair by truncating ${e} to ` + t), 
                 null == (f = await c.truncate(e, t)) ? h.log("truncate success") : h.error("truncate failed:", f), 
@@ -242,13 +241,14 @@ async function y(e, r, a, n) {
 }
 
 export {
-    u as CmdNames,
-    t as applyAclChange,
-    e as iterCmdKeys,
-    i as QyAclCmdGenerator,
-    p as readAclFile,
-    b as numsToBuffer,
-    C as bufferToNums,
-    w as toAclBuffer,
-    y as readAclBuffer
+    f as CmdNames,
+    r as applyAclCmdObj,
+    t as iterCmdKeys,
+    v as applyChange,
+    e as QyAclCmdGenerator,
+    d as readAclFile,
+    A as numsToBuffer,
+    p as bufferToNums,
+    b as toAclBuffer,
+    w as readAclBuffer
 };

package/src/QyBatch.d.ts

@@ -28,7 +28,6 @@ export declare class QyBatch extends QyCD {
     insertEmbedding(namePath: any, embedding: any, parentDir?: any): any;
     delEmbedding(namePath: any, parentDir?: any): any;
     insertWithEmbedding(namePath: any, content: any, embedding: any, noClone?: boolean, noCreate?: boolean, parentDir?: any): any;
-    remove(namePath: any, content: any, parentDir?: any): any;
     put(namePath: any, content: any, parentDir?: any): any;
     delContent(namePath: any, parentDir?: any): any;
     insertTrigger(triggerName: any, fileNamePath: any, propNamePathList: any, modCode: any): any;

package/src/QyBatch.js

@@ -3,8 +3,7 @@ import {
 } from "node:util";
 
 import {
-    mergeContentAndGenDelta as s,
-    objToDelMarks as r
+    mergeContentAndGenDelta as s
 } from "./QyFileContentUtils.js";
 
 import {
@@ -12,33 +11,33 @@ import {
     ensurePropNamePathList as n,
     isString as l,
     SpecialOperators as e,
-    getSuffix as g,
+    getSuffix as f,
     SpecialFilePaths as t,
-    toSingleName as p,
+    toSingleName as _,
     isSimpleType as c,
     isEmptyObj as m,
-    isNumber as a,
+    isNumber as r,
     getNowRounded as d,
-    isDate as u,
-    isArray as f,
-    isFloat32Array as C
+    isDate as a,
+    isArray as u,
+    isFloat32Array as g
 } from "./QyUtils.js";
 
 import {
     QyAclCmdGenerator as i,
-    CmdNames as _
+    CmdNames as C
 } from "./QyAcl.js";
 
 import {
-    calDifferenceList as v
+    calDifferenceList as p
 } from "./QyIndex.js";
 
 import {
-    getDefaultOptions as y
+    getDefaultOptions as v
 } from "./QyDefaultOptions.js";
 
 import {
-    QyCD as D
+    QyCD as y
 } from "./QyCD.js";
 
 import {
@@ -46,17 +45,17 @@ import {
 } from "./QyIndexPropTree.js";
 
 import {
-    logger as F
+    logger as D
 } from "./QyLogger.js";
 
-let O = e.$del, b = t.IndexPropPathsFileName, L = {
+let F = e.$del, O = t.IndexPropPathsFileName, b = {
     none: 0,
     basic: 1,
     delta: 2,
     all: 3
 };
 
-class Q extends D {
+class L extends y {
     fileLogLevel;
     actionQueue;
     changeId;
@@ -67,15 +66,15 @@ class Q extends D {
     running;
     constructor(e, t) {
         super(e), t = {
-            ...y("QyBatch"),
+            ...v("QyBatch"),
             ...t
         };
-        e = L[t.fileLogLevel.toLowerCase()];
+        e = b[t.fileLogLevel.toLowerCase()];
         Object.assign(this, {
             options: t,
             fileLogLevel: e ?? 1,
             qyAclCmdGenerator: new i(),
-            qyCmdObjHistory: new A(t.maxHistoryCmdObjCount),
+            qyCmdObjHistory: new Q(t.maxHistoryCmdObjCount),
             actionQueue: [],
             changeList: [],
             syncList: []
@@ -141,7 +140,7 @@ class Q extends D {
         });
     }
     createIndex(e, t, i = this.currentDir) {
-        l(e) && (e = o(e)), f(t) || (t = [ t ]);
+        l(e) && (e = o(e)), u(t) || (t = [ t ]);
         e = this.qyCache.getOrCreateDir(e, i);
         return q(this, this._action_createIndex, {
             item: e,
@@ -156,7 +155,7 @@ class Q extends D {
             indexPropPath: t
         });
     }
-    insert(e, t, i = !1, r = !1, n = this.currentDir) {
+    insert(e, t, i = !0, r = !1, n = this.currentDir) {
         l(e) && (e = o(e));
         e = this.qyCache.getOrCreateFile(e, n).ensureLoaded();
         return t = i || c(t) ? t : structuredClone(t), q(this, this._action_insert, {
@@ -166,7 +165,7 @@ class Q extends D {
         });
     }
     insertEmbedding(e, t, i = this.currentDir) {
-        var r = this.qyCache, r = (C(t) || (t = new Float32Array(t)), l(e) && (e = o(e)), 
+        var r = this.qyCache, r = (g(t) || (t = new Float32Array(t)), l(e) && (e = o(e)), 
         r.getOrCreateFile(e, i));
         return q(this, this._action_insertEmbedding, {
             item: r,
@@ -182,9 +181,6 @@ class Q extends D {
     insertWithEmbedding(e, t, i, r = !1, n = !1, a = this.currentDir) {
         return this.insert(e, t, r, n, a), this.insertEmbedding(e, i, a);
     }
-    remove(e, t, i = this.currentDir) {
-        return this.insert(e, r(t), !0, !0, i);
-    }
     put(e, t, i = this.currentDir) {
         l(e) && (e = o(e));
         e = this.qyCache.getOrCreateFile(e, i).ensureLoaded();
@@ -246,7 +242,7 @@ class Q extends D {
             syncList: l
         } = this, c = i.length;
         if (0 == c) return n.decreaseChangeId(), 0;
-        var h = g(c), o = o.takeCmdArgAsListObj();
+        var h = f(c), o = o.takeCmdArgAsListObj();
         let d;
         0 < r && (r = i.map(({
             logStr: e
@@ -269,7 +265,7 @@ ${r}
         for ({
             item: m,
             delta: u
-        } of h) for (var f of m.triggerNodes) f.checkTrigger(m, u);
+        } of h) for (var g of m.triggerNodes) g.checkTrigger(m, u);
         return e ? c : t;
     }
     getTopHistoryCmdObj() {
@@ -325,18 +321,18 @@ ${r}
         var e, {
             item: t,
             indexPropPathList: i
-        } = t, r = this.qyCache.getOrCreateIndexDir(t), n = r.getOrCreateFile(b), {
+        } = t, r = this.qyCache.getOrCreateIndexDir(t), n = r.getOrCreateFile(O), {
             fileContent: a,
             qyIndexPropTree: o
         } = (n.created || this._action_createFile({
             item: n
         }), n), s = [], l = {};
         for (e of i) {
-            var c = p(e);
+            var c = _(e);
             a && a[c] || (s.push(e), l[c] = 1, o.insert(e));
         }
         if (0 != s.length) {
-            F.log(`Creating index ${JSON.stringify(s)} for ` + t.fullPath), this._action_insert({
+            D.log(`Creating index ${JSON.stringify(s)} for ` + t.fullPath), this._action_insert({
                 item: n,
                 content: l
             });
@@ -344,17 +340,17 @@ ${r}
                 var h, d = this, m = t, u = r, i = x(s);
                 let e;
                 for (h of i) {
-                    var f = u.searchOrCreateSubdir(h);
-                    if (!f.created) {
+                    var g = u.searchOrCreateSubdir(h);
+                    if (!g.created) {
                         d._action_createDir({
-                            item: f
+                            item: g
                         });
-                        for (var g of e = e || m.fileList) {
+                        for (var f of e = e || m.fileList) {
                             var {
-                                fileContent: g,
+                                fileContent: f,
                                 name: C
-                            } = g;
-                            null != g && E(d, f, h, C, void 0, g);
+                            } = f;
+                            null != f && E(d, g, h, C, void 0, f);
                         }
                     }
                 }
@@ -367,10 +363,10 @@ ${r}
             item: e,
             indexPropPath: r
         } = e, e = this.qyCache.getIndexDir(e);
-        e && ((i = e.getFile(b)) ? (t = i.qyIndexPropTree, this._action_insert({
+        e && ((i = e.getFile(O)) ? (t = i.qyIndexPropTree, this._action_insert({
             item: i,
             content: {
-                [p(r)]: O
+                [_(r)]: F
             }
         }), t.remove(r).hasPrefix || (i = e.getSubdir(r)) && this._action_delDir({
             item: i
@@ -389,7 +385,7 @@ ${r}
             parentDir: r,
             name: n
         } = i;
-        return i.created = !1, N(this, e), t || I(this, r, _.R, r.fileMapKey, n), 
+        return i.created = !1, N(this, e), t || I(this, r, C.R, r.fileMapKey, n), 
         !0;
     }
     _action_delDir(e) {
@@ -405,13 +401,13 @@ ${r}
             fileMapKey: s
         } = t;
         if (a) {
-            I(this, t, _.D, s);
+            I(this, t, C.D, s);
             for (var l of t.fileList) this._action_delFile({
                 item: l
             }, !0);
         }
         if (n) {
-            I(this, t, _.D, o);
+            I(this, t, C.D, o);
             for (var c of t.allSubdirs()) {
                 let {
                     subdirMap: e,
@@ -419,8 +415,8 @@ ${r}
                     subdirMapKey: i,
                     fileMapKey: r
                 } = c;
-                if (e && I(this, c, _.D, i), t) {
-                    I(this, c, _.D, r);
+                if (e && I(this, c, C.D, i), t) {
+                    I(this, c, C.D, r);
                     for (var h of c.fileList) this._action_delFile({
                         item: h
                     }, !0);
@@ -431,7 +427,7 @@ ${r}
                 }), c.created = !1;
             }
         }
-        return !!i && (t.created = !1, N(this, e), I(this, i, _.R, i.subdirMapKey, r), 
+        return !!i && (t.created = !1, N(this, e), I(this, i, C.R, i.subdirMapKey, r), 
         !0);
     }
     _action_delContent(e) {
@@ -441,9 +437,9 @@ ${r}
             content: i,
             delta: {
                 oldValue: i,
-                newValue: O
+                newValue: F
             }
-        }), N(this, e), I(this, t, _.D, t.fileContentKey), P(this, t, i), !0);
+        }), N(this, e), I(this, t, C.D, t.fileContentKey), P(this, t, i), !0);
     }
     _action_insertEmbedding(e) {
         e.actionName = "insertEmbedding";
@@ -486,18 +482,14 @@ ${r}
             item: t,
             content: i
         } = e;
-        if (null == i) return F.warn(`Saving undefined to ${t.fullPath}. Not making any change.`), 
+        if (null == i) return D.warn(`Saving undefined to ${t.fullPath}. Not making any change.`), 
         !1;
         t.created || this._action_createFile({
             item: t
         });
-        var {
-            fileContentKey: r,
-            fileContent: n
-        } = t;
-        return I(this, t, _.M, r, {
-            $rpl: i
-        }), N(this, e), t.fileContent = i, P(this, t, n, i, i), !0;
+        var r = t.fileContentKey;
+        return i.$rpl = 1, I(this, t, C.M, r, i), N(this, e), t.fileContent = i, 
+        !0;
     }
     _action_insert(e) {
         e.actionName = "insert";
@@ -506,7 +498,7 @@ ${r}
             content: i,
             noCreate: r
         } = e;
-        if (null == i) return F.warn(`Saving undefined to ${t.fullPath}. Not making any change.`), 
+        if (null == i) return D.warn(`Saving undefined to ${t.fullPath}. Not making any change.`), 
         !1;
         if (!t.created) {
             if (r) return !1;
@@ -521,7 +513,7 @@ ${r}
         return !!o && ({
             oldValue: o,
             newValue: n
-        } = o, !!n) && (a = t.fileContentKey, null == i ? I(this, t, _.D, a) : I(this, t, _.M, a, n), 
+        } = o, a = t.fileContentKey, null == i ? I(this, t, C.D, a) : I(this, t, C.M, a, n), 
         Object.assign(e, r), N(this, e), t.fileContent = i, P(this, t, o, n, i), 
         !0);
     }
@@ -533,7 +525,7 @@ ${r}
         }), Object.assign(i, {
             created: !0,
             fileContentLoaded: !0
-        }), N(this, e), I(this, t, _.A, t.fileMapKey, i.name), !0);
+        }), N(this, e), I(this, t, C.A, t.fileMapKey, i.name), !0);
     }
     _action_createDir(e) {
         e.actionName = "createDir";
@@ -550,7 +542,7 @@ ${r}
                 item: e
             });
             var r = e.parentDir;
-            I(this, r, _.A, r.subdirMapKey, e.name);
+            I(this, r, C.A, r.subdirMapKey, e.name);
         }
         return !0;
     }
@@ -583,7 +575,7 @@ ${r}
         return !!r && (t = this.qyCache, !!(r = t.getExpireInfoFile(r.fullPathHash, e.isFile ? "f" : "d"))) && ((n = this._action_insert({
             item: r,
             content: {
-                [n]: O
+                [n]: F
             }
         })) && (m(r.fileContent) && this._action_delFile({
             item: r
@@ -611,7 +603,7 @@ ${r}
             expireInfoObj: i,
             infoFileOnly: r
         } = e, n = this.qyCache, a = n.getExpireInfoFile(e.fullPathHash, "c");
-        return !!a && (i = f(i) ? Object.fromEntries(i.map(e => [ e, O ])) : j(i, e => e ? O : void 0), 
+        return !!a && (i = u(i) ? Object.fromEntries(i.map(e => [ e, F ])) : j(i, e => e ? F : void 0), 
         (t = this._action_insert({
             item: a,
             content: i
@@ -670,14 +662,14 @@ function P(e, t, i, r = void 0, n = void 0) {
     if (!t) {
         var s = e.qyCache.getIndexDir(o);
         if (s) {
-            t = s.getFile(b);
+            t = s.getFile(O);
             if (t) for (var l of t.qyIndexPropTree.getAllIndexPropPaths()) E(e, s.searchOrCreateSubdir(l), l, a, i, r, n);
         }
     }
 }
 
 function E(t, e, i, r, n, a, o = void 0) {
-    e = v(e, i, n, a, o);
+    e = p(e, i, n, a, o);
     if (e) {
         var s, l, c, {
             toAddFileList: i,
@@ -685,14 +677,14 @@ function E(t, e, i, r, n, a, o = void 0) {
         } = e;
         for (s of i) {
             var h = s.fileContent ?? {};
-            h[r] = 1, t._action_put({
+            h[r] = 1, t._action_insert({
                 item: s,
                 content: h
             });
         }
         for (l of n) {
             var d = l.fileContent;
-            null != d && Object.hasOwn(d, r) && (delete d[r], t._action_put({
+            null != d && Object.hasOwn(d, r) && (delete d[r], t._action_insert({
                 item: l,
                 content: d
             }));
@@ -709,7 +701,7 @@ function E(t, e, i, r, n, a, o = void 0) {
     }
 }
 
-class A {
+class Q {
     maxLength;
     actionQueue;
     nextPos;
@@ -749,7 +741,7 @@ function j(e, t = void 0, i = [], r = {}) {
 }
 
 function S(e, t, i) {
-    return a(e) ? (t ? e : 1e3 * e) + i : l(e) ? (t = new Date(e).getTime(), isNaN(t) || t <= i ? void 0 : t) : !u(e) || (t = e.getTime()) <= i ? void 0 : t;
+    return r(e) ? (t ? e : 1e3 * e) + i : l(e) ? (t = new Date(e).getTime(), isNaN(t) || t <= i ? void 0 : t) : !a(e) || (t = e.getTime()) <= i ? void 0 : t;
 }
 
 function T(e, t, i, r, n) {
@@ -769,5 +761,5 @@ function M(e, t, i, r, n) {
 }
 
 export {
-    Q as QyBatch
+    L as QyBatch
 };

package/src/QyDB.js

@@ -47,7 +47,7 @@ class l extends t {
             ...o("QyDB"),
             ...t
         }, this.rootFolder = e;
-        for (let t of [ "createIndex", "delIndex", "insert", "put", "remove", "delDir", "delFile", "delContent", "insertTrigger", "removeTrigger", "insertRpc", "removeRpc", "insertEmbedding", "delEmbedding", "insertWithEmbedding", "expireFile", "expireDir", "expireContent", "expireFileM", "expireDirM", "expireContentM", "removeFileExpire", "removeDirExpire", "removeContentExpire" ]) this[t] = (...e) => this.currentBatch[t](...e).run();
+        for (let t of [ "createIndex", "delIndex", "insert", "put", "delDir", "delFile", "delContent", "insertTrigger", "removeTrigger", "insertRpc", "removeRpc", "insertEmbedding", "delEmbedding", "insertWithEmbedding", "expireFile", "expireDir", "expireContent", "expireFileM", "expireDirM", "expireContentM", "removeFileExpire", "removeDirExpire", "removeContentExpire" ]) this[t] = (...e) => this.currentBatch[t](...e).run();
     }
     async start(e) {
         var t;

package/src/QyFileContentUtils.d.ts

@@ -1,4 +1,3 @@
-export declare function mergeContent(oldContent: any, newContent: any): any;
 export declare function mergeContentAndGenDelta(oldContent: any, newContent: any): {
     merged: any;
     delta: any;
@@ -6,5 +5,4 @@ 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): any;
-export declare function objToDelMarks(obj: any): any;
+export declare function cleanContent(obj: any): any;

package/src/QyFileContentUtils.js

@@ -1,195 +1,145 @@
 import {
-    isDeepStrictEqual as t
+    isDeepStrictEqual as u
 } from "node:util";
 
 import {
-    isDate as f,
-    isArray as d,
-    isNotNullObj as a,
-    trimArrayTail as o,
-    isSimpleType as s,
-    SpecialOperators as r,
-    isEmptyObj as i,
-    isUint8Array as u,
+    isDate as n,
+    isArray as V,
+    isNotNullObj as i,
+    trimArrayTail as a,
+    isSimpleType as m,
+    isEmptyObj as o,
+    isUint8Array as f,
     isNumber as c
 } from "./QyUtils.js";
 
-let {
-    $del: g,
-    $rpl: p,
-    $ext: V,
-    $pop: m,
-    $u8: v
-} = r;
-
-function h(e, n) {
-    if (null == n) return e;
-    if (n !== g) {
-        if (s(n)) return n;
-        var l = n[p];
-        if (null != l) {
-            let r = l[v];
-            return null != r ? new Uint8Array(r) : l;
-        }
-        let r = n[v];
-        if (null != r) return new Uint8Array(r);
-        if (null == e || s(e)) return n;
-        if (e != n) {
-            var t, u = d(e);
-            for (t in n) {
-                var i = h(e[t], n[t]);
-                null == i ? (delete e[t], u && o(e)) : e[t] = i;
-            }
-        }
-        return e;
-    }
-}
-
-function e(r, e) {
-    let n = {
+function l(l, e) {
+    let r = e, n;
+    var t;
+    return void 0 === e ? r = l : null === e ? (r = void 0, null != l && (n = {
+        oldValue: l,
+        newValue: null
+    })) : f(e) ? f(l) && u(l, e) || (n = {
+        newValue: {
+            $u8: Array.from(e)
+        },
+        oldValue: l
+    }) : null == l ? n = {
+        newValue: e
+    } : m(e) || m(l) ? e !== l && (n = {
+        oldValue: l,
+        newValue: e
+    }) : e.$rpl ? n = {
+        oldValue: l,
+        newValue: e
+    } : (t = {}, n = {
         oldValue: {},
-        newValue: {}
-    };
-    r = $(r, e, [], 0, n);
-    return n.oldValue = A(n.oldValue, !0), n.newValue = A(n.newValue, !1), {
+        newValue: t
+    }, r = $(l, e, n), o(t) && (n = void 0)), {
         merged: r,
-        delta: n = n.oldValue || n.newValue ? n : void 0
+        delta: n
     };
 }
 
-function y(r, e, n) {
-    if (!e || 0 == e.length) return n;
-    let l = r;
-    for (let r = 0; r < e.length - 1; ++r) {
-        var t = e[r];
-        a(l[t]) || (l[t] = {}), l = l[t];
+function t(l, e, r) {
+    if (!e || 0 == e.length) return r;
+    let n = l;
+    for (let l = 0; l < e.length - 1; ++l) {
+        var t = e[l];
+        i(n[t]) || (n[t] = {}), n = n[t];
     }
     var u = e.at(-1);
-    return void 0 === n ? delete l[u] : l[u] = n, r;
+    return void 0 === r ? delete n[u] : n[u] = r, l;
 }
 
-function n(r, e) {
-    if (null != e && null != (r = b(r))) {
-        if (!d(e)) return "" == e ? r : b(r[e]);
-        if (0 != e.length && (1 != e.length || "" != e[0])) for (var n of e) if (null == (r = b(r[n]))) return;
-        return r;
+function e(l, e) {
+    if (null != e && null != l) {
+        if (!V(e)) return "" == e ? l : l[e];
+        if (0 != e.length && (1 != e.length || "" != e[0])) for (var r of e) if (null == (l = l[r])) return;
+        return l;
     }
 }
 
-function w(r, e, n = !1, l = 0) {
-    var t = e[l];
-    if (l == e.length - 1) return delete r[t], !n && i(r) ? void 0 : r;
-    var u = r[t];
-    if (a(u)) {
-        u = w(u, e, n, l + 1);
-        if (null == u && !n) return delete r[t], i(r) ? void 0 : r;
-        r[t] = u;
+function v(l, e, r = !1, n = 0) {
+    var t = e[n];
+    if (n == e.length - 1) return delete l[t], !r && o(l) ? void 0 : l;
+    var u = l[t];
+    if (i(u)) {
+        u = v(u, e, r, n + 1);
+        if (null == u && !r) return delete l[t], o(l) ? void 0 : l;
+        l[t] = u;
     }
-    return r;
+    return l;
 }
 
-function A(r, e = !0) {
-    return function l(t, u) {
-        if (f(t)) return t.toISOString();
-        if (!a(t)) return u && t === g ? void 0 : t;
-        if (u) {
-            let r = t[p];
-            if (null != r) return l(r, u);
-            let e = t[V];
-            if (null != e) return l(d(e) ? e : [ e ], u);
-            let n = t[m];
-            if (null != n) return;
+function d(l) {
+    if (null != l) {
+        if (m(l)) return n(l) ? l.toISOString() : l;
+        for (var e in l) {
+            var r = d(l[e]);
+            null == r ? delete l[e] : l[e] = r;
         }
-        let e = d(t);
-        let n = !0;
-        for (var i in t) {
-            let r = l(t[i], u);
-            void 0 === r ? (delete t[i], e && o(t)) : (t[i] = r, n = !1);
-        }
-        return n ? void 0 : t;
-    }(r, e);
-}
-
-function l(r) {
-    if (s(r)) return r ? g : void 0;
-    for (var e in r) {
-        var n = l(r[e]);
-        n ? r[e] = n : delete r[e];
+        return V(l) ? a(l) : l.$rpl && delete l.$rpl, l;
     }
-    return d(r) && o(r), r;
 }
 
-function S(r, e, n, l, t) {
-    if (r != e) {
-        var u, i = d(r);
-        for (u in e) {
-            n[l] = u, n.length = l + 1;
-            var f = $(r[u], e[u], n, l + 1, t);
-            null == f ? (delete r[u], i && o(r)) : r[u] = f;
+function $(l, e, r, n = []) {
+    if (l !== e) {
+        var t, u = n.length;
+        for (t in e) {
+            n.length = u + 1;
+            var i = ((l, e, r, n) => {
+                if (void 0 === e) return l;
+                if (null !== e) {
+                    if (null == l || m(l) || m(e)) return l !== e && w(r, n, l, e), 
+                    e;
+                    if (e.$rpl) return w(r, n, l, e), e;
+                    if (i = e.$extend, null != i) {
+                        var t = l, u = i, i = r, a = n;
+                        if (V(t)) {
+                            V(u) || (u = [ u ]);
+                            var o = t.length, f = {};
+                            for (let l = 0; l < u.length; ++l) {
+                                var v = u[l];
+                                null != v && (f[l + o] = v);
+                            }
+                            w(i, a, {}, f), t.push(...u);
+                        }
+                        return t;
+                    }
+                    if (i = e.$pop, null == i) return (a = V(l)) == V(e) ? $(l, e, r, n) : (w(r, n, l, e), 
+                    a && (e.$rpl = 1), e);
+                    var d = l, t = r, e = n;
+                    if ((i = i) && V(d)) {
+                        var s = d.length;
+                        if (0 < s) {
+                            var p = {}, g = {}, i = c(i) ? Math.min(i, s) : 1;
+                            for (let l = s - i; l < s; ++l) {
+                                var h = d[l];
+                                null != h && (p[l] = h, g[l] = null);
+                            }
+                            w(t, e, p, g), d.length -= i;
+                        }
+                    }
+                    return d;
+                }
+                void 0 !== l && w(r, n, l, null);
+            })(l[n[u] = t], e[t], r, n);
+            null == i ? delete l[t] : l[t] = i;
         }
+        V(l) && a(l);
     }
-    return r;
+    return l;
 }
 
-function $(e, n, l, t, u) {
-    if (void 0 === n) return e;
-    if (n !== g && null !== n) {
-        if (null == e || s(e) || s(n)) return O(e, n, l, u);
-        var i = n[p];
-        if (null != i) return O(e, i, l, u);
-        let r = n[V];
-        if (null != r) return d(r) || (r = [ r ]), (d(e) ? (e, n, r, l) => {
-            n = A(n);
-            var t = {};
-            for (let r = 0; r < n.length; ++r) {
-                var u = n[r];
-                null != u && (t[r + e.length] = s(u) ? u : {
-                    [p]: u
-                });
-            }
-            return U(l, r, e, t), e.concat(n);
-        } : O)(e, r, l, u);
-        i = n[m];
-        if (null == i) return d(e) && !d(n) || !d(e) && d(n) ? O(e, n, l, u) : S(e, n, l, t, u);
-        var n = e, f = l, a = u;
-        if (!i || !d(n)) return n;
-        var o = n.length, v = [];
-        for (let r = c(i) ? i <= o ? i : o : 1; 0 < r; --r) v[o - r] = g;
-        return S(n, v, f, t, a);
-    }
-    null != e && U(u, l, e, g);
-}
-
-function O(r, e, n, l) {
-    e = A(e);
-    return r === e || u(r) && u(e) && t(r, e) ? r : null != e ? (null == r ? U(l, n, 0 == n.length ? void 0 : null, u(e) ? {
-        [v]: Array.from(e)
-    } : s(e) ? e : {
-        [p]: e
-    }) : U(l, n, r, u(e) ? {
-        [v]: Array.from(e)
-    } : s(r) ? e : {
-        [p]: e
-    }), e) : void U(l, n, r, g);
-}
-
-function U(r, e, n, l) {
-    r.oldValue = y(r.oldValue, e, n), r.newValue = y(r.newValue, e, l);
-}
-
-function b(r) {
-    if (null != r && r != g) {
-        for (;null != r[p]; ) if ((r = r[p]) == g) return;
-        return r;
-    }
+function w(l, e, r, n) {
+    t(l.oldValue, e, r), t(l.newValue, e, n);
 }
 
 export {
-    h as mergeContent,
-    e as mergeContentAndGenDelta,
-    y as setValByNamePath,
-    n as getValByNamePath,
-    w as delValByNamePath,
-    A as cleanContent,
-    l as objToDelMarks
+    l as mergeContentAndGenDelta,
+    t as setValByNamePath,
+    e as getValByNamePath,
+    v as delValByNamePath,
+    d as cleanContent
 };

package/src/QySnapshots.js

@@ -36,7 +36,7 @@ import {
 import {
     bufferToNums as c,
     numsToBuffer as S,
-    applyAclChange as C,
+    applyAclCmdObj as C,
     iterCmdKeys as P
 } from "./QyAcl.js";
 

package/src/QyUtils.js

@@ -102,7 +102,7 @@ function W(r) {
 
 function E(r) {
     var t = typeof r;
-    return "string" == t || "number" == t || "boolean" == t || m(r) || s(r);
+    return "string" == t || "number" == t || "boolean" == t || s(r);
 }
 
 function R(r) {