always use defineProperty() for name

TooTallNate · Jan 27, 2017 · 55716fd · 55716fd
1 parent 786b739
commit 55716fd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/lib/ref.js b/lib/ref.js
@@ -306,12 +306,12 @@ exports.refType = function refType (type) {
   var rtn = Object.create(_type)
   rtn.indirection++
   if (_type.name) {
-    var props = Object.getOwnPropertyDescriptor(_type, "name")
-    if (props && props.writable === false) {
-      props.writable = true
-      Object.defineProperty(rtn, "name", props)
-    }
-    rtn.name = _type.name + '*'
+    Object.defineProperty(rtn, 'name', {
+      value: _type.name + '*',
+      configurable: true,
+      enumerable: true,
+      writable: true
+    })
   }
   return rtn
 }

diff --git a/test/types.js b/test/types.js
@@ -27,14 +27,19 @@ describe('types', function () {
       StructType.indirection = 0
 
       // read-only name property
-      var oldProp = Object.getOwnPropertyDescriptor(StructType, "name")
-      assert.equal(oldProp.writable, false)
+      assert.equal(StructType.name, 'StructType')
+      try {
+        StructType.name = 'foo'
+      } catch (err) {
+        // ignore
+      }
+      assert.equal(StructType.name, 'StructType')
 
       // name property should be writable and updated
       var newObj = ref.refType(StructType)
-      var newProp = Object.getOwnPropertyDescriptor(newObj, "name")
+      var newProp = Object.getOwnPropertyDescriptor(newObj, 'name')
       assert.equal(newProp.writable, true)
-      assert.equal(newObj.name, "StructType*")
+      assert.equal(newObj.name, 'StructType*')
     })
   })