@jayfong/x-server 2.112.0 → 2.114.0

package/lib/_cjs/cli/templates/models.ts

@@ -12,7 +12,29 @@ const adapter = new PrismaMariaDb({
   password: dbUri.password,
   database: dbUri.pathname.slice(1),
 });
-export const prismaClient = new PrismaClient({ adapter });
+export const prismaClient = new PrismaClient({ adapter })
+  // https://github.com/prisma/prisma/issues/7550#issuecomment-2437006346
+  .$extends({
+    name: 'findManyAndCount',
+    model: {
+      $allModels: {
+        findManyAndCount<Model, Args>(
+          this: Model,
+          args: Prisma.Exact<Args, Prisma.Args<Model, 'findMany'>>,
+        ): Promise<{
+          data: Prisma.Result<Model, Args, 'findMany'>;
+          total: number;
+        }> {
+          return prismaClient
+            .$transaction([
+              (this as any).findMany(args),
+              (this as any).count({ where: (args as any).where }),
+            ])
+            .then(([data, total]: any) => ({ data, total }));
+        },
+      },
+    },
+  });
 
 x.dispose.add(() => prismaClient.$disconnect());
 

package/lib/_cjs/core/handler.js

@@ -22,6 +22,7 @@ class Handler {
     this.options = options;
     this.requestDataSchema = void 0;
     this.requestDataSchemaVae = void 0;
+    this.requestHandle = void 0;
     this.handle = async (data, ctx) => {
       // 前置 hook
       if (Handler.hooks.length) {
@@ -72,7 +73,7 @@ class Handler {
         }
       }
       try {
-        let res = await this.options.handle(data, ctx);
+        let res = await this.requestHandle(data, ctx);
         if (res instanceof _http_redirect.HttpRedirect) {
           ctx.redirect(res.url, res.permanently);
           return {};
@@ -188,6 +189,24 @@ class Handler {
     } else if (options.requestDataSchema) {
       this.requestDataSchema = options.requestDataSchema(_validator.yup);
     }
+    if (options.concurrency != null) {
+      if (typeof options.concurrency === 'number') {
+        this.requestHandle = (0, _vtils.asyncLimit)(async (data, ctx) => options.handle(data, ctx), {
+          concurrency: options.concurrency
+        });
+      } else {
+        const {
+          count,
+          groupBy
+        } = options.concurrency;
+        this.requestHandle = (0, _vtils.asyncLimit)(async (data, ctx) => options.handle(data, ctx), {
+          concurrency: count,
+          groupBy: groupBy
+        });
+      }
+    } else {
+      this.requestHandle = options.handle;
+    }
   }
   static addHook(hook) {
     this.hooks.push(hook);

package/lib/cli/templates/models.ts

@@ -12,7 +12,29 @@ const adapter = new PrismaMariaDb({
   password: dbUri.password,
   database: dbUri.pathname.slice(1),
 });
-export const prismaClient = new PrismaClient({ adapter });
+export const prismaClient = new PrismaClient({ adapter })
+  // https://github.com/prisma/prisma/issues/7550#issuecomment-2437006346
+  .$extends({
+    name: 'findManyAndCount',
+    model: {
+      $allModels: {
+        findManyAndCount<Model, Args>(
+          this: Model,
+          args: Prisma.Exact<Args, Prisma.Args<Model, 'findMany'>>,
+        ): Promise<{
+          data: Prisma.Result<Model, Args, 'findMany'>;
+          total: number;
+        }> {
+          return prismaClient
+            .$transaction([
+              (this as any).findMany(args),
+              (this as any).count({ where: (args as any).where }),
+            ])
+            .then(([data, total]: any) => ({ data, total }));
+        },
+      },
+    },
+  });
 
 x.dispose.add(() => prismaClient.$disconnect());
 

package/lib/core/handler.d.ts

@@ -6,6 +6,7 @@ export declare class Handler<TReqData extends any = void, TResData extends any =
     readonly options: XHandler.Options<TReqData, TResData, TReqMethod>;
     private requestDataSchema;
     readonly requestDataSchemaVae: vae.VaeSchemaOf<TReqDataRequired>;
+    private requestHandle;
     constructor(options: XHandler.Options<TReqData, TResData, TReqMethod>);
     handle: XHandler.Handle<TReqData, TResData, TReqMethod>;
     private handleHttp;

package/lib/core/handler.js

@@ -1,6 +1,6 @@
 import { HTTPError as GotHTTPError, ParseError as GotParseError, RequestError as GotRequestError, TimeoutError as GotTimeoutError } from 'got';
 import LZString from 'lz-string';
-import { base64UrlEncode, DataPacker, rot13, toSingleLineString } from 'vtils';
+import { asyncLimit, base64UrlEncode, DataPacker, rot13, toSingleLineString } from 'vtils';
 import * as vae from 'vtils/vae';
 import { getZhCN, yup } from 'vtils/validator';
 import { HttpError } from "../core/http_error";
@@ -16,6 +16,7 @@ export class Handler {
     this.options = options;
     this.requestDataSchema = void 0;
     this.requestDataSchemaVae = void 0;
+    this.requestHandle = void 0;
     this.handle = async (data, ctx) => {
       // 前置 hook
       if (Handler.hooks.length) {
@@ -66,7 +67,7 @@ export class Handler {
         }
       }
       try {
-        let res = await this.options.handle(data, ctx);
+        let res = await this.requestHandle(data, ctx);
         if (res instanceof HttpRedirect) {
           ctx.redirect(res.url, res.permanently);
           return {};
@@ -182,6 +183,24 @@ export class Handler {
     } else if (options.requestDataSchema) {
       this.requestDataSchema = options.requestDataSchema(yup);
     }
+    if (options.concurrency != null) {
+      if (typeof options.concurrency === 'number') {
+        this.requestHandle = asyncLimit(async (data, ctx) => options.handle(data, ctx), {
+          concurrency: options.concurrency
+        });
+      } else {
+        const {
+          count,
+          groupBy
+        } = options.concurrency;
+        this.requestHandle = asyncLimit(async (data, ctx) => options.handle(data, ctx), {
+          concurrency: count,
+          groupBy: groupBy
+        });
+      }
+    } else {
+      this.requestHandle = options.handle;
+    }
   }
   static addHook(hook) {
     this.hooks.push(hook);

package/lib/core/types.d.ts

@@ -167,6 +167,15 @@ export declare namespace XHandler {
          * @default 默认为服务的设置
          */
         useAsyncContext?: boolean;
+        /**
+         * 并发控制
+         */
+        concurrency?: number | {
+            /** 并发数量 */
+            count?: number;
+            /** 分组函数 */
+            groupBy?: (data: TReqData, ctx: Context) => string;
+        };
         /**
          * 处理器
          */

package/lib/types/dto.d.ts

@@ -1,4 +1,4 @@
-import { Merge, OmitStrict, PartialBy, RequiredBy, RequiredDeep, Simplify } from 'vtils/types';
+import type { Merge, OmitStrict, PartialBy, RequiredBy, RequiredDeep, Simplify } from 'vtils/types';
 /** 选中的必填，同时能将部分选填，并能覆盖 */
 export type MakeDtoRequired<TRawData extends Record<any, any>, TPickKey extends keyof TRawData = never, TPartialKey extends [TPickKey] extends [never] ? keyof TRawData : TPickKey = never, TOverride extends {
     [K in [TPickKey] extends [never] ? keyof TRawData : TPickKey]?: any;
@@ -79,3 +79,8 @@ export type MakeDtoIncludeWithRequiredAndPartial<TRawData extends Record<any, an
 } = never> = Simplify<Merge<PartialBy<RequiredBy<Pick<TRawData, TIncludeKey>, TRequiredKey>, TPartialKey>, [
     TOverride
 ] extends [never] ? {} : TOverride>>;
+/** 添加分页参数 */
+export type MakeDtoWithPagination<TRawData extends Record<any, any>> = TRawData & {
+    pageNumber: number;
+    pageSize: number;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.112.0",
+  "version": "2.114.0",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",
@@ -79,7 +79,7 @@
     "unplugin-macros": "^0.16.0",
     "utf-8-validate": "^5.0.9",
     "vscode-generate-index-standalone": "^1.7.1",
-    "vtils": "^4.136.0",
+    "vtils": "^4.138.0",
     "yaml": "^2.3.1",
     "yargs": "^17.4.1"
   },