Fix Deno bundle error

colinhacks · Jul 18, 2022 · fb6b0a7 · fb6b0a7
1 parent cbfe704
commit fb6b0a7
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 17 deletions.
diff --git a/deno/lib/ZodError.ts b/deno/lib/ZodError.ts
@@ -413,8 +413,12 @@ export const defaultErrorMap = (
   return { message };
 };
 
-export let overrideErrorMap = defaultErrorMap;
+let overrideErrorMap = defaultErrorMap;
 
-export const setErrorMap = (map: ZodErrorMap) => {
+export function setErrorMap(map: ZodErrorMap) {
   overrideErrorMap = map;
-};
+}
+
+export function getErrorMap() {
+  return overrideErrorMap;
+}
diff --git a/deno/lib/helpers/parseUtil.ts b/deno/lib/helpers/parseUtil.ts
@@ -1,5 +1,5 @@
 import type { IssueData, ZodErrorMap, ZodIssue } from "../ZodError.ts";
-import { defaultErrorMap, overrideErrorMap } from "../ZodError.ts";
+import { defaultErrorMap, getErrorMap } from "../ZodError.ts";
 import type { ZodParsedType } from "./util.ts";
 
 export const makeIssue = (params: {
@@ -71,7 +71,7 @@ export function addIssueToContext(
     errorMaps: [
       ctx.common.contextualErrorMap, // contextual error map is first priority
       ctx.schemaErrorMap, // then schema-bound map if available
-      overrideErrorMap, // then global override map
+      getErrorMap(), // then global override map
       defaultErrorMap, // then global default map
     ].filter((x) => !!x) as ZodErrorMap[],
   });

diff --git a/deno/lib/types.ts b/deno/lib/types.ts
@@ -23,8 +23,8 @@ import { Primitive } from "./helpers/typeAliases.ts";
 import { getParsedType, util, ZodParsedType } from "./helpers/util.ts";
 import {
   defaultErrorMap,
+  getErrorMap,
   IssueData,
-  overrideErrorMap,
   StringValidation,
   ZodCustomIssue,
   ZodError,
@@ -2823,7 +2823,7 @@ export class ZodFunction<
         errorMaps: [
           ctx.common.contextualErrorMap,
           ctx.schemaErrorMap,
-          overrideErrorMap,
+          getErrorMap(),
           defaultErrorMap,
         ].filter((x) => !!x) as ZodErrorMap[],
         issueData: {
@@ -2840,7 +2840,7 @@ export class ZodFunction<
         errorMaps: [
           ctx.common.contextualErrorMap,
           ctx.schemaErrorMap,
-          overrideErrorMap,
+          getErrorMap(),
           defaultErrorMap,
         ].filter((x) => !!x) as ZodErrorMap[],
         issueData: {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zod",
-  "version": "3.17.5",
+  "version": "3.17.6",
   "description": "TypeScript-first schema declaration and validation library with static type inference",
   "main": "./lib/index.js",
   "types": "./index.d.ts",

diff --git a/src/ZodError.ts b/src/ZodError.ts
@@ -413,8 +413,12 @@ export const defaultErrorMap = (
   return { message };
 };
 
-export let overrideErrorMap = defaultErrorMap;
+let overrideErrorMap = defaultErrorMap;
 
-export const setErrorMap = (map: ZodErrorMap) => {
+export function setErrorMap(map: ZodErrorMap) {
   overrideErrorMap = map;
-};
+}
+
+export function getErrorMap() {
+  return overrideErrorMap;
+}
diff --git a/src/helpers/parseUtil.ts b/src/helpers/parseUtil.ts
@@ -1,5 +1,5 @@
 import type { IssueData, ZodErrorMap, ZodIssue } from "../ZodError";
-import { defaultErrorMap, overrideErrorMap } from "../ZodError";
+import { defaultErrorMap, getErrorMap } from "../ZodError";
 import type { ZodParsedType } from "./util";
 
 export const makeIssue = (params: {
@@ -71,7 +71,7 @@ export function addIssueToContext(
     errorMaps: [
       ctx.common.contextualErrorMap, // contextual error map is first priority
       ctx.schemaErrorMap, // then schema-bound map if available
-      overrideErrorMap, // then global override map
+      getErrorMap(), // then global override map
       defaultErrorMap, // then global default map
     ].filter((x) => !!x) as ZodErrorMap[],
   });

diff --git a/src/types.ts b/src/types.ts
@@ -23,8 +23,8 @@ import { Primitive } from "./helpers/typeAliases";
 import { getParsedType, util, ZodParsedType } from "./helpers/util";
 import {
   defaultErrorMap,
+  getErrorMap,
   IssueData,
-  overrideErrorMap,
   StringValidation,
   ZodCustomIssue,
   ZodError,
@@ -2823,7 +2823,7 @@ export class ZodFunction<
         errorMaps: [
           ctx.common.contextualErrorMap,
           ctx.schemaErrorMap,
-          overrideErrorMap,
+          getErrorMap(),
           defaultErrorMap,
         ].filter((x) => !!x) as ZodErrorMap[],
         issueData: {
@@ -2840,7 +2840,7 @@ export class ZodFunction<
         errorMaps: [
           ctx.common.contextualErrorMap,
           ctx.schemaErrorMap,
-          overrideErrorMap,
+          getErrorMap(),
           defaultErrorMap,
         ].filter((x) => !!x) as ZodErrorMap[],
         issueData: {