nonNullable disallows undefined

colinhacks · Apr 2, 2024 · a54ef93 · a54ef93
1 parent 991750c
commit a54ef93
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 4 deletions.
diff --git a/deno/lib/__tests__/nonNullable.test.ts b/deno/lib/__tests__/nonNullable.test.ts
@@ -19,13 +19,21 @@ test("parses a number correctly using z.nonNullable(...)", () => {
 });
 
 test("fails is passed null", () => {
- const a = z.nullable(z.number()).nonNullable();
+ const a = z.nullable(z.any()).nonNullable();
 
  expect(() => {
  a.parse(null);
  }).toThrow(z.ZodError)
 });
 
+test("fails is passed undefined", () => {
+ const a = z.nullable(z.any()).nonNullable();
+
+ expect(() => {
+ a.parse(undefined);
+ }).toThrow(z.ZodError)
+});
+
 test("unwrap", () => {
  const unwrapped = z.any().nonNullable().unwrap();
  expect(unwrapped).toBeInstanceOf(z.ZodAny);

diff --git a/deno/lib/types.ts b/deno/lib/types.ts
@@ -4480,7 +4480,10 @@ export class ZodNonNullable<T extends ZodTypeAny> extends ZodType<
 > {
  _parse(input: ParseInput): ParseReturnType<this["_output"]> {
  const parsedType = this._getType(input);
- if (parsedType === ZodParsedType.null) {
+ if (
+ parsedType === ZodParsedType.null ||
+ parsedType === ZodParsedType.undefined
+ ) {
  const { ctx } = this._processInputParams(input);
  addIssueToContext(ctx, {
  code: ZodIssueCode.invalid_type,

diff --git a/src/__tests__/nonNullable.test.ts b/src/__tests__/nonNullable.test.ts
@@ -18,13 +18,21 @@ test("parses a number correctly using z.nonNullable(...)", () => {
 });
 
 test("fails is passed null", () => {
- const a = z.nullable(z.number()).nonNullable();
+ const a = z.nullable(z.any()).nonNullable();
 
  expect(() => {
  a.parse(null);
  }).toThrow(z.ZodError)
 });
 
+test("fails is passed undefined", () => {
+ const a = z.nullable(z.any()).nonNullable();
+
+ expect(() => {
+ a.parse(undefined);
+ }).toThrow(z.ZodError)
+});
+
 test("unwrap", () => {
  const unwrapped = z.any().nonNullable().unwrap();
  expect(unwrapped).toBeInstanceOf(z.ZodAny);

diff --git a/src/types.ts b/src/types.ts
@@ -4480,7 +4480,10 @@ export class ZodNonNullable<T extends ZodTypeAny> extends ZodType<
 > {
  _parse(input: ParseInput): ParseReturnType<this["_output"]> {
  const parsedType = this._getType(input);
- if (parsedType === ZodParsedType.null) {
+ if (
+ parsedType === ZodParsedType.null ||
+ parsedType === ZodParsedType.undefined
+ ) {
  const { ctx } = this._processInputParams(input);
  addIssueToContext(ctx, {
  code: ZodIssueCode.invalid_type,