datafolder 1.0.9 → 1.0.10

package/src/QyCD.d.ts

@@ -2,36 +2,36 @@ import type { QyCache } from "./QyCache.ts";
 import type { QyDir } from "./QyDir.ts";
 import type { QyFile } from "./QyFile.ts";
 export declare class QyCD {
-    qyCache: QyCache | undefined;
-    currentDir: QyDir | undefined;
+    qyCache: any;
+    currentDir: any;
     constructor(qyCache?: QyCache);
-    cd(namePath: string | string[] | QyDir, parentDir?: QyDir | undefined): this;
-    cdP(namePath: string | string[] | QyDir, parentDir?: QyDir | undefined): this;
-    dir(namePath: string | string[], parentDir?: QyDir | undefined): QyDir | undefined;
-    dirP(namePath: string | string[], parentDir?: QyDir | undefined): QyDir | undefined;
-    indexDir(indexHostDirNamePath: string | string[] | QyDir, namePath: string | string[], parentDir?: QyDir | undefined): QyDir | undefined;
-    indexDirP(indexHostDirNamePath: string | string[] | QyDir, namePath: string | string[], parentDir?: QyDir | undefined): QyDir | undefined;
-    file(namePath: string | string[], parentDir?: QyDir | undefined): QyFile | undefined;
-    fileP(namePath: string | string[], parentDir?: QyDir | undefined): QyFile | undefined;
+    cd(namePath: string | string[] | QyDir, parentDir?: any): this;
+    cdP(namePath: string | string[] | QyDir, parentDir?: any): this;
+    dir(namePath: string | string[], parentDir?: any): QyDir | undefined;
+    dirP(namePath: string | string[], parentDir?: any): QyDir | undefined;
+    indexDir(indexHostDirNamePath: string | string[] | QyDir, namePath: string | string[], parentDir?: any): QyDir | undefined;
+    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;
     triggerFile(triggerName: any): any;
     get triggerFileList(): any;
     rpcFile(rpcName: any): any;
     get rpcFileList(): any;
-    view(namePath: any, spec: any, parentDir?: QyDir | undefined): any;
-    viewP(namePath: any, spec: any, parentDir?: QyDir | undefined): any;
-    queryFiles(indexHostDirNamePath: any, queryObj: any, limit: any, cursor: any, parentDir?: QyDir | undefined): never[];
-    queryFilesMulti(indexHostDirNamePathMulti: any, limit: any, cursor: any, parentDir?: QyDir | undefined): never[];
-    queryTree(indexHostDirNamePath: any, queryObj: any, view: any, limit: any, cursor: any, parentDir?: QyDir | undefined): {
-        tree: {};
+    view(namePath: any, spec?: undefined, parentDir?: any): any;
+    viewP(namePath: any, spec: any, parentDir?: any): any;
+    queryFiles(indexHostDirNamePath: any, queryObj: any, limit: any, cursor: any, parentDir?: any): any;
+    queryFilesMulti(indexHostDirNamePathMulti: any, limit: any, cursor: any, parentDir?: any): any;
+    queryTree(indexHostDirNamePath: any, queryObj: any, view: any, limit: any, cursor: any, parentDir?: any): {
+        tree: any;
         count: any;
     };
-    queryTreeMulti(indexHostDirNamePathMulti: any, view: any, limit: any, cursor: any, parentDir?: QyDir | undefined): {
-        tree: {};
+    queryTreeMulti(indexHostDirNamePathMulti: any, view: any, limit: any, cursor: any, parentDir?: any): {
+        tree: any;
         count: any;
     };
     resetCurrentDir(): void;
     fileListToTree(fileList: any, view: any): {
-        tree: {};
+        tree: any;
         count: any;
     };
 }

package/src/QyCD.js

@@ -5,7 +5,7 @@ import {
 
 class r {
     qyCache;
-    currentDir = void 0;
+    currentDir;
     constructor(r) {
         this.qyCache = r;
     }
@@ -49,7 +49,7 @@ class r {
     get rpcFileList() {
         return this.qyCache.rpcFileList;
     }
-    view(r, e, t = this.currentDir) {
+    view(r, e = void 0, t = this.currentDir) {
         return i(r) && (r = s(r)), this.viewP(r, e, t);
     }
     viewP(r, e, t = this.currentDir) {

package/src/QyCache.d.ts

@@ -1,33 +1,32 @@
 import EventEmitter from "node:events";
 import { QyDir } from "./QyDir.ts";
-import { QyFileLogger } from "./QyFileLogger.ts";
-import { QyKVData } from "./QyKVData.ts";
-import type { QyDB } from "./QyDB.ts";
 import type { QyFile } from "./QyFile.ts";
 export declare class QyCache extends EventEmitter {
-    rootFolder: string;
-    options: {};
-    qyDB: QyDB | undefined;
-    kvFolder: string;
-    rpcFolder: string;
-    rootDir: QyDir;
-    indexRootDir: QyDir | undefined;
-    exclusiveFilePath: string;
-    qyKVData: QyKVData;
-    qyFileLogger: QyFileLogger;
+    rootFolder: any;
+    options: any;
+    qyDB: any;
+    kvFolder: any;
+    rpcFolder: any;
+    rootDir: any;
+    triggerRootDir: any;
+    rpcRootDir: any;
+    indexRootDir: any;
+    exclusiveFilePath: any;
+    qyKVData: any;
+    qyFileLogger: any;
     rpcFunMap: {};
-    constructor(rootFolder: string, options?: {}, qyDB?: QyDB);
+    constructor(rootFolder: string, options?: any, qyDB?: any);
     start(): Promise<this>;
     stop(): Promise<this>;
-    increaseChangeId(): number;
+    increaseChangeId(): any;
     decreaseChangeId(): void;
     save(changeId: any, cmdArgAsListObj: any, logText: any, syncList: any, needPromise: any): any;
-    getFile(namePath: QyFile | string | string[], parentDir?: QyDir): QyFile | undefined;
-    getDir(namePath: QyDir | string | string[], parentDir?: QyDir): QyDir | undefined;
-    getOrCreateFile(namePath: QyFile | string | string[], parentDir?: QyDir): QyFile;
-    getOrCreateDir(namePath: QyDir | string | string[], parentDir?: QyDir): QyDir;
-    getIndexDir(indexHostDir: QyDir): QyDir | undefined;
-    getOrCreateIndexDir(indexHostDir: any): QyDir | undefined;
+    getFile(namePath: QyFile | string | string[], parentDir?: any): QyFile | undefined;
+    getDir(namePath: QyDir | string | string[], parentDir?: any): QyDir | undefined;
+    getOrCreateFile(namePath: QyFile | string | string[], parentDir?: any): QyFile;
+    getOrCreateDir(namePath: QyDir | string | string[], parentDir?: any): QyDir;
+    getIndexDir(indexHostDir: QyDir): any;
+    getOrCreateIndexDir(indexHostDir: any): any;
     getTriggerFile(triggerName: any): any;
     getOrCreateTriggerFile(triggerName: any): any;
     get triggerFileList(): any;
@@ -38,7 +37,7 @@ export declare class QyCache extends EventEmitter {
     removeTriggerFromTree(triggerName: any, fileNamePath: any): void;
     insertRpc(rpcFunName: any, modCode: any): void;
     removeRpc(rpcFunName: any): void;
-    queryFiles(indexHostDirNamePath: any, queryObj: any, limit: any, cursor: any, parentDir?: QyDir): never[];
-    queryFilesMulti(indexHostDirNamePathMulti: any, limit: any, cursor: any, parentDir?: QyDir): never[];
+    queryFiles(indexHostDirNamePath: any, queryObj: any, limit: any, cursor: any, parentDir?: any): never[];
+    queryFilesMulti(indexHostDirNamePathMulti: any, limit: any, cursor: any, parentDir?: any): never[];
     callRpc(rpcFunName: any, args: any, body: any): Promise<any>;
 }

package/src/QyCache.js

@@ -5,26 +5,26 @@ import {
 import r from "node:events";
 
 import {
-    QyDir as i
+    QyDir as o
 } from "./QyDir.js";
 
 import {
-    QyFileLogger as o
+    QyFileLogger as a
 } from "./QyFileLogger.js";
 
 import {
-    QyKVData as a
+    QyKVData as s
 } from "./QyKVData.js";
 
 import {
     QyTriggerNode as f,
-    updateTriggerNodes as s
+    updateTriggerNodes as g
 } from "./QyTrigger.js";
 
 import {
     isString as C,
     lockExclusiveFilePath as q,
-    unlockExclusiveFilePath as g
+    unlockExclusiveFilePath as i
 } from "./QyUtils.js";
 
 import {
@@ -46,7 +46,7 @@ import {
 } from "./QyUtils.js";
 
 import {
-    QueryCounter as h
+    QueryCounter as p
 } from "./QyUnionNode.js";
 
 import {
@@ -54,7 +54,7 @@ import {
 } from "./QyKVDataLoader.js";
 
 import {
-    requireFromModCode as p
+    requireFromModCode as u
 } from "./QyMod.js";
 
 import {
@@ -62,8 +62,8 @@ import {
 } from "./QyLogger.js";
 
 let {
-    IndexDirPath: P,
-    TriggerDirPath: L,
+    IndexDirPath: L,
+    TriggerDirPath: P,
     RpcDirPath: O
 } = e;
 
@@ -74,20 +74,30 @@ class t extends r {
     kvFolder;
     rpcFolder;
     rootDir;
-    indexRootDir = void 0;
+    triggerRootDir;
+    rpcRootDir;
+    indexRootDir;
     exclusiveFilePath;
     qyKVData;
     qyFileLogger;
     rpcFunMap = {};
     constructor(r, e, t) {
-        super(), this.options = e = {
+        super(), e = {
             ...d("QyCache"),
             ...e
-        }, this.rootFolder = r, this.qyDB = t;
-        t = this.kvFolder = v(r, "qykv");
-        this.rpcFolder = v(r, "rpc"), this.rootDir = new i("", !0, void 0, this), 
-        this.exclusiveFilePath = v(r, ".opened"), this.qyKVData = new a(t, e, this), 
-        this.qyFileLogger = new o(v(r, "qylog"), e);
+        };
+        var i = v(r, "qykv");
+        Object.assign(this, {
+            rootFolder: r,
+            options: e,
+            qyDB: t,
+            kvFolder: i,
+            rpcFolder: v(r, "rpc"),
+            rootDir: new o("", !0, void 0, this),
+            exclusiveFilePath: v(r, ".opened"),
+            qyKVData: new s(i, e, this),
+            qyFileLogger: new a(v(r, "qylog"), e)
+        });
     }
     async start() {
         var {
@@ -118,19 +128,19 @@ class t extends r {
                 fileMap: i
             } = e;
             for (var o of t) r(o);
-        }(s), this.indexRootDir = s.searchOrCreateSubdir(P);
-        var h = this, e = h.rootDir;
-        e.triggerNodes = [ new f() ], h.triggerRootDir = e.searchOrCreateSubdir(L);
-        for (p of h.triggerRootDir.fileList) {
+        }(s), this.indexRootDir = s.searchOrCreateSubdir(L);
+        var p = this, e = p.rootDir;
+        e.triggerNodes = [ new f() ], p.triggerRootDir = e.searchOrCreateSubdir(P);
+        for (u of p.triggerRootDir.fileList) {
             var {
-                name: p,
-                fileContent: u
-            } = p, {
-                fileNamePath: u,
+                name: u,
+                fileContent: h
+            } = u, {
+                fileNamePath: h,
                 propNamePathList: c,
                 modCode: D
-            } = u;
-            h.insertTriggerToTree(p, u, c, D);
+            } = h;
+            p.insertTriggerToTree(u, h, c, D);
         }
         var y = this;
         y.rpcRootDir = y.rootDir.searchOrCreateSubdir(O);
@@ -151,7 +161,8 @@ class t extends r {
             qyFileLogger: e,
             exclusiveFilePath: t
         } = this;
-        return await r.stop(), await e.stop(), g(t), Object.assign(this, {
+        return await r.stop(), S.log("qyFileLogger stopped."), await e.stop(), i(t), 
+        Object.assign(this, {
             rootDir: void 0,
             indexRootDir: void 0,
             qyKVData: void 0,
@@ -215,30 +226,30 @@ class t extends r {
         var {
             rootDir: o,
             qyDB: a
-        } = this, i = p("trigger", r, i, a);
-        o.triggerNodes[0].insertTrigger(r, e, t, i), s(o, e);
+        } = this, i = u("trigger", r, i, a);
+        o.triggerNodes[0].insertTrigger(r, e, t, i), g(o, e);
     }
     removeTriggerFromTree(r, e) {
         var t = this.rootDir;
-        t.triggerNodes[0].removeTrigger(r, e) && s(t, e);
+        t.triggerNodes[0].removeTrigger(r, e) && g(t, e);
     }
     insertRpc(r, e) {
         var {
             rpcFunMap: t,
             qyDB: i
-        } = this, e = p("rpc", r, e, i);
+        } = this, e = u("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 = (C(e) && !t && (t = 1), new h(t, i)), i = this.options.queryAutoCreateIndex;
-        return u(r, e, a, t, o, i), a;
+        var a = [], t = (C(e) && !t && (t = 1), new p(t, i)), i = this.options.queryAutoCreateIndex;
+        return h(r, e, a, t, o, i), a;
     }
     queryFilesMulti(r, e, t, i = this.rootDir) {
-        var o, a, s = [], g = new h(e, t), n = this.options.queryAutoCreateIndex;
-        for ([ o, a ] of r) u(o, a, s, g, i, n);
+        var o, a, s = [], g = new p(e, t), n = this.options.queryAutoCreateIndex;
+        for ([ o, a ] of r) h(o, a, s, g, i, n);
         return s;
     }
     async callRpc(e, r, t) {
@@ -252,7 +263,7 @@ class t extends r {
     }
 }
 
-function u(r, e, t, i, o, a) {
+function h(r, e, t, i, o, a) {
     e && (a = a ? n(e) : void 0, l(r, o, a, e, t, i));
 }
 

package/src/QyCompressor_Worker.js

@@ -14,8 +14,8 @@ import {
 
 a.level = r("logLevel"), (async () => {
     try {
-        await s(o), e.postMessage(!0);
+        await s(o), e?.postMessage(!0);
     } catch (r) {
-        e.postMessage(r);
+        e?.postMessage(r);
     }
 })();

package/src/QyDB.d.ts

@@ -1,15 +1,12 @@
-import { QyFetch } from "./QyFetch.ts";
-import { QyBatch } from "./QyBatch.ts";
-import { QyCache } from "./QyCache.ts";
 import { QyCD } from "./QyCD.ts";
 import type { QyDir } from "./QyDir.ts";
 import type { QyFile } from "./QyFile.ts";
 export declare class QyDB extends QyCD {
     rootFolder: string;
     options: {};
-    fetch: QyFetch;
-    batch: QyBatch;
-    _immediate: QyBatch;
+    fetch: any;
+    batch: any;
+    _immediate: any;
     constructor(rootFolder?: string, options?: {});
     start(options?: {}): Promise<this>;
     stop(): Promise<void>;
@@ -17,7 +14,7 @@ export declare class QyDB extends QyCD {
     createDirP(namePath: string | string[]): QyDir;
     createFile(namePath: string | string[]): QyFile;
     createFileP(namePath: string | string[]): QyFile;
-    createIndex(indexHostDirNamePath: string | string[] | QyDir, indexPropPathList: string[][]): any;
+    createIndex(indexHostDirNamePath: string | string[] | QyDir, indexPropPathList: string[] | string[][]): any;
     createIndexP(indexHostDirNamePath: string | string[] | QyDir, indexPropPathList: string[][]): any;
     delIndex(indexHostDirNamePath: string | string[] | QyDir, indexPropPath: string | string[]): any;
     delIndexP(indexHostDirNamePath: any, indexPropPath: any): any;
@@ -37,6 +34,6 @@ export declare class QyDB extends QyCD {
     removeTrigger(triggerName: any): any;
     insertRpc(rpcFunName: any, modCode: any): any;
     removeRpc(rpcFunName: any): any;
-    on(eventName: any, listener: any): QyCache | undefined;
-    callRpc(rpcFunName: any, args: any, body: any): Promise<any> | undefined;
+    on(eventName: any, listener: any): any;
+    callRpc(rpcFunName: any, args: any, body?: undefined): any;
 }

package/src/QyDB.js

@@ -143,7 +143,7 @@ class h extends t {
     on(e, t) {
         return this.qyCache?.on(e, t);
     }
-    callRpc(e, t, r) {
+    callRpc(e, t, r = void 0) {
         return this.qyCache?.callRpc(e, t, r);
     }
 }

package/src/QyFile.d.ts

@@ -1,6 +1,8 @@
 import { QyItem } from "./QyItem.ts";
 import type { QyDir } from "./QyDir.ts";
 export declare class QyFile extends QyItem {
+    _fileContentKey: any;
+    _fileContent: any;
     cChangeId: number;
     constructor(name: string | number, created?: boolean, parentDir?: QyDir);
     get created(): boolean;

package/src/QyFile.js

@@ -5,27 +5,29 @@ import {
 import {
     SpecialOperators as t,
     SpecialFilePaths as n,
-    getContentKey as r,
+    getContentKey as i,
     isNotNullObj as a,
     isSimpleType as C,
-    fromSingleName as s
+    fromSingleName as o
 } from "./QyUtils.js";
 
 import {
-    getValByNamePath as i
+    getValByNamePath as r
 } from "./QyFileContentUtils.js";
 
 import {
-    QyIndexPropTree as f
+    QyIndexPropTree as s
 } from "./QyIndexPropTree.js";
 
-let d = Array.isArray, u = n.IndexPropPathsFileName, {
+let d = Array.isArray, f = n.IndexPropPathsFileName, {
     $spec: h,
     $raw: c,
     $clone: l
 } = t;
 
-class o extends e {
+class u extends e {
+    _fileContentKey;
+    _fileContent;
     cChangeId = 0;
     constructor(e, t = !1, n) {
         super(e, t, n), t && n && (++n._fileCount, ++n.fileMapChangeCount);
@@ -39,7 +41,7 @@ class o extends e {
         ++t.fileMapChangeCount);
     }
     get fileContentKey() {
-        return this._fileContentKey || (this._fileContentKey = r(this.fullPathHash));
+        return this._fileContentKey || (this._fileContentKey = i(this.fullPathHash));
     }
     get fileContent() {
         var e, t = this;
@@ -53,16 +55,16 @@ class o extends e {
     get qyIndexPropTree() {
         var {
             created: e,
-            _qyIndexPropTree: t,
-            name: n,
-            fileContent: r,
+            name: t,
+            fileContent: n,
             underHiddenFolder: i
         } = this;
-        if (e && i && n == u) {
-            if (t) return t;
-            var l, o = this._qyIndexPropTree = new f();
-            for (l in r) o.insert(s(l));
-            return o;
+        if (e && i && t == f) {
+            e = this._qyIndexPropTree;
+            if (e) return e;
+            var r, l = this._qyIndexPropTree = new s();
+            for (r in n) l.insert(o(r));
+            return l;
         }
     }
     get isFile() {
@@ -80,32 +82,32 @@ class o extends e {
     }
     view(e = l, t) {
         var n = this.fileContent;
-        return null == n || C(n) ? n : function t(n, r, i, l) {
-            if (i === c) return r;
-            if (null == i) return;
-            if (C(i)) return i ? l ? r : structuredClone(r) : void 0;
-            let e = i.$link;
-            if (null != e) return y(n, r, e, i[h]);
-            if (C(r)) return r;
-            d(i) && (i = Object.fromEntries(i.filter(e => e).map(e => [ e, 1 ])));
-            let o = d(r) ? [] : {};
+        return null == n || C(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;
+            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) ? [] : {};
             let {
                 $all: s,
                 "**": a
-            } = i;
-            if (s || a) for (var f in r) {
-                let e = i[f] ?? s ?? a;
-                e && (o[f] = t(n, r[f], e, l));
-            } else for (var u in i) {
-                let e = i[u];
-                e && (o[u] = t(n, r[u], e, l));
+            } = r;
+            if (s || a) for (var f in i) {
+                let e = r[f] ?? s ?? a;
+                e && (o[f] = t(n, i[f], e, l));
+            } else for (var u in r) {
+                let e = r[u];
+                e && (o[u] = t(n, i[u], e, l));
             }
             return o;
         }(this, n, e, t);
     }
     prop(e, t = l, n) {
-        var r;
-        if (t) return e = i(this.fileContent, d(e) ? e : [ e ]), r = t.$link, null != r ? y(this, e, r, t[h], n) : n || t === c ? e : structuredClone(e);
+        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);
     }
     unloadFileContent() {
         this.created && this.fileContentLoaded && null != this._fileContent && (this._fileContent = void 0, 
@@ -113,25 +115,25 @@ class o extends e {
     }
 }
 
-function p(e, t, n, r) {
+function p(e, t, n, i) {
     if (e) {
         e = e.getFile(t);
-        if (e) return e.view(n, r);
+        if (e) return e.view(n, i);
     }
     return t;
 }
 
-function y(e, t, n, r, i) {
+function y(e, t, n, i, r = !1) {
     let l = e.qyCache.getDir(n);
-    if (d(t)) return t.map(e => p(l, e, r, i));
+    if (d(t)) return t.map(e => p(l, e, i, r));
     if (a(t)) {
         var o, s = {};
-        for (o in t) s[o] = p(l, o, r, i);
+        for (o in t) s[o] = p(l, o, i, r);
         return s;
     }
-    return p(l, t, r, i);
+    return p(l, t, i, r);
 }
 
 export {
-    o as QyFile
+    u as QyFile
 };

package/src/QyFileContentUtils.d.ts

@@ -2,10 +2,7 @@ export declare function mergeContent(oldContent: any, newContent: any): any;
 export declare function mergeContentChanges(oldChanges: any, newChanges: any): any;
 export declare function mergeContentAndGenDelta(oldContent: any, newContent: any): {
     merged: any;
-    delta: {
-        oldValue: {};
-        newValue: {};
-    };
+    delta: any;
 };
 export declare function setValByNamePath(rootObj: any, namePath: any, value: any): any;
 export declare function getValByNamePath(obj: any, namePath: any): any;

package/src/QyFileLogger.d.ts

@@ -1,5 +1,9 @@
 import { QyOpRunner } from "./QyOpRunner.ts";
 export declare class QyFileLogger extends QyOpRunner {
+    qyLogFileSaver: any;
+    logFileFolder: any;
+    dateDirPath: any;
+    timeoutRef: any;
     constructor(logFileFolder: any, options: any);
     save(changeId: any, data: any): any;
     getDateDirPath(): any;