@effect/platform 0.77.4 → 0.77.7

package/src/OpenApi.ts

@@ -175,6 +175,12 @@ function processAnnotation<Services, S, I>(
   }
 }
 
+/**
+ * @since 1.0.0
+ * @category models
+ */
+export type AdditionalPropertiesStrategy = "allow" | "strict"
+
 /**
  * Converts an `HttpApi` instance into an OpenAPI Specification object.
  *
@@ -192,6 +198,12 @@ function processAnnotation<Services, S, I>(
  * and overrides. Cached results are used for better performance when the same
  * `HttpApi` instance is processed multiple times.
  *
+ * **Options**
+ *
+ * - `additionalPropertiesStrategy`: Controls the handling of additional properties. Possible values are:
+ *   - `"strict"`: Disallow additional properties (default behavior).
+ *   - `"allow"`: Allow additional properties.
+ *
  * @example
  * ```ts
  * import { HttpApi, HttpApiEndpoint, HttpApiGroup, OpenApi } from "@effect/platform"
@@ -214,7 +226,10 @@ function processAnnotation<Services, S, I>(
  * @since 1.0.0
  */
 export const fromApi = <Id extends string, Groups extends HttpApiGroup.Any, E, R>(
-  api: HttpApi.HttpApi<Id, Groups, E, R>
+  api: HttpApi.HttpApi<Id, Groups, E, R>,
+  options?: {
+    readonly additionalPropertiesStrategy?: AdditionalPropertiesStrategy | undefined
+  } | undefined
 ): OpenAPISpec => {
   const cached = apiCache.get(api)
   if (cached !== undefined) {
@@ -238,7 +253,8 @@ export const fromApi = <Id extends string, Groups extends HttpApiGroup.Any, E, R
 
   function processAST(ast: AST.AST): JsonSchema.JsonSchema {
     return JsonSchema.fromAST(ast, {
-      defs: jsonSchemaDefs
+      defs: jsonSchemaDefs,
+      additionalPropertiesStrategy: options?.additionalPropertiesStrategy
     })
   }
 

package/src/OpenApiJsonSchema.ts

@@ -255,35 +255,47 @@ export const make = <A, I, R>(schema: Schema.Schema<A, I, R>): Root => {
   return out
 }
 
+type TopLevelReferenceStrategy = "skip" | "keep"
+
+type AdditionalPropertiesStrategy = "allow" | "strict"
+
 /**
  * Creates a schema with additional options and definitions.
  *
+ * **Options**
+ *
  * - `defs`: A record of definitions that are included in the schema.
  * - `defsPath`: The path to the definitions within the schema (defaults to "#/$defs/").
  * - `topLevelReferenceStrategy`: Controls the handling of the top-level reference. Possible values are:
  *   - `"keep"`: Keep the top-level reference (default behavior).
  *   - `"skip"`: Skip the top-level reference.
+ * - `additionalPropertiesStrategy`: Controls the handling of additional properties. Possible values are:
+ *   - `"strict"`: Disallow additional properties (default behavior).
+ *   - `"allow"`: Allow additional properties.
  *
  * @category encoding
  * @since 1.0.0
  */
 export const makeWithDefs = <A, I, R>(schema: Schema.Schema<A, I, R>, options: {
   readonly defs: Record<string, any>
-  readonly defsPath?: string
-  readonly topLevelReferenceStrategy?: "skip" | "keep"
+  readonly defsPath?: string | undefined
+  readonly topLevelReferenceStrategy?: TopLevelReferenceStrategy | undefined
+  readonly additionalPropertiesStrategy?: AdditionalPropertiesStrategy | undefined
 }): JsonSchema => fromAST(schema.ast, options)
 
 /** @internal */
 export const fromAST = (ast: AST.AST, options: {
   readonly defs: Record<string, any>
-  readonly defsPath?: string
-  readonly topLevelReferenceStrategy?: "skip" | "keep"
+  readonly defsPath?: string | undefined
+  readonly topLevelReferenceStrategy?: TopLevelReferenceStrategy | undefined
+  readonly additionalPropertiesStrategy?: AdditionalPropertiesStrategy | undefined
 }): JsonSchema => {
   const jsonSchema = JSONSchema.fromAST(ast, {
     definitions: options.defs,
     definitionPath: options.defsPath ?? "#/components/schemas/",
     target: "openApi3.1",
-    topLevelReferenceStrategy: options.topLevelReferenceStrategy ?? "keep"
+    topLevelReferenceStrategy: options.topLevelReferenceStrategy,
+    additionalPropertiesStrategy: options.additionalPropertiesStrategy
   })
   return jsonSchema as JsonSchema
 }

package/src/internal/fetchHttpClient.ts

@@ -1,6 +1,7 @@
 import * as Effect from "effect/Effect"
 import * as FiberRef from "effect/FiberRef"
 import * as Stream from "effect/Stream"
+import * as Headers from "../Headers.js"
 import type * as Client from "../HttpClient.js"
 import * as Error from "../HttpClientError.js"
 import * as client from "./httpClient.js"
@@ -15,7 +16,7 @@ const fetch: Client.HttpClient = client.make((request, url, signal, fiber) => {
   const context = fiber.getFiberRef(FiberRef.currentContext)
   const fetch: typeof globalThis.fetch = context.unsafeMap.get(fetchTagKey) ?? globalThis.fetch
   const options: RequestInit = context.unsafeMap.get(requestInitTagKey) ?? {}
-  const headers = new globalThis.Headers(request.headers)
+  const headers = options.headers ? Headers.merge(Headers.fromInput(options.headers), request.headers) : request.headers
   const send = (body: BodyInit | undefined) =>
     Effect.map(
       Effect.tryPromise({

package/src/internal/httpClient.ts

@@ -12,7 +12,7 @@ import * as Predicate from "effect/Predicate"
 import * as Ref from "effect/Ref"
 import * as Schedule from "effect/Schedule"
 import * as Scope from "effect/Scope"
-import type { NoInfer } from "effect/Types"
+import type { NoExcessProperties, NoInfer } from "effect/Types"
 import * as Cookies from "../Cookies.js"
 import * as Headers from "../Headers.js"
 import type * as Client from "../HttpClient.js"
@@ -541,13 +541,13 @@ export const mapRequestInputEffect = dual<
 
 /** @internal */
 export const retry: {
-  <E, O extends Effect.Retry.Options<E>>(
+  <E, O extends NoExcessProperties<Effect.Retry.Options<E>, O>>(
     options: O
   ): <R>(self: Client.HttpClient.With<E, R>) => Client.Retry.Return<R, E, O>
   <B, E, R1>(
     policy: Schedule.Schedule<B, NoInfer<E>, R1>
   ): <R>(self: Client.HttpClient.With<E, R>) => Client.HttpClient.With<E, R1 | R>
-  <E, R, O extends Effect.Retry.Options<E>>(
+  <E, R, O extends NoExcessProperties<Effect.Retry.Options<E>, O>>(
     self: Client.HttpClient.With<E, R>,
     options: O
   ): Client.Retry.Return<R, E, O>