Refactor: Remove LengthOfArrayLike

petamoriken · Nov 1, 2021 · adad0e6 · adad0e6
1 parent 0827464
commit adad0e6
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 25 deletions.
diff --git a/src/Float16Array.mjs b/src/Float16Array.mjs
@@ -78,9 +78,9 @@ import {
 } from "./_util/primordials.mjs";
 import {
   IsDetachedBuffer,
-  LengthOfArrayLike,
   SpeciesConstructor,
   ToIntegerOrInfinity,
+  ToLength,
   defaultCompare,
 } from "./_util/spec.mjs";
 
@@ -331,7 +331,7 @@ export class Float16Array {
           }
         } else { // ArrayLike
           list = /** @type {ArrayLike<unknown>} */ (input);
-          length = LengthOfArrayLike(input);
+          length = ToLength(list.length);
         }
         float16bitsArray = ReflectConstruct(NativeUint16Array, [length], new.target);
       }
@@ -421,8 +421,13 @@ export class Float16Array {
         length = list.length;
       }
     } else { // ArrayLike
-      list = src;
-      length = LengthOfArrayLike(src);
+      if (src == null) {
+        throw NativeTypeError(
+          CANNOT_CONVERT_UNDEFINED_OR_NULL_TO_OBJECT
+        );
+      }
+      list = NativeObject(src);
+      length = ToLength(list.length);
     }
 
     const array = new Constructor(length);
@@ -831,7 +836,7 @@ export class Float16Array {
     const targetLength = TypedArrayPrototypeGetLength(float16bitsArray);
 
     const src = NativeObject(input);
-    const srcLength = LengthOfArrayLike(src);
+    const srcLength = ToLength(src.length);
 
     if (targetOffset === Infinity || srcLength + targetOffset > targetLength) {
       throw NativeRangeError(OFFSET_IS_OUT_OF_BOUNDS);

diff --git a/src/_util/spec.mjs b/src/_util/spec.mjs
@@ -14,6 +14,8 @@ import {
   SymbolSpecies,
 } from "./primordials.mjs";
 
+const MAX_SAFE_INTEGER = NativeNumber.MAX_SAFE_INTEGER;
+
 /**
  * @see https://tc39.es/ecma262/#sec-tointegerorinfinity
  * @param {unknown} target
@@ -38,28 +40,15 @@ export function ToIntegerOrInfinity(target) {
  * @param {unknown} target
  * @returns {number}
  */
-function ToLength(target) {
+export function ToLength(target) {
   const length = ToIntegerOrInfinity(target);
   if (length < 0) {
     return 0;
   }
 
-  return length < NativeNumber.MAX_SAFE_INTEGER
+  return length < MAX_SAFE_INTEGER
     ? length
-    : NativeNumber.MAX_SAFE_INTEGER;
-}
-
-/**
- * @see https://tc39.es/ecma262/#sec-lengthofarraylike
- * @param {object} arrayLike
- * @returns {number}
- */
-export function LengthOfArrayLike(arrayLike) {
-  if (!isObject(arrayLike)) {
-    throw NativeTypeError(THIS_IS_NOT_AN_OBJECT);
-  }
-
-  return ToLength(/** @type {any} */ (arrayLike).length);
+    : MAX_SAFE_INTEGER;
 }
 
 /**

diff --git a/test/Float16Array.js b/test/Float16Array.js
@@ -501,10 +501,11 @@ describe("Float16Array", () => {
     });
 
     it("input empty or primitive", () => {
-      assert.doesNotThrow(() => Float16Array.from(0));
-      assert.doesNotThrow(() => Float16Array.from(4));
-      assert.doesNotThrow(() => Float16Array.from(-1));
-      assert.doesNotThrow(() => Float16Array.from(Symbol()));
+      assert.equalFloat16ArrayValues(Float16Array.from(0), []);
+      assert.equalFloat16ArrayValues(Float16Array.from(4), []);
+      assert.equalFloat16ArrayValues(Float16Array.from(-1), []);
+      assert.equalFloat16ArrayValues(Float16Array.from(Symbol()), []);
+      assert.equalFloat16ArrayValues(Float16Array.from("123"), [1, 2, 3]);
 
       assert.throws(() => Float16Array.from(), TypeError);
       assert.throws(() => Float16Array.from(null), TypeError);