@kevisual/router 0.0.79 → 0.0.81

package/dist/app.js

@@ -2316,9 +2316,9 @@ var require_websocket = __commonJS((exports, module) => {
       emitErrorAndClose(websocket, err);
     });
     req.on("response", (res) => {
-      const location = res.headers.location;
+      const location2 = res.headers.location;
       const statusCode = res.statusCode;
-      if (location && opts.followRedirects && statusCode >= 300 && statusCode < 400) {
+      if (location2 && opts.followRedirects && statusCode >= 300 && statusCode < 400) {
         if (++websocket._redirects > opts.maxRedirects) {
           abortHandshake(websocket, req, "Maximum redirects exceeded");
           return;
@@ -2326,9 +2326,9 @@ var require_websocket = __commonJS((exports, module) => {
         req.abort();
         let addr;
         try {
-          addr = new URL2(location, address);
+          addr = new URL2(location2, address);
         } catch (e) {
-          const err = new SyntaxError(`Invalid URL: ${location}`);
+          const err = new SyntaxError(`Invalid URL: ${location2}`);
           emitErrorAndClose(websocket, err);
           return;
         }
@@ -3019,18 +3019,14 @@ class CustomError extends Error {
   code;
   data;
   message;
-  tips;
-  constructor(code, message, tips) {
-    super(message || String(code));
-    this.name = "CustomError";
-    if (typeof code === "number") {
-      this.code = code;
-      this.message = message;
-    } else {
-      this.code = 500;
-      this.message = code;
-    }
-    this.tips = tips;
+  constructor(code, opts) {
+    let message = opts?.message || String(code);
+    const cause = opts?.cause;
+    super(message, { cause });
+    this.name = "RouterError";
+    let codeNum = opts?.code || (typeof code === "number" ? code : undefined);
+    this.code = codeNum ?? 500;
+    this.message = message;
     Error.captureStackTrace(this, this.constructor);
   }
   static fromCode(code) {
@@ -3045,8 +3041,7 @@ class CustomError extends Error {
     return {
       code: e?.code,
       data: e?.data,
-      message: e?.message,
-      tips: e?.tips
+      message: e?.message
     };
   }
   static isError(error) {
@@ -3060,8 +3055,7 @@ class CustomError extends Error {
       return {
         code: e2?.code,
         data: e2?.data,
-        message: e2?.message,
-        tips: e2?.tips
+        message: e2?.message
       };
     }
   }
@@ -16796,6 +16790,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,82 +16999,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, 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);
-  let 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 = "";
@@ -17248,20 +17261,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;
     });
   }
@@ -17349,8 +17348,8 @@ class QueryRouter {
     }
     return listenProcess({ app: this, params, ...opts });
   }
-  toJSONSchema = toJSONSchema2;
-  fromJSONSchema = fromJSONSchema2;
+  toJSONSchema = toJSONSchema3;
+  fromJSONSchema = fromJSONSchema3;
 }
 
 // src/server/server.ts
@@ -18316,7 +18315,8 @@ class App extends QueryRouter {
   }
 }
 
-// node_modules/.pnpm/@kevisual+context@0.0.6/node_modules/@kevisual/context/dist/app.js
+// node_modules/.pnpm/@kevisual+context@0.0.8/node_modules/@kevisual/context/dist/app.js
+var isBrowser2 = typeof window !== "undefined" && typeof window.document !== "undefined";
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
@@ -18780,7 +18780,7 @@ var useEnv = (initEnv, initKey = "config", isOverwrite) => {
   }
   return gt[initKey];
 };
-var useEnvKey = (key, init, initKey = "config") => {
+var useEnvKey = (key, init, initKey = "config", opts = {}) => {
   const _env = useEnv({}, initKey);
   if (key && typeof _env[key] !== "undefined") {
     return _env[key];
@@ -18806,12 +18806,13 @@ var useEnvKey = (key, init, initKey = "config") => {
     const voidFn = async () => {
       return _env[key];
     };
+    const timeout = opts.timeout || 5 * 60 * 1000;
     const checkFn = async () => {
       const loadRes = await baseLoad.load(voidFn, {
         key,
         isReRun: true,
         checkSuccess: () => _env[key],
-        timeout: 5 * 60 * 1000,
+        timeout,
         interval: 1000
       });
       if (loadRes.code !== 200) {
@@ -18827,27 +18828,28 @@ var useEnvKey = (key, init, initKey = "config") => {
 };
 var useEnvKeyNew = (key, initKey = "config", opts) => {
   const _env = useEnv({}, initKey);
+  const timeout = opts?.timeout;
   if (key) {
     delete _env[key];
   }
   if (opts?.getNew && opts.init) {
-    return useEnvKey(key, opts.init, initKey);
+    return useEnvKey(key, opts.init, initKey, { timeout });
   } else if (opts?.getNew) {
-    return useEnvKey(key, null, initKey);
+    return useEnvKey(key, null, initKey, { timeout });
   }
 };
-var useContextKey = (key, init, isNew) => {
-  if (isNew) {
-    return useEnvKeyNew(key, "context", { getNew: true, init });
+var useContextKey = (key, init, opts) => {
+  if (opts?.isNew) {
+    return useEnvKeyNew(key, "context", { getNew: true, init, ...opts });
   }
-  return useEnvKey(key, init, "context");
+  return useEnvKey(key, init, "context", opts);
 };
 var use = useContextKey;
-var useConfigKey = (key, init, isNew) => {
-  if (isNew) {
-    return useEnvKeyNew(key, "config", { getNew: true, init });
+var useConfigKey = (key, init, opts) => {
+  if (opts?.isNew) {
+    return useEnvKeyNew(key, "config", { getNew: true, init, ...opts });
   }
-  return useEnvKey(key, init, "config");
+  return useEnvKey(key, init, "config", opts);
 };
 
 class InitEnv {
@@ -19517,7 +19519,7 @@ app
 10. **中间件找不到会返回 404**，错误信息中会包含找不到的中间件列表。
 `;
 // package.json
-var version2 = "0.0.78";
+var version2 = "0.0.81";
 
 // agent/routes/route-create.ts
 app.route({

package/dist/opencode.d.ts

@@ -350,10 +350,15 @@ declare class QueryRouter {
     }): Promise<void>;
     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/opencode.js

@@ -203,7 +203,8 @@ var require_eventemitter3 = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/@kevisual+context@0.0.6/node_modules/@kevisual/context/dist/app.js
+// node_modules/.pnpm/@kevisual+context@0.0.8/node_modules/@kevisual/context/dist/app.js
+var isBrowser2 = typeof window !== "undefined" && typeof window.document !== "undefined";
 function getDefaultExportFromCjs(x) {
   return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
 }
@@ -667,7 +668,7 @@ var useEnv = (initEnv, initKey = "config", isOverwrite) => {
   }
   return gt[initKey];
 };
-var useEnvKey = (key, init, initKey = "config") => {
+var useEnvKey = (key, init, initKey = "config", opts = {}) => {
   const _env = useEnv({}, initKey);
   if (key && typeof _env[key] !== "undefined") {
     return _env[key];
@@ -693,12 +694,13 @@ var useEnvKey = (key, init, initKey = "config") => {
     const voidFn = async () => {
       return _env[key];
     };
+    const timeout = opts.timeout || 5 * 60 * 1000;
     const checkFn = async () => {
       const loadRes = await baseLoad.load(voidFn, {
         key,
         isReRun: true,
         checkSuccess: () => _env[key],
-        timeout: 5 * 60 * 1000,
+        timeout,
         interval: 1000
       });
       if (loadRes.code !== 200) {
@@ -714,27 +716,28 @@ var useEnvKey = (key, init, initKey = "config") => {
 };
 var useEnvKeyNew = (key, initKey = "config", opts) => {
   const _env = useEnv({}, initKey);
+  const timeout = opts?.timeout;
   if (key) {
     delete _env[key];
   }
   if (opts?.getNew && opts.init) {
-    return useEnvKey(key, opts.init, initKey);
+    return useEnvKey(key, opts.init, initKey, { timeout });
   } else if (opts?.getNew) {
-    return useEnvKey(key, null, initKey);
+    return useEnvKey(key, null, initKey, { timeout });
   }
 };
-var useContextKey = (key, init, isNew) => {
-  if (isNew) {
-    return useEnvKeyNew(key, "context", { getNew: true, init });
+var useContextKey = (key, init, opts) => {
+  if (opts?.isNew) {
+    return useEnvKeyNew(key, "context", { getNew: true, init, ...opts });
   }
-  return useEnvKey(key, init, "context");
+  return useEnvKey(key, init, "context", opts);
 };
 var use = useContextKey;
-var useConfigKey = (key, init, isNew) => {
-  if (isNew) {
-    return useEnvKeyNew(key, "config", { getNew: true, init });
+var useConfigKey = (key, init, opts) => {
+  if (opts?.isNew) {
+    return useEnvKeyNew(key, "config", { getNew: true, init, ...opts });
   }
-  return useEnvKey(key, init, "config");
+  return useEnvKey(key, init, "config", opts);
 };
 
 class InitEnv {

package/dist/router-browser.d.ts

@@ -204,17 +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, 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;
@@ -394,10 +394,15 @@ declare class QueryRouter {
     }): Promise<void>;
     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;
@@ -493,20 +498,23 @@ declare const createSchema: (rule: Rule) => z.ZodType<any, any, any>;
 
 type Schema = z.ZodType<any, any, any>;
 
+type CustomErrorOptions = {
+    cause?: Error | string;
+    code?: number;
+    message?: string;
+};
 /** 自定义错误 */
 declare class CustomError extends Error {
     code?: number;
     data?: any;
     message: string;
-    tips?: string;
-    constructor(code?: number | string, message?: string, tips?: string);
+    constructor(code?: number | string, opts?: CustomErrorOptions);
     static fromCode(code?: number): CustomError;
     static fromErrorData(code?: number, data?: any): CustomError;
     static parseError(e: CustomError): {
         code: number;
         data: any;
         message: string;
-        tips: string;
     };
     /**
      * 判断 throw 的错误是否不是当前这个错误
@@ -518,7 +526,6 @@ declare class CustomError extends Error {
         code: number;
         data: any;
         message: string;
-        tips: string;
     };
 }