refactor(types): move PrettyMerge type in utils file

TheEdoRan · Apr 19, 2024 · f7eb50c · f7eb50c
1 parent cff3545
commit f7eb50c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 13 deletions.
diff --git a/packages/next-safe-action/src/utils.ts b/packages/next-safe-action/src/utils.ts
@@ -14,6 +14,9 @@ export type Prettify<T> = {
 // Returns type or promise of type.
 export type MaybePromise<T> = Promise<T> | T;
 
+// Merges an object without printing "&".
+export type PrettyMerge<S> = S extends infer U ? { [K in keyof U]: U[K] } : never;
+
 // Infers output schema type in array of schemas.
 export type InferArray<BAS extends readonly Schema[]> = {
 	[K in keyof BAS]: Infer<BAS[K]>;

diff --git a/packages/next-safe-action/src/validation-errors.types.ts b/packages/next-safe-action/src/validation-errors.types.ts
@@ -1,8 +1,5 @@
 import type { Infer, Schema } from "@typeschema/main";
-import type { Prettify } from "./utils";
-
-// Merges an object without printing "&".
-type PrettyMerge<S> = S extends infer U ? { [K in keyof U]: U[K] } : never;
+import type { Prettify, PrettyMerge } from "./utils";
 
 // Object with an optional list of validation errors.
 export type ErrorList = Prettify<{ _errors?: string[] }>;

diff --git a/website/docs/types.md b/website/docs/types.md
@@ -254,7 +254,7 @@ type HookActionStatus = "idle" | "executing" | "hasSucceeded" | "hasErrored";
 
 ---
 
-## Utility types
+## Internal utility types
 
 ### `Prettify`
 
@@ -274,6 +274,14 @@ Returns type or promise of type.
 export type MaybePromise<T> = Promise<T> | T;
 ```
 
+### `PrettyMerge`
+
+Merges an object without printing "&".
+
+```typescript
+type PrettyMerge<S> = S extends infer U ? { [K in keyof U]: U[K] } : never;
+```
+
 ### `InferArray`
 
 Infers output schema type in array of schemas.
@@ -294,13 +302,7 @@ export type InferInArray<BAS extends readonly Schema[]> = {
 };
 ```
 
-### `PrettyMerge`
-
-Merges an object without printing "&".
-
-```typescript
-type PrettyMerge<S> = S extends infer U ? { [K in keyof U]: U[K] } : never;
-```
+## Internal validation errors types
 
 ### `ErrorList`
 
@@ -326,4 +328,4 @@ type SchemaErrors<S> = {
 
 ## TypeSchema library
 
-`Infer`, `InferIn`, `Schema` types come from [TypeSchema](https://typeschema.com) library.
+`Infer`, `InferIn`, `Schema` types used in this documentation come from [TypeSchema](https://typeschema.com) library.