From ccca998f43a73a5829484bc2c4a9b397714f0fb1 Mon Sep 17 00:00:00 2001 From: Szilagyi Adam Date: Sat, 14 Mar 2020 20:06:27 +0100 Subject: [PATCH] Implement Proxy object [[Set]] internal method (#3605) The algorithm is based on ECMA-262 v6, 9.5.9 JerryScript-DCO-1.0-Signed-off-by: Adam Szilagyi aszilagy@inf.u-szeged.hu --- .../ecma/operations/ecma-proxy-object.c | 105 ++++++++++++++- tests/jerry/es2015/proxy_set.js | 122 +++++++++++++++++- 2 files changed, 218 insertions(+), 9 deletions(-) diff --git a/jerry-core/ecma/operations/ecma-proxy-object.c b/jerry-core/ecma/operations/ecma-proxy-object.c index e456b12e4..ad177ba40 100644 --- a/jerry-core/ecma/operations/ecma-proxy-object.c +++ b/jerry-core/ecma/operations/ecma-proxy-object.c @@ -530,8 +530,109 @@ ecma_proxy_object_set (ecma_object_t *obj_p, /**< proxy object */ ecma_value_t receiver) /**< receiver to invoke setter function */ { JERRY_ASSERT (ECMA_OBJECT_IS_PROXY (obj_p)); - JERRY_UNUSED_4 (obj_p, prop_name_p, value, receiver); - return ecma_raise_type_error (ECMA_ERR_MSG ("UNIMPLEMENTED: Proxy.[[Set]]")); + + ecma_proxy_object_t *proxy_obj_p = (ecma_proxy_object_t *) obj_p; + + /* 2. */ + ecma_value_t handler = proxy_obj_p->handler; + + /* 3. */ + if (ecma_is_value_null (handler)) + { + return ecma_raise_type_error (ECMA_ERR_MSG ("Handler can not be null")); + } + + /* 4. */ + JERRY_ASSERT (ecma_is_value_object (handler)); + + /* 5. */ + ecma_value_t target = proxy_obj_p->target; + + /* 6. */ + ecma_value_t trap = ecma_op_get_method_by_magic_id (handler, LIT_MAGIC_STRING_SET); + + /* 7. */ + if (ECMA_IS_VALUE_ERROR (trap)) + { + return trap; + } + + ecma_object_t *target_obj_p = ecma_get_object_from_value (target); + + /* 8. */ + if (ecma_is_value_undefined (trap)) + { + return ecma_op_object_put_with_receiver (target_obj_p, prop_name_p, value, receiver, false); + } + + ecma_object_t *func_obj_p = ecma_get_object_from_value (trap); + ecma_value_t prop_name_value = ecma_make_prop_name_value (prop_name_p); + ecma_value_t args[] = { target, prop_name_value, value, receiver }; + + /* 9. */ + ecma_value_t trap_result = ecma_op_function_call (func_obj_p, handler, args, 4); + + ecma_deref_object (func_obj_p); + + /* 10. */ + if (ECMA_IS_VALUE_ERROR (trap_result)) + { + return trap_result; + } + + bool boolean_trap_result = ecma_op_to_boolean (trap_result); + + ecma_free_value (trap_result); + + /* 11. */ + if (!boolean_trap_result) + { + return ECMA_VALUE_FALSE; + } + + /* 12. */ + ecma_property_descriptor_t target_desc; + + ecma_value_t status = ecma_op_object_get_own_property_descriptor (target_obj_p, prop_name_p, &target_desc); + + /* 13. */ + if (ECMA_IS_VALUE_ERROR (status)) + { + return status; + } + + /* 14. */ + if (ecma_is_value_true (status)) + { + ecma_value_t ret_value = ECMA_VALUE_EMPTY; + + if ((target_desc.flags & ECMA_PROP_IS_VALUE_DEFINED) + && !(target_desc.flags & ECMA_PROP_IS_CONFIGURABLE) + && !(target_desc.flags & ECMA_PROP_IS_WRITABLE) + && !ecma_op_same_value (value, target_desc.value)) + { + ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("The property exists in the proxy target as a" + " non-configurable and non-writable data property" + " with a different value.")); + } + else if (!(target_desc.flags & ECMA_PROP_IS_CONFIGURABLE) + && (target_desc.flags & (ECMA_PROP_IS_GET_DEFINED | ECMA_PROP_IS_SET_DEFINED)) + && target_desc.set_p == NULL) + { + ret_value = ecma_raise_type_error (ECMA_ERR_MSG ("The property exists in the proxy target as a" + " non-configurable accessor property whitout a setter.")); + } + + ecma_free_property_descriptor (&target_desc); + + if (ECMA_IS_VALUE_ERROR (ret_value)) + { + return ret_value; + } + } + + /* 15. */ + return ECMA_VALUE_TRUE; } /* ecma_proxy_object_set */ /** diff --git a/tests/jerry/es2015/proxy_set.js b/tests/jerry/es2015/proxy_set.js index e9feb691a..2fe1134d7 100644 --- a/tests/jerry/es2015/proxy_set.js +++ b/tests/jerry/es2015/proxy_set.js @@ -12,20 +12,128 @@ // See the License for the specific language governing permissions and // limitations under the License. -// TODO: Update these tests when the internal routine has been implemented +// Copyright 2015 the V8 project authors. All rights reserved. +// Use of this source code is governed by a BSD-style license that can be +// found in the LICENSE file. -var target = {}; -var handler = { set (target) { - throw 42; -}}; +// test basic funcionality +function Monster() { + this.eyeCount = 4; +} +var handler = { + set(obj, prop, value) { + if (prop == 'eyeCount') { + obj[prop] = value; + } else { + obj[prop] = "foo"; + } + } +}; + +var monster = new Monster(); +var proxy = new Proxy(monster, handler); + +proxy.eyeCount = 1; +proxy.foo = "bar"; + +assert(monster.eyeCount === 1); +assert(monster.foo === "foo"); + +var target = { foo: "foo"}; +var handler = { + set: function(obj, prop, value) { + obj[prop] = ""; + } +}; var proxy = new Proxy(target, handler); +proxy.foo = 12; +assert(target.foo === ""); + +var properties = ["bla", "0", 1, Symbol(), {[Symbol.toPrimitive]() {return "a"}}]; + +var target = {}; +var handler = {}; +var proxy = new Proxy(target, handler); + +// test when property does not exist on target +for (var p of properties) { + proxy.p = 42; + assert(target.p === 42); +} + +// test when property exists as writable data on target +for (var p of properties) { + Object.defineProperty(target, p, { + writable: true, + value: 24 + }); + + proxy.p = 42; + assert(target.p === 42); +} + +// test when target is a proxy +var target = {}; +var handler = { + set(obj, prop, value) { + obj[prop] = value; + } +}; + +var proxy = new Proxy(target, handler); +var proxy2 = new Proxy(proxy, handler); + +proxy2.prop = "foo"; + +assert(target.prop === "foo"); + +// test when handler is null +var target = {}; +var handler = { + set(obj, prop, value) { + obj[prop] = value; + } +}; + +var revocable = Proxy.revocable (target, {}); +var proxy = revocable.proxy; +revocable.revoke(); + try { - // vm_op_set_value - proxy.a = 5 + proxy.prop = 42; assert(false); } catch (e) { assert(e instanceof TypeError); } +// test when invariants gets violated +var target = {}; +var handler = { set() {return 42} }; +var proxy = new Proxy(target, handler); + +Object.defineProperty(target, "key", { + configurable: false, + writable: false, + value: 0 +}); + +try { + proxy.key = 600; + assert(false); +} catch (e) { + assert(e instanceof TypeError); +} + +Object.defineProperty(target, "key2", { + configurable: false, + set: undefined +}); + +try { + proxy.key2 = 500; + assert(false); +} catch (e) { + assert(e instanceof TypeError); +}