@mx-space/api-client 0.9.3 → 0.10.1

package/lib/controllers/user.d.ts

@@ -1,8 +1,8 @@
-import { IRequestAdapter } from '../interfaces/adapter';
-import { IController } from '../interfaces/controller';
-import { IRequestHandler } from '../interfaces/request';
-import { TLogin, UserModel } from '../models/user';
-import { HTTPClient } from '../core';
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { IController } from '../interfaces/controller';
+import type { IRequestHandler } from '../interfaces/request';
+import type { TLogin, UserModel } from '../models/user';
+import type { HTTPClient } from '../core';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
         user: UserController<ResponseWrapper>;

package/lib/core/client.d.ts

@@ -1,14 +1,15 @@
-import { IAdaptorRequestResponseType, IRequestAdapter } from '../interfaces/adapter';
-import { ClientOptions } from '../interfaces/client';
-import { IController } from '../interfaces/controller';
-import { IRequestHandler } from '../interfaces/request';
-import { Class } from '../interfaces/types';
+import type { IAdaptorRequestResponseType, IRequestAdapter } from '../interfaces/adapter';
+import type { ClientOptions } from '../interfaces/client';
+import type { IController } from '../interfaces/controller';
+import type { IRequestHandler } from '../interfaces/request';
+import type { Class } from '../interfaces/types';
 export type { HTTPClient };
 declare class HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
     private readonly _endpoint;
     private _adaptor;
+    private options;
     private readonly _proxy;
-    constructor(_endpoint: string, _adaptor: T);
+    constructor(_endpoint: string, _adaptor: T, options?: Omit<ClientOptions, 'controllers'>);
     private initGetClient;
     injectControllers(...Controller: Class<IController>[]): void;
     injectControllers(Controller: Class<IController>[]): void;

package/lib/core/client.js

@@ -12,9 +12,10 @@ const attach_request_1 = require("./attach-request");
 const error_1 = require("./error");
 const methodPrefix = '_$';
 class HTTPClient {
-    constructor(_endpoint, _adaptor) {
+    constructor(_endpoint, _adaptor, options = {}) {
         this._endpoint = _endpoint;
         this._adaptor = _adaptor;
+        this.options = options;
         this._endpoint = _endpoint
             .replace(/\/*$/, '')
             .replace('localhost', '127.0.0.1');
@@ -115,13 +116,20 @@ class HTTPClient {
                                 });
                             }
                             catch (e) {
-                                throw new error_1.RequestError(e.message, e.code ||
+                                let message = e.message;
+                                let code = e.code ||
                                     e.status ||
                                     e.statusCode ||
                                     e.response?.status ||
                                     e.response?.statusCode ||
                                     e.response?.code ||
-                                    500, url, e);
+                                    500;
+                                if (that.options.getCodeMessageFromException) {
+                                    const errorInfo = that.options.getCodeMessageFromException(e);
+                                    message = errorInfo.message || message;
+                                    code = errorInfo.code || code;
+                                }
+                                throw new error_1.RequestError(message, code, url, e);
                             }
                             const data = res.data;
                             if (!data) {
@@ -168,7 +176,7 @@ class HTTPClient {
 }
 function createClient(adapter) {
     return (endpoint, options) => {
-        const client = new HTTPClient(endpoint, adapter);
+        const client = new HTTPClient(endpoint, adapter, options);
         const { controllers } = options || {};
         if (controllers) {
             client.injectControllers(controllers);

package/lib/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/lib/interfaces/adapter.d.ts

@@ -1,4 +1,4 @@
-import { RequestOptions } from './instance';
+import type { RequestOptions } from './instance';
 export declare type IAdaptorRequestResponseType<P> = Promise<Record<string, any> & {
     data: P;
 }>;

package/lib/interfaces/client.d.ts

@@ -1,5 +1,9 @@
-import { IController } from './controller';
-import { Class } from './types';
+import type { IController } from './controller';
+import type { Class } from './types';
 export declare type ClientOptions = {
     controllers?: Class<IController>[];
+    getCodeMessageFromException?: <T = Error>(error: T) => {
+        message?: string | undefined | null;
+        code?: number | undefined | null;
+    };
 };

package/lib/models/aggregate.d.ts

@@ -1,10 +1,10 @@
-import { CategoryModel } from './category';
-import { NoteModel } from './note';
-import { PageModel } from './page';
-import { PostModel } from './post';
-import { SayModel } from './say';
-import { SeoOptionModel } from './setting';
-import { UserModel } from './user';
+import type { CategoryModel } from './category';
+import type { NoteModel } from './note';
+import type { PageModel } from './page';
+import type { PostModel } from './post';
+import type { SayModel } from './say';
+import type { SeoOptionModel } from './setting';
+import type { UserModel } from './user';
 export interface AggregateRoot {
     user: UserModel;
     seo: SeoOptionModel;

package/lib/models/category.d.ts

@@ -1,5 +1,5 @@
-import { BaseModel } from './base';
-import { PostModel } from './post';
+import type { BaseModel } from './base';
+import type { PostModel } from './post';
 export declare enum CategoryType {
     Category = 0,
     Tag = 1

package/lib/models/comment.d.ts

@@ -1,5 +1,5 @@
-import { BaseModel } from './base';
-import { CategoryModel } from './category';
+import type { BaseModel } from './base';
+import type { CategoryModel } from './category';
 export declare enum RefType {
     Page = "Page",
     Post = "Post",

package/lib/models/link.d.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base';
+import type { BaseModel } from './base';
 export declare enum LinkType {
     Friend = 0,
     Collection = 1

package/lib/models/note.d.ts

@@ -1,4 +1,4 @@
-import { TextBaseModel } from './base';
+import type { TextBaseModel } from './base';
 export interface NoteModel extends TextBaseModel {
     hide: boolean;
     count: {

package/lib/models/page.d.ts

@@ -1,4 +1,4 @@
-import { TextBaseModel } from './base';
+import type { TextBaseModel } from './base';
 export declare enum EnumPageType {
     'md' = "md",
     'html' = "html",

package/lib/models/post.d.ts

@@ -1,5 +1,5 @@
-import { Count, Image, TextBaseModel } from './base';
-import { CategoryModel } from './category';
+import type { Count, Image, TextBaseModel } from './base';
+import type { CategoryModel } from './category';
 export interface PostModel extends TextBaseModel {
     summary?: string;
     copyright: boolean;

package/lib/models/project.d.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base';
+import type { BaseModel } from './base';
 export interface ProjectModel extends BaseModel {
     name: string;
     previewUrl?: string;

package/lib/models/recently.d.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base';
+import type { BaseModel } from './base';
 export interface RecentlyModel extends BaseModel {
     content: string;
     project?: string;

package/lib/models/say.d.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base';
+import type { BaseModel } from './base';
 export interface SayModel extends BaseModel {
     text: string;
     source?: string;

package/lib/models/snippet.d.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base';
+import type { BaseModel } from './base';
 export declare enum SnippetType {
     JSON = "json",
     Function = "function",

package/lib/models/topic.d.ts

@@ -0,0 +1,8 @@
+import type { BaseModel } from './base';
+export interface TopicModel extends BaseModel {
+    description?: string;
+    introduce: string;
+    name: string;
+    slug: string;
+    icon?: string;
+}

package/lib/models/topic.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=topic.js.map

package/lib/models/topic.js.map

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

package/lib/models/user.d.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base';
+import type { BaseModel } from './base';
 export interface UserModel extends BaseModel {
     introduce: string;
     mail: string;

package/lib/utils/index.d.ts

@@ -1,4 +1,4 @@
-import { SortOrder } from '../interfaces/options';
+import type { SortOrder } from '../interfaces/options';
 export declare const isPlainObject: (obj: any) => any;
 export declare const sortOrderToNumber: (order: SortOrder) => number;
 export declare const destructureData: (payload: any) => any;

package/models/aggregate.ts

@@ -1,10 +1,10 @@
-import { CategoryModel } from './category'
-import { NoteModel } from './note'
-import { PageModel } from './page'
-import { PostModel } from './post'
-import { SayModel } from './say'
-import { SeoOptionModel } from './setting'
-import { UserModel } from './user'
+import type { CategoryModel } from './category'
+import type { NoteModel } from './note'
+import type { PageModel } from './page'
+import type { PostModel } from './post'
+import type { SayModel } from './say'
+import type { SeoOptionModel } from './setting'
+import type { UserModel } from './user'
 
 export interface AggregateRoot {
   user: UserModel

package/models/category.ts

@@ -1,5 +1,5 @@
-import { BaseModel } from './base'
-import { PostModel } from './post'
+import type { BaseModel } from './base'
+import type { PostModel } from './post'
 
 export enum CategoryType {
   Category,

package/models/comment.ts

@@ -1,5 +1,5 @@
-import { BaseModel } from './base'
-import { CategoryModel } from './category'
+import type { BaseModel } from './base'
+import type { CategoryModel } from './category'
 
 export enum RefType {
   Page = 'Page',

package/models/link.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export enum LinkType {
   Friend,

package/models/note.ts

@@ -1,4 +1,4 @@
-import { TextBaseModel } from './base'
+import type { TextBaseModel } from './base'
 
 export interface NoteModel extends TextBaseModel {
   hide: boolean

package/models/page.ts

@@ -1,4 +1,4 @@
-import { TextBaseModel } from './base'
+import type { TextBaseModel } from './base'
 
 export enum EnumPageType {
   'md' = 'md',

package/models/post.ts

@@ -1,5 +1,5 @@
-import { Count, Image, TextBaseModel } from './base'
-import { CategoryModel } from './category'
+import type { Count, Image, TextBaseModel } from './base'
+import type { CategoryModel } from './category'
 
 export interface PostModel extends TextBaseModel {
   summary?: string

package/models/project.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export interface ProjectModel extends BaseModel {
   name: string

package/models/recently.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export interface RecentlyModel extends BaseModel {
   content: string

package/models/say.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export interface SayModel extends BaseModel {
   text: string

package/models/snippet.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export enum SnippetType {
   JSON = 'json',

package/models/topic.ts

@@ -0,0 +1,9 @@
+import type { BaseModel } from './base'
+
+export interface TopicModel extends BaseModel {
+  description?: string
+  introduce: string
+  name: string
+  slug: string
+  icon?: string
+}

package/models/user.ts

@@ -1,4 +1,4 @@
-import { BaseModel } from './base'
+import type { BaseModel } from './base'
 
 export interface UserModel extends BaseModel {
   introduce: string

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mx-space/api-client",
-  "version": "0.9.3",
+  "version": "0.10.1",
   "description": "A api client for mx-space server@next",
   "author": "Innei",
   "license": "MIT",
@@ -44,16 +44,16 @@
     "version": "vv"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "21.0.3",
-    "@rollup/plugin-node-resolve": "13.2.1",
+    "@rollup/plugin-commonjs": "22.0.0",
+    "@rollup/plugin-node-resolve": "13.2.2",
     "@rollup/plugin-typescript": "8.3.2",
     "@types/cors": "2.8.12",
     "@types/lodash": "4.14.182",
-    "@types/node": "16.11.27",
-    "axios": "0.26.1",
+    "@types/node": "16.11.36",
+    "axios": "0.27.2",
     "gh-pages": "3.2.3",
     "lodash": "4.17.21",
-    "rollup": "2.70.2",
+    "rollup": "2.72.1",
     "rollup-plugin-peer-deps-external": "2.2.4",
     "rollup-plugin-terser": "7.0.2",
     "tsconfig-replace-paths": "0.0.11",

package/types/adaptors/axios.d.ts

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

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

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

package/types/controllers/aggregate.d.ts

@@ -1,9 +1,9 @@
-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';
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { IController } from '../interfaces/controller';
+import type { SortOrder } from '../interfaces/options';
+import type { IRequestHandler, RequestProxyResult } from '../interfaces/request';
+import type { AggregateRoot, AggregateStat, AggregateTop, TimelineData, TimelineType } from '../models/aggregate';
+import type { HTTPClient } from '../core';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
         aggregate: AggregateController<ResponseWrapper>;

package/types/controllers/base.d.ts

@@ -1,6 +1,6 @@
-import { IRequestHandler, RequestProxyResult } from '../interfaces/request';
-import { PaginateResult } from '../models/base';
-import { HTTPClient } from '../core';
+import type { IRequestHandler, RequestProxyResult } from '../interfaces/request';
+import type { PaginateResult } from '../models/base';
+import type { HTTPClient } from '../core';
 export declare abstract class BaseCrudController<T, ResponseWrapper> {
     protected client: HTTPClient;
     base: string;

package/types/controllers/category.d.ts

@@ -1,9 +1,10 @@
-import { IRequestAdapter } from '../interfaces/adapter';
-import { IController } from '../interfaces/controller';
-import { IRequestHandler, RequestProxyResult, ResponseProxyExtraRaw } from '../interfaces/request';
-import { HTTPClient } from '../core/client';
-import { CategoryModel, CategoryType, CategoryWithChildrenModel, TagModel } from '../models/category';
-import { PostModel } from '../models/post';
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { IController } from '../interfaces/controller';
+import type { IRequestHandler, RequestProxyResult, ResponseProxyExtraRaw } from '../interfaces/request';
+import type { HTTPClient } from '../core/client';
+import type { CategoryModel, CategoryWithChildrenModel, TagModel } from '../models/category';
+import { CategoryType } from '../models/category';
+import type { PostModel } from '../models/post';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
         category: CategoryController<ResponseWrapper>;

package/types/controllers/comment.d.ts

@@ -1,11 +1,11 @@
-import { IRequestAdapter } from '../interfaces/adapter';
-import { IController } from '../interfaces/controller';
-import { PaginationParams } from '../interfaces/params';
-import { IRequestHandler } from '../interfaces/request';
-import { PaginateResult } from '../models/base';
-import { CommentModel } from '../models/comment';
-import { HTTPClient } from '../core';
-import { CommentDto } from '../dtos/comment';
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { IController } from '../interfaces/controller';
+import type { PaginationParams } from '../interfaces/params';
+import type { IRequestHandler } from '../interfaces/request';
+import type { PaginateResult } from '../models/base';
+import type { CommentModel } from '../models/comment';
+import type { HTTPClient } from '../core';
+import type { CommentDto } from '../dtos/comment';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
         comment: CommentController<ResponseWrapper>;

package/types/controllers/index.d.ts

@@ -11,7 +11,8 @@ import { SayController } from './say';
 import { SearchController } from './search';
 import { ServerlessController } from './severless';
 import { SnippetController } from './snippet';
+import { TopicController } from './topic';
 import { UserController } from './user';
 export declare const allControllers: (typeof AggregateController | typeof CategoryController | typeof CommentController | typeof LinkController | typeof NoteController | typeof PageController | typeof PostController | typeof ProjectController | typeof RecentlyController | typeof SayController | typeof SearchController | typeof ServerlessController | typeof SnippetController | typeof UserController)[];
-export declare const allContollerNames: readonly ["aggregate", "category", "comment", "link", "note", "page", "post", "project", "recently", "say", "search", "snippet", "serverless", "user", "friend", "master", "shorthand"];
-export { AggregateController, CategoryController, CommentController, LinkController, NoteController, PageController, PostController, ProjectController, RecentlyController, SayController, SearchController, SnippetController, ServerlessController, UserController, };
+export declare const allContollerNames: readonly ["aggregate", "category", "comment", "link", "note", "page", "post", "project", "topic", "recently", "say", "search", "snippet", "serverless", "user", "friend", "master", "shorthand"];
+export { AggregateController, CategoryController, CommentController, LinkController, NoteController, PageController, PostController, ProjectController, RecentlyController, SayController, SearchController, SnippetController, ServerlessController, UserController, TopicController, };

package/types/controllers/link.d.ts

@@ -1,6 +1,6 @@
-import { IRequestAdapter } from '../interfaces/adapter';
-import { LinkModel } from '../models/link';
-import { HTTPClient } from '../core';
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { LinkModel } from '../models/link';
+import type { HTTPClient } from '../core';
 import { BaseCrudController } from './base';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {

package/types/controllers/note.d.ts

@@ -1,10 +1,10 @@
-import { IRequestAdapter } from '../interfaces/adapter';
-import { IController } from '../interfaces/controller';
-import { IRequestHandler } from '../interfaces/request';
-import { SelectFields } from '../interfaces/types';
-import { PaginateResult } from '../models/base';
-import { NoteModel, NoteWrappedPayload } from '../models/note';
-import { HTTPClient } from '../core/client';
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { IController } from '../interfaces/controller';
+import type { IRequestHandler, RequestProxyResult } from '../interfaces/request';
+import type { SelectFields } from '../interfaces/types';
+import type { PaginateResult } from '../models/base';
+import type { NoteModel, NoteWrappedPayload } from '../models/note';
+import type { HTTPClient } from '../core/client';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
         note: NoteController<ResponseWrapper>;
@@ -25,7 +25,7 @@ export declare class NoteController<ResponseWrapper> implements IController {
     /**
      * 最新日记
      */
-    getLatest(): import("../interfaces/request").RequestProxyResult<NoteWrappedPayload, ResponseWrapper, ResponseWrapper extends unknown ? {
+    getLatest(): RequestProxyResult<NoteWrappedPayload, ResponseWrapper, ResponseWrapper extends unknown ? {
         [key: string]: any;
         data: NoteWrappedPayload;
     } : ResponseWrapper extends {
@@ -34,22 +34,19 @@ export declare class NoteController<ResponseWrapper> implements IController {
         data: NoteWrappedPayload;
     }>;
     /**
-     * 获取一篇日记
+     * 获取一篇日记, 根据 Id 查询需要鉴权
      * @param id id | nid
      * @param password 访问密码
      */
-    getNoteById(id: string | number, password?: string): import("../interfaces/request").RequestProxyResult<NoteWrappedPayload, ResponseWrapper, ResponseWrapper extends unknown ? {
-        [key: string]: any;
-        data: NoteWrappedPayload;
-    } : ResponseWrapper extends {
-        data: NoteWrappedPayload;
-    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
-        data: NoteWrappedPayload;
-    }>;
+    getNoteById(id: string): Promise<RequestProxyResult<NoteModel, ResponseWrapper>>;
+    getNoteById(id: number): Promise<NoteWrappedPayload>;
+    getNoteById(id: number, password: string): Promise<NoteWrappedPayload>;
+    getNoteById(id: number, password: undefined, singleResult: true): Promise<RequestProxyResult<NoteModel, ResponseWrapper>>;
+    getNoteById(id: number, password: string, singleResult: true): Promise<RequestProxyResult<NoteModel, ResponseWrapper>>;
     /**
      * 日记列表分页
      */
-    getList(page?: number, perPage?: number, options?: NoteListOptions): import("../interfaces/request").RequestProxyResult<PaginateResult<NoteModel>, ResponseWrapper, ResponseWrapper extends unknown ? {
+    getList(page?: number, perPage?: number, options?: NoteListOptions): RequestProxyResult<PaginateResult<NoteModel>, ResponseWrapper, ResponseWrapper extends unknown ? {
         [key: string]: any;
         data: PaginateResult<NoteModel>;
     } : ResponseWrapper extends {
@@ -60,7 +57,7 @@ export declare class NoteController<ResponseWrapper> implements IController {
     /**
      * 获取当前日记的上下各 n / 2 篇日记
      */
-    getMiddleList(id: string, size?: number): import("../interfaces/request").RequestProxyResult<{
+    getMiddleList(id: string, size?: number): RequestProxyResult<{
         data: Pick<NoteModel, 'id' | 'title' | 'nid' | 'created'>[];
         size: number;
     }, ResponseWrapper, ResponseWrapper extends unknown ? {
@@ -83,7 +80,7 @@ export declare class NoteController<ResponseWrapper> implements IController {
     /**
      * 喜欢这篇日记
      */
-    likeIt(id: string | number): import("../interfaces/request").RequestProxyResult<never, ResponseWrapper, ResponseWrapper extends unknown ? {
+    likeIt(id: string | number): RequestProxyResult<never, ResponseWrapper, ResponseWrapper extends unknown ? {
         [key: string]: any;
         data: never;
     } : ResponseWrapper extends {
@@ -91,4 +88,15 @@ export declare class NoteController<ResponseWrapper> implements IController {
     } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
         data: never;
     }>;
+    /**
+     * 获取专栏内的所有日记
+     */
+    getNoteByTopicId(topicId: string, page?: number, size?: number): RequestProxyResult<PaginateResult<NoteModel>, ResponseWrapper, ResponseWrapper extends unknown ? {
+        [key: string]: any;
+        data: PaginateResult<NoteModel>;
+    } : ResponseWrapper extends {
+        data: PaginateResult<NoteModel>;
+    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
+        data: PaginateResult<NoteModel>;
+    }>;
 }