@anjianshi/utils 2.4.9 → 2.4.11

package/env-node/logging/handlers.d.ts

@@ -50,9 +50,9 @@ export declare class FileHandler extends LogHandler {
     private buffer;
     private bufferSize;
     protected pushBuffer(...strings: string[]): void;
-    protected flush(): void;
+    protected flush(sync?: boolean): void;
     protected initFlush(): void;
     get filepath(): string;
     protected initLogDir(): void;
-    protected write(content: string): void;
+    protected write(content: string, sync?: boolean): void;
 }

package/env-node/logging/handlers.js

@@ -112,19 +112,21 @@ export class FileHandler extends LogHandler {
         if (this.options.flushInterval === 0 || this.bufferSize >= this.options.flushLength)
             this.flush();
     }
-    flush() {
+    flush(sync) {
         if (this.buffer.length) {
             const content = this.buffer.join('');
             this.buffer = [];
             this.bufferSize = 0;
-            this.write(content);
+            this.write(content, sync);
         }
     }
     initFlush() {
         if (this.options.flushInterval !== 0) {
             setInterval(() => this.flush(), this.options.flushInterval);
         }
-        process.on('exit', () => this.flush());
+        // 进程退出前把尚未写入文件的日志强制写入
+        // 这里必须用同步的方式来写，不然会写入不进去（可能是因为异步的话是放到下一个事件循环，但进程在这个事件循环内就退出了）
+        process.on('exit', () => this.flush(true));
     }
     // 文件系统交互 File system interaction
     get filepath() {
@@ -135,10 +137,15 @@ export class FileHandler extends LogHandler {
         if (!fs.existsSync(this.options.dir))
             fs.mkdirSync(this.options.dir);
     }
-    write(content) {
-        fs.appendFile(this.filepath, content, error => {
-            if (error)
-                console.error('[logger] write failed: ' + String(error));
-        });
+    write(content, sync = false) {
+        if (sync) {
+            fs.appendFileSync(this.filepath, content);
+        }
+        else {
+            fs.appendFile(this.filepath, content, error => {
+                if (error)
+                    console.error('[logger] write failed: ' + String(error));
+            });
+        }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "2.4.9",
+  "version": "2.4.11",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -27,11 +27,11 @@
     "redis": "^4.7.0",
     "typescript": "^5.6.3",
     "vconsole": "^3.15.1",
-    "@anjianshi/presets-eslint-node": "4.0.13",
-    "@anjianshi/presets-eslint-typescript": "5.0.10",
+    "@anjianshi/presets-eslint-node": "4.0.14",
+    "@anjianshi/presets-eslint-react": "4.0.13",
     "@anjianshi/presets-prettier": "3.0.1",
     "@anjianshi/presets-typescript": "3.2.3",
-    "@anjianshi/presets-eslint-react": "4.0.12"
+    "@anjianshi/presets-eslint-typescript": "5.0.11"
   },
   "peerDependencies": {
     "@emotion/react": "^11.13.3",

package/validators/base.d.ts

@@ -12,7 +12,7 @@ export type PrimitiveType = string | boolean | number | PrimitiveType[] | [...Pr
 /**
  * validator 通用参数
  */
-export interface CommonOptions<Defaults = unknown> {
+export interface CommonOptions<Value = unknown> {
     /** 是否允许 null 值 @default false */
     null?: boolean;
     /** 字段是否必须有值（不能是 undefined） @default true */
@@ -21,7 +21,8 @@ export interface CommonOptions<Defaults = unknown> {
      * 默认值，字段无值（或值为 undefined）时生效，值为 null 不会生效。
      * 指定后 required 选项将失去作用。
      */
-    defaults?: Defaults;
+    defaults?: Value;
+    custom?: <T extends Value>(input: T) => MaySuccess<T>;
     [key: string]: unknown;
 }
 /**
@@ -33,6 +34,9 @@ type FullfiledOptions<Options extends Partial<CommonOptions>> = Omit<Options, ke
     defaults: Options extends {
         defaults: infer T;
     } ? T : undefined;
+    custom: Options extends {
+        custom: infer T;
+    } ? T : undefined;
 };
 /**
  * 验证完成后能得到的值类型

package/validators/base.js

@@ -7,7 +7,7 @@ import { success, failed } from '../lang/index.js';
 export function getValidatorGenerator(validate) {
     return function validatorGenerator(inputOptions) {
         function validator(field, input) {
-            const { null: allowNull = false, required = true, defaults } = inputOptions;
+            const { null: allowNull = false, required = true, defaults, custom } = inputOptions;
             if (typeof field !== 'string') {
                 input = field;
                 field = 'value';
@@ -25,7 +25,8 @@ export function getValidatorGenerator(validate) {
                 return failed(`${field} cannot be null`);
             if (value === null || value === undefined)
                 return success(value);
-            return validate(field, value, inputOptions);
+            const validated = validate(field, value, inputOptions);
+            return validated.success && custom ? custom(validated.data) : validated;
         }
         return validator;
     };

package/validators/factory.js

@@ -22,23 +22,23 @@ export function getValidator(definition) {
             return getArrayValidator({
                 // @ts-ignore 允许递归类型推断
                 ...definition,
-                item: getValidator(definition['item']),
+                item: getValidator(definition.item),
             });
         case 'tuple':
             return getTupleValidator({
                 ...definition,
-                tuple: definition['tuple'].map(def => getValidator(def)),
+                tuple: definition.tuple.map(def => getValidator(def)),
             });
         case 'struct': {
             const struct = {};
-            for (const [key, def] of Object.entries(definition['struct']))
+            for (const [key, def] of Object.entries(definition.struct))
                 struct[key] = getValidator(def);
             return getStructValidator({ ...definition, struct });
         }
         case 'record':
             return getRecordValidator({
                 ...definition,
-                record: getValidator(definition['record']),
+                record: getValidator(definition.record),
             });
     }
 }