@kevisual/query 0.0.47 → 0.0.49

package/dist/query-api.d.ts

@@ -107,13 +107,14 @@ type QueryOpts = {
 } & AdapterOpts;
 type QueryOptions = {
     url?: string;
+    baseURL?: string;
+    beforeRequest?: Fn;
     adapter?: typeof adapter;
     headers?: Record<string, string>;
     timeout?: number;
     isClient?: boolean;
     tokenName?: string;
     storage?: Storage;
-    beforeRequest?: Fn;
 };
 type Data = {
     path?: string;
@@ -149,6 +150,7 @@ type DataOpts = Partial<QueryOpts> & {
  */
 declare class Query {
     adapter: typeof adapter;
+    baseURL: string;
     url: string;
     /**
      * 请求前处理函数
@@ -291,20 +293,25 @@ type InferType<T> = T extends z.ZodType<infer U> ? U : T extends {
 } ? InferFromJSONSchema<T> : T extends {
     properties: infer P;
 } ? InferFromJSONSchema<T> : T;
+type IsOptional<T> = T extends {
+    optional: true;
+} ? true : false;
 type ExtractArgsFromMetadata<T> = T extends {
     metadata?: {
         args?: infer A;
     };
-} ? A extends Record<string, any> ? {
-    [K in keyof A]: InferType<A[K]>;
-} : never : never;
+} ? A extends Record<string, any> ? ({
+    [K in keyof A as IsOptional<A[K]> extends true ? never : K]: InferType<A[K]>;
+} & {
+    [K in keyof A as IsOptional<A[K]> extends true ? K : never]?: InferType<A[K]>;
+}) : never : never;
 type ApiMethods<P extends {
     [path: string]: {
         [key: string]: Pos;
     };
 }> = {
     [Path in keyof P]: {
-        [Key in keyof P[Path]]: (data?: Partial<ExtractArgsFromMetadata<P[Path][Key]>>, opts?: DataOpts) => ReturnType<Query['post']>;
+        [Key in keyof P[Path]]: (data?: ExtractArgsFromMetadata<P[Path][Key]>, opts?: DataOpts) => ReturnType<Query['post']>;
     };
 };
 type QueryApiOpts<P extends {
@@ -322,7 +329,7 @@ declare class QueryApi<P extends {
 } = {}> {
     query: Query;
     constructor(opts?: QueryApiOpts<P>);
-    post<T extends Pos>(pos: T, data?: Partial<ExtractArgsFromMetadata<T>>, opts?: DataOpts): Promise<{
+    post<T extends Pos>(pos: T, data?: ExtractArgsFromMetadata<T>, opts?: DataOpts): Promise<{
         code: number;
         data?: any;
         message?: string;