Skip to content

Commit e7d2772

Browse files
committed
refactor: move standard schema stuff in a single file
1 parent bf5dc6a commit e7d2772

12 files changed

+15
-18
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ import type {
1212
StateServerCodeFn,
1313
} from "./index.types";
1414
import { FrameworkErrorHandler } from "./next/errors";
15-
import { standardParse } from "./standard";
1615
import type {
1716
InferInputArray,
1817
InferInputOrDefault,
1918
InferOutputArray,
2019
InferOutputOrDefault,
2120
StandardSchemaV1,
22-
} from "./standard.types";
21+
} from "./standard-schema";
22+
import { standardParse } from "./standard-schema";
2323
import { DEFAULT_SERVER_ERROR_MESSAGE, isError, winningBoolean } from "./utils";
2424
import {
2525
ActionBindArgsValidationError,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import {} from "react/experimental";
33
import type { HookActionStatus, HookCallbacks, HookShorthandStatus } from "./hooks.types";
44
import type { SafeActionResult } from "./index.types";
55
import { FrameworkErrorHandler } from "./next/errors";
6-
import type { InferInputOrDefault, StandardSchemaV1 } from "./standard.types";
6+
import type { InferInputOrDefault, StandardSchemaV1 } from "./standard-schema";
77

88
export const getActionStatus = <ServerError, S extends StandardSchemaV1 | undefined, CVE, Data>({
99
isIdle,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ import type {
1111
} from "./hooks.types";
1212
import type { SafeActionResult } from "./index.types";
1313
import { FrameworkErrorHandler } from "./next/errors";
14-
import type { InferInputOrDefault, StandardSchemaV1 } from "./standard.types";
14+
import type { InferInputOrDefault, StandardSchemaV1 } from "./standard-schema";
1515

1616
// HOOKS
1717

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import type { NavigationKind, SafeActionFn, SafeActionResult, SafeStateActionFn } from "./index.types";
2-
import type { InferInputOrDefault, StandardSchemaV1 } from "./standard.types";
2+
import type { InferInputOrDefault, StandardSchemaV1 } from "./standard-schema";
33
import type { MaybePromise, Prettify } from "./utils.types";
44

55
/**

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import type { CreateClientOpts, DVES, HandleServerErrorFn } from "./index.types";
22
import { SafeActionClient } from "./safe-action-client";
3-
import type { InferOutputOrDefault, StandardSchemaV1 } from "./standard.types";
3+
import type { InferOutputOrDefault, StandardSchemaV1 } from "./standard-schema";
44
import { DEFAULT_SERVER_ERROR_MESSAGE } from "./utils";
55
import { flattenValidationErrors, formatValidationErrors } from "./validation-errors";
66

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import type {
55
InferOutputArray,
66
InferOutputOrDefault,
77
StandardSchemaV1,
8-
} from "./standard.types";
8+
} from "./standard-schema";
99
import type { MaybePromise, Prettify } from "./utils.types";
1010
import type { HandleValidationErrorsShapeFn, ValidationErrors } from "./validation-errors.types";
1111

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import type {
77
ServerCodeFn,
88
StateServerCodeFn,
99
} from "./index.types";
10-
import type { InferOutputOrDefault, StandardSchemaV1 } from "./standard.types";
10+
import type { InferOutputOrDefault, StandardSchemaV1 } from "./standard-schema";
1111
import type {
1212
FlattenedValidationErrors,
1313
HandleValidationErrorsShapeFn,

packages/next-safe-action/src/standard.types.ts renamed to packages/next-safe-action/src/standard-schema.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,7 @@ export type InferInputOrDefault<MaybeSchema, Default> = MaybeSchema extends Stan
8585
export type InferOutputOrDefault<MaybeSchema, Default> = MaybeSchema extends StandardSchemaV1
8686
? StandardSchemaV1.InferOutput<MaybeSchema>
8787
: Default;
88+
89+
export async function standardParse<Output>(schema: StandardSchemaV1<unknown, Output>, value: unknown) {
90+
return schema["~standard"].validate(value);
91+
}

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

Lines changed: 0 additions & 7 deletions
This file was deleted.

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import * as React from "react";
44
import {} from "react/experimental";
55
import { getActionShorthandStatusObject, getActionStatus, useActionCallbacks } from "./hooks-utils";
66
import type { HookCallbacks, HookSafeStateActionFn, UseStateActionHookReturn } from "./hooks.types";
7-
import type { InferInputOrDefault, StandardSchemaV1 } from "./standard.types";
7+
import type { InferInputOrDefault, StandardSchemaV1 } from "./standard-schema";
88

99
/**
1010
* Use the stateful action from a Client Component via hook. Used for actions defined with [`stateAction`](https://next-safe-action.dev/docs/define-actions/instance-methods#action--stateaction).

0 commit comments

Comments
 (0)