Skip to content
This repository was archived by the owner on Jul 30, 2024. It is now read-only.

Move compiler switches into core #100

Merged
merged 3 commits into from
Oct 4, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions app/current/src/main/scala/io/scalajs/nodejs/Assert.scala
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ trait Assert extends IEventEmitter {
*/
def deepStrictEqual(actual: js.Any, expected: js.Any, message: String = js.native): Unit = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def doesNotReject(asyncFn: js.Function | js.Promise[_],
error: js.RegExp | js.Function = js.native,
message: String = js.native): Unit = js.native
Expand Down Expand Up @@ -115,7 +115,7 @@ trait Assert extends IEventEmitter {
error: js.RegExp | js.Function | js.Object | Error,
message: String = js.native): Unit = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def rejects(asyncFn: js.Function | js.Promise[_],
error: js.RegExp | js.Function | js.Object | Error = js.native,
message: String = js.native): Unit = js.native
Expand All @@ -127,6 +127,6 @@ trait Assert extends IEventEmitter {
@js.native
@JSImport("assert", JSImport.Namespace)
object Assert extends Assert {
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
val strict: Assert = js.native
}
6 changes: 3 additions & 3 deletions app/current/src/main/scala/io/scalajs/nodejs/Module.scala
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@ trait Module extends js.Object {
@JSImport("module", JSImport.Namespace)
object Module extends Module {

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
var builtinModules: js.Array[String] = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createRequire(filename: String): Require = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createRequire(filename: io.scalajs.nodejs.url.URL): Require = js.native
}
Original file line number Diff line number Diff line change
Expand Up @@ -844,25 +844,25 @@ class Buffer protected () extends Uint8Array( /* dummy to trick constructor */ -
/**
* @see https://nodejs.org/api/buffer.html#buffer_buf_readbiguint64be_offset
*/
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def readBigInt64BE(offset: Int = js.native): Buffer.UnsafeBigInt = js.native

/**
* @see https://nodejs.org/api/buffer.html#buffer_buf_readbiguint64le_offset
*/
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def readBigUInt64LE(offset: Int = js.native): Buffer.UnsafeBigInt = js.native

/**
* @see https://nodejs.org/api/buffer.html#buffer_buf_writebigint64be_value_offset
*/
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def writeBigInt64BE(value: Buffer.UnsafeBigInt, offset: Int = js.native): Int = js.native

/**
* @see https://nodejs.org/api/buffer.html#buffer_buf_writebigint64le_value_offset
*/
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def writeBigInt64LE(value: Buffer.UnsafeBigInt, offset: Int = js.native): Int = js.native
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ trait ClusterSettings extends js.Object {

var inspectPort: Int | js.Function = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
var cwd: String = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
var windowsHide: Boolean = js.native
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class Console protected () extends js.Object {
* @param tabularData
* @param properties Alternate properties for constructing the table.
*/
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def table(tabularData: js.Any, properties: js.Array[String] = js.native): Unit = js.native

/**
Expand All @@ -165,7 +165,7 @@ class Console protected () extends js.Object {
/**
* Stops a timer that was previously started by calling [[time()]] and prints the result to `.stdout`.`
*/
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def timeLog(label: String, data: js.Any*): Unit = js.native

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,12 @@ class Certificate extends js.Object {
@js.native
@JSImport("crypto", "Certificate")
object Certificate extends js.Object {
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def exportChallenge(spkac: String | BufferLike): Buffer = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def exportPublicKey(spkac: String | BufferLike, encoding: String = js.native): Buffer = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def verifySpkac(spkac: BufferLike): Boolean = js.native
}
62 changes: 31 additions & 31 deletions app/current/src/main/scala/io/scalajs/nodejs/crypto/Crypto.scala
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@ trait Crypto extends js.Object {
@deprecated("Use crypto.createCipheriv() instead.", "Node.js v10.0")
def createCipher(algorithm: String, password: Buffer | String): Cipher = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def createCipheriv(algorithm: String,
key: String | BufferLike,
iv: String | BufferLike,
options: TransformOptions = js.native): Cipher = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createCipheriv(algorithm: String, key: KeyObject, iv: String | BufferLike, options: TransformOptions): Cipher =
js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createCipheriv(algorithm: String, key: KeyObject, iv: String | BufferLike): Cipher = js.native

/**
Expand All @@ -77,17 +77,17 @@ trait Crypto extends js.Object {
*/
@deprecated("Use crypto.createDecipheriv() instead.", "Node.js v10.0")
def createDecipher(algorithm: String, password: Buffer | String): Decipher = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def createDecipheriv(algorithm: String,
key: String | BufferLike,
iv: String | BufferLike,
options: TransformOptions = js.native): Decipher = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createDecipheriv(algorithm: String,
key: KeyObject,
iv: String | BufferLike,
options: TransformOptions): Decipher = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createDecipheriv(algorithm: String, key: KeyObject, iv: String | BufferLike): Decipher = js.native

def createDiffieHellman(prime: String, primeEncoding: String, generator: Int | BufferLike): DiffieHellman = js.native
Expand Down Expand Up @@ -124,18 +124,18 @@ trait Crypto extends js.Object {
* @param key The key is the HMAC key used to generate the cryptographic HMAC hash.
*/
def createHmac(algorithm: String, key: String | BufferLike, options: TransformOptions = js.native): Hmac = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createHmac(algorithm: String, key: KeyObject, options: TransformOptions): Hmac = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createHmac(algorithm: String, key: KeyObject): Hmac = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createPrivateKey(key: String | Buffer | CreatePrivateKeyOptions): KeyObject = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createPublicKey(key: String | Buffer | KeyObject | CreatePublicKeyOptions): KeyObject = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def createSecretKey(key: Buffer): KeyObject = js.native

/**
Expand All @@ -152,14 +152,14 @@ trait Crypto extends js.Object {
*/
def createVerify(algorithm: String, options: WritableOptions = js.native): Verify = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def generateKeyPair(
`type`: String,
options: GenerateKeyPairOptions,
callback: Callback2[String | Buffer | KeyObject, String | Buffer | KeyObject]
): Unit = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def generateKeyPairSync(`type`: String, options: GenerateKeyPairOptions): KeyPair = js.native

/**
Expand All @@ -172,7 +172,7 @@ trait Crypto extends js.Object {

def getDiffieHellman(groupName: String): DiffieHellmanGroup = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def getFips(): Boolean = js.native

def getHashes(): js.Array[String] = js.native
Expand Down Expand Up @@ -206,19 +206,19 @@ trait Crypto extends js.Object {
digest: String): Buffer = js.native

def privateDecrypt(privateKey: String | Buffer, buffer: BufferLike): Buffer = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def privateDecrypt(privateKey: KeyObject, buffer: BufferLike): Buffer = js.native

def privateEncrypt(privateKey: String | Buffer, buffer: BufferLike): Buffer = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def privateEncrypt(privateKey: KeyObject, buffer: BufferLike): Buffer = js.native

def publicDecrypt(key: String | Buffer, buffer: BufferLike): Buffer = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def publicDecrypt(key: KeyObject, buffer: BufferLike): Buffer = js.native

def publicEncrypt(key: String | Buffer, buffer: BufferLike): Buffer = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def publicEncrypt(key: KeyObject, buffer: BufferLike): Buffer = js.native

def randomBytes(size: Int): Buffer = js.native
Expand All @@ -228,16 +228,16 @@ trait Crypto extends js.Object {
def randomFillSync(buffer: Buffer, offset: Int): Buffer = js.native
def randomFillSync(buffer: Buffer): Buffer = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def randomFillSync(buffer: scala.scalajs.js.typedarray.DataView,
offset: Int,
size: Int): scala.scalajs.js.typedarray.DataView = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def randomFillSync(buffer: scala.scalajs.js.typedarray.DataView, offset: Int): scala.scalajs.js.typedarray.DataView =
js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def randomFillSync(buffer: scala.scalajs.js.typedarray.DataView): scala.scalajs.js.typedarray.DataView = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def randomFillSync[T <: scala.scalajs.js.typedarray.TypedArray[_, T]](buffer: T,
offset: Int = js.native,
size: Int = js.native): T = js.native
Expand All @@ -246,52 +246,52 @@ trait Crypto extends js.Object {
def randomFill(buffer: Buffer, offset: Int, callback: Callback1[Buffer]): Buffer = js.native
def randomFill(buffer: Buffer, callback: Callback1[Buffer]): Buffer = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def randomFill(buffer: scala.scalajs.js.typedarray.DataView,
offset: Int,
size: Int,
callback: Callback1[scala.scalajs.js.typedarray.DataView]): scala.scalajs.js.typedarray.DataView =
js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def randomFill(buffer: scala.scalajs.js.typedarray.DataView,
offset: Int,
callback: Callback1[scala.scalajs.js.typedarray.DataView]): scala.scalajs.js.typedarray.DataView =
js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def randomFill(buffer: scala.scalajs.js.typedarray.DataView,
callback: Callback1[scala.scalajs.js.typedarray.DataView]): scala.scalajs.js.typedarray.DataView =
js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def randomFill[T <: scala.scalajs.js.typedarray.TypedArray[_, T]](buffer: T,
offset: Int = js.native,
size: Int = js.native,
callback: Callback1[T]): T = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def scrypt(password: String | BufferLike,
salt: String | BufferLike,
keylen: Int,
options: ScryptOptions = js.native,
callback: Callback1[Buffer]): Unit = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def scryptSync(password: String | BufferLike,
salt: String | BufferLike,
keylen: Int,
options: ScryptOptions = js.native): Buffer = js.native

def setEngine(engine: String, fips: Int = js.native): Unit = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
def setFips(enable: Boolean): Unit = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def sign(algorithm: String = js.native, data: BufferLike, key: String | Buffer | KeyObject): Buffer = js.native

def timingSafeEqual(a: BufferLike, b: BufferLike): Boolean = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def verify(algorithm: String = js.native, data: BufferLike, key: String | Buffer | KeyObject): Boolean = js.native
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ trait ECDH extends js.Object {
}

@js.native
@enableMembersIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableMembersIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
@JSImport("crypto", "ECDH")
object ECDH extends js.Object {
def convertKey(key: String, curve: String, inputEncoding: String, outputEncoding: String, format: String): String =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import scala.scalajs.js.|
sealed trait Sign extends Writable {
def sign(privateKey: String | Buffer): Buffer = js.native
def sign(privateKey: String | Buffer, outputEncoding: String): String = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def sign(privateKey: KeyObject): Buffer = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def sign(privateKey: KeyObject, outputEncoding: String): String = js.native

def update(data: String, inputEncoding: String = js.native): Unit = js.native
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,9 @@ trait Verify extends Writable {
*/
def verify(obj: String | Buffer, signature: String, signatureEncoding: String): Boolean = js.native
def verify(obj: String | Buffer, signature: BufferLike): Boolean = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def verify(obj: KeyObject, signature: String, signatureEncoding: String): Boolean = js.native
@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def verify(obj: KeyObject, signature: BufferLike): Boolean = js.native

}
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,10 @@ class Socket private[this] () extends IEventEmitter {

def close(callback: js.Function = js.native): Unit = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def connect(port: Int, address: String = js.native, callback: js.Function0[Any] = js.native): Unit = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def disconnect(): Unit = js.native

def dropMembership(multicastAddress: String, multicastInterface: String = js.native): Unit = js.native
Expand All @@ -80,7 +80,7 @@ class Socket private[this] () extends IEventEmitter {

def ref(): this.type = js.native

@enableIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs12)
@enableIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs12)
def remoteAddress(): RemoteAddress = js.native

def send(msg: BufferMessage, offset: Int, length: Int, port: Int, address: String, callback: js.Function): Unit =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import scala.scalajs.js
import scala.scalajs.js.annotation.JSImport

@js.native
@enableMembersIf(io.scalajs.nodejs.CompilerSwitches.gteNodeJs10)
@enableMembersIf(io.scalajs.nodejs.internal.CompilerSwitches.gteNodeJs10)
@JSImport("dns", "promises.Resolver")
class PromisesResolver extends js.Object {
def getServers(): js.Array[String] = js.native
Expand Down
Loading