[Fix] CreateDataProperty: update an existing property

See es-shims/Object.fromEntries#6
ljharb · Mar 22, 2020 · bdd77b5 · bdd77b5
1 parent 920a682
commit bdd77b5
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 11 deletions.
diff --git a/2015/CreateDataProperty.js b/2015/CreateDataProperty.js
@@ -24,8 +24,8 @@ module.exports = function CreateDataProperty(O, P, V) {
 		throw new $TypeError('Assertion failed: IsPropertyKey(P) is not true');
 	}
 	var oldDesc = OrdinaryGetOwnProperty(O, P);
-	var extensible = oldDesc || IsExtensible(O);
-	var immutable = oldDesc && (!oldDesc.writable || !oldDesc.configurable);
+	var extensible = !oldDesc || IsExtensible(O);
+	var immutable = oldDesc && (!oldDesc['[[Writable]]'] || !oldDesc['[[Configurable]]']);
 	if (immutable || !extensible) {
 		return false;
 	}

diff --git a/2016/CreateDataProperty.js b/2016/CreateDataProperty.js
@@ -24,8 +24,8 @@ module.exports = function CreateDataProperty(O, P, V) {
 		throw new $TypeError('Assertion failed: IsPropertyKey(P) is not true');
 	}
 	var oldDesc = OrdinaryGetOwnProperty(O, P);
-	var extensible = oldDesc || IsExtensible(O);
-	var immutable = oldDesc && (!oldDesc.writable || !oldDesc.configurable);
+	var extensible = !oldDesc || IsExtensible(O);
+	var immutable = oldDesc && (!oldDesc['[[Writable]]'] || !oldDesc['[[Configurable]]']);
 	if (immutable || !extensible) {
 		return false;
 	}

diff --git a/2017/CreateDataProperty.js b/2017/CreateDataProperty.js
@@ -24,8 +24,8 @@ module.exports = function CreateDataProperty(O, P, V) {
 		throw new $TypeError('Assertion failed: IsPropertyKey(P) is not true');
 	}
 	var oldDesc = OrdinaryGetOwnProperty(O, P);
-	var extensible = oldDesc || IsExtensible(O);
-	var immutable = oldDesc && (!oldDesc.writable || !oldDesc.configurable);
+	var extensible = !oldDesc || IsExtensible(O);
+	var immutable = oldDesc && (!oldDesc['[[Writable]]'] || !oldDesc['[[Configurable]]']);
 	if (immutable || !extensible) {
 		return false;
 	}

diff --git a/2018/CreateDataProperty.js b/2018/CreateDataProperty.js
@@ -24,8 +24,8 @@ module.exports = function CreateDataProperty(O, P, V) {
 		throw new $TypeError('Assertion failed: IsPropertyKey(P) is not true');
 	}
 	var oldDesc = OrdinaryGetOwnProperty(O, P);
-	var extensible = oldDesc || IsExtensible(O);
-	var immutable = oldDesc && (!oldDesc.writable || !oldDesc.configurable);
+	var extensible = !oldDesc || IsExtensible(O);
+	var immutable = oldDesc && (!oldDesc['[[Writable]]'] || !oldDesc['[[Configurable]]']);
 	if (immutable || !extensible) {
 		return false;
 	}

diff --git a/2019/CreateDataProperty.js b/2019/CreateDataProperty.js
@@ -24,8 +24,8 @@ module.exports = function CreateDataProperty(O, P, V) {
 		throw new $TypeError('Assertion failed: IsPropertyKey(P) is not true');
 	}
 	var oldDesc = OrdinaryGetOwnProperty(O, P);
-	var extensible = oldDesc || IsExtensible(O);
-	var immutable = oldDesc && (!oldDesc.writable || !oldDesc.configurable);
+	var extensible = !oldDesc || IsExtensible(O);
+	var immutable = oldDesc && (!oldDesc['[[Writable]]'] || !oldDesc['[[Configurable]]']);
 	if (immutable || !extensible) {
 		return false;
 	}

diff --git a/test/tests.js b/test/tests.js
@@ -1430,7 +1430,8 @@ var es2015 = function ES2015(ES, ops, expectedMissing, skips) {
 			);
 		});
 
-		var sentinel = {};
+		var sentinel = { id: 'sentinel' };
+		var secondSentinel = { id: 'second sentinel' };
 		forEach(v.propertyKeys, function (propertyKey) {
 			var obj = {};
 			var status = ES.CreateDataProperty(obj, propertyKey, sentinel);
@@ -1440,6 +1441,13 @@ var es2015 = function ES2015(ES, ops, expectedMissing, skips) {
 				sentinel,
 				debug(sentinel) + ' is installed on "' + debug(propertyKey) + '" on the object'
 			);
+			var secondStatus = ES.CreateDataProperty(obj, propertyKey, secondSentinel);
+			t.equal(secondStatus, true, 'second status is true');
+			t.equal(
+				obj[propertyKey],
+				secondSentinel,
+				debug(secondSentinel) + ' is installed on "' + debug(propertyKey) + '" on the object'
+			);
 
 			t.test('with defineProperty', { skip: !defineProperty.oDP }, function (st) {
 				var nonWritable = defineProperty({}, propertyKey, { configurable: true, writable: false });