@openmrs/esm-utils 6.2.1-pre.2760 → 6.2.1-pre.2762

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-utils",
-  "version": "6.2.1-pre.2760",
+  "version": "6.2.1-pre.2762",
   "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.2760",
+    "@openmrs/esm-globals": "6.2.1-pre.2762",
     "@types/semver": "^7.3.4",
     "dayjs": "^1.10.4",
     "rxjs": "^6.5.3"

package/src/age-helpers.ts

@@ -1,9 +1,8 @@
 /** @module @category Utility */
 import dayjs from 'dayjs';
-import { getLocale } from './omrs-dates';
 import { DurationFormat } from '@formatjs/intl-durationformat';
 import { type DurationFormatOptions, type DurationInput } from '@formatjs/intl-durationformat/src/types';
-
+import { getLocale } from './get-locale';
 /**
  * Gets a human readable and locale supported representation of a person's age, given their birthDate,
  * The representation logic follows the guideline here:

package/src/{omrs-dates.test.ts → dates/date-util.test.ts}

@@ -1,7 +1,13 @@
-import { toOmrsIsoString, toDateObjectStrict, isOmrsDateStrict } from './omrs-dates';
+import {
+  toOmrsIsoString,
+  toDateObjectStrict,
+  isOmrsDateStrict,
+  formatDate,
+  formatDatetime,
+  formatTime,
+} from './date-util';
 import dayjs from 'dayjs';
 import timezoneMock from 'timezone-mock';
-import { formatDate, formatDatetime, formatTime } from '.';
 import type { i18n } from 'i18next';
 
 window.i18next = { language: 'en' } as i18n;

package/src/{omrs-dates.ts → dates/date-util.ts}

@@ -13,6 +13,7 @@ import {
 import dayjs from 'dayjs';
 import utc from 'dayjs/plugin/utc';
 import isToday from 'dayjs/plugin/isToday';
+import { getLocale } from '@openmrs/esm-utils';
 
 dayjs.extend(utc);
 dayjs.extend(isToday);
@@ -89,46 +90,6 @@ export function toOmrsIsoString(date: DateInput, toUTC = false): string {
   return d.format(isoFormat);
 }
 
-/**
- * @deprecated use `formatTime`
- * Formats the input as a time string using the format "HH:mm".
- */
-export function toOmrsTimeString24(date: DateInput) {
-  return dayjs(date).format('HH:mm');
-}
-
-/**
- * @deprecated use `formatTime`
- * Formats the input as a time string using the format "HH:mm A".
- */
-export function toOmrsTimeString(date: DateInput) {
-  return dayjs.utc(date).format('HH:mm A');
-}
-
-/**
- * @deprecated use `formatDate(date, "wide")`
- * Formats the input as a date string using the format "DD - MMM - YYYY".
- */
-export function toOmrsDayDateFormat(date: DateInput) {
-  return toOmrsDateFormat(date, 'DD - MMM - YYYY');
-}
-
-/**
- * @deprecated use `formatDate(date, "no year")`
- * Formats the input as a date string using the format "DD-MMM".
- */
-export function toOmrsYearlessDateFormat(date: DateInput) {
-  return toOmrsDateFormat(date, 'DD-MMM');
-}
-
-/**
- * @deprecated use `formatDate(date)`
- * Formats the input as a date string. By default the format "YYYY-MMM-DD" is used.
- */
-export function toOmrsDateFormat(date: DateInput, format = 'YYYY-MMM-DD') {
-  return dayjs(date).format(format);
-}
-
 /**
  * Utility function to parse an arbitrary string into a date.
  * Uses `dayjs(dateString)`.
@@ -382,21 +343,6 @@ export function formatDatetime(date: Date, options?: Partial<Omit<FormatDateOpti
   return formatDate(date, { ...options, time: true });
 }
 
-/**
- * Returns the current locale of the application.
- * @returns string
- */
-export function getLocale() {
-  let language = window.i18next.language;
-  language = language.replace('_', '-'); // just in case
-  // hack for `ht` until https://unicode-org.atlassian.net/browse/CLDR-14956 is fixed
-  if (language === 'ht') {
-    language = 'fr-HT';
-  }
-
-  return language;
-}
-
 /**
  * Converts a calendar date to the equivalent locale calendar date.
  * @returns CalendarDate

package/src/dates/index.ts

@@ -0,0 +1 @@
+export * from './date-util';

package/src/get-locale.ts

@@ -0,0 +1,14 @@
+/**
+ * Returns the current locale of the application.
+ * @returns string
+ */
+export function getLocale() {
+  let language = window.i18next.language;
+  language = language.replace('_', '-'); // just in case
+  // Hack for `ht` until all browsers update their unicode support with ht to fr mapping.
+  // See https://unicode-org.atlassian.net/browse/CLDR-14956
+  if (language === 'ht') {
+    language = 'fr-HT';
+  }
+  return language;
+}

package/src/index.ts

@@ -1,6 +1,7 @@
 export * from './age-helpers';
+export * from './dates';
+export * from './get-locale';
 export * from './is-online';
-export * from './omrs-dates';
 export * from './patient-helpers';
 export * from './shallowEqual';
 export * from './storage';