@mx-space/api-client 0.9.4 → 0.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mx-space/api-client",
-  "version": "0.9.4",
+  "version": "0.10.2",
   "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.29",
-    "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

@@ -88,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>;
+    }>;
 }

package/types/controllers/page.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 { PageModel } from '../models/page';
-import { HTTPClient } from '../core';
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { IController } from '../interfaces/controller';
+import type { IRequestHandler } from '../interfaces/request';
+import type { SelectFields } from '../interfaces/types';
+import type { PaginateResult } from '../models/base';
+import type { PageModel } from '../models/page';
+import type { HTTPClient } from '../core';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
         page: PageController<ResponseWrapper>;

package/types/controllers/post.d.ts

@@ -1,10 +1,10 @@
-import { IRequestAdapter } from '../interfaces/adapter';
-import { IController } from '../interfaces/controller';
-import { IRequestHandler, RequestProxyResult } from '../interfaces/request';
-import { SelectFields } from '../interfaces/types';
-import { PaginateResult } from '../models/base';
-import { PostModel } from '../models/post';
-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 { PostModel } from '../models/post';
+import type { HTTPClient } from '../core/client';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
         post: PostController<ResponseWrapper>;

package/types/controllers/project.d.ts

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

package/types/controllers/recently.d.ts

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

package/types/controllers/say.d.ts

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

package/types/controllers/search.d.ts

@@ -1,11 +1,11 @@
-import { IRequestAdapter } from '../interfaces/adapter';
-import { IController } from '../interfaces/controller';
-import { IRequestHandler, RequestProxyResult } from '../interfaces/request';
-import { PaginateResult } from '../models/base';
-import { NoteModel } from '../models/note';
-import { PostModel } from '../models/post';
-import { PageModel } from '..';
-import { HTTPClient } from '../core';
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { IController } from '../interfaces/controller';
+import type { IRequestHandler, RequestProxyResult } from '../interfaces/request';
+import type { PaginateResult } from '../models/base';
+import type { NoteModel } from '../models/note';
+import type { PostModel } from '../models/post';
+import type { PageModel } from '..';
+import type { HTTPClient } from '../core';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
         search: SearchController<ResponseWrapper>;

package/types/controllers/severless.d.ts

@@ -1,7 +1,7 @@
-import { IRequestAdapter } from '../interfaces/adapter';
-import { IController } from '../interfaces/controller';
-import { IRequestHandler } from '../interfaces/request';
-import { HTTPClient } from '../core';
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { IController } from '../interfaces/controller';
+import type { IRequestHandler } from '../interfaces/request';
+import type { HTTPClient } from '../core';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
         serverless: ServerlessController<ResponseWrapper>;

package/types/controllers/snippet.d.ts

@@ -1,7 +1,7 @@
-import { IRequestAdapter } from '../interfaces/adapter';
-import { IController } from '../interfaces/controller';
-import { IRequestHandler } from '../interfaces/request';
-import { HTTPClient } from '../core';
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { IController } from '../interfaces/controller';
+import type { IRequestHandler } from '../interfaces/request';
+import type { HTTPClient } from '../core';
 declare module '../core/client' {
     interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
         snippet: SnippetController<ResponseWrapper>;

package/types/controllers/topic.d.ts

@@ -0,0 +1,27 @@
+import type { IRequestAdapter } from '../interfaces/adapter';
+import type { IController } from '../interfaces/controller';
+import type { IRequestHandler } from '../interfaces/request';
+import type { SayModel } from '../models/say';
+import type { TopicModel } from '../models/topic';
+import type { HTTPClient } from '../core';
+import { BaseCrudController } from './base';
+declare module '../core/client' {
+    interface HTTPClient<T extends IRequestAdapter = IRequestAdapter, ResponseWrapper = unknown> {
+        topic: TopicController<ResponseWrapper>;
+    }
+}
+export declare class TopicController<ResponseWrapper> extends BaseCrudController<SayModel, ResponseWrapper> implements IController {
+    protected client: HTTPClient;
+    base: string;
+    name: string;
+    constructor(client: HTTPClient);
+    get proxy(): IRequestHandler<ResponseWrapper>;
+    getTopicBySlug(slug: string): import("../interfaces/request").RequestProxyResult<TopicModel, ResponseWrapper, ResponseWrapper extends unknown ? {
+        [key: string]: any;
+        data: TopicModel;
+    } : ResponseWrapper extends {
+        data: TopicModel;
+    } ? ResponseWrapper : Omit<ResponseWrapper, "data"> & {
+        data: TopicModel;
+    }>;
+}

package/types/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/types/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/types/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/types/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/types/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/types/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/types/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/types/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/types/models/note.d.ts

@@ -1,4 +1,5 @@
-import { TextBaseModel } from './base';
+import type { TextBaseModel } from './base';
+import type { TopicModel } from './topic';
 export interface NoteModel extends TextBaseModel {
     hide: boolean;
     count: {
@@ -14,6 +15,8 @@ export interface NoteModel extends TextBaseModel {
     music?: NoteMusicRecord[];
     location?: string;
     coordinates?: Coordinate;
+    topic?: TopicModel;
+    topicId?: string;
 }
 export interface NoteMusicRecord {
     type: string;

package/types/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/types/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/types/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/types/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/types/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/types/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/types/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/types/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/types/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/utils/index.ts

@@ -1,4 +1,4 @@
-import { SortOrder } from '~/interfaces/options'
+import type { SortOrder } from '~/interfaces/options'
 
 export const isPlainObject = (obj: any) =>
   isObject(obj) &&