fix: parsableStrictIsoDateZ case insensitivity issues

belgattitude · May 24, 2024 · 066e527 · 066e527
1 parent 16e7dce
commit 066e527
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/.changeset/smart-seals-study.md b/.changeset/smart-seals-study.md
@@ -0,0 +1,5 @@
+---
+"@httpx/assert": patch
+---
+
+make assertParsableStrictIsoDateZ case insensitive
diff --git a/packages/assert/src/__tests__/string.guard.test.ts b/packages/assert/src/__tests__/string.guard.test.ts
@@ -7,7 +7,7 @@ import {
 } from '../string.guards';
 
 describe('Typeguards string tests', () => {
-  describe('isParsableIsoStrictDateZ', () => {
+  describe('isParsableStrictIsoDateZ', () => {
     it.each([
       [true, new Date().toISOString()],
       [true, '2023-12-29T23:37:31.653Z'],

diff --git a/packages/assert/src/string.asserts.ts b/packages/assert/src/string.asserts.ts
@@ -47,14 +47,10 @@ export function assertParsableStrictIsoDateZ(
   let check: 'INVALID_FORMAT' | 'INVALID_DATE' | true | null = null;
   if (typeof v !== 'string') {
     check = null;
-  } else if (
-    v.length === 24 &&
-    isoDateTimeZRegexp.test(v.toLocaleUpperCase())
-  ) {
+  } else if (v.length === 24 && isoDateTimeZRegexp.test(v)) {
     try {
-      const d = new Date(v);
       check =
-        d.toISOString().toLocaleLowerCase() === v.toLocaleLowerCase()
+        new Date(v).toISOString().toUpperCase() === v.toUpperCase()
           ? true
           : 'INVALID_DATE';
     } catch {

diff --git a/packages/assert/src/string.guards.ts b/packages/assert/src/string.guards.ts
@@ -35,16 +35,11 @@ export const isParsableSafeInt = (v: unknown): v is ParsableSafeInt => {
 export const isParsableStrictIsoDateZ = (
   v: unknown
 ): v is ParsableStrictIsoDateZ => {
-  if (
-    !isStringNonEmpty(v) ||
-    v.length !== 24 ||
-    !isoDateTimeZRegexp.test(v.toLocaleUpperCase())
-  ) {
+  if (!isStringNonEmpty(v) || v.length !== 24 || !isoDateTimeZRegexp.test(v)) {
     return false;
   }
   try {
-    const d = new Date(v);
-    return d.toISOString().toLowerCase() === v.toLowerCase();
+    return new Date(v).toISOString().toUpperCase() === v.toUpperCase();
   } catch {
     return false;
   }

diff --git a/packages/assert/src/string.utils.ts b/packages/assert/src/string.utils.ts
@@ -1,2 +1,3 @@
 export const isoDateTimeZRegexp =
-  /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/;
+  // eslint-disable-next-line unicorn/better-regex
+  /^\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d{3}Z$/i;