Removed BRAND from ZodBrand Input definition (#1492)

* removed brand from input definition * added tests
colinhacks · Oct 18, 2022 · 04f28e6 · 04f28e6
1 parent bc9073d
commit 04f28e6
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 10 deletions.
diff --git a/deno/lib/__tests__/branded.test.ts b/deno/lib/__tests__/branded.test.ts
@@ -47,6 +47,17 @@ test("branded types", () => {
     true
   );
 
+  // keeping brands out of input types
+  const age = z.number().brand<"age">();
+
+  type Age = z.infer<typeof age>;
+  type AgeInput = z.input<typeof age>;
+
+  util.assertEqual<AgeInput, Age>(false);
+
+  util.assertEqual<number, AgeInput>(true);
+  util.assertEqual<number & z.BRAND<"age">, Age>(true);
+
   // @ts-expect-error
   doStuff({ name: "hello there!" });
 });
diff --git a/deno/lib/types.ts b/deno/lib/types.ts
@@ -3795,11 +3795,7 @@ export type BRAND<T extends string | number | symbol> = {
 export class ZodBranded<
   T extends ZodTypeAny,
   B extends string | number | symbol
-> extends ZodType<
-  T["_output"] & BRAND<B>,
-  ZodBrandedDef<T>,
-  T["_input"] & BRAND<B>
-> {
+> extends ZodType<T["_output"] & BRAND<B>, ZodBrandedDef<T>, T["_input"]> {
   _parse(input: ParseInput): ParseReturnType<any> {
     const { ctx } = this._processInputParams(input);
     const data = ctx.data;

diff --git a/src/__tests__/branded.test.ts b/src/__tests__/branded.test.ts
@@ -46,6 +46,17 @@ test("branded types", () => {
     true
   );
 
+  // keeping brands out of input types
+  const age = z.number().brand<"age">();
+
+  type Age = z.infer<typeof age>;
+  type AgeInput = z.input<typeof age>;
+
+  util.assertEqual<AgeInput, Age>(false);
+
+  util.assertEqual<number, AgeInput>(true);
+  util.assertEqual<number & z.BRAND<"age">, Age>(true);
+
   // @ts-expect-error
   doStuff({ name: "hello there!" });
 });
diff --git a/src/types.ts b/src/types.ts
@@ -3795,11 +3795,7 @@ export type BRAND<T extends string | number | symbol> = {
 export class ZodBranded<
   T extends ZodTypeAny,
   B extends string | number | symbol
-> extends ZodType<
-  T["_output"] & BRAND<B>,
-  ZodBrandedDef<T>,
-  T["_input"] & BRAND<B>
-> {
+> extends ZodType<T["_output"] & BRAND<B>, ZodBrandedDef<T>, T["_input"]> {
   _parse(input: ParseInput): ParseReturnType<any> {
     const { ctx } = this._processInputParams(input);
     const data = ctx.data;