feat: cleanup

src/index.ts

@@ -20,8 +20,8 @@ export * from "./lib/utils/retryBackoff"
 export * from "./lib/utils/useLiveRef"
 
 // higher helpers
-export * from "./lib/queries/react/useAsyncQuery"
-export * from "./lib/queries/react/useQuery"
+export * from "./lib/queries/react/mutations/useAsyncQuery"
+export * from "./lib/queries/react/queries/useQuery"
 export * from "./lib/queries/react/useSubscribeEffect"
 export * from "./lib/queries/client/createClient"
 export {

src/lib/queries/react/useAsyncQuery.ts → src/lib/queries/react/mutations/useAsyncQuery.ts

@@ -1,4 +1,4 @@
-import { useLiveRef } from "../../utils/useLiveRef"
+import { useLiveRef } from "../../../utils/useLiveRef"
 import {
   type MonoTypeOperatorFunction,
   type Observable,
@@ -21,12 +21,12 @@ import {
   distinctUntilChanged,
   filter
 } from "rxjs"
-import { useBehaviorSubject } from "../../binding/useBehaviorSubject"
-import { useObserve } from "../../binding/useObserve"
-import { useSubject } from "../../binding/useSubject"
+import { useBehaviorSubject } from "../../../binding/useBehaviorSubject"
+import { useObserve } from "../../../binding/useObserve"
+import { useSubject } from "../../../binding/useSubject"
 import { useCallback, useEffect } from "react"
-import { shallowEqual } from "../../utils/shallowEqual"
-import { retryOnError } from "../client/operators"
+import { shallowEqual } from "../../../utils/shallowEqual"
+import { retryOnError } from "../../client/operators"
 
 interface QueryState<R> {
   data: R | undefined

src/lib/queries/react/useQuery.deduplication.test.tsx → src/lib/queries/react/queries/useQuery.deduplication.test.tsx

@@ -3,9 +3,9 @@ import { Subject, interval, tap, timer } from "rxjs"
 import { render, cleanup } from "@testing-library/react"
 import React, { useEffect, useState } from "react"
 import { useQuery } from "./useQuery"
-import { Provider, useQueryClient } from "./Provider"
-import { QueryClient } from "../client/createClient"
-import { serializeKey } from "../client/keys/serializeKey"
+import { Provider, useQueryClient } from "../Provider"
+import { QueryClient } from "../../client/createClient"
+import { serializeKey } from "../../client/keys/serializeKey"
 
 afterEach(() => {
   cleanup()

src/lib/queries/react/useQuery.invalidation.test.tsx → src/lib/queries/react/queries/useQuery.invalidation.test.tsx

@@ -1,10 +1,10 @@
 import { afterEach, describe, expect, it, vi } from "vitest"
 import { render, cleanup } from "@testing-library/react"
 import { useQuery } from "./useQuery"
-import { QueryClient } from "../client/createClient"
-import { QueryClientProvider } from "../../.."
-import { waitForTimeout } from "../../../tests/utils"
-import { printQuery } from "../../../tests/testUtils"
+import { QueryClient } from "../../client/createClient"
+import { QueryClientProvider } from "../../../.."
+import { waitForTimeout } from "../../../../tests/utils"
+import { printQuery } from "../../../../tests/testUtils"
 import { of } from "rxjs"
 
 afterEach(() => {

src/lib/queries/react/useQuery.keys.test.tsx → src/lib/queries/react/queries/useQuery.keys.test.tsx

@@ -3,9 +3,9 @@ import { Subject } from "rxjs"
 import { render, cleanup } from "@testing-library/react"
 import React from "react"
 import { useQuery } from "./useQuery"
-import { printQuery } from "../../../tests/testUtils"
-import { QueryClient, QueryClientProvider } from "../../.."
-import { waitForTimeout } from "../../../tests/utils"
+import { printQuery } from "../../../../tests/testUtils"
+import { QueryClient, QueryClientProvider } from "../../../.."
+import { waitForTimeout } from "../../../../tests/utils"
 
 afterEach(() => {
   cleanup()

src/lib/queries/react/useQuery.test.tsx → src/lib/queries/react/queries/useQuery.test.tsx

@@ -3,10 +3,10 @@ import { Subject, interval, of, tap } from "rxjs"
 import { render, cleanup } from "@testing-library/react"
 import React, { memo, useEffect, useRef, useState } from "react"
 import { useQuery } from "./useQuery"
-import { printQuery } from "../../../tests/testUtils"
-import { useSubscribe } from "../../binding/useSubscribe"
-import { QueryClient, QueryClientProvider } from "../../.."
-import { waitForTimeout } from "../../../tests/utils"
+import { printQuery } from "../../../../tests/testUtils"
+import { useSubscribe } from "../../../binding/useSubscribe"
+import { QueryClient, QueryClientProvider } from "../../../.."
+import { waitForTimeout } from "../../../../tests/utils"
 
 afterEach(() => {
   cleanup()

src/lib/queries/react/useQuery.ts → src/lib/queries/react/queries/useQuery.ts

@@ -12,21 +12,21 @@ import {
   identity,
   throttleTime
 } from "rxjs"
-import { type UseQueryResult, type UseQueryOptions } from "./types"
-import { useObserve } from "../../binding/useObserve"
-import { useSubject } from "../../binding/useSubject"
-import { useQueryClient } from "./Provider"
-import { arrayEqual } from "../../utils/arrayEqual"
-import { shallowEqual } from "../../utils/shallowEqual"
-import { isDefined } from "../../utils/isDefined"
+import { type UseQueryResult, type UseQueryOptions } from "../types"
+import { useObserve } from "../../../binding/useObserve"
+import { useSubject } from "../../../binding/useSubject"
+import { useQueryClient } from "../Provider"
+import { arrayEqual } from "../../../utils/arrayEqual"
+import { shallowEqual } from "../../../utils/shallowEqual"
+import { isDefined } from "../../../utils/isDefined"
 import {
   type QueryResult,
   type QueryFn,
   type QueryTrigger
-} from "../client/types"
-import { createActivityTrigger } from "./triggers/activityTrigger"
-import { createNetworkTrigger } from "./triggers/networkTrigger"
-import { useQueryParams } from "./helpers"
+} from "../../client/types"
+import { createActivityTrigger } from "../triggers/activityTrigger"
+import { createNetworkTrigger } from "../triggers/networkTrigger"
+import { useQueryParams } from "../helpers"
 
 const defaultValue = {
   data: undefined,