From 384d5bb2b761b419d8ab6e35010c0b5ea0d6d949 Mon Sep 17 00:00:00 2001 From: Milan Raulim Date: Fri, 30 Jun 2023 15:18:18 +0200 Subject: [PATCH 1/2] add DateTimeFormatOptions#fractionalSecondDigits --- api-reports/2_12.txt | 3 ++- api-reports/2_13.txt | 3 ++- .../org/scalajs/dom/intl/DateTimeFormatOptions.scala | 9 ++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt index d874b2985..f540f098c 100644 --- a/api-reports/2_12.txt +++ b/api-reports/2_12.txt @@ -27648,6 +27648,7 @@ intl/DateTimeFormat[JC] def supportedLocalesOf(locales: String | js.Array[String intl/DateTimeFormatOptions[JT] var day: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var era: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var formatMatcher: js.UndefOr[String] +intl/DateTimeFormatOptions[JT] var fractionalSecondDigits: js.UndefOr[Int] intl/DateTimeFormatOptions[JT] var hour: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var hour12: js.UndefOr[Boolean] intl/DateTimeFormatOptions[JT] var localeMatcher: js.UndefOr[String] @@ -27658,7 +27659,7 @@ intl/DateTimeFormatOptions[JT] var timeZone: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var timeZoneName: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var weekday: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var year: js.UndefOr[String] -intl/DateTimeFormatOptions[SO] def apply(localeMatcher: js.UndefOr[String]?, timeZone: js.UndefOr[String]?, hour12: js.UndefOr[Boolean]?, formatMatcher: js.UndefOr[String]?, weekday: js.UndefOr[String]?, era: js.UndefOr[String]?, year: js.UndefOr[String]?, month: js.UndefOr[String]?, day: js.UndefOr[String]?, hour: js.UndefOr[String]?, minute: js.UndefOr[String]?, second: js.UndefOr[String]?, timeZoneName: js.UndefOr[String]?): DateTimeFormatOptions (@deprecated in 2.0.0) +intl/DateTimeFormatOptions[SO] def apply(localeMatcher: js.UndefOr[String]?, timeZone: js.UndefOr[String]?, hour12: js.UndefOr[Boolean]?, formatMatcher: js.UndefOr[String]?, weekday: js.UndefOr[String]?, era: js.UndefOr[String]?, year: js.UndefOr[String]?, month: js.UndefOr[String]?, day: js.UndefOr[String]?, hour: js.UndefOr[String]?, minute: js.UndefOr[String]?, second: js.UndefOr[String]?, timeZoneName: js.UndefOr[String]?, fractionalSecondDigits: js.UndefOr[Int]?): DateTimeFormatOptions (@deprecated in 2.0.0) intl/NumberFormat[JC] def format(number: Double): String intl/NumberFormat[JC] def resolvedOptions(): NumberFormatOptions intl/NumberFormat[JC] def supportedLocalesOf(locales: String | js.Array[String], options: js.Any): js.Array[String] diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt index d874b2985..f540f098c 100644 --- a/api-reports/2_13.txt +++ b/api-reports/2_13.txt @@ -27648,6 +27648,7 @@ intl/DateTimeFormat[JC] def supportedLocalesOf(locales: String | js.Array[String intl/DateTimeFormatOptions[JT] var day: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var era: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var formatMatcher: js.UndefOr[String] +intl/DateTimeFormatOptions[JT] var fractionalSecondDigits: js.UndefOr[Int] intl/DateTimeFormatOptions[JT] var hour: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var hour12: js.UndefOr[Boolean] intl/DateTimeFormatOptions[JT] var localeMatcher: js.UndefOr[String] @@ -27658,7 +27659,7 @@ intl/DateTimeFormatOptions[JT] var timeZone: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var timeZoneName: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var weekday: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var year: js.UndefOr[String] -intl/DateTimeFormatOptions[SO] def apply(localeMatcher: js.UndefOr[String]?, timeZone: js.UndefOr[String]?, hour12: js.UndefOr[Boolean]?, formatMatcher: js.UndefOr[String]?, weekday: js.UndefOr[String]?, era: js.UndefOr[String]?, year: js.UndefOr[String]?, month: js.UndefOr[String]?, day: js.UndefOr[String]?, hour: js.UndefOr[String]?, minute: js.UndefOr[String]?, second: js.UndefOr[String]?, timeZoneName: js.UndefOr[String]?): DateTimeFormatOptions (@deprecated in 2.0.0) +intl/DateTimeFormatOptions[SO] def apply(localeMatcher: js.UndefOr[String]?, timeZone: js.UndefOr[String]?, hour12: js.UndefOr[Boolean]?, formatMatcher: js.UndefOr[String]?, weekday: js.UndefOr[String]?, era: js.UndefOr[String]?, year: js.UndefOr[String]?, month: js.UndefOr[String]?, day: js.UndefOr[String]?, hour: js.UndefOr[String]?, minute: js.UndefOr[String]?, second: js.UndefOr[String]?, timeZoneName: js.UndefOr[String]?, fractionalSecondDigits: js.UndefOr[Int]?): DateTimeFormatOptions (@deprecated in 2.0.0) intl/NumberFormat[JC] def format(number: Double): String intl/NumberFormat[JC] def resolvedOptions(): NumberFormatOptions intl/NumberFormat[JC] def supportedLocalesOf(locales: String | js.Array[String], options: js.Any): js.Array[String] diff --git a/dom/src/main/scala/org/scalajs/dom/intl/DateTimeFormatOptions.scala b/dom/src/main/scala/org/scalajs/dom/intl/DateTimeFormatOptions.scala index 958b1b012..62f944f4c 100644 --- a/dom/src/main/scala/org/scalajs/dom/intl/DateTimeFormatOptions.scala +++ b/dom/src/main/scala/org/scalajs/dom/intl/DateTimeFormatOptions.scala @@ -57,6 +57,11 @@ trait DateTimeFormatOptions extends js.Object { /** The representation of the time zone name. Possible values are "short", "long". */ var timeZoneName: js.UndefOr[String] = js.undefined + + /** The number of digits used to represent fractions of a second (any additional digits are truncated). Possible + * values are 1, 2, 3. + */ + var fractionalSecondDigits: js.UndefOr[Int] = js.undefined } @deprecated("all members of DateTimeFormatOptions are deprecated", "2.0.0") @@ -70,7 +75,7 @@ object DateTimeFormatOptions { year: js.UndefOr[String] = js.undefined, month: js.UndefOr[String] = js.undefined, day: js.UndefOr[String] = js.undefined, hour: js.UndefOr[String] = js.undefined, minute: js.UndefOr[String] = js.undefined, second: js.UndefOr[String] = js.undefined, - timeZoneName: js.UndefOr[String] = js.undefined + timeZoneName: js.UndefOr[String] = js.undefined, fractionalSecondDigits: js.UndefOr[Int] = js.undefined ): DateTimeFormatOptions = { val localeMatcher0 = localeMatcher val timeZone0 = timeZone @@ -85,6 +90,7 @@ object DateTimeFormatOptions { val minute0 = minute val second0 = second val timeZoneName0 = timeZoneName + val fractionalSecondDigits0 = fractionalSecondDigits new DateTimeFormatOptions { this.localeMatcher = localeMatcher0 this.timeZone = timeZone0 @@ -99,6 +105,7 @@ object DateTimeFormatOptions { this.minute = minute0 this.second = second0 this.timeZoneName = timeZoneName0 + this.fractionalSecondDigits = fractionalSecondDigits0 } } } From 152469503a7e1800096a5fcfc540963fc399411b Mon Sep 17 00:00:00 2001 From: Milan Raulim Date: Tue, 4 Jul 2023 10:30:24 +0200 Subject: [PATCH 2/2] remove new code from deprecated apply method --- api-reports/2_12.txt | 2 +- api-reports/2_13.txt | 2 +- .../scala/org/scalajs/dom/intl/DateTimeFormatOptions.scala | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/api-reports/2_12.txt b/api-reports/2_12.txt index f540f098c..b9e87bf8e 100644 --- a/api-reports/2_12.txt +++ b/api-reports/2_12.txt @@ -27659,7 +27659,7 @@ intl/DateTimeFormatOptions[JT] var timeZone: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var timeZoneName: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var weekday: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var year: js.UndefOr[String] -intl/DateTimeFormatOptions[SO] def apply(localeMatcher: js.UndefOr[String]?, timeZone: js.UndefOr[String]?, hour12: js.UndefOr[Boolean]?, formatMatcher: js.UndefOr[String]?, weekday: js.UndefOr[String]?, era: js.UndefOr[String]?, year: js.UndefOr[String]?, month: js.UndefOr[String]?, day: js.UndefOr[String]?, hour: js.UndefOr[String]?, minute: js.UndefOr[String]?, second: js.UndefOr[String]?, timeZoneName: js.UndefOr[String]?, fractionalSecondDigits: js.UndefOr[Int]?): DateTimeFormatOptions (@deprecated in 2.0.0) +intl/DateTimeFormatOptions[SO] def apply(localeMatcher: js.UndefOr[String]?, timeZone: js.UndefOr[String]?, hour12: js.UndefOr[Boolean]?, formatMatcher: js.UndefOr[String]?, weekday: js.UndefOr[String]?, era: js.UndefOr[String]?, year: js.UndefOr[String]?, month: js.UndefOr[String]?, day: js.UndefOr[String]?, hour: js.UndefOr[String]?, minute: js.UndefOr[String]?, second: js.UndefOr[String]?, timeZoneName: js.UndefOr[String]?): DateTimeFormatOptions (@deprecated in 2.0.0) intl/NumberFormat[JC] def format(number: Double): String intl/NumberFormat[JC] def resolvedOptions(): NumberFormatOptions intl/NumberFormat[JC] def supportedLocalesOf(locales: String | js.Array[String], options: js.Any): js.Array[String] diff --git a/api-reports/2_13.txt b/api-reports/2_13.txt index f540f098c..b9e87bf8e 100644 --- a/api-reports/2_13.txt +++ b/api-reports/2_13.txt @@ -27659,7 +27659,7 @@ intl/DateTimeFormatOptions[JT] var timeZone: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var timeZoneName: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var weekday: js.UndefOr[String] intl/DateTimeFormatOptions[JT] var year: js.UndefOr[String] -intl/DateTimeFormatOptions[SO] def apply(localeMatcher: js.UndefOr[String]?, timeZone: js.UndefOr[String]?, hour12: js.UndefOr[Boolean]?, formatMatcher: js.UndefOr[String]?, weekday: js.UndefOr[String]?, era: js.UndefOr[String]?, year: js.UndefOr[String]?, month: js.UndefOr[String]?, day: js.UndefOr[String]?, hour: js.UndefOr[String]?, minute: js.UndefOr[String]?, second: js.UndefOr[String]?, timeZoneName: js.UndefOr[String]?, fractionalSecondDigits: js.UndefOr[Int]?): DateTimeFormatOptions (@deprecated in 2.0.0) +intl/DateTimeFormatOptions[SO] def apply(localeMatcher: js.UndefOr[String]?, timeZone: js.UndefOr[String]?, hour12: js.UndefOr[Boolean]?, formatMatcher: js.UndefOr[String]?, weekday: js.UndefOr[String]?, era: js.UndefOr[String]?, year: js.UndefOr[String]?, month: js.UndefOr[String]?, day: js.UndefOr[String]?, hour: js.UndefOr[String]?, minute: js.UndefOr[String]?, second: js.UndefOr[String]?, timeZoneName: js.UndefOr[String]?): DateTimeFormatOptions (@deprecated in 2.0.0) intl/NumberFormat[JC] def format(number: Double): String intl/NumberFormat[JC] def resolvedOptions(): NumberFormatOptions intl/NumberFormat[JC] def supportedLocalesOf(locales: String | js.Array[String], options: js.Any): js.Array[String] diff --git a/dom/src/main/scala/org/scalajs/dom/intl/DateTimeFormatOptions.scala b/dom/src/main/scala/org/scalajs/dom/intl/DateTimeFormatOptions.scala index 62f944f4c..7cf4d415e 100644 --- a/dom/src/main/scala/org/scalajs/dom/intl/DateTimeFormatOptions.scala +++ b/dom/src/main/scala/org/scalajs/dom/intl/DateTimeFormatOptions.scala @@ -75,7 +75,7 @@ object DateTimeFormatOptions { year: js.UndefOr[String] = js.undefined, month: js.UndefOr[String] = js.undefined, day: js.UndefOr[String] = js.undefined, hour: js.UndefOr[String] = js.undefined, minute: js.UndefOr[String] = js.undefined, second: js.UndefOr[String] = js.undefined, - timeZoneName: js.UndefOr[String] = js.undefined, fractionalSecondDigits: js.UndefOr[Int] = js.undefined + timeZoneName: js.UndefOr[String] = js.undefined ): DateTimeFormatOptions = { val localeMatcher0 = localeMatcher val timeZone0 = timeZone @@ -90,7 +90,6 @@ object DateTimeFormatOptions { val minute0 = minute val second0 = second val timeZoneName0 = timeZoneName - val fractionalSecondDigits0 = fractionalSecondDigits new DateTimeFormatOptions { this.localeMatcher = localeMatcher0 this.timeZone = timeZone0 @@ -105,7 +104,6 @@ object DateTimeFormatOptions { this.minute = minute0 this.second = second0 this.timeZoneName = timeZoneName0 - this.fractionalSecondDigits = fractionalSecondDigits0 } } }