Remove getter existence check from assignCommonNamespaceHandlerTraps(…

…) error guard. [closes #773]
standard-things · Mar 30, 2019 · a48ba8a · a48ba8a
1 parent 0799513
commit a48ba8a
Showing 1 changed file with 13 additions and 5 deletions.
diff --git a/src/entry.js b/src/entry.js
@@ -708,10 +708,16 @@ function assignCommonNamespaceHandlerTraps(handler, entry, proxy) {
     const getter = getters[name]
     const hasGetter = getter !== void 0
 
-    const errored =
-      ! hasGetter ||
-      entry._namespaceFinalized !== NAMESPACE_FINALIZATION_COMPLETED ||
-      getter() === ERROR_GETTER
+    let getterValue
+    let errored = entry._namespaceFinalized !== NAMESPACE_FINALIZATION_COMPLETED
+    let getterCalled = false
+
+    if (! errored &&
+        hasGetter) {
+      getterCalled = true
+      getterValue = getter()
+      errored = getterValue === ERROR_GETTER
+    }
 
     if (errored &&
         typeof name === "string" &&
@@ -728,7 +734,9 @@ function assignCommonNamespaceHandlerTraps(handler, entry, proxy) {
     }
 
     if (hasGetter) {
-      return getter()
+      return getterCalled
+        ? getterValue
+        : getter()
     }
 
     if (receiver === proxy) {