Merge pull request #3 from triyanox/fix/fix-path-type

Fix/fix path type

Author: chaqchase

CHANGELOG.md

@@ -1,5 +1,11 @@
 # @triyanox/next-middleware
 
+## 0.1.4
+
+### Patch Changes
+
+- fix: fix the `Path<T>` for `RuleFunction` #2
+
 ## 0.1.3
 
 ### Patch Changes

README.md

@@ -80,7 +80,7 @@ const isAdmin: RuleFunction<Data, typeof routes> = ({ data, next, redirect }) =>
   }
 };
 
-const isOwnWorkspace: RuleFunction<Data, typeof routes, '/dashboard/workspaces/[workspaceId]/*'> = ({
+const isOwnWorkspace: RuleFunction<Data, typeof routes, '/dashboard/workspaces/[workspaceId]'> = ({
   data,
   next,
   redirect,

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@triyanox/next-middleware",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "The cleanest way to protect your Next.js routes with a middleware",
   "license": "MIT",
   "publishConfig": {

src/types.ts

@@ -1,12 +1,15 @@
-import { NextRequest, NextResponse } from 'next/server';
+import { NextRequest, NextResponse, NextFetchEvent } from 'next/server';
 
 type Path<R extends string> = R | (R extends '/' ? `${R}*` : `${R}/*`);
-
 /**
  * The type of the routes object
  */
-type Routes = Record<string, { path: string }>;
-
+type Routes = Record<
+  string,
+  {
+    path: string;
+  }
+>;
 /**
  * Extracts the parameters from a dynamic path
  */
@@ -15,40 +18,35 @@ type ExtractParams<R extends string> = string extends R
   : R extends `${infer _Start}/[${infer Param}]${infer _Rest}`
     ? [Param, ...ExtractParams<_Rest>]
     : [];
-
 /**
  * Checks if a path has parameters
  */
 type HasParams<R extends string> = ExtractParams<R> extends [] ? false : true;
-
 /**
  * Extracts the parameters from a dynamic path if it has any
  */
 type ParamsObject<R extends string> =
   HasParams<R> extends true ? Record<ExtractParams<R>[number], string> : never;
-
 /**
  * This is the type of the function that will be used to define the rules for each path
  */
 type RuleFunction<
   T,
   RS extends Routes,
-  R extends Path<keyof RS & string> = keyof RS & string,
+  R extends keyof RS & string = keyof RS & string,
 > = (options: {
   data: T;
   path: R;
   params: ParamsObject<R>;
   next: () => void;
   redirect: (path: keyof RS & string) => void;
 }) => Promise<void> | void;
-
 /**
  * Authorization rules for each path
  */
 type AuthRules<T, RS extends Routes, R extends keyof RS & string> = Partial<
-  Record<Path<R>, RuleFunction<T, RS, R>[]>
+  Record<Path<keyof RS & string>, RuleFunction<T, RS, R>[]>
 >;
-
 type BaseOptions<R extends Routes, T> = {
   /**
    * Function to fetch data so that it can be used in the authorization rules
@@ -57,7 +55,7 @@ type BaseOptions<R extends Routes, T> = {
   /**
    * Authorization rules for each path
    */
-  rules: AuthRules<T, R, keyof R & string>;
+  rules: AuthRules<T, R, any>;
   /**
    * Paths that requiring authentication
    * Those paths will be the root paths of all the existing paths
@@ -68,7 +66,6 @@ type BaseOptions<R extends Routes, T> = {
    */
   onError?: (req: NextRequest) => Promise<NextResponse> | NextResponse;
 };
-
 type MiddlewareOptions<R extends Routes, T> = BaseOptions<R, T>;
 
 export type {