@openmrs/esm-utils 11.0.1-pre.5906 → 11.0.1-pre.5917

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
-[0] Successfully compiled: 14 files with swc (289.26ms)
+[0] Successfully compiled: 14 files with swc (321.25ms)
 [0] swc --strip-leading-paths src -d dist exited with code 0
 [1] tsc --project tsconfig.build.json exited with code 0

package/dist/dates/date-util.d.ts

@@ -169,8 +169,8 @@ export declare function convertToLocaleCalendar(date: CalendarDate | CalendarDat
  */
 export declare function formatDuration(duration: Intl.DurationInput, options?: Intl.DurationFormatOptions): string;
 /**
- * Parses a date input into a dayjs object. String inputs are interpreted using
- * any-date-parser with corrections for its month/day representation differences
+ * Parses a date input into a dayjs object. ISO calendar dates are parsed independently of locale;
+ * other strings use any-date-parser with corrections for its month/day representation differences
  * with dayjs. Non-string inputs are passed directly to dayjs.
  *
  * @param dateInput The date to parse.

package/dist/dates/date-util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"date-util.d.ts","sourceRoot":"","sources":["../../src/dates/date-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"date-util.d.ts","sourceRoot":"","sources":["../../src/dates/date-util.ts"],"names":[],"mappings":"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"}

package/dist/dates/date-util.js

@@ -38,6 +38,36 @@ dayjs.extend(isToday);
 dayjs.extend(utc);
 dayjs.extend(objectSupport);
 const isoFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZZ';
+const isoCalendarDate = /^(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?$/;
+/**
+ * Parses ISO calendar dates independently of the display locale, preserving missing fields.
+ * Invalid ISO dates must not fall back to a parser that may reinterpret or normalize them.
+ */ function parseDateString(dateString, locale) {
+    const match = isoCalendarDate.exec(dateString);
+    if (!match) {
+        return attempt(dateString, locale);
+    }
+    const year = Number(match[1]);
+    const month = match[2] === undefined ? undefined : Number(match[2]);
+    const day = match[3] === undefined ? undefined : Number(match[3]);
+    // Check for calendar overflow in UTC. setUTCFullYear also preserves years below 100.
+    const date = new Date(0);
+    date.setUTCFullYear(year, (month ?? 1) - 1, day ?? 1);
+    if (date.getUTCFullYear() !== year || date.getUTCMonth() !== (month ?? 1) - 1 || date.getUTCDate() !== (day ?? 1)) {
+        return {
+            invalid: `Invalid ISO calendar date '${dateString}'`
+        };
+    }
+    return {
+        year,
+        ...month !== undefined && {
+            month
+        },
+        ...day !== undefined && {
+            day
+        }
+    };
+}
 /**
  * This function checks whether a date string is the OpenMRS ISO format.
  * The format should be YYYY-MM-DDTHH:mm:ss.SSSZZ
@@ -183,7 +213,7 @@ const defaultOptions = {
  */ // TODO: Shouldn't throw on null input
 export function formatPartialDate(dateString, options = {}) {
     const locale = getLocale();
-    let parsed = attempt(dateString, locale);
+    let parsed = parseDateString(dateString, locale);
     if (parsed.invalid) {
         console.warn(`Could not parse invalid date '${dateString}'`);
         return null;
@@ -361,8 +391,8 @@ const formatParts = (separator)=>{
     return formatter.format(duration);
 }
 /**
- * Parses a date input into a dayjs object. String inputs are interpreted using
- * any-date-parser with corrections for its month/day representation differences
+ * Parses a date input into a dayjs object. ISO calendar dates are parsed independently of locale;
+ * other strings use any-date-parser with corrections for its month/day representation differences
  * with dayjs. Non-string inputs are passed directly to dayjs.
  *
  * @param dateInput The date to parse.
@@ -374,7 +404,7 @@ const formatParts = (separator)=>{
     }
     if (typeof dateInput === 'string') {
         const locale = getLocale();
-        let parsedDate = attempt(dateInput, locale);
+        let parsedDate = parseDateString(dateInput, locale);
         if (parsedDate.invalid) {
             console.warn(`Could not interpret '${dateInput}' as a date`);
             return null;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-utils",
-  "version": "11.0.1-pre.5906",
+  "version": "11.0.1-pre.5917",
   "license": "MPL-2.0",
   "description": "Helper utilities for OpenMRS",
   "type": "module",
@@ -58,12 +58,12 @@
     "semver": "^7.7.3"
   },
   "peerDependencies": {
-    "@openmrs/esm-globals": "^11.0.1-pre.5906",
+    "@openmrs/esm-globals": "^11.0.1-pre.5917",
     "dayjs": "1.x",
     "i18next": "25.x"
   },
   "devDependencies": {
-    "@openmrs/esm-globals": "11.0.1-pre.5906",
+    "@openmrs/esm-globals": "11.0.1-pre.5917",
     "@swc/cli": "0.8.1",
     "@swc/core": "1.15.21",
     "@types/lodash-es": "^4.17.12",

package/src/dates/date-util.test.ts

@@ -1,4 +1,4 @@
-import { afterAll, describe, expect, it } from 'vitest';
+import { afterAll, afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
 import dayjs from 'dayjs';
 import timezoneMock from 'timezone-mock';
 import type { i18n } from 'i18next';
@@ -14,10 +14,101 @@ import {
   formatDuration,
   duration,
   formatDurationBetween,
+  parseDateInput,
 } from './date-util';
 
 window.i18next = { language: 'en' } as i18n;
 
+describe('ISO calendar dates', () => {
+  const referenceDate = dayjs('2024-03-31T12:00:00');
+  let originalLocale: string;
+
+  beforeEach(() => {
+    originalLocale = window.i18next.language;
+    window.i18next.language = 'en';
+    vi.useFakeTimers({ toFake: ['Date'] });
+    vi.setSystemTime(referenceDate.toDate());
+  });
+
+  afterEach(() => {
+    vi.useRealTimers();
+    vi.restoreAllMocks();
+    window.i18next.language = originalLocale;
+  });
+
+  it.each([
+    { input: '2024', expected: '2024', resolved: '2024-03-31' },
+    { input: '2024-03', expected: 'Mar 2024', resolved: '2024-03-31' },
+    { input: '2024-03-31', expected: '31-Mar-2024', resolved: '2024-03-31' },
+    { input: '2021-02', expected: 'Feb 2021', resolved: '2021-02-28' },
+    { input: '2020-02-29', expected: '29-Feb-2020', resolved: '2020-02-29' },
+    { input: '2000-02-29', expected: '29-Feb-2000', resolved: '2000-02-29' },
+    { input: '0096-02-29', expected: '29-Feb-96', resolved: '0096-02-29' },
+  ])('preserves precision and calendar fields for $input', ({ input, expected, resolved }) => {
+    expect(formatPartialDate(input, { time: false, noToday: true })).toEqual(expected);
+    expect(parseDateInput(input, referenceDate)?.format('YYYY-MM-DDTHH:mm:ss')).toEqual(`${resolved}T12:00:00`);
+  });
+
+  describe.each(['bn', 'ar_SY'])('with locale %s', (locale) => {
+    it.each([
+      { input: '2020', options: { year: 'numeric' } as const, resolved: '2020-03-31' },
+      { input: '2020-03', options: { year: 'numeric', month: 'short' } as const, resolved: '2020-03-31' },
+      {
+        input: '2020-03-22',
+        options: { year: 'numeric', month: 'short', day: '2-digit' } as const,
+        resolved: '2020-03-22',
+      },
+    ])('parses $input independently of the display locale', ({ input, options, resolved }) => {
+      window.i18next.language = locale;
+      const expected = new Intl.DateTimeFormat(locale.replace('_', '-'), options).format(
+        new Date('2020-03-22T12:00:00'),
+      );
+
+      expect(formatPartialDate(input, { time: false, noToday: true })).toEqual(expected);
+      expect(parseDateInput(input, referenceDate)?.format('YYYY-MM-DD')).toEqual(resolved);
+    });
+  });
+
+  it.each([
+    '2021-00',
+    '2021-13',
+    '2021-00-01',
+    '2021-13-01',
+    '2021-01-00',
+    '2021-01-32',
+    '2021-04-31',
+    '2021-02-29',
+    '2020-02-30',
+    '1900-02-29',
+    '0099-02-29',
+  ])('rejects the invalid calendar date %s', (input) => {
+    vi.spyOn(console, 'warn').mockImplementation(() => {});
+
+    expect(formatPartialDate(input, { time: false, noToday: true })).toBeNull();
+    expect(parseDateInput(input, referenceDate)).toBeNull();
+  });
+
+  it('continues to parse non-ISO date strings', () => {
+    expect(formatPartialDate('9 April 2021', { time: false, noToday: true })).toEqual('09-Apr-2021');
+    expect(parseDateInput('9 April 2021', referenceDate)?.format('YYYY-MM-DD')).toEqual('2021-04-09');
+    expect(parseDateInput('2021-04-09T15:30:00Z', referenceDate)?.format('YYYY-MM-DDTHH:mm:ss')).toEqual(
+      '2021-04-09T15:30:00',
+    );
+  });
+
+  it('keeps date-only inputs on the same day behind UTC', () => {
+    vi.useRealTimers();
+    timezoneMock.register('US/Pacific');
+    try {
+      const localReferenceDate = dayjs('2024-03-31T12:00:00');
+      expect(formatPartialDate('2020-03-22', { time: false, noToday: true })).toEqual('22-Mar-2020');
+      expect(parseDateInput('2020-03-22', localReferenceDate)?.format('YYYY-MM-DD')).toEqual('2020-03-22');
+    } finally {
+      timezoneMock.unregister();
+    }
+  });
+});
+
 describe('Openmrs Dates', () => {
   afterAll(() => timezoneMock.unregister());
 

package/src/dates/date-util.ts

@@ -26,6 +26,32 @@ export type DateInput = string | number | Date;
 
 const isoFormat = 'YYYY-MM-DDTHH:mm:ss.SSSZZ';
 
+const isoCalendarDate = /^(\d{4})(?:-(\d{2})(?:-(\d{2}))?)?$/;
+
+/**
+ * Parses ISO calendar dates independently of the display locale, preserving missing fields.
+ * Invalid ISO dates must not fall back to a parser that may reinterpret or normalize them.
+ */
+function parseDateString(dateString: string, locale: string): ReturnType<typeof attempt> {
+  const match = isoCalendarDate.exec(dateString);
+  if (!match) {
+    return attempt(dateString, locale);
+  }
+
+  const year = Number(match[1]);
+  const month = match[2] === undefined ? undefined : Number(match[2]);
+  const day = match[3] === undefined ? undefined : Number(match[3]);
+
+  // Check for calendar overflow in UTC. setUTCFullYear also preserves years below 100.
+  const date = new Date(0);
+  date.setUTCFullYear(year, (month ?? 1) - 1, day ?? 1);
+  if (date.getUTCFullYear() !== year || date.getUTCMonth() !== (month ?? 1) - 1 || date.getUTCDate() !== (day ?? 1)) {
+    return { invalid: `Invalid ISO calendar date '${dateString}'` };
+  }
+
+  return { year, ...(month !== undefined && { month }), ...(day !== undefined && { day }) };
+}
+
 /**
  * This function checks whether a date string is the OpenMRS ISO format.
  * The format should be YYYY-MM-DDTHH:mm:ss.SSSZZ
@@ -240,7 +266,7 @@ const defaultOptions: FormatDateOptions = {
 // TODO: Shouldn't throw on null input
 export function formatPartialDate(dateString: string, options: Partial<FormatDateOptions> = {}) {
   const locale = getLocale();
-  let parsed: ReturnType<typeof attempt> & { date?: number } = attempt(dateString, locale);
+  let parsed: ReturnType<typeof attempt> & { date?: number } = parseDateString(dateString, locale);
 
   if (parsed.invalid) {
     console.warn(`Could not parse invalid date '${dateString}'`);
@@ -444,8 +470,8 @@ export function formatDuration(duration: Intl.DurationInput, options?: Intl.Dura
 }
 
 /**
- * Parses a date input into a dayjs object. String inputs are interpreted using
- * any-date-parser with corrections for its month/day representation differences
+ * Parses a date input into a dayjs object. ISO calendar dates are parsed independently of locale;
+ * other strings use any-date-parser with corrections for its month/day representation differences
  * with dayjs. Non-string inputs are passed directly to dayjs.
  *
  * @param dateInput The date to parse.
@@ -459,7 +485,7 @@ export function parseDateInput(dateInput: dayjs.ConfigType, referenceDate: dayjs
 
   if (typeof dateInput === 'string') {
     const locale = getLocale();
-    let parsedDate = attempt(dateInput, locale);
+    let parsedDate = parseDateString(dateInput, locale);
     if (parsedDate.invalid) {
       console.warn(`Could not interpret '${dateInput}' as a date`);
       return null;