From 04e60a01d8442f0a6ca99ded84843936b5664f29 Mon Sep 17 00:00:00 2001 From: rtritto Date: Mon, 30 Sep 2024 13:13:18 +0200 Subject: [PATCH 1/5] chore!: bump Elysia to v1 --- bun.lockb | Bin 50450 -> 49623 bytes package.json | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bun.lockb b/bun.lockb index db2cbd5a0800bcca53631541090588e36926a451..60cf686df45144f606e09e2ea3051f575874f538 100755 GIT binary patch delta 5759 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 R`G+L>Ro>@-T2D4@8tCP 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 0.6.0-alpha.1" + "elysia": "^1" }, "exports": { "require": "./dist/cjs/index.js", From 4aa081d87784efecb1da9b1893f7b748e6d95b25 Mon Sep 17 00:00:00 2001 From: rtritto Date: Mon, 30 Sep 2024 13:13:28 +0200 Subject: [PATCH 2/5] fix: context parameter of handleError --- src/index.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/index.ts b/src/index.ts index a27058f..a4077c8 100644 --- a/src/index.ts +++ b/src/index.ts @@ -108,7 +108,7 @@ export const node = return void toResponse( res, // @ts-ignore - await app.handleError(request, error as Error, set) + await app.handleError({ request, set }, error as Error) ) } }) @@ -140,14 +140,14 @@ export const node = const response = mapResponse( // @ts-ignore - await app.handleError(request, new NotFoundError(), set), + await app.handleError({ request, set }, new NotFoundError()), set ) await toResponse( res, // @ts-ignore - await app.handleError(request, new NotFoundError(), set) + await app.handleError({ request, set }, new NotFoundError()) ) }) From 2d3ab1e4706d8aef085af517b9f083724bc8a53e Mon Sep 17 00:00:00 2001 From: rtritto Date: Mon, 30 Sep 2024 13:48:50 +0200 Subject: [PATCH 3/5] fix: type --- src/index.ts | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/index.ts b/src/index.ts index a4077c8..40e193e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -40,8 +40,7 @@ const toResponse = async (res: HttpResponse, response: Response) => { export const node = (port: number, callback: (socket: us_listen_socket) => any = () => {}) => (app: Elysia) => { - // @ts-ignore - const routes: InternalRoute[] = app.routes + const routes: InternalRoute[] = app.routes const server = App() From 6ccf9099b815d86503623f2e6b30ae4207f1ecb6 Mon Sep 17 00:00:00 2001 From: rtritto Date: Mon, 30 Sep 2024 19:45:49 +0200 Subject: [PATCH 4/5] fix: context from decorators to decorator --- src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index 40e193e..e92f93a 100644 --- a/src/index.ts +++ b/src/index.ts @@ -82,7 +82,7 @@ export const node = } const context = { - ...app.decorators, + ...app.decorator, set, params, store: app.store, From 09450865ad1e28b76c3cad469f7e5620d38f30dc Mon Sep 17 00:00:00 2001 From: rtritto Date: Tue, 8 Oct 2024 21:30:56 +0200 Subject: [PATCH 5/5] fix: type --- src/index.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/index.ts b/src/index.ts index e92f93a..3661750 100644 --- a/src/index.ts +++ b/src/index.ts @@ -10,6 +10,7 @@ import { mapResponse, mapEarlyResponse, NotFoundError, + type ComposedHandler, type Context, type HTTPMethod, type InternalRoute @@ -102,7 +103,7 @@ export const node = } try { - return void toResponse(res, await handle(context)) + return void toResponse(res, await (handle as ComposedHandler)(context)) } catch (error) { return void toResponse( res,