diff --git a/quasar/quasar.cabal b/quasar/quasar.cabal index fcded16..50e219b 100644 --- a/quasar/quasar.cabal +++ b/quasar/quasar.cabal @@ -74,6 +74,7 @@ library Quasar.Logger Quasar.MonadQuasar Quasar.MonadQuasar.Misc + Quasar.Observable Quasar.Observable.AccumulatingObserver Quasar.Observable.Async Quasar.Observable.Core diff --git a/quasar/src/Quasar/Observable.hs b/quasar/src/Quasar/Observable.hs new file mode 100644 index 0000000..1db85d3 --- /dev/null +++ b/quasar/src/Quasar/Observable.hs @@ -0,0 +1,20 @@ +module Quasar.Observable ( + Observable, + toObservable, + ObservableList, + Quasar.Observable.List.toObservableList, + ObservableMap, + toObservableMap, + ObservableSet, + toObservableSet, + + ObservableVar, + newObservableVar, + newObservableVarIO, +) where + +import Quasar.Observable.ObservableVar +import Quasar.Observable.Core +import Quasar.Observable.List +import Quasar.Observable.Map +import Quasar.Observable.Set diff --git a/quasar/src/Quasar/Observable/List.hs b/quasar/src/Quasar/Observable/List.hs index 3a996a7..c8de8a9 100644 --- a/quasar/src/Quasar/Observable/List.hs +++ b/quasar/src/Quasar/Observable/List.hs @@ -412,7 +412,7 @@ stripLoading :: Seq v -> ObservableList Load exceptions v -> ObservableList NoLo stripLoading initialFallback = ObservableList . observableTStripLoading initialFallback . toObservableT isLoading :: ObservableList canLoad exceptions v -> Observable NoLoad '[] (Loading canLoad) -isLoading = observableTIsLoading . toObservableT +isLoading (ObservableList f) = observableTIsLoading f constObservableList :: ObservableState canLoad (ObservableResult exceptions Seq) v -> ObservableList canLoad exceptions v