effect 4.0.0-beta.37 → 4.0.0-beta.39

package/src/unstable/httpapi/HttpApiSchema.ts

@@ -31,6 +31,7 @@ import { constVoid, type LazyArg } from "../../Function.ts"
 import * as Schema from "../../Schema.ts"
 import * as AST from "../../SchemaAST.ts"
 import * as Transformation from "../../SchemaTransformation.ts"
+import { hasBody, type HttpMethod } from "../http/HttpMethod.ts"
 import type * as Multipart_ from "../http/Multipart.ts"
 
 declare module "../../Schema.ts" {
@@ -332,6 +333,17 @@ export function asUint8Array(options?: {
   return <S extends Schema.Top & { readonly Encoded: Uint8Array }>(self: S) =>
     asNonMultipartEncoding(self, { _tag: "Uint8Array", ...options })
 }
+/**
+ * @since 4.0.0
+ */
+export const isNoContent = (ast: AST.AST): boolean => {
+  if (AST.isVoid(ast)) return true
+  const encoded = AST.toEncoded(ast)
+  if (AST.isVoid(encoded)) return true
+  const target = ast.encoding?.[0].to
+  if (target === undefined) return false
+  return AST.isVoid(target)
+}
 
 const resolveHttpApiEncoding = AST.resolveAt<Encoding>("~httpApiEncoding")
 
@@ -341,14 +353,20 @@ const defaultJsonEncoding: Encoding = {
   _tag: "Json",
   contentType: "application/json"
 }
+const defaultUrlEncodedEncoding: Encoding = {
+  _tag: "FormUrlEncoded",
+  contentType: "application/x-www-form-urlencoded"
+}
 
 function getEncoding(ast: AST.AST): Encoding {
   return resolveHttpApiEncoding(ast) ?? defaultJsonEncoding
 }
 
 /** @internal */
-export function getPayloadEncoding(ast: AST.AST): PayloadEncoding {
-  return getEncoding(ast)
+export function getPayloadEncoding(ast: AST.AST, method: HttpMethod): PayloadEncoding {
+  const encoding = resolveHttpApiEncoding(ast)
+  if (encoding) return encoding
+  return hasBody(method) ? defaultJsonEncoding : defaultUrlEncodedEncoding
 }
 
 /** @internal */

package/src/unstable/httpapi/OpenApi.ts

@@ -314,7 +314,7 @@ export function fromApi<Id extends string, Groups extends HttpApiGroup.Any>(
           const c: OpenApiSpecContent = {}
           let hasContent = false
           payloadMap.forEach(({ encoding, schemas }, contentType) => {
-            const filtered = schemas.filter((s) => !isNoContent(s.ast))
+            const filtered = schemas.filter((s) => !HttpApiSchema.isNoContent(s.ast))
             if (filtered.length === 0) return
             hasContent = true
             const asts = filtered.map(AST.getAST)
@@ -529,10 +529,6 @@ export function fromApi<Id extends string, Groups extends HttpApiGroup.Any>(
   return spec
 }
 
-function isNoContent(ast: AST.AST): boolean {
-  return AST.isVoid(AST.toEncoded(ast))
-}
-
 type ResponseBodies = Map<
   number, // status
   {
@@ -558,7 +554,7 @@ function extractResponseBodies(
   function process(schema: Schema.Top) {
     const ast = schema.ast
     const status = getStatus(ast)
-    if (isNoContent(ast)) {
+    if (HttpApiSchema.isNoContent(ast)) {
       addNoContent(status, getDescription(schema.ast) ?? "<No Content>")
     } else {
       addContent(schema, status, HttpApiSchema.getResponseEncoding(ast))

package/src/unstable/reactivity/AtomHttpApi.ts

@@ -41,12 +41,12 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
       HttpApiGroup.Endpoints<Group>,
       Name
     >,
-    const WithResponse extends boolean = false
+    const ResponseMode extends HttpApiEndpoint.ClientResponseMode = HttpApiEndpoint.ClientResponseMode
   >(
     group: GroupName,
     endpoint: Name,
     options?: {
-      readonly withResponse?: WithResponse | undefined
+      readonly responseMode?: ResponseMode | undefined
     }
   ) => [Endpoint] extends [
     HttpApiEndpoint.HttpApiEndpoint<
@@ -64,11 +64,11 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
     >
   ] ? Atom.AtomResultFn<
       Simplify<
-        HttpApiEndpoint.ClientRequest<_Params, _Query, _Payload, _Headers, false> & {
+        HttpApiEndpoint.ClientRequest<_Params, _Query, _Payload, _Headers, "decoded-only"> & {
           readonly reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined
         }
       >,
-      WithResponse extends true ? [_Success["Type"], HttpClientResponse] : _Success["Type"],
+      ResponseByMode<_Success["Type"], ResponseMode>,
       _Error["Type"]
     >
     : never
@@ -81,7 +81,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
       HttpApiGroup.Endpoints<Group>,
       Name
     >,
-    const WithResponse extends boolean = false
+    const ResponseMode extends HttpApiEndpoint.ClientResponseMode = "decoded-only"
   >(
     group: GroupName,
     endpoint: Name,
@@ -100,7 +100,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
         infer _RE
       >
     ] ? Simplify<
-        HttpApiEndpoint.ClientRequest<_Params, _Query, _Payload, _Headers, WithResponse> & {
+        HttpApiEndpoint.ClientRequest<_Params, _Query, _Payload, _Headers, ResponseMode> & {
           readonly reactivityKeys?:
             | ReadonlyArray<unknown>
             | ReadonlyRecord<string, ReadonlyArray<unknown>>
@@ -125,7 +125,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
     >
   ] ? Atom.Atom<
       AsyncResult.AsyncResult<
-        WithResponse extends true ? [_Success["Type"], HttpClientResponse] : _Success["Type"],
+        ResponseByMode<_Success["Type"], ResponseMode>,
         _Error["Type"]
       >
     >
@@ -175,7 +175,7 @@ export const Service = <Self>() =>
     Schema.isSchemaError(e) || HttpClientError.isHttpClientError(e) ? Effect.die(e) : Effect.fail(e)
   )
 
-  const mutationFamily = Atom.family(({ endpoint, group, withResponse }: MutationKey) => {
+  const mutationFamily = Atom.family(({ endpoint, group, responseMode }: MutationKey) => {
     const atom = self.runtime.fn<{
       params: any
       query: any
@@ -187,14 +187,14 @@ export const Service = <Self>() =>
         const client = (yield* self) as any
         const effect = catchErrors(client[group][endpoint]({
           ...opts,
-          withResponse
+          responseMode
         }) as Effect.Effect<any>)
         return yield* opts.reactivityKeys
           ? Reactivity.mutation(effect, opts.reactivityKeys)
           : effect
       })
     )
-    if (withResponse === false) {
+    if (responseMode === "decoded-only") {
       const definition = options.api.groups[group]!.endpoints[endpoint]! as HttpApiEndpoint.AnyWithProps
       return Atom.serializable(atom, {
         key: `AtomHttpApi:mutation:${group}:${endpoint}`,
@@ -208,12 +208,12 @@ export const Service = <Self>() =>
   }) as any
 
   self.mutation = ((group: string, endpoint: string, options?: {
-    readonly withResponse?: boolean | undefined
+    readonly responseMode?: HttpApiEndpoint.ClientResponseMode | undefined
   }) =>
     mutationFamily({
       group,
       endpoint,
-      withResponse: options?.withResponse ?? false
+      responseMode: options?.responseMode ?? "decoded-only"
     })) as any
 
   const queryFamily = Atom.family((opts: QueryKey) => {
@@ -224,7 +224,7 @@ export const Service = <Self>() =>
         HttpClientError.HttpClientError | SchemaError
       >)
     }))
-    if (opts.withResponse === false) {
+    if (opts.responseMode === "decoded-only") {
       const endpoint = options.api.groups[opts.group]!.endpoints[opts.endpoint]! as HttpApiEndpoint.AnyWithProps
       atom = Atom.serializable(atom, {
         key: makeSerializableKey(opts),
@@ -252,7 +252,7 @@ export const Service = <Self>() =>
       readonly query?: any
       readonly payload?: any
       readonly headers?: any
-      readonly withResponse?: boolean
+      readonly responseMode?: HttpApiEndpoint.ClientResponseMode
       readonly reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined
       readonly timeToLive?: Duration.Input | undefined
     }
@@ -264,7 +264,7 @@ export const Service = <Self>() =>
       query: request.query,
       payload: request.payload,
       headers: request.headers,
-      withResponse: request.withResponse ?? false,
+      responseMode: request.responseMode ?? "decoded-only",
       reactivityKeys: request.reactivityKeys,
       timeToLive: request.timeToLive
         ? Duration.fromInputUnsafe(request.timeToLive)
@@ -277,7 +277,7 @@ export const Service = <Self>() =>
 interface MutationKey {
   group: string
   endpoint: string
-  withResponse: boolean
+  responseMode: HttpApiEndpoint.ClientResponseMode
 }
 
 interface QueryKey {
@@ -287,11 +287,16 @@ interface QueryKey {
   query: any
   headers: any
   payload: any
-  withResponse: boolean
+  responseMode: HttpApiEndpoint.ClientResponseMode
   reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined
   timeToLive?: Duration.Duration | undefined
 }
 
+type ResponseByMode<Success, ResponseMode extends HttpApiEndpoint.ClientResponseMode> = [ResponseMode] extends
+  ["decoded-and-response"] ? [Success, HttpClientResponse]
+  : [ResponseMode] extends ["response-only"] ? HttpClientResponse
+  : Success
+
 const makeSerializableKey = (
   key: QueryKey
 ): string => `AtomHttpApi:${key.group}:${key.endpoint}:${Hash.hash(key)}`

package/src/unstable/schema/VariantSchema.ts

@@ -238,7 +238,7 @@ export interface Class<
   new(
     props: S["~type.make.in"],
     options?: {
-      readonly disableValidation?: boolean
+      readonly disableChecks?: boolean
     } | undefined
   ): S["Type"]