@jayfong/x-server 2.106.4 → 2.106.6

package/lib/_cjs/cli/cli.js

@@ -301,11 +301,12 @@ _yargs.default.command('dev', '开始开发', _ => _.positional('index', {
       const schemaDir = _nodePath.default.join(process.cwd(), 'src/db/schema');
       const isMultipleFiles = await _fsExtra.default.pathExists(schemaDir);
       const schemaArg = isMultipleFiles ? 'src/db' : 'src/db/schema.prisma';
-      await (0, _execa.default)('tnpx', ['prisma', ...argv._.slice(1), '--schema', schemaArg], {
+      const prismaArgs = argv._.slice(1);
+      await (0, _execa.default)('tnpx', ['prisma', ...prismaArgs, '--schema', schemaArg], {
         cwd: process.cwd(),
         stdio: 'inherit'
       });
-      if (!argv.production) {
+      if (!argv.production && prismaArgs[0] === 'generate') {
         await _template_util.TemplateUtil.initModels(process.cwd());
       }
     }

package/lib/cli/cli.js

@@ -297,11 +297,12 @@ yargs.command('dev', '开始开发', _ => _.positional('index', {
       const schemaDir = path.join(process.cwd(), 'src/db/schema');
       const isMultipleFiles = await fs.pathExists(schemaDir);
       const schemaArg = isMultipleFiles ? 'src/db' : 'src/db/schema.prisma';
-      await execa('tnpx', ['prisma', ...argv._.slice(1), '--schema', schemaArg], {
+      const prismaArgs = argv._.slice(1);
+      await execa('tnpx', ['prisma', ...prismaArgs, '--schema', schemaArg], {
         cwd: process.cwd(),
         stdio: 'inherit'
       });
-      if (!argv.production) {
+      if (!argv.production && prismaArgs[0] === 'generate') {
         await TemplateUtil.initModels(process.cwd());
       }
     }

package/lib/core/types.d.ts

@@ -1,15 +1,15 @@
-import type { IncomingHttpHeaders } from 'http';
+import type { IncomingHttpHeaders } from 'node:http';
 import type { MultipartFile } from '@fastify/multipart';
 import type { SocketStream } from '@fastify/websocket';
 import type { Queue } from 'bull';
-import { CronJob } from 'cron';
-import { FastifyReply, FastifyRequest, FastifyServerOptions } from 'fastify';
+import type { CronJob } from 'cron';
+import type { FastifyReply, FastifyRequest, FastifyServerOptions } from 'fastify';
 import type { MsValue } from 'vtils';
 import type { AsyncOrSync, LiteralUnion, OneOrMore, RequiredDeep } from 'vtils/types';
-import * as vae from 'vtils/vae';
-import { yup } from 'vtils/validator';
-import { BasePlugin } from '../plugins/base';
-import { BaseService } from '../services/base';
+import type * as vae from 'vtils/vae';
+import type { yup } from 'vtils/validator';
+import type { BasePlugin } from '../plugins/base';
+import type { BaseService } from '../services/base';
 import type { DisposeService } from '../services/dispose';
 import type { Handler } from './handler';
 export declare namespace XServer {
@@ -117,7 +117,7 @@ export declare namespace XHandler {
     ctx: Context) => AsyncOrSync<TResData>;
     interface ExtraOptions {
     }
-    interface Options<TReqData extends any = void, TResData extends any = void, TReqMethod extends Method = Method> extends ExtraOptions {
+    interface Options<TReqData extends any = void, TResData extends any = void, TReqMethod extends Method = Method, TReqDataRequired = RequiredDeep<TReqData>> extends ExtraOptions {
         /**
          * 请求方法
          *
@@ -156,11 +156,11 @@ export declare namespace XHandler {
         /**
          * 请求数据验证结构(yup)
          */
-        requestDataSchema?: (_: typeof yup) => yup.GetSchema<RequiredDeep<TReqData>>;
+        requestDataSchema?: (_: typeof yup) => yup.GetSchema<TReqDataRequired>;
         /**
          * 请求数据验证结构(vae)
          */
-        requestDataSchemaVae?: vae.VaeSchemaOf<TReqData> | ((_: vae.VaeSchemaBuilder<TReqData>) => vae.VaeSchemaOf<TReqData> | vae.VaeObjectSchemaShapeOf<TReqData>);
+        requestDataSchemaVae?: vae.VaeSchemaOf<TReqDataRequired> | ((_: vae.VaeSchemaBuilder<TReqDataRequired>) => vae.VaeSchemaOf<TReqDataRequired> | vae.VaeObjectSchemaShapeOf<TReqDataRequired>);
         /**
          * 是否使用异步上下文
          *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.106.4",
+  "version": "2.106.6",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",