@kevisual/api 0.0.52 → 0.0.54

package/dist/query-login.js

@@ -1,4 +1,4 @@
-// node_modules/.pnpm/@kevisual+query@0.0.47/node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -118,6 +118,7 @@ var wrapperError = ({ code, message }) => {
 
 class Query {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -134,6 +135,11 @@ class Query {
     this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -177,6 +183,13 @@ class Query {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);
@@ -864,6 +877,9 @@ class QueryLogin extends BaseQuery {
     this.init();
     this.onLoad = opts?.onLoad;
     this.storage = opts?.storage || globalThis?.localStorage;
+    if (!this.storage) {
+      throw new Error("storage is required");
+    }
   }
   setQuery(query) {
     this.query = query;

package/dist/query-mark.js

@@ -1,4 +1,4 @@
-// node_modules/.pnpm/@kevisual+query@0.0.47/node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -118,6 +118,7 @@ var wrapperError = ({ code, message }) => {
 
 class Query {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -134,6 +135,11 @@ class Query {
     this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -177,6 +183,13 @@ class Query {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);

package/dist/query-proxy.js

@@ -194,7 +194,7 @@ var require_eventemitter32 = __commonJS((exports, module) => {
   }
 });
 
-// node_modules/.pnpm/@kevisual+query@0.0.47/node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -506,6 +506,7 @@ var wrapperError = ({ code, message }) => {
 
 class Query {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -522,6 +523,11 @@ class Query {
     this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -565,6 +571,13 @@ class Query {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);
@@ -672,7 +685,7 @@ class QueryClient extends Query {
   }
 }
 
-// node_modules/.pnpm/@kevisual+router@0.0.75/node_modules/@kevisual/router/dist/router-browser.js
+// node_modules/@kevisual/router/dist/router-browser.js
 var __create2 = Object.create;
 var __getProtoOf2 = Object.getPrototypeOf;
 var __defProp2 = Object.defineProperty;
@@ -880,18 +893,18 @@ 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) {
+    if (typeof code === "object" && code !== null) {
+      opts = code;
+      code = opts.code || 500;
+    }
+    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) {
@@ -906,13 +919,24 @@ class CustomError extends Error {
     return {
       code: e?.code,
       data: e?.data,
-      message: e?.message,
-      tips: e?.tips
+      message: e?.message
     };
   }
   static isError(error) {
     return error instanceof CustomError || typeof error === "object" && error !== null && "code" in error;
   }
+  static throw(...args) {
+    const [args0, args1] = args;
+    if (args0 && typeof args0 === "object") {
+      throw new CustomError(args0);
+    }
+    if (args1 && typeof args1 === "object") {
+      throw new CustomError(args0, args1);
+    } else if (args1) {
+      throw new CustomError(args0, { message: args1 });
+    }
+    throw new CustomError(args0);
+  }
   parse(e) {
     if (e) {
       return CustomError.parseError(e);
@@ -921,8 +945,7 @@ class CustomError extends Error {
       return {
         code: e2?.code,
         data: e2?.data,
-        message: e2?.message,
-        tips: e2?.tips
+        message: e2?.message
       };
     }
   }
@@ -14525,6 +14548,90 @@ var nanoid3 = customAlphabet("abcdefghijklmnopqrstuvwxyz", 16);
 var randomId = (length = 8, affix = "") => {
   return affix + nanoid3(length);
 };
+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;
+};
 var pickValue = ["path", "key", "id", "description", "type", "middleware", "metadata"];
 class Route {
   path;
@@ -14536,7 +14643,6 @@ class Route {
   metadata;
   middleware;
   type = "route";
-  data;
   isDebug;
   constructor(path = "", key = "", opts) {
     if (!path) {
@@ -14628,53 +14734,19 @@ class Route {
   addTo(router, opts) {
     router.add(this, opts);
   }
-  setData(data) {
-    this.data = data;
-    return this;
-  }
   throw(...args) {
-    throw new CustomError(...args);
+    CustomError.throw(...args);
   }
 }
-var toJSONSchema2 = (route) => {
+var toJSONSchemaRoute = (route) => {
   const pickValues = pick(route, pickValue);
   if (pickValues?.metadata?.args) {
-    const args = pickValues.metadata.args;
-    if (args && typeof args === "object" && args.toJSONSchema && typeof args.toJSONSchema === "function") {
-      pickValues.metadata.args = args.toJSONSchema();
-      return pickValues;
-    }
-    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 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;
-  }
-  const keys = Object.keys(args);
-  const newArgs = {};
-  for (let key of keys) {
-    const item = args[key];
-    newArgs[key] = exports_external.fromJSONSchema(item);
-  }
-  route.metadata.args = newArgs;
-  return route;
-};
+var toJSONSchema3 = toJSONSchema2;
+var fromJSONSchema3 = fromJSONSchema2;
 
 class QueryRouter {
   appId = "";
@@ -14928,20 +15000,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;
     });
   }
@@ -14975,7 +15033,7 @@ class QueryRouter {
     this.importRoutes(router.routes);
   }
   throw(...args) {
-    throw new CustomError(...args);
+    CustomError.throw(...args);
   }
   hasRoute(path, key = "") {
     return this.routes.find((r) => r.path === path && r.key === key);
@@ -15013,7 +15071,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
           };
@@ -15029,8 +15087,8 @@ class QueryRouter {
     }
     return listenProcess({ app: this, params, ...opts });
   }
-  toJSONSchema = toJSONSchema2;
-  fromJSONSchema = fromJSONSchema2;
+  toJSONSchema = toJSONSchema3;
+  fromJSONSchema = fromJSONSchema3;
 }
 
 class QueryRouterServer extends QueryRouter {

package/dist/query-resources.js

@@ -446,7 +446,7 @@ var require_spark_md5 = __commonJS((exports, module) => {
   });
 });
 
-// node_modules/.pnpm/@kevisual+query@0.0.47/node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;

package/dist/query-secret.js

@@ -1,4 +1,4 @@
-// node_modules/.pnpm/@kevisual+query@0.0.47/node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -118,6 +118,7 @@ var wrapperError = ({ code, message }) => {
 
 class Query {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -134,6 +135,11 @@ class Query {
     this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -177,6 +183,13 @@ class Query {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);

package/dist/query-shop.js

@@ -1,4 +1,4 @@
-// node_modules/.pnpm/@kevisual+query@0.0.47/node_modules/@kevisual/query/dist/query-browser.js
+// node_modules/@kevisual/query/dist/query-browser.js
 var isTextForContentType = (contentType) => {
   if (!contentType)
     return false;
@@ -118,6 +118,7 @@ var wrapperError = ({ code, message }) => {
 
 class Query {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -134,6 +135,11 @@ class Query {
     this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -177,6 +183,13 @@ class Query {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);
@@ -273,7 +286,7 @@ class Query {
   }
 }
 
-// node_modules/.pnpm/@kevisual+router@0.0.75/node_modules/@kevisual/router/dist/router-define.js
+// node_modules/@kevisual/router/dist/router-define.js
 class Chain {
   object;
   app;
@@ -422,7 +435,7 @@ var shopDefine = QueryUtil.create({
   }
 });
 
-// node_modules/.pnpm/@kevisual+query@0.0.47/node_modules/@kevisual/query/dist/query.js
+// node_modules/@kevisual/query/dist/query.js
 class BaseQuery {
   query;
   queryDefine;

package/dist/store-mark.js

@@ -121,6 +121,7 @@ var wrapperError = ({ code, message }) => {
 
 class Query {
   adapter;
+  baseURL;
   url;
   beforeRequest;
   afterResponse;
@@ -137,6 +138,11 @@ class Query {
     this.storage = opts?.storage || globalThis?.localStorage;
     const defaultURL = opts?.isClient ? "/client/router" : "/api/router";
     this.url = opts?.url || defaultURL;
+    if (this.url.startsWith("http")) {
+      const urlObj = new URL(this.url);
+      this.baseURL = urlObj.origin;
+    }
+    this.baseURL = opts?.baseURL || this.baseURL;
     this.headers = opts?.headers || {
       "Content-Type": "application/json"
     };
@@ -180,6 +186,13 @@ class Query {
       timeout: _timeout,
       ...rest
     };
+    const isStartsWithHttp = req.url.startsWith("http");
+    if (!isStartsWithHttp) {
+      if (this.baseURL) {
+        const baseURL = new URL(this.baseURL || globalThis?.location?.origin).origin;
+        req.url = baseURL + req.url;
+      }
+    }
     try {
       if (_beforeRequest) {
         const res = await _beforeRequest(req);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kevisual/api",
-  "version": "0.0.52",
+  "version": "0.0.54",
   "description": "",
   "main": "mod.ts",
   "scripts": {
@@ -18,25 +18,25 @@
   "keywords": [],
   "author": "abearxiong <xiongxiao@xiongxiao.me> (https://www.xiongxiao.me)",
   "license": "MIT",
-  "packageManager": "pnpm@10.30.0",
+  "packageManager": "pnpm@10.30.1",
   "type": "module",
   "devDependencies": {
     "@kevisual/cache": "^0.0.5",
     "@kevisual/code-builder": "^0.0.6",
-    "@kevisual/query": "^0.0.47",
+    "@kevisual/query": "^0.0.49",
     "@kevisual/remote-app": "^0.0.4",
-    "@kevisual/router": "^0.0.75",
+    "@kevisual/router": "^0.0.83",
     "@kevisual/types": "^0.0.12",
     "@kevisual/use-config": "^1.0.30",
     "@types/bun": "^1.3.9",
-    "@types/node": "^25.2.3",
+    "@types/node": "^25.3.0",
     "@types/spark-md5": "^3.0.5",
     "dotenv": "^17.3.1",
     "fast-glob": "^3.3.3",
     "ws": "npm:@kevisual/ws"
   },
   "dependencies": {
-    "@kevisual/context": "^0.0.6",
+    "@kevisual/context": "^0.0.8",
     "@kevisual/js-filter": "^0.0.5",
     "@kevisual/load": "^0.0.6",
     "@paralleldrive/cuid2": "^3.3.0",
@@ -58,6 +58,7 @@
     "./secret": "./query/query-secret/index.ts",
     "./resources": "./query/query-resources/index.ts",
     "./utils-node": "./dist/utils-node.js",
+    "./query-login-node": "./dist/query-login-node.js",
     "./utils": "./dist/utils.js",
     "./query-secret": "./dist/query-secret.js",
     "./query-mark": "./dist/query-mark.js",