Fix the detection of BigInt TypedArray

petamoriken · Oct 15, 2021 · 47803fa · 47803fa
1 parent 8adf001
commit 47803fa
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 1 deletion.
diff --git a/src/Float16Array.mjs b/src/Float16Array.mjs
@@ -2,7 +2,7 @@ import { wrapInArrayIterator } from "./_arrayIterator.mjs";
 import { convertToNumber, roundToFloat16Bits } from "./_converter.mjs";
 import { LengthOfArrayLike, SpeciesConstructor, ToIntegerOrInfinity, defaultCompare } from "./_spec.mjs";
 import { hasOwn } from "./_util/hasOwn.mjs";
-import { isArrayBuffer, isCanonicalIntegerIndexString, isIterable, isObject, isObjectLike, isOrdinaryArray, isOrdinaryTypedArray, isSharedArrayBuffer, isTypedArray, isUint16Array } from "./_util/is.mjs";
+import { isArrayBuffer, isBigIntTypedArray, isCanonicalIntegerIndexString, isIterable, isObject, isObjectLike, isOrdinaryArray, isOrdinaryTypedArray, isSharedArrayBuffer, isTypedArray, isUint16Array } from "./_util/is.mjs";
 import { createPrivateStorage } from "./_util/private.mjs";
 
 const brand = Symbol.for("__Float16Array__");
@@ -144,6 +144,10 @@ export class Float16Array extends Uint16Array {
 
       // TypedArray
       if (isTypedArray(input)) {
+        if (isBigIntTypedArray(input)) {
+          throw new TypeError("Cannot mix BigInt and other types, use explicit conversions");
+        }
+
         list = input;
         length = input.length;
 
@@ -616,6 +620,10 @@ export class Float16Array extends Uint16Array {
       throw RangeError("offset is out of bounds");
     }
 
+    if (isBigIntTypedArray(input)) {
+      throw new TypeError("Cannot mix BigInt and other types, use explicit conversions");
+    }
+
     // for optimization
     if (isFloat16Array(input)) {
       // peel off Proxy

diff --git a/src/_util/is.mjs b/src/_util/is.mjs
@@ -33,6 +33,15 @@ export function isUint16Array(value) {
   return getTypedArrayPrototypeSymbolToStringTag.call(value) === "Uint16Array";
 }
 
+/**
+ * @param {unknown} value
+ * @returns {value is BigInt64Array|BigUint64Array}
+ */
+export function isBigIntTypedArray(value) {
+  const typedArrayName = getTypedArrayPrototypeSymbolToStringTag.call(value);
+  return typedArrayName === "BigInt64Array" || typedArrayName === "BigUint64Array";
+}
+
 /**
  * @param {unknown} value
  * @returns {value is DataView}

diff --git a/test/Float16Array.js b/test/Float16Array.js
@@ -106,6 +106,15 @@ describe("Float16Array", () => {
     assert.equalFloat16ArrayValues( float16_2, checkArray );
   });
 
+  it("input BigInt TypedArray", function () {
+    // Safari 13 doesn't have BigInt
+    if (typeof BigUint64Array === "undefined") {
+      this.skip();
+    }
+
+    assert.throws(() => new Float16Array(new BigUint64Array()), TypeError);
+  });
+
   it("input custom Array", () => {
     class FooArray extends Array {}
     const array = FooArray.from([1, 1.1, 1.2, 1.3]);
@@ -1140,6 +1149,16 @@ describe("Float16Array", () => {
       assert.equalFloat16ArrayValues( float16, [1, 20, 21, 11, 5] );
     });
 
+    it("set BigInt TypedArray", function () {
+      // Safari 13 doesn't have BigInt
+      if (typeof BigUint64Array === "undefined") {
+        this.skip();
+      }
+
+      const float16 = new Float16Array([1, 2, 3, 4, 5]);
+      assert.throws(() => float16.set(new BigUint64Array()), TypeError);
+    });
+
     it("set ArrayLike", () => {
       const float16 = new Float16Array([1, 2, 3, 4, 5]);
       const arrayLike = { 0: 10, 1: 11, length: 2 };