@typed/async-data 0.7.0 → 0.8.0

package/src/AsyncData.ts

@@ -5,10 +5,10 @@
  * @since 1.0.0
  */
 
-import type { Effect } from "effect"
 import * as Cause from "effect/Cause"
 import * as Data from "effect/Data"
 import * as Duration from "effect/Duration"
+import type * as Effect from "effect/Effect"
 import * as Either from "effect/Either"
 import * as Equal from "effect/Equal"
 import * as Equivalence from "effect/Equivalence"
@@ -457,17 +457,20 @@ export const flatMap: {
 /**
  * @since 1.0.0
  */
-export const startLoading = <A, E>(data: AsyncData<A, E>): AsyncData<A, E> => {
+export const startLoading = <A, E>(
+  data: AsyncData<A, E>,
+  options?: OptionalPartial<LoadingOptions>
+): AsyncData<A, E> => {
   if (isSuccess(data)) {
-    return Option.isSome(data.refreshing) ? data : success(data.value, { ...data, refreshing: loading() })
+    return Option.isSome(data.refreshing) ? data : success(data.value, { ...data, refreshing: loading(options) })
   } else if (isFailure(data)) {
     return Option.isSome(data.refreshing)
       ? data
-      : failCause(data.cause, { ...data, refreshing: loading() })
+      : failCause(data.cause, { ...data, refreshing: loading(options) })
   } else if (isOptimistic(data)) {
-    return optimistic(startLoading(data.previous), data.value, data)
+    return optimistic(startLoading(data.previous, options), data.value, data)
   } else {
-    return loading()
+    return loading(options)
   }
 }
 
@@ -476,9 +479,9 @@ export const startLoading = <A, E>(data: AsyncData<A, E>): AsyncData<A, E> => {
  */
 export const stopLoading = <A, E>(data: AsyncData<A, E>): AsyncData<A, E> => {
   if (isSuccess(data)) {
-    return Option.isSome(data.refreshing) ? success(data.value) : data
+    return Option.isSome(data.refreshing) ? success(data.value, { timestamp: data.timestamp }) : data
   } else if (isFailure(data)) {
-    return Option.isSome(data.refreshing) ? failCause(data.cause) : data
+    return Option.isSome(data.refreshing) ? failCause(data.cause, { timestamp: data.timestamp }) : data
   } else if (isOptimistic(data)) {
     return optimistic(stopLoading(data.previous), data.value, data)
   } else {
@@ -580,7 +583,7 @@ export const getEquivalence = <A, E>(
 /**
  * @since 1.0.0
  */
-export function fromExit<A, E>(exit: Exit.Exit<A, E>): AsyncData<A, E> {
+export function fromExit<A, E>(exit: Exit.Exit<A, E>): Success<A> | Failure<E> {
   return Exit.match(exit, {
     onFailure: (cause) => failCause(cause),
     onSuccess: (value) => success(value)
@@ -590,7 +593,7 @@ export function fromExit<A, E>(exit: Exit.Exit<A, E>): AsyncData<A, E> {
 /**
  * @since 1.0.0
  */
-export function fromEither<A, E = never>(either: Either.Either<A, E>): AsyncData<A, E> {
+export function fromEither<A, E = never>(either: Either.Either<A, E>): Success<A> | Failure<E> {
   return Either.match(either, {
     onLeft: (e) => fail(e),
     onRight: (a) => success(a)
@@ -650,3 +653,42 @@ export function dataEqual<A, E>(first: AsyncData<A, E>, second: AsyncData<A, E>)
       isOptimistic(second) && Equal.equals(o1.value, second.value) && dataEqual(o1.previous, second.previous)
   })
 }
+
+/**
+ * @since 1.0.0
+ */
+export function toOption<A, E>(data: AsyncData<A, E>): Option.Option<A> {
+  return match(data, {
+    NoData: Option.none,
+    Loading: Option.none,
+    Failure: Option.none,
+    Success: Option.some,
+    Optimistic: Option.some
+  })
+}
+
+/**
+ * @since 1.0.0
+ */
+export function toOptionCause<A, E>(data: AsyncData<A, E>): Option.Option<Cause.Cause<E>> {
+  return match(data, {
+    NoData: Option.none,
+    Loading: Option.none,
+    Failure: Option.some,
+    Success: Option.none,
+    Optimistic: Option.none
+  })
+}
+
+/**
+ * @since 1.0.0
+ */
+export function toOptionError<A, E>(data: AsyncData<A, E>): Option.Option<E> {
+  return match(data, {
+    NoData: Option.none,
+    Loading: Option.none,
+    Failure: Cause.failureOption,
+    Success: Option.none,
+    Optimistic: Option.none
+  })
+}

package/src/Progress.ts

@@ -2,7 +2,7 @@
  * @since 1.0.0
  */
 
-import { Data } from "effect"
+import * as Data from "effect/Data"
 import * as Equivalence from "effect/Equivalence"
 import { dual } from "effect/Function"
 import * as Option from "effect/Option"