src: remove TypedArray::unknown_array_type

PR-URL: #1209 Reviewed-By: Michael Dawson <[email protected]>
nodejs · Oct 14, 2022 · a8afb2d · a8afb2d
1 parent 257a52f
commit a8afb2d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 29 deletions.
diff --git a/napi-inl.h b/napi-inl.h
@@ -2003,19 +2003,13 @@ inline void DataView::WriteData(size_t byteOffset, T value) const {
 ////////////////////////////////////////////////////////////////////////////////
 
 inline TypedArray::TypedArray()
-    : Object(), _type(TypedArray::unknown_array_type), _length(0) {}
+    : Object(), _type(napi_typedarray_type::napi_int8_array), _length(0) {}
 
 inline TypedArray::TypedArray(napi_env env, napi_value value)
-    : Object(env, value), _type(TypedArray::unknown_array_type), _length(0) {}
-
-inline TypedArray::TypedArray(napi_env env,
-                              napi_value value,
-                              napi_typedarray_type type,
-                              size_t length)
-    : Object(env, value), _type(type), _length(length) {}
-
-inline napi_typedarray_type TypedArray::TypedArrayType() const {
-  if (_type == TypedArray::unknown_array_type) {
+    : Object(env, value),
+      _type(napi_typedarray_type::napi_int8_array),
+      _length(0) {
+  if (value != nullptr) {
     napi_status status =
         napi_get_typedarray_info(_env,
                                  _value,
@@ -2024,14 +2018,22 @@ inline napi_typedarray_type TypedArray::TypedArrayType() const {
                                  nullptr,
                                  nullptr,
                                  nullptr);
-    NAPI_THROW_IF_FAILED(_env, status, napi_int8_array);
+    NAPI_THROW_IF_FAILED_VOID(_env, status);
   }
+}
+
+inline TypedArray::TypedArray(napi_env env,
+                              napi_value value,
+                              napi_typedarray_type type,
+                              size_t length)
+    : Object(env, value), _type(type), _length(length) {}
 
+inline napi_typedarray_type TypedArray::TypedArrayType() const {
   return _type;
 }
 
 inline uint8_t TypedArray::ElementSize() const {
-  switch (TypedArrayType()) {
+  switch (_type) {
     case napi_int8_array:
     case napi_uint8_array:
     case napi_uint8_clamped_array:
@@ -2055,18 +2057,6 @@ inline uint8_t TypedArray::ElementSize() const {
 }
 
 inline size_t TypedArray::ElementLength() const {
-  if (_type == TypedArray::unknown_array_type) {
-    napi_status status =
-        napi_get_typedarray_info(_env,
-                                 _value,
-                                 &const_cast<TypedArray*>(this)->_type,
-                                 &const_cast<TypedArray*>(this)->_length,
-                                 nullptr,
-                                 nullptr,
-                                 nullptr);
-    NAPI_THROW_IF_FAILED(_env, status, 0);
-  }
-
   return _length;
 }
 

diff --git a/napi.h b/napi.h
@@ -1169,9 +1169,6 @@ class TypedArray : public Object {
              napi_typedarray_type type,
              size_t length);
 
-  static const napi_typedarray_type unknown_array_type =
-      static_cast<napi_typedarray_type>(-1);
-
   template <typename T>
   static
 #if defined(NAPI_HAS_CONSTEXPR)
@@ -1191,7 +1188,7 @@ class TypedArray : public Object {
            : std::is_same<T, int64_t>::value  ? napi_bigint64_array
            : std::is_same<T, uint64_t>::value ? napi_biguint64_array
 #endif  // NAPI_VERSION > 5
-                                              : unknown_array_type;
+                                              : napi_int8_array;
   }
   /// !endcond
 };