refactor: return invalid type on coerce error

colinhacks · Nov 24, 2024 · 644af27 · 644af27
1 parent 4d05e52
commit 644af27
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 16 deletions.
diff --git a/deno/lib/types.ts b/deno/lib/types.ts
@@ -1552,18 +1552,12 @@ export class ZodBigInt extends ZodType<bigint, ZodBigIntDef, bigint> {
       try {
         input.data = BigInt(input.data);
       } catch {
-        input.data = undefined;
+        return this._getInvalidInput(input);
       }
     }
     const parsedType = this._getType(input);
     if (parsedType !== ZodParsedType.bigint) {
-      const ctx = this._getOrReturnCtx(input);
-      addIssueToContext(ctx, {
-        code: ZodIssueCode.invalid_type,
-        expected: ZodParsedType.bigint,
-        received: ctx.parsedType,
-      });
-      return INVALID;
+      return this._getInvalidInput(input);
     }
 
     let ctx: undefined | ParseContext = undefined;
@@ -1618,6 +1612,16 @@ export class ZodBigInt extends ZodType<bigint, ZodBigIntDef, bigint> {
     return { status: status.value, value: input.data };
   }
 
+  _getInvalidInput(input: ParseInput) {
+    const ctx = this._getOrReturnCtx(input);
+    addIssueToContext(ctx, {
+      code: ZodIssueCode.invalid_type,
+      expected: ZodParsedType.bigint,
+      received: ctx.parsedType,
+    });
+    return INVALID;
+  }
+
   static create = (
     params?: RawCreateParams & { coerce?: boolean }
   ): ZodBigInt => {

diff --git a/src/types.ts b/src/types.ts
@@ -1552,18 +1552,12 @@ export class ZodBigInt extends ZodType<bigint, ZodBigIntDef, bigint> {
       try {
         input.data = BigInt(input.data);
       } catch {
-        input.data = undefined;
+        return this._getInvalidInput(input);
       }
     }
     const parsedType = this._getType(input);
     if (parsedType !== ZodParsedType.bigint) {
-      const ctx = this._getOrReturnCtx(input);
-      addIssueToContext(ctx, {
-        code: ZodIssueCode.invalid_type,
-        expected: ZodParsedType.bigint,
-        received: ctx.parsedType,
-      });
-      return INVALID;
+      return this._getInvalidInput(input);
     }
 
     let ctx: undefined | ParseContext = undefined;
@@ -1618,6 +1612,16 @@ export class ZodBigInt extends ZodType<bigint, ZodBigIntDef, bigint> {
     return { status: status.value, value: input.data };
   }
 
+  _getInvalidInput(input: ParseInput) {
+    const ctx = this._getOrReturnCtx(input);
+    addIssueToContext(ctx, {
+      code: ZodIssueCode.invalid_type,
+      expected: ZodParsedType.bigint,
+      received: ctx.parsedType,
+    });
+    return INVALID;
+  }
+
   static create = (
     params?: RawCreateParams & { coerce?: boolean }
   ): ZodBigInt => {