allow unqualified date times

colinhacks · Oct 27, 2023 · 2486484 · 2486484
1 parent 481c9ba
commit 2486484
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -742,7 +742,7 @@ z.string().uuid({ message: "Invalid UUID" });
 z.string().includes("tuna", { message: "Must include tuna" });
 z.string().startsWith("https://", { message: "Must provide secure URL" });
 z.string().endsWith(".com", { message: "Only .com domains allowed" });
-z.string().datetime({ message: "Invalid datetime string! Must be UTC." });
+z.string().datetime({ message: "Invalid datetime string!" });
 z.string().ip({ message: "Invalid IP address" });
 ```
 
@@ -754,6 +754,7 @@ The `z.string().datetime()` method enforces ISO 8601; default is no timezone off
 const datetime = z.string().datetime();
 
 datetime.parse("2020-01-01T00:00:00Z"); // pass
+datetime.parse("2020-01-01T00:00:00"); // pass (unqualified)
 datetime.parse("2020-01-01T00:00:00.123Z"); // pass
 datetime.parse("2020-01-01T00:00:00.123456Z"); // pass (arbitrary precision)
 datetime.parse("2020-01-01T00:00:00+02:00"); // fail (no offsets allowed)
@@ -777,6 +778,7 @@ You can additionally constrain the allowable `precision`. By default, arbitrary
 const datetime = z.string().datetime({ precision: 3 });
 
 datetime.parse("2020-01-01T00:00:00.123Z"); // pass
+datetime.parse("2020-01-01T00:00:00.123"); // pass (unqualified still supported)
 datetime.parse("2020-01-01T00:00:00Z"); // fail
 datetime.parse("2020-01-01T00:00:00.123456Z"); // fail
 ```

diff --git a/deno/lib/README.md b/deno/lib/README.md
@@ -742,7 +742,7 @@ z.string().uuid({ message: "Invalid UUID" });
 z.string().includes("tuna", { message: "Must include tuna" });
 z.string().startsWith("https://", { message: "Must provide secure URL" });
 z.string().endsWith(".com", { message: "Only .com domains allowed" });
-z.string().datetime({ message: "Invalid datetime string! Must be UTC." });
+z.string().datetime({ message: "Invalid datetime string!" });
 z.string().ip({ message: "Invalid IP address" });
 ```
 
@@ -754,6 +754,7 @@ The `z.string().datetime()` method enforces ISO 8601; default is no timezone off
 const datetime = z.string().datetime();
 
 datetime.parse("2020-01-01T00:00:00Z"); // pass
+datetime.parse("2020-01-01T00:00:00"); // pass (unqualified)
 datetime.parse("2020-01-01T00:00:00.123Z"); // pass
 datetime.parse("2020-01-01T00:00:00.123456Z"); // pass (arbitrary precision)
 datetime.parse("2020-01-01T00:00:00+02:00"); // fail (no offsets allowed)
@@ -777,6 +778,7 @@ You can additionally constrain the allowable `precision`. By default, arbitrary
 const datetime = z.string().datetime({ precision: 3 });
 
 datetime.parse("2020-01-01T00:00:00.123Z"); // pass
+datetime.parse("2020-01-01T00:00:00.123"); // pass (unqualified still supported)
 datetime.parse("2020-01-01T00:00:00Z"); // fail
 datetime.parse("2020-01-01T00:00:00.123456Z"); // fail
 ```

diff --git a/deno/lib/__tests__/string.test.ts b/deno/lib/__tests__/string.test.ts
@@ -404,10 +404,15 @@ test("datetime", () => {
 test("datetime parsing", () => {
   const datetime = z.string().datetime();
   datetime.parse("1970-01-01T00:00:00.000Z");
+  datetime.parse("1970-01-01T00:00:00.000");
   datetime.parse("2022-10-13T09:52:31.816Z");
+  datetime.parse("2022-10-13T09:52:31.816");
   datetime.parse("2022-10-13T09:52:31.8162314Z");
+  datetime.parse("2022-10-13T09:52:31.8162314");
   datetime.parse("1970-01-01T00:00:00Z");
+  datetime.parse("1970-01-01T00:00:00");
   datetime.parse("2022-10-13T09:52:31Z");
+  datetime.parse("2022-10-13T09:52:31");
   expect(() => datetime.parse("")).toThrow();
   expect(() => datetime.parse("foo")).toThrow();
   expect(() => datetime.parse("2020-10-14")).toThrow();
@@ -416,15 +421,19 @@ test("datetime parsing", () => {
 
   const datetimeNoMs = z.string().datetime({ precision: 0 });
   datetimeNoMs.parse("1970-01-01T00:00:00Z");
+  datetimeNoMs.parse("1970-01-01T00:00:00");
   datetimeNoMs.parse("2022-10-13T09:52:31Z");
+  datetimeNoMs.parse("2022-10-13T09:52:31");
   expect(() => datetimeNoMs.parse("tuna")).toThrow();
   expect(() => datetimeNoMs.parse("1970-01-01T00:00:00.000Z")).toThrow();
   expect(() => datetimeNoMs.parse("1970-01-01T00:00:00.Z")).toThrow();
   expect(() => datetimeNoMs.parse("2022-10-13T09:52:31.816Z")).toThrow();
 
   const datetime3Ms = z.string().datetime({ precision: 3 });
   datetime3Ms.parse("1970-01-01T00:00:00.000Z");
+  datetime3Ms.parse("1970-01-01T00:00:00.000");
   datetime3Ms.parse("2022-10-13T09:52:31.123Z");
+  datetime3Ms.parse("2022-10-13T09:52:31.123");
   expect(() => datetime3Ms.parse("tuna")).toThrow();
   expect(() => datetime3Ms.parse("1970-01-01T00:00:00.1Z")).toThrow();
   expect(() => datetime3Ms.parse("1970-01-01T00:00:00.12Z")).toThrow();

diff --git a/deno/lib/types.ts b/deno/lib/types.ts
@@ -588,7 +588,7 @@ const datetimeRegex = (args: { precision: number | null; offset: boolean }) => {
       );
     } else {
       return new RegExp(
-        `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}Z$`
+        `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}Z?$`
       );
     }
   } else if (args.precision === 0) {
@@ -597,7 +597,7 @@ const datetimeRegex = (args: { precision: number | null; offset: boolean }) => {
         `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(([+-]\\d{2}(:?\\d{2})?)|Z)$`
       );
     } else {
-      return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z$`);
+      return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z?$`);
     }
   } else {
     if (args.offset) {
@@ -606,7 +606,7 @@ const datetimeRegex = (args: { precision: number | null; offset: boolean }) => {
       );
     } else {
       return new RegExp(
-        `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?Z$`
+        `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?Z?$`
       );
     }
   }

diff --git a/src/__tests__/string.test.ts b/src/__tests__/string.test.ts
@@ -403,10 +403,15 @@ test("datetime", () => {
 test("datetime parsing", () => {
   const datetime = z.string().datetime();
   datetime.parse("1970-01-01T00:00:00.000Z");
+  datetime.parse("1970-01-01T00:00:00.000");
   datetime.parse("2022-10-13T09:52:31.816Z");
+  datetime.parse("2022-10-13T09:52:31.816");
   datetime.parse("2022-10-13T09:52:31.8162314Z");
+  datetime.parse("2022-10-13T09:52:31.8162314");
   datetime.parse("1970-01-01T00:00:00Z");
+  datetime.parse("1970-01-01T00:00:00");
   datetime.parse("2022-10-13T09:52:31Z");
+  datetime.parse("2022-10-13T09:52:31");
   expect(() => datetime.parse("")).toThrow();
   expect(() => datetime.parse("foo")).toThrow();
   expect(() => datetime.parse("2020-10-14")).toThrow();
@@ -415,15 +420,19 @@ test("datetime parsing", () => {
 
   const datetimeNoMs = z.string().datetime({ precision: 0 });
   datetimeNoMs.parse("1970-01-01T00:00:00Z");
+  datetimeNoMs.parse("1970-01-01T00:00:00");
   datetimeNoMs.parse("2022-10-13T09:52:31Z");
+  datetimeNoMs.parse("2022-10-13T09:52:31");
   expect(() => datetimeNoMs.parse("tuna")).toThrow();
   expect(() => datetimeNoMs.parse("1970-01-01T00:00:00.000Z")).toThrow();
   expect(() => datetimeNoMs.parse("1970-01-01T00:00:00.Z")).toThrow();
   expect(() => datetimeNoMs.parse("2022-10-13T09:52:31.816Z")).toThrow();
 
   const datetime3Ms = z.string().datetime({ precision: 3 });
   datetime3Ms.parse("1970-01-01T00:00:00.000Z");
+  datetime3Ms.parse("1970-01-01T00:00:00.000");
   datetime3Ms.parse("2022-10-13T09:52:31.123Z");
+  datetime3Ms.parse("2022-10-13T09:52:31.123");
   expect(() => datetime3Ms.parse("tuna")).toThrow();
   expect(() => datetime3Ms.parse("1970-01-01T00:00:00.1Z")).toThrow();
   expect(() => datetime3Ms.parse("1970-01-01T00:00:00.12Z")).toThrow();

diff --git a/src/types.ts b/src/types.ts
@@ -588,7 +588,7 @@ const datetimeRegex = (args: { precision: number | null; offset: boolean }) => {
       );
     } else {
       return new RegExp(
-        `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}Z$`
+        `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{${args.precision}}Z?$`
       );
     }
   } else if (args.precision === 0) {
@@ -597,7 +597,7 @@ const datetimeRegex = (args: { precision: number | null; offset: boolean }) => {
         `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(([+-]\\d{2}(:?\\d{2})?)|Z)$`
       );
     } else {
-      return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z$`);
+      return new RegExp(`^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}Z?$`);
     }
   } else {
     if (args.offset) {
@@ -606,7 +606,7 @@ const datetimeRegex = (args: { precision: number | null; offset: boolean }) => {
       );
     } else {
       return new RegExp(
-        `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?Z$`
+        `^\\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?Z?$`
       );
     }
   }