@kevisual/router 0.0.78 → 0.0.80

package/dist/app.js

@@ -16796,6 +16796,92 @@ var randomId = (length = 8, affix = "") => {
   return affix + nanoid3(length);
 };
 
+// src/validator/schema.ts
+var extractArgs = (args) => {
+  if (args && typeof args === "object" && typeof args.shape === "object") {
+    return args.shape;
+  }
+  return args || {};
+};
+var toJSONSchema2 = (args, opts) => {
+  const mergeObject = opts?.mergeObject ?? false;
+  if (!args)
+    return {};
+  const _override = ({ jsonSchema, path, zodSchema }) => {
+    if (Array.isArray(path) && path.length > 0) {
+      return;
+    }
+    const isOptional = zodSchema.isOptional?.();
+    if (isOptional) {
+      jsonSchema.optional = true;
+    }
+  };
+  const isError = (keys2) => {
+    const errorKeys = ["toJSONSchema", "def", "type", "parse"];
+    const hasErrorKeys = errorKeys.every((key) => keys2.includes(key));
+    return hasErrorKeys;
+  };
+  const override = opts?.override || _override;
+  if (mergeObject) {
+    if (typeof args === "object" && typeof args.toJSONSchema === "function") {
+      return args.toJSONSchema();
+    }
+    if (isError(Object.keys(args))) {
+      return {};
+    }
+    const schema = exports_external.object(args);
+    return schema.toJSONSchema();
+  }
+  args = extractArgs(args);
+  let keys = Object.keys(args);
+  if (isError(keys)) {
+    console.error(`[toJSONSchema error]: 解析到的 schema 可能不正确，包含了zod默认的value的schema. 请检查输入的 schema 是否正确。`);
+    args = {};
+    keys = [];
+  }
+  if (mergeObject) {}
+  let newArgs = {};
+  for (let key of keys) {
+    const item = args[key];
+    if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
+      newArgs[key] = item.toJSONSchema({ override });
+    } else {
+      newArgs[key] = args[key];
+    }
+  }
+  return newArgs;
+};
+var fromJSONSchema2 = (args = {}, opts) => {
+  let resultArgs = null;
+  const mergeObject = opts?.mergeObject ?? false;
+  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);
+      if (item.optional) {
+        newArgs[key] = newArgs[key].optional();
+      }
+    }
+    resultArgs = newArgs;
+  }
+  if (mergeObject) {
+    resultArgs = exports_external.object(resultArgs);
+  }
+  return resultArgs;
+};
+
 // src/route.ts
 var pickValue = ["path", "key", "id", "description", "type", "middleware", "metadata"];
 var tool = {
@@ -16919,72 +17005,15 @@ class Route {
     throw new CustomError(...args);
   }
 }
-var extractArgs = (args) => {
-  if (args && typeof args === "object" && typeof args.shape === "object") {
-    return args.shape;
-  }
-  return args || {};
-};
 var toJSONSchemaRoute = (route) => {
   const pickValues = pick(route, pickValue);
   if (pickValues?.metadata?.args) {
-    let args = pickValues.metadata.args;
-    args = extractArgs(args);
-    const keys = Object.keys(args);
-    const newArgs = {};
-    for (let key of keys) {
-      const item = args[key];
-      if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
-        newArgs[key] = item.toJSONSchema();
-      } else {
-        newArgs[key] = args[key];
-      }
-    }
-    pickValues.metadata.args = newArgs;
+    pickValues.metadata.args = toJSONSchema3(pickValues?.metadata?.args, { mergeObject: false });
   }
   return pickValues;
 };
-var toJSONSchema2 = (args) => {
-  args = extractArgs(args);
-  const keys = Object.keys(args);
-  const newArgs = {};
-  for (let key of keys) {
-    const item = args[key];
-    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);
-  }
-  return resultArgs;
-};
+var toJSONSchema3 = toJSONSchema2;
+var fromJSONSchema3 = fromJSONSchema2;
 
 class QueryRouter {
   appId = "";
@@ -17238,20 +17267,6 @@ class QueryRouter {
   getList(filter) {
     return this.routes.filter(filter || (() => true)).map((r) => {
       const pickValues = pick(r, pickValue);
-      if (pickValues?.metadata?.args) {
-        const args = pickValues.metadata.args;
-        const keys = Object.keys(args);
-        const newArgs = {};
-        for (let key of keys) {
-          const item = args[key];
-          if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
-            newArgs[key] = item.toJSONSchema();
-          } else {
-            newArgs[key] = args[key];
-          }
-        }
-        pickValues.metadata.args = newArgs;
-      }
       return pickValues;
     });
   }
@@ -17339,8 +17354,8 @@ class QueryRouter {
     }
     return listenProcess({ app: this, params, ...opts });
   }
-  toJSONSchema = toJSONSchema2;
-  fromJSONSchema = fromJSONSchema2;
+  toJSONSchema = toJSONSchema3;
+  fromJSONSchema = fromJSONSchema3;
 }
 
 // src/server/server.ts
@@ -19507,7 +19522,7 @@ app
 10. **中间件找不到会返回 404**，错误信息中会包含找不到的中间件列表。
 `;
 // package.json
-var version2 = "0.0.77";
+var version2 = "0.0.80";
 
 // agent/routes/route-create.ts
 app.route({

package/dist/opencode.d.ts

@@ -348,10 +348,17 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (args: any) => {
+    toJSONSchema: (args: any, opts?: {
+        mergeObject?: boolean;
+        override?: (opts: {
+            jsonSchema: any;
+            path: string[];
+            zodSchema: z.ZodTypeAny;
+        }) => void;
+    }) => {
         [key: string]: any;
     };
-    fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+    fromJSONSchema: <Merge extends boolean = false>(args?: any, opts?: {
         mergeObject?: boolean;
     }) => Merge extends true ? z.ZodObject<{
         [key: string]: any;

package/dist/router-browser.d.ts

@@ -204,15 +204,17 @@ declare class Route<U = {
     }, opts?: AddOpts): void;
     throw(code?: number | string, message?: string, tips?: string): void;
 }
-/**
- * 剥离第一层schema，转换为JSON Schema，无论是skill还是其他的infer比纯粹的zod object schema更合适，因为它可能包含其他的字段，而不仅仅是schema
- * @param args
- * @returns
- */
-declare const toJSONSchema: (args: any) => {
+declare const toJSONSchema: (args: any, opts?: {
+    mergeObject?: boolean;
+    override?: (opts: {
+        jsonSchema: any;
+        path: string[];
+        zodSchema: z.ZodTypeAny;
+    }) => void;
+}) => {
     [key: string]: any;
 };
-declare const fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+declare const fromJSONSchema: <Merge extends boolean = false>(args?: any, opts?: {
     mergeObject?: boolean;
 }) => Merge extends true ? z.ZodObject<{
     [key: string]: any;
@@ -390,10 +392,17 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (args: any) => {
+    toJSONSchema: (args: any, opts?: {
+        mergeObject?: boolean;
+        override?: (opts: {
+            jsonSchema: any;
+            path: string[];
+            zodSchema: z.ZodTypeAny;
+        }) => void;
+    }) => {
         [key: string]: any;
     };
-    fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+    fromJSONSchema: <Merge extends boolean = false>(args?: any, opts?: {
         mergeObject?: boolean;
     }) => Merge extends true ? z.ZodObject<{
         [key: string]: any;

package/dist/router-browser.js

@@ -13960,6 +13960,92 @@ var randomId = (length = 8, affix = "") => {
   return affix + nanoid3(length);
 };
 
+// src/validator/schema.ts
+var extractArgs = (args) => {
+  if (args && typeof args === "object" && typeof args.shape === "object") {
+    return args.shape;
+  }
+  return args || {};
+};
+var toJSONSchema2 = (args, opts) => {
+  const mergeObject = opts?.mergeObject ?? false;
+  if (!args)
+    return {};
+  const _override = ({ jsonSchema, path, zodSchema }) => {
+    if (Array.isArray(path) && path.length > 0) {
+      return;
+    }
+    const isOptional = zodSchema.isOptional?.();
+    if (isOptional) {
+      jsonSchema.optional = true;
+    }
+  };
+  const isError = (keys2) => {
+    const errorKeys = ["toJSONSchema", "def", "type", "parse"];
+    const hasErrorKeys = errorKeys.every((key) => keys2.includes(key));
+    return hasErrorKeys;
+  };
+  const override = opts?.override || _override;
+  if (mergeObject) {
+    if (typeof args === "object" && typeof args.toJSONSchema === "function") {
+      return args.toJSONSchema();
+    }
+    if (isError(Object.keys(args))) {
+      return {};
+    }
+    const schema = exports_external.object(args);
+    return schema.toJSONSchema();
+  }
+  args = extractArgs(args);
+  let keys = Object.keys(args);
+  if (isError(keys)) {
+    console.error(`[toJSONSchema error]: 解析到的 schema 可能不正确，包含了zod默认的value的schema. 请检查输入的 schema 是否正确。`);
+    args = {};
+    keys = [];
+  }
+  if (mergeObject) {}
+  let newArgs = {};
+  for (let key of keys) {
+    const item = args[key];
+    if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
+      newArgs[key] = item.toJSONSchema({ override });
+    } else {
+      newArgs[key] = args[key];
+    }
+  }
+  return newArgs;
+};
+var fromJSONSchema2 = (args = {}, opts) => {
+  let resultArgs = null;
+  const mergeObject = opts?.mergeObject ?? false;
+  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);
+      if (item.optional) {
+        newArgs[key] = newArgs[key].optional();
+      }
+    }
+    resultArgs = newArgs;
+  }
+  if (mergeObject) {
+    resultArgs = exports_external.object(resultArgs);
+  }
+  return resultArgs;
+};
+
 // src/route.ts
 var pickValue = ["path", "key", "id", "description", "type", "middleware", "metadata"];
 var tool = {
@@ -14083,72 +14169,15 @@ class Route {
     throw new CustomError(...args);
   }
 }
-var extractArgs = (args) => {
-  if (args && typeof args === "object" && typeof args.shape === "object") {
-    return args.shape;
-  }
-  return args || {};
-};
 var toJSONSchemaRoute = (route) => {
   const pickValues = pick(route, pickValue);
   if (pickValues?.metadata?.args) {
-    let args = pickValues.metadata.args;
-    args = extractArgs(args);
-    const keys = Object.keys(args);
-    const newArgs = {};
-    for (let key of keys) {
-      const item = args[key];
-      if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
-        newArgs[key] = item.toJSONSchema();
-      } else {
-        newArgs[key] = args[key];
-      }
-    }
-    pickValues.metadata.args = newArgs;
+    pickValues.metadata.args = toJSONSchema3(pickValues?.metadata?.args, { mergeObject: false });
   }
   return pickValues;
 };
-var toJSONSchema2 = (args) => {
-  args = extractArgs(args);
-  const keys = Object.keys(args);
-  const newArgs = {};
-  for (let key of keys) {
-    const item = args[key];
-    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);
-  }
-  return resultArgs;
-};
+var toJSONSchema3 = toJSONSchema2;
+var fromJSONSchema3 = fromJSONSchema2;
 
 class QueryRouter {
   appId = "";
@@ -14402,20 +14431,6 @@ class QueryRouter {
   getList(filter) {
     return this.routes.filter(filter || (() => true)).map((r) => {
       const pickValues = pick(r, pickValue);
-      if (pickValues?.metadata?.args) {
-        const args = pickValues.metadata.args;
-        const keys = Object.keys(args);
-        const newArgs = {};
-        for (let key of keys) {
-          const item = args[key];
-          if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
-            newArgs[key] = item.toJSONSchema();
-          } else {
-            newArgs[key] = args[key];
-          }
-        }
-        pickValues.metadata.args = newArgs;
-      }
       return pickValues;
     });
   }
@@ -14503,8 +14518,8 @@ class QueryRouter {
     }
     return listenProcess({ app: this, params, ...opts });
   }
-  toJSONSchema = toJSONSchema2;
-  fromJSONSchema = fromJSONSchema2;
+  toJSONSchema = toJSONSchema3;
+  fromJSONSchema = fromJSONSchema3;
 }
 
 class QueryRouterServer extends QueryRouter {
@@ -14743,8 +14758,8 @@ var App = QueryRouterServer;
 export {
   util,
   tool,
-  toJSONSchema2 as toJSONSchema,
-  fromJSONSchema2 as fromJSONSchema,
+  toJSONSchema3 as toJSONSchema,
+  fromJSONSchema3 as fromJSONSchema,
   define,
   createSkill,
   createSchema,

package/dist/router-define.d.ts

@@ -345,10 +345,17 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (args: any) => {
+    toJSONSchema: (args: any, opts?: {
+        mergeObject?: boolean;
+        override?: (opts: {
+            jsonSchema: any;
+            path: string[];
+            zodSchema: z.ZodTypeAny;
+        }) => void;
+    }) => {
         [key: string]: any;
     };
-    fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+    fromJSONSchema: <Merge extends boolean = false>(args?: any, opts?: {
         mergeObject?: boolean;
     }) => Merge extends true ? z.ZodObject<{
         [key: string]: any;

package/dist/router.d.ts

@@ -210,15 +210,17 @@ declare class Route<U = {
     }, opts?: AddOpts): void;
     throw(code?: number | string, message?: string, tips?: string): void;
 }
-/**
- * 剥离第一层schema，转换为JSON Schema，无论是skill还是其他的infer比纯粹的zod object schema更合适，因为它可能包含其他的字段，而不仅仅是schema
- * @param args
- * @returns
- */
-declare const toJSONSchema: (args: any) => {
+declare const toJSONSchema: (args: any, opts?: {
+    mergeObject?: boolean;
+    override?: (opts: {
+        jsonSchema: any;
+        path: string[];
+        zodSchema: z.ZodTypeAny;
+    }) => void;
+}) => {
     [key: string]: any;
 };
-declare const fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+declare const fromJSONSchema: <Merge extends boolean = false>(args?: any, opts?: {
     mergeObject?: boolean;
 }) => Merge extends true ? z.ZodObject<{
     [key: string]: any;
@@ -396,10 +398,17 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (args: any) => {
+    toJSONSchema: (args: any, opts?: {
+        mergeObject?: boolean;
+        override?: (opts: {
+            jsonSchema: any;
+            path: string[];
+            zodSchema: z.ZodTypeAny;
+        }) => void;
+    }) => {
         [key: string]: any;
     };
-    fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+    fromJSONSchema: <Merge extends boolean = false>(args?: any, opts?: {
         mergeObject?: boolean;
     }) => Merge extends true ? z.ZodObject<{
         [key: string]: any;

package/dist/router.js

@@ -16793,6 +16793,92 @@ var randomId = (length = 8, affix = "") => {
   return affix + nanoid3(length);
 };
 
+// src/validator/schema.ts
+var extractArgs = (args) => {
+  if (args && typeof args === "object" && typeof args.shape === "object") {
+    return args.shape;
+  }
+  return args || {};
+};
+var toJSONSchema2 = (args, opts) => {
+  const mergeObject = opts?.mergeObject ?? false;
+  if (!args)
+    return {};
+  const _override = ({ jsonSchema, path, zodSchema }) => {
+    if (Array.isArray(path) && path.length > 0) {
+      return;
+    }
+    const isOptional = zodSchema.isOptional?.();
+    if (isOptional) {
+      jsonSchema.optional = true;
+    }
+  };
+  const isError = (keys2) => {
+    const errorKeys = ["toJSONSchema", "def", "type", "parse"];
+    const hasErrorKeys = errorKeys.every((key) => keys2.includes(key));
+    return hasErrorKeys;
+  };
+  const override = opts?.override || _override;
+  if (mergeObject) {
+    if (typeof args === "object" && typeof args.toJSONSchema === "function") {
+      return args.toJSONSchema();
+    }
+    if (isError(Object.keys(args))) {
+      return {};
+    }
+    const schema = exports_external.object(args);
+    return schema.toJSONSchema();
+  }
+  args = extractArgs(args);
+  let keys = Object.keys(args);
+  if (isError(keys)) {
+    console.error(`[toJSONSchema error]: 解析到的 schema 可能不正确，包含了zod默认的value的schema. 请检查输入的 schema 是否正确。`);
+    args = {};
+    keys = [];
+  }
+  if (mergeObject) {}
+  let newArgs = {};
+  for (let key of keys) {
+    const item = args[key];
+    if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
+      newArgs[key] = item.toJSONSchema({ override });
+    } else {
+      newArgs[key] = args[key];
+    }
+  }
+  return newArgs;
+};
+var fromJSONSchema2 = (args = {}, opts) => {
+  let resultArgs = null;
+  const mergeObject = opts?.mergeObject ?? false;
+  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);
+      if (item.optional) {
+        newArgs[key] = newArgs[key].optional();
+      }
+    }
+    resultArgs = newArgs;
+  }
+  if (mergeObject) {
+    resultArgs = exports_external.object(resultArgs);
+  }
+  return resultArgs;
+};
+
 // src/route.ts
 var pickValue = ["path", "key", "id", "description", "type", "middleware", "metadata"];
 var tool = {
@@ -16916,72 +17002,15 @@ class Route {
     throw new CustomError(...args);
   }
 }
-var extractArgs = (args) => {
-  if (args && typeof args === "object" && typeof args.shape === "object") {
-    return args.shape;
-  }
-  return args || {};
-};
 var toJSONSchemaRoute = (route) => {
   const pickValues = pick(route, pickValue);
   if (pickValues?.metadata?.args) {
-    let args = pickValues.metadata.args;
-    args = extractArgs(args);
-    const keys = Object.keys(args);
-    const newArgs = {};
-    for (let key of keys) {
-      const item = args[key];
-      if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
-        newArgs[key] = item.toJSONSchema();
-      } else {
-        newArgs[key] = args[key];
-      }
-    }
-    pickValues.metadata.args = newArgs;
+    pickValues.metadata.args = toJSONSchema3(pickValues?.metadata?.args, { mergeObject: false });
   }
   return pickValues;
 };
-var toJSONSchema2 = (args) => {
-  args = extractArgs(args);
-  const keys = Object.keys(args);
-  const newArgs = {};
-  for (let key of keys) {
-    const item = args[key];
-    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);
-  }
-  return resultArgs;
-};
+var toJSONSchema3 = toJSONSchema2;
+var fromJSONSchema3 = fromJSONSchema2;
 
 class QueryRouter {
   appId = "";
@@ -17235,20 +17264,6 @@ class QueryRouter {
   getList(filter) {
     return this.routes.filter(filter || (() => true)).map((r) => {
       const pickValues = pick(r, pickValue);
-      if (pickValues?.metadata?.args) {
-        const args = pickValues.metadata.args;
-        const keys = Object.keys(args);
-        const newArgs = {};
-        for (let key of keys) {
-          const item = args[key];
-          if (item && typeof item === "object" && typeof item.toJSONSchema === "function") {
-            newArgs[key] = item.toJSONSchema();
-          } else {
-            newArgs[key] = args[key];
-          }
-        }
-        pickValues.metadata.args = newArgs;
-      }
       return pickValues;
     });
   }
@@ -17336,8 +17351,8 @@ class QueryRouter {
     }
     return listenProcess({ app: this, params, ...opts });
   }
-  toJSONSchema = toJSONSchema2;
-  fromJSONSchema = fromJSONSchema2;
+  toJSONSchema = toJSONSchema3;
+  fromJSONSchema = fromJSONSchema3;
 }
 
 class QueryRouterServer extends QueryRouter {
@@ -18535,9 +18550,9 @@ class App extends QueryRouter {
 export {
   util,
   tool,
-  toJSONSchema2 as toJSONSchema,
+  toJSONSchema3 as toJSONSchema,
   handleServer,
-  fromJSONSchema2 as fromJSONSchema,
+  fromJSONSchema3 as fromJSONSchema,
   define,
   createSkill,
   createSchema,

package/dist/ws.d.ts

@@ -395,10 +395,17 @@ declare class QueryRouter {
         filter?: (route: Route) => boolean;
         routeListMiddleware?: string[];
     }): Promise<void>;
-    toJSONSchema: (args: any) => {
+    toJSONSchema: (args: any, opts?: {
+        mergeObject?: boolean;
+        override?: (opts: {
+            jsonSchema: any;
+            path: string[];
+            zodSchema: z.ZodTypeAny;
+        }) => void;
+    }) => {
         [key: string]: any;
     };
-    fromJSONSchema: <Merge extends boolean = true>(args?: any, opts?: {
+    fromJSONSchema: <Merge extends boolean = false>(args?: any, opts?: {
         mergeObject?: boolean;
     }) => Merge extends true ? z.ZodObject<{
         [key: string]: any;

package/package.json

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

package/src/route.ts

@@ -3,6 +3,8 @@ 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 * as schema from './validator/schema.ts';
+
 export type RouterContextT = { code?: number;[key: string]: any };
 export type RouteContext<T = { code?: number }, S = any> = {
   /**
@@ -245,92 +247,17 @@ export class Route<U = { [key: string]: any }, T extends SimpleObject = SimpleOb
     throw new CustomError(...args);
   }
 }
-export const extractArgs = (args: any) => {
-  if (args && typeof args === 'object' && typeof args.shape === 'object') {
-    return args.shape as z.ZodRawShape;
-  }
-  return args || {};
-};
 
 const toJSONSchemaRoute = (route: RouteInfo) => {
   const pickValues = pick(route, pickValue as any);
   if (pickValues?.metadata?.args) {
-    let args = pickValues.metadata.args;
-    // 如果 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] as z.ZodAny;
-      if (item && typeof item === 'object' && typeof item.toJSONSchema === 'function') {
-        newArgs[key] = item.toJSONSchema();
-      } else {
-        newArgs[key] = args[key]; // 可能不是schema
-      }
-    }
-    pickValues.metadata.args = newArgs;
+    pickValues.metadata.args = toJSONSchema(pickValues?.metadata?.args, { mergeObject: false });
   }
   return pickValues;
 }
-const fromJSONSchemaRoute = (route: RouteInfo): RouteInfo => {
-  const args = route?.metadata?.args;
-  if (!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] as z.ZodAny;
-    if (item && typeof item === 'object' && typeof item.toJSONSchema === 'function') {
-      newArgs[key] = item.toJSONSchema();
-    } else {
-      newArgs[key] = args[key]; // 可能不是schema
-    }
-  }
-  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;
-}
+export const toJSONSchema = schema.toJSONSchema;
+export const fromJSONSchema = schema.fromJSONSchema;
 
 /**
  * @parmas overwrite 是否覆盖已存在的route，默认true
@@ -648,21 +575,6 @@ export class QueryRouter {
   getList(filter?: (route: Route) => boolean): RouteInfo[] {
     return this.routes.filter(filter || (() => true)).map((r) => {
       const pickValues = pick(r, pickValue as any);
-      if (pickValues?.metadata?.args) {
-        // const demoArgs = { k: tool.schema.string().describe('示例参数') };
-        const args = pickValues.metadata.args;
-        const keys = Object.keys(args);
-        const 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') {
-            newArgs[key] = item.toJSONSchema();
-          } else {
-            newArgs[key] = args[key]; // 可能不是schema
-          }
-        }
-        pickValues.metadata.args = newArgs;
-      }
       return pickValues;
     });
   }

package/src/validator/schema.ts

@@ -0,0 +1,100 @@
+import { z } from "zod";
+const extractArgs = (args: any) => {
+  if (args && typeof args === 'object' && typeof args.shape === 'object') {
+    return args.shape as z.ZodRawShape;
+  }
+  return args || {};
+};
+
+type ZodOverride = (opts: { jsonSchema: any; path: string[]; zodSchema: z.ZodTypeAny }) => void;
+/**
+ * 剥离第一层schema，转换为JSON Schema，无论是skill还是其他的infer比纯粹的zod object schema更合适，因为它可能包含其他的字段，而不仅仅是schema
+ * @param args 
+ * @returns 
+ */
+export const toJSONSchema = (args: any, opts?: { mergeObject?: boolean, override?: ZodOverride }): { [key: string]: any } => {
+  const mergeObject = opts?.mergeObject ?? false;
+  if (!args) return {};
+  const _override = ({ jsonSchema, path, zodSchema }) => {
+    if (Array.isArray(path) && path.length > 0) {
+      return
+    }
+    const isOptional = (zodSchema as any).isOptional?.();
+    if (isOptional) {
+      // 添加自定义属性
+      jsonSchema.optional = true;
+    }
+  }
+  const isError = (keys: string[]) => {
+    const errorKeys: string[] = ["toJSONSchema", "def", "type", "parse"]
+    const hasErrorKeys = errorKeys.every(key => keys.includes(key));
+    return hasErrorKeys;
+  }
+  const override: any = opts?.override || _override;
+  if (mergeObject) {
+    if (typeof args === 'object' && typeof args.toJSONSchema === 'function') {
+      return args.toJSONSchema();
+    }
+    if (isError(Object.keys(args))) {
+      return {};
+    }
+    // 如果 mergeObject 为 true，直接将整个对象转换为 JSON Schema
+    // 先检测是否是一个错误的 schema
+    const schema = z.object(args);
+    return schema.toJSONSchema();
+  }
+  // 如果 args 本身是一个 zod object schema，先提取 shape
+  args = extractArgs(args);
+  let keys = Object.keys(args);
+  if (isError(keys)) {
+    console.error(`[toJSONSchema error]: 解析到的 schema 可能不正确，包含了zod默认的value的schema. 请检查输入的 schema 是否正确。`);
+    args = {};
+    keys = [];
+  }
+  if (mergeObject) {
+
+  }
+  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') {
+      newArgs[key] = item.toJSONSchema({ override });
+    } else {
+      newArgs[key] = args[key]; // 可能不是schema
+    }
+  }
+  return newArgs;
+}
+export const fromJSONSchema = <Merge extends boolean = false>(args: any = {}, opts?: { mergeObject?: boolean }) => {
+  let resultArgs: any = null;
+  const mergeObject = opts?.mergeObject ?? false;
+  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)
+      if (item.optional) {
+        newArgs[key] = newArgs[key].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;
+}