fix: use the custom error message correctly

colinhacks · Aug 28, 2024 · 4b94fbc · 4b94fbc
1 parent 8552233
commit 4b94fbc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/deno/lib/README.md b/deno/lib/README.md
@@ -219,7 +219,7 @@ Sponsorship at any level is appreciated and encouraged. If you built a paid prod
       <a href="https://neon.tech">
         <picture height="68px">
           <source media="(prefers-color-scheme: dark)" srcset="https://github.com/user-attachments/assets/83b4b1b1-a9ab-4ae5-a632-56d282f0c444">
-          <img alt="stainless" height="68px" src="https://github.com/user-attachments/assets/83b4b1b1-a9ab-4ae5-a632-56d282f0c444">
+          <img alt="Neon" height="68px" src="https://github.com/user-attachments/assets/b5799fc8-81ff-4053-a1c3-b29adf85e7a1">
         </picture>
       </a>
       <br  />   

diff --git a/deno/lib/types.ts b/deno/lib/types.ts
@@ -138,14 +138,17 @@ function processCreateParams(params: RawCreateParams): ProcessedCreateParams {
   const customMap: ZodErrorMap = (iss, ctx) => {
     const { message } = params;
 
+    if (message != null) {
+      return { message };
+    }
     if (iss.code === "invalid_enum_value") {
-      return { message: message ?? ctx.defaultError };
+      return { message: ctx.defaultError };
     }
     if (typeof ctx.data === "undefined") {
-      return { message: message ?? required_error ?? ctx.defaultError };
+      return { message: required_error ?? ctx.defaultError };
     }
     if (iss.code !== "invalid_type") return { message: ctx.defaultError };
-    return { message: message ?? invalid_type_error ?? ctx.defaultError };
+    return { message: invalid_type_error ?? ctx.defaultError };
   };
   return { errorMap: customMap, description };
 }

diff --git a/src/types.ts b/src/types.ts
@@ -138,14 +138,17 @@ function processCreateParams(params: RawCreateParams): ProcessedCreateParams {
   const customMap: ZodErrorMap = (iss, ctx) => {
     const { message } = params;
 
+    if (message != null) {
+      return { message };
+    }
     if (iss.code === "invalid_enum_value") {
-      return { message: message ?? ctx.defaultError };
+      return { message: ctx.defaultError };
     }
     if (typeof ctx.data === "undefined") {
-      return { message: message ?? required_error ?? ctx.defaultError };
+      return { message: required_error ?? ctx.defaultError };
     }
     if (iss.code !== "invalid_type") return { message: ctx.defaultError };
-    return { message: message ?? invalid_type_error ?? ctx.defaultError };
+    return { message: invalid_type_error ?? ctx.defaultError };
   };
   return { errorMap: customMap, description };
 }