datafolder 1.0.17 → 1.0.18

package/src/QyCD.d.ts

@@ -13,6 +13,9 @@ export declare class QyCD {
     indexDirP(indexHostDirNamePath: string | string[] | QyDir, namePath: string | string[], parentDir?: any): QyDir | undefined;
     file(namePath: string | string[], parentDir?: any): QyFile | undefined;
     fileP(namePath: string | string[], parentDir?: any): QyFile | undefined;
+    fileContent(namePath: string | string[], parentDir?: any): any;
+    embeddingFile(namePath: string | string[], parentDir?: any): any;
+    embedding(namePath: string | string[], parentDir?: any): any;
     triggerFile(triggerName: any): any;
     get triggerFileList(): any;
     rpcFile(rpcName: any): any;

package/src/QyCD.js

@@ -1,107 +1,118 @@
 import {
     isString as t,
-    pathSplit as s
+    pathSplit as n
 } from "./QyUtils.js";
 
-class r {
+class e {
     qyCache;
     currentDir;
-    constructor(r) {
-        this.qyCache = r;
+    constructor(e) {
+        this.qyCache = e;
     }
-    cd(r, e = this.currentDir) {
-        return t(r) && (r = s(r)), this.cdP(r, e);
+    cd(e, r = this.currentDir) {
+        return t(e) && (e = n(e)), this.cdP(e, r);
     }
-    cdP(r, e = this.currentDir) {
-        return this.currentDir = this.qyCache?.getOrCreateDir(r, e), this;
+    cdP(e, r = this.currentDir) {
+        return this.currentDir = this.qyCache.getOrCreateDir(e, r), this;
     }
-    dir(r, e = this.currentDir) {
-        return t(r) && (r = s(r)), this.dirP(r, e);
+    dir(e, r = this.currentDir) {
+        return t(e) && (e = n(e)), this.dirP(e, r);
     }
-    dirP(r, e = this.currentDir) {
-        return this.qyCache?.getDir(r, e);
+    dirP(e, r = this.currentDir) {
+        return this.qyCache.getDir(e, r);
     }
-    indexDir(r, e, i = this.currentDir) {
-        return t(r) && (r = s(r)), t(e) && (e = s(e)), this.indexDirP(r, e, i);
+    indexDir(e, r, i = this.currentDir) {
+        return t(e) && (e = n(e)), t(r) && (r = n(r)), this.indexDirP(e, r, i);
     }
-    indexDirP(r, e, i = this.currentDir) {
-        var t = this.qyCache, r = t?.getDir(r, i);
-        if (r) {
-            i = t?.getIndexDir(r);
-            if (i) return e && 0 != e.length ? t?.getDir(e, i) : i;
+    indexDirP(e, r, i = this.currentDir) {
+        var t = this.qyCache, e = t.getDir(e, i);
+        if (e) {
+            i = t.getIndexDir(e);
+            if (i) return r && 0 != r.length ? t.getDir(r, i) : i;
         }
     }
-    file(r, e = this.currentDir) {
-        return t(r) && (r = s(r)), this.fileP(r, e);
+    file(e, r = this.currentDir) {
+        return t(e) && (e = n(e)), this.fileP(e, r);
     }
-    fileP(r, e = this.currentDir) {
-        return this.qyCache?.getFile(r, e);
+    fileP(e, r = this.currentDir) {
+        return this.qyCache.getFile(e, r);
     }
-    triggerFile(r) {
-        return this.qyCache.getTriggerFile(r);
+    fileContent(e, r = this.currentDir) {
+        return this.file(e, r)?.fileContent;
+    }
+    embeddingFile(e, r = this.currentDir) {
+        t(e) && (e = n(e));
+        var i = this.qyCache;
+        return i.getEmbeddingFile(i.getOrCreateFile(e, r).fullPathHash);
+    }
+    embedding(e, r = this.currentDir) {
+        return this.embeddingFile(e, r)?.fileContent;
+    }
+    triggerFile(e) {
+        return this.qyCache.getTriggerFile(e);
     }
     get triggerFileList() {
         return this.qyCache.triggerFileList;
     }
-    rpcFile(r) {
-        return this.qyCache.getRpcFile(r);
+    rpcFile(e) {
+        return this.qyCache.getRpcFile(e);
     }
     get rpcFileList() {
         return this.qyCache.rpcFileList;
     }
-    view(r, e = void 0, i = this.currentDir) {
-        return t(r) && (r = s(r)), this.viewP(r, e, i);
+    view(e, r = void 0, i = this.currentDir) {
+        return t(e) && (e = n(e)), this.viewP(e, r, i);
     }
-    viewP(r, e, i = this.currentDir) {
-        return this.qyCache.getFile(r, i)?.view(e);
+    viewP(e, r, i = this.currentDir) {
+        return this.qyCache.getFile(e, i)?.view(r);
     }
-    queryFiles(r, e, i = void 0, t = void 0, s = this.currentDir) {
-        return this.qyCache.queryFiles(r, e, i, t, s);
+    queryFiles(e, r, i = void 0, t = void 0, n = this.currentDir) {
+        return this.qyCache.queryFiles(e, r, i, t, n);
     }
-    queryFilesMulti(r, e, i, t = this.currentDir) {
-        return this.qyCache.queryFilesMulti(r, e, i, t);
+    queryFilesMulti(e, r, i, t = this.currentDir) {
+        return this.qyCache.queryFilesMulti(e, r, i, t);
     }
-    queryTree(r, e, i, t, s, h = this.currentDir) {
-        return n(this.qyCache.queryFiles(r, e, t, s, h), i);
+    queryTree(e, r, i, t, n, s = this.currentDir) {
+        return h(this.qyCache.queryFiles(e, r, t, n, s), i);
     }
-    queryTreeMulti(r, e, i, t, s = this.currentDir) {
-        return n(this.qyCache.queryFilesMulti(r, i, t, s), e);
+    queryTreeMulti(e, r, i, t, n = this.currentDir) {
+        return h(this.qyCache.queryFilesMulti(e, i, t, n), r);
     }
     resetCurrentDir() {
         this.currentDir = void 0;
     }
-    fileListToTree(r, e) {
-        return n(r, e);
+    fileListToTree(e, r) {
+        return h(e, r);
     }
 }
 
-function n(r, i) {
-    var t, s = {};
-    for (t of r) {
-        var h, n = t.parentList;
-        let e = s;
-        for (h of n) {
+function h(e, i) {
+    var t, n = {};
+    for (t of e) {
+        var s, h = t.parentList;
+        let r = n;
+        for (s of h) {
             var {
                 name: u,
-                fullPathHash: c
-            } = h;
-            let r = e.subdirMap;
-            r = r || (e.subdirMap = {}), e = (e = r[u]) || (r[u] = {
-                fullPathHash: c
+                fullPathHash: l
+            } = s;
+            let e = r.subdirMap;
+            e = e || (r.subdirMap = {}), r = (r = e[u]) || (e[u] = {
+                fullPathHash: l
             });
         }
-        let r = e.fileMap;
-        (r = r || (e.fileMap = {}))[t.name] = {
+        let e = r.fileMap;
+        (e = e || (r.fileMap = {}))[t.name] = {
             fileContent: t.view(i, !0),
             fileContentKey: t.fileContentKey
         };
     }
     return {
-        tree: s,
-        count: r.length
+        tree: n,
+        count: e.length
     };
 }
 
 export {
-    r as QyCD
+    e as QyCD
 };

package/src/QyCache.d.ts

@@ -12,6 +12,8 @@ export declare class QyCache extends EventEmitter {
     rpcRootDir: any;
     indexRootDir: any;
     expireRootDir: any;
+    embeddingRootDir: any;
+    h2FRootDir: any;
     exclusiveFilePath: any;
     qyKVData: any;
     qyFileLogger: any;
@@ -32,6 +34,12 @@ export declare class QyCache extends EventEmitter {
     getOrCreateTriggerFile(triggerName: any): any;
     getExpireInfoFile(fullPathHash: any, type?: string): any;
     getOrCreateExpireInfoFile(fullPathHash: any, type?: string): any;
+    getH2FFile(fullPathHash: any): any;
+    getOrCreateH2FFile(fullPathHash: any): any;
+    h2F(fullPathHash: any): QyFile | undefined;
+    getEmbeddingFile(fullPathHash: any): any;
+    getOrCreateEmbeddingFile(fullPathHash: any): any;
+    getEmbedding(fullPathHash: any): any;
     get triggerFileList(): any;
     getRpcFile(rpcFunName: any): any;
     getOrCreateRpcFile(rpcFunName: any): any;

package/src/QyCache.js

@@ -1,34 +1,34 @@
 import {
-    join as v
+    join as f
 } from "node:path";
 
 import r from "node:events";
 
 import {
-    QyDir as p
+    QyDir as D
 } from "./QyDir.js";
 
 import {
-    QyFileLogger as u
+    QyFileLogger as c
 } from "./QyFileLogger.js";
 
 import {
-    QyKVData as d
+    QyKVData as F
 } from "./QyKVData.js";
 
 import {
-    QyTriggerNode as f,
+    QyTriggerNode as v,
     updateTriggerNodes as s
 } from "./QyTrigger.js";
 
 import {
-    isString as x,
-    lockExclusiveFilePath as C,
+    isString as C,
+    lockExclusiveFilePath as R,
     unlockExclusiveFilePath as i
 } from "./QyUtils.js";
 
 import {
-    dumpStructure as q
+    dumpStructure as x
 } from "./QyStructure.js";
 
 import {
@@ -37,11 +37,11 @@ import {
 } from "./QyIndex.js";
 
 import {
-    getDefaultOptions as h
+    getDefaultOptions as m
 } from "./QyDefaultOptions.js";
 
 import {
-    ensureDir as R,
+    ensureDir as q,
     SpecialFilePaths as e
 } from "./QyUtils.js";
 
@@ -50,24 +50,26 @@ import {
 } from "./QyUnionNode.js";
 
 import {
-    QyKVDataLoader as O
+    QyKVDataLoader as b
 } from "./QyKVDataLoader.js";
 
 import {
-    requireFromModCode as c
+    requireFromModCode as d
 } from "./QyMod.js";
 
 import {
-    logger as Q
+    logger as O
 } from "./QyLogger.js";
 
 let {
-    HiddenFolderName: D,
-    IndexDirPath: F,
-    TriggerDirPath: P,
-    RpcDirPath: S,
-    ExpireDirPath: m,
-    MetaFilePath: t
+    HiddenFolderName: y,
+    IndexDirPath: P,
+    TriggerDirPath: Q,
+    RpcDirPath: w,
+    ExpireDirPath: S,
+    MetaFilePath: t,
+    EmbeddingDirPath: L,
+    H2FDirPath: E
 } = e;
 
 class o extends r {
@@ -81,35 +83,42 @@ class o extends r {
     rpcRootDir;
     indexRootDir;
     expireRootDir;
+    embeddingRootDir;
+    h2FRootDir;
     exclusiveFilePath;
     qyKVData;
     qyFileLogger;
     rpcFunMap = {};
     constructor(r, e, t) {
         super(), e = {
-            ...h("QyCache"),
+            ...m("QyCache"),
             ...e
-        }, o = new p("", !0, void 0, i = this), a = m.at(-1), s = F.at(-1), l = new p(D, !0, o), 
-        n = new p(a, !0, l), g = new p(s, !0, l), o._subdirMap = {
-            [D]: l
-        }, l._subdirMap = {
-            [a]: n,
-            [s]: g
+        }, o = new D("", !0, void 0, i = this), a = S.at(-1), s = P.at(-1), n = L.at(-1), 
+        g = E.at(-1), p = new D(y, !0, o), l = new D(a, !0, p), d = new D(s, !0, p), 
+        h = new D(n, !0, p), u = new D(g, !0, p), o._subdirMap = {
+            [y]: p
+        }, p._subdirMap = {
+            [a]: l,
+            [s]: d,
+            [n]: h,
+            [g]: u
         }, Object.assign(i, {
             rootDir: o,
-            expireRootDir: n,
-            indexRootDir: g
+            expireRootDir: l,
+            indexRootDir: d,
+            embeddingRootDir: h,
+            h2FRootDir: u
         });
-        var i, o, a, s, n, g, l = v(r, "qykv");
+        var i, o, a, s, n, g, l, d, h, u, p = f(r, "qykv");
         Object.assign(this, {
             rootFolder: r,
             options: e,
             qyDB: t,
-            kvFolder: l,
-            rpcFolder: v(r, "rpc"),
-            exclusiveFilePath: v(r, ".opened"),
-            qyKVData: new d(l, e, this),
-            qyFileLogger: new u(v(r, "qylog"), e)
+            kvFolder: p,
+            rpcFolder: f(r, "rpc"),
+            exclusiveFilePath: f(r, ".opened"),
+            qyKVData: new F(p, e, this),
+            qyFileLogger: new c(f(r, "qylog"), e)
         });
     }
     async start() {
@@ -122,16 +131,16 @@ class o extends r {
             exclusiveFilePath: a,
             rootDir: s
         } = this;
-        Q.log(`Starting at ${r}...`);
+        O.log(`Starting at ${r}...`);
         try {
-            await R(e), o.start();
+            await q(e), o.start();
             var [ {
                 maxChangeId: n,
                 loadedMaxAclNum: g,
                 qySnapshots: l,
-                aclKeyValueMap: p
-            } ] = await Promise.all([ ((r, e) => (r = new O(r, e)).load())(e, t), C(a) ]);
-            i.start(n, g, l, p);
+                aclKeyValueMap: d
+            } ] = await Promise.all([ ((r, e) => (r = new b(r, e)).load())(e, t), R(a) ]);
+            i.start(n, g, l, d);
         } catch (r) {
             throw o.stop(), r;
         }
@@ -142,46 +151,48 @@ class o extends r {
             } = e;
             for (var o of t) r(o);
         }(s);
-        var u = this, e = u.rootDir;
-        e.triggerNodes = [ new f() ];
-        for (d of (e = u.triggerRootDir = e.searchOrCreateSubdir(P)).fileList) {
+        var h = this, e = h.rootDir;
+        e.triggerNodes = [ new v() ];
+        for (u of (e = h.triggerRootDir = e.searchOrCreateSubdir(Q)).fileList) {
             var {
-                name: d,
-                fileContent: h
-            } = d, [ h, c, D ] = h;
-            u.insertTriggerToTree(d, h, c, D);
+                name: u,
+                fileContent: p
+            } = u, [ p, D, c ] = p;
+            h.insertTriggerToTree(u, p, D, c);
         }
         var F = this;
-        F.rpcRootDir = F.rootDir.searchOrCreateSubdir(S);
+        F.rpcRootDir = F.rootDir.searchOrCreateSubdir(w);
         for (m of F.rpcRootDir.fileList) {
             var {
                 name: m,
                 fileContent: y
             } = m;
-            x(y) && F.insertRpc(m, y);
+            C(y) && F.insertRpc(m, y);
         }
-        return t.dumpStructureAtStart && await q(v(r, "qystruct"), s), Q.log("Started."), 
+        return t.dumpStructureAtStart && await x(f(r, "qystruct"), s), O.log("Started."), 
         this;
     }
     async stop() {
-        Q.log("Stopping...");
+        O.log("Stopping...");
         var {
             qyKVData: r,
             qyFileLogger: e,
             exclusiveFilePath: t
         } = this;
-        return await r.stop(), Q.log("QyFileLogger stopped."), await e.stop(), i(t), 
+        return await r.stop(), O.log("QyFileLogger stopped."), await e.stop(), i(t), 
         Object.assign(this, {
             rootDir: void 0,
             indexRootDir: void 0,
             expireRootDir: void 0,
             triggerRootDir: void 0,
             rpcRootDir: void 0,
+            embeddingRootDir: void 0,
+            h2FRootDir: void 0,
             qyKVData: void 0,
             rpcFunMap: void 0,
             qyDB: void 0,
             qyFileLogger: void 0
-        }), Q.log("Stopped."), this;
+        }), O.log("Stopped."), this;
     }
     increaseChangeId() {
         return this.qyKVData.increaseChangeId();
@@ -197,22 +208,22 @@ class o extends r {
         return t && s.save(r, t), a.save(r, e, i, o);
     }
     getFile(r, e = this.rootDir) {
-        return r.isFile ? r : x(r) ? e.getFile(r) : e.searchFile(r);
+        return r.isFile ? r : C(r) ? e.getFile(r) : e.searchFile(r);
     }
     getDir(r, e = this.rootDir) {
-        return r.isDir ? r : x(r) ? e.getSubdir(r) : e.searchSubdir(r);
+        return r.isDir ? r : C(r) ? e.getSubdir(r) : e.searchSubdir(r);
     }
     getOrCreateFile(r, e = this.rootDir) {
-        return r.isFile ? r : x(r) ? e.getOrCreateFile(r) : e.searchOrCreateFile(r);
+        return r.isFile ? r : C(r) ? e.getOrCreateFile(r) : e.searchOrCreateFile(r);
     }
     getOrCreateDir(r, e = this.rootDir) {
-        return r.isDir ? r : x(r) ? e.getOrCreateSubdir(r) : e.searchOrCreateSubdir(r);
+        return r.isDir ? r : C(r) ? e.getOrCreateSubdir(r) : e.searchOrCreateSubdir(r);
     }
     getIndexDir(r) {
-        return this.indexRootDir.searchSubdir(y(r.fullPathHash));
+        return this.indexRootDir.searchSubdir(p(r.fullPathHash));
     }
     getOrCreateIndexDir(r) {
-        return this.indexRootDir.searchOrCreateSubdir(y(r.fullPathHash));
+        return this.indexRootDir.searchOrCreateSubdir(p(r.fullPathHash));
     }
     getTriggerFile(r) {
         return this.triggerRootDir.getFile(r);
@@ -221,10 +232,29 @@ class o extends r {
         return this.triggerRootDir.getOrCreateFile(r);
     }
     getExpireInfoFile(r, e = "c") {
-        return this.expireRootDir.searchFile(a(r, e));
+        return this.expireRootDir.searchFile(u(r, e));
     }
     getOrCreateExpireInfoFile(r, e = "c") {
-        return this.expireRootDir.searchOrCreateFile(a(r, e));
+        return this.expireRootDir.searchOrCreateFile(u(r, e));
+    }
+    getH2FFile(r) {
+        return this.h2FRootDir.searchFile(a(r));
+    }
+    getOrCreateH2FFile(r) {
+        return this.h2FRootDir.searchOrCreateFile(a(r));
+    }
+    h2F(r) {
+        r = this.getH2FFile(r);
+        if (r) return this.getOrCreateFile(r.fileContent);
+    }
+    getEmbeddingFile(r) {
+        return this.embeddingRootDir.searchFile(h(r));
+    }
+    getOrCreateEmbeddingFile(r) {
+        return this.embeddingRootDir.searchOrCreateFile(h(r));
+    }
+    getEmbedding(r) {
+        return this.embeddingRootDir.searchFile(h(r))?.fileContent;
     }
     get triggerFileList() {
         return this.triggerRootDir.fileList;
@@ -245,7 +275,7 @@ class o extends r {
         var {
             rootDir: o,
             qyDB: a
-        } = this, i = c("trigger", r, i, a);
+        } = this, i = d("trigger", r, i, a);
         o.triggerNodes[0].insertTrigger(r, e, t, i), s(o, e);
     }
     removeTriggerFromTree(r, e) {
@@ -256,28 +286,28 @@ class o extends r {
         var {
             rpcFunMap: t,
             qyDB: i
-        } = this, e = c("rpc", r, e, i);
+        } = this, e = d("rpc", r, e, i);
         e && (t[r] = e);
     }
     removeRpc(r) {
         delete this.rpcFunMap[r];
     }
     queryFiles(r, e, t, i, o = this.rootDir) {
-        var a = [], t = (x(e) && !t && (t = 1), new l(t, i)), i = this.options.queryAutoCreateIndex;
-        return w(r, e, a, t, o, i), a;
+        var a = [], t = (C(e) && !t && (t = 1), new l(t, i)), i = this.options.queryAutoCreateIndex;
+        return I(r, e, a, t, o, i), a;
     }
     queryFilesMulti(r, e, t, i = this.rootDir) {
         var o, a, s = [], n = new l(e, t), g = this.options.queryAutoCreateIndex;
-        for ([ o, a ] of r) w(o, a, s, n, i, g);
+        for ([ o, a ] of r) I(o, a, s, n, i, g);
         return s;
     }
     async callRpc(e, r, t) {
         var i, o = this.rpcFunMap[e];
-        if (!o) return Q.warn(i = `RPC ${e} not implemented.`), new Error(i);
+        if (!o) return O.warn(i = `RPC ${e} not implemented.`), new Error(i);
         try {
             return await o(r, t);
         } catch (r) {
-            return Q.error(`Calling RPC ${e} failed:`, r), r;
+            return O.error(`Calling RPC ${e} failed:`, r), r;
         }
     }
     monitorItemExpire(r, e) {
@@ -294,15 +324,23 @@ class o extends r {
     }
 }
 
-function a(r, e) {
+function a(r) {
+    return [ r.substring(0, 2), r ];
+}
+
+function h(r) {
+    return [ r.substring(0, 2), r ];
+}
+
+function u(r, e) {
     return [ e, r.substring(0, 2), r ];
 }
 
-function y(r) {
+function p(r) {
     return [ r[0], r ];
 }
 
-function w(r, e, t, i, o, a) {
+function I(r, e, t, i, o, a) {
     e && (a = a ? n(e) : void 0, g(r, o, a, e, t, i));
 }
 

package/src/QyDB.js

@@ -33,7 +33,7 @@ import {
     logger as m
 } from "./QyLogger.js";
 
-let p = e(n, "../data/sampleDataFolder");
+let d = e(n, "../data/sampleDataFolder");
 
 class l extends t {
     rootFolder;
@@ -42,12 +42,12 @@ class l extends t {
     batch;
     _immediate;
     creationTime;
-    constructor(e = p, t) {
-        s(e) && (t = e, e = p), super(), this.options = {
+    constructor(e = d, t) {
+        s(e) && (t = e, e = d), super(), this.options = {
             ...o("QyDB"),
             ...t
         }, this.rootFolder = e;
-        for (let i of [ "createIndex", "delIndex", "insert", "put", "remove", "delDir", "delFile", "delContent", "insertTrigger", "removeTrigger", "insertRpc", "removeRpc", "expireFile", "expireDir", "expireContent", "expireFileM", "expireDirM", "expireContentM", "removeFileExpire", "removeDirExpire", "removeContentExpire" ]) this[i] = (...e) => {
+        for (let i of [ "createIndex", "delIndex", "insert", "put", "remove", "delDir", "delFile", "delContent", "insertTrigger", "removeTrigger", "insertRpc", "removeRpc", "insertEmbedding", "delEmbedding", "expireFile", "expireDir", "expireContent", "expireFileM", "expireDirM", "expireContentM", "removeFileExpire", "removeDirExpire", "removeContentExpire" ]) this[i] = (...e) => {
             var t = this.currentBatch;
             return t[i].apply(t, e).run();
         };

package/src/QyFile.js

@@ -10,7 +10,8 @@ import {
     isSimpleType as h,
     fromSingleName as s,
     isEmptyObj as r,
-    getNowTime as l
+    getNowTime as l,
+    isArray as d
 } from "./QyUtils.js";
 
 import {
@@ -25,13 +26,13 @@ import {
     handleExpiredProps as u
 } from "./QyExpire.js";
 
-let d = Array.isArray, C = n.IndexPropPathsFileName, {
+let C = n.IndexPropPathsFileName, {
     $spec: p,
     $raw: c,
-    $clone: y
+    $clone: m
 } = t;
 
-class m extends e {
+class y extends e {
     _fileContentKey;
     _fileContent;
     cChangeId = 0;
@@ -80,7 +81,7 @@ class m extends e {
     get clonedContent() {
         return structuredClone(this.fileContent);
     }
-    view(e = y, t) {
+    view(e = m, t) {
         var n = this.fileContent;
         return null == n || h(n) ? n : function t(n, i, r, o) {
             if (r === c) return i;
@@ -105,7 +106,7 @@ class m extends e {
             return s;
         }(this, n, e, t);
     }
-    prop(e, t = y, n) {
+    prop(e, t = m, n) {
         var i;
         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);
     }
@@ -161,5 +162,5 @@ function v(e, t, n, i, r = !1) {
 }
 
 export {
-    m as QyFile
+    y as QyFile
 };

package/src/QyFileContentUtils.d.ts

@@ -1,5 +1,4 @@
 export declare function mergeContent(oldContent: any, newContent: any): any;
-export declare function mergeChanges(oldChanges: any, newChanges: any): any;
 export declare function mergeContentAndGenDelta(oldContent: any, newContent: any): {
     merged: any;
     delta: any;