Fix issue #3582 : ULID should be case insensitive (#3593)

mohamed-azd · AZDOUD Mohamed · colinhacks · web-flow · commit c6bc80de5091 · 2024-06-28T17:50:29.000-07:00
* Fix issue #3582 : ULID should be case insensitive * Use i flag --------- Co-authored-by: AZDOUD Mohamed <mazdoud-ext@cogelec.fr> Co-authored-by: Colin McDonnell <colinmcd94@gmail.com>
diff --git a/deno/lib/__tests__/string.test.ts b/deno/lib/__tests__/string.test.ts
@@ -331,6 +331,8 @@ test("ulid", () => {
   if (!result.success) {
     expect(result.error.issues[0].message).toEqual("Invalid ulid");
   }
+  const caseInsensitive = ulid.safeParse("01arZ3nDeKTsV4RRffQ69G5FAV")
+  expect(caseInsensitive.success).toEqual(true)
 });
 
 test("regex", () => {
diff --git a/deno/lib/types.ts b/deno/lib/types.ts
@@ -575,7 +575,7 @@ export interface ZodStringDef extends ZodTypeDef {
 
 const cuidRegex = /^c[^\s-]{8,}$/i;
 const cuid2Regex = /^[0-9a-z]+$/;
-const ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/;
+const ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/i;
 // const uuidRegex =
 //   /^([a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[a-f0-9]{4}-[a-f0-9]{12}|00000000-0000-0000-0000-000000000000)$/i;
 const uuidRegex =
diff --git a/src/__tests__/string.test.ts b/src/__tests__/string.test.ts
@@ -330,6 +330,8 @@ test("ulid", () => {
   if (!result.success) {
     expect(result.error.issues[0].message).toEqual("Invalid ulid");
   }
+  const caseInsensitive = ulid.safeParse("01arZ3nDeKTsV4RRffQ69G5FAV")
+  expect(caseInsensitive.success).toEqual(true)
 });
 
 test("regex", () => {
diff --git a/src/types.ts b/src/types.ts
@@ -575,7 +575,7 @@ export interface ZodStringDef extends ZodTypeDef {
 
 const cuidRegex = /^c[^\s-]{8,}$/i;
 const cuid2Regex = /^[0-9a-z]+$/;
-const ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/;
+const ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/i;
 // const uuidRegex =
 //   /^([a-f0-9]{8}-[a-f0-9]{4}-[1-5][a-f0-9]{3}-[a-f0-9]{4}-[a-f0-9]{12}|00000000-0000-0000-0000-000000000000)$/i;
 const uuidRegex =

Original file line number	Diff line number	Diff line change
`@@ -331,6 +331,8 @@ test("ulid", () => {`
`331`	`331`	`if (!result.success) {`
`332`	`332`	`expect(result.error.issues[0].message).toEqual("Invalid ulid");`
`333`	`333`	`}`
	`334`	`+ const caseInsensitive = ulid.safeParse("01arZ3nDeKTsV4RRffQ69G5FAV")`
	`335`	`+ expect(caseInsensitive.success).toEqual(true)`
`334`	`336`	`});`
`335`	`337`
`336`	`338`	`test("regex", () => {`
Original file line number	Diff line number	Diff line change
`@@ -330,6 +330,8 @@ test("ulid", () => {`
`330`	`330`	`if (!result.success) {`
`331`	`331`	`expect(result.error.issues[0].message).toEqual("Invalid ulid");`
`332`	`332`	`}`
	`333`	`+ const caseInsensitive = ulid.safeParse("01arZ3nDeKTsV4RRffQ69G5FAV")`
	`334`	`+ expect(caseInsensitive.success).toEqual(true)`
`333`	`335`	`});`
`334`	`336`
`335`	`337`	`test("regex", () => {`