@zwa73/utils 1.0.286 → 1.0.288

package/dist/UtilClass/DataStore.d.ts

@@ -32,13 +32,3 @@ export declare class JsonStore<T extends JObject> implements DataStore<T> {
      */
     getUid(): string;
 }
-/**可解析的数据存储源 */
-export type ParseableDataStore<T> = string | T | DataStore<T>;
-/**常用的数据存储实现 */
-export declare class UtilDataStore {
-    /**解析数据存储器源
-     * @param source 数据存储源
-     * @returns 数据存储对象
-     */
-    static parseDataStore<T>(source: ParseableDataStore<T>): DataStore<T>;
-}

package/dist/UtilClass/DataStore.js

@@ -3,9 +3,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UtilDataStore = exports.JsonStore = void 0;
+exports.JsonStore = void 0;
 const fs_1 = __importDefault(require("fs"));
-const js_utils_1 = require("@zwa73/js-utils");
 const UtilFileTools_1 = require("../UtilFileTools");
 const UtilFunctions_1 = require("../UtilFunctions");
 const UtilLogger_1 = require("../UtilLogger");
@@ -66,19 +65,3 @@ class JsonStore {
     }
 }
 exports.JsonStore = JsonStore;
-/**常用的数据存储实现 */
-class UtilDataStore {
-    /**解析数据存储器源
-     * @param source 数据存储源
-     * @returns 数据存储对象
-     */
-    static parseDataStore(source) {
-        if (typeof source == 'string')
-            return new JsonStore({ filepath: source });
-        if (typeof source == 'object' && source != null && 'save' in source &&
-            typeof source.save == 'function')
-            return source;
-        return new js_utils_1.ObjectStore({ data: source });
-    }
-}
-exports.UtilDataStore = UtilDataStore;

package/dist/UtilCodecs.js

@@ -24,8 +24,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilCodec = void 0;
-const Constant_1 = require("./Constant");
 const he = __importStar(require("html-entities"));
+const Constant_1 = require("./Constant");
 /**引入tiktoken
  * 依赖于 tiktoken@1.0.7 但不会自动安装
  */

package/dist/UtilDecorators.d.ts

@@ -1,2 +1,2 @@
-export type { ParamsDecoratorsGener, BaseDecoratorsGener, LogTraceOpt, PostProcessOpt } from "@zwa73/js-utils";
+export type { ParamsDecoratorsGener, BaseDecoratorsGener, StandardMethodDecorator, LogTraceOpt, PostProcessOpt } from "@zwa73/js-utils";
 export { LogTrace, PostProcess, AwaitInited } from "@zwa73/js-utils";

package/dist/UtilFunctions.d.ts

@@ -1,3 +1,4 @@
+import type { DataStore } from "@zwa73/js-utils";
 import { JsFunc } from "@zwa73/js-utils";
 import type { AnyString, LogLevel } from "./UtilInterfaces";
 declare const HashAlgorithmList: readonly ["RSA-MD5", "RSA-RIPEMD160", "RSA-SHA1", "RSA-SHA1-2", "RSA-SHA224", "RSA-SHA256", "RSA-SHA3-224", "RSA-SHA3-256", "RSA-SHA3-384", "RSA-SHA3-512", "RSA-SHA384", "RSA-SHA512", "RSA-SHA512/224", "RSA-SHA512/256", "RSA-SM3", "blake2b512", "blake2s256", "id-rsassa-pkcs1-v1_5-with-sha3-224", "id-rsassa-pkcs1-v1_5-with-sha3-256", "id-rsassa-pkcs1-v1_5-with-sha3-384", "id-rsassa-pkcs1-v1_5-with-sha3-512", "md5", "md5-sha1", "md5WithRSAEncryption", "ripemd", "ripemd160", "ripemd160WithRSA", "rmd160", "sha1", "sha1WithRSAEncryption", "sha224", "sha224WithRSAEncryption", "sha256", "sha256WithRSAEncryption", "sha3-224", "sha3-256", "sha3-384", "sha3-512", "sha384", "sha384WithRSAEncryption", "sha512", "sha512-224", "sha512-224WithRSAEncryption", "sha512-256", "sha512-256WithRSAEncryption", "sha512WithRSAEncryption", "shake128", "shake256", "sm3", "sm3WithRSAEncryption", "ssl3-md5", "ssl3-sha1"];
@@ -16,6 +17,8 @@ type ExecOpt = Partial<{
     /**额外环境变量 */
     env: string;
 }>;
+/**可解析的数据存储源 */
+export type ParseableDataStore<T> = string | T | DataStore<T>;
 /**常用函数 */
 declare class _UtilFunc {
     /**计算Hash
@@ -48,7 +51,12 @@ declare class _UtilFunc {
      * 依赖于 public-ip@6.0.2 但不会自动安装
      */
     static getPublicIpv4(): Promise<string>;
+    /**解析数据存储器源
+     * @param source 数据存储源
+     * @returns 数据存储对象
+     */
+    static resolveDataStore<T>(source: ParseableDataStore<T>): DataStore<T>;
 }
-export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "match" | "prototype" | "preset" | "assignOption" | "genUUID" | "getTime" | "initField" | "initObject" | "afterward" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "sortJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getStack" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "lazyFunction" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "dynamicImport" | "createInjectable" | "createAsyncProxy" | "checkSharpSchema" | "unwarpReadonly" | "outcome" | "extractOutcome" | "success" | "failed" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "range" | "s2l" | "l2s">;
+export declare const UtilFunc: import("@zwa73/modular-mixer").ComposedClass<typeof _UtilFunc, typeof JsFunc, "__jsUtils", "prototype" | "preset" | "assignOption" | "genUUID" | "getTime" | "initField" | "initObject" | "afterward" | "sleep" | "getNeverResolvedPromise" | "retryPromise" | "timelimitPromise" | "mapEntries" | "eachField" | "stringifyJToken" | "sortJToken" | "assertType" | "assertLiteral" | "deepClone" | "isSafeNumber" | "dedent" | "throwError" | "getStack" | "getFuncLoc" | "cachePool" | "memoize" | "asyncize" | "lazyFunction" | "splitToChunk" | "mergeFromChunk" | "structEqual" | "concurrent" | "dynamicImport" | "createInjectable" | "createAsyncProxy" | "checkSharpSchema" | "unwarpReadonly" | "outcome" | "extractOutcome" | "success" | "failed" | "match" | "isStatus" | "eitherize" | "parseSrtTime" | "formatSrtTime" | "parseSrt" | "createSrt" | "ivk" | "range" | "s2l" | "l2s">;
 export type UtilFunc = typeof UtilFunc;
 export {};

package/dist/UtilFunctions.js

@@ -34,6 +34,7 @@ const js_utils_1 = require("@zwa73/js-utils");
 const modular_mixer_1 = require("@zwa73/modular-mixer");
 const UtilSymbol_1 = require("./UtilSymbol");
 const Constant_1 = require("./Constant");
+const UtilClass_1 = require("./UtilClass");
 const UtilFileTools_1 = require("./UtilFileTools");
 const UtilLogger_1 = require("./UtilLogger");
 const HashAlgorithmList = [
@@ -138,6 +139,18 @@ class _UtilFunc {
         });
         return pip.publicIpv4();
     }
+    /**解析数据存储器源
+     * @param source 数据存储源
+     * @returns 数据存储对象
+     */
+    static resolveDataStore(source) {
+        if (typeof source == 'string')
+            return new UtilClass_1.JsonStore({ filepath: source });
+        if (typeof source == 'object' && source != null && 'save' in source &&
+            typeof source.save == 'function')
+            return source;
+        return new js_utils_1.ObjectStore({ data: source });
+    }
 }
 const key = '__jsUtils';
 const fieldList = Object.getOwnPropertyNames(js_utils_1.JsFunc).filter(k => !['length', 'prototype', 'name'].includes(k));

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@zwa73/utils",
-	"version": "1.0.286",
+	"version": "1.0.288",
 	"description": "my utils",
 	"main": "dist/index.js",
 	"scripts": {