@effect-app/vue 4.0.0-beta.331 → 4.0.0-beta.332
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/dist/atomQuery.d.ts +3 -3
- package/dist/atomQuery.d.ts.map +1 -1
- package/dist/atomQuery.js +5 -5
- package/dist/commander.d.ts +1 -1
- package/dist/commander.d.ts.map +1 -1
- package/dist/commander.js +2 -2
- package/dist/internal/tanstackQuery.js +4 -4
- package/dist/lib.d.ts +1 -1
- package/dist/lib.d.ts.map +1 -1
- package/dist/lib.js +3 -3
- package/dist/makeClient.d.ts +1 -1
- package/dist/makeClient.d.ts.map +1 -1
- package/dist/makeClient.js +2 -2
- package/dist/mutate.d.ts +2 -2
- package/dist/mutate.d.ts.map +1 -1
- package/dist/mutate.js +2 -2
- package/dist/query.d.ts +2 -2
- package/dist/query.d.ts.map +1 -1
- package/dist/query.js +3 -3
- package/dist/queryLifetime.d.ts +2 -2
- package/dist/queryLifetime.d.ts.map +1 -1
- package/dist/queryLifetime.js +2 -2
- package/dist/suspense.d.ts +1 -1
- package/dist/suspense.d.ts.map +1 -1
- package/dist/suspense.js +2 -2
- package/package.json +6 -6
- package/src/atomQuery.ts +4 -4
- package/src/commander.ts +1 -1
- package/src/internal/tanstackQuery.ts +3 -3
- package/src/lib.ts +2 -2
- package/src/makeClient.ts +2 -2
- package/src/mutate.ts +2 -2
- package/src/query.ts +2 -2
- package/src/queryLifetime.ts +2 -2
- package/src/suspense.ts +1 -1
- package/test/dependencyInvalidation.test.ts +1 -1
- package/test/dist/stubs.d.ts +5 -5
- package/test/dist/stubs.js +2 -2
- package/test/inactiveInvalidation.test.ts +2 -2
- package/test/interrupt-refetch-repro.test.ts +2 -2
- package/test/makeClient.test.ts +5 -7
- package/test/query-span.test.ts +1 -1
- package/test/queryOptions.test.ts +1 -1
- package/test/stubs.ts +3 -3
- package/test/suspense-regression.test.ts +4 -4
- package/test/suspense.test.ts +2 -2
package/src/atomQuery.ts
CHANGED
|
@@ -24,14 +24,14 @@ import * as Cause from "effect/Cause"
|
|
|
24
24
|
import * as Duration from "effect/Duration"
|
|
25
25
|
import * as Equal from "effect/Equal"
|
|
26
26
|
import * as Hash from "effect/Hash"
|
|
27
|
+
import { isHttpClientError } from "effect/http/HttpClientError"
|
|
27
28
|
import type * as Layer from "effect/Layer"
|
|
29
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
30
|
+
import * as Atom from "effect/reactivity/Atom"
|
|
31
|
+
import * as AtomRegistry from "effect/reactivity/AtomRegistry"
|
|
28
32
|
import * as Ref from "effect/Ref"
|
|
29
33
|
import * as Stream from "effect/Stream"
|
|
30
34
|
import type * as Tracer from "effect/Tracer"
|
|
31
|
-
import { isHttpClientError } from "effect/unstable/http/HttpClientError"
|
|
32
|
-
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
33
|
-
import * as Atom from "effect/unstable/reactivity/Atom"
|
|
34
|
-
import * as AtomRegistry from "effect/unstable/reactivity/AtomRegistry"
|
|
35
35
|
import { clearQueryReadDependencies, getQueryReadDependencies, type QueryInvalidationMode, registerQueryInvalidationMode, setQueryReadDependencies } from "./dependencyMetadata.ts"
|
|
36
36
|
import { reportRuntimeError } from "./lib.ts"
|
|
37
37
|
import { beginLiveQueryFetch, endLiveQueryFetch, type LiveQueryOptions, registerLiveQuery } from "./liveQueryInvalidation.ts"
|
package/src/commander.ts
CHANGED
|
@@ -17,8 +17,8 @@ import { flow } from "effect/Function"
|
|
|
17
17
|
import * as MutableHashMap from "effect/MutableHashMap"
|
|
18
18
|
import * as Predicate from "effect/Predicate"
|
|
19
19
|
import { type Refinement } from "effect/Predicate"
|
|
20
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
20
21
|
import * as Stream from "effect/Stream"
|
|
21
|
-
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
22
22
|
import { type FormatXMLElementFn, type PrimitiveType } from "intl-messageformat"
|
|
23
23
|
import { computed, type ComputedRef, reactive, ref, toRaw } from "vue"
|
|
24
24
|
import { Confirm } from "./confirm.ts"
|
|
@@ -8,11 +8,11 @@ import * as Effect from "effect-app/Effect"
|
|
|
8
8
|
import * as Option from "effect-app/Option"
|
|
9
9
|
import * as S from "effect-app/Schema"
|
|
10
10
|
import * as Cause from "effect/Cause"
|
|
11
|
+
import { isHttpClientError } from "effect/http/HttpClientError"
|
|
12
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
13
|
+
import * as Atom from "effect/reactivity/Atom"
|
|
11
14
|
import * as Ref from "effect/Ref"
|
|
12
15
|
import type * as Tracer from "effect/Tracer"
|
|
13
|
-
import { isHttpClientError } from "effect/unstable/http/HttpClientError"
|
|
14
|
-
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
15
|
-
import * as Atom from "effect/unstable/reactivity/Atom"
|
|
16
16
|
import { computed, type MaybeRefOrGetter, shallowRef, toValue, watch, type WatchSource } from "vue"
|
|
17
17
|
import { replaceEqualDeep } from "../atomQuery.ts"
|
|
18
18
|
import { clearQueryReadDependencies, registerQueryInvalidationMode, setQueryReadDependencies } from "../dependencyMetadata.ts"
|
package/src/lib.ts
CHANGED
|
@@ -3,11 +3,11 @@ import type { Req } from "effect-app/client"
|
|
|
3
3
|
import type { RequestHandlerWithInput } from "effect-app/client/clientFor"
|
|
4
4
|
import type * as Effect from "effect-app/Effect"
|
|
5
5
|
import * as Cause from "effect/Cause"
|
|
6
|
-
import { isHttpClientError } from "effect/
|
|
6
|
+
import { isHttpClientError } from "effect/http/HttpClientError"
|
|
7
7
|
import { isProxy, isReactive, isRef, type MaybeRefOrGetter, toRaw } from "vue"
|
|
8
8
|
import { reportError } from "./errorReporter.ts"
|
|
9
9
|
|
|
10
|
-
export * as AsyncResult from "effect/
|
|
10
|
+
export * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
11
11
|
|
|
12
12
|
const reportRuntimeError_ = reportError("Runtime")
|
|
13
13
|
|
package/src/makeClient.ts
CHANGED
|
@@ -14,10 +14,10 @@ import * as Exit from "effect/Exit"
|
|
|
14
14
|
import { type Fiber } from "effect/Fiber"
|
|
15
15
|
import * as Hash from "effect/Hash"
|
|
16
16
|
import type * as ManagedRuntime from "effect/ManagedRuntime"
|
|
17
|
+
import type * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
18
|
+
import * as Reactivity from "effect/reactivity/Reactivity"
|
|
17
19
|
import type * as Stream from "effect/Stream"
|
|
18
20
|
import * as Struct from "effect/Struct"
|
|
19
|
-
import type * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
20
|
-
import * as Reactivity from "effect/unstable/reactivity/Reactivity"
|
|
21
21
|
import { type ComputedRef, effectScope, onBeforeUnmount, onScopeDispose, ref, type WatchSource } from "vue"
|
|
22
22
|
import { type AtomClientRuntime, invalidateAndAwait, invalidateSoft, makeAtomClientRuntime } from "./atomQuery.ts"
|
|
23
23
|
import { type Commander, CommanderStatic, type Progress } from "./commander.ts"
|
package/src/mutate.ts
CHANGED
|
@@ -8,10 +8,10 @@ import * as Option from "effect-app/Option"
|
|
|
8
8
|
import { isReadonlyArrayNonEmpty } from "effect/Array"
|
|
9
9
|
import type * as Cause from "effect/Cause"
|
|
10
10
|
import * as Exit from "effect/Exit"
|
|
11
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
12
|
+
import type * as Reactivity from "effect/reactivity/Reactivity"
|
|
11
13
|
import * as Ref from "effect/Ref"
|
|
12
14
|
import * as Stream from "effect/Stream"
|
|
13
|
-
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
14
|
-
import type * as Reactivity from "effect/unstable/reactivity/Reactivity"
|
|
15
15
|
import { computed, type ComputedRef, shallowRef } from "vue"
|
|
16
16
|
import { invalidateAndAwait, invalidateSoft } from "./atomQuery.ts"
|
|
17
17
|
import { getDerivedInvalidationKeys, partitionInvalidationKeys } from "./dependencyMetadata.ts"
|
package/src/query.ts
CHANGED
|
@@ -13,9 +13,9 @@ import * as Effect from "effect-app/Effect"
|
|
|
13
13
|
import * as Option from "effect-app/Option"
|
|
14
14
|
import type * as Cause from "effect/Cause"
|
|
15
15
|
import * as Exit from "effect/Exit"
|
|
16
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
17
|
+
import * as Atom from "effect/reactivity/Atom"
|
|
16
18
|
import * as Stream from "effect/Stream"
|
|
17
|
-
import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
|
|
18
|
-
import * as Atom from "effect/unstable/reactivity/Atom"
|
|
19
19
|
import { computed, type ComputedRef, effectScope, type MaybeRefOrGetter, onBeforeUnmount, onMounted, onScopeDispose, ref, toValue, type WatchSource } from "vue"
|
|
20
20
|
import { type AtomClientRuntime, type AtomQueryOptions, awaitAtomResult, buildQueryFamily, buildStreamQueryFamily, disabledQueryAtom, isStaleResult, queryKeyForAtom, refreshAtomWithCurrentSpan, staleTimeMsOf, withQueryOptions } from "./atomQuery.ts"
|
|
21
21
|
import type { QueryInvalidationMode } from "./dependencyMetadata.ts"
|
package/src/queryLifetime.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import type * as AsyncResult from "effect/
|
|
2
|
-
import * as Atom from "effect/
|
|
1
|
+
import type * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
2
|
+
import * as Atom from "effect/reactivity/Atom"
|
|
3
3
|
|
|
4
4
|
/**
|
|
5
5
|
* Per-query observer count + invalidation flag. Lives on the family atom so
|
package/src/suspense.ts
CHANGED
|
@@ -9,9 +9,9 @@ import * as Deferred from "effect/Deferred"
|
|
|
9
9
|
import * as Fiber from "effect/Fiber"
|
|
10
10
|
import * as Layer from "effect/Layer"
|
|
11
11
|
import * as ManagedRuntime from "effect/ManagedRuntime"
|
|
12
|
+
import * as Reactivity from "effect/reactivity/Reactivity"
|
|
12
13
|
import * as Stream from "effect/Stream"
|
|
13
14
|
import { TestClock } from "effect/testing"
|
|
14
|
-
import * as Reactivity from "effect/unstable/reactivity/Reactivity"
|
|
15
15
|
import { createApp, effectScope, ref } from "vue"
|
|
16
16
|
import { awaitAtomResult, buildQueryFamily, invalidateAndAwait, makeAtomClientRuntime } from "../src/atomQuery.js"
|
|
17
17
|
import { clearQueryReadDependencies, getDerivedInvalidationKeys, partitionInvalidationKeys, registerQueryInvalidationMode, setQueryReadDependencies } from "../src/dependencyMetadata.js"
|
package/test/dist/stubs.d.ts
CHANGED
|
@@ -23,7 +23,7 @@ declare const RequestContextMap_base: (new () => {
|
|
|
23
23
|
readonly config: {};
|
|
24
24
|
}) & {
|
|
25
25
|
config: {};
|
|
26
|
-
getConfig: (rpc: import("effect/
|
|
26
|
+
getConfig: (rpc: import("effect/rpc/Rpc").AnyWithProps) => RpcContextMap.GetContextConfig<{}>;
|
|
27
27
|
get: <Key extends (never) & string>(key: Key) => import("effect-app/rpc/RpcMiddleware").RpcDynamic<Key, {}[Key]>;
|
|
28
28
|
};
|
|
29
29
|
export declare class RequestContextMap extends RequestContextMap_base {
|
|
@@ -1823,10 +1823,10 @@ declare const SomethingGetSomething2WithDependencies_base: S.Opaque<SomethingGet
|
|
|
1823
1823
|
id: S.String;
|
|
1824
1824
|
};
|
|
1825
1825
|
readonly _tag: "GetSomething2";
|
|
1826
|
-
readonly success: S.
|
|
1826
|
+
readonly success: S.FiniteFromString;
|
|
1827
1827
|
readonly error: S.String;
|
|
1828
1828
|
readonly config: Omit<Omit<RpcContextMap.GetContextConfig<{}> & Record<string, any>, "invalidatesQueries"> & {
|
|
1829
|
-
success: S.
|
|
1829
|
+
success: S.FiniteFromString;
|
|
1830
1830
|
error: S.String;
|
|
1831
1831
|
} & Partial<{
|
|
1832
1832
|
readonly invalidatesQueries: import("effect-app/client").InvalidationCallback<never, {
|
|
@@ -3070,10 +3070,10 @@ declare const SomethingElseGetSomething2WithDependencies_base: S.Opaque<Somethin
|
|
|
3070
3070
|
id: S.String;
|
|
3071
3071
|
};
|
|
3072
3072
|
readonly _tag: "GetSomething2";
|
|
3073
|
-
readonly success: S.
|
|
3073
|
+
readonly success: S.FiniteFromString;
|
|
3074
3074
|
readonly error: S.String;
|
|
3075
3075
|
readonly config: Omit<Omit<RpcContextMap.GetContextConfig<{}> & Record<string, any>, "invalidatesQueries"> & {
|
|
3076
|
-
success: S.
|
|
3076
|
+
success: S.FiniteFromString;
|
|
3077
3077
|
error: S.String;
|
|
3078
3078
|
} & Partial<{
|
|
3079
3079
|
readonly invalidatesQueries: import("effect-app/client").InvalidationCallback<never, {
|
package/test/dist/stubs.js
CHANGED
|
@@ -6,8 +6,8 @@ import * as Option from "effect-app/Option";
|
|
|
6
6
|
import { RpcContextMap } from "effect-app/rpc";
|
|
7
7
|
import * as S from "effect-app/Schema";
|
|
8
8
|
import * as Exit from "effect/Exit";
|
|
9
|
+
import * as FetchHttpClient from "effect/http/FetchHttpClient";
|
|
9
10
|
import * as ManagedRuntime from "effect/ManagedRuntime";
|
|
10
|
-
import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient";
|
|
11
11
|
import { createApp, ref } from "vue";
|
|
12
12
|
import { Commander } from "../src/commander.js";
|
|
13
13
|
import { I18n } from "../src/intl.js";
|
|
@@ -261,4 +261,4 @@ export const useClient = (options) => {
|
|
|
261
261
|
};
|
|
262
262
|
return { ...rawClient, clientFor };
|
|
263
263
|
};
|
|
264
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"stubs.js","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"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"}
|
|
264
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"stubs.js","sourceRoot":"","sources":["../stubs.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,8 +6,8 @@ import * as Option from "effect-app/Option"
|
|
|
6
6
|
import * as Latch from "effect/Latch"
|
|
7
7
|
import * as Layer from "effect/Layer"
|
|
8
8
|
import * as ManagedRuntime from "effect/ManagedRuntime"
|
|
9
|
-
import * as AsyncResult from "effect/
|
|
10
|
-
import * as Reactivity from "effect/
|
|
9
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
10
|
+
import * as Reactivity from "effect/reactivity/Reactivity"
|
|
11
11
|
import { describe, expect, it } from "vitest"
|
|
12
12
|
import { createApp, nextTick } from "vue"
|
|
13
13
|
import { buildQueryFamily, invalidateAndAwait, makeAtomClientRuntime, withQueryOptions } from "../src/atomQuery.js"
|
|
@@ -27,8 +27,8 @@ import * as Fiber from "effect/Fiber"
|
|
|
27
27
|
import * as Latch from "effect/Latch"
|
|
28
28
|
import * as Layer from "effect/Layer"
|
|
29
29
|
import * as ManagedRuntime from "effect/ManagedRuntime"
|
|
30
|
-
import * as AsyncResult from "effect/
|
|
31
|
-
import * as Reactivity from "effect/
|
|
30
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
31
|
+
import * as Reactivity from "effect/reactivity/Reactivity"
|
|
32
32
|
import { createApp, nextTick } from "vue"
|
|
33
33
|
import { awaitAtomResult, buildQueryFamily, invalidateAndAwait, makeAtomClientRuntime, queryFetchStates, withQueryOptions } from "../src/atomQuery.js"
|
|
34
34
|
import { invalidateQueries } from "../src/mutate.js"
|
package/test/makeClient.test.ts
CHANGED
|
@@ -6,8 +6,8 @@ import * as Effect from "effect-app/Effect"
|
|
|
6
6
|
import * as S from "effect-app/Schema"
|
|
7
7
|
import * as Exit from "effect/Exit"
|
|
8
8
|
import * as Fiber from "effect/Fiber"
|
|
9
|
+
import * as Atom from "effect/reactivity/Atom"
|
|
9
10
|
import { TestClock } from "effect/testing"
|
|
10
|
-
import * as Atom from "effect/unstable/reactivity/Atom"
|
|
11
11
|
import type { CommandFromRequest } from "../src/makeClient.js"
|
|
12
12
|
import { combineQueryInvalidators, invalidateQueries } from "../src/mutate.js"
|
|
13
13
|
import { useAtomQuery, useAtomSuspense } from "../src/query.js"
|
|
@@ -352,7 +352,7 @@ it("additive atom query api type tests", () => {
|
|
|
352
352
|
const mappedFamilyAtom = Atom.mapResult(familyAtom, (data) => data.toString())
|
|
353
353
|
expectTypeOf<Atom.Success<typeof mappedFamilyAtom>>().toEqualTypeOf<string>()
|
|
354
354
|
expectTypeOf(useAtomQuery(() => mappedFamilyAtom).data.value).toEqualTypeOf<string | undefined>()
|
|
355
|
-
useAtomSuspense(() => mappedFamilyAtom).then((view) => {
|
|
355
|
+
void useAtomSuspense(() => mappedFamilyAtom).then((view) => {
|
|
356
356
|
expectTypeOf(view[1].value).toEqualTypeOf<string>()
|
|
357
357
|
return view
|
|
358
358
|
})
|
|
@@ -368,7 +368,7 @@ it("additive atom query api type tests", () => {
|
|
|
368
368
|
const selected = client.GetSomething2.queryNew({ id: "a" }, { select: (data) => data.toString() })
|
|
369
369
|
expectTypeOf(selected.data.value).toEqualTypeOf<string | undefined>()
|
|
370
370
|
|
|
371
|
-
client.GetSomething2.suspenseNew({ id: "a" }, { select: (data) => data.toString() }).then((view) => {
|
|
371
|
+
void client.GetSomething2.suspenseNew({ id: "a" }, { select: (data) => data.toString() }).then((view) => {
|
|
372
372
|
expectTypeOf(view[1].value).toEqualTypeOf<string>()
|
|
373
373
|
return view
|
|
374
374
|
})
|
|
@@ -379,7 +379,7 @@ it("additive atom query api type tests", () => {
|
|
|
379
379
|
const projectedAtom = projected.atom({ id: "a" })
|
|
380
380
|
expectTypeOf<Atom.Success<typeof projectedAtom>>().toEqualTypeOf<string>()
|
|
381
381
|
expectTypeOf(projected.queryNew({ id: "a" }).data.value).toEqualTypeOf<string | undefined>()
|
|
382
|
-
projected.suspenseNew({ id: "a" }).then((view) => {
|
|
382
|
+
void projected.suspenseNew({ id: "a" }).then((view) => {
|
|
383
383
|
expectTypeOf(view[1].value).toEqualTypeOf<string>()
|
|
384
384
|
return view
|
|
385
385
|
})
|
|
@@ -387,7 +387,7 @@ it("additive atom query api type tests", () => {
|
|
|
387
387
|
const helperFamilyAtom = client.helpers.getSomething2QueryFamily({ id: "a" })
|
|
388
388
|
expectTypeOf<Atom.Success<typeof helperFamilyAtom>>().toEqualTypeOf<number>()
|
|
389
389
|
expectTypeOf(client.helpers.getSomething2QueryNew({ id: "a" }).data.value).toEqualTypeOf<number | undefined>()
|
|
390
|
-
client.helpers.getSomething2SuspenseQueryNew({ id: "a" }).then((view) => {
|
|
390
|
+
void client.helpers.getSomething2SuspenseQueryNew({ id: "a" }).then((view) => {
|
|
391
391
|
expectTypeOf(view[1].value).toEqualTypeOf<number>()
|
|
392
392
|
return view
|
|
393
393
|
})
|
|
@@ -423,9 +423,7 @@ it.skip("works", () => {
|
|
|
423
423
|
// @ts-expect-error query request does not match Command.wrap mutation signature
|
|
424
424
|
const e000 = Command.wrap(client.GetSomething2WithDependencies)
|
|
425
425
|
const e00 = client.GetSomething2WithDependencies.request(null as any)
|
|
426
|
-
// @ts-expect-error dependencies required that are not provided
|
|
427
426
|
const e1 = client.GetSomething2WithDependencies.suspense(null as any)
|
|
428
|
-
// @ts-expect-error dependencies required that are not provided
|
|
429
427
|
const e2 = client.GetSomething2WithDependencies.query(null as any)
|
|
430
428
|
// @ts-expect-error query requests no longer expose command helpers
|
|
431
429
|
const f0 = client.GetSomething2WithDependencies.fn(null as any)
|
package/test/query-span.test.ts
CHANGED
|
@@ -6,7 +6,7 @@ import * as Effect from "effect-app/Effect"
|
|
|
6
6
|
import * as Layer from "effect-app/Layer"
|
|
7
7
|
import * as Option from "effect-app/Option"
|
|
8
8
|
import type * as Cause from "effect/Cause"
|
|
9
|
-
import * as AsyncResult from "effect/
|
|
9
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
10
10
|
import { createApp, effectScope, nextTick } from "vue"
|
|
11
11
|
import { buildQueryFamily, makeAtomClientRuntime } from "../src/atomQuery.js"
|
|
12
12
|
import { makeTanstackQuery } from "../src/internal/tanstackQuery.js"
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { expect, it } from "@effect/vitest"
|
|
2
2
|
import * as Cause from "effect/Cause"
|
|
3
3
|
import * as Option from "effect/Option"
|
|
4
|
-
import * as AsyncResult from "effect/
|
|
4
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
5
5
|
import { shallowRef } from "vue"
|
|
6
6
|
import { withDataFallback } from "../src/query.js"
|
|
7
7
|
|
package/test/stubs.ts
CHANGED
|
@@ -8,8 +8,8 @@ import * as Option from "effect-app/Option"
|
|
|
8
8
|
import { RpcContextMap } from "effect-app/rpc"
|
|
9
9
|
import * as S from "effect-app/Schema"
|
|
10
10
|
import * as Exit from "effect/Exit"
|
|
11
|
+
import * as FetchHttpClient from "effect/http/FetchHttpClient"
|
|
11
12
|
import * as ManagedRuntime from "effect/ManagedRuntime"
|
|
12
|
-
import * as FetchHttpClient from "effect/unstable/http/FetchHttpClient"
|
|
13
13
|
import { createApp, ref } from "vue"
|
|
14
14
|
import { Commander } from "../src/commander.js"
|
|
15
15
|
import { I18n } from "../src/intl.js"
|
|
@@ -146,7 +146,7 @@ class SomethingGetSomething2WithDependencies
|
|
|
146
146
|
id: S.String
|
|
147
147
|
}, {
|
|
148
148
|
// this is intentilally fake, to simulate a codec that requires a dependency
|
|
149
|
-
success: S.FiniteFromString
|
|
149
|
+
success: S.FiniteFromString,
|
|
150
150
|
error: S.String
|
|
151
151
|
})
|
|
152
152
|
{}
|
|
@@ -262,7 +262,7 @@ class SomethingElseGetSomething2WithDependencies
|
|
|
262
262
|
extends SomethingElseQuery<SomethingElseGetSomething2WithDependencies>()("GetSomething2", {
|
|
263
263
|
id: S.String
|
|
264
264
|
}, {
|
|
265
|
-
success: S.FiniteFromString
|
|
265
|
+
success: S.FiniteFromString,
|
|
266
266
|
error: S.String
|
|
267
267
|
})
|
|
268
268
|
{}
|
|
@@ -6,7 +6,7 @@ import * as Effect from "effect-app/Effect"
|
|
|
6
6
|
import * as Option from "effect-app/Option"
|
|
7
7
|
import * as Layer from "effect/Layer"
|
|
8
8
|
import * as ManagedRuntime from "effect/ManagedRuntime"
|
|
9
|
-
import * as AsyncResult from "effect/
|
|
9
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
10
10
|
import { createApp, effectScope, nextTick, ref } from "vue"
|
|
11
11
|
import { makeAtomClientRuntime } from "../src/atomQuery.js"
|
|
12
12
|
import { makeTanstackQuery } from "../src/internal/tanstackQuery.js"
|
|
@@ -37,9 +37,9 @@ it("makeClient .suspense(): observer re-pointed mid-flight -> resolves (seeded)
|
|
|
37
37
|
const getRuntime = () => Context.empty()
|
|
38
38
|
const qi = new QueryImpl(
|
|
39
39
|
getRuntime,
|
|
40
|
-
(
|
|
40
|
+
() => {
|
|
41
41
|
throw new Error("atom runtime is unused by this legacy TanStack regression")
|
|
42
|
-
}
|
|
42
|
+
},
|
|
43
43
|
makeTanstackQuery(getRuntime, queryClient)
|
|
44
44
|
)
|
|
45
45
|
|
|
@@ -115,7 +115,7 @@ it("atom engine .suspense(): reactive arg switched to an uncached input serves t
|
|
|
115
115
|
app.provide(registryKey, defaultRegistry)
|
|
116
116
|
app.mount(host)
|
|
117
117
|
|
|
118
|
-
const [resultRef, latestRef] =
|
|
118
|
+
const [resultRef, latestRef] = await promise
|
|
119
119
|
expect(latestRef.value).toBe("DATA_A")
|
|
120
120
|
|
|
121
121
|
// Re-point to an input whose atom has never fetched -> Initial, no previousSuccess.
|
package/test/suspense.test.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { defaultRegistry, registryKey } from "@effect/atom-vue"
|
|
2
2
|
import { Effect, Option } from "effect-app"
|
|
3
|
-
import * as AsyncResult from "effect/
|
|
4
|
-
import * as Atom from "effect/
|
|
3
|
+
import * as AsyncResult from "effect/reactivity/AsyncResult"
|
|
4
|
+
import * as Atom from "effect/reactivity/Atom"
|
|
5
5
|
import { computed, createApp, nextTick, ref } from "vue"
|
|
6
6
|
import { withQueryOptions } from "../src/atomQuery.js"
|
|
7
7
|
import { useAtomQuery, useAtomSuspense } from "../src/query.js"
|