fix ulid regex (#2225)

r0ots · web-flow · commit cd7991e04a55 · 2023-10-04T14:31:42.000-07:00
diff --git a/deno/lib/__tests__/string.test.ts b/deno/lib/__tests__/string.test.ts
@@ -266,6 +266,8 @@ test("ulid", () => {
   ulid.parse("01ARZ3NDEKTSV4RRFFQ69G5FAV");
   const result = ulid.safeParse("invalidulid");
   expect(result.success).toEqual(false);
+  const tooLong = "01ARZ3NDEKTSV4RRFFQ69G5FAVA"
+  expect(ulid.safeParse(tooLong).success).toEqual(false);
   if (!result.success) {
     expect(result.error.issues[0].message).toEqual("Invalid ulid");
   }
diff --git a/deno/lib/types.ts b/deno/lib/types.ts
@@ -547,7 +547,7 @@ export interface ZodStringDef extends ZodTypeDef {
 
 const cuidRegex = /^c[^\s-]{8,}$/i;
 const cuid2Regex = /^[a-z][a-z0-9]*$/;
-const ulidRegex = /[0-9A-HJKMNP-TV-Z]{26}/;
+const ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/;
 // 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
@@ -265,6 +265,8 @@ test("ulid", () => {
   ulid.parse("01ARZ3NDEKTSV4RRFFQ69G5FAV");
   const result = ulid.safeParse("invalidulid");
   expect(result.success).toEqual(false);
+  const tooLong = "01ARZ3NDEKTSV4RRFFQ69G5FAVA"
+  expect(ulid.safeParse(tooLong).success).toEqual(false);
   if (!result.success) {
     expect(result.error.issues[0].message).toEqual("Invalid ulid");
   }
diff --git a/src/types.ts b/src/types.ts
@@ -547,7 +547,7 @@ export interface ZodStringDef extends ZodTypeDef {
 
 const cuidRegex = /^c[^\s-]{8,}$/i;
 const cuid2Regex = /^[a-z][a-z0-9]*$/;
-const ulidRegex = /[0-9A-HJKMNP-TV-Z]{26}/;
+const ulidRegex = /^[0-9A-HJKMNP-TV-Z]{26}$/;
 // 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
`@@ -266,6 +266,8 @@ test("ulid", () => {`
`266`	`266`	`ulid.parse("01ARZ3NDEKTSV4RRFFQ69G5FAV");`
`267`	`267`	`const result = ulid.safeParse("invalidulid");`
`268`	`268`	`expect(result.success).toEqual(false);`
	`269`	`+ const tooLong = "01ARZ3NDEKTSV4RRFFQ69G5FAVA"`
	`270`	`+ expect(ulid.safeParse(tooLong).success).toEqual(false);`
`269`	`271`	`if (!result.success) {`
`270`	`272`	`expect(result.error.issues[0].message).toEqual("Invalid ulid");`
`271`	`273`	`}`
Original file line number	Diff line number	Diff line change
`@@ -265,6 +265,8 @@ test("ulid", () => {`
`265`	`265`	`ulid.parse("01ARZ3NDEKTSV4RRFFQ69G5FAV");`
`266`	`266`	`const result = ulid.safeParse("invalidulid");`
`267`	`267`	`expect(result.success).toEqual(false);`
	`268`	`+ const tooLong = "01ARZ3NDEKTSV4RRFFQ69G5FAVA"`
	`269`	`+ expect(ulid.safeParse(tooLong).success).toEqual(false);`
`268`	`270`	`if (!result.success) {`
`269`	`271`	`expect(result.error.issues[0].message).toEqual("Invalid ulid");`
`270`	`272`	`}`