@anjianshi/utils 2.3.6 → 2.3.9

package/env-node/env-reader.d.ts

@@ -38,7 +38,9 @@ export declare class EnvReader {
     batchGet<Defs extends Record<string, EnvValue>>(definitions: Defs): Defs;
     /**
      * 同 envReader.getByType()，只不过是通过对象指定各 env 的类型来批量获取。
-     * 若 required 为 true，要求所有 env 都必须有值，否则会抛出异常；默认为 false。
+     *
+     * - required=false（默认）时，不存在或值为 undefined 的 env 不会出现在返回对象里，以保证 { ...defaults, ...envReader.batchGetByType(...) } 的用法能正常保留默认值。
+     * - required=true 时要求所有 env 都必须有值，否则会抛出异常
      *
      * envReader.batchGetByType({
      *   port: 'number',

package/env-node/env-reader.js

@@ -68,9 +68,10 @@ export class EnvReader {
         const result = {};
         for (const [key, def] of Object.entries(definitions)) {
             const value = typeof def === 'string' ? this.getByType(key, def) : this.getByType(key, 'json');
-            if (value === undefined && required)
+            if (value !== undefined)
+                result[key] = value;
+            else if (required)
                 throw new Error(`env ${key} needs a value`);
-            result[key] = value;
         }
         return result;
     }

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

@@ -1,9 +1,9 @@
-import { Prisma } from '@prisma/client';
+import { Prisma } from '@prisma/client/extension';
 /**
  * 快速检查指定条件的数据是否存在
  * const exists = await prisma.xxx.exists({ id: '1' })
  */
-export declare const exists: (client: any) => import("@prisma/client").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {
+export declare const exists: (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {
     $allModels: {
         exists<T>(this: T, where: Prisma.Args<T, "count">["where"], withDeleted?: boolean): Promise<boolean>;
     };

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

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

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

@@ -1,6 +1,6 @@
-import { Prisma } from '@prisma/client';
+import { Prisma } from '@prisma/client/extension';
 import { type SoftDeleteQueryArgs } from './soft-delete.js';
-export declare const findAndCount: (client: any) => import("@prisma/client").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {
+export declare const findAndCount: (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {
     $allModels: {
         findAndCount<T, A>(this: T, rawArgs: Prisma.Exact<A, Prisma.Args<T, "findMany"> & SoftDeleteQueryArgs>): Promise<[Awaited<Prisma.Result<T, A, "findMany">>, Awaited<Prisma.Result<T, A, "count">>]>;
     };

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

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

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

@@ -13,7 +13,7 @@
  * 此扩展修改了 Prisma 的原生方法。
  * 为保证其他扩展也应用到修改过的这些方法，此扩展应尽可能放在最前面。
  */
-import { Prisma } from '@prisma/client';
+import { Prisma } from '@prisma/client/extension';
 import type { Operation } from '@prisma/client/runtime/library.js';
 import { type OptionalFields } from '../../../index.js';
 type DeleteArgs<T> = Prisma.Args<T, 'delete'> & {
@@ -33,7 +33,7 @@ interface QueryExtraArgs {
 }
 export type { QueryExtraArgs as SoftDeleteQueryArgs };
 type QueryInputArgs<T, A, K extends Operation> = Prisma.Exact<A, Prisma.Args<T, K> & QueryExtraArgs>;
-export declare const softDelete: (client: any) => import("@prisma/client").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {
+export declare const softDelete: (client: any) => import("@prisma/client/extension").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {
     $allModels: {
         withSoftDeleteExtension: boolean;
         delete<T, A>(this: T, rawArgs: Prisma.Exact<A, DeleteArgs<T>>): DeleteReturn<T, A>;

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

@@ -13,7 +13,7 @@
  * 此扩展修改了 Prisma 的原生方法。
  * 为保证其他扩展也应用到修改过的这些方法，此扩展应尽可能放在最前面。
  */
-import { Prisma } from '@prisma/client';
+import { Prisma } from '@prisma/client/extension';
 function getModel(that) {
     const context = Prisma.getExtensionContext(that);
     // 1. 此扩展修改了 Prisma 原生的方法，所以要通过 context.$parent[context.$name] 获取上一层的 model，不然会自己调用自己导致死循环。

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

@@ -1,6 +1,6 @@
 import { type ITXClientDenyList } from '@prisma/client/runtime/library.js';
 import type { MaySuccess } from '../../../index.js';
-export declare const withTransaction: (client: any) => import("@prisma/client").PrismaClientExtends<import("@prisma/client/runtime/library").InternalArgs<{}, {}, {}, {
+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>;

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

@@ -12,7 +12,7 @@
  *   }
  * )
  */
-import { Prisma } from '@prisma/client';
+import { Prisma } from '@prisma/client/extension';
 export const withTransaction = Prisma.defineExtension({
     name: 'withTransaction',
     client: {

package/env-node/prisma/transaction-contexted.d.ts

@@ -6,6 +6,6 @@ import type { WithTransactionMethod } from './extensions/with-transaction.js';
  * 注意：应给每个线性流程（例如一个请求）单独生成一个此对象，不能作为全局对象使用，不然可能出现事务冲突。
  */
 export declare function getTransactionContextedPrismaClient<AppPrismaClient extends {
-    $transaction: (...args: unknown[]) => Promise<unknown>;
+    $transaction: (...args: any[]) => Promise<unknown>;
     $withTransaction: WithTransactionMethod;
 }>(prisma: AppPrismaClient): AppPrismaClient;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "2.3.6",
+  "version": "2.3.9",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -26,9 +26,9 @@
     "dotenv": "^16.4.5",
     "typescript": "^5.5.4",
     "vconsole": "^3.15.1",
-    "@anjianshi/presets-prettier": "3.0.1",
     "@anjianshi/presets-eslint-typescript": "5.0.5",
     "@anjianshi/presets-eslint-node": "4.0.8",
+    "@anjianshi/presets-prettier": "3.0.1",
     "@anjianshi/presets-typescript": "3.2.2",
     "@anjianshi/presets-eslint-react": "4.0.7"
   },