@tim-smart/openapi-gen 0.3.19 → 0.3.21

package/main.js

@@ -35510,20 +35510,49 @@ var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
     readonly transformClient?: ((client: HttpClient.HttpClient) => Effect.Effect<HttpClient.HttpClient>) | undefined
   } = {}
 ): ${name2} => {
-  const unexpectedStatus = (request: HttpClientRequest.HttpClientRequest, response: HttpClientResponse.HttpClientResponse) =>
+  const unexpectedStatus = (response: HttpClientResponse.HttpClientResponse) =>
     Effect.flatMap(
       Effect.orElseSucceed(response.text, () => "Unexpected status code"),
       (description) =>
-        Effect.fail(new HttpClientError.ResponseError({
-          request,
-          response,
-          reason: "StatusCode",
-          description
-        }))
+        Effect.fail(
+          new HttpClientError.ResponseError({
+            request: response.request,
+            response,
+            reason: "StatusCode",
+            description,
+          }),
+        ),
     )
-  const applyClientTransform = (client: HttpClient.HttpClient): Effect.Effect<HttpClient.HttpClient> => 
-    options.transformClient ? options.transformClient(client) : Effect.succeed(client)
-  const decodeError = <A, I, R>(response: HttpClientResponse.HttpClientResponse, schema: S.Schema<A, I, R>) => Effect.flatMap(HttpClientResponse.schemaBodyJson(schema)(response), Effect.fail)
+  const withResponse: <A, E, R>(
+    f: (
+      response: HttpClientResponse.HttpClientResponse,
+    ) => Effect.Effect<A, E, R>,
+  ) => (
+    request: HttpClientRequest.HttpClientRequest,
+  ) => Effect.Effect<A, E | HttpClientError.HttpClientError, R> =
+    options.transformClient
+      ? (f) => (request) =>
+          Effect.flatMap(
+            Effect.flatMap(options.transformClient!(httpClient), (client) =>
+              client.execute(request),
+            ),
+            f,
+          )
+      : (f) => (request) => Effect.flatMap(httpClient.execute(request), f)
+  const jsonBody =
+    (body: unknown) => (request: HttpClientRequest.HttpClientRequest) =>
+      Effect.orDie(HttpClientRequest.bodyJson(request, body))
+  const decodeSuccess =
+    <A, I, R>(schema: S.Schema<A, I, R>) =>
+    (response: HttpClientResponse.HttpClientResponse) =>
+      HttpClientResponse.schemaBodyJson(schema)(response)
+  const decodeError =
+    <A, I, R>(schema: S.Schema<A, I, R>) =>
+    (response: HttpClientResponse.HttpClientResponse) =>
+      Effect.flatMap(
+        HttpClientResponse.schemaBodyJson(schema)(response),
+        Effect.fail,
+      )
   return {
     httpClient,
     ${operations.map(operationToImpl).join(",\n  ")}
@@ -35537,6 +35566,7 @@ var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
     }
     const params = `${args2.join(", ")}`;
     const pipeline = [];
+    let effectfulRequest = false;
     if (operation.params) {
       const varName = operation.payload ? "options.params?." : "options?.";
       if (operation.urlParams.length > 0) {
@@ -35554,30 +35584,25 @@ var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
     }
     const payloadVarName = operation.params ? "options.payload" : "options";
     if (operation.payload === "FormData") {
-      pipeline.push(
-        `HttpClientRequest.bodyFormData(${payloadVarName})`,
-        "Effect.succeed"
-      );
+      pipeline.push(`HttpClientRequest.bodyFormData(${payloadVarName})`);
     } else if (operation.payload) {
-      pipeline.push(
-        `(req) => Effect.orDie(HttpClientRequest.bodyJson(req, ${payloadVarName}))`
-      );
-    } else {
-      pipeline.push("Effect.succeed");
+      effectfulRequest = true;
+      pipeline.push(`jsonBody(${payloadVarName})`);
     }
     const decodes = [];
+    const singleSuccessCode = operation.successSchemas.size === 1;
     operation.successSchemas.forEach((schema, status2) => {
-      decodes.push(
-        `"${status2}": r => HttpClientResponse.schemaBodyJson(${schema})(r)`
-      );
+      const statusCode = singleSuccessCode && status2.startsWith("2") ? "2xx" : status2;
+      decodes.push(`"${statusCode}": decodeSuccess(${schema})`);
     });
     operation.errorSchemas.forEach((schema, status2) => {
-      decodes.push(`"${status2}": r => decodeError(r, ${schema})`);
+      decodes.push(`"${status2}": decodeError(${schema})`);
     });
-    decodes.push(`orElse: (response) => unexpectedStatus(request, response)`);
-    pipeline.push(`Effect.flatMap(request => Effect.flatMap(applyClientTransform(httpClient), (httpClient) => Effect.flatMap(httpClient.execute(request), HttpClientResponse.matchStatus({
+    decodes.push(`orElse: unexpectedStatus`);
+    const execute2 = `withResponse(HttpClientResponse.matchStatus({
       ${decodes.join(",\n      ")}
-    }))))`);
+    }))`;
+    pipeline.push(effectfulRequest ? `Effect.flatMap(${execute2})` : execute2);
     return `"${operation.id}": (${params}) => HttpClientRequest.make("${operation.method.toUpperCase()}")(${operation.pathTemplate}).pipe(
     ${pipeline.join(",\n    ")}
   )`;
@@ -35588,7 +35613,6 @@ var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
       'import * as HttpClientError from "@effect/platform/HttpClientError"',
       'import * as HttpClientRequest from "@effect/platform/HttpClientRequest"',
       'import * as HttpClientResponse from "@effect/platform/HttpClientResponse"',
-      'import * as UrlParams from "@effect/platform/UrlParams"',
       'import * as Effect from "effect/Effect"',
       'import type { ParseError } from "effect/ParseResult"',
       'import * as S from "effect/Schema"'
@@ -35671,12 +35695,23 @@ export const ${name2}Error = <Tag extends string, E>(
           }),
         ),
     )
-  const applyClientTransform = (
-    client: HttpClient.HttpClient,
-  ): Effect.Effect<HttpClient.HttpClient> =>
-    options.transformClient
-      ? options.transformClient(client)
-      : Effect.succeed(client)
+  const withResponse: <A, E>(
+    f: (response: HttpClientResponse.HttpClientResponse) => Effect.Effect<A, E>,
+  ) => (
+    request: HttpClientRequest.HttpClientRequest,
+  ) => Effect.Effect<any, any> = options.transformClient
+    ? (f) => (request) =>
+        Effect.flatMap(
+          Effect.flatMap(options.transformClient!(httpClient), (client) =>
+            client.execute(request),
+          ),
+          f,
+        )
+    : (f) => (request) => Effect.flatMap(httpClient.execute(request), f)
+  const jsonBody =
+    (body: unknown) =>
+    (request: HttpClientRequest.HttpClientRequest) =>
+      Effect.orDie(HttpClientRequest.bodyJson(request, body))
   const decodeSuccess = <A>(response: HttpClientResponse.HttpClientResponse) =>
     response.json as Effect.Effect<A, HttpClientError.ResponseError>
   const decodeVoid = (_response: HttpClientResponse.HttpClientResponse) =>
@@ -35695,27 +35730,21 @@ export const ${name2}Error = <Tag extends string, E>(
       )
   const onRequest = (
     successCodes: ReadonlyArray<string>,
-    errorCodes: Record<string, string>,
+    errorCodes?: Record<string, string>,
   ) => {
     const cases: any = { orElse: unexpectedStatus }
     for (const code of successCodes) {
       cases[code] = decodeSuccess
     }
-    for (const [code, tag] of Object.entries(errorCodes)) {
-      cases[code] = decodeError(tag)
+    if (errorCodes) {
+      for (const [code, tag] of Object.entries(errorCodes)) {
+        cases[code] = decodeError(tag)
+      }
     }
     if (successCodes.length === 0) {
       cases["2xx"] = decodeVoid
     }
-    return (
-      request: HttpClientRequest.HttpClientRequest,
-    ): Effect.Effect<any, any> =>
-      Effect.flatMap(applyClientTransform(httpClient), (httpClient) =>
-        Effect.flatMap(
-          httpClient.execute(request),
-          HttpClientResponse.matchStatus(cases) as any,
-        ),
-      )
+    return withResponse(HttpClientResponse.matchStatus(cases) as any)
   }
   return {
     httpClient,
@@ -35730,6 +35759,7 @@ export const ${name2}Error = <Tag extends string, E>(
     }
     const params = `${args2.join(", ")}`;
     const pipeline = [];
+    let effectfulRequest = false;
     if (operation.params) {
       const varName = operation.payload ? "options.params?." : "options?.";
       if (operation.urlParams.length > 0) {
@@ -35747,24 +35777,17 @@ export const ${name2}Error = <Tag extends string, E>(
     }
     const payloadVarName = operation.params ? "options.payload" : "options";
     if (operation.payload === "FormData") {
-      pipeline.push(
-        `HttpClientRequest.bodyFormData(${payloadVarName})`,
-        "Effect.succeed"
-      );
+      pipeline.push(`HttpClientRequest.bodyFormData(${payloadVarName})`);
     } else if (operation.payload) {
-      pipeline.push(
-        `(req) => Effect.orDie(HttpClientRequest.bodyJson(req, ${payloadVarName}))`
-      );
-    } else {
-      pipeline.push("Effect.succeed");
+      effectfulRequest = true;
+      pipeline.push(`jsonBody(${payloadVarName})`);
     }
     const successCodesRaw = Array.from(operation.successSchemas.keys());
     const successCodes = successCodesRaw.map((_) => JSON.stringify(_)).join(", ");
     const singleSuccessCode = successCodesRaw.length === 1 && successCodesRaw[0].startsWith("2");
-    const errorCodes = Object.fromEntries(operation.errorSchemas.entries());
-    pipeline.push(
-      `Effect.flatMap(onRequest([${singleSuccessCode ? `"2xx"` : successCodes}], ${JSON.stringify(errorCodes)}))`
-    );
+    const errorCodes = operation.errorSchemas.size > 0 && Object.fromEntries(operation.errorSchemas.entries());
+    const execute2 = `onRequest([${singleSuccessCode ? `"2xx"` : successCodes}]${errorCodes ? `, ${JSON.stringify(errorCodes)}` : ""})`;
+    pipeline.push(effectfulRequest ? `Effect.flatMap(${execute2})` : execute2);
     return `"${operation.id}": (${params}) => HttpClientRequest.make("${operation.method.toUpperCase()}")(${operation.pathTemplate}).pipe(
     ${pipeline.join(",\n    ")}
   )`;
@@ -35775,7 +35798,6 @@ export const ${name2}Error = <Tag extends string, E>(
       'import * as HttpClientError from "@effect/platform/HttpClientError"',
       'import * as HttpClientRequest from "@effect/platform/HttpClientRequest"',
       'import * as HttpClientResponse from "@effect/platform/HttpClientResponse"',
-      'import * as UrlParams from "@effect/platform/UrlParams"',
       'import * as Data from "effect/Data"',
       'import * as Effect from "effect/Effect"'
     ].join("\n"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tim-smart/openapi-gen",
-  "version": "0.3.19",
+  "version": "0.3.21",
   "description": "Generate Effect http clients from OpenAPI specs",
   "bin": "main.js",
   "repository": {