Skip to content

Normative: Do not validate time zone names when parsing Instant string #1953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ptomato merged 1 commit into from
Jan 11, 2022
Merged

Normative: Do not validate time zone names when parsing Instant string #1953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions spec/abstractops.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,21 +468,29 @@ <h1>ToRelativeTemporalObject ( _options_ )</h1>
1. Let _result_ be ? InterpretTemporalDateTimeFields(_calendar_, _fields_, _dateOptions_).
1. Let _offsetString_ be ? Get(_value_, *"offset"*).
1. Let _timeZone_ be ? Get(_value_, *"timeZone"*).
1. If _timeZone_ is not *undefined*, then
1. Set _timeZone_ to ? ToTemporalTimeZone(_timeZone_).
1. If _offsetString_ is *undefined*, then
1. Set _offsetBehaviour_ to ~wall~.
1. Else,
1. Let _string_ be ? ToString(_value_).
1. Let _result_ be ? ParseTemporalRelativeToString(_string_).
1. Let _calendar_ be ? ToTemporalCalendarWithISODefault(_result_.[[Calendar]]).
1. Let _offsetString_ be _result_.[[TimeZoneOffset]].
1. Let _timeZone_ be _result_.[[TimeZoneIANAName]].
1. Let _timeZoneName_ be _result_.[[TimeZoneIANAName]].
1. If _timeZoneName_ is not *undefined*, then
1. If ParseText(! StringToCodePoints(_timeZoneName_), |TimeZoneNumericUTCOffset|) is not a List of errors, then
Copy link
Contributor

@FrankYFTang FrankYFTang Dec 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This use of ParseText is very different than other part of the spec parsing the ISO 8601 grammar. Is there a reason for that? or could it be rewrite to use similar wording like other parsing part?
Is the line the same as
"If timeZoneName does satisfy the syntax of a TimeZoneNumericUTCOffset (see 13.33), then "
as similar (removed the "not") used in https://tc39.es/proposal-temporal/#sec-temporal-parsetimezoneoffsetstring

1. If ! IsValidTimeZoneName(_timeZoneName_) is *false*, throw a *RangeError* exception.
1. Set _timeZoneName_ to ! CanonicalizeTimeZoneName(_timeZoneName_).
1. Let _timeZone_ be ! CreateTemporalTimeZone(_timeZoneName_).
1. Else,
1. Let _timeZone_ be *undefined*.
1. If _result_.[[TimeZoneZ]] is *true*, then
1. Set _offsetBehaviour_ to ~exact~.
1. Else if _offsetString_ is *undefined*, then
1. Set _offsetBehaviour_ to ~wall~.
1. Set _matchBehaviour_ to ~match minutes~.
1. If _timeZone_ is not *undefined*, then
1. Set _timeZone_ to ? ToTemporalTimeZone(_timeZone_).
1. If _offsetBehaviour_ is ~option~, then
1. Set _offsetString_ to ? ToString(_offsetString_).
1. Let _offsetNs_ be ? ParseTimeZoneOffsetString(_offsetString_).
Expand Down Expand Up @@ -1490,9 +1498,6 @@ <h1>ParseTemporalTimeZoneString ( _isoString_ )</h1>
1. Let _nanoseconds_ be 0.
1. Let _offsetNanoseconds_ be _sign_ × (((_hours_ × 60 + _minutes_) × 60 + _seconds_) × 10<sup>9</sup> + _nanoseconds_).
1. Let _offsetString_ be ! FormatTimeZoneOffsetString(_offsetNanoseconds_).
1. If _name_ is not *undefined*, then
1. If ! IsValidTimeZoneName(_name_) is *false*, throw a *RangeError* exception.
1. Set _name_ to ! CanonicalizeTimeZoneName(_name_).
1. Return the Record {
[[Z]]: *false*,
[[OffsetString]]: _offsetString_,
Expand Down
22 changes: 9 additions & 13 deletions spec/timezone.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -409,17 +409,6 @@ <h1>Properties of Temporal.TimeZone Instances</h1>
<emu-clause id="sec-temporal-timezone-abstract-ops">
<h1>Abstract operations</h1>

<emu-clause id="sec-temporal-parsetemporaltimezone" aoid="ParseTemporalTimeZone">
<h1>ParseTemporalTimeZone ( _string_ )</h1>
<emu-alg>
1. Assert: Type(_string_) is String.
1. Let _result_ be ? ParseTemporalTimeZoneString(_string_).
1. If _result_.[[Name]] is not *undefined*, return _result_.[[Name]].
1. If _result_.[[Z]] is *true*, return *"UTC"*.
1. Return _result_.[[OffsetString]].
</emu-alg>
</emu-clause>

<emu-clause id="sec-temporal-createtemporaltimezone" aoid="CreateTemporalTimeZone">
<h1>CreateTemporalTimeZone ( _identifier_ [ , _newTarget_ ] )</h1>
<emu-alg>
Expand Down Expand Up @@ -585,8 +574,15 @@ <h1>ToTemporalTimeZone ( _temporalTimeZoneLike_ )</h1>
1. Set _temporalTimeZoneLike_ to ? Get(_temporalTimeZoneLike_, *"timeZone"*).
1. If Type(_temporalTimeZoneLike_) is Object and ? HasProperty(_temporalTimeZoneLike_, *"timeZone"*) is *false*, return _temporalTimeZoneLike_.
1. Let _identifier_ be ? ToString(_temporalTimeZoneLike_).
1. Let _result_ be ? ParseTemporalTimeZone(_identifier_).
1. Return ? CreateTemporalTimeZone(_result_).
1. Let _parseResult_ be ? ParseTemporalTimeZoneString(_identifier_).
1. If _parseResult_.[[Name]] is not *undefined*, then
1. If ParseText(! StringToCodePoints(_parseResult_.[[Name]], |TimeZoneNumericUTCOffset|)) is not a List of errors, then
1. If _parseResult_.[[OffsetString]] is not *undefined*, and ! ParseTimeZoneOffsetString(_parseResult_.[[OffsetString]]) ≠ ! ParseTimeZoneOffsetString(_parseResult_.[[Name]]), throw a *RangeError* exception.
1. Else,
1. If ! IsValidTimeZoneName(_parseResult_.[[Name]]) is *false*, throw a *RangeError* exception.
1. Return ! CreateTemporalTimeZone(! CanonicalizeTimeZoneName(_parseResult_.[[Name]])).
1. If _parseResult_.[[Z]] is *true*, return ! CreateTemporalTimeZone(*"UTC"*).
1. Return ! CreateTemporalTimeZone(_parseResult_.[[OffsetString]]).
</emu-alg>
</emu-clause>

Expand Down
8 changes: 6 additions & 2 deletions spec/zoneddatetime.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1142,13 +1142,17 @@ <h1>ToTemporalZonedDateTime ( _item_ [ , _options_ ] )</h1>
1. Perform ? ToTemporalOverflow(_options_).
1. Let _string_ be ? ToString(_item_).
1. Let _result_ be ? ParseTemporalZonedDateTimeString(_string_).
1. Assert: _result_.[[TimeZoneName]] is not *undefined*.
1. Let _timeZoneName_ be _result_.[[TimeZoneName]].
1. Assert: _timeZoneName_ is not *undefined*.
1. If ParseText(! StringToCodePoints(_timeZoneName_), |TimeZoneNumericUTCOffset|) is a List of errors, then
1. If ! IsValidTimeZoneName(_timeZoneName_) is *false*, throw a *RangeError* exception.
1. Set _timeZoneName_ to ! CanonicalizeTimeZoneName(_timeZoneName_).
1. Let _offsetString_ be _result_.[[TimeZoneOffsetString]].
1. If _result_.[[TimeZoneZ]] is *true*, then
1. Set _offsetBehaviour_ to ~exact~.
1. Else if _offsetString_ is *undefined*, then
1. Set _offsetBehaviour_ to ~wall~.
1. Let _timeZone_ be ? CreateTemporalTimeZone(_result_.[[TimeZoneName]]).
1. Let _timeZone_ be ! CreateTemporalTimeZone(_timeZoneName_).
1. Let _calendar_ be ? ToTemporalCalendarWithISODefault(_result_.[[Calendar]]).
1. Set _matchBehaviour_ to ~match minutes~.
1. Let _offsetNanoseconds_ be 0.
Expand Down