From 7ca7785b01a496bc3cf42d575fb7818526f5e733 Mon Sep 17 00:00:00 2001 From: simeng_li Date: Wed, 11 Aug 2021 21:04:12 +0800 Subject: [PATCH] refactor: move error types to schema bundle move error types to schema bundle --- packages/core/src/errors/RequestError/index.ts | 4 +--- packages/core/src/middleware/koa-error-handler.ts | 3 ++- .../errors/RequestError/types.ts => schemas/src/api/error.ts} | 0 packages/schemas/src/api/index.ts | 1 + packages/schemas/src/index.ts | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) rename packages/{core/src/errors/RequestError/types.ts => schemas/src/api/error.ts} (100%) create mode 100644 packages/schemas/src/api/index.ts diff --git a/packages/core/src/errors/RequestError/index.ts b/packages/core/src/errors/RequestError/index.ts index df5a8ff05..2179a77c8 100644 --- a/packages/core/src/errors/RequestError/index.ts +++ b/packages/core/src/errors/RequestError/index.ts @@ -1,9 +1,7 @@ import pick from 'lodash.pick'; import i18next from 'i18next'; import { LogtoErrorCode } from '@logto/phrases'; -import { RequestErrorBody, RequestErrorMetadata } from './types'; - -export * from './types'; +import { RequestErrorBody, RequestErrorMetadata } from '@logto/schemas'; export default class RequestError extends Error { code: LogtoErrorCode; diff --git a/packages/core/src/middleware/koa-error-handler.ts b/packages/core/src/middleware/koa-error-handler.ts index cd22f2797..cd4c1cb9b 100644 --- a/packages/core/src/middleware/koa-error-handler.ts +++ b/packages/core/src/middleware/koa-error-handler.ts @@ -1,4 +1,5 @@ -import RequestError, { RequestErrorBody } from '@/errors/RequestError'; +import RequestError from '@/errors/RequestError'; +import { RequestErrorBody } from '@logto/schemas'; import decamelize from 'decamelize'; import { Middleware } from 'koa'; import { errors } from 'oidc-provider'; diff --git a/packages/core/src/errors/RequestError/types.ts b/packages/schemas/src/api/error.ts similarity index 100% rename from packages/core/src/errors/RequestError/types.ts rename to packages/schemas/src/api/error.ts diff --git a/packages/schemas/src/api/index.ts b/packages/schemas/src/api/index.ts new file mode 100644 index 000000000..93ae819ea --- /dev/null +++ b/packages/schemas/src/api/index.ts @@ -0,0 +1 @@ +export * from './error'; diff --git a/packages/schemas/src/index.ts b/packages/schemas/src/index.ts index 5f8b52015..1d7a54cb3 100644 --- a/packages/schemas/src/index.ts +++ b/packages/schemas/src/index.ts @@ -1,2 +1,3 @@ export * from './foundations'; export * from './db-entries'; +export * from './api';