Temporal: Copy options object in Plain{Date,MonthDay,YearMonth}.{from…

…,p.with}
tc39 · Aug 11, 2023 · bcd44ca · bcd44ca
1 parent b37d2b6
commit bcd44ca
Show file tree

Hide file tree

Showing 15 changed files with 203 additions and 45 deletions.
diff --git a/test/built-ins/Temporal/PlainDate/from/observable-get-overflow-argument-string-invalid.js b/test/built-ins/Temporal/PlainDate/from/observable-get-overflow-argument-string-invalid.js
@@ -4,27 +4,18 @@
 /*---
 esid: sec-temporal.plaindate.from
 description: overflow property is extracted with ISO-invalid string argument.
-info: |
-    1. Perform ? ToTemporalOverflow(_options_).
-
-    1. If ! IsValidISODate(year, month, day) is false, throw a RangeError exception.
 includes: [compareArray.js, temporalHelpers.js]
 features: [Temporal]
 ---*/
 
 const expected = [
-  "get overflow",
-  "get overflow.toString",
-  "call overflow.toString",
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
 ];
 
 let actual = [];
-const object = {
-  get overflow() {
-    actual.push("get overflow");
-    return TemporalHelpers.toPrimitiveObserver(actual, "constrain", "overflow");
-  }
-};
+const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
 
-assert.throws(RangeError, () => Temporal.PlainDate.from("2020-13-34", object));
+assert.throws(RangeError, () => Temporal.PlainDate.from("2020-13-34", options));
 assert.compareArray(actual, expected);
diff --git a/test/built-ins/Temporal/PlainDate/from/observable-get-overflow-argument-string.js b/test/built-ins/Temporal/PlainDate/from/observable-get-overflow-argument-string.js
@@ -4,30 +4,31 @@
 /*---
 esid: sec-temporal.plaindate.from
 description: overflow property is extracted with string argument.
-info: |
-    1. Perform ? ToTemporalOverflow(_options_).
 includes: [compareArray.js, temporalHelpers.js]
 features: [Temporal]
 ---*/
 
 const expected = [
-  "get overflow",
-  "get overflow.toString",
-  "call overflow.toString",
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+  "get options.overflow.toString",
+  "call options.overflow.toString",
 ];
 
 let actual = [];
-const object = {
-  get overflow() {
-    actual.push("get overflow");
-    return TemporalHelpers.toPrimitiveObserver(actual, "reject", "overflow");
-  }
-};
+const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
 
-const result = Temporal.PlainDate.from("2021-05-17", object);
+const result = Temporal.PlainDate.from("2021-05-17", options);
 assert.compareArray(actual, expected, "Successful call");
 TemporalHelpers.assertPlainDate(result, 2021, 5, "M05", 17);
 
 actual.splice(0);  // empty it for the next check
-assert.throws(TypeError, () => Temporal.PlainDate.from(7, object));
-assert.compareArray(actual, expected, "Failing call");
+const failureExpected = [
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+];
+
+assert.throws(TypeError, () => Temporal.PlainDate.from(7, options));
+assert.compareArray(actual, failureExpected, "Failing call");
diff --git a/test/built-ins/Temporal/PlainDate/from/order-of-operations.js b/test/built-ins/Temporal/PlainDate/from/order-of-operations.js
@@ -9,6 +9,11 @@ features: [Temporal]
 ---*/
 
 const expected = [
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+  "getOwnPropertyDescriptor options.extra",
+  "get options.extra",
   "get fields.calendar",
   "has fields.calendar.dateAdd",
   "has fields.calendar.dateFromFields",
@@ -48,7 +53,6 @@ const expected = [
   "get fields.calendar.dateFromFields",
   "call fields.calendar.dateFromFields",
   // inside Calendar.p.dateFromFields
-  "get options.overflow",
   "get options.overflow.toString",
   "call options.overflow.toString",
 ];
@@ -63,7 +67,10 @@ const fields = TemporalHelpers.propertyBagObserver(actual, {
   calendar,
 }, "fields");
 
-const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
+const options = TemporalHelpers.propertyBagObserver(actual, {
+  overflow: "constrain",
+  extra: "property",
+}, "options");
 
 const result = Temporal.PlainDate.from(fields, options);
 assert.compareArray(actual, expected, "order of operations");
diff --git a/test/built-ins/Temporal/PlainDate/prototype/with/custom.js b/test/built-ins/Temporal/PlainDate/prototype/with/custom.js
@@ -8,7 +8,9 @@ features: [Temporal]
 ---*/
 
 const result = new Temporal.PlainDate(1920, 5, 3);
-const options = {};
+const options = {
+  extra: "property",
+};
 let calls = 0;
 class CustomCalendar extends Temporal.Calendar {
   constructor() {
@@ -22,7 +24,8 @@ class CustomCalendar extends Temporal.Calendar {
     assert.sameValue(args[0].month, 11, "First argument: month");
     assert.sameValue(args[0].monthCode, "M11", "First argument: monthCode");
     assert.sameValue(args[0].year, 43, "First argument: year");
-    assert.sameValue(args[1], options, "Second argument");
+    assert.notSameValue(args[1], options, "Second argument is a copy of options");
+    assert.sameValue(args[1].extra, "property", "All properties are copied");
     return result;
   }
 }

diff --git a/test/built-ins/Temporal/PlainDate/prototype/with/order-of-operations.js b/test/built-ins/Temporal/PlainDate/prototype/with/order-of-operations.js
@@ -12,6 +12,12 @@ const expected = [
   // RejectObjectWithCalendarOrTimeZone
   "get fields.calendar",
   "get fields.timeZone",
+  // CopyDataProperties
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+  "getOwnPropertyDescriptor options.extra",
+  "get options.extra",
   // CalendarFields
   "get this.calendar.fields",
   "call this.calendar.fields",
@@ -44,7 +50,6 @@ const expected = [
   "get this.calendar.dateFromFields",
   "call this.calendar.dateFromFields",
   // inside Calendar.p.dateFromFields
-  "get options.overflow",
   "get options.overflow.toString",
   "call options.overflow.toString",
 ];
@@ -64,6 +69,7 @@ const fields = TemporalHelpers.propertyBagObserver(actual, {
 
 const options = TemporalHelpers.propertyBagObserver(actual, {
   overflow: "constrain",
+  extra: "property",
 }, "options");
 
 instance.with(fields, options);

diff --git a/.../built-ins/Temporal/PlainMonthDay/from/observable-get-overflow-argument-string-invalid.js b/.../built-ins/Temporal/PlainMonthDay/from/observable-get-overflow-argument-string-invalid.js
@@ -0,0 +1,21 @@
+// Copyright (C) 2023 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainmonthday.from
+description: overflow property is extracted with ISO-invalid string argument.
+includes: [compareArray.js, temporalHelpers.js]
+features: [Temporal]
+---*/
+
+const expected = [
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+];
+
+let actual = [];
+const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
+
+assert.throws(RangeError, () => Temporal.PlainMonthDay.from("13-34", options));
+assert.compareArray(actual, expected);
diff --git a/test/built-ins/Temporal/PlainMonthDay/from/observable-get-overflow-argument-string.js b/test/built-ins/Temporal/PlainMonthDay/from/observable-get-overflow-argument-string.js
@@ -0,0 +1,36 @@
+// Copyright (C) 2023 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainmonthday.from
+description: overflow property is extracted with string argument.
+info: |
+    1. Perform ? ToTemporalOverflow(_options_).
+includes: [compareArray.js, temporalHelpers.js]
+features: [Temporal]
+---*/
+
+const expected = [
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+  "get options.overflow.toString",
+  "call options.overflow.toString",
+];
+
+let actual = [];
+const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
+
+const result = Temporal.PlainMonthDay.from("05-17", options);
+assert.compareArray(actual, expected, "Successful call");
+TemporalHelpers.assertPlainMonthDay(result, "M05", 17);
+
+actual.splice(0);  // empty it for the next check
+const failureExpected = [
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+];
+
+assert.throws(TypeError, () => Temporal.PlainMonthDay.from(7, options));
+assert.compareArray(actual, failureExpected, "Failing call");
diff --git a/test/built-ins/Temporal/PlainMonthDay/from/order-of-operations.js b/test/built-ins/Temporal/PlainMonthDay/from/order-of-operations.js
@@ -9,6 +9,12 @@ features: [Temporal]
 ---*/
 
 const expected = [
+  // CopyDataProperties
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+  "getOwnPropertyDescriptor options.extra",
+  "get options.extra",
   "get fields.calendar",
   "has fields.calendar.dateAdd",
   "has fields.calendar.dateFromFields",
@@ -51,7 +57,6 @@ const expected = [
   "get fields.calendar.monthDayFromFields",
   "call fields.calendar.monthDayFromFields",
   // inside Calendar.p.monthDayFromFields
-  "get options.overflow",
   "get options.overflow.toString",
   "call options.overflow.toString",
 ];
@@ -65,7 +70,10 @@ const fields = TemporalHelpers.propertyBagObserver(actual, {
   calendar: TemporalHelpers.calendarObserver(actual, "fields.calendar"),
 }, "fields");
 
-const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
+const options = TemporalHelpers.propertyBagObserver(actual, {
+  overflow: "constrain",
+  extra: "property",
+}, "options");
 
 Temporal.PlainMonthDay.from(fields, options);
 assert.compareArray(actual, expected, "order of operations");
diff --git a/test/built-ins/Temporal/PlainMonthDay/prototype/with/calendar-arguments.js b/test/built-ins/Temporal/PlainMonthDay/prototype/with/calendar-arguments.js
@@ -12,15 +12,18 @@ includes: [temporalHelpers.js]
 features: [Temporal]
 ---*/
 
-const options = {};
+const options = {
+  extra: "property",
+};
 class CustomCalendar extends Temporal.Calendar {
   constructor() {
     super("iso8601");
   }
   monthDayFromFields(...args) {
     assert.sameValue(args.length, 2, "args.length");
     assert.sameValue(typeof args[0], "object", "args[0]");
-    assert.sameValue(args[1], options, "args[1]");
+    assert.notSameValue(args[1], options, "args[1] is a copy of options");
+    assert.sameValue(args[1].extra, "property", "All properties are copied");
     return super.monthDayFromFields(...args);
   }
 }

diff --git a/test/built-ins/Temporal/PlainMonthDay/prototype/with/order-of-operations.js b/test/built-ins/Temporal/PlainMonthDay/prototype/with/order-of-operations.js
@@ -12,6 +12,12 @@ const expected = [
   // RejectObjectWithCalendarOrTimeZone
   "get fields.calendar",
   "get fields.timeZone",
+  // CopyDataProperties
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+  "getOwnPropertyDescriptor options.extra",
+  "get options.extra",
   // CalendarFields
   "get this.calendar.fields",
   "call this.calendar.fields",
@@ -40,7 +46,6 @@ const expected = [
   "get this.calendar.monthDayFromFields",
   "call this.calendar.monthDayFromFields",
   // inside Calendar.p.monthDayFromFields
-  "get options.overflow",
   "get options.overflow.toString",
   "call options.overflow.toString",
 ];
@@ -58,7 +63,10 @@ const fields = TemporalHelpers.propertyBagObserver(actual, {
   day: 1.7,
 }, "fields");
 
-const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
+const options = TemporalHelpers.propertyBagObserver(actual, {
+  overflow: "constrain",
+  extra: "property",
+}, "options");
 
 instance.with(fields, options);
 assert.compareArray(actual, expected, "order of operations");
diff --git a/...built-ins/Temporal/PlainYearMonth/from/observable-get-overflow-argument-string-invalid.js b/...built-ins/Temporal/PlainYearMonth/from/observable-get-overflow-argument-string-invalid.js
@@ -0,0 +1,21 @@
+// Copyright (C) 2023 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.from
+description: overflow property is extracted with ISO-invalid string argument.
+includes: [compareArray.js, temporalHelpers.js]
+features: [Temporal]
+---*/
+
+const expected = [
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+];
+
+let actual = [];
+const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
+
+assert.throws(RangeError, () => Temporal.PlainYearMonth.from("2020-13", options));
+assert.compareArray(actual, expected);
diff --git a/test/built-ins/Temporal/PlainYearMonth/from/observable-get-overflow-argument-string.js b/test/built-ins/Temporal/PlainYearMonth/from/observable-get-overflow-argument-string.js
@@ -0,0 +1,34 @@
+// Copyright (C) 2023 Igalia, S.L. All rights reserved.
+// This code is governed by the BSD license found in the LICENSE file.
+
+/*---
+esid: sec-temporal.plainyearmonth.from
+description: overflow property is extracted with string argument.
+includes: [compareArray.js, temporalHelpers.js]
+features: [Temporal]
+---*/
+
+const expected = [
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+  "get options.overflow.toString",
+  "call options.overflow.toString",
+];
+
+let actual = [];
+const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
+
+const result = Temporal.PlainYearMonth.from("2021-05", options);
+assert.compareArray(actual, expected, "Successful call");
+TemporalHelpers.assertPlainYearMonth(result, 2021, 5, "M05");
+
+actual.splice(0);  // empty it for the next check
+const failureExpected = [
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+];
+
+assert.throws(TypeError, () => Temporal.PlainYearMonth.from(7, options));
+assert.compareArray(actual, failureExpected, "Failing call");
diff --git a/test/built-ins/Temporal/PlainYearMonth/from/order-of-operations.js b/test/built-ins/Temporal/PlainYearMonth/from/order-of-operations.js
@@ -9,6 +9,12 @@ features: [Temporal]
 ---*/
 
 const expected = [
+  // CopyDataProperties
+  "ownKeys options",
+  "getOwnPropertyDescriptor options.overflow",
+  "get options.overflow",
+  "getOwnPropertyDescriptor options.extra",
+  "get options.extra",
   // GetTemporalCalendarSlotValueWithISODefault
   "get fields.calendar",
   "has fields.calendar.dateAdd",
@@ -49,7 +55,6 @@ const expected = [
   "get fields.calendar.yearMonthFromFields",
   "call fields.calendar.yearMonthFromFields",
   // inside Calendar.p.yearMonthFromFields
-  "get options.overflow",
   "get options.overflow.toString",
   "call options.overflow.toString",
 ];
@@ -62,7 +67,10 @@ const fields = TemporalHelpers.propertyBagObserver(actual, {
   calendar: TemporalHelpers.calendarObserver(actual, "fields.calendar"),
 }, "fields");
 
-const options = TemporalHelpers.propertyBagObserver(actual, { overflow: "constrain" }, "options");
+const options = TemporalHelpers.propertyBagObserver(actual, {
+  overflow: "constrain",
+  extra: "property",
+}, "options");
 
 Temporal.PlainYearMonth.from(fields, options);
 assert.compareArray(actual, expected, "order of operations");