fixup! remove ArrayBufferLike common ancestor

Author: KevinEady

doc/array_buffer.md

@@ -1,6 +1,6 @@
 # ArrayBuffer
 
-Class `Napi::ArrayBuffer` inherits from class [`Napi::ArrayBufferLike`][].
+Class `Napi::ArrayBuffer` inherits from class [`Napi::Object`][].
 
 The `Napi::ArrayBuffer` class corresponds to the
 [JavaScript `ArrayBuffer`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/ArrayBuffer)
@@ -128,6 +128,22 @@ Napi::ArrayBuffer::ArrayBuffer(napi_env env, napi_value value);
 - `[in] env`: The environment in which to create the `Napi::ArrayBuffer` instance.
 - `[in] value`: The `Napi::ArrayBuffer` reference to wrap.
 
+### ByteLength
+
+```cpp
+size_t Napi::ArrayBuffer::ByteLength() const;
+```
+
+Returns the length of the wrapped data, in bytes.
+
+### Data
+
+```cpp
+void* Napi::ArrayBuffer::Data() const;
+```
+
+Returns a pointer the wrapped data.
+
 ### Detach
 
 ```cpp
@@ -144,6 +160,6 @@ bool Napi::ArrayBuffer::IsDetached() const;
 
 Returns `true` if this `ArrayBuffer` has been detached.
 
-[`Napi::ArrayBufferLike`]: ./array_buffer_like.md
+[`Napi::Object`]: ./object.md
 [External Buffer]: ./external_buffer.md
 [Finalization]: ./finalization.md

doc/array_buffer_like.md

@@ -1,6 +1,6 @@
 # SharedArrayBuffer
 
-Class `Napi::SharedArrayBuffer` inherits from class [`Napi::ArrayBufferLike`][].
+Class `Napi::SharedArrayBuffer` inherits from class [`Napi::Object`][].
 
 The `Napi::SharedArrayBuffer` class corresponds to the
 [JavaScript `SharedArrayBuffer`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/SharedArrayBuffer)
@@ -46,4 +46,20 @@ Napi::SharedArrayBuffer::SharedArrayBuffer(napi_env env, napi_value value);
   instance.
 - `[in] value`: The `Napi::SharedArrayBuffer` reference to wrap.
 
-[`Napi::ArrayBufferLike`]: ./array_buffer_like.md
+### ByteLength
+
+```cpp
+size_t Napi::SharedArrayBuffer::ByteLength() const;
+```
+
+Returns the length of the wrapped data, in bytes.
+
+### Data
+
+```cpp
+void* Napi::SharedArrayBuffer::Data() const;
+```
+
+Returns a pointer the wrapped data.
+
+[`Napi::Object`]: ./object.md

doc/shared_array_buffer.md

@@ -2081,35 +2081,15 @@ inline uint32_t Array::Length() const {
   return result;
 }
 
-inline ArrayBufferLike::ArrayBufferLike() : Object() {}
-
-inline ArrayBufferLike::ArrayBufferLike(napi_env env, napi_value value)
-    : Object(env, value) {}
-
-inline void* ArrayBufferLike::Data() {
-  void* data;
-  napi_status status = napi_get_arraybuffer_info(_env, _value, &data, nullptr);
-  NAPI_THROW_IF_FAILED(_env, status, nullptr);
-  return data;
-}
-
-inline size_t ArrayBufferLike::ByteLength() {
-  size_t length;
-  napi_status status =
-      napi_get_arraybuffer_info(_env, _value, nullptr, &length);
-  NAPI_THROW_IF_FAILED(_env, status, 0);
-  return length;
-}
-
 #ifdef NODE_API_EXPERIMENTAL_HAS_SHAREDARRAYBUFFER
 ////////////////////////////////////////////////////////////////////////////////
 // SharedArrayBuffer class
 ////////////////////////////////////////////////////////////////////////////////
 
-inline SharedArrayBuffer::SharedArrayBuffer() : ArrayBufferLike() {}
+inline SharedArrayBuffer::SharedArrayBuffer() : Object() {}
 
 inline SharedArrayBuffer::SharedArrayBuffer(napi_env env, napi_value value)
-    : ArrayBufferLike(env, value) {}
+    : Object(env, value) {}
 
 inline void SharedArrayBuffer::CheckCast(napi_env env, napi_value value) {
   NAPI_CHECK(value != nullptr, "SharedArrayBuffer::CheckCast", "empty value");
@@ -2133,6 +2113,21 @@ inline SharedArrayBuffer SharedArrayBuffer::New(napi_env env,
 
   return SharedArrayBuffer(env, value);
 }
+
+inline void* SharedArrayBuffer::Data() {
+  void* data;
+  napi_status status = napi_get_arraybuffer_info(_env, _value, &data, nullptr);
+  NAPI_THROW_IF_FAILED(_env, status, nullptr);
+  return data;
+}
+
+inline size_t SharedArrayBuffer::ByteLength() {
+  size_t length;
+  napi_status status =
+      napi_get_arraybuffer_info(_env, _value, nullptr, &length);
+  NAPI_THROW_IF_FAILED(_env, status, 0);
+  return length;
+}
 #endif  // NODE_API_EXPERIMENTAL_HAS_SHAREDARRAYBUFFER
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -2221,10 +2216,25 @@ inline void ArrayBuffer::CheckCast(napi_env env, napi_value value) {
   NAPI_CHECK(result, "ArrayBuffer::CheckCast", "value is not arraybuffer");
 }
 
-inline ArrayBuffer::ArrayBuffer() : ArrayBufferLike() {}
+inline ArrayBuffer::ArrayBuffer() : Object() {}
 
 inline ArrayBuffer::ArrayBuffer(napi_env env, napi_value value)
-    : ArrayBufferLike(env, value) {}
+    : Object(env, value) {}
+
+inline void* ArrayBuffer::Data() {
+  void* data;
+  napi_status status = napi_get_arraybuffer_info(_env, _value, &data, nullptr);
+  NAPI_THROW_IF_FAILED(_env, status, nullptr);
+  return data;
+}
+
+inline size_t ArrayBuffer::ByteLength() {
+  size_t length;
+  napi_status status =
+      napi_get_arraybuffer_info(_env, _value, nullptr, &length);
+  NAPI_THROW_IF_FAILED(_env, status, 0);
+  return length;
+}
 
 #if NAPI_VERSION >= 7
 inline bool ArrayBuffer::IsDetached() const {

napi-inl.h

@@ -1205,30 +1205,23 @@ class Object::iterator {
 };
 #endif  // NODE_ADDON_API_CPP_EXCEPTIONS
 
-class ArrayBufferLike : public Object {
- public:
-  void* Data();
-  size_t ByteLength();
-
- protected:
-  ArrayBufferLike();
-  ArrayBufferLike(napi_env env, napi_value value);
-};
-
 #ifdef NODE_API_EXPERIMENTAL_HAS_SHAREDARRAYBUFFER
-class SharedArrayBuffer : public ArrayBufferLike {
+class SharedArrayBuffer : public Object {
  public:
   SharedArrayBuffer();
   SharedArrayBuffer(napi_env env, napi_value value);
 
   static SharedArrayBuffer New(napi_env env, size_t byteLength);
 
   static void CheckCast(napi_env env, napi_value value);
+
+  void* Data();
+  size_t ByteLength();
 };
 #endif
 
 /// A JavaScript array buffer value.
-class ArrayBuffer : public ArrayBufferLike {
+class ArrayBuffer : public Object {
  public:
   /// Creates a new ArrayBuffer instance over a new automatically-allocated
   /// buffer.
@@ -1289,6 +1282,9 @@ class ArrayBuffer : public ArrayBufferLike {
   ArrayBuffer(napi_env env,
               napi_value value);  ///< Wraps a Node-API value primitive.
 
+  void* Data();         ///< Gets a pointer to the data buffer.
+  size_t ByteLength();  ///< Gets the length of the array buffer in bytes.
+
 #if NAPI_VERSION >= 7
   bool IsDetached() const;
   void Detach();