Support passing a descriptor to various utils.

standard-things · Sep 4, 2018 · 6ce0385 · 6ce0385
1 parent 1bcc936
commit 6ce0385
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 8 deletions.
diff --git a/src/util/get-getter.js b/src/util/get-getter.js
@@ -4,8 +4,13 @@ function init() {
   const { __lookupGetter__ } = Object.prototype
 
   function getGetter(object, name) {
-    if (! shared.support.lookupShadowed) {
-      const descriptor = Reflect.getOwnPropertyDescriptor(object, name)
+    const useAsDescriptor = name === void 0
+
+    if (useAsDescriptor ||
+        ! shared.support.lookupShadowed) {
+      const descriptor = useAsDescriptor
+        ? object
+        : Reflect.getOwnPropertyDescriptor(object, name)
 
       if (! descriptor ||
           ! descriptor.get) {

diff --git a/src/util/get-setter.js b/src/util/get-setter.js
@@ -4,8 +4,13 @@ function init() {
   const { __lookupSetter__ } = Object.prototype
 
   function getSetter(object, name) {
-    if (! shared.support.lookupShadowed) {
-      const descriptor = Reflect.getOwnPropertyDescriptor(object, name)
+    const useAsDescriptor = name === void 0
+
+    if (useAsDescriptor ||
+        ! shared.support.lookupShadowed) {
+      const descriptor = useAsDescriptor
+        ? object
+        : Reflect.getOwnPropertyDescriptor(object, name)
 
       if (! descriptor ||
           ! descriptor.set) {

diff --git a/src/util/is-data-property.js b/src/util/is-data-property.js
@@ -4,8 +4,15 @@ import shared from "../shared.js"
 
 function init() {
   function isDataProperty(object, name) {
-    return isObjectLike(object) &&
-      isDataPropertyDescriptor(Reflect.getOwnPropertyDescriptor(object, name))
+    if (! isObjectLike(object)) {
+      return false
+    }
+
+    const descriptor = name === void 0
+      ? object
+      : Reflect.getOwnPropertyDescriptor(object, name)
+
+    return isDataPropertyDescriptor(descriptor)
   }
 
   return isDataProperty

diff --git a/src/util/is-updatable-get.js b/src/util/is-updatable-get.js
@@ -2,7 +2,9 @@ import shared from "../shared.js"
 
 function init() {
   function isUpdatableGet(object, name) {
-    const descriptor = Reflect.getOwnPropertyDescriptor(object, name)
+    const descriptor = name === void 0
+      ? object
+      : Reflect.getOwnPropertyDescriptor(object, name)
 
     if (descriptor) {
       // Section 9.5.8: [[Get]]()

diff --git a/src/util/is-updatable-set.js b/src/util/is-updatable-set.js
@@ -2,7 +2,9 @@ import shared from "../shared.js"
 
 function init() {
   function isUpdatableSet(object, name) {
-    const descriptor = Reflect.getOwnPropertyDescriptor(object, name)
+    const descriptor = name === void 0
+      ? object
+      : Reflect.getOwnPropertyDescriptor(object, name)
 
     if (descriptor) {
       // Section 9.5.9: [[Set]]()