@kevisual/router 0.0.77 → 0.0.79

package/dist/app.js

@@ -16944,10 +16944,20 @@ var toJSONSchemaRoute = (route) => {
   }
   return pickValues;
 };
-var toJSONSchema2 = (args) => {
+var toJSONSchema2 = (args, opts) => {
+  const mergeObject = opts?.mergeObject ?? true;
+  if (!args)
+    return {};
+  if (mergeObject) {
+    if (typeof args === "object" && typeof args.toJSONSchema === "function") {
+      return args.toJSONSchema();
+    }
+    const schema = exports_external.object(args);
+    return schema.toJSONSchema();
+  }
   args = extractArgs(args);
   const keys = Object.keys(args);
-  const newArgs = {};
+  let newArgs = {};
   for (let key of keys) {
     const item = args[key];
     if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
@@ -16976,7 +16986,7 @@ var fromJSONSchema2 = (args = {}, opts) => {
     const newArgs = {};
     for (let key of keys) {
       const item = args[key];
-      newArgs[key] = exports_external.fromJSONSchema(item);
+      newArgs[key] = exports_external.fromJSONSchema(item).optional();
     }
     resultArgs = newArgs;
   }
@@ -19507,7 +19517,7 @@ app
 10. **中间件找不到会返回 404**，错误信息中会包含找不到的中间件列表。
 `;
 // package.json
-var version2 = "0.0.77";
+var version2 = "0.0.78";
 
 // agent/routes/route-create.ts
 app.route({

package/dist/opencode.d.ts

@@ -348,7 +348,9 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (args: any) => {
+    toJSONSchema: (args: any, opts?: {
+        mergeObject?: boolean;
+    }) => {
         [key: string]: any;
     };
     fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {

package/dist/router-browser.d.ts

@@ -209,7 +209,9 @@ declare class Route<U = {
  * @param args
  * @returns
  */
-declare const toJSONSchema: (args: any) => {
+declare const toJSONSchema: (args: any, opts?: {
+    mergeObject?: boolean;
+}) => {
     [key: string]: any;
 };
 declare const fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
@@ -390,7 +392,9 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (args: any) => {
+    toJSONSchema: (args: any, opts?: {
+        mergeObject?: boolean;
+    }) => {
         [key: string]: any;
     };
     fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {

package/dist/router-browser.js

@@ -14108,10 +14108,20 @@ var toJSONSchemaRoute = (route) => {
   }
   return pickValues;
 };
-var toJSONSchema2 = (args) => {
+var toJSONSchema2 = (args, opts) => {
+  const mergeObject = opts?.mergeObject ?? true;
+  if (!args)
+    return {};
+  if (mergeObject) {
+    if (typeof args === "object" && typeof args.toJSONSchema === "function") {
+      return args.toJSONSchema();
+    }
+    const schema = exports_external.object(args);
+    return schema.toJSONSchema();
+  }
   args = extractArgs(args);
   const keys = Object.keys(args);
-  const newArgs = {};
+  let newArgs = {};
   for (let key of keys) {
     const item = args[key];
     if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
@@ -14140,7 +14150,7 @@ var fromJSONSchema2 = (args = {}, opts) => {
     const newArgs = {};
     for (let key of keys) {
       const item = args[key];
-      newArgs[key] = exports_external.fromJSONSchema(item);
+      newArgs[key] = exports_external.fromJSONSchema(item).optional();
     }
     resultArgs = newArgs;
   }

package/dist/router-define.d.ts

@@ -345,7 +345,9 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (args: any) => {
+    toJSONSchema: (args: any, opts?: {
+        mergeObject?: boolean;
+    }) => {
         [key: string]: any;
     };
     fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {

package/dist/router.d.ts

@@ -215,7 +215,9 @@ declare class Route<U = {
  * @param args
  * @returns
  */
-declare const toJSONSchema: (args: any) => {
+declare const toJSONSchema: (args: any, opts?: {
+    mergeObject?: boolean;
+}) => {
     [key: string]: any;
 };
 declare const fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
@@ -396,7 +398,9 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (args: any) => {
+    toJSONSchema: (args: any, opts?: {
+        mergeObject?: boolean;
+    }) => {
         [key: string]: any;
     };
     fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {

package/dist/router.js

@@ -16941,10 +16941,20 @@ var toJSONSchemaRoute = (route) => {
   }
   return pickValues;
 };
-var toJSONSchema2 = (args) => {
+var toJSONSchema2 = (args, opts) => {
+  const mergeObject = opts?.mergeObject ?? true;
+  if (!args)
+    return {};
+  if (mergeObject) {
+    if (typeof args === "object" && typeof args.toJSONSchema === "function") {
+      return args.toJSONSchema();
+    }
+    const schema = exports_external.object(args);
+    return schema.toJSONSchema();
+  }
   args = extractArgs(args);
   const keys = Object.keys(args);
-  const newArgs = {};
+  let newArgs = {};
   for (let key of keys) {
     const item = args[key];
     if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
@@ -16973,7 +16983,7 @@ var fromJSONSchema2 = (args = {}, opts) => {
     const newArgs = {};
     for (let key of keys) {
       const item = args[key];
-      newArgs[key] = exports_external.fromJSONSchema(item);
+      newArgs[key] = exports_external.fromJSONSchema(item).optional();
     }
     resultArgs = newArgs;
   }

package/dist/ws.d.ts

@@ -395,7 +395,9 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (args: any) => {
+    toJSONSchema: (args: any, opts?: {
+        mergeObject?: boolean;
+    }) => {
         [key: string]: any;
     };
     fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.77",
+  "version": "0.0.79",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",

package/src/route.ts

@@ -3,6 +3,7 @@ import { pick } from './utils/pick.ts';
 import { listenProcess, MockProcess } from './utils/listen-process.ts';
 import { z } from 'zod';
 import { randomId } from './utils/random.ts';
+import { ar } from 'zod/v4/locales';
 export type RouterContextT = { code?: number;[key: string]: any };
 export type RouteContext<T = { code?: number }, S = any> = {
   /**
@@ -245,7 +246,7 @@ export class Route<U = { [key: string]: any }, T extends SimpleObject = SimpleOb
     throw new CustomError(...args);
   }
 }
-export const extractArgs = (args: any) => {
+const extractArgs = (args: any) => {
   if (args && typeof args === 'object' && typeof args.shape === 'object') {
     return args.shape as z.ZodRawShape;
   }
@@ -286,11 +287,20 @@ const fromJSONSchemaRoute = (route: RouteInfo): RouteInfo => {
  * @param args 
  * @returns 
  */
-export const toJSONSchema = (args: any): { [key: string]: any } => {
+export const toJSONSchema = (args: any, opts?: { mergeObject?: boolean }): { [key: string]: any } => {
+  const mergeObject = opts?.mergeObject ?? true;
+  if (!args) return {};
+  if (mergeObject) {
+    if (typeof args === 'object' && typeof args.toJSONSchema === 'function') {
+      return args.toJSONSchema();
+    }
+    const schema = z.object(args);
+    return schema.toJSONSchema();
+  }
   // 如果 args 本身是一个 zod object schema，先提取 shape
   args = extractArgs(args);
   const keys = Object.keys(args);
-  const newArgs: { [key: string]: any } = {};
+  let newArgs: { [key: string]: any } = {};
   for (let key of keys) {
     const item = args[key] as z.ZodAny;
     if (item && typeof item === 'object' && typeof item.toJSONSchema === 'function') {
@@ -320,7 +330,8 @@ export const fromJSONSchema = <Merge extends boolean = true>(args: any = {}, opt
     const newArgs: { [key: string]: any } = {};
     for (let key of keys) {
       const item = args[key];
-      newArgs[key] = z.fromJSONSchema(item);
+      // fromJSONSchema 可能会失败，所以先 optional，等使用的时候再验证
+      newArgs[key] = z.fromJSONSchema(item).optional();
     }
     resultArgs = newArgs;
   }