@typed/async-data 0.3.3 → 0.3.4

package/dist/esm/internal/async-data.js

@@ -1,22 +1,20 @@
 // Internal
-import * as Cause from "effect/Cause";
 import * as Effect from "effect/Effect";
 import * as Effectable from "effect/Effectable";
 import * as Equal from "effect/Equal";
 import { constant, pipe } from "effect/Function";
 import * as Hash from "effect/Hash";
-import * as Option from "effect/Option";
-import * as Unify from "effect/Unify";
-import { FAILURE_TAG, LOADING_TAG, NO_DATA_TAG, SUCCESS_TAG } from "./tag.js";
+import { hasProperty } from "effect/Predicate";
+import { AsyncDataTypeId } from "../TypeId.js";
+import { FAILURE_TAG, OPTIMISTIC_TAG, SUCCESS_TAG } from "./tag.js";
+// @ts-expect-error
 export class FailureImpl extends Effectable.Class {
     cause;
     timestamp;
     refreshing;
-    _tag = "Failure";
+    [AsyncDataTypeId] = AsyncDataTypeId;
+    _tag = FAILURE_TAG;
     commit;
-    [Unify.typeSymbol];
-    [Unify.unifySymbol];
-    [Unify.ignoreSymbol];
     constructor(cause, timestamp, refreshing) {
         super();
         this.cause = cause;
@@ -24,25 +22,28 @@ export class FailureImpl extends Effectable.Class {
         this.refreshing = refreshing;
         this.commit = constant(Effect.failCause(cause));
     }
-    [Equal.symbol] = (that) => {
-        return isAsyncData(that) && that._tag === "Failure"
-            && Equal.equals(this.cause, that.cause)
-            && Equal.equals(this.timestamp, that.timestamp)
+    [Equal.symbol](that) {
+        if (this === that)
+            return true;
+        if (!isAsyncData(that) || that._tag !== FAILURE_TAG)
+            return false;
+        console.log(Equal.equals(this.cause, that.cause), this.timestamp === that.timestamp, Equal.equals(this.refreshing, that.refreshing));
+        return Equal.equals(this.cause, that.cause)
+            && this.timestamp === that.timestamp
             && Equal.equals(this.refreshing, that.refreshing);
-    };
-    [Hash.symbol] = () => {
-        return pipe(Hash.string(this._tag), Hash.combine(Hash.hash(this.cause)), Hash.combine(Hash.hash(this.refreshing)));
-    };
+    }
+    [Hash.symbol]() {
+        return pipe(Hash.string(this._tag), Hash.combine(Hash.hash(this.cause)), Hash.combine(Hash.hash(this.timestamp)), Hash.combine(Hash.hash(this.refreshing)));
+    }
 }
+// @ts-expect-error
 export class SuccessImpl extends Effectable.Class {
     value;
     timestamp;
     refreshing;
-    _tag = "Success";
+    [AsyncDataTypeId] = AsyncDataTypeId;
+    _tag = SUCCESS_TAG;
     commit;
-    [Unify.typeSymbol];
-    [Unify.unifySymbol];
-    [Unify.ignoreSymbol];
     constructor(value, timestamp, refreshing) {
         super();
         this.value = value;
@@ -50,48 +51,42 @@ export class SuccessImpl extends Effectable.Class {
         this.refreshing = refreshing;
         this.commit = constant(Effect.succeed(value));
     }
-    [Equal.symbol] = (that) => {
-        return isAsyncData(that) && that._tag === "Success"
+    [Equal.symbol](that) {
+        return isAsyncData(that) && that._tag === SUCCESS_TAG
             && Equal.equals(this.value, that.value)
             && Equal.equals(this.timestamp, that.timestamp)
             && Equal.equals(this.refreshing, that.refreshing);
-    };
-    [Hash.symbol] = () => {
-        return pipe(Hash.string(this._tag), Hash.combine(Hash.hash(this.value)), Hash.combine(Hash.hash(this.refreshing)));
-    };
-}
-export function hasDataOptions(u) {
-    if ("timestamp" in u && "refreshing" in u) {
-        return typeof u.timestamp === "bigint" && Option.isOption(u.refreshing);
     }
-    else
-        return false;
-}
-export function hasEquality(u) {
-    return Equal.symbol in u && Hash.symbol in u;
-}
-export function isTaggedRecord(u) {
-    return isRecord(u) && "_tag" in u;
+    [Hash.symbol]() {
+        return pipe(Hash.string(this._tag), Hash.combine(Hash.hash(this.value)), Hash.combine(Hash.hash(this.timestamp)), Hash.combine(Hash.hash(this.refreshing)));
+    }
 }
-export function isRecord(u) {
-    return typeof u === "object" && u !== null && !Array.isArray(u);
+// @ts-expect-error
+export class OptimisticImpl extends Effectable.Class {
+    value;
+    timestamp;
+    previous;
+    [AsyncDataTypeId] = AsyncDataTypeId;
+    _tag = OPTIMISTIC_TAG;
+    commit;
+    constructor(value, timestamp, previous) {
+        super();
+        this.value = value;
+        this.timestamp = timestamp;
+        this.previous = previous;
+        this.commit = constant(Effect.succeed(value));
+    }
+    [Equal.symbol](that) {
+        return isAsyncData(that) && that._tag === OPTIMISTIC_TAG
+            && Equal.equals(this.value, that.value)
+            && Equal.equals(this.timestamp, that.timestamp)
+            && Equal.equals(this.previous, that.previous);
+    }
+    [Hash.symbol]() {
+        return pipe(Hash.string(this._tag), Hash.combine(Hash.hash(this.value)), Hash.combine(Hash.hash(this.timestamp)), Hash.combine(Hash.hash(this.previous)));
+    }
 }
 export function isAsyncData(u) {
-    if (isTaggedRecord(u) && hasEquality(u)) {
-        switch (u._tag) {
-            case NO_DATA_TAG:
-                return "timstamp" in u && typeof u.timestamp === "bigint";
-            case LOADING_TAG:
-                return "progress" in u && Option.isOption(u.progress);
-            case FAILURE_TAG:
-                return hasDataOptions(u) && "cause" in u && Cause.isCause(u.cause);
-            case SUCCESS_TAG:
-                return hasDataOptions(u) && "value" in u;
-            default:
-                return false;
-        }
-    }
-    else
-        return false;
+    return hasProperty(u, AsyncDataTypeId);
 }
 //# sourceMappingURL=async-data.js.map

package/dist/esm/internal/async-data.js.map

@@ -1 +1 @@
-{"version":3,"file":"async-data.js","sourceRoot":"","sources":["../../../src/internal/async-data.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"async-data.js","sourceRoot":"","sources":["../../../src/internal/async-data.ts"],"names":[],"mappings":"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"}

package/dist/esm/internal/tag.js

@@ -2,4 +2,5 @@ export const NO_DATA_TAG = "NoData";
 export const LOADING_TAG = "Loading";
 export const FAILURE_TAG = "Failure";
 export const SUCCESS_TAG = "Success";
+export const OPTIMISTIC_TAG = "Optimistic";
 //# sourceMappingURL=tag.js.map

package/dist/esm/internal/tag.js.map

@@ -1 +1 @@
-{"version":3,"file":"tag.js","sourceRoot":"","sources":["../../../src/internal/tag.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,QAAiB,CAAA;AAE5C,MAAM,CAAC,MAAM,WAAW,GAAG,SAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG,SAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG,SAAkB,CAAA"}
+{"version":3,"file":"tag.js","sourceRoot":"","sources":["../../../src/internal/tag.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,WAAW,GAAG,QAAiB,CAAA;AAE5C,MAAM,CAAC,MAAM,WAAW,GAAG,SAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG,SAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,WAAW,GAAG,SAAkB,CAAA;AAE7C,MAAM,CAAC,MAAM,cAAc,GAAG,YAAqB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed/async-data",
-  "version": "0.3.3",
+  "version": "0.3.4",
   "description": "",
   "license": "MIT",
   "repository": {
@@ -30,6 +30,11 @@
       "types": "./dist/dts/Schema.d.ts",
       "import": "./dist/esm/Schema.js",
       "default": "./dist/cjs/Schema.js"
+    },
+    "./TypeId": {
+      "types": "./dist/dts/TypeId.d.ts",
+      "import": "./dist/esm/TypeId.js",
+      "default": "./dist/cjs/TypeId.js"
     }
   },
   "typesVersions": {
@@ -42,6 +47,9 @@
       ],
       "Schema": [
         "./dist/dts/Schema.d.ts"
+      ],
+      "TypeId": [
+        "./dist/dts/TypeId.d.ts"
       ]
     }
   }

package/src/AsyncData.ts

@@ -17,8 +17,9 @@ import { dual } from "effect/Function"
 import * as Option from "effect/Option"
 import * as Unify from "effect/Unify"
 import * as internal from "./internal/async-data.js"
-import { FAILURE_TAG, LOADING_TAG, NO_DATA_TAG, SUCCESS_TAG } from "./internal/tag.js"
+import { FAILURE_TAG, LOADING_TAG, NO_DATA_TAG, OPTIMISTIC_TAG, SUCCESS_TAG } from "./internal/tag.js"
 import * as Progress from "./Progress.js"
+import { AsyncDataTypeId } from "./TypeId.js"
 
 const getCurrentTimestamp = () => Date.now()
 
@@ -28,7 +29,7 @@ const getCurrentTimestamp = () => Date.now()
  *
  * @since 1.0.0
  */
-export type AsyncData<E, A> = NoData | Loading | Failure<E> | Success<A>
+export type AsyncData<E, A> = NoData | Loading | Failure<E> | Success<A> | Optimistic<E, A>
 
 /**
  * @since 1.0.0
@@ -73,6 +74,11 @@ export namespace AsyncData {
  * @since 1.0.0
  */
 export class NoData extends Data.TaggedError(NO_DATA_TAG)<{}> {
+  /**
+   * @since 1.0.0
+   */
+  readonly [AsyncDataTypeId]: AsyncDataTypeId = AsyncDataTypeId
+
   /**
    * @since 1.0.0
    */
@@ -99,6 +105,11 @@ export const noData: {
  * @since 1.0.0
  */
 export class Loading extends Data.TaggedError(LOADING_TAG)<LoadingOptions> {
+  /**
+   * @since 1.0.0
+   */
+  readonly [AsyncDataTypeId]: AsyncDataTypeId = AsyncDataTypeId
+
   /**
    * @since 1.0.0
    */
@@ -138,14 +149,17 @@ export const loading: {
   <E, A>(options?: OptionalPartial<LoadingOptions>): AsyncData<E, A>
 } = (options?: OptionalPartial<LoadingOptions>): Loading =>
   new Loading({
+    [AsyncDataTypeId]: AsyncDataTypeId,
     timestamp: options?.timestamp ?? getCurrentTimestamp(),
     progress: Option.fromNullable(options?.progress)
-  })
+  } as any)
 
 /**
  * @since 1.0.0
  */
 export interface Failure<out E> extends Effect.Effect<never, E, never> {
+  readonly [AsyncDataTypeId]: AsyncDataTypeId
+
   /**
    * @since 1.18.0
    */
@@ -201,7 +215,7 @@ export const failCause: {
     cause,
     options?.timestamp ?? getCurrentTimestamp(),
     Option.fromNullable(options?.refreshing)
-  )
+  ) as any
 
 /**
  * @since 1.0.0
@@ -215,6 +229,8 @@ export const fail: {
  * @since 1.0.0
  */
 export interface Success<out A> extends Effect.Effect<never, never, A> {
+  readonly [AsyncDataTypeId]: AsyncDataTypeId
+
   readonly _tag: typeof SUCCESS_TAG
   readonly value: A
   /**
@@ -247,13 +263,59 @@ export const success: {
     value,
     options?.timestamp ?? getCurrentTimestamp(),
     Option.fromNullable(options?.refreshing)
-  )
+  ) as any
+
+/**
+ * @since 1.0.0
+ */
+export interface Optimistic<E, A> extends Effect.Effect<never, never, A> {
+  readonly [AsyncDataTypeId]: AsyncDataTypeId
+  readonly _tag: "Optimistic"
+  readonly value: A
+  readonly timestamp: number // Date.now()
+  readonly previous: AsyncData<E, A>
+
+  readonly [Unify.typeSymbol]: unknown
+  readonly [Unify.unifySymbol]: AsyncData.Unify<this>
+  readonly [Unify.ignoreSymbol]: AsyncData.IgnoreList
+}
+
+/**
+ * @since 1.0.0
+ */
+export interface OptimisticOptions {
+  readonly timestamp: number // Date.now()
+}
+
+const isAsyncDataFirst = (args: IArguments) => isAsyncData(args[0])
+
+/**
+ * @since 1.0.0
+ */
+export const optimistic: {
+  <A>(value: A, options?: OptionalPartial<OptimisticOptions>): <E>(previous: AsyncData<E, A>) => Optimistic<E, A>
+  <E, A>(previous: AsyncData<E, A>, value: A, options?: OptionalPartial<OptimisticOptions>): Optimistic<E, A>
+} = dual(
+  (args) => args.length === 3 || isAsyncDataFirst(args),
+  <E, A>(previous: AsyncData<E, A>, value: A, options?: OptionalPartial<OptimisticOptions>): Optimistic<E, A> =>
+    new internal.OptimisticImpl(
+      value,
+      options?.timestamp ?? getCurrentTimestamp(),
+      // We don't want to nest Optimistic values, so we unwrap the previous value if it's already optimistic
+      previous._tag === "Optimistic" ? previous.previous : previous
+    ) as any
+)
 
 /**
  * @since 1.0.0
  */
 export const isSuccess = <E, A>(data: AsyncData<E, A>): data is Success<A> => data._tag === SUCCESS_TAG
 
+/**
+ * @since 1.0.0
+ */
+export const isOptimistic = <E, A>(data: AsyncData<E, A>): data is Optimistic<E, A> => data._tag === OPTIMISTIC_TAG
+
 /**
  * @since 1.0.0
  */
@@ -292,41 +354,48 @@ export interface RefreshingSuccess<A> extends Success<A> {
  * @since 1.0.0
  */
 export const isRefreshing = <E, A>(data: AsyncData<E, A>): data is Refreshing<E, A> =>
-  isSuccess(data) || isFailure(data) ? Option.isSome(data.refreshing) : false
+  isSuccess(data) || isFailure(data)
+    ? Option.isSome(data.refreshing)
+    : isOptimistic(data)
+    ? isRefreshing(data.previous)
+    : false
 
 /**
  * @since 1.0.0
  */
 export const isLoadingOrRefreshing = <E, A>(data: AsyncData<E, A>): data is Loading | Refreshing<E, A> =>
-  isLoading(data) || isRefreshing(data)
+  isLoading(data) || isRefreshing(data) || (isOptimistic(data) && isLoadingOrRefreshing(data.previous))
 
 /**
  * @since 1.0.0
  */
 export const match: {
-  <E, A, R1, R2, R3, R4>(
+  <E, A, R1, R2, R3, R4, R5>(
     matchers: {
       NoData: (data: NoData) => R1
       Loading: (data: Loading) => R2
       Failure: (cause: Cause.Cause<E>, data: Failure<E>) => R3
       Success: (value: A, data: Success<A>) => R4
+      Optimistic: (value: A, data: Optimistic<E, A>) => R5
     }
-  ): (data: AsyncData<E, A>) => Unify.Unify<R1 | R2 | R3 | R4>
+  ): (data: AsyncData<E, A>) => Unify.Unify<R1 | R2 | R3 | R4 | R5>
 
-  <E, A, R1, R2, R3, R4>(
+  <E, A, R1, R2, R3, R4, R5>(
     data: AsyncData<E, A>,
     matchers: {
       NoData: (data: NoData) => R1
       Loading: (data: Loading) => R2
       Failure: (cause: Cause.Cause<E>, data: Failure<E>) => R3
       Success: (value: A, data: Success<A>) => R4
+      Optimistic: (value: A, data: Optimistic<E, A>) => R5
     }
-  ): Unify.Unify<R1 | R2 | R3 | R4>
-} = dual(2, <E, A, R1, R2, R3, R4>(data: AsyncData<E, A>, matchers: {
+  ): Unify.Unify<R1 | R2 | R3 | R4 | R5>
+} = dual(2, <E, A, R1, R2, R3, R4, R5>(data: AsyncData<E, A>, matchers: {
   NoData: (data: NoData) => R1
   Loading: (data: Loading) => R2
   Failure: (cause: Cause.Cause<E>, data: Failure<E>) => R3
   Success: (value: A, data: Success<A>) => R4
+  Optimistic: (value: A, data: Optimistic<E, A>) => R5
 }): Unify.Unify<R1 | R2 | R3 | R4> => {
   if (isSuccess(data)) {
     return matchers.Success(data.value, data) as Unify.Unify<R1 | R2 | R3 | R4>
@@ -334,8 +403,10 @@ export const match: {
     return matchers.Failure(data.cause, data) as Unify.Unify<R1 | R2 | R3 | R4>
   } else if (isLoading(data)) {
     return matchers.Loading(data) as Unify.Unify<R1 | R2 | R3 | R4>
-  } else {
+  } else if (isNoData(data)) {
     return matchers.NoData(data) as Unify.Unify<R1 | R2 | R3 | R4>
+  } else {
+    return matchers.Optimistic(data.value, data) as Unify.Unify<R1 | R2 | R3 | R4>
   }
 })
 
@@ -345,27 +416,41 @@ export const match: {
 export const map: {
   <A, B>(f: (a: A) => B): <E>(data: AsyncData<E, A>) => AsyncData<E, B>
   <E, A, B>(data: AsyncData<E, A>, f: (a: A) => B): AsyncData<E, B>
-} = dual(2, function<E, A, B>(data: AsyncData<E, A>, f: (a: A) => B): AsyncData<E, B> {
-  return isSuccess(data) ?
-    success(f(data.value), {
+} = dual(2, function map<E, A, B>(data: AsyncData<E, A>, f: (a: A) => B): AsyncData<E, B> {
+  if (isSuccess(data)) {
+    return success(f(data.value), {
+      timestamp: data.timestamp,
       refreshing: Option.getOrUndefined(data.refreshing)
-    }) :
-    data
+    })
+  } else if (isOptimistic(data)) {
+    return optimistic(map(data.previous, f), f(data.value), { timestamp: data.timestamp })
+  } else {
+    return data
+  }
 })
 
 /**
  * @since 1.0.0
  */
 export const flatMap: {
-  <A, E2, B>(f: (a: A, options: SuccessOptions) => AsyncData<E2, B>): <E>(data: AsyncData<E, A>) => AsyncData<E | E2, B>
-  <E, A, E2, B>(data: AsyncData<E, A>, f: (a: A, options: SuccessOptions) => AsyncData<E, B>): AsyncData<E | E2, B>
+  <E, A, E2, B>(
+    f: (a: A, data: Success<A> | Optimistic<E, A>) => AsyncData<E2, B>
+  ): (data: AsyncData<E, A>) => AsyncData<E | E2, B>
+  <E, A, E2, B>(
+    data: AsyncData<E, A>,
+    f: (a: A, data: Success<A> | Optimistic<E, A>) => AsyncData<E, B>
+  ): AsyncData<E | E2, B>
 } = dual(
   2,
   function<E, A, E2, B>(
     data: AsyncData<E, A>,
-    f: (a: A, options: SuccessOptions) => AsyncData<E2, B>
+    f: (a: A, data: Success<A> | Optimistic<E, A>) => AsyncData<E2, B>
   ): AsyncData<E | E2, B> {
-    return isSuccess(data) ? f(data.value, data) : data
+    if (isSuccess(data) || isOptimistic(data)) {
+      return f(data.value, data)
+    } else {
+      return data
+    }
   }
 )
 
@@ -379,6 +464,8 @@ export const startLoading = <E, A>(data: AsyncData<E, A>): AsyncData<E, A> => {
     return Option.isSome(data.refreshing)
       ? data
       : failCause(data.cause, { ...data, refreshing: loading() })
+  } else if (isOptimistic(data)) {
+    return optimistic(startLoading(data.previous), data.value, data)
   } else {
     return loading()
   }
@@ -392,6 +479,8 @@ export const stopLoading = <E, A>(data: AsyncData<E, A>): AsyncData<E, A> => {
     return Option.isSome(data.refreshing) ? success(data.value) : data
   } else if (isFailure(data)) {
     return Option.isSome(data.refreshing) ? failCause(data.cause) : data
+  } else if (isOptimistic(data)) {
+    return optimistic(stopLoading(data.previous), data.value, data)
   } else {
     return noData()
   }
@@ -421,7 +510,7 @@ export const getFailure = <E, A>(data: AsyncData<E, A>): Option.Option<E> =>
  * @since 1.0.0
  */
 export const getSuccess = <E, A>(data: AsyncData<E, A>): Option.Option<A> =>
-  isSuccess(data) ? Option.some(data.value) : Option.none()
+  isSuccess(data) || isOptimistic(data) ? Option.some(data.value) : Option.none()
 
 const optionProgressEq = Option.getEquivalence(Progress.equals)
 
@@ -448,20 +537,45 @@ const successEquivalence = <A>(valueEq: Equivalence.Equivalence<A>): Equivalence
     refreshing: optionLoadingEq
   })
 
+const optimisticEquivalence = <E, A>(
+  valueEq: Equivalence.Equivalence<A>
+): Equivalence.Equivalence<Optimistic<E, A>> => {
+  let previousEq: Equivalence.Equivalence<AsyncData<E, A>> | undefined
+  const get = () => {
+    if (previousEq === undefined) {
+      previousEq = getEquivalence(valueEq)
+    }
+    return previousEq
+  }
+
+  return Equivalence.struct({
+    _tag: Equivalence.string,
+    value: valueEq,
+    timestamp: Equivalence.number,
+    previous: (a, b) => get()(a, b)
+  })
+}
+
 /**
  * @since 1.0.0
  */
-export const getEquivalence =
-  <E, A>(valueEq: Equivalence.Equivalence<A> = Equal.equals): Equivalence.Equivalence<AsyncData<E, A>> => (a, b) => {
+export const getEquivalence = <E, A>(
+  valueEq: Equivalence.Equivalence<A> = Equal.equals
+): Equivalence.Equivalence<AsyncData<E, A>> => {
+  const successEq_ = successEquivalence(valueEq)
+  const optimisticEq_ = optimisticEquivalence(valueEq)
+  return (a, b) => {
     if (a === b) return true
 
     return match(a, {
       NoData: () => isNoData(b),
       Loading: (l1) => isLoading(b) ? loadingEquivalence(l1, b) : false,
       Failure: (_, f1) => isFailure(b) ? failureEquivalence(f1, b) : false,
-      Success: (_, s1) => isSuccess(b) ? successEquivalence(valueEq)(s1, b) : false
+      Success: (_, s1) => isSuccess(b) ? successEq_(s1, b) : false,
+      Optimistic: (_, o1) => isOptimistic(b) ? optimisticEq_(o1, b) : false
     })
   }
+}
 
 /**
  * @since 1.0.0
@@ -483,8 +597,6 @@ export function fromEither<E, A>(either: Either.Either<E, A>): AsyncData<E, A> {
   })
 }
 
-const isAsyncDataFirst = (args: IArguments) => args.length === 3 || isAsyncData(args[0])
-
 /**
  * @since 1.0.0
  */
@@ -498,7 +610,7 @@ export const isExpired: {
 ): boolean {
   return match(data, {
     NoData: () => true,
-    Loading: () => false,
+    Loading: ({ timestamp }) => isPastTTL(timestamp, ttl, now),
     Failure: (_, f) =>
       Option.isNone(f.refreshing)
         ? isPastTTL(f.timestamp, ttl, now)
@@ -506,14 +618,16 @@ export const isExpired: {
     Success: (_, s) =>
       Option.isNone(s.refreshing)
         ? isPastTTL(s.timestamp, ttl, now) :
-        isPastTTL(s.refreshing.value.timestamp, ttl, now)
+        isPastTTL(s.refreshing.value.timestamp, ttl, now),
+    Optimistic: (_, o) =>
+      isPastTTL(o.timestamp, ttl, now) || (o.previous._tag === NO_DATA_TAG ? false : isExpired(o.previous, ttl, now))
   })
 })
 
 function isPastTTL(timestamp: number, ttl: Duration.DurationInput, now: number): boolean {
   const millis = Duration.toMillis(ttl)
 
-  return now - timestamp > millis
+  return now - timestamp >= millis
 }
 
 /**
@@ -529,6 +643,8 @@ export function dataEqual<E, A>(first: AsyncData<E, A>, second: AsyncData<E, A>)
     Failure: (_, f1) =>
       isFailure(second) && Equal.equals(f1.cause, second.cause) && Equal.equals(f1.refreshing, second.refreshing),
     Success: (_, s1) =>
-      isSuccess(second) && Equal.equals(s1.value, second.value) && Equal.equals(s1.refreshing, second.refreshing)
+      isSuccess(second) && Equal.equals(s1.value, second.value) && Equal.equals(s1.refreshing, second.refreshing),
+    Optimistic: (_, o1) =>
+      isOptimistic(second) && Equal.equals(o1.value, second.value) && dataEqual(o1.previous, second.previous)
   })
 }