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

Commit 2fa701c

Browse files
authored
Merge pull request #235 from exoego/factory
Use Factory macro where inheriting other trait (Follow-up of #234)
2 parents f8f77df + 779294c commit 2fa701c

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

app/current/src/main/scala/io/scalajs/nodejs/crypto/Cipher.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package io.scalajs.nodejs.crypto
22

33
import io.scalajs.nodejs.buffer.Buffer
44
import io.scalajs.nodejs.stream.{Transform, TransformOptions}
5+
import net.exoego.scalajs.types.util.Factory
56

67
import scala.scalajs.js
78

@@ -85,8 +86,7 @@ sealed trait Cipher extends Transform {
8586
def update(data: BufferLike): Buffer = js.native
8687
}
8788

88-
// TODO: Use Factory macro
89-
class SetAADOptions(transform: js.UndefOr[js.Function] = js.undefined,
90-
flush: js.UndefOr[js.Function] = js.undefined,
91-
var plaintextLength: js.UndefOr[Int] = js.undefined
92-
) extends TransformOptions(transform, flush) {}
89+
@Factory
90+
trait SetAADOptions extends TransformOptions {
91+
var plaintextLength: js.UndefOr[Int] = js.undefined
92+
}

app/current/src/main/scala/io/scalajs/nodejs/crypto/Hash.scala

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package io.scalajs.nodejs.crypto
33
import com.thoughtworks.enableIf
44
import io.scalajs.nodejs.buffer.Buffer
55
import io.scalajs.nodejs.stream.{Transform, TransformOptions}
6+
import net.exoego.scalajs.types.util.Factory
67

78
import scala.scalajs.js
89

@@ -72,8 +73,7 @@ sealed trait Hash extends Transform {
7273
def update(data: BufferLike): Hash = js.native
7374
}
7475

75-
// TODO: Use Fatory macro
76-
class CreateHashOptions(transform: js.UndefOr[js.Function] = js.undefined,
77-
flush: js.UndefOr[js.Function] = js.undefined,
78-
var outputLength: js.UndefOr[Int] = js.undefined
79-
) extends TransformOptions(transform, flush)
76+
@Factory
77+
trait CreateHashOptions extends TransformOptions {
78+
var outputLength: js.UndefOr[Int] = js.undefined
79+
}

app/current/src/main/scala/io/scalajs/nodejs/stream/Stream.scala

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -356,7 +356,8 @@ trait DuplexOptions extends js.Object {
356356
var writableObjectMode: js.UndefOr[Boolean] = js.undefined
357357
}
358358

359-
// TODO: Use Factory macro
360-
class TransformOptions(var transform: js.UndefOr[js.Function] = js.undefined,
361-
var flush: js.UndefOr[js.Function] = js.undefined
362-
) extends js.Object
359+
@Factory
360+
trait TransformOptions extends js.Object {
361+
var transform: js.UndefOr[js.Function] = js.undefined
362+
var flush: js.UndefOr[js.Function] = js.undefined
363+
}

0 commit comments

Comments
 (0)