@openmrs/esm-utils 6.2.1-pre.2807 → 6.2.1-pre.2812

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-utils",
-  "version": "6.2.1-pre.2807",
+  "version": "6.2.1-pre.2812",
   "license": "MPL-2.0",
   "description": "Helper utilities for OpenMRS",
   "browser": "dist/openmrs-esm-utils.js",
@@ -39,7 +39,7 @@
     "access": "public"
   },
   "devDependencies": {
-    "@openmrs/esm-globals": "6.2.1-pre.2807",
+    "@openmrs/esm-globals": "6.2.1-pre.2812",
     "@types/lodash-es": "^4.17.12",
     "@types/semver": "^7.3.4",
     "dayjs": "^1.10.4",

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

@@ -6,6 +6,7 @@ import {
   formatDatetime,
   formatTime,
   registerDefaultCalendar,
+  formatPartialDate,
 } from './date-util';
 import dayjs from 'dayjs';
 import timezoneMock from 'timezone-mock';
@@ -79,6 +80,16 @@ describe('Openmrs Dates', () => {
     expect(formatDate(testDate, { mode: 'wide' })).toMatch(/09\s—\sдек\.\s—\s2021\sг\./);
   });
 
+  it('formats partial dates', () => {
+    timezoneMock.register('UTC');
+    window.i18next.language = 'en';
+    expect(formatPartialDate('2021')).toEqual('2021');
+    expect(formatPartialDate('2021-04')).toEqual('Apr 2021');
+    expect(formatPartialDate('2021-04-09')).toEqual('09-Apr-2021');
+    expect(formatPartialDate('2021-01-01')).toEqual('01-Jan-2021');
+    expect(formatPartialDate('2021-12')).toEqual('Dec 2021');
+  });
+
   it('formats dates with respect to the active calendar', () => {
     registerDefaultCalendar('am', 'ethiopic');
 

package/src/dates/date-util.ts

@@ -15,8 +15,7 @@ import dayjs from 'dayjs';
 import isToday from 'dayjs/plugin/isToday';
 import objectSupport from 'dayjs/plugin/objectSupport';
 import utc from 'dayjs/plugin/utc';
-import type { i18n } from 'i18next';
-import { omit } from 'lodash-es';
+import { isNil, omit } from 'lodash-es';
 
 dayjs.extend(isToday);
 dayjs.extend(utc);
@@ -242,7 +241,7 @@ export function formatPartialDate(dateString: string, options: Partial<FormatDat
   }
 
   // hack here but any date interprets 2000-01, etc. as yyyy-dd rather than yyyy-mm
-  if (parsed.day && !parsed.month) {
+  if (!isNil(parsed.day) && isNil(parsed.month)) {
     parsed = Object.assign({}, omit(parsed, 'day'), { month: parsed.day });
   }
 
@@ -258,15 +257,15 @@ export function formatPartialDate(dateString: string, options: Partial<FormatDat
 
   const date = dayjs().set(parsed).toDate();
 
-  if (!parsed.year) {
+  if (isNil(parsed.year)) {
     options.year = false;
   }
 
-  if (!parsed.month) {
+  if (isNil(parsed.month)) {
     options.month = false;
   }
 
-  if (!parsed.date) {
+  if (isNil(parsed.date)) {
     options.day = false;
   }