refactor(middleware): move createMiddleware function to separate file

TheEdoRan · Aug 12, 2024 · 37af4fa · 37af4fa
1 parent 87868a2
commit 37af4fa
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/packages/next-safe-action/src/index.ts b/packages/next-safe-action/src/index.ts
@@ -10,7 +10,8 @@ import {
 	formatValidationErrors,
 } from "./validation-errors";
 
-export { ActionMetadataError, createMiddleware, DEFAULT_SERVER_ERROR_MESSAGE } from "./utils";
+export { createMiddleware } from "./middleware";
+export { ActionMetadataError, DEFAULT_SERVER_ERROR_MESSAGE } from "./utils";
 export {
 	ActionValidationError,
 	flattenBindArgsValidationErrors,

diff --git a/packages/next-safe-action/src/middleware.ts b/packages/next-safe-action/src/middleware.ts
@@ -0,0 +1,21 @@
+import type { MiddlewareFn } from "./index.types";
+
+/**
+ * Creates a standalone middleware function. It accepts a generic object with optional `serverError`, `ctx` and `metadata`
+ * properties, if you need one or all of them to be typed. The type for each property that is passed as generic is the
+ * **minimum** shape required to define the middleware function, but it can also be larger than that.
+ *
+ * {@link https://next-safe-action.dev/docs/safe-action-client/middleware#create-standalone-middleware-with-createmiddleware See docs for more information}
+ */
+export const createMiddleware = <BaseData extends { serverError?: any; ctx?: object; metadata?: any }>() => {
+	return {
+		define: <NextCtx extends object>(
+			middlewareFn: MiddlewareFn<
+				BaseData extends { serverError: infer SE } ? SE : any,
+				BaseData extends { metadata: infer MD } ? MD : any,
+				BaseData extends { ctx: infer Ctx extends object } ? Ctx : object,
+				NextCtx
+			>
+		) => middlewareFn,
+	};
+};
diff --git a/packages/next-safe-action/src/utils.ts b/packages/next-safe-action/src/utils.ts
@@ -1,5 +1,3 @@
-import type { MiddlewareFn } from "./index.types";
-
 export const DEFAULT_SERVER_ERROR_MESSAGE = "Something went wrong while executing the operation.";
 
 export const isError = (error: unknown): error is Error => error instanceof Error;
@@ -30,23 +28,3 @@ export class ActionMetadataError extends Error {
 		this.name = "ActionMetadataError";
 	}
 }
-
-/**
- * Creates a standalone middleware function. It accepts a generic object with optional `serverError`, `ctx` and `metadata`
- * properties, if you need one or all of them to be typed. The type for each property that is passed as generic is the
- * **minimum** shape required to define the middleware function, but it can also be larger than that.
- *
- * {@link https://next-safe-action.dev/docs/safe-action-client/middleware#create-standalone-middleware-with-createmiddleware See docs for more information}
- */
-export const createMiddleware = <BaseData extends { serverError?: any; ctx?: object; metadata?: any }>() => {
-	return {
-		define: <NextCtx extends object>(
-			middlewareFn: MiddlewareFn<
-				BaseData extends { serverError: infer SE } ? SE : any,
-				BaseData extends { metadata: infer MD } ? MD : any,
-				BaseData extends { ctx: infer Ctx extends object } ? Ctx : object,
-				NextCtx
-			>
-		) => middlewareFn,
-	};
-};