fix: type of isValidationErrorResponse

airjp73 · Jun 13, 2024 · 65e9e9e · 65e9e9e
1 parent 3de22a7
commit 65e9e9e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/packages/core/src/createValidator.ts b/packages/core/src/createValidator.ts
@@ -3,7 +3,7 @@ import {
   ValidationErrorResponseData,
   Validator,
 } from "./types";
-import { GenericObject, preprocessFormData } from "./native-form-data/flatten";
+import { preprocessFormData } from "./native-form-data/flatten";
 import { FORM_ID_FIELD_NAME } from "./constants";
 
 /**
@@ -12,7 +12,7 @@ import { FORM_ID_FIELD_NAME } from "./constants";
  * extracting the values from FormData.
  */
 export function createValidator<T>(
-  validator: CreateValidatorArg<T>,
+  validator: CreateValidatorArg<T>
 ): Validator<T> {
   return {
     validate: async (value) => {
@@ -42,6 +42,9 @@ export function createValidator<T>(
   };
 }
 
-export const isValidationErrorResponse = <T extends GenericObject>(
-  response: T | ValidationErrorResponseData,
-): response is ValidationErrorResponseData => "fieldErrors" in response;
+export const isValidationErrorResponse = <T>(
+  response: T | ValidationErrorResponseData
+): response is ValidationErrorResponseData =>
+  typeof response === "object" &&
+  response !== null &&
+  "fieldErrors" in response;
diff --git a/packages/remix/src/server.ts b/packages/remix/src/server.ts
@@ -21,7 +21,7 @@ import { ValidationErrorResponseData, ValidatorError } from "@rvf/core";
 export function validationError(
   error: ValidatorError,
   repopulateFields?: unknown,
-  init?: ResponseInit,
+  init?: ResponseInit
 ) {
   return new Response(
     JSON.stringify({
@@ -35,6 +35,6 @@ export function validationError(
       headers: {
         "Content-Type": "application/json; utf-8",
       },
-    },
+    }
   ) as TypedResponse<ValidationErrorResponseData>;
 }