effect 4.0.0-beta.8 → 4.0.0-beta.9

package/dist/unstable/httpapi/OpenApi.js

@@ -294,20 +294,23 @@ export function fromApi(api, options) {
           }
         }
       }
-      function processParameters(fields, i) {
-        if (fields) {
-          for (const [name, field] of Object.entries(fields)) {
-            op.parameters.push({
-              name: String(name),
-              in: i,
-              schema: {},
-              required: i === "path" || !AST.isOptional(field.ast)
-            });
-            pathOps.push({
-              _tag: "parameter",
-              ast: AST.toEncoded(field.ast),
-              path: ["paths", path, method, "parameters", String(op.parameters.length - 1), "schema"]
-            });
+      function processParameters(schema, i) {
+        if (schema) {
+          const ast = AST.toEncoded(schema.ast);
+          if (AST.isObjects(ast)) {
+            for (const ps of ast.propertySignatures) {
+              op.parameters.push({
+                name: String(ps.name),
+                in: i,
+                schema: {},
+                required: i === "path" || !AST.isOptional(ps.type)
+              });
+              pathOps.push({
+                _tag: "parameter",
+                ast: ps.type,
+                path: ["paths", path, method, "parameters", String(op.parameters.length - 1), "schema"]
+              });
+            }
           }
         }
       }
@@ -347,8 +350,7 @@ export function fromApi(api, options) {
       processParameters(endpoint.params, "path");
       if (!hasBody && endpoint.payload.size === 1) {
         const entry = endpoint.payload.values().next().value;
-        const schema = entry.schemas[0];
-        processParameters(schema.fields, "query");
+        processParameters(entry.schemas[0], "query");
       }
       processParameters(endpoint.headers, "header");
       processParameters(endpoint.query, "query");

package/dist/unstable/httpapi/OpenApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpenApi.js","names":["Arr","constFalse","JsonPatch","escapeToken","JsonSchema","Option","Schema","AST","SchemaRepresentation","ServiceMap","HttpMethod","HttpApi","HttpApiEndpoint","HttpApiMiddleware","HttpApiSchema","Identifier","Service","Title","Version","Description","License","ExternalDocs","Servers","Format","Summary","Deprecated","Override","Exclude","Reference","defaultValue","Transform","servicesPartial","tags","entries","Object","options","context","empty","key","tag","undefined","add","annotations","identifier","title","version","description","license","summary","deprecated","externalDocs","servers","format","override","exclude","transform","apiCache","WeakMap","processAnnotation","ctx","annotation","f","o","getOption","isSome","value","fromApi","api","cached","get","spec","openapi","info","paths","components","schemas","securitySchemes","security","pathOps","reflect","onGroup","group","name","getOrElse","assign","transformFn","push","onEndpoint","endpoint","mergedAnnotations","middleware","op","operationId","topLevel","parameters","responses","path","replace","method","toLowerCase","processRequestBodies","payloadMap","size","c","hasContent","forEach","encoding","contentType","filtered","filter","s","isNoContent","ast","length","asts","map","getAST","Union","_tag","toEncodingAST","schema","requestBody","content","required","processResponseBodies","bodies","defaultDescription","status","descriptions","Array","from","join","String","processParameters","fields","i","field","in","isOptional","toEncoded","isSecurity","processHttpApiSecurity","makeSecurityScheme","hasBody","payload","params","entry","values","next","headers","query","extractResponseBodies","getSuccessSchemas","getStatusSuccess","resolveDescriptionOrIdentifier","getErrorSchemas","getStatusError","AdditionalSchemas","componentSchemas","componentSchema","resolveIdentifier","globalThis","Error","escapePath","isArrayNonEmpty","multiDocument","fromASTs","jsonSchemaMultiDocument","toMultiDocumentOpenApi3_1","toJsonSchemaMultiDocument","additionalProperties","patchOps","oppath","definitions","definition","apply","keys","VALID_OPEN_API_COMPONENTS_SCHEMAS_KEY_REGEXP","test","set","isVoid","getStatus","getDescription","Map","process","addNoContent","addContent","getResponseEncoding","statusMap","Set","contentTypeMap","resolveDescription","Uint8ArrayEncoding","annotate","meta","type","scheme","pipe","bearerFormat","getOrUndefined"],"sources":["../../../src/unstable/httpapi/OpenApi.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"OpenApi.js","names":["Arr","constFalse","JsonPatch","escapeToken","JsonSchema","Option","Schema","AST","SchemaRepresentation","ServiceMap","HttpMethod","HttpApi","HttpApiEndpoint","HttpApiMiddleware","HttpApiSchema","Identifier","Service","Title","Version","Description","License","ExternalDocs","Servers","Format","Summary","Deprecated","Override","Exclude","Reference","defaultValue","Transform","servicesPartial","tags","entries","Object","options","context","empty","key","tag","undefined","add","annotations","identifier","title","version","description","license","summary","deprecated","externalDocs","servers","format","override","exclude","transform","apiCache","WeakMap","processAnnotation","ctx","annotation","f","o","getOption","isSome","value","fromApi","api","cached","get","spec","openapi","info","paths","components","schemas","securitySchemes","security","pathOps","reflect","onGroup","group","name","getOrElse","assign","transformFn","push","onEndpoint","endpoint","mergedAnnotations","middleware","op","operationId","topLevel","parameters","responses","path","replace","method","toLowerCase","processRequestBodies","payloadMap","size","c","hasContent","forEach","encoding","contentType","filtered","filter","s","isNoContent","ast","length","asts","map","getAST","Union","_tag","toEncodingAST","schema","requestBody","content","required","processResponseBodies","bodies","defaultDescription","status","descriptions","Array","from","join","String","processParameters","i","toEncoded","isObjects","ps","propertySignatures","in","isOptional","type","isSecurity","processHttpApiSecurity","makeSecurityScheme","hasBody","payload","params","entry","values","next","headers","query","extractResponseBodies","getSuccessSchemas","getStatusSuccess","resolveDescriptionOrIdentifier","getErrorSchemas","getStatusError","AdditionalSchemas","componentSchemas","componentSchema","resolveIdentifier","globalThis","Error","escapePath","isArrayNonEmpty","multiDocument","fromASTs","jsonSchemaMultiDocument","toMultiDocumentOpenApi3_1","toJsonSchemaMultiDocument","additionalProperties","patchOps","oppath","definitions","definition","apply","keys","VALID_OPEN_API_COMPONENTS_SCHEMAS_KEY_REGEXP","test","set","isVoid","getStatus","getDescription","Map","process","addNoContent","addContent","getResponseEncoding","statusMap","Set","contentTypeMap","resolveDescription","Uint8ArrayEncoding","annotate","meta","scheme","pipe","bearerFormat","getOrUndefined"],"sources":["../../../src/unstable/httpapi/OpenApi.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/unstable/reactivity/AtomHttpApi.d.ts

@@ -28,17 +28,17 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
     readonly mutation: <GroupName extends HttpApiGroup.Name<Groups>, Name extends HttpApiEndpoint.Name<HttpApiGroup.Endpoints<Group>>, Group extends HttpApiGroup.Any = HttpApiGroup.WithName<Groups, GroupName>, Endpoint extends HttpApiEndpoint.Any = HttpApiEndpoint.WithName<HttpApiGroup.Endpoints<Group>, Name>, const WithResponse extends boolean = false>(group: GroupName, endpoint: Name, options?: {
         readonly withResponse?: WithResponse | undefined;
     }) => [Endpoint] extends [
-        HttpApiEndpoint.HttpApiEndpoint<infer _Name, infer _Method, infer _Path, infer _PathSchema, infer _UrlParams, infer _Payload, infer _Headers, infer _Success, infer _Error, infer _R, infer _RE>
-    ] ? Atom.AtomResultFn<Simplify<HttpApiEndpoint.ClientRequest<_PathSchema, _UrlParams, _Payload, _Headers, false> & {
+        HttpApiEndpoint.HttpApiEndpoint<infer _Name, infer _Method, infer _Path, infer _Params, infer _Query, infer _Payload, infer _Headers, infer _Success, infer _Error, infer _R, infer _RE>
+    ] ? Atom.AtomResultFn<Simplify<HttpApiEndpoint.ClientRequest<_Params, _Query, _Payload, _Headers, false> & {
         readonly reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined;
     }>, WithResponse extends true ? [_Success, HttpClientResponse] : _Success, _Error | HttpClientError.HttpClientError | SchemaError> : never;
     readonly query: <GroupName extends HttpApiGroup.Name<Groups>, Name extends HttpApiEndpoint.Name<HttpApiGroup.Endpoints<Group>>, Group extends HttpApiGroup.Any = HttpApiGroup.WithName<Groups, GroupName>, Endpoint extends HttpApiEndpoint.Any = HttpApiEndpoint.WithName<HttpApiGroup.Endpoints<Group>, Name>, const WithResponse extends boolean = false>(group: GroupName, endpoint: Name, request: [Endpoint] extends [
-        HttpApiEndpoint.HttpApiEndpoint<infer _Name, infer _Method, infer _Path, infer _PathSchema, infer _UrlParams, infer _Payload, infer _Headers, infer _Success, infer _Error, infer _R, infer _RE>
-    ] ? Simplify<HttpApiEndpoint.ClientRequest<_PathSchema, _UrlParams, _Payload, _Headers, WithResponse> & {
+        HttpApiEndpoint.HttpApiEndpoint<infer _Name, infer _Method, infer _Path, infer _Params, infer _Query, infer _Payload, infer _Headers, infer _Success, infer _Error, infer _R, infer _RE>
+    ] ? Simplify<HttpApiEndpoint.ClientRequest<_Params, _Query, _Payload, _Headers, WithResponse> & {
         readonly reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined;
         readonly timeToLive?: Duration.Input | undefined;
     }> : never) => [Endpoint] extends [
-        HttpApiEndpoint.HttpApiEndpoint<infer _Name, infer _Method, infer _Path, infer _UrlParams, infer _Payload, infer _Headers, infer _Success, infer _Error, infer _R, infer _RE>
+        HttpApiEndpoint.HttpApiEndpoint<infer _Name, infer _Method, infer _Path, infer _Params, infer _Query, infer _Payload, infer _Headers, infer _Success, infer _Error, infer _R, infer _RE>
     ] ? Atom.Atom<AsyncResult.AsyncResult<WithResponse extends true ? [_Success, HttpClientResponse] : _Success, _Error | HttpClientError.HttpClientError | SchemaError>> : never;
 }
 declare global {

package/dist/unstable/reactivity/AtomHttpApi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"AtomHttpApi.d.ts","sourceRoot":"","sources":["../../../src/unstable/reactivity/AtomHttpApi.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AtomHttpApi.d.ts","sourceRoot":"","sources":["../../../src/unstable/reactivity/AtomHttpApi.ts"],"names":[],"mappings":"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"}

package/dist/unstable/reactivity/AtomHttpApi.js

@@ -47,8 +47,8 @@ export const Service = () => (id, options) => {
   self.query = (group, endpoint, request) => queryFamily({
     group,
     endpoint,
-    path: request.path,
-    urlParams: request.urlParams,
+    params: request.params,
+    query: request.query,
     payload: request.payload,
     headers: request.headers,
     withResponse: request.withResponse ?? false,

package/dist/unstable/reactivity/AtomHttpApi.js.map

@@ -1 +1 @@
-{"version":3,"file":"AtomHttpApi.js","names":["Duration","Effect","Layer","ServiceMap","HttpApiClient","Atom","Reactivity","Service","id","options","self","layer","effect","make","api","pipe","provide","httpClient","runtimeFactory","runtime","mutationFamily","family","endpoint","group","withResponse","fn","fnUntraced","opts","client","reactivityKeys","mutation","queryFamily","atom","use","client_","timeToLive","isFinite","setIdleTTL","keepAlive","factory","withReactivity","query","request","path","urlParams","payload","headers","fromInputUnsafe","undefined"],"sources":["../../../src/unstable/reactivity/AtomHttpApi.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"AtomHttpApi.js","names":["Duration","Effect","Layer","ServiceMap","HttpApiClient","Atom","Reactivity","Service","id","options","self","layer","effect","make","api","pipe","provide","httpClient","runtimeFactory","runtime","mutationFamily","family","endpoint","group","withResponse","fn","fnUntraced","opts","client","reactivityKeys","mutation","queryFamily","atom","use","client_","timeToLive","isFinite","setIdleTTL","keepAlive","factory","withReactivity","query","request","params","payload","headers","fromInputUnsafe","undefined"],"sources":["../../../src/unstable/reactivity/AtomHttpApi.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "effect",
   "type": "module",
-  "version": "4.0.0-beta.8",
+  "version": "4.0.0-beta.9",
   "license": "MIT",
   "description": "The missing standard library for TypeScript, for writing production-grade software.",
   "homepage": "https://effect.website",

package/src/unstable/httpapi/HttpApiBuilder.ts

@@ -505,9 +505,9 @@ function handlerToRoute(
   const endpoint = handler.endpoint
   const encodeSuccess = Schema.encodeUnknownEffect(makeSuccessSchema(endpoint))
   const encodeError = Schema.encodeUnknownEffect(makeErrorSchema(endpoint))
-  const decodeParams = UndefinedOr.map(HttpApiEndpoint.getParamsSchema(endpoint), Schema.decodeUnknownEffect)
-  const decodeHeaders = UndefinedOr.map(HttpApiEndpoint.getHeadersSchema(endpoint), Schema.decodeUnknownEffect)
-  const decodeQuery = UndefinedOr.map(HttpApiEndpoint.getQuerySchema(endpoint), Schema.decodeUnknownEffect)
+  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 payloadBy = shouldParsePayload ? buildPayloadDecoders(endpoint.payload) : undefined

package/src/unstable/httpapi/HttpApiClient.ts

@@ -217,7 +217,7 @@ const makeClient = <ApiId extends string, Groups extends HttpApiGroup.Any, E, R>
         })
 
         // encoders
-        const encodeParams = UndefinedOr.map(HttpApiEndpoint.getParamsSchema(endpoint), Schema.encodeUnknownEffect)
+        const encodeParams = UndefinedOr.map(endpoint.params, Schema.encodeUnknownEffect)
 
         const payloadSchemas = HttpApiEndpoint.getPayloadSchemas(endpoint)
         const encodePayload = Arr.isArrayNonEmpty(payloadSchemas) ?
@@ -226,8 +226,8 @@ const makeClient = <ApiId extends string, Groups extends HttpApiGroup.Any, E, R>
             : Schema.encodeUnknownEffect(Schema.Union(payloadSchemas)) :
           undefined
 
-        const encodeHeaders = UndefinedOr.map(HttpApiEndpoint.getHeadersSchema(endpoint), Schema.encodeUnknownEffect)
-        const encodeQuery = UndefinedOr.map(HttpApiEndpoint.getQuerySchema(endpoint), Schema.encodeUnknownEffect)
+        const encodeHeaders = UndefinedOr.map(endpoint.headers, Schema.encodeUnknownEffect)
+        const encodeQuery = UndefinedOr.map(endpoint.query, Schema.encodeUnknownEffect)
 
         const middlewareKeys = Array.from(onEndpointOptions.middleware, (tag) => `${tag.key}/Client`)
 

package/src/unstable/httpapi/HttpApiEndpoint.ts

@@ -4,7 +4,6 @@
 import * as Arr from "../../Array.ts"
 import type { Brand } from "../../Brand.ts"
 import type { Effect } from "../../Effect.ts"
-import { format } from "../../Formatter.ts"
 import { type Pipeable, pipeArguments } from "../../Pipeable.ts"
 import * as Predicate from "../../Predicate.ts"
 import * as Schema from "../../Schema.ts"
@@ -71,9 +70,9 @@ export interface HttpApiEndpoint<
   readonly name: Name
   readonly path: Path
   readonly method: Method
-  readonly params: Schema.Struct.Fields | undefined
-  readonly query: Schema.Struct.Fields | undefined
-  readonly headers: Schema.Struct.Fields | undefined
+  readonly params: Schema.Top | undefined
+  readonly query: Schema.Top | undefined
+  readonly headers: Schema.Top | undefined
   readonly payload: PayloadMap
   readonly success: ReadonlySet<Schema.Top>
   readonly error: ReadonlySet<Schema.Top>
@@ -156,21 +155,6 @@ export interface HttpApiEndpoint<
   >
 }
 
-/** @internal */
-export function getParamsSchema(endpoint: AnyWithProps): Schema.Top | undefined {
-  return endpoint.params ? Schema.Struct(endpoint.params) : undefined
-}
-
-/** @internal */
-export function getQuerySchema(endpoint: AnyWithProps): Schema.Top | undefined {
-  return endpoint.query ? Schema.Struct(endpoint.query) : undefined
-}
-
-/** @internal */
-export function getHeadersSchema(endpoint: AnyWithProps): Schema.Top | undefined {
-  return endpoint.headers ? Schema.Struct(endpoint.headers) : undefined
-}
-
 /** @internal */
 export function getPayloadSchemas(endpoint: AnyWithProps): Array<Schema.Top> {
   const result: Array<Schema.Top> = []
@@ -830,9 +814,9 @@ function makeProto<
   readonly name: Name
   readonly path: Path
   readonly method: Method
-  readonly params: Schema.Struct.Fields | undefined
-  readonly query: Schema.Struct.Fields | undefined
-  readonly headers: Schema.Struct.Fields | undefined
+  readonly params: Schema.Top | undefined
+  readonly query: Schema.Top | undefined
+  readonly headers: Schema.Top | undefined
   readonly payload: PayloadMap
   readonly success: ReadonlySet<Schema.Top>
   readonly error: ReadonlySet<Schema.Top>
@@ -855,32 +839,28 @@ function makeProto<
 }
 
 /**
- * Params come from the router as `string` (optional params as `undefined`) and
- * must be encodable back into the URL path.
- *
- * We accept "struct fields" (`Record<string, Codec<...>>`) so we can both enforce
- * `Encoded` = `string | undefined` per field and reliably generate OpenAPI
- * `in: path` parameters by iterating object properties.
- *
  * @since 4.0.0
  * @category constraints
  */
-export type ParamsConstraint = Record<string, Schema.Encoder<string | undefined, unknown>>
+export type ParamsConstraint =
+  | Record<string, Schema.Encoder<string | undefined, unknown>>
+  | Schema.Encoder<Record<string, string | undefined>, unknown>
 
 /**
- * URL search params can be repeated, so fields may encode to `string` or
- * `ReadonlyArray<string>` (or be missing).
- *
- * Kept as "struct fields" so OpenAPI can safely expand properties into
- * `in: query` parameters.
- *
  * @since 4.0.0
  * @category constraints
  */
-export type QuerySchemaConstraint = Record<
-  string,
-  Schema.Encoder<string | ReadonlyArray<string> | undefined, unknown>
->
+export type HeadersConstraint =
+  | Record<string, Schema.Encoder<string | undefined, unknown>>
+  | Schema.Encoder<Record<string, string | undefined>, unknown>
+
+/**
+ * @since 4.0.0
+ * @category constraints
+ */
+export type QueryConstraint =
+  | Record<string, Schema.Encoder<string | ReadonlyArray<string> | undefined, unknown>>
+  | Schema.Encoder<Record<string, string | ReadonlyArray<string> | undefined>, unknown>
 
 /**
  * Payload schema depends on the HTTP method:
@@ -893,34 +873,23 @@ export type QuerySchemaConstraint = Record<
  * @since 4.0.0
  * @category constraints
  */
-export type PayloadSchemaConstraint<Method extends HttpMethod> = Method extends HttpMethod.NoBody ? Record<
+export type PayloadConstraint<Method extends HttpMethod> = Method extends HttpMethod.NoBody ? Record<
     string,
     Schema.Encoder<string | ReadonlyArray<string> | undefined, unknown>
   > :
-  SuccessSchemaConstraint
-
-/**
- * HTTP headers are string-valued (or missing).
- *
- * Kept as "struct fields" so OpenAPI can safely expand properties into
- * `in: header` parameters.
- *
- * @since 4.0.0
- * @category constraints
- */
-export type HeadersSchemaConstraint = Record<string, Schema.Encoder<string | undefined, unknown>>
+  SuccessConstraint
 
 /**
  * @since 4.0.0
  * @category constraints
  */
-export type SuccessSchemaConstraint = Schema.Top | ReadonlyArray<Schema.Top>
+export type SuccessConstraint = Schema.Top | ReadonlyArray<Schema.Top>
 
 /**
  * @since 4.0.0
  * @category constraints
  */
-export type ErrorSchemaConstraint = Schema.Top | ReadonlyArray<Schema.Top>
+export type ErrorConstraint = Schema.Top | ReadonlyArray<Schema.Top>
 
 /**
  * @since 4.0.0
@@ -931,11 +900,11 @@ export const make = <Method extends HttpMethod>(method: Method) =>
   const Name extends string,
   const Path extends HttpRouter.PathInput,
   Params extends ParamsConstraint = never,
-  Query extends QuerySchemaConstraint = never,
-  Payload extends PayloadSchemaConstraint<Method> = never,
-  Headers extends HeadersSchemaConstraint = never,
-  const Success extends SuccessSchemaConstraint = HttpApiSchema.NoContent,
-  const Error extends ErrorSchemaConstraint = never
+  Query extends QueryConstraint = never,
+  Payload extends PayloadConstraint<Method> = never,
+  Headers extends HeadersConstraint = never,
+  const Success extends SuccessConstraint = HttpApiSchema.NoContent,
+  const Error extends ErrorConstraint = never
 >(
   name: Name,
   path: Path,
@@ -964,8 +933,8 @@ export const make = <Method extends HttpMethod>(method: Method) =>
     name,
     path,
     method,
-    params: options?.params,
-    query: options?.query,
+    params: getParams(options?.params),
+    query: getQuery(options?.query),
     headers: getHeaders(options?.headers),
     payload: getPayload(options?.payload),
     success: getSuccess(options?.success),
@@ -975,17 +944,23 @@ export const make = <Method extends HttpMethod>(method: Method) =>
   })
 }
 
+function getParams(params: ParamsConstraint | undefined): Schema.Top | undefined {
+  if (params === undefined) return undefined
+  if (Schema.isSchema(params)) return params
+  return Schema.Struct(params)
+}
+
+function getQuery(query: QueryConstraint | undefined): Schema.Top | undefined {
+  if (query === undefined) return undefined
+  if (Schema.isSchema(query)) return query
+  return Schema.Struct(query)
+}
+
 // all keys should be lowercase
-function getHeaders(headers: Schema.Struct.Fields | undefined): Schema.Struct.Fields | undefined {
-  if (headers !== undefined) {
-    for (const key of Object.keys(headers)) {
-      const lowerKey = key.toLowerCase()
-      if (key !== lowerKey) {
-        throw new Error(`Header keys must be lowercase, got ${format(key)} (use ${format(lowerKey)})`)
-      }
-    }
-    return headers
-  }
+function getHeaders(headers: HeadersConstraint | undefined): Schema.Top | undefined {
+  if (headers === undefined) return undefined
+  if (Schema.isSchema(headers)) return headers
+  return Schema.Struct(headers)
 }
 
 function getPayload(

package/src/unstable/httpapi/OpenApi.ts

@@ -362,20 +362,23 @@ export function fromApi<Id extends string, Groups extends HttpApiGroup.Any>(
         }
       }
 
-      function processParameters(fields: Schema.Struct.Fields | undefined, i: OpenAPISpecParameter["in"]) {
-        if (fields) {
-          for (const [name, field] of Object.entries(fields)) {
-            op.parameters.push({
-              name: String(name),
-              in: i,
-              schema: {},
-              required: i === "path" || !AST.isOptional(field.ast)
-            })
-            pathOps.push({
-              _tag: "parameter",
-              ast: AST.toEncoded(field.ast),
-              path: ["paths", path, method, "parameters", String(op.parameters.length - 1), "schema"]
-            })
+      function processParameters(schema: Schema.Top | undefined, i: OpenAPISpecParameter["in"]) {
+        if (schema) {
+          const ast = AST.toEncoded(schema.ast)
+          if (AST.isObjects(ast)) {
+            for (const ps of ast.propertySignatures) {
+              op.parameters.push({
+                name: String(ps.name),
+                in: i,
+                schema: {},
+                required: i === "path" || !AST.isOptional(ps.type)
+              })
+              pathOps.push({
+                _tag: "parameter",
+                ast: ps.type,
+                path: ["paths", path, method, "parameters", String(op.parameters.length - 1), "schema"]
+              })
+            }
           }
         }
       }
@@ -421,8 +424,7 @@ export function fromApi<Id extends string, Groups extends HttpApiGroup.Any>(
       processParameters(endpoint.params, "path")
       if (!hasBody && endpoint.payload.size === 1) {
         const entry = endpoint.payload.values().next().value!
-        const schema = entry.schemas[0] as Schema.Struct<Schema.Struct.Fields>
-        processParameters(schema.fields, "query")
+        processParameters(entry.schemas[0], "query")
       }
       processParameters(endpoint.headers, "header")
       processParameters(endpoint.query, "query")

package/src/unstable/reactivity/AtomHttpApi.ts

@@ -51,8 +51,8 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
       infer _Name,
       infer _Method,
       infer _Path,
-      infer _PathSchema,
-      infer _UrlParams,
+      infer _Params,
+      infer _Query,
       infer _Payload,
       infer _Headers,
       infer _Success,
@@ -62,7 +62,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
     >
   ] ? Atom.AtomResultFn<
       Simplify<
-        HttpApiEndpoint.ClientRequest<_PathSchema, _UrlParams, _Payload, _Headers, false> & {
+        HttpApiEndpoint.ClientRequest<_Params, _Query, _Payload, _Headers, false> & {
           readonly reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined
         }
       >,
@@ -88,8 +88,8 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
         infer _Name,
         infer _Method,
         infer _Path,
-        infer _PathSchema,
-        infer _UrlParams,
+        infer _Params,
+        infer _Query,
         infer _Payload,
         infer _Headers,
         infer _Success,
@@ -98,7 +98,7 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
         infer _RE
       >
     ] ? Simplify<
-        HttpApiEndpoint.ClientRequest<_PathSchema, _UrlParams, _Payload, _Headers, WithResponse> & {
+        HttpApiEndpoint.ClientRequest<_Params, _Query, _Payload, _Headers, WithResponse> & {
           readonly reactivityKeys?:
             | ReadonlyArray<unknown>
             | ReadonlyRecord<string, ReadonlyArray<unknown>>
@@ -112,7 +112,8 @@ export interface AtomHttpApiClient<Self, Id extends string, Groups extends HttpA
       infer _Name,
       infer _Method,
       infer _Path,
-      infer _UrlParams,
+      infer _Params,
+      infer _Query,
       infer _Payload,
       infer _Headers,
       infer _Success,
@@ -170,8 +171,8 @@ export const Service = <Self>() =>
 
   const mutationFamily = Atom.family(({ endpoint, group, withResponse }: MutationKey) =>
     self.runtime.fn<{
-      path: any
-      urlParams: any
+      params: any
+      query: any
       headers: any
       payload: any
       reactivityKeys?: ReadonlyArray<unknown> | ReadonlyRecord<string, ReadonlyArray<unknown>> | undefined
@@ -217,8 +218,8 @@ export const Service = <Self>() =>
     group: string,
     endpoint: string,
     request: {
-      readonly path?: any
-      readonly urlParams?: any
+      readonly params?: any
+      readonly query?: any
       readonly payload?: any
       readonly headers?: any
       readonly withResponse?: boolean
@@ -229,8 +230,8 @@ export const Service = <Self>() =>
     queryFamily({
       group,
       endpoint,
-      path: request.path,
-      urlParams: request.urlParams,
+      params: request.params,
+      query: request.query,
       payload: request.payload,
       headers: request.headers,
       withResponse: request.withResponse ?? false,
@@ -252,8 +253,8 @@ interface MutationKey {
 interface QueryKey {
   group: string
   endpoint: string
-  path: any
-  urlParams: any
+  params: any
+  query: any
   headers: any
   payload: any
   withResponse: boolean