Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Remove the need of explicit import for SplitByType macros #135

Merged
merged 1 commit into from
Dec 9, 2024
Merged

fix: Remove the need of explicit import for SplitByType macros #135

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 59 additions & 1 deletion src/main/scala-3/com/raquo/airstream/core/ObservableMacroImplicits.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.raquo.airstream.core

import com.raquo.airstream.core.{Observable, BaseObservable, Signal}
import com.raquo.airstream.split.{DuplicateKeysConfig, SplitMatchOneObservable, SplitMatchSeqObservable}
import com.raquo.airstream.split.*

trait ObservableMacroImplicits {

Expand All @@ -10,6 +10,37 @@ trait ObservableMacroImplicits {
SplitMatchOneObservable.build(observable)()()
}

extension [Self[+_] <: Observable[_], I, O](
inline matchSplitObservable: SplitMatchOneObservable[Self, I, O]
) {
inline def handleCase[A, B, O1 >: O](inline casePf: PartialFunction[A, B])(inline handleFn: (B, Signal[B]) => O1): SplitMatchOneObservable[Self, I, O1] =
SplitMatchOneMacros.deglateHandleCase(matchSplitObservable, casePf, handleFn)

inline def handleType[T]: SplitMatchOneTypeObservable[Self, I, O, T] =
SplitMatchOneMacros.deglateHandleType(matchSplitObservable)

inline def handleValue[V](inline v: V)(using inline valueOf: ValueOf[V]): SplitMatchOneValueObservable[Self, I, O, V] =
SplitMatchOneMacros.deglateHandleValue(matchSplitObservable, v)
}

extension [Self[+_] <: Observable[_], I, O, T](inline matchTypeObserver: SplitMatchOneTypeObservable[Self, I, O, T]) {
inline def apply[O1 >: O](inline handleFn: (T, Signal[T]) => O1): SplitMatchOneObservable[Self, I, O1] =
SplitMatchOneMacros.deglateHandleTypeApply(matchTypeObserver, handleFn)
}

extension [Self[+_] <: Observable[_], I, O, V](inline matchValueObservable: SplitMatchOneValueObservable[Self, I, O, V]) {
inline def apply[O1 >: O](inline handle: => O1): SplitMatchOneObservable[Self, I, O1] =
SplitMatchOneMacros.deglateHandleValueApply(matchValueObservable, (_, _) => handle)
}

extension [I, O](inline matchSplitObservable: SplitMatchOneObservable[Signal, I, O]) {
inline def toSignal: Signal[O] = SplitMatchOneMacros.deglateToSignal(matchSplitObservable)
}

extension [I, O](inline matchSplitObservable: SplitMatchOneObservable[EventStream, I, O]) {
inline def toStream: EventStream[O] = SplitMatchOneMacros.deglateToStream(matchSplitObservable)
}

extension [Self[+_] <: Observable[_], I, K, CC[_]](inline observable: BaseObservable[Self, CC[I]]) {
inline def splitMatchSeq(
inline keyFn: Function1[I, K],
Expand All @@ -19,4 +50,31 @@ trait ObservableMacroImplicits {
SplitMatchSeqObservable.build(keyFn, distinctCompose, duplicateKeysConfig, observable)()()
}
}

extension [Self[+_] <: Observable[_], I, K, O, CC[_]](
inline matchSplitObservable: SplitMatchSeqObservable[Self, I, K, O, CC]
) {
inline def handleCase[A, B, O1 >: O](inline casePf: PartialFunction[A, B])(inline handleFn: (B, Signal[B]) => O1): SplitMatchSeqObservable[Self, I, K, O1, CC] =
SplitMatchSeqMacros.deglateHandleCase(matchSplitObservable, casePf, handleFn)

inline def handleType[T]: SplitMatchSeqTypeObservable[Self, I, K, O, CC, T] =
SplitMatchSeqMacros.deglateHandleType(matchSplitObservable)

inline def handleValue[V](inline v: V)(using inline valueOf: ValueOf[V]): SplitMatchSeqValueObservable[Self, I, K, O, CC, V] =
SplitMatchSeqMacros.deglateHandleValue(matchSplitObservable, v)

inline def toSignal: Signal[CC[O]] =
SplitMatchSeqMacros.deglateToSignal(matchSplitObservable)
}

extension [Self[+_] <: Observable[_], I, K, O, CC[_], T](inline matchTypeObserver: SplitMatchSeqTypeObservable[Self, I, K, O, CC, T]) {
inline def apply[O1 >: O](inline handleFn: (T, Signal[T]) => O1): SplitMatchSeqObservable[Self, I, K, O1, CC] =
SplitMatchSeqMacros.deglateHandleTypeApply(matchTypeObserver, handleFn)
}

extension [Self[+_] <: Observable[_], I, K, O, CC[_], V](inline matchValueObservable: SplitMatchSeqValueObservable[Self, I, K, O, CC, V]) {

inline def apply[O1 >: O](inline handle: => O1): SplitMatchSeqObservable[Self, I, K, O1, CC] =
SplitMatchSeqMacros.deglateHandleValueApply(matchValueObservable, (_, _) => handle)
}
}
67 changes: 37 additions & 30 deletions src/main/scala-3/com/raquo/airstream/split/SplitMatchOneMacros.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,46 +52,53 @@ import scala.reflect.TypeTest
*/
object SplitMatchOneMacros {

extension [Self[+_] <: Observable[_], I, O](
inline matchSplitObservable: SplitMatchOneObservable[Self, I, O]
) {
inline def handleCase[A, B, O1 >: O](inline casePf: PartialFunction[A, B])(inline handleFn: (B, Signal[B]) => O1) = ${
handleCaseImpl('{ matchSplitObservable }, '{ casePf }, '{ handleFn })
}

inline def handleType[T]: SplitMatchOneTypeObservable[Self, I, O, T] = ${
handleTypeImpl[Self, I, O, T]('{ matchSplitObservable })
}
private[airstream] inline def deglateHandleCase[Self[+_] <: Observable[_], I, O, A, B, O1 >: O](
inline matchSplitObservable: SplitMatchOneObservable[Self, I, O],
inline casePf: PartialFunction[A, B],
inline handleFn: (B, Signal[B]) => O1
) = ${
handleCaseImpl('{ matchSplitObservable }, '{ casePf }, '{ handleFn })
}

inline def handleValue[V](inline v: V)(using inline valueOf: ValueOf[V]): SplitMatchOneValueObservable[Self, I, O, V] = ${
handleValueImpl[Self, I, O, V]('{ matchSplitObservable }, '{ v })
}
private[airstream] inline def deglateHandleType[Self[+_] <: Observable[_], I, O, T](
inline matchSplitObservable: SplitMatchOneObservable[Self, I, O]
) = ${
handleTypeImpl[Self, I, O, T]('{ matchSplitObservable })
}

extension [Self[+_] <: Observable[_], I, O, T](inline matchTypeObserver: SplitMatchOneTypeObservable[Self, I, O, T]) {
inline def apply[O1 >: O](inline handleFn: (T, Signal[T]) => O1): SplitMatchOneObservable[Self, I, O1] = ${
handleTypeApplyImpl('{ matchTypeObserver }, '{ handleFn })
}
private[airstream] inline def deglateHandleValue[Self[+_] <: Observable[_], I, O, V](
inline matchSplitObservable: SplitMatchOneObservable[Self, I, O],
inline v: V
)(
using inline valueOf: ValueOf[V]
) = ${
handleValueImpl[Self, I, O, V]('{ matchSplitObservable }, '{ v })
}

extension [Self[+_] <: Observable[_], I, O, V](inline matchValueObservable: SplitMatchOneValueObservable[Self, I, O, V]) {
inline private def delegate[O1 >: O](inline handleFn: (V, Signal[V]) => O1) = ${
handleValueApplyImpl('{ matchValueObservable }, '{ handleFn })
}
private[airstream] inline def deglateHandleTypeApply[Self[+_] <: Observable[_], I, O, T, O1 >: O](
inline matchTypeObserver: SplitMatchOneTypeObservable[Self, I, O, T],
inline handleFn: (T, Signal[T]) => O1
) = ${
handleTypeApplyImpl('{ matchTypeObserver }, '{ handleFn })
}

inline def apply[O1 >: O](inline handle: => O1): SplitMatchOneObservable[Self, I, O1] = delegate { (_, _) => handle }
private[airstream] inline def deglateHandleValueApply[Self[+_] <: Observable[_], I, O, V, O1 >: O](
inline matchValueObservable: SplitMatchOneValueObservable[Self, I, O, V],
inline handleFn: (V, Signal[V]) => O1
) = ${
handleValueApplyImpl('{ matchValueObservable }, '{ handleFn })
}

extension [I, O](inline matchSplitObservable: SplitMatchOneObservable[Signal, I, O]) {
inline def toSignal: Signal[O] = ${
observableImpl('{ matchSplitObservable })
}
private[airstream] inline def deglateToSignal[I, O](
inline matchSplitObservable: SplitMatchOneObservable[Signal, I, O]
) = ${
observableImpl('{ matchSplitObservable })
}

extension [I, O](inline matchSplitObservable: SplitMatchOneObservable[EventStream, I, O]) {
inline def toStream: EventStream[O] = ${
observableImpl('{ matchSplitObservable })
}
private[airstream] inline def deglateToStream[I, O](
inline matchSplitObservable: SplitMatchOneObservable[EventStream, I, O]
) = ${
observableImpl('{ matchSplitObservable })
}

private def handleCaseImpl[Self[+_] <: Observable[_]: Type, I: Type, O: Type, O1 >: O: Type, A: Type, B: Type](
Expand Down
57 changes: 33 additions & 24 deletions src/main/scala-3/com/raquo/airstream/split/SplitMatchSeqMacros.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,38 +14,47 @@ import com.raquo.airstream.split.MacrosUtilities.{CaseAny, HandlerAny, MatchType

object SplitMatchSeqMacros {

extension [Self[+_] <: Observable[_], I, K, O, CC[_]](
inline matchSplitObservable: SplitMatchSeqObservable[Self, I, K, O, CC]
) {
inline def handleCase[A, B, O1 >: O](inline casePf: PartialFunction[A, B])(inline handleFn: (B, Signal[B]) => O1) = ${
handleCaseImpl('{ matchSplitObservable }, '{ casePf }, '{ handleFn })
}

inline def handleType[T]: SplitMatchSeqTypeObservable[Self, I, K, O, CC, T] = ${
handleTypeImpl('{ matchSplitObservable })
}

inline def handleValue[V](inline v: V)(using inline valueOf: ValueOf[V]): SplitMatchSeqValueObservable[Self, I, K, O, CC, V] = ${
handleValueImpl('{ matchSplitObservable }, '{ v })
}
private[airstream] inline def deglateHandleCase[Self[+_] <: Observable[_], I, K, O, CC[_], A, B, O1 >: O](
inline matchSplitObservable: SplitMatchSeqObservable[Self, I, K, O, CC],
inline casePf: PartialFunction[A, B],
inline handleFn: (B, Signal[B]) => O1
) = ${
handleCaseImpl('{ matchSplitObservable }, '{ casePf }, '{ handleFn })
}

inline def toSignal: Signal[CC[O]] = ${ observableImpl('{ matchSplitObservable }) }
private[airstream] inline def deglateHandleType[Self[+_] <: Observable[_], I, K, O, CC[_], T](
inline matchSplitObservable: SplitMatchSeqObservable[Self, I, K, O, CC]
) = ${
handleTypeImpl[Self, I, K, O, CC, T]('{ matchSplitObservable })
}

extension [Self[+_] <: Observable[_], I, K, O, CC[_], T](inline matchTypeObserver: SplitMatchSeqTypeObservable[Self, I, K, O, CC, T]) {
inline def apply[O1 >: O](inline handleFn: (T, Signal[T]) => O1): SplitMatchSeqObservable[Self, I, K, O1, CC] = ${
handleTypeApplyImpl('{ matchTypeObserver }, '{ handleFn })
}
private[airstream] inline def deglateHandleValue[Self[+_] <: Observable[_], I, K, O, CC[_], V](
inline matchSplitObservable: SplitMatchSeqObservable[Self, I, K, O, CC],
inline v: V
)(
using inline valueOf: ValueOf[V]
) = ${
handleValueImpl('{ matchSplitObservable }, '{ v })
}

extension [Self[+_] <: Observable[_], I, K, O, CC[_], V](inline matchValueObservable: SplitMatchSeqValueObservable[Self, I, K, O, CC, V]) {
inline private def delegate[O1 >: O](inline handleFn: (V, Signal[V]) => O1) = ${
handleValueApplyImpl('{ matchValueObservable }, '{ handleFn })
}
private[airstream] inline def deglateHandleTypeApply[Self[+_] <: Observable[_], I, K, O, CC[_], T, O1 >: O](
inline matchTypeObserver: SplitMatchSeqTypeObservable[Self, I, K, O, CC, T],
inline handleFn: (T, Signal[T]) => O1
) = ${
handleTypeApplyImpl('{ matchTypeObserver }, '{ handleFn })
}

inline def apply[O1 >: O](inline handle: => O1): SplitMatchSeqObservable[Self, I, K, O1, CC] = delegate { (_, _) => handle }
private[airstream] inline def deglateHandleValueApply[Self[+_] <: Observable[_], I, K, O, CC[_], V, O1 >: O](
inline matchValueObservable: SplitMatchSeqValueObservable[Self, I, K, O, CC, V],
inline handleFn: (V, Signal[V]) => O1
) = ${
handleValueApplyImpl('{ matchValueObservable }, '{ handleFn })
}

private[airstream] inline def deglateToSignal[Self[+_] <: Observable[_], I, K, O, CC[_]](
inline matchSplitObservable: SplitMatchSeqObservable[Self, I, K, O, CC]
) = ${ observableImpl('{ matchSplitObservable }) }

private def handleCaseImpl[Self[+_] <: Observable[_]: Type, I: Type, K: Type, O: Type, O1 >: O: Type, CC[_]: Type, A: Type, B: Type](
matchSplitObservableExpr: Expr[SplitMatchSeqObservable[Self, I, K, O, CC]],
casePfExpr: Expr[PartialFunction[A, B]],
Expand Down
1 change: 0 additions & 1 deletion src/test/scala-3/com/raquo/airstream/split/SplitMatchOneSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import com.raquo.airstream.UnitSpec
import com.raquo.airstream.eventbus.EventBus
import com.raquo.airstream.fixtures.{Effect, TestableOwner}
import com.raquo.airstream.state.Var
import com.raquo.airstream.split.SplitMatchOneMacros.*
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No more importing


import scala.collection.{immutable, mutable}
import scala.scalajs.js
Expand Down
1 change: 0 additions & 1 deletion src/test/scala-3/com/raquo/airstream/split/SplitMatchSeqSpec.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import com.raquo.airstream.eventbus.EventBus
import com.raquo.airstream.fixtures.{Effect, TestableOwner}
import com.raquo.airstream.ownership.{DynamicOwner, DynamicSubscription, ManualOwner, Subscription}
import com.raquo.airstream.split.DuplicateKeysConfig
import com.raquo.airstream.split.SplitMatchSeqMacros.*
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No more importing

import com.raquo.airstream.state.Var
import com.raquo.ew.{JsArray, JsVector}
import org.scalatest.{Assertion, BeforeAndAfter}
Expand Down
Loading