Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 17 additions & 4 deletions src/OpenApi.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import type {
OpenAPISpec,
OpenAPISpecMethodName,
OpenAPISpecParameter,
OpenAPISpecPathItem,
} from "@effect/platform/OpenApi"
import * as Effect from "effect/Effect"
Expand Down Expand Up @@ -128,10 +129,22 @@ export const make = Effect.gen(function* () {
paramsOptional: true,
}
const schemaId = identifier(operation.operationId ?? path)
const validParameters =
operation.parameters?.filter(
(_) => _.in !== "path" && _.in !== "cookie",
) ?? []

// Merge path-level parameters with operation-level parameters
// Path-level parameters are part of OpenAPI 3.0 spec but not typed in @effect/platform
// This is needed until https://github.com/Effect-TS/effect/issues/5760 is resolved
const pathParameters =
(
methods as OpenAPISpecParameter & {
parameters?: Array<OpenAPISpecParameter>
}
).parameters ?? []
const operationParameters = operation.parameters ?? []
const allParameters = [...pathParameters, ...operationParameters]
const validParameters = allParameters.filter(
(_) => _.in !== "path" && _.in !== "cookie",
)

if (validParameters.length > 0) {
const schema: JsonSchema.Object = {
type: "object",
Expand Down