From 3d0b3ed6a8b325f1091dfd1035d1a5a951625dc5 Mon Sep 17 00:00:00 2001
From: ligiapopescu <ligiapopescu@microsoft.com_msteamsmdb>
Date: Wed, 14 Feb 2024 18:10:34 +0200
Subject: [PATCH] Add MEDIUM_DATE_SHORT_TIME format

---
 README.md                       |  3 +++
 docs/index.html                 |  3 ++-
 package.json                    |  2 +-
 src/date-time-format-options.ts | 15 +++++++++++++++
 src/date-time-formatter.test.ts | 19 ++++++++++++++++---
 src/date-time-formatter.ts      | 11 +++++++++++
 src/index.ts                    |  1 +
 7 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index 115b5e1..8fade05 100644
--- a/README.md
+++ b/README.md
@@ -142,6 +142,9 @@ NPM Releases are made manually by @TomasHubelbauer at the moment.
 
 ## Release Notes
 
+### `4.1.4` 2024-02-14
+Add new format `MEDIUM_DATE_SHORT_TIME`
+
 ### `4.1.3` 2021-08-09
 Attempting to fix VDI issues on Electron
 ### `4.1.2` 2021-03-31
diff --git a/docs/index.html b/docs/index.html
index f4f8914..d0ca516 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -5,7 +5,7 @@
   <script>
     var exports = {};
   </script>
-  <script src="https://unpkg.com/@microsoft/globe@4.1.3/dist/globe.cjs.development.js"></script>
+  <script src="https://unpkg.com/@microsoft/globe@4.1.4/dist/globe.cjs.development.js"></script>
   <!-- <script src="./../dist/globe.cjs.development.js"></script> -->
   <style>
     .header {
@@ -164,6 +164,7 @@
         MEDIUM_DATE_WITH_YEAR: exports.MEDIUM_DATE_WITH_YEAR,
         MEDIUM_WITH_YEAR: exports.MEDIUM_WITH_YEAR,
         MEDIUM: exports.MEDIUM,
+        MEDIUM_DATE_SHORT_TIME: exports.MEDIUM_DATE_SHORT_TIME,
         HOUR_ONLY: exports.HOUR_ONLY,
         LONG_WEEKDAY_SHORT_TIME: exports.LONG_WEEKDAY_SHORT_TIME,
         LONG_WEEKDAY_LONG_TIME: exports.LONG_WEEKDAY_LONG_TIME,
diff --git a/package.json b/package.json
index 001b76e..5d3ecb3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/globe",
-  "version": "4.1.3",
+  "version": "4.1.4",
   "description": "Globalization Service",
   "author": "Microsoft",
   "license": "MIT",
diff --git a/src/date-time-format-options.ts b/src/date-time-format-options.ts
index b0e49a2..edffffe 100644
--- a/src/date-time-format-options.ts
+++ b/src/date-time-format-options.ts
@@ -80,6 +80,13 @@ type MediumDateWithYear = Readonly<{
   year: 'numeric'
 }>;
 
+type MediumDateShortTime = Readonly<{
+  day: 'numeric',
+  month: 'short',
+  hour: 'numeric',
+  minute: 'numeric'
+}>;
+
 type ShortTimeZoneName = Readonly<{ timeZoneName: 'short' }>;
 
 type LongTimeZoneName = Readonly<{ timeZoneName: 'long' }>;
@@ -137,6 +144,7 @@ export type DateTimeFormatOptions =
   | MediumDateWithYear
   | MediumWithYear
   | Medium
+  | MediumDateShortTime
   | LongWeekday
   | ShortWeekday
   | HourOnly
@@ -273,6 +281,13 @@ export const MEDIUM: Medium = {
   ...MEDIUM_TIME
 };
 
+export const MEDIUM_DATE_SHORT_TIME: MediumDateShortTime = {
+  day: 'numeric',
+  month: 'short',
+  hour: 'numeric',
+  minute: 'numeric'
+};
+
 export const HOUR_ONLY: HourOnly = {
   hour: 'numeric'
 };
diff --git a/src/date-time-formatter.test.ts b/src/date-time-formatter.test.ts
index bd37872..4b9f4c2 100644
--- a/src/date-time-formatter.test.ts
+++ b/src/date-time-formatter.test.ts
@@ -22,7 +22,8 @@ const {
   FULL,
   SHORT_WITH_YEAR,
   SHORT,
-  SHORT_TIME
+  SHORT_TIME,
+  MEDIUM_DATE_SHORT_TIME
 } = require('../dist/globe.cjs.development');
 
 describe('date-time-format-options', () => {
@@ -210,6 +211,12 @@ describe('date-time-format-options', () => {
         expect(dateTimeFormatter.formatDateTime(date, SHORT_WEEKDAY_LONG_TIME)).toBe('Sun, 3:40:25 PM');
       });
 
+      it('medium date with short time', () => {
+        const dateTimeFormatter = new DateTimeFormatter(localeInfo);
+        const date = new Date(2020, 5, 28, 15, 40, 25);
+        expect(dateTimeFormatter.formatDateTime(date, MEDIUM_DATE_SHORT_TIME)).toBe('Jun 28, 3:40 PM');
+      });
+
       it('removes unsupported symbols', () => {
         const localeInfo = { platform: 'macos', regionalFormat: 'en-US', shortTime: 'llwwWWDDFFggUUqqQQh:mm a' };
         const dateTimeFormatter = new DateTimeFormatter(localeInfo);
@@ -353,6 +360,12 @@ describe('date-time-format-options', () => {
         expect(dateTimeFormatter.formatDateTime(date, SHORT_WEEKDAY_LONG_TIME)).toBe('Sun, 3:40:25 PM');
       });
 
+      it('medium date with short time', () => {
+        const dateTimeFormatter = new DateTimeFormatter(localeInfo);
+        const date = new Date(2020, 5, 28, 15, 40, 25);
+        expect(dateTimeFormatter.formatDateTime(date, MEDIUM_DATE_SHORT_TIME)).toBe('Jun 28, 3:40 PM');
+      });
+
       it('combines short month and long month', () => {
         const localeInfo = {
           platform: 'windows',
@@ -444,7 +457,7 @@ describe('date-time-format-options', () => {
       }
       const end = performance.now();
       expect(result).toBe('6/28/2020 3:40 PM');
-      expect(end - start).toBe(0);
+expect(end - start).toBe(0);
+      });
     });
-  });
 });
diff --git a/src/date-time-formatter.ts b/src/date-time-formatter.ts
index 62a4f7f..f10b5ed 100644
--- a/src/date-time-formatter.ts
+++ b/src/date-time-formatter.ts
@@ -23,6 +23,7 @@ import {
   LONG_WITH_YEAR_TIMEZONE,
   MEDIUM,
   MEDIUM_DATE,
+  MEDIUM_DATE_SHORT_TIME,
   MEDIUM_DATE_WITH_YEAR,
   MEDIUM_TIME,
   MEDIUM_WITH_YEAR,
@@ -160,6 +161,16 @@ export class DateTimeFormatter {
         const t = this.formatter.timeToString(date, localeInfo.longTime);
         return this.combineDateAndTime(d, t);
       }
+      case MEDIUM_DATE_SHORT_TIME: {
+        if (!localeInfo.shortTime) {
+          throw new Error(`localeInfo.shortTime was not provided!`);
+        }
+        
+        const d = this.cachedDateTimeFormat.get(loc, MEDIUM_DATE).format(date);
+        const t = this.formatter.timeToString(date, localeInfo.shortTime);
+        
+        return `${d}, ${t}`;
+      }
       case FULL:
       case FULL_WITH_YEAR: {
 
diff --git a/src/index.ts b/src/index.ts
index e0f8806..01778a7 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -30,6 +30,7 @@ export {
   MEDIUM_DATE_WITH_YEAR,
   MEDIUM_WITH_YEAR,
   MEDIUM,
+  MEDIUM_DATE_SHORT_TIME,
   HOUR_ONLY,
   LONG_WEEKDAY_SHORT_TIME,
   LONG_WEEKDAY_LONG_TIME,