@openmrs/esm-utils 9.0.3-pre.4181 → 9.0.3-pre.4195

package/.turbo/turbo-build.log

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

package/dist/age-helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"age-helpers.d.ts","sourceRoot":"","sources":["../src/age-helpers.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B;;;;;;;;;GASG;AACH,wBAAgB,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,WAAW,GAAE,KAAK,CAAC,UAAoB,GAAG,MAAM,GAAG,IAAI,CAyEvG"}
+{"version":3,"file":"age-helpers.d.ts","sourceRoot":"","sources":["../src/age-helpers.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAC;AAO1B;;;;;;;;;GASG;AACH,wBAAgB,GAAG,CAAC,SAAS,EAAE,KAAK,CAAC,UAAU,EAAE,WAAW,GAAE,KAAK,CAAC,UAAoB,GAAG,MAAM,GAAG,IAAI,CAyEvG"}

package/dist/age-helpers.js

@@ -1,5 +1,4 @@
-/** @module @category Utility */ import { DurationFormat } from "@formatjs/intl-durationformat";
-import { attempt } from "any-date-parser";
+/** @module @category Utility */ import { attempt } from "any-date-parser";
 import dayjs from "dayjs";
 import objectSupport from "dayjs/plugin/objectSupport.js";
 import { omit } from "lodash-es";
@@ -82,5 +81,5 @@ dayjs.extend(objectSupport);
     } else {
         duration['years'] = yearDiff;
     }
-    return new DurationFormat(locale, options).format(duration);
+    return new Intl.DurationFormat(locale, options).format(duration);
 }

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

@@ -3,7 +3,6 @@
  * @category Date and Time
  */
 import { type CalendarDate, type CalendarDateTime, type CalendarIdentifier, type ZonedDateTime } from '@internationalized/date';
-import type { DurationFormatOptions, DurationInput } from '@formatjs/intl-durationformat/src/types';
 export type DateInput = string | number | Date;
 /**
  * This function checks whether a date string is the OpenMRS ISO format.
@@ -167,5 +166,5 @@ export declare function convertToLocaleCalendar(date: CalendarDate | CalendarDat
  * @param options Optional options for formatting.
  * @returns The formatted duration string.
  */
-export declare function formatDuration(duration: DurationInput, options?: DurationFormatOptions): string;
+export declare function formatDuration(duration: Intl.DurationInput, options?: Intl.DurationFormatOptions): string;
 //# sourceMappingURL=date-util.d.ts.map

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":"AAAA;;;GAGG;AACH,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAGnB,MAAM,yBAAyB,CAAC;AASjC,OAAO,KAAK,EAAE,qBAAqB,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AAMpG,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAI/C;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAuBnE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,WAE9C;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAMtE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,UAAQ,GAAG,MAAM,CAQtE;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,QAE3C;AA6CD;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,QAEnF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,kCAI1E;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,MAAM,CAAC;AAEjD,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,IAAI,EAAE,cAAc,CAAC;IACrB;;;OAGG;IACH,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,WAAW,CAAC;IACjC,wCAAwC;IACxC,GAAG,EAAE,OAAO,CAAC;IACb,0CAA0C;IAC1C,KAAK,EAAE,OAAO,CAAC;IACf,kCAAkC;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,0CAA0C;IAC1C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAWF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,iBAAiB,CAAM,iBAuC7F;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,UAkE1E;AAiBD;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,UAKpC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,UAE5F;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,YAAY,GAAG,gBAAgB,GAAG,aAAa,EACrD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,mDAM7B;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,aAAa,EAAE,OAAO,CAAC,EAAE,qBAAqB,UAGtF"}
+{"version":3,"file":"date-util.d.ts","sourceRoot":"","sources":["../../src/dates/date-util.ts"],"names":[],"mappings":"AAAA;;;GAGG;AACH,OAAO,EACL,KAAK,YAAY,EACjB,KAAK,gBAAgB,EACrB,KAAK,kBAAkB,EACvB,KAAK,aAAa,EAGnB,MAAM,yBAAyB,CAAC;AAajC,MAAM,MAAM,SAAS,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,CAAC;AAI/C;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,iBAAiB,EAAE,MAAM,GAAG,OAAO,CAuBnE;AAED;;;;;GAKG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,WAE9C;AAED;;;GAGG;AACH,wBAAgB,kBAAkB,CAAC,cAAc,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAMtE;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,SAAS,EAAE,KAAK,UAAQ,GAAG,MAAM,CAQtE;AAED;;;GAGG;AACH,wBAAgB,SAAS,CAAC,UAAU,EAAE,MAAM,QAE3C;AA6CD;;;;;;;;;;GAUG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,kBAAkB,QAEnF;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,GAAG,MAAM,GAAG,SAAS,kCAI1E;AAED,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,MAAM,CAAC;AAEjD,MAAM,MAAM,iBAAiB,GAAG;IAC9B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB;;OAEG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;OAGG;IACH,IAAI,EAAE,cAAc,CAAC;IACrB;;;OAGG;IACH,IAAI,EAAE,IAAI,GAAG,KAAK,GAAG,WAAW,CAAC;IACjC,wCAAwC;IACxC,GAAG,EAAE,OAAO,CAAC;IACb,0CAA0C;IAC1C,KAAK,EAAE,OAAO,CAAC;IACf,kCAAkC;IAClC,IAAI,EAAE,OAAO,CAAC;IACd,0CAA0C;IAC1C,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB;;;;;OAKG;IACH,OAAO,EAAE,OAAO,CAAC;CAClB,CAAC;AAWF;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,wBAAgB,iBAAiB,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,GAAE,OAAO,CAAC,iBAAiB,CAAM,iBAuC7F;AAED;;;;;;;;;;;;;;;;;;;;;;GAsBG;AAEH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,iBAAiB,CAAC,UAkE1E;AAiBD;;;;;;GAMG;AACH,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,UAKpC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,iBAAiB,EAAE,MAAM,CAAC,CAAC,UAE5F;AAED;;;GAGG;AACH,wBAAgB,uBAAuB,CACrC,IAAI,EAAE,YAAY,GAAG,gBAAgB,GAAG,aAAa,EACrD,MAAM,EAAE,MAAM,GAAG,IAAI,CAAC,MAAM,mDAM7B;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,IAAI,CAAC,aAAa,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,qBAAqB,UAGhG"}

package/dist/dates/date-util.js

@@ -27,7 +27,6 @@ function _class_private_field_init(obj, privateMap, value) {
  * @module
  * @category Date and Time
  */ import { createCalendar, toCalendar } from "@internationalized/date";
-import { DurationFormat } from "@formatjs/intl-durationformat";
 import { attempt } from "any-date-parser";
 import dayjs from "dayjs";
 import isToday from "dayjs/plugin/isToday.js";
@@ -358,6 +357,6 @@ const formatParts = (separator)=>{
  * @param options Optional options for formatting.
  * @returns The formatted duration string.
  */ export function formatDuration(duration, options) {
-    const formatter = new DurationFormat(getLocale(), options);
+    const formatter = new Intl.DurationFormat(getLocale(), options);
     return formatter.format(duration);
 }

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,cAAc,eAAe,CAAC;AAC9B,cAAc,SAAS,CAAC;AACxB,cAAc,cAAc,CAAC;AAC7B,cAAc,aAAa,CAAC;AAC5B,cAAc,mBAAmB,CAAC;AAClC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}

package/dist/index.js

@@ -1,3 +1,4 @@
+/// <reference path="./intl-durationformat.d.ts" />
 export * from "./age-helpers.js";
 export * from "./dates/index.js";
 export * from "./get-locale.js";

package/dist/intl-durationformat.d.js

@@ -0,0 +1,3 @@
+// Ambient type declarations for Intl.DurationFormat (TC39 Stage 3 proposal).
+// Can be removed once TypeScript ships built-in types for Intl.DurationFormat.
+// Reference: https://tc39.es/proposal-intl-duration-format/

package/mock-jest.ts

@@ -0,0 +1,2 @@
+import '@formatjs/intl-durationformat/polyfill';
+export * from './src/index';

package/mock.ts

@@ -0,0 +1,2 @@
+import '@formatjs/intl-durationformat/polyfill';
+export * from './src/index';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-utils",
-  "version": "9.0.3-pre.4181",
+  "version": "9.0.3-pre.4195",
   "license": "MPL-2.0",
   "description": "Helper utilities for OpenMRS",
   "type": "module",
@@ -10,6 +10,10 @@
     ".": {
       "types": "./src/index.ts",
       "default": "./dist/index.js"
+    },
+    "./mock": {
+      "import": "./mock.ts",
+      "require": "./mock-jest.ts"
     }
   },
   "source": true,
@@ -59,7 +63,7 @@
     "rxjs": "6.x"
   },
   "devDependencies": {
-    "@openmrs/esm-globals": "9.0.3-pre.4181",
+    "@openmrs/esm-globals": "9.0.3-pre.4195",
     "@swc/cli": "0.8.0",
     "@swc/core": "1.15.18",
     "@types/lodash-es": "^4.17.12",

package/setup-tests.ts

@@ -0,0 +1,2 @@
+// happy-dom doesn't have Intl.DurationFormat, so we unconditionally load the polyfill for tests
+import '@formatjs/intl-durationformat/polyfill';

package/src/age-helpers.ts

@@ -1,6 +1,4 @@
 /** @module @category Utility */
-import { DurationFormat } from '@formatjs/intl-durationformat';
-import { type DurationFormatOptions, type DurationInput } from '@formatjs/intl-durationformat/src/types';
 import { attempt } from 'any-date-parser';
 import dayjs from 'dayjs';
 import objectSupport from 'dayjs/plugin/objectSupport.js';
@@ -62,8 +60,8 @@ export function age(birthDate: dayjs.ConfigType, currentDate: dayjs.ConfigType =
   const monthDiff = to.diff(from, 'months');
   const yearDiff = to.diff(from, 'years');
 
-  const duration: DurationInput = {};
-  const options: DurationFormatOptions = { style: 'short', localeMatcher: 'lookup' };
+  const duration: Intl.DurationInput = {};
+  const options: Intl.DurationFormatOptions = { style: 'short', localeMatcher: 'lookup' };
 
   if (hourDiff < 2) {
     const minuteDiff = to.diff(from, 'minutes');
@@ -91,5 +89,5 @@ export function age(birthDate: dayjs.ConfigType, currentDate: dayjs.ConfigType =
     duration['years'] = yearDiff;
   }
 
-  return new DurationFormat(locale, options).format(duration);
+  return new Intl.DurationFormat(locale, options).format(duration);
 }

package/src/dates/date-util.ts

@@ -10,7 +10,6 @@ import {
   createCalendar,
   toCalendar,
 } from '@internationalized/date';
-import { DurationFormat } from '@formatjs/intl-durationformat';
 import { attempt } from 'any-date-parser';
 import dayjs from 'dayjs';
 import isToday from 'dayjs/plugin/isToday.js';
@@ -18,7 +17,6 @@ import objectSupport from 'dayjs/plugin/objectSupport.js';
 import utc from 'dayjs/plugin/utc.js';
 import { isNil, omit } from 'lodash-es';
 import { getLocale } from '../';
-import type { DurationFormatOptions, DurationInput } from '@formatjs/intl-durationformat/src/types';
 
 dayjs.extend(isToday);
 dayjs.extend(utc);
@@ -440,7 +438,7 @@ export function convertToLocaleCalendar(
  * @param options Optional options for formatting.
  * @returns The formatted duration string.
  */
-export function formatDuration(duration: DurationInput, options?: DurationFormatOptions) {
-  const formatter = new DurationFormat(getLocale(), options);
+export function formatDuration(duration: Intl.DurationInput, options?: Intl.DurationFormatOptions) {
+  const formatter = new Intl.DurationFormat(getLocale(), options);
   return formatter.format(duration);
 }

package/src/index.ts

@@ -1,3 +1,4 @@
+/// <reference path="./intl-durationformat.d.ts" />
 export * from './age-helpers';
 export * from './dates';
 export * from './get-locale';

package/src/intl-durationformat.d.ts

@@ -0,0 +1,64 @@
+// Ambient type declarations for Intl.DurationFormat (TC39 Stage 3 proposal).
+// Can be removed once TypeScript ships built-in types for Intl.DurationFormat.
+// Reference: https://tc39.es/proposal-intl-duration-format/
+
+declare namespace Intl {
+  interface ResolvedDurationFormatOptions {
+    localeMatcher: 'best fit' | 'lookup';
+    style: 'long' | 'short' | 'narrow' | 'digital';
+    years: 'long' | 'short' | 'narrow';
+    yearsDisplay: 'always' | 'auto';
+    months: 'long' | 'short' | 'narrow';
+    monthsDisplay: 'always' | 'auto';
+    weeks: 'long' | 'short' | 'narrow';
+    weeksDisplay: 'always' | 'auto';
+    days: 'long' | 'short' | 'narrow';
+    daysDisplay: 'always' | 'auto';
+    hours: 'long' | 'short' | 'narrow' | 'numeric';
+    hoursDisplay: 'always' | 'auto';
+    minutes: 'long' | 'short' | 'narrow' | 'numeric' | '2-digit';
+    minutesDisplay: 'always' | 'auto';
+    seconds: 'long' | 'short' | 'narrow' | 'numeric' | '2-digit';
+    secondsDisplay: 'always' | 'auto';
+    milliseconds: 'long' | 'short' | 'narrow' | 'numeric';
+    millisecondsDisplay: 'always' | 'auto';
+    microseconds: 'long' | 'short' | 'narrow' | 'numeric';
+    microsecondsDisplay: 'always' | 'auto';
+    nanoseconds: 'long' | 'short' | 'narrow' | 'numeric';
+    nanosecondsDisplay: 'always' | 'auto';
+    fractionalDigits?: 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9;
+    numberingSystem: string;
+  }
+
+  type DurationFormatOptions = Partial<ResolvedDurationFormatOptions>;
+
+  interface DurationInput {
+    years?: number;
+    months?: number;
+    weeks?: number;
+    days?: number;
+    hours?: number;
+    minutes?: number;
+    seconds?: number;
+    milliseconds?: number;
+    microseconds?: number;
+    nanoseconds?: number;
+  }
+
+  interface DurationFormatPart {
+    unit?: string;
+    type: string;
+    value: string;
+  }
+
+  class DurationFormat {
+    constructor(locales?: string | string[], options?: DurationFormatOptions);
+    format(duration: DurationInput): string;
+    formatToParts(duration: DurationInput): DurationFormatPart[];
+    resolvedOptions(): ResolvedDurationFormatOptions;
+    static supportedLocalesOf(
+      locales: string | string[],
+      options?: Pick<DurationFormatOptions, 'localeMatcher'>,
+    ): string[];
+  }
+}

package/vitest.config.ts

@@ -4,5 +4,6 @@ export default defineConfig({
   test: {
     environment: 'happy-dom',
     mockReset: true,
+    setupFiles: ['./setup-tests.ts'],
   },
 });