@effect-app/vue 4.0.0-beta.0 → 4.0.0-beta.2

package/dist/query.js

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import * as Result from "@effect-atom/atom/Result";
+import * as AsyncResult from "effect/unstable/reactivity/AsyncResult";
 import { useQuery as useTanstackQuery, useQueryClient } from "@tanstack/vue-query";
 import { Array, Cause, Effect, Exit, flow, Option, S } from "effect-app";
 import { ServiceUnavailableError } from "effect-app/client/errors";
@@ -77,7 +77,7 @@ export const makeQuery = (getRuntime) => {
             isValidating: r.isFetching.value
         }));
         // not using `computed` here as we have a circular dependency
-        watch(result, (value) => latestSuccess.value = Option.getOrUndefined(Result.value(value)), { immediate: true });
+        watch(result, (value) => latestSuccess.value = Option.getOrUndefined(AsyncResult.value(value)), { immediate: true });
         return [
             result,
             computed(() => latestSuccess.value),
@@ -90,15 +90,15 @@ export const makeQuery = (getRuntime) => {
     };
     function swrToQuery(r) {
         if (r.error !== undefined) {
-            return Result.failureWithPrevious(r.error.effectCause, {
-                previous: r.data === undefined ? Option.none() : Option.some(Result.success(r.data)),
+            return AsyncResult.failureWithPrevious(r.error.effectCause, {
+                previous: r.data === undefined ? Option.none() : Option.some(AsyncResult.success(r.data)),
                 waiting: r.isValidating
             });
         }
         if (r.data !== undefined) {
-            return Result.success(r.data, { waiting: r.isValidating });
+            return AsyncResult.success(r.data, { waiting: r.isValidating });
         }
-        return Result.initial(r.isValidating);
+        return AsyncResult.initial(r.isValidating);
     }
     const useQuery = (self) => {
         const q = useQuery_(self);
@@ -109,15 +109,15 @@ export const makeQuery = (getRuntime) => {
     return useQuery;
 };
 function orPrevious(result) {
-    return Result.isFailure(result) && Option.isSome(result.previousSuccess)
-        ? Result.success(result.previousSuccess.value, { waiting: result.waiting })
+    return AsyncResult.isFailure(result) && Option.isSome(result.previousSuccess)
+        ? AsyncResult.success(result.previousSuccess.value, { waiting: result.waiting })
         : result;
 }
 export function composeQueries(results, renderPreviousOnFailure) {
     const values = renderPreviousOnFailure
         ? Object.values(results).map(orPrevious)
         : Object.values(results);
-    const error = values.find(Result.isFailure);
+    const error = values.find(AsyncResult.isFailure);
     if (error) {
         return error;
     }
@@ -125,16 +125,16 @@ export function composeQueries(results, renderPreviousOnFailure) {
     if (initial.value !== undefined) {
         return initial.value;
     }
-    const loading = Array.findFirst(values, (x) => Result.isInitial(x) && x.waiting ? Option.some(x) : Option.none());
+    const loading = Array.findFirst(values, (x) => AsyncResult.isInitial(x) && x.waiting ? Option.some(x) : Option.none());
     if (loading.value !== undefined) {
         return loading.value;
     }
     const isRefreshing = values.some((x) => x.waiting);
     const r = Object.entries(results).reduce((prev, [key, value]) => {
-        prev[key] = Result.value(value).value;
+        prev[key] = AsyncResult.value(value).value;
         return prev;
     }, {});
-    return Result.success(r, { waiting: isRefreshing });
+    return AsyncResult.success(r, { waiting: isRefreshing });
 }
 export const useUpdateQuery = () => {
     const queryClient = useQueryClient();
@@ -153,4 +153,4 @@ export const useUpdateQuery = () => {
     };
     return f;
 };
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../src/query.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/vue",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0-beta.2",
   "license": "MIT",
   "type": "module",
   "homepage": "https://github.com/effect-ts-app/libs/tree/main/packages/vue",
@@ -11,11 +11,10 @@
     "@vueuse/core": "^14.2.1",
     "change-case": "^5.4.4",
     "query-string": "^9.3.1",
-    "effect-app": "4.0.0-beta.0"
+    "effect-app": "4.0.0-beta.2"
   },
   "peerDependencies": {
-    "@effect-atom/atom": "^0.5.3",
-    "@effect-atom/atom-vue": "^0.5.0",
+    "@effect/atom-vue": "^4.0.0-beta.25",
     "@effect/platform-browser": "^4.0.0-beta.25",
     "@sentry/browser": "^10.40.0",
     "effect": "^4.0.0-beta.25",
@@ -31,7 +30,7 @@
     "typescript": "~5.9.3",
     "vite": "^7.3.1",
     "vitest": "^4.0.18",
-    "@effect-app/eslint-shared-config": "0.5.7-beta.0"
+    "@effect-app/eslint-shared-config": "0.5.7-beta.1"
   },
   "typesVersions": {
     "*": {

package/src/experimental/commander.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { asResult, type MissingDependencies, reportRuntimeError } from "@effect-app/vue"
 import { reportMessage } from "@effect-app/vue/errorReporter"
-import { type Result } from "@effect-atom/atom/Result"
+import { type AsyncResult } from "effect/unstable/reactivity/AsyncResult"
 import { Cause, Effect, type Exit, type Fiber, flow, Layer, Match, MutableHashMap, Option, S, ServiceMap } from "effect-app"
 import { SupportedErrors } from "effect-app/client"
 import { OperationFailure, OperationSuccess } from "effect-app/Operations"
@@ -139,7 +139,7 @@ export declare namespace Commander {
     /** reactive */
     label: string
     /** reactive */
-    result: Result<A, E>
+    result: AsyncResult<A, E>
     /** reactive */
     waiting: boolean
     /** reactive */

package/src/form.ts

@@ -1,7 +1,6 @@
 import { createIntl, type IntlFormatters } from "@formatjs/intl"
 import type {} from "intl-messageformat"
 import { Cause, Exit, Option, pipe, S } from "effect-app"
-import type { Schema } from "effect-app/Schema"
 import type { Unbranded } from "effect-app/Schema/brand"
 import type { IsUnion } from "effect-app/utils"
 import { capitalize, ref } from "vue"
@@ -122,7 +121,7 @@ function handlePropertySignature(
   switch (schema.ast._tag) {
     case "Objects": {
       return buildFieldInfoFromFieldsRoot(
-        schema as S.Schema<Record<PropertyKey, any>>
+        schema as S.Codec<Record<PropertyKey, any>>
       )
     }
     case "Union": {
@@ -194,7 +193,7 @@ export function buildFieldInfoFromFields<
   From extends Record<PropertyKey, any>,
   To extends Record<PropertyKey, any>
 >(
-  schema: (Schema<To> | S.Codec<To, From>) & { fields?: S.Struct.Fields }
+  schema: (S.Codec<To, From>) & { fields?: S.Struct.Fields }
 ) {
   return buildFieldInfoFromFieldsRoot(schema).fields
 }
@@ -204,7 +203,7 @@ export function buildFieldInfoFromFieldsRoot<
   To extends Record<PropertyKey, any>,
   R
 >(
-  schema: (Schema<To> | S.Codec<To, From, R>) & { fields?: S.Struct.Fields }
+  schema: (S.Codec<To, From, R>) & { fields?: S.Struct.Fields }
 ): NestedFieldInfo<To> {
   const ast = getObjectsAST(schema.ast)
 
@@ -245,9 +244,9 @@ function buildFieldInfo(
   property: S.AST.PropertySignature
 ): FieldInfo<any> {
   const propertyKey = property.name
-  const schema = S.make<S.Schema<unknown>>(property.type)
+  const schema = S.make<S.Codec<unknown>>(property.type)
   const metadata = getMetadataFromSchema(property.type)
-  const parse = S.decodeUnknownExit(schema as S.Schema<unknown> & { readonly DecodingServices: never })
+  const parse = S.decodeUnknownExit(schema as S.Codec<unknown> & { readonly DecodingServices: never })
 
   const nullableOrUndefined = S.AST.isUnion(property.type)
     && (property.type.types.includes(S.Null.ast) || property.type.types.some((_) => _._tag === "Undefined"))
@@ -419,7 +418,7 @@ export function getMetadataFromSchema(
 
   let jschema: any
   try {
-    const doc = S.toJsonSchemaDocument(S.make<S.Schema<unknown>>(realSelf))
+    const doc = S.toJsonSchemaDocument(S.make<S.Codec<unknown>>(realSelf))
     jschema = doc.schema as any
     const defs = doc.definitions as Record<string, any>
     // resolve $ref against definitions

package/src/lib.ts

@@ -6,7 +6,7 @@ import { isHttpClientError } from "effect/unstable/http/HttpClientError"
 import type { MaybeRefOrGetter } from "vue"
 import { reportError } from "./errorReporter.js"
 
-export * as Result from "@effect-atom/atom/Result"
+export * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
 
 const reportRuntimeError_ = reportError("Runtime")
 

package/src/makeClient.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import * as Result from "@effect-atom/atom/Result"
+import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
 import { type InvalidateOptions, type InvalidateQueryFilters, isCancelledError, type QueryObserverResult, type RefetchOptions, type UseQueryReturnType } from "@tanstack/vue-query"
 import { camelCase } from "change-case"
 import { Cause, Data, Effect, Exit, Layer, type ManagedRuntime, Match, Option, S, ServiceMap, Struct } from "effect-app"
@@ -411,7 +411,7 @@ export class LegacyMutationImpl<RT> {
       self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
       options?: MutationOptions<A, E, R, A2, E2, R2, I>
     ): readonly [
-      ComputedRef<Result.Result<A2, E2>>,
+      ComputedRef<AsyncResult.AsyncResult<A2, E2>>,
       (i: I) => Effect.Effect<Exit.Exit<A2, E2>, never, R2>
     ]
     /**
@@ -423,7 +423,7 @@ export class LegacyMutationImpl<RT> {
       self: RequestHandler<A, E, R, Request, Name>,
       options?: MutationOptions<A, E, R, A2, E2, R2>
     ): readonly [
-      ComputedRef<Result.Result<A2, E2>>,
+      ComputedRef<AsyncResult.AsyncResult<A2, E2>>,
       Effect.Effect<Exit.Exit<A2, E2>, never, R2>
     ]
   } = <I, E, A, R, Request extends Req, Name extends string, A2 = A, E2 = E, R2 = R>(
@@ -617,7 +617,7 @@ export class LegacyMutationImpl<RT> {
       self: RequestHandlerWithInput<I, A, E, R, Request, Name>,
       action: string,
       options?: Opts<A, E, R, I, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
-    ): Resp<I, A2, E2, R2, ComputedRef<Result.Result<A2, E2>>>
+    ): Resp<I, A2, E2, R2, ComputedRef<AsyncResult.AsyncResult<A2, E2>>>
     /**
      * Pass a function that returns an Effect, e.g from a client action, give it a name.
      * Returns a tuple with raw Result and execution function which reports success and errors as Toast.
@@ -642,7 +642,7 @@ export class LegacyMutationImpl<RT> {
       self: RequestHandler<A, E, R, Request, Name>,
       action: string,
       options?: Opts<A, E, R, void, A2, E2, R2, ESuccess, RSuccess, EError, RError, EDefect, RDefect>
-    ): ActResp<A2, E2, R2, ComputedRef<Result.Result<A2, E2>>>
+    ): ActResp<A2, E2, R2, ComputedRef<AsyncResult.AsyncResult<A2, E2>>>
   } = <E extends ResponseErrors, A, R, Request extends Req, Name extends string, I>(
     self: RequestHandlerWithInput<I, A, E, R, Request, Name> | RequestHandler<A, E, R, Request, Name>,
     action: any,
@@ -1010,13 +1010,13 @@ export class LegacyMutationImpl<RT> {
     OnSubmitA
   >(
     s:
-      & S.Schema<To>
+      & S.Codec<To>
       & { new(c: C): any; extend: any; fields: S.Struct.Fields },
     state: Ref<Omit<From, "_tag">>,
     onSubmit: (a: To) => Effect.Effect<OnSubmitA, never, RT>
   ) => {
     const fields = buildFieldInfoFromFieldsRoot(s).fields
-    const schema = S.Struct(Struct.omit(s.fields, ["_tag"])) as unknown as S.Schema<any> & {
+    const schema = S.Struct(Struct.omit(s.fields, ["_tag"])) as unknown as S.Codec<any> & {
       readonly DecodingServices: never
     }
     const parse = S.decodeUnknownSync(schema)
@@ -1121,7 +1121,7 @@ export class QueryImpl<R> {
        */
       <TData = A>(options?: CustomUndefinedInitialQueryOptions<A, E, TData>): Promise<
         readonly [
-          ComputedRef<Result.Result<TData, E>>,
+          ComputedRef<AsyncResult.AsyncResult<TData, E>>,
           ComputedRef<TData>,
           (
             options?: RefetchOptions
@@ -1151,7 +1151,7 @@ export class QueryImpl<R> {
        */
       <TData = A>(arg: Arg | WatchSource<Arg>, options?: CustomUndefinedInitialQueryOptions<A, E, TData>): Promise<
         readonly [
-          ComputedRef<Result.Result<TData, E>>,
+          ComputedRef<AsyncResult.AsyncResult<TData, E>>,
           ComputedRef<TData>,
           (
             options?: RefetchOptions
@@ -1189,7 +1189,7 @@ export class QueryImpl<R> {
           return yield* Effect.interrupt
         }
         const result = resultRef.value
-        if (Result.isInitial(result)) {
+        if (AsyncResult.isInitial(result)) {
           console.error("Internal Error: Promise should be resolved already", {
             self,
             argOrOptions,
@@ -1201,7 +1201,7 @@ export class QueryImpl<R> {
             "Internal Error: Promise should be resolved already"
           )
         }
-        if (Result.isFailure(result)) {
+        if (AsyncResult.isFailure(result)) {
           return yield* Exit.failCause(result.cause)
         }
 

package/src/mutate.ts

@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import * as Result from "@effect-atom/atom/Result"
+import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
 import { type InvalidateOptions, type InvalidateQueryFilters, type QueryClient, useQueryClient } from "@tanstack/vue-query"
 import { type Cause, Effect, type Exit, Option } from "effect-app"
 import { type Req } from "effect-app/client"
@@ -19,7 +19,7 @@ export const getQueryKey = (h: { id: string; options?: ClientForOptions }) => {
 }
 
 export function mutationResultToVue<A, E>(
-  mutationResult: Result.Result<A, E>
+  mutationResult: AsyncResult.AsyncResult<A, E>
 ): Res<A, E> {
   switch (mutationResult._tag) {
     case "Initial": {
@@ -49,20 +49,20 @@ export interface Res<A, E> {
 }
 
 export function make<A, E, R>(self: Effect.Effect<A, E, R>) {
-  const result = shallowRef(Result.initial() as Result.Result<A, E>)
+  const result = shallowRef(AsyncResult.initial() as AsyncResult.AsyncResult<A, E>)
 
   const execute = Effect
     .sync(() => {
-      result.value = Result.waiting(result.value)
+      result.value = AsyncResult.waiting(result.value)
     })
     .pipe(
       Effect.andThen(self),
       Effect.exit,
-      Effect.map(Result.fromExit),
+      Effect.map(AsyncResult.fromExit),
       Effect.flatMap((r) => Effect.sync(() => result.value = r))
     )
 
-  const latestSuccess = computed(() => Option.getOrUndefined(Result.value(result.value)))
+  const latestSuccess = computed(() => Option.getOrUndefined(AsyncResult.value(result.value)))
 
   return tuple(result, latestSuccess, execute)
 }
@@ -103,38 +103,38 @@ export interface MutationOptions<A, E, R, A2 = A, E2 = E, R2 = R, I = void> exte
 export const asResult: {
   <A, E, R>(
     handler: Effect.Effect<A, E, R>
-  ): readonly [ComputedRef<Result.Result<A, E>>, Effect.Effect<Exit.Exit<A, E>, never, R>]
+  ): readonly [ComputedRef<AsyncResult.AsyncResult<A, E>>, Effect.Effect<Exit.Exit<A, E>, never, R>]
   <Args extends readonly any[], A, E, R>(
     handler: (...args: Args) => Effect.Effect<A, E, R>
-  ): readonly [ComputedRef<Result.Result<A, E>>, (...args: Args) => Effect.Effect<Exit.Exit<A, E>, never, R>]
+  ): readonly [ComputedRef<AsyncResult.AsyncResult<A, E>>, (...args: Args) => Effect.Effect<Exit.Exit<A, E>, never, R>]
 } = <Args extends readonly any[], A, E, R>(
   handler: Effect.Effect<A, E, R> | ((...args: Args) => Effect.Effect<A, E, R>)
 ) => {
-  const state = shallowRef<Result.Result<A, E>>(Result.initial())
+  const state = shallowRef<AsyncResult.AsyncResult<A, E>>(AsyncResult.initial())
 
   const act = Effect.isEffect(handler)
     ? Effect
       .sync(() => {
-        state.value = Result.initial(true)
+        state.value = AsyncResult.initial(true)
       })
       .pipe(
         Effect.andThen(Effect.suspend(() =>
           handler.pipe(
             Effect.exit,
-            Effect.tap((exit) => Effect.sync(() => (state.value = Result.fromExit(exit))))
+            Effect.tap((exit) => Effect.sync(() => (state.value = AsyncResult.fromExit(exit))))
           )
         ))
       )
     : (...args: Args) =>
       Effect
         .sync(() => {
-          state.value = Result.initial(true)
+          state.value = AsyncResult.initial(true)
         })
         .pipe(
           Effect.andThen(Effect.suspend(() =>
             handler(...args).pipe(
               Effect.exit,
-              Effect.tap((exit) => Effect.sync(() => (state.value = Result.fromExit(exit))))
+              Effect.tap((exit) => Effect.sync(() => (state.value = AsyncResult.fromExit(exit))))
             )
           ))
         )

package/src/query.ts

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import * as Result from "@effect-atom/atom/Result"
+import * as AsyncResult from "effect/unstable/reactivity/AsyncResult"
 import { type DefaultError, type Enabled, type InitialDataFunction, type NonUndefinedGuard, type PlaceholderDataFunction, type QueryKey, type QueryObserverOptions, type QueryObserverResult, type RefetchOptions, useQuery as useTanstackQuery, useQueryClient, type UseQueryDefinedReturnType, type UseQueryReturnType } from "@tanstack/vue-query"
 import { Array, Cause, Effect, Exit, flow, Option, S, type ServiceMap } from "effect-app"
 import { type Req } from "effect-app/client"
@@ -93,7 +93,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
         arg: I | WatchSource<I> | undefined,
         options?: CustomUndefinedInitialQueryOptions<A, E, TData>
       ): readonly [
-        ComputedRef<Result.Result<TData, E>>,
+        ComputedRef<AsyncResult.AsyncResult<TData, E>>,
         ComputedRef<TData | undefined>,
         (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E>>, never, never>,
         UseQueryDefinedReturnType<TData, KnownFiberFailure<E>>
@@ -103,7 +103,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
         arg: I | WatchSource<I> | undefined,
         options: CustomDefinedInitialQueryOptions<A, E, TData>
       ): readonly [
-        ComputedRef<Result.Result<TData, E>>,
+        ComputedRef<AsyncResult.AsyncResult<TData, E>>,
         ComputedRef<TData>,
         (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E>>, never, never>,
         UseQueryDefinedReturnType<TData, KnownFiberFailure<E>>
@@ -113,7 +113,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
         arg: I | WatchSource<I> | undefined,
         options: CustomDefinedPlaceholderQueryOptions<A, E, TData>
       ): readonly [
-        ComputedRef<Result.Result<TData, E>>,
+        ComputedRef<AsyncResult.AsyncResult<TData, E>>,
         ComputedRef<TData>,
         (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E>>, never, never>,
         UseQueryDefinedReturnType<TData, KnownFiberFailure<E>>
@@ -202,7 +202,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
     )
 
     const latestSuccess = shallowRef<TData>()
-    const result = computed((): Result.Result<TData, E> =>
+    const result = computed((): AsyncResult.AsyncResult<TData, E> =>
       swrToQuery({
         error: r.error.value ?? undefined,
         data: r.data.value === undefined ? latestSuccess.value : r.data.value, // we fall back to existing data, as tanstack query might loose it when the key changes
@@ -210,7 +210,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
       })
     )
     // not using `computed` here as we have a circular dependency
-    watch(result, (value) => latestSuccess.value = Option.getOrUndefined(Result.value(value)), { immediate: true })
+    watch(result, (value) => latestSuccess.value = Option.getOrUndefined(AsyncResult.value(value)), { immediate: true })
 
     return [
       result,
@@ -231,21 +231,21 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
     error: KnownFiberFailure<E> | undefined
     data: A | undefined
     isValidating: boolean
-  }): Result.Result<A, E> {
+  }): AsyncResult.AsyncResult<A, E> {
     if (r.error !== undefined) {
-      return Result.failureWithPrevious(
+      return AsyncResult.failureWithPrevious(
         r.error.effectCause,
         {
-          previous: r.data === undefined ? Option.none() : Option.some(Result.success(r.data)),
+          previous: r.data === undefined ? Option.none() : Option.some(AsyncResult.success(r.data)),
           waiting: r.isValidating
         }
       )
     }
     if (r.data !== undefined) {
-      return Result.success<A, E>(r.data, { waiting: r.isValidating })
+      return AsyncResult.success<A, E>(r.data, { waiting: r.isValidating })
     }
 
-    return Result.initial(r.isValidating)
+    return AsyncResult.initial(r.isValidating)
   }
 
   const useQuery: {
@@ -263,7 +263,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
       <TData = A>(
         options: CustomDefinedInitialQueryOptions<A, KnownFiberFailure<E>, TData>
       ): readonly [
-        ComputedRef<Result.Result<TData, E>>,
+        ComputedRef<AsyncResult.AsyncResult<TData, E>>,
         ComputedRef<TData>,
         (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E>>>,
         UseQueryReturnType<any, any>
@@ -271,7 +271,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
       <TData = A>(
         options: CustomDefinedPlaceholderQueryOptions<A, E, TData>
       ): readonly [
-        ComputedRef<Result.Result<TData, E>>,
+        ComputedRef<AsyncResult.AsyncResult<TData, E>>,
         ComputedRef<TData>,
         (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E>>, never, never>,
         UseQueryDefinedReturnType<TData, KnownFiberFailure<E>>
@@ -281,7 +281,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
        * Effect results are passed to the caller, including errors.
        */
       <TData = A>(options?: CustomUndefinedInitialQueryOptions<A, KnownFiberFailure<E>, TData>): readonly [
-        ComputedRef<Result.Result<A, E>>,
+        ComputedRef<AsyncResult.AsyncResult<A, E>>,
         ComputedRef<A | undefined>,
         (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E>>>,
         UseQueryReturnType<any, any>
@@ -302,7 +302,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
         arg: Arg | WatchSource<Arg>,
         options: CustomDefinedInitialQueryOptions<A, KnownFiberFailure<E>, TData>
       ): readonly [
-        ComputedRef<Result.Result<TData, E>>,
+        ComputedRef<AsyncResult.AsyncResult<TData, E>>,
         ComputedRef<TData>,
         (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E>>>,
         UseQueryReturnType<any, any>
@@ -315,7 +315,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
         arg: Arg | WatchSource<Arg>,
         options: CustomDefinedPlaceholderQueryOptions<A, KnownFiberFailure<E>, TData>
       ): readonly [
-        ComputedRef<Result.Result<TData, E>>,
+        ComputedRef<AsyncResult.AsyncResult<TData, E>>,
         ComputedRef<TData>,
         (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E>>>,
         UseQueryReturnType<any, any>
@@ -328,7 +328,7 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
         arg: Arg | WatchSource<Arg>,
         options?: CustomUndefinedInitialQueryOptions<A, KnownFiberFailure<E>, TData>
       ): readonly [
-        ComputedRef<Result.Result<TData, E>>,
+        ComputedRef<AsyncResult.AsyncResult<TData, E>>,
         ComputedRef<TData | undefined>,
         (options?: RefetchOptions) => Effect.Effect<QueryObserverResult<TData, KnownFiberFailure<E>>>,
         UseQueryReturnType<any, any>
@@ -350,31 +350,31 @@ export const makeQuery = <R>(getRuntime: () => ServiceMap.ServiceMap<R>) => {
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type
 export interface MakeQuery2<R> extends ReturnType<typeof makeQuery<R>> {}
 
-function orPrevious<E, A>(result: Result.Result<A, E>) {
-  return Result.isFailure(result) && Option.isSome(result.previousSuccess)
-    ? Result.success(result.previousSuccess.value, { waiting: result.waiting })
+function orPrevious<E, A>(result: AsyncResult.AsyncResult<A, E>) {
+  return AsyncResult.isFailure(result) && Option.isSome(result.previousSuccess)
+    ? AsyncResult.success(result.previousSuccess.value, { waiting: result.waiting })
     : result
 }
 
 export function composeQueries<
-  R extends Record<string, Result.Result<any, any>>
+  R extends Record<string, AsyncResult.AsyncResult<any, any>>
 >(
   results: R,
   renderPreviousOnFailure?: boolean
-): Result.Result<
+): AsyncResult.AsyncResult<
   {
-    [Property in keyof R]: R[Property] extends Result.Result<infer A, any> ? A
+    [Property in keyof R]: R[Property] extends AsyncResult.AsyncResult<infer A, any> ? A
       : never
   },
   {
-    [Property in keyof R]: R[Property] extends Result.Result<any, infer E> ? E
+    [Property in keyof R]: R[Property] extends AsyncResult.AsyncResult<any, infer E> ? E
       : never
   }[keyof R]
 > {
   const values = renderPreviousOnFailure
     ? Object.values(results).map(orPrevious)
     : Object.values(results)
-  const error = values.find(Result.isFailure)
+  const error = values.find(AsyncResult.isFailure)
   if (error) {
     return error
   }
@@ -382,7 +382,7 @@ export function composeQueries<
   if (initial.value !== undefined) {
     return initial.value
   }
-  const loading = Array.findFirst(values, (x) => Result.isInitial(x) && x.waiting ? Option.some(x) : Option.none())
+  const loading = Array.findFirst(values, (x) => AsyncResult.isInitial(x) && x.waiting ? Option.some(x) : Option.none())
   if (loading.value !== undefined) {
     return loading.value
   }
@@ -390,10 +390,10 @@ export function composeQueries<
   const isRefreshing = values.some((x) => x.waiting)
 
   const r = Object.entries(results).reduce((prev, [key, value]) => {
-    prev[key] = Result.value(value).value
+    prev[key] = AsyncResult.value(value).value
     return prev
   }, {} as any)
-  return Result.success(r, { waiting: isRefreshing })
+  return AsyncResult.success(r, { waiting: isRefreshing })
 }
 
 export const useUpdateQuery = () => {