Fixes parsing of flexible day periods in compiled JavaScript.

RELNOTES: Fixes parsing of flexible day periods in compiled JavaScript.

PiperOrigin-RevId: 468762639
Change-Id: I382ff5ffdb37f33a949d90c142b594cf58077116

Author: Closure Team

closure/goog/i18n/BUILD

@@ -4,6 +4,63 @@ package(default_visibility = ["//visibility:public"])
 
 licenses(["notice"])
 
+closure_js_library(
+    name = "jstests_deps",
+    lenient = True,
+    exports = [
+        ":bidi",
+        ":bidiformatter",
+        ":charlistdecompressor",
+        ":collation",
+        ":compactnumberformatsymbols",
+        ":compactnumberformatsymbolsext",
+        ":currency",
+        ":dateintervalformat",
+        ":dateintervalpatterns",
+        ":dateintervalsymbols",
+        ":datetimeformat",
+        ":datetimeparse",
+        ":datetimepatterns",
+        ":datetimepatternsext",
+        ":datetimesymbols",
+        ":datetimesymbolsext",
+        ":dayperiodsymbols",
+        ":graphemebreak",
+        ":listformat",
+        ":listsymbols",
+        ":listsymbolsext",
+        ":localefeature",
+        ":messageformat",
+        ":mime",
+        ":numberformat",
+        ":numberformatsymbols",
+        ":numberformatsymbolsext",
+        ":ordinalrules",
+        ":pluralrules",
+        ":relativedatetimeformat",
+        ":relativedatetimesymbols",
+        ":relativedatetimesymbolsext",
+        ":timezone",
+        ":uchar",
+        ":ucharnames",
+        "//closure/goog/date",
+        "//closure/goog/date:daterange",
+        "//closure/goog/date:utcdatetime",
+        "//closure/goog/html:safehtml",
+        "//closure/goog/html:testing",
+        "//closure/goog/labs/useragent",
+        "//closure/goog/object",
+        "//closure/goog/string",
+        "//closure/goog/testing:expectedfailures",
+        "//closure/goog/testing:propertyreplacer",
+        "//closure/goog/testing:testsuite",
+        "//closure/goog/useragent",
+        "//closure/goog/useragent:product",
+        "//closure/goog/useragent:product_isversion",
+        "//closure/goog:base",
+    ],
+)
+
 closure_js_library(
     name = "bidi",
     srcs = ["bidi.js"],

closure/goog/i18n/datetimeformat_test.js

@@ -622,17 +622,45 @@ testSuite({
      * {goog.i18n.DayPeriods}
      */
     const fakeDayPeriods_en = {
-      midnight: {at: '00:00', formatNames: ['midnight']},
-      morning1:
-          {from: '05:00', before: '08:00', formatNames: ['before breakfast']},
-      morning2: {from: '08:00', before: '12:00', formatNames: ['morning']},
-      noon: {at: '12:00', formatNames: ['noon']},
-      afternoon1:
-          {from: '12:00', before: '16:00', formatNames: ['early afternoon']},
-      afternoon2:
-          {from: '16:00', before: '18:00', formatNames: ['dinner time']},
-      evening1: {from: '18:00', before: '23:00', formatNames: ['evening']},
-      night1: {from: '23:00', before: '05:00', formatNames: ['sleeping']},
+      midnight:
+          {at: '00:00', formatNames: ['midnight'], periodName: 'midnight'},
+      morning1: {
+        from: '05:00',
+        before: '08:00',
+        formatNames: ['before breakfast'],
+        periodName: 'morning1'
+      },
+      morning2: {
+        from: '08:00',
+        before: '12:00',
+        formatNames: ['morning'],
+        periodName: 'morning2'
+      },
+      noon: {at: '12:00', formatNames: ['noon'], periodName: 'noon'},
+      afternoon1: {
+        from: '12:00',
+        before: '16:00',
+        formatNames: ['early afternoon'],
+        periodName: 'afternoon1'
+      },
+      afternoon2: {
+        from: '16:00',
+        before: '18:00',
+        formatNames: ['dinner time'],
+        periodName: 'afternoon2'
+      },
+      evening1: {
+        from: '18:00',
+        before: '23:00',
+        formatNames: ['evening'],
+        periodName: 'evening1'
+      },
+      night1: {
+        from: '23:00',
+        before: '05:00',
+        formatNames: ['sleeping'],
+        periodName: 'night1'
+      },
     };
     setDayPeriods(fakeDayPeriods_en);
 

closure/goog/i18n/datetimeparse.js

@@ -444,7 +444,7 @@ goog.i18n.DateTimeParse.prototype.parse = function(text, date, options) {
 
   const cal = new goog.i18n.DateTimeParse.MyDate_();
   const parsePos = [0];
-  cal.dayPeriodIndex = null;
+  cal.dayPeriodIndex = -1;
 
   for (let i = 0; i < this.patternParts_.length; i++) {
     if (predictive && parsePos[0] >= text.length) {
@@ -593,31 +593,28 @@ goog.i18n.DateTimeParse.prototype.subParse_ = function(
       /** {?goog.i18n.DayPeriods} */
       const localePeriods = DayPeriods.getDayPeriods();
       // Standard names such as 'noon', 'morning1', 'night2', etc.
-      let periodNames;
+      let periodNames = [];
       // The localized terms for the period names.
       let expectedValues = [];
       if (localePeriods) {
-        periodNames = goog.object.getKeys(localePeriods);
         // Get the formatNames values to check
-        for (const name of periodNames) {
+        for (const name of goog.object.getKeys(localePeriods)) {
+          periodNames.push(localePeriods[name].periodName);
           expectedValues.push(localePeriods[name].formatNames[0]);
         }
       }
       // Add strings for AM & PM, in addition to flexible periods
       const periodsData = [expectedValues.concat(this.dateTimeSymbols_.AMPMS)];
       // Include possible outputs of am/pm as day periods.
-      if (periodNames) {
-        periodNames.push('isAm');
-        periodNames.push('isPm');
-      }
+      periodNames.push('isAm');
+      periodNames.push('isPm');
+
       // Record string matching this day period
       const foundPeriod = this.subParseString_(
           text, pos, periodsData, value => cal.dayPeriodIndex = value,
           predictive);
-      cal.dayPeriodName = null;
-      if (cal.dayPeriodIndex && periodNames) {
-        cal.dayPeriodName = periodNames[cal.dayPeriodIndex];
-      }
+      cal.dayPeriodName = periodNames[cal.dayPeriodIndex];
+
       return predictive ? foundPeriod : true;
     case 'a':  // AM_PM
       const success = this.subParseString_(
@@ -1169,7 +1166,7 @@ goog.i18n.DateTimeParse.MyDate_.prototype.ampm;
 
 /**
  * Index of the time's flexible day period in data object.
- * @type {?number}
+ * @type {number}
  */
 goog.i18n.DateTimeParse.MyDate_.prototype.dayPeriodIndex;
 

closure/goog/i18n/datetimeparse_test.js

@@ -32,7 +32,11 @@ const testSuite = goog.require('goog.testing.testSuite');
 
 const {DayPeriods_zh_Hant, setDayPeriods} = goog.require('goog.i18n.DayPeriods');
 
-replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_en);
+const DATETIMESYMBOLS =
+    goog.reflect.objectProperty('DateTimeSymbols', goog.i18n);
+const LOCALE = goog.reflect.objectProperty('LOCALE', goog);
+
+replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_en);
 
 /**
  * @record
@@ -141,12 +145,12 @@ testSuite({
   setUpPage() {},
 
   setUp() {
-    replacer.replace(goog, 'LOCALE', 'en');
-    replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_en);
+    replacer.replace(goog, LOCALE, 'en');
+    replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_en);
   },
 
   tearDown() {
-    replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_en);
+    replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_en);
   },
 
   testNegativeYear() {
@@ -489,7 +493,7 @@ testSuite({
   },
 
   testChineseDate() {
-    replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_zh);
+    replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_zh);
 
     // JavaScript month start from 0, July is 7 - 1
     const date = new Date(2006, 7 - 1, 24, 12, 12, 12, 0);
@@ -531,7 +535,8 @@ testSuite({
   },
 
   testZhTwBFormat() {
-    replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_zh_TW);
+    let nativeMode = true;
+    replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_zh_TW);
 
     // Make sure we have the day period info.
     setDayPeriods(DayPeriods_zh_Hant);
@@ -544,7 +549,10 @@ testSuite({
     let date = new Date(2006, 7 - 1, 24, 12, 12, 12, 0);
 
     let parsedDate = parser.parse(gmtDateStringPm, date);
-    assertTrue('parsedDate=' + parsedDate, parsedDate > 0);
+
+    assertTrue(
+        'nativeMode=' + nativeMode + ', parsedDate=' + parsedDate,
+        parsedDate > 0);
     // This should be give 10PM == 22:00.
     const normalizedHourPm =
         (24 + date.getHours() + date.getTimezoneOffset() / 60) % 24;
@@ -556,7 +564,7 @@ testSuite({
   // for parsing dates with such native digits.
   testDatesWithNativeDigits() {
     // Language Arabic is one example with
-    replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_fa);
+    replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_fa);
 
     let formatter = new DateTimeFormat(DateTimeFormat.Format.FULL_DATE);
     let parser = new DateTimeParse(DateTimeFormat.Format.FULL_DATE);
@@ -679,7 +687,7 @@ testSuite({
   },
 
   testFrenchShortQuarter() {
-    replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_fr);
+    replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_fr);
     const parser = new DateTimeParse('yyyyQQ');
 
     assertParsedDateEquals(2009, 7 - 1, 1, parser, '2009T3');
@@ -769,7 +777,7 @@ testSuite({
 
   /** @bug 9901750 */
   testStandaloneMonthPattern() {
-    replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_pl);
+    replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_pl);
     const date1 = new GoogDate(2006, 7 - 1);
     const date2 = new GoogDate();
     const formatter = new DateTimeFormat('LLLL yyyy');
@@ -784,7 +792,7 @@ testSuite({
     const symbols = [DateTimeSymbols_en, DateTimeSymbols_pl];
 
     for (let i = 0; i < symbols.length; i++) {
-      replacer.replace(goog.i18n, 'DateTimeSymbols', symbols[i]);
+      replacer.replace(goog.i18n, DATETIMESYMBOLS, symbols[i]);
       const dateTimeSymbols = symbols[i];
       const tests = {
         'MMMM yyyy': dateTimeSymbols.MONTHS,
@@ -827,7 +835,7 @@ testSuite({
 
   testQuotedPattern() {
     // Regression test for b/29990921.
-    replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_en);
+    replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_en);
 
     // Literal apostrophe
     let parser = new DateTimeParse('MMM \'\'yy');
@@ -879,8 +887,8 @@ testSuite({
   testZhHantTwDayPeriods() {
     // b/208532468, 3-Dec-2021
 
-    replacer.replace(goog, 'LOCALE', 'zh-TW');
-    replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_zh_TW);
+    replacer.replace(goog, LOCALE, 'zh-TW');
+    replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_zh_TW);
     // Set up for parts of the day in Chinese.
     setDayPeriods(DayPeriods_zh_Hant);
 
@@ -943,8 +951,8 @@ testSuite({
   testRoundTripZhTw() {
     // Test for b/208532468 round trip with zh_TW with flexible time periods
     const date = new Date(0, 0, 0, 17);
-    replacer.replace(goog, 'LOCALE', 'zh-TW');
-    replacer.replace(goog.i18n, 'DateTimeSymbols', DateTimeSymbols_zh_TW);
+    replacer.replace(goog, LOCALE, 'zh-TW');
+    replacer.replace(goog.i18n, DATETIMESYMBOLS, DateTimeSymbols_zh_TW);
 
     setDayPeriods(DayPeriods_zh_Hant);
 

closure/goog/i18n/dayperiodsymbols.js

@@ -20,6 +20,7 @@ goog.module.declareLegacyNamespace();
  *    at: (string|undefined),
  *    from: (string|undefined),
  *    before: (string|undefined),
+ *    periodName: (string),
  *    formatNames: (!Array<string>|undefined),
  *    standaloneNames: (!Array<string>|undefined)
  *  }}
@@ -54,13 +55,43 @@ exports.DayPeriods = DayPeriods;
  * @type {!DayPeriods}
  */
 exports.DayPeriods_zh_Hant = {
-  midnight: {at: '00:00', formatNames: ['午夜']},
-  night1: {from: '00:00', before: '05:00', formatNames: ['凌晨']},
-  morning1: {from: '05:00', before: '08:00', formatNames: ['清晨']},
-  morning2: {from: '08:00', before: '12:00', formatNames: ['上午']},
-  afternoon1: {from: '12:00', before: '13:00', formatNames: ['中午']},
-  afternoon2: {from: '13:00', before: '19:00', formatNames: ['下午']},
-  evening1: {from: '19:00', before: '24:00', formatNames: ['晚上']},
+  midnight: {at: '00:00', formatNames: ['午夜'], periodName: 'midnight'},
+  night1: {
+    from: '00:00',
+    before: '05:00',
+    formatNames: ['凌晨'],
+    periodName: 'night1'
+  },
+  morning1: {
+    from: '05:00',
+    before: '08:00',
+    formatNames: ['清晨'],
+    periodName: 'morning1'
+  },
+  morning2: {
+    from: '08:00',
+    before: '12:00',
+    formatNames: ['上午'],
+    periodName: 'morning2'
+  },
+  afternoon1: {
+    from: '12:00',
+    before: '13:00',
+    formatNames: ['中午'],
+    periodName: 'afternoon1'
+  },
+  afternoon2: {
+    from: '13:00',
+    before: '19:00',
+    formatNames: ['下午'],
+    periodName: 'afternoon1'
+  },
+  evening1: {
+    from: '19:00',
+    before: '24:00',
+    formatNames: ['晚上'],
+    periodName: 'evening1'
+  },
 };
 
 /**