@effect/platform 0.84.9 → 0.84.11

package/src/HttpApiSchema.ts

@@ -118,7 +118,12 @@ export const getEncoding = (ast: AST.AST, fallback = encodingJson): Encoding =>
  * @since 1.0.0
  * @category annotations
  */
-export const getParam = (ast: AST.AST): string | undefined => ast.annotations[AnnotationParam] as string | undefined
+export const getParam = (ast: AST.AST | Schema.PropertySignature.AST): string | undefined => {
+  if (ast._tag === "PropertySignatureTransformation") {
+    ast = ast.to.type
+  }
+  return (ast.annotations[AnnotationParam] as any)?.name as string | undefined
+}
 
 /**
  * @since 1.0.0
@@ -228,10 +233,13 @@ type Void$ = typeof Schema.Void
  * @since 1.0.0
  * @category path params
  */
-export interface Param<Name extends string, S extends Schema.Schema.Any>
-  extends Schema.Schema<S["Type"], S["Encoded"], S["Context"]>
+export interface Param<Name extends string, S extends Schema.Schema.Any | Schema.PropertySignature.Any>
+  extends Schema.Schema<Schema.Schema.Type<S>, Schema.Schema.Encoded<S>, Schema.Schema.Context<S>>
 {
-  readonly [AnnotationParam]: Name
+  readonly [AnnotationParam]: {
+    readonly name: Name
+    readonly schema: S
+  }
 }
 
 /**
@@ -243,21 +251,30 @@ export const param: {
    * @since 1.0.0
    * @category path params
    */
-  <Name extends string>(name: Name): <S extends Schema.Schema.Any>(
-    schema: S & ([S["Encoded"]] extends [string] ? unknown : "Schema must be encodable to a string")
+  <Name extends string>(name: Name): <S extends Schema.Schema.Any | Schema.PropertySignature.Any>(
+    schema:
+      & S
+      & ([Schema.Schema.Encoded<S> & {}] extends [string] ? unknown : "Schema must be encodable to a string")
   ) => Param<Name, S>
   /**
    * @since 1.0.0
    * @category path params
    */
-  <Name extends string, S extends Schema.Schema.Any>(
+  <Name extends string, S extends Schema.Schema.Any | Schema.PropertySignature.Any>(
     name: Name,
-    schema: S & ([S["Encoded"]] extends [string] ? unknown : "Schema must be encodable to a string")
+    schema:
+      & S
+      & ([Schema.Schema.Encoded<S> & {}] extends [string] ? unknown : "Schema must be encodable to a string")
   ): Param<Name, S>
 } = dual(
   2,
-  <Name extends string, S extends Schema.Schema.Any>(name: Name, schema: S): Param<Name, S> =>
-    schema.annotations({ [AnnotationParam]: name }) as any
+  <Name extends string, S extends Schema.Schema.Any | Schema.PropertySignature.Any>(
+    name: Name,
+    schema: S
+  ): Param<Name, S> =>
+    schema.annotations({
+      [AnnotationParam]: { name, schema }
+    }) as any
 )
 
 /**

package/src/OpenApi.ts

@@ -420,7 +420,7 @@ export const fromApi = <Id extends string, Groups extends HttpApiGroup.Any, E, R
       processResponseMap(successes, () => "Success")
       processResponseMap(errors, () => "Error")
 
-      const path = endpoint.path.replace(/:(\w+)/g, "{$1}")
+      const path = endpoint.path.replace(/:(\w+)\??/g, "{$1}")
       const method = endpoint.method.toLowerCase() as OpenAPISpecMethodName
       if (!spec.paths[path]) {
         spec.paths[path] = {}

package/src/internal/httpClientResponse.ts

@@ -50,7 +50,7 @@ class ClientResponseImpl extends Inspectable.Class implements ClientResponse.Htt
   }
 
   get headers(): Headers.Headers {
-    return Headers.fromInput(this.source.headers)
+    return Headers.fromInput(this.source.headers as any)
   }
 
   cachedCookies?: Cookies.Cookies

package/src/internal/httpServerRequest.ts

@@ -229,7 +229,7 @@ class ServerRequestImpl extends Inspectable.Class implements ServerRequest.HttpS
     return this.remoteAddressOverride ? Option.some(this.remoteAddressOverride) : Option.none()
   }
   get headers(): Headers.Headers {
-    this.headersOverride ??= Headers.fromInput(this.source.headers)
+    this.headersOverride ??= Headers.fromInput(this.source.headers as any)
     return this.headersOverride
   }