From b22666694a6ee143f04e6d6ca50c1d46fb2c4d90 Mon Sep 17 00:00:00 2001 From: Innei Date: Sat, 10 Jun 2023 16:36:14 +0800 Subject: [PATCH] chore: lint Signed-off-by: Innei --- .../api-client/__tests__/core/client.test.ts | 13 ++++++----- .../__tests__/helpers/e2e-mock-server.ts | 2 +- .../api-client/__tests__/helpers/instance.ts | 6 +++-- .../api-client/__tests__/helpers/response.ts | 2 +- packages/api-client/adaptors/axios.ts | 6 ++--- packages/api-client/adaptors/fetch.ts | 4 ++-- packages/api-client/adaptors/ky.ts | 8 +++---- packages/api-client/adaptors/umi-request.ts | 6 ++--- packages/api-client/controllers/aggregate.ts | 14 +++++------ packages/api-client/controllers/base.ts | 8 +++---- packages/api-client/controllers/category.ts | 23 ++++++++++--------- packages/api-client/controllers/comment.ts | 18 +++++++-------- packages/api-client/controllers/link.ts | 7 +++--- packages/api-client/controllers/note.ts | 18 +++++++-------- packages/api-client/controllers/page.ts | 16 ++++++------- packages/api-client/controllers/post.ts | 16 ++++++------- packages/api-client/controllers/project.ts | 7 +++--- packages/api-client/controllers/recently.ts | 12 +++++----- packages/api-client/controllers/say.ts | 11 +++++---- packages/api-client/controllers/search.ts | 18 +++++++-------- packages/api-client/controllers/severless.ts | 10 ++++---- packages/api-client/controllers/snippet.ts | 10 ++++---- packages/api-client/controllers/subscribe.ts | 12 +++++----- packages/api-client/controllers/topic.ts | 11 +++++---- packages/api-client/controllers/user.ts | 12 +++++----- packages/api-client/core/attach-request.ts | 2 +- packages/api-client/interfaces/adapter.ts | 2 +- packages/api-client/interfaces/client.ts | 4 ++-- packages/api-client/models/aggregate.ts | 14 +++++------ packages/api-client/models/category.ts | 4 ++-- packages/api-client/models/comment.ts | 4 ++-- packages/api-client/models/link.ts | 2 +- packages/api-client/models/note.ts | 4 ++-- packages/api-client/models/page.ts | 2 +- packages/api-client/models/post.ts | 4 ++-- packages/api-client/models/project.ts | 2 +- packages/api-client/models/recently.ts | 2 +- packages/api-client/models/say.ts | 2 +- packages/api-client/models/snippet.ts | 2 +- packages/api-client/models/subscribe.ts | 2 +- packages/api-client/models/topic.ts | 2 +- packages/api-client/models/user.ts | 2 +- packages/api-client/tsconfig.json | 2 +- 43 files changed, 168 insertions(+), 160 deletions(-) diff --git a/packages/api-client/__tests__/core/client.test.ts b/packages/api-client/__tests__/core/client.test.ts index 6f27f991..004585f8 100644 --- a/packages/api-client/__tests__/core/client.test.ts +++ b/packages/api-client/__tests__/core/client.test.ts @@ -1,17 +1,18 @@ -import { AxiosError, AxiosResponse } from 'axios' +import { AxiosError } from 'axios' import { vi } from 'vitest' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { ClientOptions } from '~/interfaces/client' +import type { AxiosResponse } from 'axios' import { axiosAdaptor } from '~/adaptors/axios' import { umiAdaptor } from '~/adaptors/umi-request' import { - NoteController, - PostController, allContollerNames, allControllers, + NoteController, + PostController, } from '~/controllers' -import { RequestError, createClient } from '~/core' -import { IRequestAdapter } from '~/interfaces/adapter' -import { ClientOptions } from '~/interfaces/client' +import { createClient, RequestError } from '~/core' const { spyOn } = vi diff --git a/packages/api-client/__tests__/helpers/e2e-mock-server.ts b/packages/api-client/__tests__/helpers/e2e-mock-server.ts index 70a0581d..e3e7f9d8 100644 --- a/packages/api-client/__tests__/helpers/e2e-mock-server.ts +++ b/packages/api-client/__tests__/helpers/e2e-mock-server.ts @@ -1,6 +1,6 @@ import cors from 'cors' import express from 'express' -import { AddressInfo } from 'net' +import type { AddressInfo } from 'net' type Express = ReturnType export const createMockServer = (options: { port?: number } = {}) => { diff --git a/packages/api-client/__tests__/helpers/instance.ts b/packages/api-client/__tests__/helpers/instance.ts index e784e234..efb3eba3 100644 --- a/packages/api-client/__tests__/helpers/instance.ts +++ b/packages/api-client/__tests__/helpers/instance.ts @@ -1,6 +1,8 @@ +import type { HTTPClient } from '~/core' +import type { IController } from '~/interfaces/controller' + import { axiosAdaptor } from '~/adaptors/axios' -import { HTTPClient, createClient } from '~/core' -import { IController } from '~/interfaces/controller' +import { createClient } from '~/core' export const mockRequestInstance = ( injectController: new (client: HTTPClient) => IController, diff --git a/packages/api-client/__tests__/helpers/response.ts b/packages/api-client/__tests__/helpers/response.ts index 53a15c4e..2c5d6a28 100644 --- a/packages/api-client/__tests__/helpers/response.ts +++ b/packages/api-client/__tests__/helpers/response.ts @@ -1,6 +1,6 @@ import isEqual from 'lodash/isEqual' -import { URLSearchParams } from 'url' import { vi } from 'vitest' +import type { URLSearchParams } from 'url' import { axiosAdaptor } from '~/adaptors/axios' diff --git a/packages/api-client/adaptors/axios.ts b/packages/api-client/adaptors/axios.ts index 3753c711..0daee9ff 100644 --- a/packages/api-client/adaptors/axios.ts +++ b/packages/api-client/adaptors/axios.ts @@ -1,6 +1,6 @@ -import axios, { AxiosInstance, AxiosResponse } from 'axios' - -import { IRequestAdapter } from '~/interfaces/adapter' +import axios from 'axios' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { AxiosInstance, AxiosResponse } from 'axios' // eslint-disable-next-line spaced-comment const $http = /*#__PURE__*/ axios.create({}) diff --git a/packages/api-client/adaptors/fetch.ts b/packages/api-client/adaptors/fetch.ts index 4ca1e6a3..0791158f 100644 --- a/packages/api-client/adaptors/fetch.ts +++ b/packages/api-client/adaptors/fetch.ts @@ -1,5 +1,5 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { RequestOptions } from '~/interfaces/instance' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { RequestOptions } from '~/interfaces/instance' const jsonDataAttachResponse = async (response: Response) => { const cloned = response.clone() diff --git a/packages/api-client/adaptors/ky.ts b/packages/api-client/adaptors/ky.ts index aa25aa00..63b26f5b 100644 --- a/packages/api-client/adaptors/ky.ts +++ b/packages/api-client/adaptors/ky.ts @@ -1,7 +1,7 @@ -import ky, { Options, ResponsePromise } from 'ky' -import { KyInstance } from 'ky/distribution/types/ky' - -import { IRequestAdapter } from '~/interfaces/adapter' +import ky from 'ky' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { Options, ResponsePromise } from 'ky' +import type { KyInstance } from 'ky/distribution/types/ky' // eslint-disable-next-line spaced-comment const $http: KyInstance = /*#__PURE__*/ ky.create({}) diff --git a/packages/api-client/adaptors/umi-request.ts b/packages/api-client/adaptors/umi-request.ts index e666405e..0c8dd963 100644 --- a/packages/api-client/adaptors/umi-request.ts +++ b/packages/api-client/adaptors/umi-request.ts @@ -1,6 +1,6 @@ -import { RequestMethod, RequestResponse, extend } from 'umi-request' - -import { IRequestAdapter } from '~/interfaces/adapter' +import { extend } from 'umi-request' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { RequestMethod, RequestResponse } from 'umi-request' // eslint-disable-next-line spaced-comment const $http = /*#__PURE__*/ extend({ diff --git a/packages/api-client/controllers/aggregate.ts b/packages/api-client/controllers/aggregate.ts index 637abf4a..6947f0ac 100644 --- a/packages/api-client/controllers/aggregate.ts +++ b/packages/api-client/controllers/aggregate.ts @@ -1,19 +1,19 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { IController } from '~/interfaces/controller' -import { SortOrder } from '~/interfaces/options' -import { IRequestHandler, RequestProxyResult } from '~/interfaces/request' -import { +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' + import { sortOrderToNumber } from '~/utils' import { autoBind } from '~/utils/auto-bind' -import { HTTPClient } from '../core' - declare module '../core/client' { interface HTTPClient< T extends IRequestAdapter = IRequestAdapter, diff --git a/packages/api-client/controllers/base.ts b/packages/api-client/controllers/base.ts index 6cb4cea5..40796367 100644 --- a/packages/api-client/controllers/base.ts +++ b/packages/api-client/controllers/base.ts @@ -1,8 +1,8 @@ -import { IRequestHandler, RequestProxyResult } from '~/interfaces/request' -import { PaginateResult } from '~/models/base' -import { autoBind } from '~/utils/auto-bind' +import type { IRequestHandler, RequestProxyResult } from '~/interfaces/request' +import type { PaginateResult } from '~/models/base' +import type { HTTPClient } from '../core' -import { HTTPClient } from '../core' +import { autoBind } from '~/utils/auto-bind' export type SortOptions = { sortBy?: string diff --git a/packages/api-client/controllers/category.ts b/packages/api-client/controllers/category.ts index b217eae3..acd99ce3 100644 --- a/packages/api-client/controllers/category.ts +++ b/packages/api-client/controllers/category.ts @@ -1,23 +1,24 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { IController } from '~/interfaces/controller' -import { +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { IController } from '~/interfaces/controller' +import type { IRequestHandler, RequestProxyResult, ResponseProxyExtraRaw, } from '~/interfaces/request' -import { attachRawFromOneToAnthor, destructureData } from '~/utils' -import { autoBind } from '~/utils/auto-bind' - -import { HTTPClient } from '../core/client' -import { RequestError } from '../core/error' -import { +import type { HTTPClient } from '../core/client' +import type { CategoryEntries, CategoryModel, - CategoryType, CategoryWithChildrenModel, TagModel, } from '../models/category' -import { PostModel } from '../models/post' +import type { PostModel } from '../models/post' + +import { attachRawFromOneToAnthor, destructureData } from '~/utils' +import { autoBind } from '~/utils/auto-bind' + +import { RequestError } from '../core/error' +import { CategoryType } from '../models/category' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/controllers/comment.ts b/packages/api-client/controllers/comment.ts index eb1ca36b..55270c78 100644 --- a/packages/api-client/controllers/comment.ts +++ b/packages/api-client/controllers/comment.ts @@ -1,13 +1,13 @@ -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 { autoBind } from '~/utils/auto-bind' +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' -import { HTTPClient } from '../core' -import { CommentDto } from '../dtos/comment' +import { autoBind } from '~/utils/auto-bind' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/controllers/link.ts b/packages/api-client/controllers/link.ts index 9c9000b2..73233d83 100644 --- a/packages/api-client/controllers/link.ts +++ b/packages/api-client/controllers/link.ts @@ -1,8 +1,9 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { LinkModel } from '~/models/link' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { LinkModel } from '~/models/link' +import type { HTTPClient } from '../core' + import { autoBind } from '~/utils/auto-bind' -import { HTTPClient } from '../core' import { BaseCrudController } from './base' declare module '../core/client' { diff --git a/packages/api-client/controllers/note.ts b/packages/api-client/controllers/note.ts index 6002123e..c52f9539 100644 --- a/packages/api-client/controllers/note.ts +++ b/packages/api-client/controllers/note.ts @@ -1,17 +1,17 @@ -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 { +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, NoteWrappedWithLikedPayload, } from '~/models/note' -import { autoBind } from '~/utils/auto-bind' +import type { HTTPClient } from '../core/client' +import type { SortOptions } from './base' -import { HTTPClient } from '../core/client' -import { SortOptions } from './base' +import { autoBind } from '~/utils/auto-bind' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/controllers/page.ts b/packages/api-client/controllers/page.ts index db140749..f5aa279e 100644 --- a/packages/api-client/controllers/page.ts +++ b/packages/api-client/controllers/page.ts @@ -1,12 +1,12 @@ -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 { autoBind } from '~/utils/auto-bind' +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' -import { HTTPClient } from '../core' +import { autoBind } from '~/utils/auto-bind' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/controllers/post.ts b/packages/api-client/controllers/post.ts index aa527fa4..50b47a77 100644 --- a/packages/api-client/controllers/post.ts +++ b/packages/api-client/controllers/post.ts @@ -1,12 +1,12 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { IController } from '~/interfaces/controller' -import { IRequestHandler, RequestProxyResult } from '~/interfaces/request' -import { SelectFields } from '~/interfaces/types' -import { ModelWithLiked, PaginateResult } from '~/models/base' -import { PostModel } from '~/models/post' -import { autoBind } from '~/utils/auto-bind' +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 { ModelWithLiked, PaginateResult } from '~/models/base' +import type { PostModel } from '~/models/post' +import type { HTTPClient } from '../core/client' -import { HTTPClient } from '../core/client' +import { autoBind } from '~/utils/auto-bind' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/controllers/project.ts b/packages/api-client/controllers/project.ts index 797adb58..7287cc2c 100644 --- a/packages/api-client/controllers/project.ts +++ b/packages/api-client/controllers/project.ts @@ -1,8 +1,9 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { ProjectModel } from '~/models/project' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { ProjectModel } from '~/models/project' +import type { HTTPClient } from '../core' + import { autoBind } from '~/utils/auto-bind' -import { HTTPClient } from '../core' import { BaseCrudController } from './base' declare module '../core/client' { diff --git a/packages/api-client/controllers/recently.ts b/packages/api-client/controllers/recently.ts index 2fd93941..7d6f7767 100644 --- a/packages/api-client/controllers/recently.ts +++ b/packages/api-client/controllers/recently.ts @@ -1,10 +1,10 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { IController } from '~/interfaces/controller' -import { IRequestHandler } from '~/interfaces/request' -import { RecentlyModel } from '~/models/recently' -import { autoBind } from '~/utils/auto-bind' +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' -import { HTTPClient } from '../core' +import { autoBind } from '~/utils/auto-bind' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/controllers/say.ts b/packages/api-client/controllers/say.ts index 8dec10c9..e2fa5cb0 100644 --- a/packages/api-client/controllers/say.ts +++ b/packages/api-client/controllers/say.ts @@ -1,10 +1,11 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { IController } from '~/interfaces/controller' -import { IRequestHandler } from '~/interfaces/request' -import { SayModel } from '~/models/say' +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 { autoBind } from '~/utils/auto-bind' -import { HTTPClient } from '../core' import { BaseCrudController } from './base' declare module '../core/client' { diff --git a/packages/api-client/controllers/search.ts b/packages/api-client/controllers/search.ts index 03f58996..0408cd44 100644 --- a/packages/api-client/controllers/search.ts +++ b/packages/api-client/controllers/search.ts @@ -1,13 +1,13 @@ -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 { autoBind } from '~/utils/auto-bind' +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' -import { PageModel } from '..' -import { HTTPClient } from '../core' +import { autoBind } from '~/utils/auto-bind' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/controllers/severless.ts b/packages/api-client/controllers/severless.ts index 280990a6..93b78b45 100644 --- a/packages/api-client/controllers/severless.ts +++ b/packages/api-client/controllers/severless.ts @@ -1,9 +1,9 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { IController } from '~/interfaces/controller' -import { IRequestHandler } from '~/interfaces/request' -import { autoBind } from '~/utils/auto-bind' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { IController } from '~/interfaces/controller' +import type { IRequestHandler } from '~/interfaces/request' +import type { HTTPClient } from '../core' -import { HTTPClient } from '../core' +import { autoBind } from '~/utils/auto-bind' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/controllers/snippet.ts b/packages/api-client/controllers/snippet.ts index d4de986f..b36342f8 100644 --- a/packages/api-client/controllers/snippet.ts +++ b/packages/api-client/controllers/snippet.ts @@ -1,9 +1,9 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { IController } from '~/interfaces/controller' -import { IRequestHandler } from '~/interfaces/request' -import { autoBind } from '~/utils/auto-bind' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { IController } from '~/interfaces/controller' +import type { IRequestHandler } from '~/interfaces/request' +import type { HTTPClient } from '../core' -import { HTTPClient } from '../core' +import { autoBind } from '~/utils/auto-bind' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/controllers/subscribe.ts b/packages/api-client/controllers/subscribe.ts index 62b9fe22..f808ab01 100644 --- a/packages/api-client/controllers/subscribe.ts +++ b/packages/api-client/controllers/subscribe.ts @@ -1,10 +1,10 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { IController } from '~/interfaces/controller' -import { IRequestHandler } from '~/interfaces/request' -import { SubscribeType } from '~/models/subscribe' -import { autoBind } from '~/utils/auto-bind' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { IController } from '~/interfaces/controller' +import type { IRequestHandler } from '~/interfaces/request' +import type { SubscribeType } from '~/models/subscribe' +import type { HTTPClient } from '../core' -import { HTTPClient } from '../core' +import { autoBind } from '~/utils/auto-bind' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/controllers/topic.ts b/packages/api-client/controllers/topic.ts index 76a51419..04e19728 100644 --- a/packages/api-client/controllers/topic.ts +++ b/packages/api-client/controllers/topic.ts @@ -1,10 +1,11 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { IController } from '~/interfaces/controller' -import { IRequestHandler } from '~/interfaces/request' -import { TopicModel } from '~/models/topic' +import type { IRequestAdapter } from '~/interfaces/adapter' +import type { IController } from '~/interfaces/controller' +import type { IRequestHandler } from '~/interfaces/request' +import type { TopicModel } from '~/models/topic' +import type { HTTPClient } from '../core' + import { autoBind } from '~/utils/auto-bind' -import { HTTPClient } from '../core' import { BaseCrudController } from './base' declare module '../core/client' { diff --git a/packages/api-client/controllers/user.ts b/packages/api-client/controllers/user.ts index 4362ac72..4f4ea3b8 100644 --- a/packages/api-client/controllers/user.ts +++ b/packages/api-client/controllers/user.ts @@ -1,10 +1,10 @@ -import { IRequestAdapter } from '~/interfaces/adapter' -import { IController } from '~/interfaces/controller' -import { IRequestHandler } from '~/interfaces/request' -import { TLogin, UserModel } from '~/models/user' -import { autoBind } from '~/utils/auto-bind' +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' -import { HTTPClient } from '../core' +import { autoBind } from '~/utils/auto-bind' declare module '../core/client' { interface HTTPClient< diff --git a/packages/api-client/core/attach-request.ts b/packages/api-client/core/attach-request.ts index 5340740e..11f9d38d 100644 --- a/packages/api-client/core/attach-request.ts +++ b/packages/api-client/core/attach-request.ts @@ -1,4 +1,4 @@ -import { HTTPClient } from '.' +import type { HTTPClient } from '.' export function attachRequestMethod>(target: T) { Object.defineProperty(target, '$$get', { diff --git a/packages/api-client/interfaces/adapter.ts b/packages/api-client/interfaces/adapter.ts index 86932486..5f5a19c7 100644 --- a/packages/api-client/interfaces/adapter.ts +++ b/packages/api-client/interfaces/adapter.ts @@ -1,4 +1,4 @@ -import { RequestOptions } from './instance' +import type { RequestOptions } from './instance' export type IAdaptorRequestResponseType

= Promise< Record & { data: P } diff --git a/packages/api-client/interfaces/client.ts b/packages/api-client/interfaces/client.ts index 0b47ab63..4974fad0 100644 --- a/packages/api-client/interfaces/client.ts +++ b/packages/api-client/interfaces/client.ts @@ -1,5 +1,5 @@ -import { IController } from './controller' -import { Class } from './types' +import type { IController } from './controller' +import type { Class } from './types' interface IClientOptions { controllers: Class[] diff --git a/packages/api-client/models/aggregate.ts b/packages/api-client/models/aggregate.ts index f38c6f53..5b655c46 100644 --- a/packages/api-client/models/aggregate.ts +++ b/packages/api-client/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 diff --git a/packages/api-client/models/category.ts b/packages/api-client/models/category.ts index 499356bb..785ab870 100644 --- a/packages/api-client/models/category.ts +++ b/packages/api-client/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, diff --git a/packages/api-client/models/comment.ts b/packages/api-client/models/comment.ts index 92d80a00..1346a482 100644 --- a/packages/api-client/models/comment.ts +++ b/packages/api-client/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', diff --git a/packages/api-client/models/link.ts b/packages/api-client/models/link.ts index ce1d2c00..69d61bcc 100644 --- a/packages/api-client/models/link.ts +++ b/packages/api-client/models/link.ts @@ -1,4 +1,4 @@ -import { BaseModel } from './base' +import type { BaseModel } from './base' export enum LinkType { Friend, diff --git a/packages/api-client/models/note.ts b/packages/api-client/models/note.ts index 52078195..705b48f7 100644 --- a/packages/api-client/models/note.ts +++ b/packages/api-client/models/note.ts @@ -1,5 +1,5 @@ -import { ModelWithLiked, TextBaseModel } from './base' -import { TopicModel } from './topic' +import type { ModelWithLiked, TextBaseModel } from './base' +import type { TopicModel } from './topic' export interface NoteModel extends TextBaseModel { hide: boolean diff --git a/packages/api-client/models/page.ts b/packages/api-client/models/page.ts index bd05817f..5e29a42a 100644 --- a/packages/api-client/models/page.ts +++ b/packages/api-client/models/page.ts @@ -1,4 +1,4 @@ -import { TextBaseModel } from './base' +import type { TextBaseModel } from './base' export enum EnumPageType { 'md' = 'md', diff --git a/packages/api-client/models/post.ts b/packages/api-client/models/post.ts index 4f1c5e91..f3408115 100644 --- a/packages/api-client/models/post.ts +++ b/packages/api-client/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 diff --git a/packages/api-client/models/project.ts b/packages/api-client/models/project.ts index 160abf3e..3530a884 100644 --- a/packages/api-client/models/project.ts +++ b/packages/api-client/models/project.ts @@ -1,4 +1,4 @@ -import { BaseModel } from './base' +import type { BaseModel } from './base' export interface ProjectModel extends BaseModel { name: string diff --git a/packages/api-client/models/recently.ts b/packages/api-client/models/recently.ts index 7e23ee5e..f8db3581 100644 --- a/packages/api-client/models/recently.ts +++ b/packages/api-client/models/recently.ts @@ -1,4 +1,4 @@ -import { BaseCommentIndexModel } from './base' +import type { BaseCommentIndexModel } from './base' export enum RecentlyRefTypes { Post = 'Post', diff --git a/packages/api-client/models/say.ts b/packages/api-client/models/say.ts index 93c2b1a9..28491cba 100644 --- a/packages/api-client/models/say.ts +++ b/packages/api-client/models/say.ts @@ -1,4 +1,4 @@ -import { BaseModel } from './base' +import type { BaseModel } from './base' export interface SayModel extends BaseModel { text: string diff --git a/packages/api-client/models/snippet.ts b/packages/api-client/models/snippet.ts index 9cca5c92..560c1377 100644 --- a/packages/api-client/models/snippet.ts +++ b/packages/api-client/models/snippet.ts @@ -1,4 +1,4 @@ -import { BaseModel } from './base' +import type { BaseModel } from './base' export enum SnippetType { JSON = 'json', diff --git a/packages/api-client/models/subscribe.ts b/packages/api-client/models/subscribe.ts index ad03e797..adeab96b 100644 --- a/packages/api-client/models/subscribe.ts +++ b/packages/api-client/models/subscribe.ts @@ -1,4 +1,4 @@ -import { SubscribeTypeToBitMap } from '@core/modules/subscribe/subscribe.constant' +import type { SubscribeTypeToBitMap } from '@core/modules/subscribe/subscribe.constant' export * from '@core/modules/subscribe/subscribe.constant' diff --git a/packages/api-client/models/topic.ts b/packages/api-client/models/topic.ts index 8d761da8..ffe79164 100644 --- a/packages/api-client/models/topic.ts +++ b/packages/api-client/models/topic.ts @@ -1,4 +1,4 @@ -import { BaseModel } from './base' +import type { BaseModel } from './base' export interface TopicModel extends BaseModel { description?: string diff --git a/packages/api-client/models/user.ts b/packages/api-client/models/user.ts index 378076c3..15d25d4d 100644 --- a/packages/api-client/models/user.ts +++ b/packages/api-client/models/user.ts @@ -1,4 +1,4 @@ -import { BaseModel } from './base' +import type { BaseModel } from './base' export interface UserModel extends BaseModel { introduce: string diff --git a/packages/api-client/tsconfig.json b/packages/api-client/tsconfig.json index d4ae8099..5da20c02 100644 --- a/packages/api-client/tsconfig.json +++ b/packages/api-client/tsconfig.json @@ -23,7 +23,7 @@ "*" ], "@core/*": [ - "../../src/*" + "../../apps/core/src/*" ], } },