@kevisual/router 0.0.76 → 0.0.78

package/dist/app.js

@@ -16925,7 +16925,7 @@ var extractArgs = (args) => {
   }
   return args || {};
 };
-var toJSONSchema2 = (route) => {
+var toJSONSchemaRoute = (route) => {
   const pickValues = pick(route, pickValue);
   if (pickValues?.metadata?.args) {
     let args = pickValues.metadata.args;
@@ -16944,22 +16944,46 @@ var toJSONSchema2 = (route) => {
   }
   return pickValues;
 };
-var fromJSONSchema2 = (route) => {
-  const args = route?.metadata?.args;
-  if (!args)
-    return route;
-  if (args["$schema"] || args.type === "object" && args.properties && typeof args.properties === "object") {
-    route.metadata.args = exports_external.fromJSONSchema(args);
-    return route;
-  }
+var toJSONSchema2 = (args) => {
+  args = extractArgs(args);
   const keys = Object.keys(args);
   const newArgs = {};
   for (let key of keys) {
     const item = args[key];
-    newArgs[key] = exports_external.fromJSONSchema(item);
+    if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
+      newArgs[key] = item.toJSONSchema();
+    } else {
+      newArgs[key] = args[key];
+    }
+  }
+  return newArgs;
+};
+var fromJSONSchema2 = (args = {}, opts) => {
+  let resultArgs = null;
+  const mergeObject = opts?.mergeObject ?? true;
+  if (args["$schema"] || args.type === "object" && args.properties && typeof args.properties === "object") {
+    const objectSchema = exports_external.fromJSONSchema(args);
+    const extract = extractArgs(objectSchema);
+    const keys = Object.keys(extract);
+    const newArgs = {};
+    for (let key of keys) {
+      newArgs[key] = extract[key];
+    }
+    resultArgs = newArgs;
+  }
+  if (!resultArgs) {
+    const keys = Object.keys(args);
+    const newArgs = {};
+    for (let key of keys) {
+      const item = args[key];
+      newArgs[key] = exports_external.fromJSONSchema(item).optional();
+    }
+    resultArgs = newArgs;
+  }
+  if (mergeObject) {
+    resultArgs = exports_external.object(resultArgs);
   }
-  route.metadata.args = newArgs;
-  return route;
+  return resultArgs;
 };
 
 class QueryRouter {
@@ -17299,7 +17323,7 @@ class QueryRouter {
           ctx.body = {
             list: list.map((item) => {
               const route = pick(item, ["id", "path", "key", "description", "middleware", "metadata"]);
-              return toJSONSchema2(route);
+              return toJSONSchemaRoute(route);
             }),
             isUser
           };
@@ -19483,7 +19507,7 @@ app
 10. **中间件找不到会返回 404**，错误信息中会包含找不到的中间件列表。
 `;
 // package.json
-var version2 = "0.0.76";
+var version2 = "0.0.77";
 
 // agent/routes/route-create.ts
 app.route({

package/dist/opencode.d.ts

@@ -1,4 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
+import { z } from 'zod';
 import * as http from 'node:http';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
@@ -347,8 +348,16 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-    fromJSONSchema: (route: RouteInfo) => RouteInfo;
+    toJSONSchema: (args: any) => {
+        [key: string]: any;
+    };
+    fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+        mergeObject?: boolean;
+    }) => Merge extends true ? z.ZodObject<{
+        [key: string]: any;
+    }, z.core.$strip> : {
+        [key: string]: z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>;
+    };
 }
 type QueryRouterServerOpts = {
     handleFn?: HandleFn;

package/dist/router-browser.d.ts

@@ -204,8 +204,21 @@ declare class Route<U = {
     }, opts?: AddOpts): void;
     throw(code?: number | string, message?: string, tips?: string): void;
 }
-declare const toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-declare const fromJSONSchema: (route: RouteInfo) => RouteInfo;
+/**
+ * 剥离第一层schema，转换为JSON Schema，无论是skill还是其他的infer比纯粹的zod object schema更合适，因为它可能包含其他的字段，而不仅仅是schema
+ * @param args
+ * @returns
+ */
+declare const toJSONSchema: (args: any) => {
+    [key: string]: any;
+};
+declare const fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+    mergeObject?: boolean;
+}) => Merge extends true ? z.ZodObject<{
+    [key: string]: any;
+}, z.core.$strip> : {
+    [key: string]: z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>;
+};
 /**
  * @parmas overwrite 是否覆盖已存在的route，默认true
  */
@@ -377,8 +390,16 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-    fromJSONSchema: (route: RouteInfo) => RouteInfo;
+    toJSONSchema: (args: any) => {
+        [key: string]: any;
+    };
+    fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+        mergeObject?: boolean;
+    }) => Merge extends true ? z.ZodObject<{
+        [key: string]: any;
+    }, z.core.$strip> : {
+        [key: string]: z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>;
+    };
 }
 type QueryRouterServerOpts = {
     handleFn?: HandleFn;

package/dist/router-browser.js

@@ -14089,7 +14089,7 @@ var extractArgs = (args) => {
   }
   return args || {};
 };
-var toJSONSchema2 = (route) => {
+var toJSONSchemaRoute = (route) => {
   const pickValues = pick(route, pickValue);
   if (pickValues?.metadata?.args) {
     let args = pickValues.metadata.args;
@@ -14108,22 +14108,46 @@ var toJSONSchema2 = (route) => {
   }
   return pickValues;
 };
-var fromJSONSchema2 = (route) => {
-  const args = route?.metadata?.args;
-  if (!args)
-    return route;
-  if (args["$schema"] || args.type === "object" && args.properties && typeof args.properties === "object") {
-    route.metadata.args = exports_external.fromJSONSchema(args);
-    return route;
-  }
+var toJSONSchema2 = (args) => {
+  args = extractArgs(args);
   const keys = Object.keys(args);
   const newArgs = {};
   for (let key of keys) {
     const item = args[key];
-    newArgs[key] = exports_external.fromJSONSchema(item);
+    if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
+      newArgs[key] = item.toJSONSchema();
+    } else {
+      newArgs[key] = args[key];
+    }
+  }
+  return newArgs;
+};
+var fromJSONSchema2 = (args = {}, opts) => {
+  let resultArgs = null;
+  const mergeObject = opts?.mergeObject ?? true;
+  if (args["$schema"] || args.type === "object" && args.properties && typeof args.properties === "object") {
+    const objectSchema = exports_external.fromJSONSchema(args);
+    const extract = extractArgs(objectSchema);
+    const keys = Object.keys(extract);
+    const newArgs = {};
+    for (let key of keys) {
+      newArgs[key] = extract[key];
+    }
+    resultArgs = newArgs;
+  }
+  if (!resultArgs) {
+    const keys = Object.keys(args);
+    const newArgs = {};
+    for (let key of keys) {
+      const item = args[key];
+      newArgs[key] = exports_external.fromJSONSchema(item).optional();
+    }
+    resultArgs = newArgs;
+  }
+  if (mergeObject) {
+    resultArgs = exports_external.object(resultArgs);
   }
-  route.metadata.args = newArgs;
-  return route;
+  return resultArgs;
 };
 
 class QueryRouter {
@@ -14463,7 +14487,7 @@ class QueryRouter {
           ctx.body = {
             list: list.map((item) => {
               const route = pick(item, ["id", "path", "key", "description", "middleware", "metadata"]);
-              return toJSONSchema2(route);
+              return toJSONSchemaRoute(route);
             }),
             isUser
           };

package/dist/router-define.d.ts

@@ -1,4 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
+import { z } from 'zod';
 import { Query, DataOpts, Result } from '@kevisual/query/query';
 
 declare class MockProcess {
@@ -344,8 +345,16 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-    fromJSONSchema: (route: RouteInfo) => RouteInfo;
+    toJSONSchema: (args: any) => {
+        [key: string]: any;
+    };
+    fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+        mergeObject?: boolean;
+    }) => Merge extends true ? z.ZodObject<{
+        [key: string]: any;
+    }, z.core.$strip> : {
+        [key: string]: z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>;
+    };
 }
 type QueryRouterServerOpts = {
     handleFn?: HandleFn;

package/dist/router.d.ts

@@ -210,8 +210,21 @@ declare class Route<U = {
     }, opts?: AddOpts): void;
     throw(code?: number | string, message?: string, tips?: string): void;
 }
-declare const toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-declare const fromJSONSchema: (route: RouteInfo) => RouteInfo;
+/**
+ * 剥离第一层schema，转换为JSON Schema，无论是skill还是其他的infer比纯粹的zod object schema更合适，因为它可能包含其他的字段，而不仅仅是schema
+ * @param args
+ * @returns
+ */
+declare const toJSONSchema: (args: any) => {
+    [key: string]: any;
+};
+declare const fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+    mergeObject?: boolean;
+}) => Merge extends true ? z.ZodObject<{
+    [key: string]: any;
+}, z.core.$strip> : {
+    [key: string]: z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>;
+};
 /**
  * @parmas overwrite 是否覆盖已存在的route，默认true
  */
@@ -383,8 +396,16 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-    fromJSONSchema: (route: RouteInfo) => RouteInfo;
+    toJSONSchema: (args: any) => {
+        [key: string]: any;
+    };
+    fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+        mergeObject?: boolean;
+    }) => Merge extends true ? z.ZodObject<{
+        [key: string]: any;
+    }, z.core.$strip> : {
+        [key: string]: z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>;
+    };
 }
 type QueryRouterServerOpts = {
     handleFn?: HandleFn;

package/dist/router.js

@@ -16922,7 +16922,7 @@ var extractArgs = (args) => {
   }
   return args || {};
 };
-var toJSONSchema2 = (route) => {
+var toJSONSchemaRoute = (route) => {
   const pickValues = pick(route, pickValue);
   if (pickValues?.metadata?.args) {
     let args = pickValues.metadata.args;
@@ -16941,22 +16941,46 @@ var toJSONSchema2 = (route) => {
   }
   return pickValues;
 };
-var fromJSONSchema2 = (route) => {
-  const args = route?.metadata?.args;
-  if (!args)
-    return route;
-  if (args["$schema"] || args.type === "object" && args.properties && typeof args.properties === "object") {
-    route.metadata.args = exports_external.fromJSONSchema(args);
-    return route;
-  }
+var toJSONSchema2 = (args) => {
+  args = extractArgs(args);
   const keys = Object.keys(args);
   const newArgs = {};
   for (let key of keys) {
     const item = args[key];
-    newArgs[key] = exports_external.fromJSONSchema(item);
+    if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
+      newArgs[key] = item.toJSONSchema();
+    } else {
+      newArgs[key] = args[key];
+    }
+  }
+  return newArgs;
+};
+var fromJSONSchema2 = (args = {}, opts) => {
+  let resultArgs = null;
+  const mergeObject = opts?.mergeObject ?? true;
+  if (args["$schema"] || args.type === "object" && args.properties && typeof args.properties === "object") {
+    const objectSchema = exports_external.fromJSONSchema(args);
+    const extract = extractArgs(objectSchema);
+    const keys = Object.keys(extract);
+    const newArgs = {};
+    for (let key of keys) {
+      newArgs[key] = extract[key];
+    }
+    resultArgs = newArgs;
+  }
+  if (!resultArgs) {
+    const keys = Object.keys(args);
+    const newArgs = {};
+    for (let key of keys) {
+      const item = args[key];
+      newArgs[key] = exports_external.fromJSONSchema(item).optional();
+    }
+    resultArgs = newArgs;
+  }
+  if (mergeObject) {
+    resultArgs = exports_external.object(resultArgs);
   }
-  route.metadata.args = newArgs;
-  return route;
+  return resultArgs;
 };
 
 class QueryRouter {
@@ -17296,7 +17320,7 @@ class QueryRouter {
           ctx.body = {
             list: list.map((item) => {
               const route = pick(item, ["id", "path", "key", "description", "middleware", "metadata"]);
-              return toJSONSchema2(route);
+              return toJSONSchemaRoute(route);
             }),
             isUser
           };

package/dist/ws.d.ts

@@ -1,4 +1,5 @@
 import { EventEmitter } from 'eventemitter3';
+import { z } from 'zod';
 import * as http from 'node:http';
 import { IncomingMessage, ServerResponse } from 'node:http';
 import { IncomingMessage as IncomingMessage$1, ServerResponse as ServerResponse$1 } from 'http';
@@ -394,8 +395,16 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (route: RouteInfo) => Pick<RouteInfo, "path" | "key" | "id" | "description" | "type" | "middleware" | "metadata">;
-    fromJSONSchema: (route: RouteInfo) => RouteInfo;
+    toJSONSchema: (args: any) => {
+        [key: string]: any;
+    };
+    fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+        mergeObject?: boolean;
+    }) => Merge extends true ? z.ZodObject<{
+        [key: string]: any;
+    }, z.core.$strip> : {
+        [key: string]: z.ZodType<unknown, unknown, z.core.$ZodTypeInternals<unknown, unknown>>;
+    };
 }
 interface HandleFn<T = any> {
     (msg: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@kevisual/router",
-  "version": "0.0.76",
+  "version": "0.0.78",
   "description": "",
   "type": "module",
   "main": "./dist/router.js",
@@ -27,7 +27,7 @@
     "@kevisual/dts": "^0.0.4",
     "@kevisual/js-filter": "^0.0.5",
     "@kevisual/local-proxy": "^0.0.8",
-    "@kevisual/query": "^0.0.46",
+    "@kevisual/query": "^0.0.47",
     "@kevisual/use-config": "^1.0.30",
     "@opencode-ai/plugin": "^1.2.6",
     "@types/bun": "^1.3.9",

package/src/route.ts

@@ -252,7 +252,7 @@ export const extractArgs = (args: any) => {
   return args || {};
 };
 
-export const toJSONSchema = (route: RouteInfo) => {
+const toJSONSchemaRoute = (route: RouteInfo) => {
   const pickValues = pick(route, pickValue as any);
   if (pickValues?.metadata?.args) {
     let args = pickValues.metadata.args;
@@ -273,23 +273,63 @@ export const toJSONSchema = (route: RouteInfo) => {
   }
   return pickValues;
 }
-
-export const fromJSONSchema = (route: RouteInfo): RouteInfo => {
+const fromJSONSchemaRoute = (route: RouteInfo): RouteInfo => {
   const args = route?.metadata?.args;
   if (!args) return route;
-  if (args["$schema"] || (args.type === 'object' && args.properties && typeof args.properties === 'object')) {
-    // 可能是整个schema
-    route.metadata.args = z.fromJSONSchema(args);
-    return route;
-  }
+  const newArgs = fromJSONSchema(args);
+  route.metadata.args = newArgs;
+  return route;
+}
+
+/**
+ * 剥离第一层schema，转换为JSON Schema，无论是skill还是其他的infer比纯粹的zod object schema更合适，因为它可能包含其他的字段，而不仅仅是schema
+ * @param args 
+ * @returns 
+ */
+export const toJSONSchema = (args: any): { [key: string]: any } => {
+  // 如果 args 本身是一个 zod object schema，先提取 shape
+  args = extractArgs(args);
   const keys = Object.keys(args);
   const newArgs: { [key: string]: any } = {};
   for (let key of keys) {
-    const item = args[key];
-    newArgs[key] = z.fromJSONSchema(item);
+    const item = args[key] as z.ZodAny;
+    if (item && typeof item === 'object' && typeof item.toJSONSchema === 'function') {
+      newArgs[key] = item.toJSONSchema();
+    } else {
+      newArgs[key] = args[key]; // 可能不是schema
+    }
   }
-  route.metadata.args = newArgs;
-  return route;
+  return newArgs;
+}
+export const fromJSONSchema = <Merge extends boolean = true>(args: any = {}, opts?: { mergeObject?: boolean }) => {
+  let resultArgs: any = null;
+  const mergeObject = opts?.mergeObject ?? true;
+  if (args["$schema"] || (args.type === 'object' && args.properties && typeof args.properties === 'object')) {
+    // 可能是整个schema
+    const objectSchema = z.fromJSONSchema(args);
+    const extract = extractArgs(objectSchema);
+    const keys = Object.keys(extract);
+    const newArgs: { [key: string]: any } = {};
+    for (let key of keys) {
+      newArgs[key] = extract[key];
+    }
+    resultArgs = newArgs;
+  }
+  if (!resultArgs) {
+    const keys = Object.keys(args);
+    const newArgs: { [key: string]: any } = {};
+    for (let key of keys) {
+      const item = args[key];
+      // fromJSONSchema 可能会失败，所以先 optional，等使用的时候再验证
+      newArgs[key] = z.fromJSONSchema(item).optional();
+    }
+    resultArgs = newArgs;
+  }
+  if (mergeObject) {
+    resultArgs = z.object(resultArgs);
+  }
+  type ResultArgs = Merge extends true ? z.ZodObject<{ [key: string]: any }> : { [key: string]: z.ZodTypeAny };
+  return resultArgs as unknown as ResultArgs;
 }
 
 /**
@@ -698,7 +738,7 @@ export class QueryRouter {
           ctx.body = {
             list: list.map((item) => {
               const route = pick(item, ['id', 'path', 'key', 'description', 'middleware', 'metadata'] as const);
-              return toJSONSchema(route);
+              return toJSONSchemaRoute(route);
             }),
             isUser
           };

package/src/test/schema.ts

@@ -0,0 +1,14 @@
+import { toJSONSchema, fromJSONSchema } from "@/route.ts";
+import { z } from "zod";
+const schema = z.object({
+  name: z.string(),
+  age: z.number(),
+
+});
+// console.log("schema", schema);
+const jsonSchema = toJSONSchema(schema);
+console.log("jsonSchema", jsonSchema);
+
+const newSchema = fromJSONSchema<true>(jsonSchema, { mergeObject: true });
+console.log("newSchema shape", Object.keys(newSchema.shape));
+console.log('check', newSchema.safeParse({ name: "Alice", age: "30" })?.success);