From 791828f0a3f19c59ae332d79a9814139cb94ad9f Mon Sep 17 00:00:00 2001 From: maxime Date: Sun, 19 Nov 2023 20:43:33 +0100 Subject: [PATCH] feat: cleanup --- src/index.ts | 4 ++-- .../{ => mutations}/useAsyncQuery.test.tsx | 0 .../react/{ => mutations}/useAsyncQuery.ts | 12 +++++----- .../useQuery.deduplication.test.tsx | 6 ++--- .../useQuery.invalidation.test.tsx | 8 +++---- .../{ => queries}/useQuery.keys.test.tsx | 6 ++--- .../react/{ => queries}/useQuery.test.tsx | 8 +++---- .../queries/react/{ => queries}/useQuery.ts | 22 +++++++++---------- 8 files changed, 33 insertions(+), 33 deletions(-) rename src/lib/queries/react/{ => mutations}/useAsyncQuery.test.tsx (100%) rename src/lib/queries/react/{ => mutations}/useAsyncQuery.ts (96%) rename src/lib/queries/react/{ => queries}/useQuery.deduplication.test.tsx (96%) rename src/lib/queries/react/{ => queries}/useQuery.invalidation.test.tsx (95%) rename src/lib/queries/react/{ => queries}/useQuery.keys.test.tsx (96%) rename src/lib/queries/react/{ => queries}/useQuery.test.tsx (96%) rename src/lib/queries/react/{ => queries}/useQuery.ts (85%) diff --git a/src/index.ts b/src/index.ts index 389f820..8d841ad 100644 --- a/src/index.ts +++ b/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 { diff --git a/src/lib/queries/react/useAsyncQuery.test.tsx b/src/lib/queries/react/mutations/useAsyncQuery.test.tsx similarity index 100% rename from src/lib/queries/react/useAsyncQuery.test.tsx rename to src/lib/queries/react/mutations/useAsyncQuery.test.tsx diff --git a/src/lib/queries/react/useAsyncQuery.ts b/src/lib/queries/react/mutations/useAsyncQuery.ts similarity index 96% rename from src/lib/queries/react/useAsyncQuery.ts rename to src/lib/queries/react/mutations/useAsyncQuery.ts index ca293e0..cf90293 100644 --- a/src/lib/queries/react/useAsyncQuery.ts +++ b/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 { data: R | undefined diff --git a/src/lib/queries/react/useQuery.deduplication.test.tsx b/src/lib/queries/react/queries/useQuery.deduplication.test.tsx similarity index 96% rename from src/lib/queries/react/useQuery.deduplication.test.tsx rename to src/lib/queries/react/queries/useQuery.deduplication.test.tsx index e36510a..7d7c55a 100644 --- a/src/lib/queries/react/useQuery.deduplication.test.tsx +++ b/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() diff --git a/src/lib/queries/react/useQuery.invalidation.test.tsx b/src/lib/queries/react/queries/useQuery.invalidation.test.tsx similarity index 95% rename from src/lib/queries/react/useQuery.invalidation.test.tsx rename to src/lib/queries/react/queries/useQuery.invalidation.test.tsx index df01c9f..6606f22 100644 --- a/src/lib/queries/react/useQuery.invalidation.test.tsx +++ b/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(() => { diff --git a/src/lib/queries/react/useQuery.keys.test.tsx b/src/lib/queries/react/queries/useQuery.keys.test.tsx similarity index 96% rename from src/lib/queries/react/useQuery.keys.test.tsx rename to src/lib/queries/react/queries/useQuery.keys.test.tsx index aabdad6..e1ae48e 100644 --- a/src/lib/queries/react/useQuery.keys.test.tsx +++ b/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() diff --git a/src/lib/queries/react/useQuery.test.tsx b/src/lib/queries/react/queries/useQuery.test.tsx similarity index 96% rename from src/lib/queries/react/useQuery.test.tsx rename to src/lib/queries/react/queries/useQuery.test.tsx index 1de7193..3789889 100644 --- a/src/lib/queries/react/useQuery.test.tsx +++ b/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() diff --git a/src/lib/queries/react/useQuery.ts b/src/lib/queries/react/queries/useQuery.ts similarity index 85% rename from src/lib/queries/react/useQuery.ts rename to src/lib/queries/react/queries/useQuery.ts index 012ddd1..0d41792 100644 --- a/src/lib/queries/react/useQuery.ts +++ b/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,