Merge pull request #54 from zanerock/work-liquid-labs/regex-repo/53

Drop the 'day' and 'time' only ISO 8601 and RFC 2822 regex and replace with usDateRE, intlDateRE, and timeOfDayRE

Author: zanerock

src/date-times.mjs

@@ -18,45 +18,50 @@ import { lockdownRE } from './lib/lockdown-re'
 // Started RE based on https://www.myintervals.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/
 // Made some corrections, rearranged capture groups.
 
-export const iso8601DayOnlyREString = '([+-]?\\d{4})(?:(-?)(?:(0[1-9]|1[0-2])(?:\\2([12]\\d|0[1-9]|3[01])?)?|W([0-4]\\d|5[0-3])\\2([1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3(?:[0-5]\\d|6[1-6])))?)?'
-// Date/Times: Matches as [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) consisting of dates only, like '2024-01-01'. Provides matching groups 1 (year), 3 (month), and 4 (day of month), 5 (week date), 6 (day of week date), and 7 (ordinal or Julian date). (Group 2 is an internal backreference.)
-export const iso8601DayOnlyRE = lockdownRE(iso8601DayOnlyREString)
+const iso8601DayOnlyREString = '([+-]?\\d{4})(?:(-?)(?:(0[1-9]|1[0-2])(?:\\2([12]\\d|0[1-9]|3[01])?)?|W([0-4]\\d|5[0-3])\\2([1-7])?|(00[1-9]|0[1-9]\\d|[12]\\d{2}|3(?:[0-5]\\d|6[1-6])))?)?'
 
 const eod = '(24(?<endSep>:?)00\\k<endSep>00)'
-const frac = '([.,]\\d+)'
+const frac = '(?:[.,](\\d+))'
 const hr = `(?:([01]\\d|2[0-3])${frac}?)`
 const min = `(?:([0-5]\\d)${frac}?)`
 const sec = `(?:([0-5]\\d|60)${frac}?)`
 const tz = '([zZ]|(?:[+-](?!00(?::?00)?)(?:[01]\\d|2[0-3])(?::?[0-5]\\d)?))'
 
-export const iso8601TimeOnlyREString = `(?:${eod}|${hr}(?:(?<timeSep>:?)${min}(?:\\k<timeSep>${sec})?)?)${tz}?`
-// Date/Time: Matches an [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) style time designation, like '12:12Z'. Provides matching 1 (special instant end of day time), 3 (hour), 4 (decimal fraction of hour), 6 (minute), 7 (decimal fraction of minute), 8 (seconds), 9 (decimal fraction of a second), and 10 (timezone designation). (Groups 2 and 5 are internal back references.)
-export const iso8601TimeOnlyRE = lockdownRE(iso8601TimeOnlyREString)
+const iso8601TimeOnlyREString = `(?:${eod}|${hr}(?:(?<timeSep>:?)${min}(?:\\k<timeSep>${sec})?)?)${tz}?`
 
 export const iso8601DateREString = `${iso8601DayOnlyREString}(?:T${iso8601TimeOnlyREString})?`
-// Date/Time: Matches an [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) date time like '20240101T1212Z. Provides matching groups 1 (year), 3 (month), and 4 (day of month), 5 (week date), 6 (day of week date), and 7 (ordinal or Julian date), 8 (special instant end of day time), 10 (hour), 12 (decimal fraction of hour), 14 (minute), 15(decimal fraction of minute), 16 (seconds), 17 (decimal fraction of a second), and 18 (timezone designation). (Groups 2, 11, and 13 are internal back references.)
+// Date/Time: Matches an [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) date time like '20240101T1212Z. Provides matching groups 1 (year), 3 (month), and 4 (day of month), 5 (week date), 6 (day of week date), and 7 (ordinal or Julian date), 8 (special instant end of day time), 10 (hour), 11 (decimal fraction of hour), 13 (minute), 14 (decimal fraction of minute), 15 (seconds), 16 (decimal fraction of a second), and 17 (timezone designation). (Groups 2, 11, and 13 are internal back references.)
 export const iso8601DateRE = lockdownRE(iso8601DateREString)
 
 export const iso8601DateTimeREString = `${iso8601DayOnlyREString}T${iso8601TimeOnlyREString}`
-// Date/Time: Matches an [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) _requiring_ both date and time components.
+// Date/Time: Matches an [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601) _requiring_ both date and time components. See [`iso8601DateRE`](#iso8601datere) for matching groups.
 export const iso8601DateTimeRE = lockdownRE(iso8601DateTimeREString)
 
-export const iso8601LooseDateREString = `${iso8601DayOnlyREString}(?:[T\\s]${iso8601TimeOnlyREString})?`
-// Date/Time: Matches an [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601)-like date time allowing for a space to separate the date and time components instead of requiring a 'T' as the ISO 8601 spec requires, like '20240101 1212Z'. See [`iso8601DateRE`](#iso8601datere) for capture groups.`
-export const iso8601LooseDateRE = lockdownRE(iso8601LooseDateREString)
-
-export const iso8601LooseDateTimeREString = `${iso8601DayOnlyREString}[T\\s]${iso8601TimeOnlyREString}`
-// Date/Time: Matches an [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601)-lke date time allowing for a space to separate the date and time instead of requiring a 'T' and _requiring_ both date and time components, like '20240101 1212Z'. See [`iso8601DateRE`](#iso8601datere) for capture groups.
-export const iso8601LooseDateTimeRE = lockdownRE(iso8601LooseDateTimeREString)
-
-export const rfc2822DayOnlyREString = '(?:(Sun|Mon|Tue|Wed|Thu|Fri|Sat),\\s+)?(0[1-9]|[1-2]?[0-9]|3[01])\\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\s+(\\d{2,4})'
-// Date/Tmie: Matches an [RFC 2822](https://datatracker.ietf.org/doc/html/rfc2822#section-3.3) style date like 'Mon, 6 Jan 1992'. Provides matching groups 1 (day of week), 2 (day of month), 3 (month), and 4 (year).
-export const rfc2822DayOnlyRE = lockdownRE(rfc2822DayOnlyREString)
-
-export const rfc2822TimeOnlyREString = '(2[0-3]|[0-1][0-9]):([0-5][0-9])(?::(60|[0-5][0-9]))?(?:\\s+([+-][0-9]{2}[0-5][0-9]|(?:UT|GMT|[A-Z]{3,5}|[A-IK-Z])))?'
-export const rfc2822TimeOnlyRE = lockdownRE(rfc2822TimeOnlyREString)
-// Date/Time: Matches an [RFC 2822](https://datatracker.ietf.org/doc/html/rfc2822#section-3.3) style time designation like '12:12 UTC'. Provides matching groups 1 (hour), 2 (min), 3 (second), and 4 (time zone).
+const rfc2822DayOnlyREString = '(?:(Sun|Mon|Tue|Wed|Thu|Fri|Sat),\\s+)?(0[1-9]|[1-2]?[0-9]|3[01])\\s+(Jan|Feb|Mar|Apr|May|Jun|Jul|Aug|Sep|Oct|Nov|Dec)\\s+(\\d{2,4})'
+const rfc2822TimeOnlyREString = '(2[0-3]|[0-1][0-9]):([0-5][0-9])(?::(60|[0-5][0-9]))?(?:\\s+([+-][0-9]{2}[0-5][0-9]|(?:UT|GMT|[A-Z]{3,5}|[A-IK-Z])))?'
 
 export const rfc2822DateREString = `${rfc2822DayOnlyREString}\\s+${rfc2822TimeOnlyREString}`
 // Date/Tmie: Matches an [RFC 2822](https://datatracker.ietf.org/doc/html/rfc2822#section-3.3) style date like 'Mon, 6 Jan 1992 12:12 UTC'. Provides matching groups 1 (day of week), 2 (day of month), 3 (month), and 4 (year), 5 (hour), 6 (min), 7 (second), and 8 (time zone).
 export const rfc2822DateRE = lockdownRE(rfc2822DateREString)
+
+const seps = '[./-]'
+
+export const usDateREString = `(0?[1-9]|1[0-2])${seps}(0?[1-9]|[1-2][0-9]|3[0-1])${seps}([+-])?(\\d{1,})`
+// Date/Time: Matches a US style 'MM/DD/YYYY' string. Accepts separators '.', '/', '-'. Will except 1 or 2 digits for month and day and 1-4 digits for the year. Also accepts a + or - before the year. Provides capture groups 1 (month), 2 (day of month), 3 (BCE/CE indicator), and 4 (year).
+export const usDateRE = lockdownRE(usDateREString)
+
+export const intlDateREString = `([+-])?(\\d{1,})${seps}(0?[1-9]|1[0-2])${seps}(0?[1-9]|[1-2][0-9]|3[0-1])`
+// Date/Time: Matches an international style 'YYYY/MM/DD' string. Accepts separators '.', '/', '-'. Will except 1 or 2 digits for month and day and 1-4 digits for the year. Also accepts a + or - before the year. Provides capture groups 1 (BCE/CE indicator), 2 (year), 3 (month), 4 (day).
+export const intlDateRE = lockdownRE(intlDateREString)
+
+export const militaryTimeREString = '(?:(2400)|([0-1][0-9]|2[0-3])([0-5]\\d))'
+// Date/Time: Matches military time style 'HHMM' string. Provides capture groups 1 (special 2400 time), 2 (hour), and 3 (minutes).
+export const militaryTimeRE = lockdownRE(militaryTimeREString)
+
+export const timeREString = '(?:(0?[1-9]|1[0-2]):([0-5][0-9])(?::([0-5][0-9])(?:[.,](\\d+))?)?\\s*([aApP][mM]))'
+// Date/Time: Matches a twelve hour time designation, requires AM or PM designation. Allows optional leading 0 in hour. Provides matching groups 1 (hour), 2 (minutes), 3 (seconds, without decimal fractions), 4 (decimal fraction seconds), and 5 (AM/PM indicator).
+export const timeRE = lockdownRE(timeREString)
+
+export const twentyFourHourTimeREString = '(?:(24:00(?::00)?)|(0?[1-9]|1[0-9]|2[0-3]):([0-5][0-9])(?::([0-5][0-9])(?:[.,](\\d+))?)?)'
+// Date/Time: Matches a twenty-four hour time designationAllows optional leading 0 in hour. Provides matching groups 1 (special 24:00 designation with optional seconds), 2 (hour), 3 (minutes), 4 (seconds, without decimal fractions), 5 (decimal fraction seconds).
+export const twentyFourHourTimeRE = lockdownRE(twentyFourHourTimeREString)

src/test/data/intl-dates.mjs

@@ -0,0 +1,14 @@
+export const validIntlDates = [
+  '2024/01/01',
+  '2024/1/1',
+  '1/1/1',
+  '10000/1/1',
+  '+2024/1/1',
+  '-2024/1/1'
+]
+
+export const invalidIntlDates = [
+  '2024/13/01',
+  '2024/01/32',
+  '01/01/2024'
+]

src/test/data/iso-8601-date-times.mjs

@@ -15,7 +15,7 @@ limitations under the License.
 */
 
 // Pulled some test data from https://www.myintervals.com/blog/2009/05/20/iso-8601-date-validation-that-doesnt-suck/ (2024-07-15)
-export const valid8601DatesOnly = [
+const valid8601DatesOnly = [
   '2009', // year only
   '-0010',
   '+0010',
@@ -31,7 +31,7 @@ export const valid8601DatesOnly = [
   '2009W011'
 ]
 
-export const invalid8601DatesOnly = [
+const invalid8601DatesOnly = [
   '2009-0101', // inconsistent separators
   '200901-01',
   '2009-W0101',
@@ -43,7 +43,7 @@ export const invalid8601DatesOnly = [
   '20090132'
 ]
 
-export const valid8601TimesOnly = [
+const valid8601TimesOnly = [
   '24:00:00',
   '240000',
   '24:00:00Z',
@@ -79,7 +79,7 @@ export const valid8601TimesOnly = [
   '232323-05:00'
 ]
 
-export const invalid8601TimesOnly = [
+const invalid8601TimesOnly = [
   '24:0000', // inconsistent separators
   '2400:00',
   '23:2323',
@@ -103,28 +103,20 @@ export const invalid8601TimesOnly = [
 
 export const valid8601DateTimes = [
   '2009-12T12:34',
-  '2009-12T12:34+01'
+  '2009-12T12:34+01',
+  ...valid8601TimesOnly.map((t) => '2009-12-12T' + t)
 ]
 
+const invalid8601DateAndTimes = invalid8601TimesOnly.map((t) => '2009-12-12T' + t)
+
 export const invalid8601DateTimes = [
-  '2009-12-01',
   '2009-12 12:34',
-  '2009-12 12:34+01'
+  '2009-12 12:34+01',
+  ...invalid8601DateAndTimes,
+  ...valid8601DatesOnly,
+  ...valid8601TimesOnly
 ]
 
 export const valid8601Dates = [...valid8601DatesOnly, ...valid8601DateTimes]
 
-export const invalid8601Dates = [...invalid8601DatesOnly, ...invalid8601DateTimes.slice(1)]
-
-export const valid8601LooseDateTimes = [
-  '2009-12 12:34',
-  '2009-12 12:34+01'
-]
-
-// not really a lot of utility in testing much, but testing infra needs something
-export const invalid8601LooseDateTimes = ['2009-12-01']
-
-export const valid8601LooseDates = [...valid8601DatesOnly, ...valid8601LooseDateTimes]
-
-// not really a lot of utility in testing much, but testing infra needs something
-export const invalid8601LooseDates = invalid8601DatesOnly
+export const invalid8601Dates = [...invalid8601DatesOnly, ...invalid8601DateAndTimes]

src/test/data/times.mjs

@@ -0,0 +1,38 @@
+export const validMilTimes = [
+  '2400',
+  '0000',
+  '0130'
+]
+
+export const invalidMilTimes = [
+  '2500',
+  '2060',
+  '300'
+]
+
+export const validTimes = [
+  '12:00 AM',
+  '12:00:39 PM',
+  '2:00:39.383 PM'
+]
+
+export const invalidTimes = [
+  '13:00 AM',
+  '5:60 PM',
+  '7:00'
+]
+
+export const valid24HrTimes = [
+  '24:00',
+  '24:00:00',
+  '12:00',
+  '12:00:32.928'
+]
+
+export const invalid24HrTimes = [
+  '24:01',
+  '25:00',
+  '12:60',
+  '12:00:60',
+  '12:00:10.'
+]

src/test/data/us-dates.mjs

@@ -0,0 +1,14 @@
+export const validUSDates = [
+  '01/01/2024',
+  '1/1/2024',
+  '1/1/1',
+  '1/1/10000',
+  '1/1/+2024',
+  '1/1/-2024'
+]
+
+export const invalidUSDates = [
+  '13/01/2024',
+  '1/32/2024',
+  '2024/01/01'
+]