@effect/platform 0.69.28 → 0.69.30

package/src/OpenApi.ts

@@ -159,7 +159,7 @@ export const fromApi = <A extends HttpApi.HttpApi.Any>(self: A): OpenAPISpec =>
   const api = self as unknown as HttpApi.HttpApi.AnyWithProps
   const jsonSchemaDefs: Record<string, JsonSchema.JsonSchema> = {}
   let spec: DeepMutable<OpenAPISpec> = {
-    openapi: "3.0.3",
+    openapi: "3.1.0",
     info: {
       title: Context.getOrElse(api.annotations, Title, () => "Api"),
       version: Context.getOrElse(api.annotations, Version, () => "0.0.1")
@@ -231,7 +231,7 @@ export const fromApi = <A extends HttpApi.HttpApi.Any>(self: A): OpenAPISpec =>
       })
       spec.tags!.push(tag)
     },
-    onEndpoint({ endpoint, errors, group, middleware, successes }) {
+    onEndpoint({ endpoint, errors, group, middleware, payloads, successes }) {
       const path = endpoint.path.replace(/:(\w+)[^/]*/g, "{$1}")
       const method = endpoint.method.toLowerCase() as OpenAPISpecMethodName
       const op: DeepMutable<OpenAPISpecOperation> = {
@@ -266,35 +266,15 @@ export const fromApi = <A extends HttpApi.HttpApi.Any>(self: A): OpenAPISpec =>
           op.security!.push({ [name]: [] })
         }
       })
-      endpoint.payloadSchema.pipe(
-        Option.filter(() => HttpMethod.hasBody(endpoint.method)),
-        Option.map((schema) => {
-          const content: Mutable<OpenApiSpecContent> = {}
-          const members = schema.ast._tag === "Union" ? schema.ast.types : [schema.ast]
-          const jsonTypes: Array<AST.AST> = []
-          const multipartTypes: Array<AST.AST> = []
-
-          for (const member of members) {
-            if (HttpApiSchema.getMultipart(member)) {
-              multipartTypes.push(member)
-            } else {
-              jsonTypes.push(member)
-            }
-          }
-
-          if (jsonTypes.length > 0) {
-            content["application/json"] = {
-              schema: makeJsonSchemaOrRef(Schema.make(AST.Union.make(jsonTypes)))
-            }
+      if (payloads.size > 0) {
+        const content: Mutable<OpenApiSpecContent> = {}
+        payloads.forEach(({ ast }, contentType) => {
+          content[contentType as OpenApiSpecContentType] = {
+            schema: makeJsonSchemaOrRef(Schema.make(ast))
           }
-          if (multipartTypes.length > 0) {
-            content["multipart/form-data"] = {
-              schema: makeJsonSchemaOrRef(Schema.make(AST.Union.make(multipartTypes)))
-            }
-          }
-          op.requestBody = { content, required: true }
         })
-      )
+        op.requestBody = { content, required: true }
+      }
       for (const [status, ast] of successes) {
         if (op.responses![status]) continue
         op.responses![status] = {
@@ -454,7 +434,7 @@ const getDescriptionOrIdentifier = (ast: Option.Option<AST.PropertySignature | A
  * @since 1.0.0
  */
 export interface OpenAPISpec {
-  readonly openapi: "3.0.3"
+  readonly openapi: "3.1.0"
   readonly info: OpenAPISpecInfo
   readonly servers?: Array<OpenAPISpecServer>
   readonly paths: OpenAPISpecPaths

package/src/UrlParams.ts

@@ -274,6 +274,40 @@ const baseUrl = (): string | undefined => {
   return undefined
 }
 
+/**
+ * Builds a `Record` containing all the key-value pairs in the given `UrlParams`
+ * as `string` (if only one value for a key) or a `NonEmptyArray<string>`
+ * (when more than one value for a key)
+ *
+ * @example
+ * import { UrlParams } from "@effect/platform"
+ *
+ * const urlParams = UrlParams.fromInput({ a: 1, b: true, c: "string", e: [1, 2, 3] })
+ * const result = UrlParams.toRecord(urlParams)
+ *
+ * assert.deepStrictEqual(
+ *   result,
+ *   { "a": "1", "b": "true", "c": "string", "e": ["1", "2", "3"] }
+ * )
+ *
+ * @since 1.0.0
+ * @category conversions
+ */
+export const toRecord = (self: UrlParams): Record<string, string | Arr.NonEmptyArray<string>> => {
+  const out: Record<string, string | Arr.NonEmptyArray<string>> = {}
+  for (const [k, value] of self) {
+    const curr = out[k]
+    if (curr === undefined) {
+      out[k] = value
+    } else if (typeof curr === "string") {
+      out[k] = [curr, value]
+    } else {
+      curr.push(value)
+    }
+  }
+  return out
+}
+
 /**
  * @since 1.0.0
  * @category schema