Refactor Query/Mutation

packages/effect-fc-next/src/QueryClient.ts

@@ -1,7 +1,6 @@
 import { type Cause, Context, DateTime, Duration, Effect, Equal, Equivalence, Hash, HashMap, type Option, Pipeable, Predicate, Schedule, type Scope, Semaphore, SubscriptionRef } from "effect"
 import type { AsyncResult } from "effect/unstable/reactivity"
 import * as Lens from "./Lens.js"
-import type * as Query from "./Query.js"
 import type * as Subscribable from "./Subscribable.js"
 
 
@@ -23,7 +22,7 @@ export interface QueryClientService extends Pipeable.Pipeable {
         result: AsyncResult.Success<unknown, unknown>,
         staleTime: Duration.Duration,
     ): Effect.Effect<QueryClientCacheEntry>
-    invalidateCacheEntries(f: (key: Query.Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>): Effect.Effect<void>
+    invalidateCacheEntries(f: (key: unknown) => Effect.Effect<unknown, unknown, unknown>): Effect.Effect<void>
     invalidateCacheEntry(key: QueryClientCacheKey): Effect.Effect<void>
 }
 
@@ -86,7 +85,7 @@ implements QueryClientService {
         )
     }
 
-    invalidateCacheEntries(f: (key: Query.Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>): Effect.Effect<void> {
+    invalidateCacheEntries(f: (key: unknown) => Effect.Effect<unknown, unknown, unknown>): Effect.Effect<void> {
         return Lens.update(this.cache, HashMap.filter((_, key) => !Equivalence.strictEqual()(key.f, f)))
     }
     invalidateCacheEntry(key: QueryClientCacheKey): Effect.Effect<void> {
@@ -137,17 +136,17 @@ implements Pipeable.Pipeable, Equal.Equal {
     readonly [QueryClientCacheKeyTypeId]: QueryClientCacheKeyTypeId = QueryClientCacheKeyTypeId
 
     constructor(
-        readonly key: Query.Query.AnyKey,
-        readonly f: (key: Query.Query.AnyKey) => Effect.Effect<unknown, unknown, unknown>,
+        readonly key: unknown,
+        readonly f: (key: unknown) => Effect.Effect<unknown, unknown, unknown>,
     ) {
         super()
     }
 
     [Equal.symbol](that: Equal.Equal) {
-        return isQueryClientCacheKey(that) && Equivalence.Array(Equal.asEquivalence())(this.key, that.key) && Equivalence.strictEqual()(this.f, that.f)
+        return isQueryClientCacheKey(that) && Equal.equals(this.key, that.key) && Equivalence.strictEqual()(this.f, that.f)
     }
     [Hash.symbol]() {
-        return Hash.combine(Hash.hash(this.f))(Hash.array(this.key))
+        return Hash.combine(Hash.hash(this.f))(Hash.hash(this.key))
     }
 }