effect 4.0.0-beta.14 → 4.0.0-beta.16

package/src/unstable/cli/GlobalFlag.ts

@@ -4,7 +4,6 @@
 
 import * as Console from "../../Console.ts"
 import * as Effect from "../../Effect.ts"
-import { dual } from "../../Function.ts"
 import type { LogLevel as LogLevelType } from "../../LogLevel.ts"
 import * as Option from "../../Option.ts"
 import * as ServiceMap from "../../ServiceMap.ts"
@@ -49,18 +48,30 @@ export interface Action<A> {
  * @since 4.0.0
  * @category models
  */
-export interface Setting<A> extends ServiceMap.Reference<A> {
+export interface Setting<Id extends string, A> extends ServiceMap.Service<Setting.Identifier<Id>, A> {
   readonly _tag: "Setting"
+  readonly id: Id
   readonly flag: Flag.Flag<A>
 }
 
+/**
+ * @since 4.0.0
+ */
+export declare namespace Setting {
+  /**
+   * @since 4.0.0
+   * @category models
+   */
+  export type Identifier<Id extends string> = `effect/unstable/cli/GlobalFlag/${Id}`
+}
+
 /**
  * Global flag discriminated union.
  *
  * @since 4.0.0
  * @category models
  */
-export type GlobalFlag<A> = Action<A> | Setting<A>
+export type GlobalFlag<A> = Action<A> | Setting<any, A>
 
 /* ========================================================================== */
 /* Constructors                                                               */
@@ -90,17 +101,19 @@ export const action = <A>(options: {
  * @since 4.0.0
  * @category constructors
  */
-export const setting = <A>(options: {
+export const setting = <const Id extends string>(
+  id: Id
+) =>
+<A>(options: {
   readonly flag: Flag.Flag<A>
-  readonly defaultValue: () => A
-}): Setting<A> => {
+}): Setting<Id, A> => {
   settingIdCounter += 1
-  const ref = ServiceMap.Reference<A>(
-    `effect/cli/GlobalFlag/Setting/${settingIdCounter}`,
-    { defaultValue: options.defaultValue }
+  const ref = ServiceMap.Service<Setting.Identifier<Id>, A>(
+    `effect/unstable/cli/GlobalFlag/${id}/${settingIdCounter}`
   )
   return Object.assign(ref, {
     _tag: "Setting" as const,
+    id,
     flag: options.flag
   })
 }
@@ -130,7 +143,7 @@ export const Help: Action<boolean> = action({
   run: (_, { command, commandPath }) =>
     Effect.gen(function*() {
       const formatter = yield* CliOutput.Formatter
-      const helpDoc = yield* HelpInternal.getHelpForCommandPath(command, commandPath, Registry)
+      const helpDoc = yield* HelpInternal.getHelpForCommandPath(command, commandPath, BuiltIns)
       yield* Console.log(formatter.formatHelpDoc(helpDoc))
     })
 })
@@ -184,7 +197,7 @@ export const Completions: Action<Option.Option<"bash" | "zsh" | "fish">> = actio
  * @since 4.0.0
  * @category references
  */
-export const LogLevel: Setting<Option.Option<LogLevelType>> = setting({
+export const LogLevel: Setting<"log-level", Option.Option<LogLevelType>> = setting("log-level")({
   flag: Flag.choiceWithValue(
     "log-level",
     [
@@ -201,121 +214,30 @@ export const LogLevel: Setting<Option.Option<LogLevelType>> = setting({
   ).pipe(
     Flag.optional,
     Flag.withDescription("Sets the minimum log level")
-  ),
-  defaultValue: () => Option.none()
+  )
 })
 
 /* ========================================================================== */
-/* Registry                                                                   */
+/* References                                                                 */
 /* ========================================================================== */
 
 /**
- * The ordered set of global flag references.
- * The parser iterates this set to know which flags to extract.
+ * Built-in global flags in default precedence order.
  *
  * @since 4.0.0
  * @category references
  */
-export const Registry: ServiceMap.Reference<
-  Set<GlobalFlag<any>>
-> = ServiceMap.Reference("effect/cli/GlobalFlag/Registry", {
-  defaultValue: () =>
-    new Set<GlobalFlag<any>>([
-      Help,
-      Version,
-      Completions,
-      LogLevel
-    ])
-})
-
-/* ========================================================================== */
-/* Public API                                                                 */
-/* ========================================================================== */
+export const BuiltIns: ReadonlyArray<GlobalFlag<any>> = [
+  Help,
+  Version,
+  Completions,
+  LogLevel
+]
 
 /**
- * Adds a global flag to the registry.
+ * Built-in setting context identifiers.
  *
  * @since 4.0.0
- * @category modifiers
- */
-export const add: {
-  /* ========================================================================== */
-  /* Public API                                                                 */
-  /* ========================================================================== */
-
-  /**
-   * Adds a global flag to the registry.
-   *
-   * @since 4.0.0
-   * @category modifiers
-   */
-  <A>(flag: GlobalFlag<A>): <B, E, R>(
-    self: Effect.Effect<B, E, R>
-  ) => Effect.Effect<B, E, R>
-  /* ========================================================================== */
-  /* Public API                                                                 */
-  /* ========================================================================== */
-
-  /**
-   * Adds a global flag to the registry.
-   *
-   * @since 4.0.0
-   * @category modifiers
-   */
-  <B, E, R, A>(self: Effect.Effect<B, E, R>, flag: GlobalFlag<A>): Effect.Effect<B, E, R>
-} = dual(
-  2,
-  Effect.fnUntraced(function*<B, E, R, A>(
-    self: Effect.Effect<B, E, R>,
-    flag: GlobalFlag<A>
-  ) {
-    const currentRegistry = yield* Registry
-    const nextRegistry = new Set([...currentRegistry, flag])
-    return yield* Effect.provideService(self, Registry, nextRegistry)
-  })
-)
-
-/**
- * Removes a global flag by its reference.
- *
- * @since 4.0.0
- * @category modifiers
- */
-export const remove: {
-  /**
-   * Removes a global flag by its reference.
-   *
-   * @since 4.0.0
-   * @category modifiers
-   */
-  <A>(flag: GlobalFlag<A>): <B, E, R>(
-    self: Effect.Effect<B, E, R>
-  ) => Effect.Effect<B, E, R>
-  /**
-   * Removes a global flag by its reference.
-   *
-   * @since 4.0.0
-   * @category modifiers
-   */
-  <B, E, R, A>(self: Effect.Effect<B, E, R>, flag: GlobalFlag<A>): Effect.Effect<B, E, R>
-} = dual(
-  2,
-  Effect.fnUntraced(function*<B, E, R, A>(
-    self: Effect.Effect<B, E, R>,
-    flag: GlobalFlag<A>
-  ) {
-    const currentRegistry = yield* Registry
-    const nextRegistry = new Set(currentRegistry)
-    nextRegistry.delete(flag)
-    return yield* Effect.provideService(self, Registry, nextRegistry)
-  })
-)
-
-/**
- * Removes all global flags (built-in and user-defined).
- *
- * @since 4.0.0
- * @category modifiers
+ * @category models
  */
-export const clear = <B, E, R>(self: Effect.Effect<B, E, R>): Effect.Effect<B, E, R> =>
-  Effect.provideService(self, Registry, new Set())
+export type BuiltInSettingContext = Setting.Identifier<"log-level">

package/src/unstable/cli/internal/command.ts

@@ -12,6 +12,7 @@ import { pipeArguments } from "../../../Pipeable.ts"
 import * as Predicate from "../../../Predicate.ts"
 import * as ServiceMap from "../../../ServiceMap.ts"
 import * as CliError from "../CliError.ts"
+import type * as GlobalFlag from "../GlobalFlag.ts"
 import type { ArgDoc, ExampleDoc, FlagDoc, HelpDoc, SubcommandGroupDoc } from "../HelpDoc.ts"
 import * as Param from "../Param.ts"
 import * as Primitive from "../Primitive.ts"
@@ -36,6 +37,7 @@ export interface CommandInternal<Name extends string, Input, E, R> extends Comma
   readonly config: ConfigInternal
   readonly service: ServiceMap.Service<CommandContext<Name>, Input>
   readonly annotations: ServiceMap.ServiceMap<never>
+  readonly globalFlags: ReadonlyArray<GlobalFlag.GlobalFlag<any>>
   readonly parse: (input: ParsedTokens) => Effect.Effect<Input, CliError.CliError, Environment>
   readonly handle: (
     input: Input,
@@ -88,6 +90,7 @@ export const makeCommand = <const Name extends string, Input, E, R>(options: {
   readonly config: ConfigInternal
   readonly service?: ServiceMap.Service<CommandContext<Name>, Input> | undefined
   readonly annotations?: ServiceMap.ServiceMap<never> | undefined
+  readonly globalFlags?: ReadonlyArray<GlobalFlag.GlobalFlag<any>> | undefined
   readonly description?: string | undefined
   readonly shortDescription?: string | undefined
   readonly alias?: string | undefined
@@ -101,6 +104,7 @@ export const makeCommand = <const Name extends string, Input, E, R>(options: {
   const service = options.service ?? ServiceMap.Service<CommandContext<Name>, Input>(`${TypeId}/${options.name}`)
   const config = options.config
   const annotations = options.annotations ?? ServiceMap.empty()
+  const globalFlags = options.globalFlags ?? []
   const subcommands = options.subcommands ?? []
 
   const handle = (
@@ -191,6 +195,7 @@ export const makeCommand = <const Name extends string, Input, E, R>(options: {
     name: options.name,
     examples: options.examples ?? [],
     annotations,
+    globalFlags,
     subcommands,
     config,
     service,

package/src/unstable/cli/internal/help.ts

@@ -6,46 +6,127 @@
  * Extracted from command.ts to avoid circular dependencies.
  */
 import * as Effect from "../../../Effect.ts"
-import type * as ServiceMap from "../../../ServiceMap.ts"
 import type { Command } from "../Command.ts"
-import type { GlobalFlag } from "../GlobalFlag.ts"
+import type * as GlobalFlag from "../GlobalFlag.ts"
 import type { FlagDoc, HelpDoc } from "../HelpDoc.ts"
 import * as Param from "../Param.ts"
 import * as Primitive from "../Primitive.ts"
 import { toImpl } from "./command.ts"
 
+const dedupeGlobalFlags = (
+  flags: ReadonlyArray<GlobalFlag.GlobalFlag<any>>
+): ReadonlyArray<GlobalFlag.GlobalFlag<any>> => {
+  const seen = new Set<GlobalFlag.GlobalFlag<any>>()
+  const deduped: Array<GlobalFlag.GlobalFlag<any>> = []
+  for (const flag of flags) {
+    if (seen.has(flag)) {
+      continue
+    }
+    seen.add(flag)
+    deduped.push(flag)
+  }
+  return deduped
+}
+
 /**
- * Helper function to get help documentation for a specific command path.
- * Navigates through the command hierarchy to find the right command.
- * Reads global flags from the registry and includes them in the help doc.
+ * Returns the resolved command lineage for the provided path.
+ * Includes the root command as the first element.
  */
-export const getHelpForCommandPath = <Name extends string, Input, E, R>(
+export const getCommandsForCommandPath = <Name extends string, Input, E, R>(
   command: Command<Name, Input, E, R>,
-  commandPath: ReadonlyArray<string>,
-  registry: ServiceMap.Reference<Set<GlobalFlag<unknown>>>
-): Effect.Effect<HelpDoc, never, never> =>
-  Effect.gen(function*() {
-    let currentCommand: Command.Any = command
+  commandPath: ReadonlyArray<string>
+): ReadonlyArray<Command.Any> => {
+  const commands: Array<Command.Any> = [command]
+  let currentCommand: Command.Any = command
 
-    for (let i = 1; i < commandPath.length; i++) {
-      const subcommandName = commandPath[i]
-      let subcommand: Command.Any | undefined = undefined
+  for (let i = 1; i < commandPath.length; i++) {
+    const subcommandName = commandPath[i]
+    let subcommand: Command.Any | undefined = undefined
 
-      for (const group of currentCommand.subcommands) {
-        subcommand = group.commands.find((sub) => sub.name === subcommandName)
-        if (subcommand) {
-          break
-        }
+    for (const group of currentCommand.subcommands) {
+      subcommand = group.commands.find((sub) => sub.name === subcommandName)
+      if (subcommand) {
+        break
       }
+    }
 
-      if (subcommand) {
-        currentCommand = subcommand
+    if (!subcommand) {
+      break
+    }
+
+    commands.push(subcommand)
+    currentCommand = subcommand
+  }
+
+  return commands
+}
+
+/**
+ * Returns active global flags for a command path.
+ * Built-ins are prepended and declarations are collected root -> leaf.
+ */
+export const getGlobalFlagsForCommandPath = <Name extends string, Input, E, R>(
+  command: Command<Name, Input, E, R>,
+  commandPath: ReadonlyArray<string>,
+  builtIns: ReadonlyArray<GlobalFlag.GlobalFlag<any>>
+): ReadonlyArray<GlobalFlag.GlobalFlag<any>> => {
+  const commands = getCommandsForCommandPath(command, commandPath)
+  const declared = commands.flatMap((current) => toImpl(current).globalFlags)
+  return dedupeGlobalFlags([
+    ...builtIns,
+    ...declared
+  ])
+}
+
+const collectDeclaredGlobalFlags = (command: Command.Any): ReadonlyArray<GlobalFlag.GlobalFlag<any>> => {
+  const collected: Array<GlobalFlag.GlobalFlag<any>> = []
+
+  const visit = (current: Command.Any): void => {
+    const impl = toImpl(current)
+    for (const flag of impl.globalFlags) {
+      collected.push(flag)
+    }
+    for (const group of current.subcommands) {
+      for (const subcommand of group.commands) {
+        visit(subcommand)
       }
     }
+  }
+
+  visit(command)
+  return dedupeGlobalFlags(collected)
+}
+
+/**
+ * Returns all global flags declared in a command tree.
+ * Built-ins are prepended and command declarations are deduplicated by identity.
+ */
+export const getGlobalFlagsForCommandTree = <Name extends string, Input, E, R>(
+  command: Command<Name, Input, E, R>,
+  builtIns: ReadonlyArray<GlobalFlag.GlobalFlag<any>>
+): ReadonlyArray<GlobalFlag.GlobalFlag<any>> =>
+  dedupeGlobalFlags([
+    ...builtIns,
+    ...collectDeclaredGlobalFlags(command)
+  ])
+
+/**
+ * Helper function to get help documentation for a specific command path.
+ * Navigates through the command hierarchy to find the right command.
+ * Reads active global flags for the path and includes them in the help doc.
+ */
+export const getHelpForCommandPath = <Name extends string, Input, E, R>(
+  command: Command<Name, Input, E, R>,
+  commandPath: ReadonlyArray<string>,
+  builtIns: ReadonlyArray<GlobalFlag.GlobalFlag<any>>
+): Effect.Effect<HelpDoc, never, never> =>
+  Effect.gen(function*() {
+    const commands = getCommandsForCommandPath(command, commandPath)
+    const currentCommand = commands.length > 0 ? commands[commands.length - 1] : command
 
     const baseDoc = toImpl(currentCommand).buildHelpDoc(commandPath)
 
-    const flags = yield* registry
+    const flags = getGlobalFlagsForCommandPath(command, commandPath, builtIns)
     const globalFlagDocs: Array<FlagDoc> = []
     for (const flag of flags) {
       const singles = Param.extractSingleParams(flag.flag)

package/src/unstable/httpapi/HttpApiBuilder.ts

@@ -20,7 +20,7 @@ import * as Transformation from "../../SchemaTransformation.ts"
 import type * as Scope from "../../Scope.ts"
 import * as ServiceMap from "../../ServiceMap.ts"
 import * as Stream from "../../Stream.ts"
-import type { Covariant } from "../../Types.ts"
+import type { Covariant, NoInfer } from "../../Types.ts"
 import * as UndefinedOr from "../../UndefinedOr.ts"
 import type { Cookie } from "../http/Cookies.ts"
 import type * as Etag from "../http/Etag.ts"
@@ -63,7 +63,6 @@ export const layer = <Id extends string, Groups extends HttpApiGroup.Any>(
   | HttpPlatform
   | Path
   | HttpApiGroup.ToService<Id, Groups>
-  | HttpApiGroup.ErrorServicesEncode<Groups>
 > =>
   HttpRouter.use(Effect.fnUntraced(function*(router) {
     const services = yield* Effect.services<
@@ -168,7 +167,7 @@ export interface Handlers<
     | R
     | HttpApiEndpoint.MiddlewareWithName<Endpoints, Name>
     | HttpApiEndpoint.MiddlewareServicesWithName<Endpoints, Name>
-    | HttpApiEndpoint.ExcludeProvided<
+    | HttpApiEndpoint.ExcludeProvidedWithName<
       Endpoints,
       Name,
       R1 | HttpApiEndpoint.ServerServicesWithName<Endpoints, Name>
@@ -188,7 +187,7 @@ export interface Handlers<
     | R
     | HttpApiEndpoint.MiddlewareWithName<Endpoints, Name>
     | HttpApiEndpoint.MiddlewareServicesWithName<Endpoints, Name>
-    | HttpApiEndpoint.ExcludeProvided<
+    | HttpApiEndpoint.ExcludeProvidedWithName<
       Endpoints,
       Name,
       R1 | HttpApiEndpoint.ServerServicesWithName<Endpoints, Name>
@@ -284,6 +283,54 @@ export declare namespace Handlers {
     never
 }
 
+/**
+ * @since 4.0.0
+ * @category handlers
+ */
+export const endpoint = <
+  ApiId extends string,
+  Groups extends HttpApiGroup.Any,
+  const GroupName extends HttpApiGroup.Name<Groups>,
+  const EndpointName extends HttpApiEndpoint.Name<HttpApiGroup.Endpoints<HttpApiGroup.WithName<Groups, GroupName>>>,
+  R,
+  Group extends HttpApiGroup.Any = HttpApiGroup.WithName<Groups, GroupName>,
+  Endpoint extends HttpApiEndpoint.Any = HttpApiEndpoint.WithName<HttpApiGroup.Endpoints<Group>, EndpointName>
+>(
+  api: HttpApi.HttpApi<ApiId, Groups>,
+  groupName: GroupName,
+  endpointName: EndpointName,
+  handler: NoInfer<
+    HttpApiEndpoint.HandlerWithName<
+      HttpApiGroup.Endpoints<HttpApiGroup.WithName<Groups, GroupName>>,
+      EndpointName,
+      never,
+      R
+    >
+  >
+): Effect.Effect<
+  Effect.Effect<
+    HttpServerResponse,
+    never,
+    | HttpServerRequest
+    | HttpRouter.RouteContext
+    | Request.ParsedSearchParams
+    | Exclude<R, HttpApiEndpoint.MiddlewareProvides<Endpoint>>
+  >,
+  never,
+  | HttpApiEndpoint.ServerServices<Endpoint>
+  | HttpApiEndpoint.Middleware<Endpoint>
+  | HttpApiEndpoint.MiddlewareServices<Endpoint>
+  | Etag.Generator
+  | FileSystem
+  | HttpPlatform
+  | Path
+> =>
+  Effect.servicesWith((services: ServiceMap.ServiceMap<any>) => {
+    const group = api.groups[groupName] as unknown as HttpApiGroup.AnyWithProps
+    const endpoint = group.endpoints[endpointName] as unknown as HttpApiEndpoint.AnyWithProps
+    return Effect.succeed(handlerToHttpEffect(group, endpoint, services, handler as any, false))
+  })
+
 /**
  * @since 4.0.0
  * @category security
@@ -497,22 +544,23 @@ function decodePayload(
   }
 }
 
-function handlerToRoute(
+function handlerToHttpEffect(
   group: HttpApiGroup.AnyWithProps,
-  handler: Handlers.Item<any>,
-  services: ServiceMap.ServiceMap<any>
-): HttpRouter.Route<any, any> {
-  const endpoint = handler.endpoint
+  endpoint: HttpApiEndpoint.AnyWithProps,
+  services: ServiceMap.ServiceMap<any>,
+  handler: HttpApiEndpoint.Handler<any, any, any>,
+  isRaw: boolean
+) {
   const encodeSuccess = Schema.encodeUnknownEffect(makeSuccessSchema(endpoint))
   const encodeError = Schema.encodeUnknownEffect(makeErrorSchema(endpoint))
   const decodeParams = UndefinedOr.map(endpoint.params, Schema.decodeUnknownEffect)
   const decodeHeaders = UndefinedOr.map(endpoint.headers, Schema.decodeUnknownEffect)
   const decodeQuery = UndefinedOr.map(endpoint.query, Schema.decodeUnknownEffect)
 
-  const shouldParsePayload = endpoint.payload.size > 0 && !handler.isRaw
+  const shouldParsePayload = endpoint.payload.size > 0 && !isRaw
   const payloadBy = shouldParsePayload ? buildPayloadDecoders(endpoint.payload) : undefined
 
-  const effect = applyMiddleware(
+  return applyMiddleware(
     group,
     endpoint,
     services,
@@ -545,7 +593,7 @@ function handlerToRoute(
           request.payload = yield* result
         }
       }
-      const response = yield* handler.handler(request)
+      const response = yield* handler(request)
       return Response.isHttpServerResponse(response) ? response : yield* encodeSuccess(response)
     })
   ).pipe(
@@ -558,11 +606,18 @@ function handlerToRoute(
     }),
     Effect.provideServices(services)
   )
+}
 
+function handlerToRoute(
+  group: HttpApiGroup.AnyWithProps,
+  handler: Handlers.Item<any>,
+  services: ServiceMap.ServiceMap<any>
+): HttpRouter.Route<any, any> {
+  const endpoint = handler.endpoint
   return HttpRouter.route(
     endpoint.method,
     endpoint.path as HttpRouter.PathInput,
-    effect,
+    handlerToHttpEffect(group, endpoint, services, handler.handler, handler.isRaw),
     { uninterruptible: handler.uninterruptible }
   )
 }

package/src/unstable/httpapi/HttpApiEndpoint.ts

@@ -513,8 +513,8 @@ export type ServerServices<Endpoint> = Endpoint extends HttpApiEndpoint<
     | _Payload["DecodingServices"]
     | _Headers["DecodingServices"]
     | _Success["EncodingServices"]
-  // Error services are handled globally
-  // | _Error["EncodingServices"]
+    | _Error["EncodingServices"]
+    | HttpApiMiddleware.ErrorServicesEncode<_M>
   : never
 
 /**
@@ -668,10 +668,19 @@ export type MiddlewareServicesWithName<Endpoints extends Any, Name extends strin
  * @since 4.0.0
  * @category models
  */
-export type ExcludeProvided<Endpoints extends Any, Name extends string, R> = Exclude<
+export type ExcludeProvidedWithName<Endpoints extends Any, Name extends string, R> = ExcludeProvided<
+  WithName<Endpoints, Name>,
+  R
+>
+
+/**
+ * @since 4.0.0
+ * @category models
+ */
+export type ExcludeProvided<Endpoint extends Any, R> = Exclude<
   R,
   | HttpRouter.Provided
-  | HttpApiMiddleware.Provides<MiddlewareWithName<Endpoints, Name>>
+  | HttpApiMiddleware.Provides<Middleware<Endpoint>>
 >
 
 /**

package/src/unstable/httpapi/OpenApi.ts

@@ -635,9 +635,26 @@ function toEncodingAST(ast: AST.AST, _tag: HttpApiSchema.Encoding["_tag"]): AST.
       return Schema.String.ast
     case "FormUrlEncoded":
     case "Json":
-    case "Multipart":
       return ast
+    case "Multipart":
+      return persistedFileToBinaryEncoding(ast)
+  }
+}
+
+function persistedFileToBinaryEncoding(ast: AST.AST): AST.AST {
+  if (
+    AST.isDeclaration(ast) &&
+    ((ast.annotations as (Schema.Annotations.Declaration<unknown, readonly []> | undefined))?.typeConstructor?._tag ===
+      "effect/http/PersistedFile")
+  ) {
+    return Uint8ArrayEncoding.ast
+  }
+
+  if (typeof (ast as any)?.recur === "function") {
+    return (ast as any).recur(persistedFileToBinaryEncoding)
   }
+
+  return ast
 }
 
 const makeSecurityScheme = (security: HttpApiSecurity): OpenAPISecurityScheme => {

package/src/unstable/reactivity/AtomHttpApi.ts

@@ -66,7 +66,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
           readonly reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined
         }
       >,
-      WithResponse extends true ? [_Success, HttpClientResponse] : _Success,
+      WithResponse extends true ? [_Success["Type"], HttpClientResponse] : _Success["Type"],
       _Error | HttpClientError.HttpClientError | SchemaError
     >
     : never
@@ -123,7 +123,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
     >
   ] ? Atom.Atom<
       AsyncResult.AsyncResult<
-        WithResponse extends true ? [_Success, HttpClientResponse] : _Success,
+        WithResponse extends true ? [_Success["Type"], HttpClientResponse] : _Success["Type"],
         _Error | HttpClientError.HttpClientError | SchemaError
       >
     >

package/src/unstable/reactivity/AtomRegistry.ts

@@ -482,9 +482,7 @@ class RegistryImpl implements AtomRegistry {
 
   removeNodeTimeout(node: NodeImpl<any>): void {
     const bucket = this.nodeTimeoutBucket.get(node)
-    if (bucket === undefined) {
-      return
-    }
+    if (bucket === undefined) return
     this.nodeTimeoutBucket.delete(node)
     this.scheduleNodeRemoval(node)
 
@@ -502,10 +500,8 @@ class RegistryImpl implements AtomRegistry {
     this.timeoutBuckets.delete(bucket)
 
     nodes.forEach((node) => {
-      if (!node.canBeRemoved) {
-        return
-      }
       this.nodeTimeoutBucket.delete(node)
+      if (!node.canBeRemoved) return
       this.nodes.delete(atomKey(node.atom))
       this.onNodeRemoved?.(node)
       this.#currentSweepTTL = node.atom.idleTTL ?? this.defaultIdleTTL!