@anjianshi/utils 3.5.0 → 3.6.1

package/env-node/logging/handlers.js

@@ -115,8 +115,8 @@ export class FileHandler extends LogHandler {
         if (this.options.flushInterval === 0 || this.bufferSize >= this.options.flushLength) {
             this.flush();
         }
-        else if (!this.flushTimeoutId) {
-            this.flushTimeoutId = setTimeout(() => this.flush(), this.options.flushInterval);
+        else {
+            this.flushTimeoutId ??= setTimeout(() => this.flush(), this.options.flushInterval);
         }
     }
     flush(sync) {

package/env-service/prisma/adapt-logging.d.ts

@@ -1,17 +1,17 @@
 import type { getPrismaClient } from '@prisma/client/runtime/library.js';
 import { type Logger } from '../../logging/index.js';
 type PrismalClient = ReturnType<typeof getPrismaClient> extends new () => infer T ? T : never;
-export declare function getPrismaLoggingOptions(debug: boolean): {
+export declare function getPrismaLoggingOptions(level: 'debug' | 'info' | 'warn' | 'error'): {
     errorFormat: "pretty";
     log: ({
         readonly emit: "event";
         readonly level: "query";
     } | {
-        emit: "event";
-        level: "info";
+        readonly emit: "event";
+        readonly level: "info";
     } | {
-        emit: "event";
-        level: "warn";
+        readonly emit: "event";
+        readonly level: "warn";
     } | {
         emit: "event";
         level: "error";

package/env-service/prisma/adapt-logging.js

@@ -9,13 +9,15 @@
  */
 import nodeUtil from 'node:util';
 import chalk from 'chalk';
-export function getPrismaLoggingOptions(debug) {
+export function getPrismaLoggingOptions(level) {
     return {
         errorFormat: 'pretty',
         log: [
-            ...(debug ? [{ emit: 'event', level: 'query' }] : []),
-            { emit: 'event', level: 'info' },
-            { emit: 'event', level: 'warn' },
+            ...(level === 'debug' ? [{ emit: 'event', level: 'query' }] : []),
+            ...(['debug', 'info'].includes(level) ? [{ emit: 'event', level: 'info' }] : []),
+            ...(['debug', 'info', 'warn'].includes(level)
+                ? [{ emit: 'event', level: 'warn' }]
+                : []),
             { emit: 'event', level: 'error' },
         ],
     };

package/env-service/prisma/extensions/exist.d.ts

@@ -1,4 +1,4 @@
-import { Prisma } from '@prisma/client/extension';
+import { Prisma } from '@prisma/client/extension.js';
 /**
  * 快速检查指定条件的数据是否存在
  * const exists = await prisma.xxx.exists({ id: '1' })

package/env-service/prisma/extensions/exist.js

@@ -1,4 +1,4 @@
-import { Prisma } from '@prisma/client/extension';
+import { Prisma } from '@prisma/client/extension.js';
 /**
  * 快速检查指定条件的数据是否存在
  * const exists = await prisma.xxx.exists({ id: '1' })

package/env-service/prisma/extensions/find-and-count.d.ts

@@ -1,4 +1,4 @@
-import { Prisma } from '@prisma/client/extension';
+import { Prisma } from '@prisma/client/extension.js';
 import { type SoftDeleteQueryArgs } from './soft-delete.js';
 export declare const findAndCount: (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {
     $allModels: {

package/env-service/prisma/extensions/find-and-count.js

@@ -1,4 +1,4 @@
-import { Prisma } from '@prisma/client/extension';
+import { Prisma } from '@prisma/client/extension.js';
 export const findAndCount = Prisma.defineExtension({
     name: 'findAndCount',
     model: {

package/env-service/prisma/extensions/soft-delete.d.ts

@@ -13,7 +13,7 @@
  * 此扩展修改了 Prisma 的原生方法。
  * 为保证其他扩展也应用到修改过的这些方法，此扩展应尽可能放在最前面。
  */
-import { Prisma } from '@prisma/client/extension';
+import { Prisma } from '@prisma/client/extension.js';
 import type { Operation } from '@prisma/client/runtime/library.js';
 import { type OptionalFields } from '../../../index.js';
 type DeleteArgs<T> = Prisma.Args<T, 'delete'> & {

package/env-service/prisma/extensions/soft-delete.js

@@ -13,7 +13,7 @@
  * 此扩展修改了 Prisma 的原生方法。
  * 为保证其他扩展也应用到修改过的这些方法，此扩展应尽可能放在最前面。
  */
-import { Prisma } from '@prisma/client/extension';
+import { Prisma } from '@prisma/client/extension.js';
 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
 function getModel(that) {
     const context = Prisma.getExtensionContext(that);

package/logging/adapt.js

@@ -31,8 +31,7 @@ export function adaptDebugLib(debugLib, enable = '', logger) {
     };
     Object.assign(debugLib, emulate);
     // 将 debugLib 日志转发给 logger
-    if (!logger)
-        logger = getLogger('3rd-library');
+    logger ??= getLogger('3rd-library');
     debugLib.log = logger.debug.bind(logger);
     if (enable) {
         // 有些库（例如 prisma）重新实现了自己的 debug 库，且模仿 debug 也读取 DEBUG 环境变量。

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "3.5.0",
+  "version": "3.6.1",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -23,56 +23,27 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@types/lodash": "^4.17.20",
-    "@types/node": "^22.16.0",
-    "@types/react": "^19.1.8",
-    "dotenv": "^17.0.1",
-    "eslint": "^9.30.1",
-    "redis": "^5.5.6",
-    "typescript": "^5.8.3",
-    "vconsole": "^3.15.1",
-    "@anjianshi/presets-eslint-node": "6.0.0",
-    "@anjianshi/presets-eslint-base": "6.0.0",
-    "@anjianshi/presets-eslint-typescript": "6.0.0",
-    "@anjianshi/presets-prettier": "3.0.5",
-    "@anjianshi/presets-eslint-react": "6.0.0",
-    "@anjianshi/presets-typescript": "3.2.5"
-  },
-  "peerDependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/serialize": "^1.3.3",
     "@emotion/utils": "^1.4.2",
     "@prisma/client": "^6.8.2",
+    "@types/lodash": "^4.17.20",
+    "@types/node": "^22.16.0",
+    "@types/react": "^19.1.8",
     "chalk": "^5.4.1",
     "dayjs": "^1.11.13",
     "dotenv": "^17.0.1",
-    "react": "^19.1.0"
-  },
-  "peerDependenciesMeta": {
-    "@emotion/react": {
-      "optional": true
-    },
-    "@emotion/serialize": {
-      "optional": true
-    },
-    "@emotion/utils": {
-      "optional": true
-    },
-    "@prisma/client": {
-      "optional": true
-    },
-    "chalk": {
-      "optional": true
-    },
-    "dayjs": {
-      "optional": true
-    },
-    "dotenv": {
-      "optional": true
-    },
-    "react": {
-      "optional": true
-    }
+    "eslint": "^9.39.2",
+    "react": "^19.1.0",
+    "redis": "^5.5.6",
+    "typescript": "^5.8.3",
+    "vconsole": "^3.15.1",
+    "@anjianshi/presets-eslint-base": "6.1.0",
+    "@anjianshi/presets-eslint-node": "6.1.0",
+    "@anjianshi/presets-eslint-react": "6.1.1",
+    "@anjianshi/presets-eslint-typescript": "6.1.0",
+    "@anjianshi/presets-typescript": "3.2.5",
+    "@anjianshi/presets-prettier": "3.2.0"
   },
   "prettier": "@anjianshi/presets-prettier/prettierrc"
 }