@anjianshi/utils 2.4.16 → 2.5.0

package/env-browser/device.js

@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-deprecated */
 /**
  * 自动计算最合适的 rem 大小，应用到页面样式上。
  *

package/env-browser/load-script.js

@@ -7,7 +7,7 @@ export default async function loadScript(url) {
         const script = document.createElement('script');
         script.src = url;
         script.onload = () => resolve();
-        script.onerror = err => reject(err);
+        script.onerror = err => reject(err); // eslint-disable-line @typescript-eslint/prefer-promise-reject-errors
         window.document.head.appendChild(script);
     });
 }

package/env-browser/manage-vconsole.d.ts

@@ -12,5 +12,5 @@ export declare function isVConsoleEnabled(): boolean;
 export declare function detectVConsole(): void;
 export declare function enableVConsole(): void;
 export declare function disableVConsole(): void;
-export declare function runVConsole(): undefined;
+export declare function runVConsole(): void;
 export declare function destoryVConsole(): void;

package/env-browser/manage-vconsole.js

@@ -27,7 +27,7 @@ export function runVConsole() {
     if (window.VConsole !== null)
         return;
     if (VConsoleLib === undefined)
-        return void console.warn('尚未传入 VConsole 对象，无法启动');
+        return console.warn('尚未传入 VConsole 对象，无法启动');
     window.VConsole = new VConsoleLib();
 }
 export function destoryVConsole() {

package/env-node/logging/handlers.js

@@ -147,7 +147,7 @@ export class FileHandler extends LogHandler {
         else {
             fs.appendFile(this.filepath, content, error => {
                 if (error)
-                    console.error('[logger] write failed: ' + String(error));
+                    console.error('[logger] write failed: ', error);
             });
         }
     }

package/env-react/emotion.d.ts

@@ -14,5 +14,7 @@ import { type CSSInterpolation } from '@emotion/serialize';
 export declare const useEmotionCache: () => EmotionCache | undefined;
 export declare const EmotionCacheProvider: import("react").FC<{
     children: React.ReactNode;
-} & import("react").ClassAttributes<any>>;
+} & import("react").RefAttributes<any>> | import("react").ForwardRefExoticComponent<{
+    children: React.ReactNode;
+} & import("react").RefAttributes<any>>;
 export declare function useEmotionClassName(): (...args: CSSInterpolation[]) => string;

package/env-service/index.d.ts

@@ -2,6 +2,5 @@
  * 开发后端服务能用到的工具库
  */
 export * from './env-reader.js';
-export * from './redis-cache.js';
 export * from './controllers.js';
 export * from './tasks.js';

package/env-service/index.js

@@ -2,6 +2,5 @@
  * 开发后端服务能用到的工具库
  */
 export * from './env-reader.js';
-export * from './redis-cache.js';
 export * from './controllers.js';
 export * from './tasks.js';

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

@@ -17,6 +17,7 @@ export function getPrismaLoggingOptions(debug) {
         ],
     };
 }
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
 export function adaptPrismaLogging(prisma, baseLogger) {
     // 记录 Prisma 相关日志
     const queryLogger = baseLogger.getChild('query');

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

@@ -14,6 +14,7 @@
  * 为保证其他扩展也应用到修改过的这些方法，此扩展应尽可能放在最前面。
  */
 import { Prisma } from '@prisma/client/extension';
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
 function getModel(that) {
     const context = Prisma.getExtensionContext(that);
     // 1. 此扩展修改了 Prisma 原生的方法，所以要通过 context.$parent[context.$name] 获取上一层的 model，不然会自己调用自己导致死循环。
@@ -29,6 +30,7 @@ function getModel(that) {
 }
 function query(that, inputArgs, method) {
     const { model, supportSoftDelete } = getModel(that);
+    // eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
     const { withDeleted = false, ...args } = inputArgs;
     return model[method]({
         ...args,

package/env-service/prisma/extensions/with-transaction.d.ts

@@ -1,9 +1,9 @@
 import { type ITXClientDenyList } from '@prisma/client/runtime/library.js';
-import type { MaySuccess } from '../../../index.js';
+import type { MaySuccess, Failed } from '../../../index.js';
 export declare const withTransaction: (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {}, {}, {
     $withTransaction: typeof $withTransaction;
 }>>;
 export type GetPrismaClientInTransaction<PrismaClient> = Omit<PrismaClient, ITXClientDenyList>;
 export type WithTransactionMethod = typeof $withTransaction;
-declare function $withTransaction<That extends object, R extends MaySuccess<unknown, unknown>>(this: That, callback: (dbInTransaction: GetPrismaClientInTransaction<That>) => Promise<R>): Promise<R>;
+declare function $withTransaction<That extends object, R extends MaySuccess<unknown, unknown>>(this: That, callback: (dbInTransaction: GetPrismaClientInTransaction<That>) => Promise<R>): Promise<Failed<any> | R>;
 export {};

package/env-service/prisma/extensions/with-transaction.js

@@ -12,7 +12,7 @@
  *   }
  * )
  */
-import { Prisma } from '@prisma/client/extension';
+import { Prisma } from '@prisma/client/extension.js';
 export const withTransaction = Prisma.defineExtension({
     name: 'withTransaction',
     client: {
@@ -26,6 +26,8 @@ class FailedInTransaction extends Error {
         this.failed = failed;
     }
 }
+// 注意：此函数的返回值为 `R | Failed<any>`，例如实际可能为 `MaySuccess<xxx, xxx> | Failed<any>`，这是有意为之的，`Failed<any>` 并不多余。
+// 因为有时 callback() 只会返回 success 结果，此时 R=Success<xxx>，但是 $withTransaction 整体的返回值仍有可能有 Failed<any>，所以不能用 R 作为整体返回值。
 async function $withTransaction(callback) {
     const executeCallback = async (dbInTransaction) => {
         const result = await callback(dbInTransaction);

package/env-service/redis-cache.d.ts

@@ -33,7 +33,7 @@ export declare class Cache<T> {
     /** 移除一项内容 */
     delete(identity?: string | string[]): Promise<number>;
     /** 刷新一项内容的过期时间 */
-    refresh(identity?: string): Promise<boolean>;
+    refresh(identity?: string): Promise<number | false>;
     /** 确认一项内容是否存在  */
     exists(identity?: string): Promise<boolean>;
 }

package/env-service/redis-cache.js

@@ -1,7 +1,6 @@
 import { logger as rootLogger } from '../logging/index.js';
 export function initRedisLogging(redis, logger) {
-    if (!logger)
-        logger = rootLogger.getChild('redis');
+    logger ??= rootLogger.getChild('redis');
     redis.on('connect', () => logger.info('connecting'));
     redis.on('ready', () => logger.info('connected'));
     redis.on('end', () => logger.info('connection closed'));

package/lang/async.js

@@ -23,7 +23,7 @@ export async function timeout(promise, timeoutMS, silent = false) {
         promise.then(result => {
             if (!isTimeout)
                 resolve(result);
-        }, error => {
+        }, (error) => {
             if (!isTimeout)
                 reject(error);
         });

package/lang/string.js

@@ -81,6 +81,7 @@ export function readableSize(bytes, si = false, dp = 1) {
 /**
  * 解析 JSON，失败时不抛出异常，而是返回 undefined
  */
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-type-parameters
 export function safeParseJSON(json) {
     try {
         return JSON.parse(json);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "2.4.16",
+  "version": "2.5.0",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -20,28 +20,28 @@
     "lodash": "^4.17.21"
   },
   "devDependencies": {
-    "@types/lodash": "^4.17.10",
-    "@types/node": "^20.16.11",
-    "@types/react": "^18.3.11",
-    "dotenv": "^16.4.5",
-    "redis": "^4.7.0",
-    "typescript": "^5.6.3",
+    "@types/lodash": "^4.17.17",
+    "@types/node": "^22.15.21",
+    "@types/react": "^19.1.5",
+    "dotenv": "^16.5.0",
+    "redis": "^5.1.0",
+    "typescript": "^5.8.3",
     "vconsole": "^3.15.1",
-    "@anjianshi/presets-eslint-node": "4.0.15",
-    "@anjianshi/presets-eslint-react": "4.0.14",
-    "@anjianshi/presets-eslint-typescript": "5.0.12",
-    "@anjianshi/presets-prettier": "3.0.1",
-    "@anjianshi/presets-typescript": "3.2.3"
+    "@anjianshi/presets-eslint-node": "4.2.3",
+    "@anjianshi/presets-eslint-react": "4.2.3",
+    "@anjianshi/presets-prettier": "3.0.3",
+    "@anjianshi/presets-typescript": "3.2.4",
+    "@anjianshi/presets-eslint-typescript": "5.2.3"
   },
   "peerDependencies": {
-    "@emotion/react": "^11.13.3",
-    "@emotion/serialize": "^1.3.1",
-    "@emotion/utils": "^1.4.0",
-    "@prisma/client": "^5.20.0",
-    "chalk": "^5.3.0",
-    "dayjs": "^1.11.10",
-    "dotenv": "^16.4.5",
-    "react": "^18.3.1"
+    "@emotion/react": "^11.14.0",
+    "@emotion/serialize": "^1.3.3",
+    "@emotion/utils": "^1.4.2",
+    "@prisma/client": "^6.8.2",
+    "chalk": "^5.4.1",
+    "dayjs": "^1.11.13",
+    "dotenv": "^16.5.0",
+    "react": "^19.1.0"
   },
   "peerDependenciesMeta": {
     "@emotion/react": {