Temporal: Test change from MergeLargestUnitOption to CopyDataProperties

This tests some of the normative changes in tc39/proposal-temporal#2245, which achieved consensus in the July 2022 TC39 meeting, specifically as they apply to places where the MergeLargestUnitOperation was called. Due to the use of the pre-existing spec operation CopyDataProperties, the order of observable property operations has changed from a batch of [[GetOwnProperty]] followed by a batch of [[Get]], to a series of interleaved [[GetOwnProperty]]/[[Get]] pairs. This previously wasn't tested because TemporalHelpers.propertyBagObserver didn't track [[GetOwnProperty]] operations, but now it does.
tc39 · Oct 20, 2022 · 99bc91e · 99bc91e
1 parent dfbeca3
commit 99bc91e
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 8 deletions.
diff --git a/harness/temporalHelpers.js b/harness/temporalHelpers.js
@@ -1612,6 +1612,10 @@ var TemporalHelpers = {
         calls.push(`ownKeys ${objectName}`);
         return Reflect.ownKeys(target);
       },
+      getOwnPropertyDescriptor(target, key) {
+        calls.push(`getOwnPropertyDescriptor ${formatPropertyName(key, objectName)}`);
+        return Reflect.getOwnPropertyDescriptor(target, key);
+      },
       get(target, key, receiver) {
         calls.push(`get ${formatPropertyName(key, objectName)}`);
         const result = Reflect.get(target, key, receiver);

diff --git a/test/built-ins/Temporal/PlainDate/prototype/since/order-of-operations.js b/test/built-ins/Temporal/PlainDate/prototype/since/order-of-operations.js
@@ -48,12 +48,17 @@ const expected = [
   "get options.roundingIncrement",
   "get options.roundingIncrement.valueOf",
   "call options.roundingIncrement.valueOf",
-  // MergeLargestUnitOption
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.roundingIncrement",
   "get options.roundingIncrement",
+  "getOwnPropertyDescriptor options.roundingMode",
   "get options.roundingMode",
+  "getOwnPropertyDescriptor options.largestUnit",
   "get options.largestUnit",
+  "getOwnPropertyDescriptor options.smallestUnit",
   "get options.smallestUnit",
+  "getOwnPropertyDescriptor options.additional",
   "get options.additional",
   // CalendarDateUntil
   "get this.calendar.dateUntil",

diff --git a/test/built-ins/Temporal/PlainDate/prototype/until/order-of-operations.js b/test/built-ins/Temporal/PlainDate/prototype/until/order-of-operations.js
@@ -48,12 +48,17 @@ const expected = [
   "get options.roundingIncrement",
   "get options.roundingIncrement.valueOf",
   "call options.roundingIncrement.valueOf",
-  // MergeLargestUnitOption
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.roundingIncrement",
   "get options.roundingIncrement",
+  "getOwnPropertyDescriptor options.roundingMode",
   "get options.roundingMode",
+  "getOwnPropertyDescriptor options.largestUnit",
   "get options.largestUnit",
+  "getOwnPropertyDescriptor options.smallestUnit",
   "get options.smallestUnit",
+  "getOwnPropertyDescriptor options.additional",
   "get options.additional",
   // CalendarDateUntil
   "get this.calendar.dateUntil",

diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/since/order-of-operations.js b/test/built-ins/Temporal/PlainDateTime/prototype/since/order-of-operations.js
@@ -66,12 +66,17 @@ const expected = [
   "get options.roundingIncrement",
   "get options.roundingIncrement.valueOf",
   "call options.roundingIncrement.valueOf",
-  // MergeLargestUnitOption
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.roundingIncrement",
   "get options.roundingIncrement",
+  "getOwnPropertyDescriptor options.roundingMode",
   "get options.roundingMode",
+  "getOwnPropertyDescriptor options.largestUnit",
   "get options.largestUnit",
+  "getOwnPropertyDescriptor options.smallestUnit",
   "get options.smallestUnit",
+  "getOwnPropertyDescriptor options.additional",
   "get options.additional",
   // CalendarDateUntil
   "get this.calendar.dateUntil",

diff --git a/test/built-ins/Temporal/PlainDateTime/prototype/until/order-of-operations.js b/test/built-ins/Temporal/PlainDateTime/prototype/until/order-of-operations.js
@@ -66,12 +66,17 @@ const expected = [
   "get options.roundingIncrement",
   "get options.roundingIncrement.valueOf",
   "call options.roundingIncrement.valueOf",
-  // MergeLargestUnitOption
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.roundingIncrement",
   "get options.roundingIncrement",
+  "getOwnPropertyDescriptor options.roundingMode",
   "get options.roundingMode",
+  "getOwnPropertyDescriptor options.largestUnit",
   "get options.largestUnit",
+  "getOwnPropertyDescriptor options.smallestUnit",
   "get options.smallestUnit",
+  "getOwnPropertyDescriptor options.additional",
   "get options.additional",
   // CalendarDateUntil
   "get this.calendar.dateUntil",

diff --git a/test/built-ins/Temporal/PlainYearMonth/prototype/add/calendar-arguments-extra-options.js b/test/built-ins/Temporal/PlainYearMonth/prototype/add/calendar-arguments-extra-options.js
@@ -14,9 +14,14 @@ features: [Temporal]
 
 const actual = [];
 const expected = [
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.extra",
   "get options.extra",
+  // Temporal.Calendar.prototype.dateAdd
   "get options.overflow",
+  // overwriting property in custom calendar dateAdd
+  "getOwnPropertyDescriptor options.overflow",
 ];
 const options = TemporalHelpers.propertyBagObserver(actual, { extra: 5 }, "options");
 

diff --git a/test/built-ins/Temporal/PlainYearMonth/prototype/add/calendar-arguments.js b/test/built-ins/Temporal/PlainYearMonth/prototype/add/calendar-arguments.js
@@ -14,11 +14,17 @@ features: [Temporal]
 
 const actual = [];
 const expected = [
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
   "get options.overflow",
+  // Temporal.Calendar.prototype.dateAdd
   "get options.overflow",
   "get options.overflow.toString",
   "call options.overflow.toString",
+  // overwriting property in custom calendar dateAdd
+  "getOwnPropertyDescriptor options.overflow",
+  // Temporal.Calendar.prototype.yearMonthFromFields (toPrimitiveObserver copied but not options object)
   "get options.overflow.toString",
   "call options.overflow.toString",
 ];

diff --git a/test/built-ins/Temporal/PlainYearMonth/prototype/since/order-of-operations.js b/test/built-ins/Temporal/PlainYearMonth/prototype/since/order-of-operations.js
@@ -60,12 +60,17 @@ const expected = [
   "call this.calendar.year",
   "get this.calendar.dateFromFields",
   "call this.calendar.dateFromFields",
-  // MergeLargestUnitOption
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.roundingIncrement",
   "get options.roundingIncrement",
+  "getOwnPropertyDescriptor options.roundingMode",
   "get options.roundingMode",
+  "getOwnPropertyDescriptor options.largestUnit",
   "get options.largestUnit",
+  "getOwnPropertyDescriptor options.smallestUnit",
   "get options.smallestUnit",
+  "getOwnPropertyDescriptor options.additional",
   "get options.additional",
   // CalendarDateUntil
   "get this.calendar.dateUntil",

diff --git a/.../built-ins/Temporal/PlainYearMonth/prototype/subtract/calendar-arguments-extra-options.js b/.../built-ins/Temporal/PlainYearMonth/prototype/subtract/calendar-arguments-extra-options.js
@@ -14,9 +14,14 @@ features: [Temporal]
 
 const actual = [];
 const expected = [
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.extra",
   "get options.extra",
+  // Temporal.Calendar.prototype.dateAdd
   "get options.overflow",
+  // overwriting property in custom calendar dateAdd
+  "getOwnPropertyDescriptor options.overflow",
 ];
 const options = TemporalHelpers.propertyBagObserver(actual, { extra: 5 }, "options");
 

diff --git a/test/built-ins/Temporal/PlainYearMonth/prototype/subtract/calendar-arguments.js b/test/built-ins/Temporal/PlainYearMonth/prototype/subtract/calendar-arguments.js
@@ -14,11 +14,17 @@ features: [Temporal]
 
 const actual = [];
 const expected = [
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
   "get options.overflow",
+  // Temporal.Calendar.prototype.dateAdd
   "get options.overflow",
   "get options.overflow.toString",
   "call options.overflow.toString",
+  // overwriting property in custom calendar dateAdd
+  "getOwnPropertyDescriptor options.overflow",
+  // Temporal.Calendar.prototype.yearMonthFromFields (toPrimitiveObserver copied but not options object)
   "get options.overflow.toString",
   "call options.overflow.toString",
 ];

diff --git a/test/built-ins/Temporal/PlainYearMonth/prototype/until/order-of-operations.js b/test/built-ins/Temporal/PlainYearMonth/prototype/until/order-of-operations.js
@@ -60,12 +60,17 @@ const expected = [
   "call this.calendar.year",
   "get this.calendar.dateFromFields",
   "call this.calendar.dateFromFields",
-  // MergeLargestUnitOption
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.roundingIncrement",
   "get options.roundingIncrement",
+  "getOwnPropertyDescriptor options.roundingMode",
   "get options.roundingMode",
+  "getOwnPropertyDescriptor options.largestUnit",
   "get options.largestUnit",
+  "getOwnPropertyDescriptor options.smallestUnit",
   "get options.smallestUnit",
+  "getOwnPropertyDescriptor options.additional",
   "get options.additional",
   // CalendarDateUntil
   "get this.calendar.dateUntil",

diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/since/order-of-operations.js b/test/built-ins/Temporal/ZonedDateTime/prototype/since/order-of-operations.js
@@ -122,12 +122,17 @@ const expectedOpsForCalendarDifference = [
   "get other.timeZone[Symbol.toPrimitive]",
   "get other.timeZone.toString",
   "call other.timeZone.toString",
-  // MergeLargestUnitOption
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.roundingIncrement",
   "get options.roundingIncrement",
+  "getOwnPropertyDescriptor options.roundingMode",
   "get options.roundingMode",
+  "getOwnPropertyDescriptor options.largestUnit",
   "get options.largestUnit",
+  "getOwnPropertyDescriptor options.smallestUnit",
   "get options.smallestUnit",
+  "getOwnPropertyDescriptor options.additional",
   "get options.additional",
   // DifferenceZonedDateTime
   "get this.timeZone.getOffsetNanosecondsFor",

diff --git a/test/built-ins/Temporal/ZonedDateTime/prototype/until/order-of-operations.js b/test/built-ins/Temporal/ZonedDateTime/prototype/until/order-of-operations.js
@@ -122,12 +122,17 @@ const expectedOpsForCalendarDifference = [
   "get other.timeZone[Symbol.toPrimitive]",
   "get other.timeZone.toString",
   "call other.timeZone.toString",
-  // MergeLargestUnitOption
+  // CopyDataProperties
   "ownKeys options",
+  "getOwnPropertyDescriptor options.roundingIncrement",
   "get options.roundingIncrement",
+  "getOwnPropertyDescriptor options.roundingMode",
   "get options.roundingMode",
+  "getOwnPropertyDescriptor options.largestUnit",
   "get options.largestUnit",
+  "getOwnPropertyDescriptor options.smallestUnit",
   "get options.smallestUnit",
+  "getOwnPropertyDescriptor options.additional",
   "get options.additional",
   // DifferenceZonedDateTime
   "get this.timeZone.getOffsetNanosecondsFor",