Merge pull request #16 from vordgi/nmc-15

nmc-15 chain item rules

Author: vordgi

examples/auth-intl/src/app/dk/page.tsx

@@ -1,7 +1,7 @@
 export default function Home() {
     return (
         <div>
-            <p>Home page</p>
+            <p>Home page (dk)</p>
         </div>
     );
 }

examples/auth-intl/src/app/en/page.tsx

@@ -1,7 +1,7 @@
 export default function Home() {
     return (
         <div>
-            <p>Home page</p>
+            <p>Home page (en)</p>
         </div>
     );
 }

examples/auth-intl/src/app/private/page.tsx

@@ -0,0 +1,7 @@
+export default function Private() {
+    return (
+        <div>
+            <p>Private page</p>
+        </div>
+    );
+}

examples/auth-intl/src/middleware.ts

@@ -8,11 +8,11 @@ const intlMiddleware = createMiddleware({
 });
 
 export default chain([
-    intlMiddleware,
+    [intlMiddleware, { exclude: /^\/private(\/.*)?$/ }],
     (req) => {
         if (req.summary.type === "redirect") return FinalNextResponse.next();
     },
-    nextAuth,
+    [nextAuth, { include: /^\/private(\/.*)?$/ }],
 ]);
 
 export const config = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nimpl/middleware-chain",
-  "version": "0.1.3",
+  "version": "0.2.0",
   "description": "",
   "main": "./dist/chain.js",
   "files": [
@@ -33,4 +33,4 @@
     "next": ">= 14.0.0",
     "react": ">= 18.2.0"
   }
-}
+}

package/src/chain.ts

@@ -1,10 +1,10 @@
 import { type NextRequest } from "next/server";
 import { collectData } from "./lib/collect-data";
-import { Middleware } from "./lib/types";
+import { ChainItem } from "./lib/types";
 import { formatResponse } from "./lib/format-response";
 export { FinalNextResponse } from "./lib/final-next-response";
 
-export const chain = (middlewares: Middleware[]) => async (req: NextRequest) => {
+export const chain = (middlewares: ChainItem[]) => async (req: NextRequest) => {
     const summary = await collectData(req, middlewares);
     const next = formatResponse(summary);
 

package/src/lib/collect-data.ts

@@ -1,9 +1,9 @@
 import { NextResponse, type NextRequest } from "next/server";
-import { type ChainNextResponse, type Middleware, type Summary } from "./types";
+import { ChainItem, Middleware, type ChainNextResponse, type Summary } from "./types";
 import { FinalSymbol } from "./final-next-response";
 import { INTERNAL_HEADERS } from "./constants";
 
-export const collectData = async (req: NextRequest, middlewares: Middleware[]) => {
+export const collectData = async (req: NextRequest, chainItems: ChainItem[]) => {
     const summary: Summary = {
         type: "none",
         destination: req.nextUrl,
@@ -13,7 +13,21 @@ export const collectData = async (req: NextRequest, middlewares: Middleware[]) =
         body: undefined,
     };
 
-    for await (const middleware of middlewares) {
+    for await (const chainItem of chainItems) {
+        let middleware: Middleware;
+        if (Array.isArray(chainItem)) {
+            const [itemMiddleware, itemRules] = chainItem;
+            if (
+                itemRules &&
+                ((itemRules.include && !itemRules.include?.test(req.nextUrl.pathname)) ||
+                    itemRules.exclude?.test(req.nextUrl.pathname))
+            ) {
+                continue;
+            }
+            middleware = itemMiddleware;
+        } else {
+            middleware = chainItem;
+        }
         const middlewareNext = await middleware(Object.assign(req, { summary: Object.freeze({ ...summary }) }));
 
         if (!middlewareNext) continue;

package/src/lib/types.ts

@@ -24,3 +24,5 @@ export type ChainNextResponse = FinalNextResponse | (NextResponse & { [FinalSymb
 export type MiddlewareResult = ChainNextResponse | Response | void | undefined | null | Promise<MiddlewareResult>;
 
 export type Middleware = (req: ChainNextRequest) => MiddlewareResult;
+
+export type ChainItem = Middleware | [Middleware, { include?: RegExp; exclude?: RegExp }?];