Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions examples/auth5-intl/src/middleware.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import { auth } from "@/auth";
import createMiddleware from "next-intl/middleware";
import { chain, FinalNextResponse } from "@nimpl/middleware-chain";
import { Middleware } from "@nimpl/middleware-chain/dist/lib/types";
import { chain, FinalNextResponse, type Middleware } from "@nimpl/middleware-chain";

const intlMiddleware = createMiddleware({
locales: ["en", "dk"],
Expand Down
2 changes: 1 addition & 1 deletion package/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nimpl/middleware-chain",
"version": "0.5.1",
"version": "0.5.2",
"description": "The package allows you to create a chain of native next.js middlewares without any modifications",
"main": "./dist/chain.js",
"files": [
Expand Down
5 changes: 3 additions & 2 deletions package/src/chain.ts
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
import { type NextFetchEvent } from "next/server";
import { type NextFetchEvent, type NextRequest, type NextResponse } from "next/server";
import { type ChainItem, type ChainConfig, type BaseRequest } from "./lib/types";
import { collectData } from "./lib/collect-data";
import { formatResponse } from "./lib/format-response";
import { Logger } from "./lib/logger";

export { type ChainItem, type ChainConfig, type BaseRequest, type Middleware } from "./lib/types";
export { FinalNextResponse } from "./lib/final-next-response";

export const chain =
<RequestType extends Request & BaseRequest, ResponseType extends Response>(
<RequestType extends Request & BaseRequest = NextRequest, ResponseType extends Response = NextResponse>(
middlewares: ChainItem<RequestType, ResponseType>[],
config?: ChainConfig,
) =>
Expand Down
10 changes: 5 additions & 5 deletions package/src/lib/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { type ResponseCookie } from "next/dist/compiled/@edge-runtime/cookies";
import { type NextFetchEvent } from "next/server";
import { type NextRequest, type NextResponse, type NextFetchEvent } from "next/server";
import { type FinalNextResponse, type FinalSymbol } from "./final-next-response";
import { type Logger } from "./logger";

Expand All @@ -23,24 +23,24 @@ export interface ChainNextRequest extends BaseRequest {
summary: Readonly<Summary>;
}

export type ChainNextResponse<ResponseType extends Response> =
export type ChainNextResponse<ResponseType extends Response = Response> =
| FinalNextResponse
| (ResponseType & { [FinalSymbol]?: undefined });

export type MiddlewareResult<ResponseType extends Response> =
export type MiddlewareResult<ResponseType extends Response = Response> =
| ChainNextResponse<ResponseType>
| Response
| void
| undefined
| null
| Promise<MiddlewareResult<ResponseType>>;

export type Middleware<T extends BaseRequest, ResponseType extends Response> = (
export type Middleware<T extends BaseRequest = NextRequest, ResponseType extends Response = NextResponse> = (
req: ChainNextRequest & T,
event: NextFetchEvent,
) => MiddlewareResult<ResponseType>;

export type ChainItem<T extends BaseRequest, ResponseType extends Response> =
export type ChainItem<T extends BaseRequest = NextRequest, ResponseType extends Response = NextResponse> =
| Middleware<T, ResponseType>
| [Middleware<T, ResponseType>, { include?: RegExp; exclude?: RegExp }?];

Expand Down