@mx-space/api-client 0.7.0 → 0.7.1

package/esm/core/client.js

@@ -3,46 +3,17 @@ import { isPlainObject } from '../utils';
 import { allContollerNames } from '../controllers';
 import { attachRequestMethod } from './attach-request';
 import { RequestError } from './error';
-// export interface HTTPClient {
-//   aggregate: AggregateController
-//   category: CategoryController
-//   comment: CommentController
-//   link: LinkController
-//   note: NoteController
-//   page: PageController
-//   post: PostController
-//   project: ProjectController
-//   recently: RecentlyController
-//   say: SayController
-//   search: SearchController
-//   snippet: SnippetController
-//   user: UserController
-//   master: HTTPClient['user']
-//   friend: HTTPClient['link']
-//   shorthand: HTTPClient['recently']
-// }
 const methodPrefix = '_$';
-export class HTTPClient {
+class HTTPClient {
     constructor(_endpoint, _adaptor) {
         this._endpoint = _endpoint;
         this._adaptor = _adaptor;
-        // super()
         this._endpoint = _endpoint
             .replace(/\/*$/, '')
             .replace('localhost', '127.0.0.1');
         this._proxy = this.buildRoute(this)();
         this.initGetClient();
         attachRequestMethod(this);
-        // const proxy = new Proxy(this, {
-        //   get(target, key, r) {
-        //     return (
-        //       Reflect.get(target, key, r) ||
-        //       (typeof key === 'string' &&
-        //         Reflect.get(target, methodPrefix + key, r))
-        //     )
-        //   },
-        // })
-        // return proxy
     }
     initGetClient() {
         for (const name of allContollerNames) {
@@ -110,7 +81,6 @@ export class HTTPClient {
             'inspect',
             'constructor',
             Symbol.toPrimitive,
-            Symbol.for('util.inspect.custom'),
         ];
         // eslint-disable-next-line @typescript-eslint/no-this-alias
         const that = this;
@@ -119,7 +89,18 @@ export class HTTPClient {
             const handler = {
                 get(target, name) {
                     if (reflectors.includes(name))
-                        return () => route.join('/');
+                        return (withBase) => {
+                            if (withBase) {
+                                const path = that.resolveFullPath(route.join('/'));
+                                route.length = 0;
+                                return path;
+                            }
+                            else {
+                                const path = route.join('/');
+                                route.length = 0;
+                                return path.startsWith('/') ? path : '/' + path;
+                            }
+                        };
                     if (methods.includes(name)) {
                         return async (options) => {
                             const url = that.resolveFullPath(route.join('/'));

package/esm/core/client.js.map

@@ -1 +1 @@
-{"version":3,"file":"client.js","sourceRoot":"","sources":["../../core/client.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"client.js","sourceRoot":"","sources":["../../core/client.ts"],"names":[],"mappings":"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"}

package/esm/index.d.ts

@@ -1,6 +1,7 @@
 import _camelcaseKeys from 'camelcase-keys';
 export * from './controllers';
-export { createClient, HTTPClient, RequestError } from './core';
+export { createClient, RequestError } from './core';
+export type { HTTPClient } from './core';
 export * from './models';
 export declare const camelcaseKeysDeep: <T>(obj: T) => T;
 export declare const camelcaseKeys: typeof _camelcaseKeys;

package/esm/index.js

@@ -1,6 +1,6 @@
 import _camelcaseKeys from 'camelcase-keys';
 export * from './controllers';
-export { createClient, HTTPClient, RequestError } from './core';
+export { createClient, RequestError } from './core';
 export * from './models';
 // export helper lib
 export const camelcaseKeysDeep = (obj) => {

package/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,gBAAgB,CAAA;AAE3C,cAAc,eAAe,CAAA;AAC7B,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAC/D,cAAc,UAAU,CAAA;AAExB,oBAAoB;AACpB,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAI,GAAM,EAAE,EAAE;IAC7C,OAAO,aAAa,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAM,CAAA;AAChD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,cAAc,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../index.ts"],"names":[],"mappings":"AAAA,OAAO,cAAc,MAAM,gBAAgB,CAAA;AAE3C,cAAc,eAAe,CAAA;AAC7B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAEnD,cAAc,UAAU,CAAA;AAExB,oBAAoB;AACpB,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAI,GAAM,EAAE,EAAE;IAC7C,OAAO,aAAa,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,CAAM,CAAA;AAChD,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,aAAa,GAAG,cAAc,CAAA"}

package/esm/interfaces/adapter.d.ts

@@ -1,13 +1,14 @@
 import { RequestOptions } from './instance';
-declare type RequestResponseType<P> = Promise<Record<string, any> & {
+export declare type IAdaptorRequestResponseType<P> = Promise<Record<string, any> & {
     data: P;
 }>;
-export declare type IRequestAdapter<T = any> = Readonly<{
+export declare type IRequestAdapter<T = any, Response = undefined> = Readonly<(Response extends undefined ? {} : {
+    responseWrapper: Response;
+}) & {
     default: T;
-    get<P = unknown>(url: string, options?: Omit<RequestOptions, 'data'>): RequestResponseType<P>;
-    post<P = unknown>(url: string, options: Partial<RequestOptions>): RequestResponseType<P>;
-    patch<P = unknown>(url: string, options: Partial<RequestOptions>): RequestResponseType<P>;
-    delete<P = unknown>(url: string, options?: Omit<RequestOptions, 'data'>): RequestResponseType<P>;
-    put<P = unknown>(url: string, options: Partial<RequestOptions>): RequestResponseType<P>;
+    get<P = unknown>(url: string, options?: Omit<RequestOptions, 'data'>): IAdaptorRequestResponseType<P>;
+    post<P = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P>;
+    patch<P = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P>;
+    delete<P = unknown>(url: string, options?: Omit<RequestOptions, 'data'>): IAdaptorRequestResponseType<P>;
+    put<P = unknown>(url: string, options: Partial<RequestOptions>): IAdaptorRequestResponseType<P>;
 }>;
-export {};

package/esm/interfaces/client.d.ts

@@ -1,5 +1,5 @@
-import { Class } from '../types/helper';
 import { IController } from './controller';
+import { Class } from './types';
 export declare type ClientOptions = {
     controllers?: Class<IController>[];
 };

package/esm/interfaces/request.d.ts

@@ -3,25 +3,33 @@ declare type NoStringIndex<T> = {
     [K in keyof T as string extends K ? never : K]: T[K];
 };
 export declare type Method = 'get' | 'delete' | 'post' | 'put' | 'patch';
-export interface IRequestHandler {
-    (path?: string | number): IRequestHandler;
-    get<P = unknown>(options?: Omit<NoStringIndex<RequestOptions>, 'data'>): RequestProxyResult<P>;
-    post<P = unknown>(options?: RequestOptions): RequestProxyResult<P>;
-    patch<P = unknown>(options?: RequestOptions): RequestProxyResult<P>;
-    delete<P = unknown>(options?: Omit<NoStringIndex<RequestOptions>, 'data'>): RequestProxyResult<P>;
-    put<P = unknown>(options?: RequestOptions): RequestProxyResult<P>;
-    [key: string]: IRequestHandler;
+export interface IRequestHandler<ResponseWrapper> {
+    (path?: string | number): IRequestHandler<ResponseWrapper>;
+    get<P = unknown>(options?: Omit<NoStringIndex<RequestOptions>, 'data'>): RequestProxyResult<P, ResponseWrapper>;
+    post<P = unknown>(options?: RequestOptions): RequestProxyResult<P, ResponseWrapper>;
+    patch<P = unknown>(options?: RequestOptions): RequestProxyResult<P, ResponseWrapper>;
+    delete<P = unknown>(options?: Omit<NoStringIndex<RequestOptions>, 'data'>): RequestProxyResult<P, ResponseWrapper>;
+    put<P = unknown>(options?: RequestOptions): RequestProxyResult<P, ResponseWrapper>;
+    toString(withBase?: boolean): string;
+    valueOf(withBase?: boolean): string;
+    [key: string]: IRequestHandler<ResponseWrapper>;
 }
-export declare type RequestProxyResult<T, R = {
+export declare type RequestProxyResult<T, ResponseWrapper, R = ResponseWrapper extends unknown ? {
     data: T;
     [key: string]: any;
-}> = Promise<ResponseProxyExtraRaw<T, R>>;
+} : ResponseWrapper extends {
+    data: T;
+} ? ResponseWrapper : Omit<ResponseWrapper, 'data'> & {
+    data: T;
+}> = Promise<ResponseProxyExtraRaw<T, R, ResponseWrapper>>;
 declare type CamelToSnake<T extends string, P extends string = ''> = string extends T ? string : T extends `${infer C0}${infer R}` ? CamelToSnake<R, `${P}${C0 extends Lowercase<C0> ? '' : '_'}${Lowercase<C0>}`> : P;
 declare type CamelKeysToSnake<T> = {
     [K in keyof T as CamelToSnake<Extract<K, string>>]: T[K];
 };
-export declare type ResponseProxyExtraRaw<T, RawData = unknown, Response = unknown> = T extends object ? T & {
-    $raw: Response extends unknown ? {
+declare type ResponseWrapperType<Response, RawData, T> = {
+    $raw: Response extends {
+        data: infer T;
+    } ? Response : Response extends unknown ? {
         [i: string]: any;
         data: RawData extends unknown ? CamelKeysToSnake<T> : RawData;
     } : Response;
@@ -30,5 +38,6 @@ export declare type ResponseProxyExtraRaw<T, RawData = unknown, Response = unkno
         method: string;
         [k: string]: string;
     };
-} : T;
+};
+export declare type ResponseProxyExtraRaw<T, RawData = unknown, Response = unknown> = T extends object ? T & ResponseWrapperType<Response, RawData, T> : T extends unknown ? T & ResponseWrapperType<Response, RawData, T> : unknown;
 export {};

package/esm/interfaces/types.d.ts

@@ -0,0 +1,2 @@
+export declare type Class<T> = new (...args: any[]) => T;
+export declare type SelectFields<T extends string> = `${'+' | '-' | ''}${T}`[];

package/esm/interfaces/types.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=types.js.map

package/esm/interfaces/types.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../interfaces/types.ts"],"names":[],"mappings":""}

package/index.ts

@@ -1,7 +1,8 @@
 import _camelcaseKeys from 'camelcase-keys'
 
 export * from './controllers'
-export { createClient, HTTPClient, RequestError } from './core'
+export { createClient, RequestError } from './core'
+export type { HTTPClient } from './core'
 export * from './models'
 
 // export helper lib

package/interfaces/adapter.ts

@@ -1,30 +1,35 @@
 import { RequestOptions } from './instance'
-type RequestResponseType<P> = Promise<Record<string, any> & { data: P }>
+export type IAdaptorRequestResponseType<P> = Promise<
+  Record<string, any> & { data: P }
+>
 
-export type IRequestAdapter<T = any> = Readonly<{
-  default: T
-  get<P = unknown>(
-    url: string,
-    options?: Omit<RequestOptions, 'data'>,
-  ): RequestResponseType<P>
+export type IRequestAdapter<T = any, Response = undefined> = Readonly<
+  (Response extends undefined ? {} : { responseWrapper: Response }) & {
+    default: T
 
-  post<P = unknown>(
-    url: string,
-    options: Partial<RequestOptions>,
-  ): RequestResponseType<P>
+    get<P = unknown>(
+      url: string,
+      options?: Omit<RequestOptions, 'data'>,
+    ): IAdaptorRequestResponseType<P>
 
-  patch<P = unknown>(
-    url: string,
-    options: Partial<RequestOptions>,
-  ): RequestResponseType<P>
+    post<P = unknown>(
+      url: string,
+      options: Partial<RequestOptions>,
+    ): IAdaptorRequestResponseType<P>
 
-  delete<P = unknown>(
-    url: string,
-    options?: Omit<RequestOptions, 'data'>,
-  ): RequestResponseType<P>
+    patch<P = unknown>(
+      url: string,
+      options: Partial<RequestOptions>,
+    ): IAdaptorRequestResponseType<P>
 
-  put<P = unknown>(
-    url: string,
-    options: Partial<RequestOptions>,
-  ): RequestResponseType<P>
-}>
+    delete<P = unknown>(
+      url: string,
+      options?: Omit<RequestOptions, 'data'>,
+    ): IAdaptorRequestResponseType<P>
+
+    put<P = unknown>(
+      url: string,
+      options: Partial<RequestOptions>,
+    ): IAdaptorRequestResponseType<P>
+  }
+>

package/interfaces/client.ts

@@ -1,5 +1,5 @@
-import { Class } from '~/types/helper'
 import { IController } from './controller'
+import { Class } from './types'
 
 export type ClientOptions = {
   controllers?: Class<IController>[]

package/interfaces/request.ts

@@ -3,29 +3,44 @@ type NoStringIndex<T> = { [K in keyof T as string extends K ? never : K]: T[K] }
 
 export type Method = 'get' | 'delete' | 'post' | 'put' | 'patch'
 
-export interface IRequestHandler {
-  (path?: string | number): IRequestHandler
+export interface IRequestHandler<ResponseWrapper> {
+  (path?: string | number): IRequestHandler<ResponseWrapper>
   // @ts-ignore
   get<P = unknown>(
     options?: Omit<NoStringIndex<RequestOptions>, 'data'>,
-  ): RequestProxyResult<P>
+  ): RequestProxyResult<P, ResponseWrapper>
   // @ts-ignore
-  post<P = unknown>(options?: RequestOptions): RequestProxyResult<P>
+  post<P = unknown>(
+    options?: RequestOptions,
+  ): RequestProxyResult<P, ResponseWrapper>
   // @ts-ignore
-  patch<P = unknown>(options?: RequestOptions): RequestProxyResult<P>
+  patch<P = unknown>(
+    options?: RequestOptions,
+  ): RequestProxyResult<P, ResponseWrapper>
   // @ts-ignore
   delete<P = unknown>(
     options?: Omit<NoStringIndex<RequestOptions>, 'data'>,
-  ): RequestProxyResult<P>
+  ): RequestProxyResult<P, ResponseWrapper>
   // @ts-ignore
-  put<P = unknown>(options?: RequestOptions): RequestProxyResult<P>
-  [key: string]: IRequestHandler
+  put<P = unknown>(
+    options?: RequestOptions,
+  ): RequestProxyResult<P, ResponseWrapper>
+  //@ts-ignore
+  toString(withBase?: boolean): string
+  //@ts-ignore
+  valueOf(withBase?: boolean): string
+  [key: string]: IRequestHandler<ResponseWrapper>
 }
 
 export type RequestProxyResult<
   T,
-  R = { data: T; [key: string]: any },
-> = Promise<ResponseProxyExtraRaw<T, R>>
+  ResponseWrapper,
+  R = ResponseWrapper extends unknown
+    ? { data: T; [key: string]: any }
+    : ResponseWrapper extends { data: T }
+    ? ResponseWrapper
+    : Omit<ResponseWrapper, 'data'> & { data: T },
+> = Promise<ResponseProxyExtraRaw<T, R, ResponseWrapper>>
 
 type CamelToSnake<T extends string, P extends string = ''> = string extends T
   ? string
@@ -40,18 +55,28 @@ type CamelKeysToSnake<T> = {
   [K in keyof T as CamelToSnake<Extract<K, string>>]: T[K]
 }
 
+type ResponseWrapperType<Response, RawData, T> = {
+  $raw: Response extends { data: infer T }
+    ? Response
+    : Response extends unknown
+    ? {
+        [i: string]: any
+        data: RawData extends unknown ? CamelKeysToSnake<T> : RawData
+      }
+    : Response
+  $request: {
+    path: string
+    method: string
+    [k: string]: string
+  }
+}
+
 export type ResponseProxyExtraRaw<
   T,
   RawData = unknown,
   Response = unknown,
 > = T extends object
-  ? T & {
-      $raw: Response extends unknown
-        ? {
-            [i: string]: any
-            data: RawData extends unknown ? CamelKeysToSnake<T> : RawData
-          }
-        : Response
-      $request: { path: string; method: string; [k: string]: string }
-    }
-  : T
+  ? T & ResponseWrapperType<Response, RawData, T>
+  : T extends unknown
+  ? T & ResponseWrapperType<Response, RawData, T>
+  : unknown

package/lib/adaptors/axios.d.ts

@@ -1,3 +1,3 @@
-import { AxiosInstance } from 'axios';
+import { AxiosInstance, AxiosResponse } from 'axios';
 import { IRequestAdapter } from '../interfaces/adapter';
-export declare const axiosAdaptor: IRequestAdapter<AxiosInstance>;
+export declare const axiosAdaptor: IRequestAdapter<AxiosInstance, AxiosResponse<unknown>>;

package/lib/adaptors/axios.js

@@ -11,6 +11,7 @@ exports.axiosAdaptor = Object.preventExtensions({
     get default() {
         return $http;
     },
+    responseWrapper: {},
     get(url, options) {
         // @ts-ignore
         return $http.get(url, options);

package/lib/adaptors/axios.js.map

@@ -1 +1 @@
-{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../adaptors/axios.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA4C;AAE5C,MAAM,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AAE9B,2DAA2D;AAC9C,QAAA,YAAY,GACvB,MAAM,CAAC,iBAAiB,CAAC;IACvB,IAAI,OAAO;QACT,OAAO,KAAK,CAAA;IACd,CAAC;IAED,GAAG,CAAC,GAAG,EAAE,OAAO;QACd,aAAa;QACb,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAChC,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,OAAO;QACf,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QACzC,aAAa;QACb,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACtC,CAAC;IACD,GAAG,CAAC,GAAG,EAAE,OAAO;QACd,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QACzC,aAAa;QACb,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACrC,CAAC;IACD,MAAM,CAAC,GAAG,EAAE,OAAO;QACjB,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QACnC,aAAa;QACb,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAClC,CAAC;IACD,KAAK,CAAC,GAAG,EAAE,OAAO;QAChB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QACzC,aAAa;QACb,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"axios.js","sourceRoot":"","sources":["../../adaptors/axios.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA2D;AAE3D,MAAM,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC,EAAE,CAAC,CAAA;AAE9B,2DAA2D;AAC9C,QAAA,YAAY,GAGrB,MAAM,CAAC,iBAAiB,CAAC;IAC3B,IAAI,OAAO;QACT,OAAO,KAAK,CAAA;IACd,CAAC;IACD,eAAe,EAAE,EAAmC;IACpD,GAAG,CAAC,GAAG,EAAE,OAAO;QACd,aAAa;QACb,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAChC,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,OAAO;QACf,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QACzC,aAAa;QACb,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACtC,CAAC;IACD,GAAG,CAAC,GAAG,EAAE,OAAO;QACd,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QACzC,aAAa;QACb,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACrC,CAAC;IACD,MAAM,CAAC,GAAG,EAAE,OAAO;QACjB,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QACnC,aAAa;QACb,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;IAClC,CAAC;IACD,KAAK,CAAC,GAAG,EAAE,OAAO;QAChB,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QACzC,aAAa;QACb,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;IACvC,CAAC;CACF,CAAC,CAAA"}

package/lib/adaptors/umi-request.d.ts

@@ -1,3 +1,3 @@
-import { RequestMethod } from 'umi-request';
+import { RequestMethod, RequestResponse } from 'umi-request';
 import { IRequestAdapter } from '../interfaces/adapter';
-export declare const umiAdaptor: IRequestAdapter<RequestMethod<true>>;
+export declare const umiAdaptor: IRequestAdapter<RequestMethod<true>, RequestResponse>;

package/lib/adaptors/umi-request.js

@@ -11,6 +11,7 @@ exports.umiAdaptor = Object.preventExtensions({
     get default() {
         return $http;
     },
+    responseWrapper: {},
     get(url, options) {
         return $http.get(url, options);
     },

package/lib/adaptors/umi-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"umi-request.js","sourceRoot":"","sources":["../../adaptors/umi-request.ts"],"names":[],"mappings":";;;AAAA,6CAAmD;AAGnD,MAAM,KAAK,GAAG,IAAA,oBAAM,EAAC;IACnB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,MAAM;IACnB,YAAY,EAAE,MAAM;CACrB,CAAC,CAAA;AAEW,QAAA,UAAU,GACrB,MAAM,CAAC,iBAAiB,CAAC;IACvB,IAAI,OAAO;QACT,OAAO,KAAK,CAAA;IACd,CAAC;IACD,GAAG,CAAC,GAAG,EAAE,OAAO;QACd,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAChC,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,OAAO;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACjC,CAAC;IACD,GAAG,CAAC,GAAG,EAAE,OAAO;QACd,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAChC,CAAC;IACD,MAAM,CAAC,GAAG,EAAE,OAAO;QACjB,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACnC,CAAC;IACD,KAAK,CAAC,GAAG,EAAE,OAAO;QAChB,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAClC,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"umi-request.js","sourceRoot":"","sources":["../../adaptors/umi-request.ts"],"names":[],"mappings":";;;AAAA,6CAAoE;AAGpE,MAAM,KAAK,GAAG,IAAA,oBAAM,EAAC;IACnB,WAAW,EAAE,IAAI;IACjB,WAAW,EAAE,MAAM;IACnB,YAAY,EAAE,MAAM;CACrB,CAAC,CAAA;AAEW,QAAA,UAAU,GAGnB,MAAM,CAAC,iBAAiB,CAAC;IAC3B,IAAI,OAAO;QACT,OAAO,KAAK,CAAA;IACd,CAAC;IACD,eAAe,EAAE,EAA4B;IAC7C,GAAG,CAAC,GAAG,EAAE,OAAO;QACd,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAChC,CAAC;IACD,IAAI,CAAC,GAAG,EAAE,OAAO;QACf,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACjC,CAAC;IACD,GAAG,CAAC,GAAG,EAAE,OAAO;QACd,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAChC,CAAC;IACD,MAAM,CAAC,GAAG,EAAE,OAAO;QACjB,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IACnC,CAAC;IACD,KAAK,CAAC,GAAG,EAAE,OAAO;QAChB,OAAO,KAAK,CAAC,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;IAClC,CAAC;CACF,CAAC,CAAA"}

package/lib/controllers/aggregate.d.ts

@@ -1,29 +1,34 @@
+import { IRequestAdapter } from '../interfaces/adapter';
 import { IController } from '../interfaces/controller';
 import { SortOrder } from '../interfaces/options';
 import { IRequestHandler, RequestProxyResult } from '../interfaces/request';
 import { AggregateRoot, AggregateStat, AggregateTop, TimelineData, TimelineType } from '../models/aggregate';
 import { HTTPClient } from '../core';
 declare module '../core/client' {
-    interface HTTPClient {
-        aggregate: AggregateController;
+    interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
+        aggregate: AggregateController<ResponseWrapper>;
     }
 }
-export declare class AggregateController implements IController {
+export declare class AggregateController<ResponseWrapper> implements IController {
     private client;
     base: string;
     name: string;
     constructor(client: HTTPClient);
-    get proxy(): IRequestHandler;
+    get proxy(): IRequestHandler<ResponseWrapper>;
     /**
      * 获取聚合数据
      */
-    getAggregateData(): RequestProxyResult<AggregateRoot>;
+    getAggregateData(): RequestProxyResult<AggregateRoot, ResponseWrapper>;
     /**
      * 获取最新发布的内容
      */
-    getTop(size?: number): RequestProxyResult<AggregateTop, {
+    getTop(size?: number): RequestProxyResult<AggregateTop, ResponseWrapper, ResponseWrapper extends unknown ? {
         [key: string]: any;
         data: AggregateTop;
+    } : ResponseWrapper extends {
+        data: AggregateTop;
+    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
+        data: AggregateTop;
     }>;
     getTimeline(options?: {
         sort?: SortOrder;
@@ -31,17 +36,29 @@ export declare class AggregateController implements IController {
         year?: number;
     }): RequestProxyResult<{
         data: TimelineData;
-    }, {
+    }, ResponseWrapper, ResponseWrapper extends unknown ? {
         [key: string]: any;
         data: {
             data: TimelineData;
         };
+    } : ResponseWrapper extends {
+        data: {
+            data: TimelineData;
+        };
+    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
+        data: {
+            data: TimelineData;
+        };
     }>;
     /**
      * 获取聚合数据统计
      */
-    getStat(): RequestProxyResult<AggregateStat, {
+    getStat(): RequestProxyResult<AggregateStat, ResponseWrapper, ResponseWrapper extends unknown ? {
         [key: string]: any;
         data: AggregateStat;
+    } : ResponseWrapper extends {
+        data: AggregateStat;
+    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
+        data: AggregateStat;
     }>;
 }

package/lib/controllers/aggregate.js.map

@@ -1 +1 @@
-{"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../controllers/aggregate.ts"],"names":[],"mappings":";;;AAUA,mCAA2C;AAC3C,iDAA4C;AAS5C,MAAa,mBAAmB;IAG9B,YAAoB,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;QAFtC,SAAI,GAAG,WAAW,CAAA;QAClB,SAAI,GAAG,WAAW,CAAA;QAEhB,IAAA,oBAAQ,EAAC,IAAI,CAAC,CAAA;IAChB,CAAC;IACD,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,EAAiB,CAAA;IACxC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,GAAG,CAAC;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAe,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IAC/D,CAAC;IAED,WAAW,CAAC,OAIX;QACC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAyB;YACrD,MAAM,EAAE;gBACN,IAAI,EAAE,IAAI,IAAI,IAAA,yBAAiB,EAAC,IAAI,CAAC;gBACrC,IAAI;gBACJ,IAAI;aACL;SACF,CAAC,CAAA;IACJ,CAAC;IACD;;OAEG;IACH,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAiB,CAAA;IAC7C,CAAC;CACF;AA5CD,kDA4CC"}
+{"version":3,"file":"aggregate.js","sourceRoot":"","sources":["../../controllers/aggregate.ts"],"names":[],"mappings":";;;AAWA,mCAA2C;AAC3C,iDAA4C;AAY5C,MAAa,mBAAmB;IAG9B,YAAoB,MAAkB;QAAlB,WAAM,GAAN,MAAM,CAAY;QAFtC,SAAI,GAAG,WAAW,CAAA;QAClB,SAAI,GAAG,WAAW,CAAA;QAEhB,IAAA,oBAAQ,EAAC,IAAI,CAAC,CAAA;IAChB,CAAC;IACD,IAAW,KAAK;QACd,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACrC,CAAC;IAED;;OAEG;IACH,gBAAgB;QACd,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,EAAiB,CAAA;IACxC,CAAC;IAED;;OAEG;IACH,MAAM,CAAC,IAAI,GAAG,CAAC;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAe,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;IAC/D,CAAC;IAED,WAAW,CAAC,OAIX;QACC,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,OAAO,IAAI,EAAE,CAAA;QAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAyB;YACrD,MAAM,EAAE;gBACN,IAAI,EAAE,IAAI,IAAI,IAAA,yBAAiB,EAAC,IAAI,CAAC;gBACrC,IAAI;gBACJ,IAAI;aACL;SACF,CAAC,CAAA;IACJ,CAAC;IACD;;OAEG;IACH,OAAO;QACL,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAiB,CAAA;IAC7C,CAAC;CACF;AA5CD,kDA4CC"}

package/lib/controllers/base.d.ts

@@ -1,27 +1,39 @@
 import { IRequestHandler, RequestProxyResult } from '../interfaces/request';
 import { PaginateResult } from '../models/base';
 import { HTTPClient } from '../core';
-export declare abstract class BaseCrudController<T> {
+export declare abstract class BaseCrudController<T, ResponseWrapper> {
     protected client: HTTPClient;
     base: string;
     constructor(client: HTTPClient);
-    get proxy(): IRequestHandler;
-    getById(id: string): RequestProxyResult<T>;
+    get proxy(): IRequestHandler<ResponseWrapper>;
+    getById(id: string): RequestProxyResult<T, ResponseWrapper>;
     getAll(): RequestProxyResult<{
         data: T[];
-    }, {
+    }, ResponseWrapper, ResponseWrapper extends unknown ? {
         [key: string]: any;
         data: {
             data: T[];
         };
+    } : ResponseWrapper extends {
+        data: {
+            data: T[];
+        };
+    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
+        data: {
+            data: T[];
+        };
     }>;
     /**
      * 带分页的查询
      * @param page
      * @param perPage
      */
-    getAllPaginated(page?: number, perPage?: number): RequestProxyResult<PaginateResult<T>, {
+    getAllPaginated(page?: number, perPage?: number): RequestProxyResult<PaginateResult<T>, ResponseWrapper, ResponseWrapper extends unknown ? {
         [key: string]: any;
         data: PaginateResult<T>;
+    } : ResponseWrapper extends {
+        data: PaginateResult<T>;
+    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
+        data: PaginateResult<T>;
     }>;
 }