Move crypto.BufferSource to dom, as a type alias for a union type.

It is defined in the "Common Definitions" of WebIDL.

Author: sjrd

src/main/scala/org/scalajs/dom/crypto/Crypto.scala

@@ -4,6 +4,8 @@ import scala.scalajs.js
 import scala.scalajs.js.annotation._
 import scala.scalajs.js.typedarray.ArrayBufferView
 
+import org.scalajs.dom.BufferSource
+
 @deprecated("use dom.crypto.crypto instead", "2.0.0")
 @js.native
 @JSGlobalScope
@@ -464,7 +466,9 @@ trait RsaOaepParams extends Algorithm {
 object RsaOaepParams {
   @inline
   def apply(name: String, label: BufferSource): RsaOaepParams = {
-    js.Dynamic.literal(name = name, label = label).asInstanceOf[RsaOaepParams]
+    js.Dynamic
+      .literal(name = name, label = label.asInstanceOf[js.Any])
+      .asInstanceOf[RsaOaepParams]
   }
 }
 
@@ -556,7 +560,8 @@ object AesCtrParams {
   def apply(name: String, counter: BufferSource,
       length: Short): AesCtrParams = {
     js.Dynamic
-      .literal(name = name, counter = counter, length = length)
+      .literal(name = name, counter = counter.asInstanceOf[js.Any],
+          length = length)
       .asInstanceOf[AesCtrParams]
   }
 }
@@ -612,8 +617,11 @@ trait AesCbcParams extends Algorithm {
 
 object AesCbcParams {
   @inline
-  def apply(name: String, iv: BufferSource): AesCbcParams =
-    js.Dynamic.literal(name = name, iv = iv).asInstanceOf[AesCbcParams]
+  def apply(name: String, iv: BufferSource): AesCbcParams = {
+    js.Dynamic
+      .literal(name = name, iv = iv.asInstanceOf[js.Any])
+      .asInstanceOf[AesCbcParams]
+  }
 }
 
 // AES-CMAC
@@ -648,7 +656,8 @@ object AesGcmParams {
   def apply(name: String, iv: BufferSource, additionalData: BufferSource,
       tagLength: Short): AesGcmParams = {
     js.Dynamic
-      .literal(name = name, iv = iv, additionalData = additionalData,
+      .literal(name = name, iv = iv.asInstanceOf[js.Any],
+          additionalData = additionalData.asInstanceOf[js.Any],
           tagLength = tagLength)
       .asInstanceOf[AesGcmParams]
   }
@@ -664,7 +673,9 @@ trait AesCfbParams extends Algorithm {
 object AesCfbParams {
   @inline
   def apply(name: String, iv: BufferSource): AesCfbParams =
-    js.Dynamic.literal(name = name, iv = iv).asInstanceOf[AesCfbParams]
+    js.Dynamic
+      .literal(name = name, iv = iv.asInstanceOf[js.Any])
+      .asInstanceOf[AesCfbParams]
 }
 
 // AES-KW
@@ -817,9 +828,11 @@ object ConcatParams {
       privateInfo: BufferSource): ConcatParams = {
     js.Dynamic
       .literal(name = name, hash = hash.asInstanceOf[js.Any],
-          algorithmId = algorithmId, partyUInfo = partyUInfo,
-          partyVInfo = partyVInfo, publicInfo = publicInfo,
-          privateInfo = privateInfo)
+          algorithmId = algorithmId.asInstanceOf[js.Any],
+          partyUInfo = partyUInfo.asInstanceOf[js.Any],
+          partyVInfo = partyVInfo.asInstanceOf[js.Any],
+          publicInfo = publicInfo.asInstanceOf[js.Any],
+          privateInfo = privateInfo.asInstanceOf[js.Any])
       .asInstanceOf[ConcatParams]
   }
 }
@@ -840,8 +853,9 @@ object HkdfCtrParams {
   def apply(name: String, hash: HashAlgorithmIdentifier, label: BufferSource,
       context: BufferSource): HkdfCtrParams = {
     js.Dynamic
-      .literal(name = name, hash = hash.asInstanceOf[js.Any], label = label,
-          context = context)
+      .literal(name = name, hash = hash.asInstanceOf[js.Any],
+          label = label.asInstanceOf[js.Any],
+          context = context.asInstanceOf[js.Any])
       .asInstanceOf[HkdfCtrParams]
   }
 }
@@ -862,8 +876,8 @@ object Pbkdf2Params {
   def apply(name: String, salt: BufferSource, iterations: Long,
       hash: HashAlgorithmIdentifier): Pbkdf2Params = {
     js.Dynamic
-      .literal(name = name, salt = salt, iterations = iterations.toDouble,
-          hash = hash.asInstanceOf[js.Any])
+      .literal(name = name, salt = salt.asInstanceOf[js.Any],
+          iterations = iterations.toDouble, hash = hash.asInstanceOf[js.Any])
       .asInstanceOf[Pbkdf2Params]
   }
 }

src/main/scala/org/scalajs/dom/crypto/package.scala

@@ -5,8 +5,6 @@ import scala.scalajs.js.annotation._
 import scala.scalajs.js.typedarray.{ArrayBufferView, ArrayBuffer, Uint8Array}
 import scala.scalajs.js.|
 
-import scala.language.implicitConversions
-
 package object crypto {
   @js.native
   @JSGlobal("crypto")
@@ -35,13 +33,4 @@ package object crypto {
    * Algorithm Identifiers. At the JS layer these have the same structure.
    */
   type HashAlgorithmIdentifier = HashAlgorithm | String
-
-  @js.native
-  sealed trait BufferSource extends js.Any
-
-  implicit def arrayBuffer2BufferSource(b: ArrayBuffer): BufferSource =
-    b.asInstanceOf[BufferSource]
-
-  implicit def arrayBufferView2BufferSource(b: ArrayBufferView): BufferSource =
-    b.asInstanceOf[BufferSource]
 }

src/main/scala/org/scalajs/dom/experimental/package.scala

@@ -1,7 +1,5 @@
 package org.scalajs.dom
 
-import org.scalajs.dom.crypto.BufferSource
-
 import scala.scalajs.js
 import scala.scalajs.js.|
 

src/main/scala/org/scalajs/dom/package.scala

@@ -3,7 +3,7 @@ package org.scalajs
 import scala.scalajs.js
 import scala.scalajs.js.|
 import scala.scalajs.js.annotation._
-import scala.scalajs.js.typedarray.ArrayBuffer
+import scala.scalajs.js.typedarray.{ArrayBuffer, ArrayBufferView}
 
 package object dom {
 
@@ -21,6 +21,8 @@ package object dom {
    */
   type Transferable = ArrayBuffer | MessagePort
 
+  type BufferSource = ArrayBufferView | ArrayBuffer
+
   @js.native
   @JSGlobal("window")
   val window: Window = js.native