Fix issue colinhacks#3582 : ULID should be case insensitive (colinhac…

…ks#3593) * Fix issue colinhacks#3582 : ULID should be case insensitive * Use i flag --------- Co-authored-by: AZDOUD Mohamed <[email protected]> Co-authored-by: Colin McDonnell <[email protected]>
oberbeck · Jun 29, 2024 · c6bc80d · c6bc80d
1 parent aab9eac
commit c6bc80d
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
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 =