@zwa73/utils 1.0.285 → 1.0.286

package/dist/UtilClass/DataStore.d.ts

@@ -1,4 +1,4 @@
-import type { DataStore, JObject } from '@zwa73/js-utils';
+import { type DataStore, type JObject } from '@zwa73/js-utils';
 /**JSON文件存储实现 */
 export declare class JsonStore<T extends JObject> implements DataStore<T> {
     /**存储的数据 */
@@ -9,8 +9,7 @@ export declare class JsonStore<T extends JObject> implements DataStore<T> {
     private _filepath;
     /**是否检查数据变更 */
     private _checkChange;
-    /**
-     * 构造函数
+    /**构造函数
      * @param opt 配置选项
      */
     constructor(opt: {
@@ -33,3 +32,13 @@ 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,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.JsonStore = void 0;
+exports.UtilDataStore = 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");
@@ -18,8 +19,7 @@ class JsonStore {
     _filepath;
     /**是否检查数据变更 */
     _checkChange;
-    /**
-     * 构造函数
+    /**构造函数
      * @param opt 配置选项
      */
     constructor(opt) {
@@ -66,3 +66,19 @@ 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/UtilFunctions.d.ts

@@ -1,13 +1,16 @@
 import { JsFunc } from "@zwa73/js-utils";
-import type { LogLevel } from "./UtilInterfaces";
+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"];
 export type HashAlgorithm = typeof HashAlgorithmList[number];
 /**执行选项 */
 type ExecOpt = Partial<{
     outlvl: LogLevel | ((arg: string) => any);
     errlvl: LogLevel | ((arg: string) => any);
-    /**node_modules文件夹目录, 用于设定环境变量 */
-    nodeModules: string;
+    /**node_modules文件夹目录, 用于设定环境变量 默认无
+     * undefined 时自动向上级查找
+     * 为‘None’ 时不使用
+     */
+    nodeModules: AnyString | 'None';
     /**工作路径 */
     cwd: string;
     /**额外环境变量 */

package/dist/UtilFunctions.js

@@ -80,9 +80,10 @@ class _UtilFunc {
             // 创建一个新的环境变量对象，并将项目的 node_modules/.bin 目录添加到 PATH 环境变量中
             const env = Object.assign(Object.create(process.env), opt?.env ?? {});
             const penv = opt?.nodeModules
-                ? path_1.default.join(UtilFileTools_1.UtilFT.currosizePath(opt.nodeModules), '.bin')
+                ? opt.nodeModules == 'None' ? ''
+                    : path_1.default.join(UtilFileTools_1.UtilFT.currosizePath(opt.nodeModules), '.bin')
                 : UtilFileTools_1.UtilFT.currosizePath(await exports.UtilFunc.memoize(UtilFileTools_1.UtilFT.findNodeModulesDir)(process.cwd(), '.bin') ?? '');
-            if (_UtilFunc.checkEnv && (penv == "" || !await UtilFileTools_1.UtilFT.pathExists(penv))) {
+            if (opt?.nodeModules != "None" && (_UtilFunc.checkEnv && (penv == "" || !await UtilFileTools_1.UtilFT.pathExists(penv)))) {
                 UtilLogger_1.SLogger.warn(`UtilFunc.exec 错误, 没有检测到 node_modules/.bin 环境 penv:${penv}`);
                 _UtilFunc.checkEnv = false;
             }

package/package.json

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