remix-validated-form 0.0.2 → 0.0.3

package/browser/ValidatedForm.d.ts

@@ -0,0 +1,11 @@
+import { Form as RemixForm, useFetcher } from "@remix-run/react";
+import React, { ComponentProps } from "react";
+import { Validator } from "./validation/types";
+export declare type FormProps<DataType> = {
+    validator: Validator<DataType>;
+    onSubmit?: (data: DataType, event: React.FormEvent<HTMLFormElement>) => void;
+    fetcher?: ReturnType<typeof useFetcher>;
+    defaultValues?: Partial<DataType>;
+    formRef?: React.RefObject<HTMLFormElement>;
+} & Omit<ComponentProps<typeof RemixForm>, "onSubmit">;
+export declare function ValidatedForm<DataType>({ validator, onSubmit, children, fetcher, action, defaultValues, formRef: formRefProp, ...rest }: FormProps<DataType>): JSX.Element;

package/browser/ValidatedForm.js

@@ -0,0 +1,69 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Form as RemixForm, useActionData, useFormAction, useTransition, } from "@remix-run/react";
+import { useEffect, useMemo, useRef, useState, } from "react";
+import invariant from "tiny-invariant";
+import { FormContext } from "./internal/formContext";
+import { omit, mergeRefs } from "./internal/util";
+function useFieldErrors(fetcher) {
+    const actionData = useActionData();
+    const dataToUse = fetcher ? fetcher.data : actionData;
+    const fieldErrorsFromAction = dataToUse === null || dataToUse === void 0 ? void 0 : dataToUse.fieldErrors;
+    const [fieldErrors, setFieldErrors] = useState(fieldErrorsFromAction !== null && fieldErrorsFromAction !== void 0 ? fieldErrorsFromAction : {});
+    useEffect(() => {
+        if (fieldErrorsFromAction)
+            setFieldErrors(fieldErrorsFromAction);
+    }, [fieldErrorsFromAction]);
+    return [fieldErrors, setFieldErrors];
+}
+const useIsSubmitting = (action, fetcher) => {
+    const actionForCurrentPage = useFormAction();
+    const pendingFormSubmit = useTransition().submission;
+    return fetcher
+        ? fetcher.state === "submitting"
+        : pendingFormSubmit &&
+            pendingFormSubmit.action.endsWith(action !== null && action !== void 0 ? action : actionForCurrentPage);
+};
+const getDataFromForm = (el) => Object.fromEntries(new FormData(el));
+export function ValidatedForm({ validator, onSubmit, children, fetcher, action, defaultValues, formRef: formRefProp, ...rest }) {
+    var _a;
+    const [fieldErrors, setFieldErrors] = useFieldErrors(fetcher);
+    const isSubmitting = useIsSubmitting(action, fetcher);
+    const formRef = useRef(null);
+    const contextValue = useMemo(() => ({
+        fieldErrors,
+        action,
+        defaultValues,
+        isSubmitting: isSubmitting !== null && isSubmitting !== void 0 ? isSubmitting : false,
+        clearError: (fieldName) => {
+            setFieldErrors((prev) => omit(prev, fieldName));
+        },
+        validateField: (fieldName) => {
+            invariant(formRef.current, "Cannot find reference to form");
+            const { error } = validator.validateField(getDataFromForm(formRef.current), fieldName);
+            if (error) {
+                setFieldErrors((prev) => ({
+                    ...prev,
+                    [fieldName]: error,
+                }));
+            }
+        },
+    }), [
+        fieldErrors,
+        action,
+        defaultValues,
+        isSubmitting,
+        setFieldErrors,
+        validator,
+    ]);
+    const Form = (_a = fetcher === null || fetcher === void 0 ? void 0 : fetcher.Form) !== null && _a !== void 0 ? _a : RemixForm;
+    return (_jsx(Form, { ref: mergeRefs([formRef, formRefProp]), ...rest, action: action, onSubmit: (event) => {
+            const result = validator.validate(getDataFromForm(event.currentTarget));
+            if (result.error) {
+                event.preventDefault();
+                setFieldErrors(result.error);
+            }
+            else {
+                onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(result.data, event);
+            }
+        }, children: _jsx(FormContext.Provider, { value: contextValue, children: children }, void 0) }, void 0));
+}

package/browser/hooks.d.ts

@@ -0,0 +1,8 @@
+export declare const useField: (name: string) => {
+    error: string;
+    clearError: () => void;
+    validate: () => void;
+    defaultValue: any;
+};
+export declare const useFormContext: () => import("./internal/formContext").FormContextValue;
+export declare const useIsSubmitting: () => boolean;

package/browser/hooks.js

@@ -0,0 +1,17 @@
+import { useContext, useMemo } from "react";
+import { FormContext } from "./internal/formContext";
+export const useField = (name) => {
+    const { fieldErrors, clearError, validateField, defaultValues } = useContext(FormContext);
+    const field = useMemo(() => ({
+        error: fieldErrors[name],
+        clearError: () => {
+            clearError(name);
+        },
+        validate: () => validateField(name),
+        defaultValue: defaultValues === null || defaultValues === void 0 ? void 0 : defaultValues[name],
+    }), [clearError, defaultValues, fieldErrors, name, validateField]);
+    return field;
+};
+// test commit
+export const useFormContext = () => useContext(FormContext);
+export const useIsSubmitting = () => useFormContext().isSubmitting;

package/browser/index.js

@@ -0,0 +1,5 @@
+export * from "./hooks";
+export * from "./server";
+export * from "./ValidatedForm";
+export * from "./validation/types";
+export * from "./validation/withYup";

package/browser/internal/formContext.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import { FieldErrors } from "../validation/types";
+export declare type FormContextValue = {
+    fieldErrors: FieldErrors;
+    clearError: (...names: string[]) => void;
+    validateField: (fieldName: string) => void;
+    action?: string;
+    isSubmitting: boolean;
+    defaultValues?: {
+        [fieldName: string]: any;
+    };
+};
+export declare const FormContext: import("react").Context<FormContextValue>;

package/browser/internal/formContext.js

@@ -0,0 +1,7 @@
+import { createContext } from "react";
+export const FormContext = createContext({
+    fieldErrors: {},
+    clearError: () => { },
+    validateField: () => { },
+    isSubmitting: false,
+});

package/browser/internal/util.d.ts

@@ -0,0 +1,3 @@
+import type React from "react";
+export declare const omit: (obj: any, ...keys: string[]) => any;
+export declare const mergeRefs: <T = any>(refs: (React.MutableRefObject<T> | React.LegacyRef<T> | undefined)[]) => (instance: T | null) => void;

package/browser/internal/util.js

@@ -0,0 +1,19 @@
+export const omit = (obj, ...keys) => {
+    const result = { ...obj };
+    for (const key of keys) {
+        delete result[key];
+    }
+    return result;
+};
+export const mergeRefs = (refs) => {
+    return (value) => {
+        refs.filter(Boolean).forEach((ref) => {
+            if (typeof ref === "function") {
+                ref(value);
+            }
+            else if (ref != null) {
+                ref.current = value;
+            }
+        });
+    };
+};

package/browser/server.d.ts

@@ -0,0 +1,2 @@
+import { FieldErrors } from "./validation/types";
+export declare const fieldErrors: (errors: FieldErrors) => Response;

package/browser/server.js

@@ -0,0 +1,2 @@
+import { json } from "@remix-run/server-runtime";
+export const fieldErrors = (errors) => json({ fieldErrors: errors }, { status: 422 });

package/browser/validation/types.d.ts

@@ -0,0 +1,15 @@
+export declare type FieldErrors = Record<string, string>;
+export declare type ValidationResult<DataType> = {
+    data: DataType;
+    error: undefined;
+} | {
+    error: FieldErrors;
+    data: undefined;
+};
+export declare type ValidateFieldResult = {
+    error?: string;
+};
+export declare type Validator<DataType> = {
+    validate: (formData: unknown) => ValidationResult<DataType>;
+    validateField: (formData: unknown, field: string) => ValidateFieldResult;
+};

package/browser/validation/types.js

@@ -0,0 +1 @@
+export {};

package/browser/validation/validation.test.d.ts

@@ -0,0 +1 @@
+export {};

package/browser/validation/validation.test.js

@@ -0,0 +1,56 @@
+import * as yup from "yup";
+import { withYup } from "..";
+const validationTestCases = [
+    {
+        name: "yup",
+        validator: withYup(yup.object({
+            firstName: yup.string().required(),
+            lastName: yup.string().required(),
+            age: yup.number(),
+        })),
+    },
+];
+// Not going to enforce exact error strings here
+const anyString = expect.any(String);
+describe("Validation", () => {
+    describe.each(validationTestCases)("Adapter for $name", ({ validator }) => {
+        describe("validate", () => {
+            it("should return the data when valid", () => {
+                const obj = {
+                    firstName: "John",
+                    lastName: "Doe",
+                    age: 30,
+                };
+                expect(validator.validate(obj)).toEqual({
+                    data: obj,
+                    error: undefined,
+                });
+            });
+            it("should return field errors when invalid", () => {
+                const obj = { age: "hi!" };
+                expect(validator.validate(obj)).toEqual({
+                    data: undefined,
+                    error: {
+                        firstName: anyString,
+                        lastName: anyString,
+                        age: anyString,
+                    },
+                });
+            });
+        });
+        describe("validateField", () => {
+            it("should not return an error if field is valid", () => {
+                const obj = { firstName: "John", lastName: 123 };
+                expect(validator.validateField(obj, "firstName")).toEqual({
+                    error: undefined,
+                });
+            });
+            it("should return an error if field is invalid", () => {
+                const obj = { firstName: "John", lastName: {} };
+                expect(validator.validateField(obj, "lastName")).toEqual({
+                    error: anyString,
+                });
+            });
+        });
+    });
+});

package/browser/validation/withYup.d.ts

@@ -0,0 +1,3 @@
+import type { AnyObjectSchema, InferType } from "yup";
+import { Validator } from "./types";
+export declare const withYup: <Schema extends AnyObjectSchema>(validationSchema: Schema) => Validator<InferType<Schema>>;

package/browser/validation/withYup.js

@@ -0,0 +1,34 @@
+const validationErrorToFieldErrors = (error) => {
+    const fieldErrors = {};
+    error.inner.forEach((innerError) => {
+        if (!innerError.path)
+            return;
+        fieldErrors[innerError.path] = innerError.message;
+    });
+    return fieldErrors;
+};
+export const withYup = (validationSchema) => ({
+    validate: (data) => {
+        try {
+            const validated = validationSchema.validateSync(data, {
+                abortEarly: false,
+            });
+            return { data: validated, error: undefined };
+        }
+        catch (err) {
+            return {
+                error: validationErrorToFieldErrors(err),
+                data: undefined,
+            };
+        }
+    },
+    validateField: (data, field) => {
+        try {
+            validationSchema.validateSyncAt(field, data);
+            return {};
+        }
+        catch (err) {
+            return { error: err.message };
+        }
+    },
+});

package/build/ValidatedForm.d.ts

@@ -0,0 +1,11 @@
+import { Form as RemixForm, useFetcher } from "@remix-run/react";
+import React, { ComponentProps } from "react";
+import { Validator } from "./validation/types";
+export declare type FormProps<DataType> = {
+    validator: Validator<DataType>;
+    onSubmit?: (data: DataType, event: React.FormEvent<HTMLFormElement>) => void;
+    fetcher?: ReturnType<typeof useFetcher>;
+    defaultValues?: Partial<DataType>;
+    formRef?: React.RefObject<HTMLFormElement>;
+} & Omit<ComponentProps<typeof RemixForm>, "onSubmit">;
+export declare function ValidatedForm<DataType>({ validator, onSubmit, children, fetcher, action, defaultValues, formRef: formRefProp, ...rest }: FormProps<DataType>): JSX.Element;

package/build/ValidatedForm.js

@@ -0,0 +1,76 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValidatedForm = void 0;
+const jsx_runtime_1 = require("react/jsx-runtime");
+const react_1 = require("@remix-run/react");
+const react_2 = require("react");
+const tiny_invariant_1 = __importDefault(require("tiny-invariant"));
+const formContext_1 = require("./internal/formContext");
+const util_1 = require("./internal/util");
+function useFieldErrors(fetcher) {
+    const actionData = (0, react_1.useActionData)();
+    const dataToUse = fetcher ? fetcher.data : actionData;
+    const fieldErrorsFromAction = dataToUse === null || dataToUse === void 0 ? void 0 : dataToUse.fieldErrors;
+    const [fieldErrors, setFieldErrors] = (0, react_2.useState)(fieldErrorsFromAction !== null && fieldErrorsFromAction !== void 0 ? fieldErrorsFromAction : {});
+    (0, react_2.useEffect)(() => {
+        if (fieldErrorsFromAction)
+            setFieldErrors(fieldErrorsFromAction);
+    }, [fieldErrorsFromAction]);
+    return [fieldErrors, setFieldErrors];
+}
+const useIsSubmitting = (action, fetcher) => {
+    const actionForCurrentPage = (0, react_1.useFormAction)();
+    const pendingFormSubmit = (0, react_1.useTransition)().submission;
+    return fetcher
+        ? fetcher.state === "submitting"
+        : pendingFormSubmit &&
+            pendingFormSubmit.action.endsWith(action !== null && action !== void 0 ? action : actionForCurrentPage);
+};
+const getDataFromForm = (el) => Object.fromEntries(new FormData(el));
+function ValidatedForm({ validator, onSubmit, children, fetcher, action, defaultValues, formRef: formRefProp, ...rest }) {
+    var _a;
+    const [fieldErrors, setFieldErrors] = useFieldErrors(fetcher);
+    const isSubmitting = useIsSubmitting(action, fetcher);
+    const formRef = (0, react_2.useRef)(null);
+    const contextValue = (0, react_2.useMemo)(() => ({
+        fieldErrors,
+        action,
+        defaultValues,
+        isSubmitting: isSubmitting !== null && isSubmitting !== void 0 ? isSubmitting : false,
+        clearError: (fieldName) => {
+            setFieldErrors((prev) => (0, util_1.omit)(prev, fieldName));
+        },
+        validateField: (fieldName) => {
+            (0, tiny_invariant_1.default)(formRef.current, "Cannot find reference to form");
+            const { error } = validator.validateField(getDataFromForm(formRef.current), fieldName);
+            if (error) {
+                setFieldErrors((prev) => ({
+                    ...prev,
+                    [fieldName]: error,
+                }));
+            }
+        },
+    }), [
+        fieldErrors,
+        action,
+        defaultValues,
+        isSubmitting,
+        setFieldErrors,
+        validator,
+    ]);
+    const Form = (_a = fetcher === null || fetcher === void 0 ? void 0 : fetcher.Form) !== null && _a !== void 0 ? _a : react_1.Form;
+    return ((0, jsx_runtime_1.jsx)(Form, { ref: (0, util_1.mergeRefs)([formRef, formRefProp]), ...rest, action: action, onSubmit: (event) => {
+            const result = validator.validate(getDataFromForm(event.currentTarget));
+            if (result.error) {
+                event.preventDefault();
+                setFieldErrors(result.error);
+            }
+            else {
+                onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(result.data, event);
+            }
+        }, children: (0, jsx_runtime_1.jsx)(formContext_1.FormContext.Provider, { value: contextValue, children: children }, void 0) }, void 0));
+}
+exports.ValidatedForm = ValidatedForm;

package/build/hooks.d.ts

@@ -0,0 +1,8 @@
+export declare const useField: (name: string) => {
+    error: string;
+    clearError: () => void;
+    validate: () => void;
+    defaultValue: any;
+};
+export declare const useFormContext: () => import("./internal/formContext").FormContextValue;
+export declare const useIsSubmitting: () => boolean;

package/build/hooks.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.useIsSubmitting = exports.useFormContext = exports.useField = void 0;
+const react_1 = require("react");
+const formContext_1 = require("./internal/formContext");
+const useField = (name) => {
+    const { fieldErrors, clearError, validateField, defaultValues } = (0, react_1.useContext)(formContext_1.FormContext);
+    const field = (0, react_1.useMemo)(() => ({
+        error: fieldErrors[name],
+        clearError: () => {
+            clearError(name);
+        },
+        validate: () => validateField(name),
+        defaultValue: defaultValues === null || defaultValues === void 0 ? void 0 : defaultValues[name],
+    }), [clearError, defaultValues, fieldErrors, name, validateField]);
+    return field;
+};
+exports.useField = useField;
+// test commit
+const useFormContext = () => (0, react_1.useContext)(formContext_1.FormContext);
+exports.useFormContext = useFormContext;
+const useIsSubmitting = () => (0, exports.useFormContext)().isSubmitting;
+exports.useIsSubmitting = useIsSubmitting;

package/build/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./hooks";
+export * from "./server";
+export * from "./ValidatedForm";
+export * from "./validation/types";
+export * from "./validation/withYup";

package/build/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./hooks"), exports);
+__exportStar(require("./server"), exports);
+__exportStar(require("./ValidatedForm"), exports);
+__exportStar(require("./validation/types"), exports);
+__exportStar(require("./validation/withYup"), exports);

package/build/internal/formContext.d.ts

@@ -0,0 +1,13 @@
+/// <reference types="react" />
+import { FieldErrors } from "../validation/types";
+export declare type FormContextValue = {
+    fieldErrors: FieldErrors;
+    clearError: (...names: string[]) => void;
+    validateField: (fieldName: string) => void;
+    action?: string;
+    isSubmitting: boolean;
+    defaultValues?: {
+        [fieldName: string]: any;
+    };
+};
+export declare const FormContext: import("react").Context<FormContextValue>;

package/build/internal/formContext.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FormContext = void 0;
+const react_1 = require("react");
+exports.FormContext = (0, react_1.createContext)({
+    fieldErrors: {},
+    clearError: () => { },
+    validateField: () => { },
+    isSubmitting: false,
+});

package/build/internal/util.d.ts

@@ -0,0 +1,3 @@
+import type React from "react";
+export declare const omit: (obj: any, ...keys: string[]) => any;
+export declare const mergeRefs: <T = any>(refs: (React.MutableRefObject<T> | React.LegacyRef<T> | undefined)[]) => (instance: T | null) => void;

package/build/internal/util.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeRefs = exports.omit = void 0;
+const omit = (obj, ...keys) => {
+    const result = { ...obj };
+    for (const key of keys) {
+        delete result[key];
+    }
+    return result;
+};
+exports.omit = omit;
+const mergeRefs = (refs) => {
+    return (value) => {
+        refs.filter(Boolean).forEach((ref) => {
+            if (typeof ref === "function") {
+                ref(value);
+            }
+            else if (ref != null) {
+                ref.current = value;
+            }
+        });
+    };
+};
+exports.mergeRefs = mergeRefs;

package/build/server.d.ts

@@ -0,0 +1,2 @@
+import { FieldErrors } from "./validation/types";
+export declare const fieldErrors: (errors: FieldErrors) => Response;

package/build/server.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fieldErrors = void 0;
+const server_runtime_1 = require("@remix-run/server-runtime");
+const fieldErrors = (errors) => (0, server_runtime_1.json)({ fieldErrors: errors }, { status: 422 });
+exports.fieldErrors = fieldErrors;

package/build/validation/types.d.ts

@@ -0,0 +1,15 @@
+export declare type FieldErrors = Record<string, string>;
+export declare type ValidationResult<DataType> = {
+    data: DataType;
+    error: undefined;
+} | {
+    error: FieldErrors;
+    data: undefined;
+};
+export declare type ValidateFieldResult = {
+    error?: string;
+};
+export declare type Validator<DataType> = {
+    validate: (formData: unknown) => ValidationResult<DataType>;
+    validateField: (formData: unknown, field: string) => ValidateFieldResult;
+};

package/build/validation/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/validation/validation.test.d.ts

@@ -0,0 +1 @@
+export {};

package/build/validation/validation.test.js

@@ -0,0 +1,77 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const yup = __importStar(require("yup"));
+const __1 = require("..");
+const validationTestCases = [
+    {
+        name: "yup",
+        validator: (0, __1.withYup)(yup.object({
+            firstName: yup.string().required(),
+            lastName: yup.string().required(),
+            age: yup.number(),
+        })),
+    },
+];
+// Not going to enforce exact error strings here
+const anyString = expect.any(String);
+describe("Validation", () => {
+    describe.each(validationTestCases)("Adapter for $name", ({ validator }) => {
+        describe("validate", () => {
+            it("should return the data when valid", () => {
+                const obj = {
+                    firstName: "John",
+                    lastName: "Doe",
+                    age: 30,
+                };
+                expect(validator.validate(obj)).toEqual({
+                    data: obj,
+                    error: undefined,
+                });
+            });
+            it("should return field errors when invalid", () => {
+                const obj = { age: "hi!" };
+                expect(validator.validate(obj)).toEqual({
+                    data: undefined,
+                    error: {
+                        firstName: anyString,
+                        lastName: anyString,
+                        age: anyString,
+                    },
+                });
+            });
+        });
+        describe("validateField", () => {
+            it("should not return an error if field is valid", () => {
+                const obj = { firstName: "John", lastName: 123 };
+                expect(validator.validateField(obj, "firstName")).toEqual({
+                    error: undefined,
+                });
+            });
+            it("should return an error if field is invalid", () => {
+                const obj = { firstName: "John", lastName: {} };
+                expect(validator.validateField(obj, "lastName")).toEqual({
+                    error: anyString,
+                });
+            });
+        });
+    });
+});

package/build/validation/withYup.d.ts

@@ -0,0 +1,3 @@
+import type { AnyObjectSchema, InferType } from "yup";
+import { Validator } from "./types";
+export declare const withYup: <Schema extends AnyObjectSchema>(validationSchema: Schema) => Validator<InferType<Schema>>;