@mx-space/api-client 0.3.3 → 0.3.7

package/build/index.d.ts

@@ -1,7 +1,7 @@
-// Generated by dts-bundle-generator v5.9.0
+// Generated by dts-bundle-generator v6.2.0
 
-export declare type Class<T> = new (...args: any[]) => T;
-export declare type SelectFields<T extends string> = `${"+" | "-" | ""}${T}`[];
+export type Class<T> = new (...args: any[]) => T;
+export type SelectFields<T extends string> = `${"+" | "-" | ""}${T}`[];
 export interface IController {
 	base: string;
 	name: string;
@@ -16,12 +16,16 @@ export interface RequestOptions {
 	headers?: Record<string, string>;
 	[key: string]: any;
 }
-export interface IRequestAdapter {
-	get<P = unknown>(url: string, options?: RequestOptions): Promise<P>;
-	post<P = unknown>(url: string, options?: RequestOptions): Promise<P>;
-	patch<P = unknown>(url: string, options?: RequestOptions): Promise<P>;
-	delete<P = unknown>(url: string, options?: RequestOptions): Promise<P>;
-	put<P = unknown>(url: string, options?: RequestOptions): Promise<P>;
+export declare type RequestResponseType<P> = Promise<Record<string, any> & {
+	data: P;
+}>;
+export interface IRequestAdapter<T = any> {
+	default: T;
+	get<P = unknown>(url: string, options?: RequestOptions): RequestResponseType<P>;
+	post<P = unknown>(url: string, options?: RequestOptions): RequestResponseType<P>;
+	patch<P = unknown>(url: string, options?: RequestOptions): RequestResponseType<P>;
+	delete<P = unknown>(url: string, options?: RequestOptions): RequestResponseType<P>;
+	put<P = unknown>(url: string, options?: RequestOptions): RequestResponseType<P>;
 }
 export declare type NoStringIndex<T> = {
 	[K in keyof T as string extends K ? never : K]: T[K];
@@ -48,6 +52,70 @@ export declare type ResponseProxyExtraRaw<T, R = any> = T & {
 	};
 };
 export declare type SortOrder = "asc" | "desc";
+export interface Count {
+	read: number;
+	like: number;
+}
+export interface Image {
+	height: number;
+	width: number;
+	type: string;
+	accent?: string;
+	src: string;
+}
+export interface Pager {
+	total: number;
+	size: number;
+	currentPage: number;
+	totalPage: number;
+	hasPrevPage: boolean;
+	hasNextPage: boolean;
+}
+export interface PaginateResult<T> {
+	data: T[];
+	pagination: Pager;
+}
+declare class BaseModel {
+	created?: Date;
+	id?: string;
+}
+export interface PostModel {
+	commentsIndex: number;
+	allowComment: boolean;
+	hide: boolean;
+	copyright: boolean;
+	tags: string[];
+	count: Count;
+	id: string;
+	text: string;
+	title: string;
+	slug: string;
+	categoryId: string;
+	images: Image[];
+	modified: string;
+	created: string;
+	category: CategoryModel;
+}
+declare enum CategoryType {
+	Category = 0,
+	Tag = 1
+}
+export interface CategoryModel {
+	type: CategoryType;
+	count: number;
+	id: string;
+	created: string;
+	slug: string;
+	name: string;
+	modified: string;
+}
+export declare type CategoryWithChildrenModel = CategoryModel & {
+	children: Pick<PostModel, "id" | "title" | "slug" | "modified" | "created">[];
+};
+export interface TagModel {
+	count: number;
+	name: string;
+}
 export interface NoteModel {
 	id: string;
 	hide: boolean;
@@ -106,59 +174,6 @@ export interface PageModel {
 	/** Other Options */
 	options?: object;
 }
-export interface Count {
-	read: number;
-	like: number;
-}
-export interface Image {
-	height: number;
-	width: number;
-	type: string;
-	accent?: string;
-	src: string;
-}
-export interface Pager {
-	total: number;
-	size: number;
-	currentPage: number;
-	totalPage: number;
-	hasPrevPage: boolean;
-	hasNextPage: boolean;
-}
-export interface PaginateResult<T> {
-	data: T[];
-	pagination: Pager;
-}
-declare class BaseModel {
-	created?: Date;
-	id?: string;
-}
-export interface PostModel {
-	commentsIndex: number;
-	allowComment: boolean;
-	hide: boolean;
-	copyright: boolean;
-	tags: string[];
-	count: Count;
-	id: string;
-	text: string;
-	title: string;
-	slug: string;
-	categoryId: string;
-	images: Image[];
-	modified: string;
-	created: string;
-	category: CategoryModel;
-}
-export interface CategoryModel {
-	type: number;
-	count: number;
-	id: string;
-	name: string;
-	slug: string;
-	created: Date;
-	categoryId: string;
-}
 export interface SayModel {
 	id?: string;
 	text: string;
@@ -249,40 +264,33 @@ export declare class AggregateController implements IController {
 	/**
 	 * 获取聚合数据
 	 */
-	getAggregateData(): RequestProxyResult;
+	getAggregateData(): RequestProxyResult<AggregateRoot>;
 	/**
 	 * 获取最新发布的内容
 	 */
-	getTop(size?: number): RequestProxyResult;
+	getTop(size?: number): RequestProxyResult<AggregateTop, {
+		[key: string]: any;
+		data: AggregateTop;
+	}>;
 	getTimeline(options?: {
 		sort?: SortOrder;
 		type?: TimelineType;
 		year?: number;
-	}): RequestProxyResult;
+	}): RequestProxyResult<{
+		data: TimelineData;
+	}, {
+		[key: string]: any;
+		data: {
+			data: TimelineData;
+		};
+	}>;
 	/**
 	 * 获取聚合数据统计
 	 */
-	getStat(): RequestProxyResult;
-}
-declare enum CategoryType {
-	Category = 0,
-	Tag = 1
-}
-export interface CategoryModel {
-	type: CategoryType;
-	count: number;
-	id: string;
-	created: string;
-	slug: string;
-	name: string;
-	modified: string;
-}
-export declare type CategoryWithChildrenModel = CategoryModel & {
-	children: Pick<PostModel, "id" | "title" | "slug" | "modified" | "created">[];
-};
-export interface TagModel {
-	count: number;
-	name: string;
+	getStat(): RequestProxyResult<AggregateStat, {
+		[key: string]: any;
+		data: AggregateStat;
+	}>;
 }
 export declare class CategoryController implements IController {
 	private client;
@@ -290,21 +298,11 @@ export declare class CategoryController implements IController {
 	base: string;
 	constructor(client: HTTPClient);
 	private get proxy();
-	getAllCategories(): import("~/interfaces/request").RequestProxyResult<{
+	getAllCategories(): RequestProxyResult<{
 		data: CategoryModel[];
-	}, {
-		[key: string]: any;
-		data: {
-			data: CategoryModel[];
-		};
 	}>;
-	getAllTags(): import("~/interfaces/request").RequestProxyResult<{
+	getAllTags(): RequestProxyResult<{
 		data: TagModel[];
-	}, {
-		[key: string]: any;
-		data: {
-			data: TagModel[];
-		};
 	}>;
 	getCategoryDetail(id: string): Promise<ResponseProxyExtraRaw<CategoryWithChildrenModel>>;
 	getCategoryDetail(ids: string[]): Promise<ResponseProxyExtraRaw<Map<string, CategoryWithChildrenModel>>>;
@@ -360,20 +358,29 @@ export declare class CommentController implements IController {
 	/**
 	 * 根据 comment id 获取评论, 包括子评论
 	 */
-	getById(id: string): RequestProxyResult;
+	getById(id: string): RequestProxyResult<CommentModel>;
 	/**
 	 * 获取文章的评论列表
 	 * @param refId 文章 Id
 	 */
-	getByRefId(refId: string, pagination?: PaginationParams): RequestProxyResult;
+	getByRefId(refId: string, pagination?: PaginationParams): RequestProxyResult<PaginateResult<CommentModel>, {
+		[key: string]: any;
+		data: PaginateResult<CommentModel>;
+	}>;
 	/**
 	 * 评论
 	 */
-	comment(refId: string, data: CommentDto): RequestProxyResult;
+	comment(refId: string, data: CommentDto): RequestProxyResult<CommentModel, {
+		[key: string]: any;
+		data: CommentModel;
+	}>;
 	/**
 	 * 回复评论
 	 */
-	reply(commentId: string, data: CommentDto): RequestProxyResult;
+	reply(commentId: string, data: CommentDto): RequestProxyResult<CommentModel, {
+		[key: string]: any;
+		data: CommentModel;
+	}>;
 }
 declare enum LinkType {
 	Friend = 0,
@@ -397,14 +404,24 @@ declare abstract class BaseCrudController<T> {
 	base: string;
 	constructor(client: HTTPClient);
 	protected get proxy(): IRequestHandler;
-	getById(id: string): RequestProxyResult;
-	getAll(): RequestProxyResult;
+	getById(id: string): RequestProxyResult<T>;
+	getAll(): RequestProxyResult<{
+		data: T[];
+	}, {
+		[key: string]: any;
+		data: {
+			data: T[];
+		};
+	}>;
 	/**
 	 * 带分页的查询
 	 * @param page
 	 * @param perPage
 	 */
-	getAllPaginated(page?: number, perPage?: number): RequestProxyResult;
+	getAllPaginated(page?: number, perPage?: number): RequestProxyResult<PaginateResult<T>, {
+		[key: string]: any;
+		data: PaginateResult<T>;
+	}>;
 }
 export declare class LinkController extends BaseCrudController<LinkModel> {
 	protected readonly client: HTTPClient;
@@ -427,25 +444,43 @@ export declare class NoteController implements IController {
 	/**
 	 * 最新日记
 	 */
-	getLatest(): RequestProxyResult;
+	getLatest(): RequestProxyResult<NoteWrappedPayload>;
 	/**
 	 * 获取一篇日记
 	 * @param id id | nid
 	 * @param password 访问密码
 	 */
-	getNoteById(id: string | number, password?: string): RequestProxyResult;
+	getNoteById(id: string | number, password?: string): RequestProxyResult<NoteWrappedPayload, {
+		[key: string]: any;
+		data: NoteWrappedPayload;
+	}>;
 	/**
 	 * 日记列表分页
 	 */
-	getList(page?: number, perPage?: number, options?: NoteListOptions): RequestProxyResult;
+	getList(page?: number, perPage?: number, options?: NoteListOptions): RequestProxyResult<PaginateResult<NoteModel>, {
+		[key: string]: any;
+		data: PaginateResult<NoteModel>;
+	}>;
 	/**
 	 * 获取当前日记的上下各 n / 2 篇日记
 	 */
-	getMiddleList(id: string, size?: number): RequestProxyResult;
+	getMiddleList(id: string, size?: number): RequestProxyResult<{
+		data: Pick<NoteModel, "id" | "title" | "nid" | "created">[];
+		size: number;
+	}, {
+		[key: string]: any;
+		data: {
+			data: Pick<NoteModel, "id" | "title" | "nid" | "created">[];
+			size: number;
+		};
+	}>;
 	/**
 	 * 喜欢这篇日记
 	 */
-	likeIt(id: string): RequestProxyResult;
+	likeIt(id: string): RequestProxyResult<never, {
+		[key: string]: any;
+		data: never;
+	}>;
 }
 export declare type PageListOptions = {
 	select?: SelectFields<keyof PageModel>;
@@ -461,17 +496,26 @@ export declare class PageController implements IController {
 	/**
 	 * 页面列表
 	 */
-	getList(page?: number, perPage?: number, options?: PageListOptions): RequestProxyResult;
+	getList(page?: number, perPage?: number, options?: PageListOptions): RequestProxyResult<PaginateResult<PageModel>, {
+		[key: string]: any;
+		data: PaginateResult<PageModel>;
+	}>;
 	/**
 	 * 页面详情
 	 */
-	getById(id: string): RequestProxyResult;
+	getById(id: string): RequestProxyResult<PageModel, {
+		[key: string]: any;
+		data: PageModel;
+	}>;
 	/**
 	 * 根据路径获取页面
 	 * @param slug 路径
 	 * @returns
 	 */
-	getBySlug(slug: string): RequestProxyResult;
+	getBySlug(slug: string): RequestProxyResult<PageModel, {
+		[key: string]: any;
+		data: PageModel;
+	}>;
 }
 export declare type PostListOptions = {
 	select?: SelectFields<keyof PostModel>;
@@ -552,9 +596,26 @@ export declare class RecentlyController implements IController {
 	/**
 	 * 获取最新一条
 	 */
-	getLatestOne(): RequestProxyResult;
-	getAll(): RequestProxyResult;
-	getList(before?: string | undefined, after?: string | undefined, size?: number | number): RequestProxyResult;
+	getLatestOne(): RequestProxyResult<RecentlyModel, {
+		[key: string]: any;
+		data: RecentlyModel;
+	}>;
+	getAll(): RequestProxyResult<{
+		data: RecentlyModel[];
+	}, {
+		[key: string]: any;
+		data: {
+			data: RecentlyModel[];
+		};
+	}>;
+	getList(before?: string | undefined, after?: string | undefined, size?: number | number): RequestProxyResult<{
+		data: RecentlyModel[];
+	}, {
+		[key: string]: any;
+		data: {
+			data: RecentlyModel[];
+		};
+	}>;
 }
 export declare class SayController extends BaseCrudController<SayModel> implements IController {
 	protected client: HTTPClient;
@@ -565,7 +626,14 @@ export declare class SayController extends BaseCrudController<SayModel> implemen
 	/**
 	 * 获取随机一条
 	 */
-	getRandom(): RequestProxyResult;
+	getRandom(): RequestProxyResult<{
+		data: SayModel | null;
+	}, {
+		[key: string]: any;
+		data: {
+			data: SayModel | null;
+		};
+	}>;
 }
 export declare type SearchOption = {
 	orderBy?: string;
@@ -577,7 +645,7 @@ export declare class SearchController implements IController {
 	base: string;
 	name: string;
 	constructor(client: HTTPClient);
-	get proxy(): import("~/interfaces/request").IRequestHandler;
+	get proxy(): IRequestHandler;
 	search(type: "note", keyword: string, options?: Omit<SearchOption, "rawAlgolia">): Promise<RequestProxyResult<PaginateResult<Pick<NoteModel, "modified" | "id" | "title" | "created" | "nid">>>>;
 	search(type: "post", keyword: string, options?: Omit<SearchOption, "rawAlgolia">): Promise<RequestProxyResult<PaginateResult<Pick<PostModel, "modified" | "id" | "title" | "created" | "slug" | "category">>>>;
 	/**
@@ -587,14 +655,14 @@ export declare class SearchController implements IController {
 	 * @param options
 	 * @returns
 	 */
-	searchByAlgolia(keyword: string, options?: SearchOption): RequestProxyResult<RequestProxyResult<PaginateResult<Pick<PostModel, "created" | "id" | "modified" | "title" | "slug" | "category">> & {
+	searchByAlgolia(keyword: string, options?: SearchOption): RequestProxyResult<RequestProxyResult<PaginateResult<Pick<PostModel, "id" | "title" | "slug" | "modified" | "created" | "category">> & {
 		/**
 		 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
 		 */
 		raw?: any;
 	}, {
 		[key: string]: any;
-		data: PaginateResult<Pick<PostModel, "created" | "id" | "modified" | "title" | "slug" | "category">> & {
+		data: PaginateResult<Pick<PostModel, "id" | "title" | "slug" | "modified" | "created" | "category">> & {
 			/**
 			 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
 			 */
@@ -602,14 +670,14 @@ export declare class SearchController implements IController {
 		};
 	}>, {
 		[key: string]: any;
-		data: RequestProxyResult<PaginateResult<Pick<PostModel, "created" | "id" | "modified" | "title" | "slug" | "category">> & {
+		data: RequestProxyResult<PaginateResult<Pick<PostModel, "id" | "title" | "slug" | "modified" | "created" | "category">> & {
 			/**
 			 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
 			 */
 			raw?: any;
 		}, {
 			[key: string]: any;
-			data: PaginateResult<Pick<PostModel, "created" | "id" | "modified" | "title" | "slug" | "category">> & {
+			data: PaginateResult<Pick<PostModel, "id" | "title" | "slug" | "modified" | "created" | "category">> & {
 				/**
 				 * @see: algoliasearch <https://www.algolia.com/doc/api-reference/api-methods/search/>
 				 */
@@ -637,8 +705,14 @@ export declare class SnippetController implements IController {
 	name: string;
 	constructor(client: HTTPClient);
 	get proxy(): IRequestHandler;
-	getById(id: string): RequestProxyResult;
-	getByReferenceAndName(reference: string, name: string): RequestProxyResult;
+	getById(id: string): RequestProxyResult<SnippetModel, {
+		[key: string]: any;
+		data: SnippetModel;
+	}>;
+	getByReferenceAndName(reference: string, name: string): RequestProxyResult<SnippetModel, {
+		[key: string]: any;
+		data: SnippetModel;
+	}>;
 }
 export declare class UserController implements IController {
 	private readonly client;
@@ -646,9 +720,24 @@ export declare class UserController implements IController {
 	base: string;
 	name: string;
 	protected get proxy(): IRequestHandler;
-	getMasterInfo(): RequestProxyResult;
-	login(username: string, password: string): RequestProxyResult;
-	checkTokenValid(token: string): RequestProxyResult;
+	getMasterInfo(): RequestProxyResult<UserModel, {
+		[key: string]: any;
+		data: UserModel;
+	}>;
+	login(username: string, password: string): RequestProxyResult<TLogin, {
+		[key: string]: any;
+		data: TLogin;
+	}>;
+	checkTokenValid(token: string): RequestProxyResult<{
+		ok: number;
+		isGuest: boolean;
+	}, {
+		[key: string]: any;
+		data: {
+			ok: number;
+			isGuest: boolean;
+		};
+	}>;
 }
 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 SnippetController | typeof UserController)[];
 export declare const allContollerNames: string[];
@@ -679,7 +768,7 @@ export declare class HTTPClient extends HTTPControllerDefine {
 	injectControllers(...Controller: Class<IController>[]): void;
 	injectControllers(Controller: Class<IController>[]): void;
 	get endpoint(): string;
-	get instance(): IRequestAdapter;
+	get instance(): IRequestAdapter<any>;
 	request(options: {
 		url: string;
 		method?: string;

package/build/index.esm.js

@@ -433,11 +433,48 @@ function handleSearchParams(obj) {
     return search.toString();
 }
 
+// @ts-nocheck
+// @copy: https://github.com/sindresorhus/auto-bind/blob/main/index.js
+// Gets all non-builtin properties up the prototype chain.
+const getAllProperties = (object) => {
+    const properties = new Set();
+    do {
+        for (const key of Reflect.ownKeys(object)) {
+            properties.add([object, key]);
+        }
+    } while ((object = Reflect.getPrototypeOf(object)) &&
+        object !== Object.prototype);
+    return properties;
+};
+function autoBind(self, { include, exclude } = {}) {
+    const filter = (key) => {
+        const match = (pattern) => typeof pattern === 'string' ? key === pattern : pattern.test(key);
+        if (include) {
+            return include.some(match);
+        }
+        if (exclude) {
+            return !exclude.some(match);
+        }
+        return true;
+    };
+    for (const [object, key] of getAllProperties(self.constructor.prototype)) {
+        if (key === 'constructor' || !filter(key)) {
+            continue;
+        }
+        const descriptor = Reflect.getOwnPropertyDescriptor(object, key);
+        if (descriptor && typeof descriptor.value === 'function') {
+            self[key] = self[key].bind(self);
+        }
+    }
+    return self;
+}
+
 class AggregateController {
     constructor(client) {
         this.client = client;
         this.base = 'aggregate';
         this.name = 'aggregate';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -478,11 +515,21 @@ var CategoryType;
     CategoryType[CategoryType["Tag"] = 1] = "Tag";
 })(CategoryType || (CategoryType = {}));
 
+class RequestError extends Error {
+    constructor(message, status, path, raw) {
+        super(message);
+        this.status = status;
+        this.path = path;
+        this.raw = raw;
+    }
+}
+
 class CategoryController {
     constructor(client) {
         this.client = client;
         this.name = 'category';
         this.base = 'categories';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -546,6 +593,7 @@ class CommentController {
         this.client = client;
         this.base = 'comments';
         this.name = 'comment';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -587,6 +635,7 @@ class CommentController {
 class BaseCrudController {
     constructor(client) {
         this.client = client;
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -615,6 +664,7 @@ class LinkController extends BaseCrudController {
         this.client = client;
         this.name = 'link';
         this.base = 'links';
+        autoBind(this);
     }
 }
 
@@ -623,6 +673,7 @@ class NoteController {
         this.client = client;
         this.base = 'notes';
         this.name = 'note';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -685,6 +736,7 @@ class PageController {
         this.client = client;
         this.base = 'pages';
         this.name = 'page';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -725,6 +777,7 @@ class PostController {
         this.client = client;
         this.base = 'posts';
         this.name = 'post';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -776,6 +829,7 @@ class ProjectController extends BaseCrudController {
         this.client = client;
         this.base = 'projects';
         this.name = 'project';
+        autoBind(this);
     }
 }
 
@@ -784,6 +838,7 @@ class RecentlyController {
         this.client = client;
         this.base = 'recently';
         this.name = 'recently';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -817,6 +872,7 @@ class SayController extends BaseCrudController {
         this.client = client;
         this.base = 'says';
         this.name = 'say';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -834,6 +890,7 @@ class SearchController {
         this.client = client;
         this.base = 'search';
         this.name = 'search';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -860,6 +917,7 @@ class SnippetController {
         this.client = client;
         this.base = 'snippets';
         this.name = 'snippet';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -877,6 +935,7 @@ class UserController {
         this.client = client;
         this.base = 'master';
         this.name = 'user';
+        autoBind(this);
     }
     get proxy() {
         return this.client.proxy(this.base);
@@ -944,15 +1003,6 @@ class HTTPControllerDefine {
     }
 }
 
-class RequestError extends Error {
-    constructor(message, status, path, raw) {
-        super(message);
-        this.status = status;
-        this.path = path;
-        this.raw = raw;
-    }
-}
-
 class HTTPClient extends HTTPControllerDefine {
     // define all clients
     constructor(_endpoint, _instance) {