fix: more reliable missing/empty file check

GauBen · Oct 11, 2024 · 3cbea07 · 3cbea07
1 parent 09bcb57
commit 3cbea07
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/.changeset/itchy-seas-tickle.md b/.changeset/itchy-seas-tickle.md
@@ -0,0 +1,5 @@
+---
+"formgator": patch
+---
+
+More reliable missing/empty file check
diff --git a/src/validators/file.test.ts b/src/validators/file.test.ts
@@ -10,6 +10,7 @@ describe("file()", async () => {
     data.append("input", f);
 
     assert.deepEqualTyped(file().safeParse(data, "input"), succeed(f));
+    assert.deepEqualTyped(file().safeParse(data, "missing"), succeed(null));
     assert.deepEqualTyped(
       file({ multiple: true }).safeParse(data, "input"),
       succeed([f]),
@@ -39,6 +40,10 @@ describe("file()", async () => {
     data.append("ok", f);
 
     assert.deepEqualTyped(file().safeParse(data, "input"), failures.type());
+    assert.deepEqualTyped(
+      file({ required: true }).safeParse(data, "missing"),
+      failures.required(),
+    );
     assert.deepEqualTyped(
       file({ multiple: true }).safeParse(data, "input"),
       failures.type(),

diff --git a/src/validators/file.ts b/src/validators/file.ts
@@ -58,7 +58,10 @@ export function file(
         }
       : (data, name) => {
           const value = data.get(name);
-          if (!(value instanceof File)) return failures.type();
+          if (value !== null && !(value instanceof File))
+            return failures.type();
+          if (value === null || (value.size === 0 && value.name === ""))
+            return attributes.required ? failures.required() : succeed(null);
           if (!accept(value)) return failures.accept(attributes.accept!);
           return succeed(value);
         },