@zwa73/utils 1.0.280 → 1.0.282

package/dist/UtilClass/DataStore.d.ts

@@ -0,0 +1,71 @@
+import type { JObject, MPromise } from '@zwa73/js-utils';
+/**数据存储接口 */
+export type DataStore<T> = {
+    /**尝试保存
+     * @returns 是否真实产生写入保存
+     */
+    save: (data: T) => MPromise<boolean>;
+    getData: () => MPromise<T>;
+    getUid: () => string;
+};
+/**JSON文件存储实现 */
+export declare class JsonStore<T extends JObject> implements DataStore<T> {
+    /**存储的数据 */
+    private _data;
+    /**上次保存时的数据快照，用于变更检测 */
+    private _lastSaved;
+    /**文件存储路径 */
+    private _filepath;
+    /**是否检查数据变更 */
+    private _checkChange;
+    /**
+     * 构造函数
+     * @param opt 配置选项
+     */
+    constructor(opt: {
+        /**文件路径 */
+        filepath: string;
+        /**是否检查数据变更，默认true */
+        checkChange?: boolean;
+    });
+    /**保存数据到文件
+     * @param data 要保存的数据
+     * @returns 是否真实产生写入保存
+     */
+    save(data: T): Promise<boolean>;
+    /**获取数据
+     * @returns 存储的数据
+     */
+    getData(): Promise<T>;
+    /**获取唯一标识
+     * @returns 基于路径的唯一标识符
+     */
+    getUid(): string;
+}
+/**内存对象存储实现 */
+export declare class ObjectStore<T> implements DataStore<T> {
+    /**唯一标识符 */
+    private _uid;
+    /**存储的数据 */
+    private _data;
+    /**构造函数
+     * @param data 初始数据
+     */
+    constructor(opt: {
+        data: T;
+        uid?: string;
+    });
+    /**保存数据
+     * @param data 要保存的数据
+     * @returns 始终返回false，因为内存存储不产生实际写入
+     */
+    save(data: T): Promise<boolean>;
+    /**获取数据
+     * @returns 存储的数据
+     */
+    getData(): Promise<T>;
+    /**获取唯一标识
+     * @returns 唯一标识符
+     */
+    getUid(): string;
+}

package/dist/UtilClass/DataStore.js

@@ -0,0 +1,105 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ObjectStore = exports.JsonStore = void 0;
+const fs_1 = __importDefault(require("fs"));
+const UtilFileTools_1 = require("../UtilFileTools");
+const UtilFunctions_1 = require("../UtilFunctions");
+const UtilLogger_1 = require("../UtilLogger");
+/**JSON文件存储实现 */
+class JsonStore {
+    /**存储的数据 */
+    _data;
+    /**上次保存时的数据快照，用于变更检测 */
+    _lastSaved = '';
+    /**文件存储路径 */
+    _filepath;
+    /**是否检查数据变更 */
+    _checkChange;
+    /**
+     * 构造函数
+     * @param opt 配置选项
+     */
+    constructor(opt) {
+        const { filepath, checkChange = true } = opt;
+        this._filepath = filepath;
+        this._checkChange = checkChange;
+        UtilFileTools_1.UtilFT.pathExists(this._filepath).then(exists => {
+            if (!exists)
+                UtilLogger_1.SLogger.warn(`JsonStore 配置文件不存在, 将会尝试用空对象创建 path:${this._filepath}`);
+        }).catch(err => {
+            UtilLogger_1.SLogger.error(`JsonStore 检查配置文件失败 path:${this._filepath}`, err);
+        });
+    }
+    /**保存数据到文件
+     * @param data 要保存的数据
+     * @returns 是否真实产生写入保存
+     */
+    async save(data) {
+        this._data = data;
+        const newSaved = this._checkChange ? JSON.stringify(this._data) : '';
+        if (this._checkChange == false || this._lastSaved != newSaved) {
+            await fs_1.default.promises.writeFile(this._filepath, UtilFunctions_1.UtilFunc.stringifyJToken(this._data));
+            this._lastSaved = newSaved;
+            return true;
+        }
+        return false;
+    }
+    /**获取数据
+     * @returns 存储的数据
+     */
+    async getData() {
+        if (this._data == undefined) {
+            this._data = await UtilFileTools_1.UtilFT.loadJSONFile(this._filepath, { default: {} });
+            if (this._checkChange)
+                this._lastSaved = JSON.stringify(this._data);
+        }
+        return this._data;
+    }
+    /**获取唯一标识
+     * @returns 基于路径的唯一标识符
+     */
+    getUid() {
+        return `JsonStore_${this._filepath}`;
+    }
+}
+exports.JsonStore = JsonStore;
+/**内存对象存储实现 */
+class ObjectStore {
+    /**唯一标识符 */
+    _uid;
+    /**存储的数据 */
+    _data;
+    /**构造函数
+     * @param data 初始数据
+     */
+    constructor(opt) {
+        const { data, uid } = opt;
+        this._data = data;
+        this._uid = uid ?? `ObjectStore_${UtilFunctions_1.UtilFunc.genUUID()}`;
+    }
+    /**保存数据
+     * @param data 要保存的数据
+     * @returns 始终返回false，因为内存存储不产生实际写入
+     */
+    async save(data) {
+        this._data = data;
+        return false;
+    }
+    /**获取数据
+     * @returns 存储的数据
+     */
+    async getData() {
+        ;
+        return this._data;
+    }
+    /**获取唯一标识
+     * @returns 唯一标识符
+     */
+    getUid() {
+        return this._uid;
+    }
+}
+exports.ObjectStore = ObjectStore;

package/dist/UtilClass/ObsidianDepot.d.ts

@@ -39,9 +39,10 @@ type ScanResult = {
     codeobj: undefined | Record<string, any>;
 };
 export declare class ObsidianDepot {
-    /**将数组转为markdown列表文本 */
-    static toList(v?: string[]): string | undefined;
-    private constructor();
+    /**将数组转为markdown列表 */
+    static toList(itemList?: string[]): string | undefined;
+    /**将数组转为markdown文件预览 */
+    static toPreview(filepath: string): string;
     /**搜索info.md文件
      * @param opt - 搜索选项
      */

package/dist/UtilClass/ObsidianDepot.js

@@ -6,17 +6,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ObsidianDepot = void 0;
 const fs_1 = __importDefault(require("fs"));
 const js_utils_1 = require("@zwa73/js-utils");
-const Constant_1 = require("../Constant");
 const pathe_1 = __importDefault(require("pathe"));
+const Constant_1 = require("../Constant");
 const UtilFileTools_1 = require("../UtilFileTools");
 const UtilFunctions_1 = require("../UtilFunctions");
 const Markdown_1 = require("./Markdown");
 class ObsidianDepot {
-    /**将数组转为markdown列表文本 */
-    static toList(v) {
-        return v?.map(vv => ` - ${vv.trim()}`).join('\n');
+    //static create(opt:ObsidianDepotOpt){return new ObsidianDepot(opt);}
+    //private constructor(private opt:ObsidianDepotOpt){}
+    //async scanMarkdown(opt:Omit<ScanOpt,'rootPath'>){
+    //    return ObsidianDepot.scanMarkdown({...opt,rootPath:this.opt.depotPath});
+    //}
+    //async updateMarkdown(opt:Omit<UpdateOpt,'rootPath'>){
+    //    return ObsidianDepot.updateMarkdown({...opt,rootPath:this.opt.depotPath});
+    //}
+    /**将数组转为markdown列表 */
+    static toList(itemList) {
+        return itemList?.map(item => ` - ${item.trim()}`).join('\n');
+    }
+    /**将数组转为markdown文件预览 */
+    static toPreview(filepath) {
+        return `![[${filepath}]]`;
     }
-    constructor() { }
     /**搜索info.md文件
      * @param opt - 搜索选项
      */

package/dist/UtilClass/index.d.ts

@@ -1,5 +1,6 @@
 export * from './Hbs';
 export * from './Markdown';
 export * from './ObsidianDepot';
+export * from './DataStore';
 export type { EventData, DListMiddleNode, DListHeadNode, DListTailNode, DListInvalidNode, DListMaybeNode, DListNode, BridgeInterface } from "@zwa73/js-utils";
 export { Stream, Spool, SmartCache, SequenceQueue, PromiseQueue, Piper, EventSystem, DLinkedList, DelayQueue, Bridge } from "@zwa73/js-utils";

package/dist/UtilClass/index.js

@@ -18,6 +18,7 @@ exports.Bridge = exports.DelayQueue = exports.DLinkedList = exports.EventSystem
 __exportStar(require("./Hbs"), exports);
 __exportStar(require("./Markdown"), exports);
 __exportStar(require("./ObsidianDepot"), exports);
+__exportStar(require("./DataStore"), exports);
 var js_utils_1 = require("@zwa73/js-utils");
 Object.defineProperty(exports, "Stream", { enumerable: true, get: function () { return js_utils_1.Stream; } });
 Object.defineProperty(exports, "Spool", { enumerable: true, get: function () { return js_utils_1.Spool; } });

package/dist/UtilHttp.js

@@ -493,6 +493,14 @@ class UtilHttp {
     }
 }
 exports.UtilHttp = UtilHttp;
+if (false)
+    void (async () => {
+        const tool2 = UtilHttp
+            .url('http://postman-echo.com/post')
+            .postJson()
+            .option({ timeout: 20000, port: 80 });
+        console.log(await tool2.once({ json: { j: 123 } }));
+    })();
 if (false)
     void ((async () => {
         const tool = UtilHttp

package/dist/UtilInterfaces.d.ts

@@ -1 +1,2 @@
 export type { JToken, JValue, JArray, JObject, IJData, AnyFunc, Keyable, DeepReadonly, DeepWritable, PartialOption, ProperSubset, ProperSubsetCheck, IncludeCheck, UnionCheck, Literal, LiteralCheck, AllExtends, AssignObject, Writeable, Requireify, Inverted, FixedLengthTuple, Increment, RangeTuple, AnyString, UnionToIntersection, ExclusiveRecord, ExclusiveJObject, PromiseStatus, StatusVerifyFn, Await, FuncPropNames, ExtendThen, RequiredOnly, WithPrefix, Outcome, Either, Matchable, MatchableFlag, ExtractOutcome, ExtractMatchable, NeedInit, PRecord, MPromise, SPromise, SMPromise, NotPromise, AnyRecord, MReturnType, CmtTuple, Flasy, SrtSegment, ILogger, LogLevel, Asyncize, SharpSchema, ExpandSharpSchema, Preset, PresetOption, PresetFinal } from "@zwa73/js-utils";
+export type { StringifyOpt, PromiseRetries, PromiseRetryResult } from "@zwa73/js-utils";

package/dist/UtilInterfaces.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//#endregion

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.280",
+	"version": "1.0.282",
 	"description": "my utils",
 	"main": "dist/index.js",
 	"scripts": {
@@ -19,19 +19,19 @@
 		"@zwa73/js-utils": "*",
 		"@zwa73/modular-mixer": "^1.0.8",
 		"form-data": "^4.0.2",
+		"glob": "^13.0.0",
 		"html-entities": "^2.3.3",
 		"http-proxy-agent": "^7.0.2",
 		"https-proxy-agent": "^7.0.6",
+		"pathe": "^1.1.2",
 		"querystring": "^0.2.1",
 		"winston": "^3.10.0",
 		"winston-daily-rotate-file": "^4.7.1"
 	},
 	"peerDependencies": {
 		"@iarna/toml": "^2.2.5",
-		"glob": "^13.0.0",
 		"handlebars": "^4.7.8",
 		"json5": "^2.2.3",
-		"pathe": "^1.1.2",
 		"public-ip": "^6.0.2",
 		"tiktoken": "^1.0.7",
 		"yaml": "^2.8.1"
@@ -55,6 +55,7 @@
 	},
 	"devDependencies": {
 		"@deepkit/type": "^1.0.1-alpha.153",
+		"@iarna/toml": "^2.2.5",
 		"@types/jest": "^29.5.12",
 		"@types/node": "^20.19.25",
 		"@zwa73/dev-utils": "*",