remix-validated-form 1.1.0 → 2.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (72) hide show
  1. package/.eslintcache +1 -1
  2. package/.prettierignore +2 -0
  3. package/README.md +72 -19
  4. package/browser/ValidatedForm.d.ts +22 -0
  5. package/browser/ValidatedForm.js +5 -2
  6. package/browser/flatten.d.ts +4 -0
  7. package/browser/flatten.js +35 -0
  8. package/browser/hooks.d.ts +28 -3
  9. package/browser/hooks.js +17 -2
  10. package/browser/index.d.ts +3 -0
  11. package/browser/index.js +2 -0
  12. package/browser/internal/flatten.d.ts +4 -0
  13. package/browser/internal/flatten.js +35 -0
  14. package/browser/internal/formContext.d.ts +18 -0
  15. package/browser/server.d.ts +5 -0
  16. package/browser/server.js +5 -0
  17. package/browser/test-data/testFormData.d.ts +15 -0
  18. package/browser/test-data/testFormData.js +46 -0
  19. package/browser/validation/createValidator.d.ts +7 -0
  20. package/browser/validation/createValidator.js +19 -0
  21. package/browser/validation/types.d.ts +14 -2
  22. package/browser/validation/validation.test.js +157 -8
  23. package/browser/validation/withYup.d.ts +3 -0
  24. package/browser/validation/withYup.js +31 -25
  25. package/browser/validation/withZod.d.ts +3 -0
  26. package/browser/validation/withZod.js +19 -4
  27. package/build/ValidatedForm.d.ts +22 -0
  28. package/build/ValidatedForm.js +5 -2
  29. package/build/flatten.d.ts +4 -0
  30. package/build/flatten.js +43 -0
  31. package/build/hooks.d.ts +28 -3
  32. package/build/hooks.js +20 -2
  33. package/build/index.d.ts +3 -0
  34. package/build/index.js +2 -0
  35. package/build/internal/flatten.d.ts +4 -0
  36. package/build/internal/flatten.js +43 -0
  37. package/build/internal/formContext.d.ts +18 -0
  38. package/build/server.d.ts +5 -0
  39. package/build/server.js +5 -0
  40. package/build/test-data/testFormData.d.ts +15 -0
  41. package/build/test-data/testFormData.js +50 -0
  42. package/build/validation/createValidator.d.ts +7 -0
  43. package/build/validation/createValidator.js +23 -0
  44. package/build/validation/types.d.ts +14 -2
  45. package/build/validation/validation.test.js +157 -8
  46. package/build/validation/withYup.d.ts +3 -0
  47. package/build/validation/withYup.js +31 -25
  48. package/build/validation/withZod.d.ts +3 -0
  49. package/build/validation/withZod.js +22 -4
  50. package/package.json +18 -13
  51. package/sample-app/.env +7 -0
  52. package/sample-app/README.md +53 -0
  53. package/sample-app/app/components/ErrorBox.tsx +34 -0
  54. package/sample-app/app/components/FormInput.tsx +40 -0
  55. package/sample-app/app/components/FormSelect.tsx +37 -0
  56. package/sample-app/app/components/SubjectForm.tsx +150 -0
  57. package/sample-app/app/entry.client.tsx +4 -0
  58. package/sample-app/app/entry.server.tsx +21 -0
  59. package/sample-app/app/root.tsx +92 -0
  60. package/sample-app/app/routes/index.tsx +5 -0
  61. package/sample-app/app/routes/subjects/$id.edit.tsx +98 -0
  62. package/sample-app/app/routes/subjects/index.tsx +112 -0
  63. package/sample-app/app/routes/subjects/new.tsx +46 -0
  64. package/sample-app/app/services/db.server.ts +23 -0
  65. package/sample-app/app/types.ts +6 -0
  66. package/sample-app/package-lock.json +10890 -0
  67. package/sample-app/package.json +36 -0
  68. package/sample-app/prisma/dev.db +0 -0
  69. package/sample-app/prisma/schema.prisma +34 -0
  70. package/sample-app/public/favicon.ico +0 -0
  71. package/sample-app/remix.config.js +10 -0
  72. package/sample-app/remix.env.d.ts +2 -0
@@ -0,0 +1,40 @@
1
+ import {
2
+ FormControl,
3
+ FormErrorMessage,
4
+ FormLabel,
5
+ Input,
6
+ InputProps,
7
+ } from "@chakra-ui/react";
8
+ import { useField } from "../../remix-validated-form";
9
+
10
+ type FormInputProps = {
11
+ name: string;
12
+ label: string;
13
+ isRequired?: boolean;
14
+ };
15
+
16
+ export const FormInput = ({
17
+ name,
18
+ label,
19
+ isRequired,
20
+ ...rest
21
+ }: FormInputProps & InputProps) => {
22
+ const { validate, clearError, defaultValue, error } = useField(name);
23
+
24
+ return (
25
+ <>
26
+ <FormControl isInvalid={!!error} isRequired={isRequired}>
27
+ <FormLabel htmlFor={name}>{label}</FormLabel>
28
+ <Input
29
+ id={name}
30
+ name={name}
31
+ onBlur={validate}
32
+ onChange={clearError}
33
+ defaultValue={defaultValue}
34
+ {...rest}
35
+ />
36
+ {error && <FormErrorMessage>{error}</FormErrorMessage>}
37
+ </FormControl>
38
+ </>
39
+ );
40
+ };
@@ -0,0 +1,37 @@
1
+ import {
2
+ FormControl,
3
+ FormErrorMessage,
4
+ FormLabel,
5
+ Select,
6
+ SelectProps,
7
+ } from "@chakra-ui/react";
8
+ import { useField } from "../../remix-validated-form";
9
+
10
+ type FormSelectProps = {
11
+ name: string;
12
+ label: string;
13
+ isRequired?: boolean;
14
+ };
15
+
16
+ export const FormSelect = ({
17
+ name,
18
+ label,
19
+ isRequired,
20
+ ...rest
21
+ }: FormSelectProps & SelectProps) => {
22
+ const { validate, clearError, defaultValue, error } = useField(name);
23
+ return (
24
+ <FormControl isInvalid={!!error} isRequired={isRequired}>
25
+ <FormLabel htmlFor={name}>{label}</FormLabel>
26
+ <Select
27
+ id={name}
28
+ name={name}
29
+ onBlur={validate}
30
+ onChange={clearError}
31
+ defaultValue={defaultValue}
32
+ {...rest}
33
+ />
34
+ {error && <FormErrorMessage>{error}</FormErrorMessage>}
35
+ </FormControl>
36
+ );
37
+ };
@@ -0,0 +1,150 @@
1
+ import {
2
+ Box,
3
+ Button,
4
+ Stack,
5
+ HStack,
6
+ Container,
7
+ VStack,
8
+ } from "@chakra-ui/react";
9
+ import { useState } from "react";
10
+ import { useNavigate } from "remix";
11
+ import * as z from "zod";
12
+ import {
13
+ ValidatedForm,
14
+ withZod,
15
+ useIsSubmitting,
16
+ } from "../../remix-validated-form";
17
+ import { FormInput } from "./FormInput";
18
+ import { FormSelect } from "./FormSelect";
19
+
20
+ const subjectSchema = z.object({
21
+ name: z.string().nonempty("Subject Name can't be empty"),
22
+ description: z.string().nonempty("Subject Description can't be empty"),
23
+ teacher: z.object({
24
+ name: z.string().nonempty("Teacher Name can't be empty"),
25
+ email: z
26
+ .string()
27
+ .email("Teacher Email is invalid")
28
+ .nonempty("Teacher Email can't be empty"),
29
+ }),
30
+ subjectDays: z
31
+ .object({
32
+ day: z.string().nonempty("Day can't be empty"),
33
+ })
34
+ .array(),
35
+ });
36
+
37
+ export const subjectFormValidator = withZod(subjectSchema);
38
+
39
+ export function SubjectForm({
40
+ defaultValues,
41
+ }: {
42
+ defaultValues?: Partial<z.infer<typeof subjectSchema>>;
43
+ }) {
44
+ let navigate = useNavigate();
45
+ const isSubmitting = useIsSubmitting();
46
+ const [daysKeys, setDaysKeys] = useState(
47
+ defaultValues?.subjectDays && defaultValues.subjectDays.length > 0
48
+ ? Array.from(Array(defaultValues.subjectDays.length).keys())
49
+ : [0]
50
+ );
51
+
52
+ return (
53
+ <Box as="main" py="8" flex="1">
54
+ <Container maxW="7xl" id="xxx">
55
+ <Box bg="white" p="6" rounded="lg" shadow="base">
56
+ <Box px="10" maxWidth="7xl">
57
+ <ValidatedForm
58
+ validator={subjectFormValidator}
59
+ defaultValues={defaultValues}
60
+ method="post"
61
+ noValidate
62
+ >
63
+ <Stack spacing="6" direction="column">
64
+ <Stack direction="row" spacing="6" align="center" width="full">
65
+ <FormInput name="name" label="Name" isRequired />
66
+ <FormInput
67
+ name="description"
68
+ label="Description"
69
+ isRequired
70
+ />
71
+ </Stack>
72
+ <Stack direction="row" spacing="6" align="center" width="full">
73
+ <FormInput
74
+ name="teacher.name"
75
+ label="Teacher Name"
76
+ isRequired
77
+ />
78
+ <FormInput
79
+ name="teacher.email"
80
+ label="Teacher Email"
81
+ isRequired
82
+ />
83
+ </Stack>
84
+ <VStack width="full" spacing="6" alignItems="flex-start">
85
+ {daysKeys.map((key, index) => (
86
+ <Stack direction="row" width="full" key={key}>
87
+ <FormSelect
88
+ name={`subjectDays[${index}].day`}
89
+ label="Subject Day"
90
+ isRequired
91
+ placeholder="Select Day"
92
+ >
93
+ <option value="Monday">Monday</option>
94
+ <option value="Tuesday">Tuesday</option>
95
+ <option value="Wednesday">Wednesday</option>
96
+ <option value="Thursday">Thursday</option>
97
+ <option value="Friday">Friday</option>
98
+ <option value="Saturday">Saturday</option>
99
+ <option value="Sunday">Sunday</option>
100
+ </FormSelect>
101
+ {daysKeys.length > 1 && (
102
+ <Box pt="8">
103
+ <Button
104
+ colorScheme="red"
105
+ onClick={() =>
106
+ setDaysKeys(
107
+ daysKeys.filter(
108
+ (key2, index2) => index !== index2
109
+ )
110
+ )
111
+ }
112
+ >
113
+ Delete
114
+ </Button>
115
+ </Box>
116
+ )}
117
+ </Stack>
118
+ ))}
119
+ <Button
120
+ colorScheme="blue"
121
+ size="xs"
122
+ onClick={() =>
123
+ setDaysKeys([...daysKeys, Math.max(...daysKeys) + 1])
124
+ }
125
+ >
126
+ Add Day
127
+ </Button>
128
+ </VStack>
129
+
130
+ <HStack width="full" justifyContent="center" mt="8">
131
+ <Button
132
+ type="submit"
133
+ colorScheme="blue"
134
+ disabled={isSubmitting}
135
+ isLoading={isSubmitting}
136
+ >
137
+ {isSubmitting ? "Sending..." : "Send"}
138
+ </Button>
139
+ <Button variant="outline" onClick={() => navigate(-1)}>
140
+ Cancel
141
+ </Button>
142
+ </HStack>
143
+ </Stack>
144
+ </ValidatedForm>
145
+ </Box>
146
+ </Box>
147
+ </Container>
148
+ </Box>
149
+ );
150
+ }
@@ -0,0 +1,4 @@
1
+ import { hydrate } from "react-dom";
2
+ import { RemixBrowser } from "remix";
3
+
4
+ hydrate(<RemixBrowser />, document);
@@ -0,0 +1,21 @@
1
+ import { renderToString } from "react-dom/server";
2
+ import { RemixServer } from "remix";
3
+ import type { EntryContext } from "remix";
4
+
5
+ export default function handleRequest(
6
+ request: Request,
7
+ responseStatusCode: number,
8
+ responseHeaders: Headers,
9
+ remixContext: EntryContext
10
+ ) {
11
+ let markup = renderToString(
12
+ <RemixServer context={remixContext} url={request.url} />
13
+ );
14
+
15
+ responseHeaders.set("Content-Type", "text/html");
16
+
17
+ return new Response("<!DOCTYPE html>" + markup, {
18
+ status: responseStatusCode,
19
+ headers: responseHeaders,
20
+ });
21
+ }
@@ -0,0 +1,92 @@
1
+ import { ChakraProvider } from "@chakra-ui/react";
2
+ import {
3
+ Links,
4
+ LiveReload,
5
+ Meta,
6
+ Outlet,
7
+ Scripts,
8
+ ScrollRestoration,
9
+ useCatch,
10
+ } from "remix";
11
+ import { ErrorBox } from "./components/ErrorBox";
12
+
13
+ // https://remix.run/api/conventions#default-export
14
+ // https://remix.run/api/conventions#route-filenames
15
+ export default function App() {
16
+ return (
17
+ <Document>
18
+ <Outlet />
19
+ </Document>
20
+ );
21
+ }
22
+
23
+ // https://remix.run/docs/en/v1/api/conventions#errorboundary
24
+ export function ErrorBoundary({ error }: { error: Error }) {
25
+ console.error(error);
26
+ return (
27
+ <Document title="Error!">
28
+ <ErrorBox title={`There was an error`} description={error.message} />
29
+ </Document>
30
+ );
31
+ }
32
+
33
+ // https://remix.run/docs/en/v1/api/conventions#catchboundary
34
+ export function CatchBoundary() {
35
+ let caught = useCatch();
36
+
37
+ let message;
38
+ switch (caught.status) {
39
+ case 401:
40
+ message = (
41
+ <p>
42
+ Oops! Looks like you tried to visit a page that you do not have access
43
+ to.
44
+ </p>
45
+ );
46
+ break;
47
+ case 404:
48
+ message = (
49
+ <p>Oops! Looks like you tried to visit a page that does not exist.</p>
50
+ );
51
+ break;
52
+
53
+ default:
54
+ throw new Error(caught.data || caught.statusText);
55
+ }
56
+
57
+ return (
58
+ <Document title={`${caught.status} ${caught.statusText}`}>
59
+ <ErrorBox
60
+ title={`${caught.status}: ${caught.statusText}`}
61
+ description={message}
62
+ />
63
+ </Document>
64
+ );
65
+ }
66
+
67
+ function Document({
68
+ children,
69
+ title,
70
+ }: {
71
+ children: React.ReactNode;
72
+ title?: string;
73
+ }) {
74
+ return (
75
+ <html lang="en">
76
+ <head>
77
+ <meta charSet="utf-8" />
78
+ <meta name="viewport" content="width=device-width,initial-scale=1" />
79
+ {title ? <title>{title}</title> : null}
80
+ <Meta />
81
+ <Links />
82
+ </head>
83
+ <body>
84
+ <ChakraProvider>{children}</ChakraProvider>
85
+
86
+ <ScrollRestoration />
87
+ <Scripts />
88
+ {process.env.NODE_ENV === "development" && <LiveReload />}
89
+ </body>
90
+ </html>
91
+ );
92
+ }
@@ -0,0 +1,5 @@
1
+ import { LoaderFunction, redirect } from "remix";
2
+
3
+ export let loader: LoaderFunction = () => {
4
+ return redirect("/subjects");
5
+ };
@@ -0,0 +1,98 @@
1
+ import { Box, Container, Heading } from "@chakra-ui/react";
2
+ import {
3
+ ActionFunction,
4
+ json,
5
+ LoaderFunction,
6
+ redirect,
7
+ useCatch,
8
+ useLoaderData,
9
+ useParams,
10
+ } from "remix";
11
+ import { z } from "zod";
12
+ import { ErrorBox } from "~/components/ErrorBox";
13
+ import { SubjectForm, subjectFormValidator } from "~/components/SubjectForm";
14
+ import { db } from "~/services/db.server";
15
+ import { SubjectComplete } from "~/types";
16
+ import { validationError } from "../../../remix-validated-form";
17
+
18
+ export const loader: LoaderFunction = async ({ params }) => {
19
+ const { id } = z.object({ id: z.string() }).parse(params);
20
+
21
+ const subject = await db.subject.findUnique({
22
+ where: { id: +id },
23
+ include: {
24
+ teacher: true,
25
+ subjectDays: { orderBy: { day: "asc" } },
26
+ },
27
+ });
28
+
29
+ if (!subject) {
30
+ throw new Response(`Subject ${id} doesn't exist`, {
31
+ status: 404,
32
+ });
33
+ }
34
+
35
+ return json(subject);
36
+ };
37
+
38
+ export const action: ActionFunction = async ({ request, params }) => {
39
+ const { id } = z.object({ id: z.string() }).parse(params);
40
+
41
+ const fieldValues = subjectFormValidator.validate(await request.formData());
42
+ if (fieldValues.error) return validationError(fieldValues.error);
43
+
44
+ const { teacher, subjectDays, ...updatedSubject } = fieldValues.data;
45
+
46
+ await db.subject.update({
47
+ where: { id: +id },
48
+ data: {
49
+ ...updatedSubject,
50
+ teacher: {
51
+ update: teacher,
52
+ },
53
+ subjectDays: {
54
+ deleteMany: {},
55
+ create: subjectDays,
56
+ },
57
+ },
58
+ });
59
+
60
+ return redirect("/subjects");
61
+ };
62
+
63
+ export default function NewSubject() {
64
+ const subject = useLoaderData<SubjectComplete | null>();
65
+ return (
66
+ <>
67
+ <Box bg="white" pt="4" pb="4" shadow="sm">
68
+ <Container maxW="7xl">
69
+ <Heading size="lg" mb="0">
70
+ Create Subject
71
+ </Heading>
72
+ </Container>
73
+ </Box>
74
+
75
+ <Box as="main" py="8" flex="1">
76
+ <Container maxW="7xl">
77
+ <SubjectForm defaultValues={subject ?? undefined} />
78
+ </Container>
79
+ </Box>
80
+ </>
81
+ );
82
+ }
83
+
84
+ export function CatchBoundary() {
85
+ const caught = useCatch();
86
+ const params = useParams();
87
+ if (caught.status === 404) {
88
+ return <ErrorBox title={`Subject ${params.id} doesn't exist`} />;
89
+ }
90
+ throw new Error(`Unhandled error: ${caught.status}`);
91
+ }
92
+
93
+ export function ErrorBoundary() {
94
+ const { id } = useParams();
95
+ return (
96
+ <ErrorBox title={`There was an error subject by the id ${id}. Sorry.`} />
97
+ );
98
+ }
@@ -0,0 +1,112 @@
1
+ import {
2
+ Box,
3
+ Button,
4
+ Container,
5
+ Flex,
6
+ Heading,
7
+ Spacer,
8
+ Table,
9
+ Tbody,
10
+ Td,
11
+ Th,
12
+ Thead,
13
+ Tr,
14
+ } from "@chakra-ui/react";
15
+ import { Subject, SubjectDays, Teacher } from "@prisma/client";
16
+ import {
17
+ json,
18
+ Link,
19
+ LoaderFunction,
20
+ useCatch,
21
+ useLoaderData,
22
+ useParams,
23
+ } from "remix";
24
+ import { db } from "~/services/db.server";
25
+
26
+ export const loader: LoaderFunction = async () => {
27
+ const subjects = await db.subject.findMany({
28
+ include: { teacher: true, subjectDays: true },
29
+ });
30
+ return json(subjects);
31
+ };
32
+
33
+ export default function Subjects() {
34
+ const subjects =
35
+ useLoaderData<
36
+ (Subject & { teacher: Teacher; subjectDays: SubjectDays[] })[]
37
+ >();
38
+ return (
39
+ <>
40
+ <Box bg="white" pt="4" pb="4" shadow="sm">
41
+ <Container maxW="7xl">
42
+ <Flex>
43
+ <Heading size="lg" mb="0">
44
+ Subjects
45
+ </Heading>
46
+ <Spacer />
47
+ <Link to="new">
48
+ <Button colorScheme="blue">New</Button>
49
+ </Link>
50
+ </Flex>
51
+ </Container>
52
+ </Box>
53
+
54
+ <Box as="main" py="8" flex="1">
55
+ <Container maxW="7xl">
56
+ <Box bg="white" p="6" rounded="lg" shadow="base" overflowX="auto">
57
+ <Table borderWidth="1px" fontSize="sm">
58
+ <Thead bg="white">
59
+ <Tr>
60
+ <Th whiteSpace="nowrap" scope="col">
61
+ Subject
62
+ </Th>
63
+ <Th whiteSpace="nowrap" scope="col">
64
+ Teacher
65
+ </Th>
66
+ <Th whiteSpace="nowrap" scope="col"></Th>
67
+ </Tr>
68
+ </Thead>
69
+ <Tbody>
70
+ {subjects.map((subject) => (
71
+ <Tr key={subject.id}>
72
+ <Td whiteSpace="nowrap">{subject.name}</Td>
73
+ <Td>
74
+ {subject.teacher.name} ({subject.teacher.email})
75
+ </Td>
76
+ <Td textAlign="right">
77
+ <Link to={`${subject.id}/edit`}>
78
+ <Button variant="link" colorScheme="blue">
79
+ Edit
80
+ </Button>
81
+ </Link>
82
+ </Td>
83
+ </Tr>
84
+ ))}
85
+ </Tbody>
86
+ </Table>
87
+ </Box>
88
+ </Container>
89
+ </Box>
90
+ </>
91
+ );
92
+ }
93
+
94
+ export function CatchBoundary() {
95
+ const caught = useCatch();
96
+ const params = useParams();
97
+ if (caught.status === 404) {
98
+ return (
99
+ <div className="error-container">
100
+ Huh? What the heck is "{params.id}"?
101
+ </div>
102
+ );
103
+ }
104
+ throw new Error(`Unhandled error: ${caught.status}`);
105
+ }
106
+
107
+ export function ErrorBoundary() {
108
+ const { jokeId } = useParams();
109
+ return (
110
+ <div className="error-container">{`There was an error loading joke by the id ${jokeId}. Sorry.`}</div>
111
+ );
112
+ }
@@ -0,0 +1,46 @@
1
+ import { Box, Container, Heading } from "@chakra-ui/react";
2
+ import { ActionFunction, redirect } from "remix";
3
+ import { SubjectForm, subjectFormValidator } from "~/components/SubjectForm";
4
+ import { db } from "~/services/db.server";
5
+ import { validationError } from "../../../remix-validated-form";
6
+
7
+ export const action: ActionFunction = async ({ request }) => {
8
+ const fieldValues = subjectFormValidator.validate(await request.formData());
9
+ if (fieldValues.error) return validationError(fieldValues.error);
10
+
11
+ const { teacher, subjectDays, ...newSubject } = fieldValues.data;
12
+
13
+ await db.subject.create({
14
+ data: {
15
+ ...newSubject,
16
+ teacher: {
17
+ create: teacher,
18
+ },
19
+ subjectDays: {
20
+ create: subjectDays,
21
+ },
22
+ },
23
+ });
24
+
25
+ return redirect("/subjects");
26
+ };
27
+
28
+ export default function NewSubject() {
29
+ return (
30
+ <>
31
+ <Box bg="white" pt="4" pb="4" shadow="sm">
32
+ <Container maxW="7xl">
33
+ <Heading size="lg" mb="0">
34
+ Create Subject
35
+ </Heading>
36
+ </Container>
37
+ </Box>
38
+
39
+ <Box as="main" py="8" flex="1">
40
+ <Container maxW="7xl">
41
+ <SubjectForm />
42
+ </Container>
43
+ </Box>
44
+ </>
45
+ );
46
+ }
@@ -0,0 +1,23 @@
1
+ import { PrismaClient } from "@prisma/client";
2
+
3
+ let db: PrismaClient;
4
+
5
+ declare global {
6
+ var __db: PrismaClient | undefined;
7
+ }
8
+
9
+ // this is needed because in development we don't want to restart
10
+ // the server with every change, but we want to make sure we don't
11
+ // create a new connection to the DB with every change either.
12
+ if (process.env.NODE_ENV === "production") {
13
+ db = new PrismaClient();
14
+ db.$connect();
15
+ } else {
16
+ if (!global.__db) {
17
+ global.__db = new PrismaClient();
18
+ global.__db.$connect();
19
+ }
20
+ db = global.__db;
21
+ }
22
+
23
+ export { db };
@@ -0,0 +1,6 @@
1
+ import { Subject, SubjectDays, Teacher } from "@prisma/client";
2
+
3
+ export type SubjectComplete = Subject & {
4
+ teacher: Teacher;
5
+ subjectDays: SubjectDays[];
6
+ };