refactor: move util types to separate file

Author: TheEdoRan

packages/next-safe-action/src/action-builder.ts

@@ -12,16 +12,8 @@ import type {
 	ServerCodeFn,
 	StateServerCodeFn,
 } from "./index.types";
-import type { InferArray, InferInArray } from "./utils";
-import {
-	ActionMetadataError,
-	DEFAULT_SERVER_ERROR_MESSAGE,
-	isError,
-	zodValidate,
-	type Infer,
-	type InferIn,
-	type Schema,
-} from "./utils";
+import { ActionMetadataError, DEFAULT_SERVER_ERROR_MESSAGE, isError, zodValidate } from "./utils";
+import type { Infer, InferArray, InferIn, InferInArray, Schema } from "./utils.types";
 import { ActionValidationError, buildValidationErrors } from "./validation-errors";
 import type {
 	BindArgsValidationErrors,

packages/next-safe-action/src/hooks-utils.ts

@@ -2,7 +2,7 @@ import * as React from "react";
 import {} from "react/experimental";
 import type {} from "zod";
 import type { HookActionStatus, HookCallbacks, HookResult } from "./hooks.types";
-import type { InferIn, Schema } from "./utils";
+import type { InferIn, Schema } from "./utils.types";
 
 export const getActionStatus = <
 	ServerError,

packages/next-safe-action/src/hooks.ts

@@ -8,8 +8,8 @@ import {} from "react/experimental";
 import type {} from "zod";
 import { getActionShorthandStatusObject, getActionStatus, useActionCallbacks } from "./hooks-utils";
 import type { HookCallbacks, HookResult, HookSafeActionFn } from "./hooks.types";
-import type { InferIn, Schema } from "./utils";
 import { isError } from "./utils";
+import type { InferIn, Schema } from "./utils.types";
 
 // HOOKS
 

packages/next-safe-action/src/hooks.types.ts

@@ -1,5 +1,5 @@
 import type { SafeActionResult } from "./index.types";
-import type { InferIn, MaybePromise, Prettify, Schema } from "./utils";
+import type { InferIn, MaybePromise, Prettify, Schema } from "./utils.types";
 
 /**
  * Type of `result` object returned by `useAction`, `useOptimisticAction` and `useStateAction` hooks.

packages/next-safe-action/src/index.ts

@@ -1,7 +1,7 @@
 import type { DVES, SafeActionClientOpts } from "./index.types";
 import { SafeActionClient } from "./safe-action-client";
-import type { Infer, Schema } from "./utils";
 import { DEFAULT_SERVER_ERROR_MESSAGE } from "./utils";
+import type { Infer, Schema } from "./utils.types";
 import {
 	flattenBindArgsValidationErrors,
 	flattenValidationErrors,

packages/next-safe-action/src/index.types.ts

@@ -1,4 +1,4 @@
-import type { Infer, InferArray, InferIn, InferInArray, MaybePromise, Prettify, Schema } from "./utils";
+import type { Infer, InferArray, InferIn, InferInArray, MaybePromise, Prettify, Schema } from "./utils.types";
 import type { BindArgsValidationErrors, ValidationErrors } from "./validation-errors.types";
 
 /**

packages/next-safe-action/src/safe-action-client.ts

@@ -8,7 +8,7 @@ import type {
 	ServerCodeFn,
 	StateServerCodeFn,
 } from "./index.types";
-import type { Infer, Schema } from "./utils";
+import type { Infer, Schema } from "./utils.types";
 import type {
 	BindArgsValidationErrors,
 	FlattenedBindArgsValidationErrors,

packages/next-safe-action/src/stateful-hooks.ts

@@ -6,7 +6,7 @@ import {} from "react/experimental";
 import type {} from "zod";
 import { getActionShorthandStatusObject, getActionStatus, useActionCallbacks } from "./hooks-utils";
 import type { HookCallbacks, HookSafeStateActionFn } from "./hooks.types";
-import type { InferIn, Schema } from "./utils";
+import type { InferIn, Schema } from "./utils.types";
 /**
  * Use the stateful action from a Client Component via hook. Used for actions defined with [`stateAction`](https://next-safe-action.dev/docs/safe-action-client/instance-methods#action--stateaction).
  * @param safeActionFn The action function

packages/next-safe-action/src/utils.ts

@@ -1,38 +1,9 @@
-import type { z } from "zod";
+import type { Infer, Schema } from "./utils.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;
 
-// UTIL TYPES
-
-// Takes an object type and makes it more readable.
-export type Prettify<T> = {
-	[K in keyof T]: T[K];
-} & {};
-
-// Returns type or promise of type.
-export type MaybePromise<T> = Promise<T> | T;
-
-// Schema type.
-export type Schema = z.ZodType;
-
-// Infers output schema type.
-export type Infer<S extends Schema> = z.infer<S>;
-
-// Infers input schema type.
-export type InferIn<S extends Schema> = z.input<S>;
-
-// Infers output schema type in array of schemas.
-export type InferArray<BAS extends readonly Schema[]> = {
-	[K in keyof BAS]: Infer<BAS[K]>;
-};
-
-// Infers input schema type in array of schemas.
-export type InferInArray<BAS extends readonly Schema[]> = {
-	[K in keyof BAS]: InferIn<BAS[K]>;
-};
-
 // Validate with Zod.
 export async function zodValidate<S extends Schema>(s: S, data: unknown) {
 	const result = await s.safeParseAsync(data);

packages/next-safe-action/src/utils.types.ts

@@ -0,0 +1,28 @@
+import type { z } from "zod";
+
+// Takes an object type and makes it more readable.
+export type Prettify<T> = {
+	[K in keyof T]: T[K];
+} & {};
+
+// Returns type or promise of type.
+export type MaybePromise<T> = Promise<T> | T;
+
+// Schema type.
+export type Schema = z.ZodType;
+
+// Infers output schema type.
+export type Infer<S extends Schema> = z.infer<S>;
+
+// Infers input schema type.
+export type InferIn<S extends Schema> = z.input<S>;
+
+// Infers output schema type in array of schemas.
+export type InferArray<BAS extends readonly Schema[]> = {
+	[K in keyof BAS]: Infer<BAS[K]>;
+};
+
+// Infers input schema type in array of schemas.
+export type InferInArray<BAS extends readonly Schema[]> = {
+	[K in keyof BAS]: InferIn<BAS[K]>;
+};