<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[281371] trunk</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/281371">281371</a></dd>
<dt>Author</dt> <dd>ysuzuki@apple.com</dd>
<dt>Date</dt> <dd>2021-08-21 06:02:32 -0700 (Sat, 21 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>[JSC] Extend Intl TimeZoneName Option
https://bugs.webkit.org/show_bug.cgi?id=227831

Reviewed by Ross Kirsling.

JSTests:

* stress/intl-extended-timezone-names.js: Added.
(shouldBe):
(timeZoneTest):
* test262/config.yaml:

Source/JavaScriptCore:

https://github.com/tc39/proposal-intl-extend-timezonename

This patch implements Extend Intl TimeZoneName proposal, which adds "shortOffset", "longOffset", "shortGeneric", "longGeneric"
timeZoneName variants.

* runtime/IntlDateTimeFormat.cpp:
(JSC::IntlDateTimeFormat::setFormatsFromPattern):
(JSC::IntlDateTimeFormat::initializeDateTimeFormat):
(JSC::IntlDateTimeFormat::timeZoneNameString):
* runtime/IntlDateTimeFormat.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTeststest262configyaml">trunk/JSTests/test262/config.yaml</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatcpp">trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeIntlDateTimeFormath">trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.h</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestsstressintlextendedtimezonenamesjs">trunk/JSTests/stress/intl-extended-timezone-names.js</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (281370 => 281371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog  2021-08-21 12:28:04 UTC (rev 281370)
+++ trunk/JSTests/ChangeLog     2021-08-21 13:02:32 UTC (rev 281371)
</span><span class="lines">@@ -1,5 +1,17 @@
</span><span class="cx"> 2021-08-21  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><ins>+        [JSC] Extend Intl TimeZoneName Option
+        https://bugs.webkit.org/show_bug.cgi?id=227831
+
+        Reviewed by Ross Kirsling.
+
+        * stress/intl-extended-timezone-names.js: Added.
+        (shouldBe):
+        (timeZoneTest):
+        * test262/config.yaml:
+
+2021-08-21  Yusuke Suzuki  <ysuzuki@apple.com>
+
</ins><span class="cx">         [JSC] Enable Array#findLast method
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=229355
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkJSTestsstressintlextendedtimezonenamesjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/stress/intl-extended-timezone-names.js (0 => 281371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/stress/intl-extended-timezone-names.js                             (rev 0)
+++ trunk/JSTests/stress/intl-extended-timezone-names.js        2021-08-21 13:02:32 UTC (rev 281371)
</span><span class="lines">@@ -0,0 +1,75 @@
</span><ins>+function shouldBe(actual, expected) {
+    if (actual !== expected)
+        throw new Error("bad value: " + actual);
+}
+
+let timeZoneNames = ["short", "long", "shortOffset", "longOffset", "shortGeneric", "longGeneric"];
+let date = new Date(1625939282389);
+
+function timeZoneTest(date, locale, expectedSet, timeZone = "America/Los_Angeles")
+{
+    timeZoneNames.forEach(function(timeZoneName) {
+        let formatter = new Intl.DateTimeFormat(locale, {
+            year: "numeric",
+            month: "numeric",
+            day: "numeric",
+            hour: "2-digit",
+            minute: "2-digit",
+            second: "2-digit",
+            timeZone,
+            timeZoneName
+        });
+        let actual = formatter.format(date);
+        // print(`${timeZoneName}: "${actual}",`);
+        let expected = expectedSet[timeZoneName];
+        if (Array.isArray(expected))
+            shouldBe(expected.includes(actual), true);
+        else
+            shouldBe(actual, expected);
+    });
+}
+
+timeZoneTest(date, "en", {
+    short: "7/10/2021, 10:48:02 AM PDT",
+    long: "7/10/2021, 10:48:02 AM Pacific Daylight Time",
+    shortOffset: "7/10/2021, 10:48:02 AM GMT-7",
+    longOffset: "7/10/2021, 10:48:02 AM GMT-07:00",
+    shortGeneric: "7/10/2021, 10:48:02 AM PT",
+    longGeneric: "7/10/2021, 10:48:02 AM Pacific Time",
+});
+
+timeZoneTest(date, "en", {
+    short: "7/10/2021, 11:18:02 PM GMT+5:30",
+    long: "7/10/2021, 11:18:02 PM India Standard Time",
+    shortOffset: "7/10/2021, 11:18:02 PM GMT+5:30",
+    longOffset: "7/10/2021, 11:18:02 PM GMT+05:30",
+    shortGeneric: "7/10/2021, 11:18:02 PM India Time",
+    longGeneric: "7/10/2021, 11:18:02 PM India Standard Time",
+}, "Asia/Calcutta");
+
+timeZoneTest(date, "zh-Hant", {
+    short: ["2021/7/10 PDT 上午10:48:02", "2021/7/10 上午10:48:02 [PDT]"],
+    long: ["2021/7/10 太平洋夏令時間 上午10:48:02", "2021/7/10 上午10:48:02 [太平洋夏令時間]"],
+    shortOffset: ["2021/7/10 GMT-7 上午10:48:02", "2021/7/10 上午10:48:02 [GMT-7]"],
+    longOffset: ["2021/7/10 GMT-07:00 上午10:48:02", "2021/7/10 上午10:48:02 [GMT-07:00]"],
+    shortGeneric: ["2021/7/10 PT 上午10:48:02", "2021/7/10 上午10:48:02 [PT]"],
+    longGeneric: ["2021/7/10 太平洋時間 上午10:48:02", "2021/7/10 上午10:48:02 [太平洋時間]"],
+});
+
+timeZoneTest(date, "ja-JP", {
+    short: "2021/7/10 10:48:02 GMT-7",
+    long: "2021/7/10 10時48分02秒 アメリカ太平洋夏時間",
+    shortOffset: "2021/7/10 10時48分02秒 GMT-7",
+    longOffset: "2021/7/10 10時48分02秒 GMT-07:00",
+    shortGeneric: "2021/7/10 10:48:02 ロサンゼルス時間",
+    longGeneric: "2021/7/10 10:48:02 アメリカ太平洋時間",
+});
+
+timeZoneTest(date, "ja-JP", {
+    short: "2021/7/11 02:48:02 JST",
+    long: "2021/7/11 02時48分02秒 日本標準時",
+    shortOffset: "2021/7/11 02時48分02秒 GMT+9",
+    longOffset: "2021/7/11 02時48分02秒 GMT+09:00",
+    shortGeneric: "2021/7/11 02:48:02 JST",
+    longGeneric: "2021/7/11 02:48:02 日本標準時",
+}, "Asia/Tokyo");
</ins></span></pre></div>
<a id="trunkJSTeststest262configyaml"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/test262/config.yaml (281370 => 281371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/test262/config.yaml        2021-08-21 12:28:04 UTC (rev 281370)
+++ trunk/JSTests/test262/config.yaml   2021-08-21 13:02:32 UTC (rev 281371)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx">     - json-modules
</span><span class="cx">     - class-static-block
</span><span class="cx">     - Intl.DisplayNames-v2
</span><del>-    - Intl.DateTimeFormat-extend-timezonename
</del><span class="cx">     - callable-boundary-realms
</span><span class="cx">   paths:
</span><span class="cx">   files:
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (281370 => 281371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog    2021-08-21 12:28:04 UTC (rev 281370)
+++ trunk/Source/JavaScriptCore/ChangeLog       2021-08-21 13:02:32 UTC (rev 281371)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2021-08-21  Yusuke Suzuki  <ysuzuki@apple.com>
</span><span class="cx"> 
</span><ins>+        [JSC] Extend Intl TimeZoneName Option
+        https://bugs.webkit.org/show_bug.cgi?id=227831
+
+        Reviewed by Ross Kirsling.
+
+        https://github.com/tc39/proposal-intl-extend-timezonename
+
+        This patch implements Extend Intl TimeZoneName proposal, which adds "shortOffset", "longOffset", "shortGeneric", "longGeneric"
+        timeZoneName variants.
+
+        * runtime/IntlDateTimeFormat.cpp:
+        (JSC::IntlDateTimeFormat::setFormatsFromPattern):
+        (JSC::IntlDateTimeFormat::initializeDateTimeFormat):
+        (JSC::IntlDateTimeFormat::timeZoneNameString):
+        * runtime/IntlDateTimeFormat.h:
+
+2021-08-21  Yusuke Suzuki  <ysuzuki@apple.com>
+
</ins><span class="cx">         [JSC] Enable String,TypedArray#at
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=229354
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlDateTimeFormatcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp (281370 => 281371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp       2021-08-21 12:28:04 UTC (rev 281370)
+++ trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.cpp  2021-08-21 13:02:32 UTC (rev 281371)
</span><span class="lines">@@ -411,13 +411,24 @@
</span><span class="cx">                 m_second = Second::TwoDigit;
</span><span class="cx">             break;
</span><span class="cx">         case 'z':
</span><del>-        case 'v':
-        case 'V':
</del><span class="cx">             if (count == 1)
</span><span class="cx">                 m_timeZoneName = TimeZoneName::Short;
</span><span class="cx">             else if (count == 4)
</span><span class="cx">                 m_timeZoneName = TimeZoneName::Long;
</span><span class="cx">             break;
</span><ins>+        case 'O':
+            if (count == 1)
+                m_timeZoneName = TimeZoneName::ShortOffset;
+            else if (count == 4)
+                m_timeZoneName = TimeZoneName::LongOffset;
+            break;
+        case 'v':
+        case 'V':
+            if (count == 1)
+                m_timeZoneName = TimeZoneName::ShortGeneric;
+            else if (count == 4)
+                m_timeZoneName = TimeZoneName::LongGeneric;
+            break;
</ins><span class="cx">         case 'S':
</span><span class="cx">             m_fractionalSecondDigits = count;
</span><span class="cx">             break;
</span><span class="lines">@@ -789,7 +800,7 @@
</span><span class="cx">     for (unsigned i = 0; i < fractionalSecondDigits; ++i)
</span><span class="cx">         skeletonBuilder.append('S');
</span><span class="cx"> 
</span><del>-    TimeZoneName timeZoneName = intlOption<TimeZoneName>(globalObject, options, vm.propertyNames->timeZoneName, { { "short"_s, TimeZoneName::Short }, { "long"_s, TimeZoneName::Long } }, "timeZoneName must be \"short\" or \"long\""_s, TimeZoneName::None);
</del><ins>+    TimeZoneName timeZoneName = intlOption<TimeZoneName>(globalObject, options, vm.propertyNames->timeZoneName, { { "short"_s, TimeZoneName::Short }, { "long"_s, TimeZoneName::Long }, { "shortOffset"_s, TimeZoneName::ShortOffset }, { "longOffset"_s, TimeZoneName::LongOffset }, { "shortGeneric"_s, TimeZoneName::ShortGeneric}, { "longGeneric"_s, TimeZoneName::LongGeneric } }, "timeZoneName must be \"short\", \"long\", \"shortOffset\", \"longOffset\", \"shortGenric\", or \"longGeneric\""_s, TimeZoneName::None);
</ins><span class="cx">     RETURN_IF_EXCEPTION(scope, void());
</span><span class="cx">     switch (timeZoneName) {
</span><span class="cx">     case TimeZoneName::Short:
</span><span class="lines">@@ -798,6 +809,18 @@
</span><span class="cx">     case TimeZoneName::Long:
</span><span class="cx">         skeletonBuilder.append("zzzz");
</span><span class="cx">         break;
</span><ins>+    case TimeZoneName::ShortOffset:
+        skeletonBuilder.append('O');
+        break;
+    case TimeZoneName::LongOffset:
+        skeletonBuilder.append("OOOO");
+        break;
+    case TimeZoneName::ShortGeneric:
+        skeletonBuilder.append('v');
+        break;
+    case TimeZoneName::LongGeneric:
+        skeletonBuilder.append("vvvv");
+        break;
</ins><span class="cx">     case TimeZoneName::None:
</span><span class="cx">         break;
</span><span class="cx">     }
</span><span class="lines">@@ -1100,6 +1123,14 @@
</span><span class="cx">         return "short"_s;
</span><span class="cx">     case TimeZoneName::Long:
</span><span class="cx">         return "long"_s;
</span><ins>+    case TimeZoneName::ShortOffset:
+        return "shortOffset"_s;
+    case TimeZoneName::LongOffset:
+        return "longOffset"_s;
+    case TimeZoneName::ShortGeneric:
+        return "shortGeneric"_s;
+    case TimeZoneName::LongGeneric:
+        return "longGeneric"_s;
</ins><span class="cx">     case TimeZoneName::None:
</span><span class="cx">         ASSERT_NOT_REACHED();
</span><span class="cx">         return ASCIILiteral::null();
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeIntlDateTimeFormath"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.h (281370 => 281371)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.h 2021-08-21 12:28:04 UTC (rev 281370)
+++ trunk/Source/JavaScriptCore/runtime/IntlDateTimeFormat.h    2021-08-21 13:02:32 UTC (rev 281371)
</span><span class="lines">@@ -102,7 +102,7 @@
</span><span class="cx">     enum class Hour : uint8_t { None, TwoDigit, Numeric };
</span><span class="cx">     enum class Minute : uint8_t { None, TwoDigit, Numeric };
</span><span class="cx">     enum class Second : uint8_t { None, TwoDigit, Numeric };
</span><del>-    enum class TimeZoneName : uint8_t { None, Short, Long };
</del><ins>+    enum class TimeZoneName : uint8_t { None, Short, Long, ShortOffset, LongOffset, ShortGeneric, LongGeneric };
</ins><span class="cx">     enum class DateTimeStyle : uint8_t { None, Full, Long, Medium, Short };
</span><span class="cx"> 
</span><span class="cx">     void setFormatsFromPattern(const StringView&);
</span></span></pre>
</div>
</div>

</body>
</html>