@tim-smart/openapi-gen 0.3.23 → 0.3.25

package/main.js

@@ -35326,13 +35326,17 @@ var methodNames = [
 var make65 = gen2(function* () {
   const convert3 = fn("OpenApi.convert")(
     (v2Spec) => async2((resume2) => {
-      (0, import_swagger2openapi.convertObj)(v2Spec, {}, (err, result) => {
-        if (err) {
-          resume2(die5(err));
-        } else {
-          resume2(succeed8(result.openapi));
+      (0, import_swagger2openapi.convertObj)(
+        v2Spec,
+        { laxDefaults: true, laxurls: true, patch: true, warnOnly: true },
+        (err, result) => {
+          if (err) {
+            resume2(die5(err));
+          } else {
+            resume2(succeed8(result.openapi));
+          }
         }
-      });
+      );
     })
   );
   const generate = fnUntraced2(
@@ -35484,9 +35488,11 @@ var OpenApiTransformer = class extends Tag2("OpenApiTransformer")() {
 var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
   const operationsToInterface = (name2, operations) => `export interface ${name2} {
   readonly httpClient: HttpClient.HttpClient
-  ${operations.map(operationToMethod).join("\n  ")}
-}`;
-  const operationToMethod = (operation) => {
+  ${operations.map((op) => operationToMethod(name2, op)).join("\n  ")}
+}
+
+${clientErrorSource(name2)}`;
+  const operationToMethod = (name2, operation) => {
     const args2 = [];
     if (operation.pathIds.length > 0) {
       args2.push(...operation.pathIds.map((id2) => `${id2}: string`));
@@ -35520,7 +35526,7 @@ var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
     if (operation.errorSchemas.size > 0) {
       errors.push(
         ...Array.from(operation.errorSchemas.values()).map(
-          (schema) => `typeof ${schema}.Type`
+          (schema) => `${name2}Error<"${schema}", typeof ${schema}.Type>`
         )
       );
     }
@@ -35532,45 +35538,17 @@ var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
     readonly transformClient?: ((client: HttpClient.HttpClient) => Effect.Effect<HttpClient.HttpClient>) | undefined
   } = {}
 ): ${name2} => {
-  const unexpectedStatus = (response: HttpClientResponse.HttpClientResponse) =>
-    Effect.flatMap(
-      Effect.orElseSucceed(response.json, () => "Unexpected status code"),
-      (description) =>
-        Effect.fail(
-          new HttpClientError.ResponseError({
-            request: response.request,
-            response,
-            reason: "StatusCode",
-            description: typeof description === "string" ? description : JSON.stringify(description),
-          }),
-        ),
-    )
-  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)
+  ${commonSource}
   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>) =>
+    <const Tag extends string, A, I, R>(tag: Tag, schema: S.Schema<A, I, R>) =>
     (response: HttpClientResponse.HttpClientResponse) =>
       Effect.flatMap(
         HttpClientResponse.schemaBodyJson(schema)(response),
-        Effect.fail,
+        (cause) => Effect.fail(${name2}Error(tag, cause, response)),
       )
   return {
     httpClient,
@@ -35615,7 +35593,7 @@ var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
       decodes.push(`"${statusCode}": decodeSuccess(${schema})`);
     });
     operation.errorSchemas.forEach((schema, status2) => {
-      decodes.push(`"${status2}": decodeError(${schema})`);
+      decodes.push(`"${status2}": decodeError("${schema}", ${schema})`);
     });
     decodes.push(`orElse: unexpectedStatus`);
     pipeline.push(`withResponse(HttpClientResponse.matchStatus({
@@ -35631,6 +35609,7 @@ 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 Data from "effect/Data"',
       'import * as Effect from "effect/Effect"',
       'import type { ParseError } from "effect/ParseResult"',
       'import * as S from "effect/Schema"'
@@ -35645,17 +35624,7 @@ var layerTransformerTs2 = sync6(OpenApiTransformer, () => {
   ${operations.map((s) => operationToMethod(name2, s)).join("\n  ")}
 }
 
-export interface ${name2}Error<Tag extends string, E> {
-  readonly _tag: Tag
-  readonly cause: E
-}
-
-class ${name2}ErrorImpl extends Data.Error<{ _tag: string; cause: any }> {}
-
-export const ${name2}Error = <Tag extends string, E>(
-  tag: Tag,
-  cause: E,
-): ${name2}Error<Tag, E> => new ${name2}ErrorImpl({ _tag: tag, cause }) as any`;
+${clientErrorSource(name2)}`;
   const operationToMethod = (name2, operation) => {
     const args2 = [];
     if (operation.pathIds.length > 0) {
@@ -35700,32 +35669,7 @@ export const ${name2}Error = <Tag extends string, E>(
     readonly transformClient?: ((client: HttpClient.HttpClient) => Effect.Effect<HttpClient.HttpClient>) | undefined
   } = {}
 ): ${name2} => {
-  const unexpectedStatus = (response: HttpClientResponse.HttpClientResponse) =>
-    Effect.flatMap(
-      Effect.orElseSucceed(response.json, () => "Unexpected status code"),
-      (description) =>
-        Effect.fail(
-          new HttpClientError.ResponseError({
-            request: response.request,
-            response,
-            reason: "StatusCode",
-            description: typeof description === "string" ? description : JSON.stringify(description),
-          }),
-        ),
-    )
-  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)
+  ${commonSource}
   const decodeSuccess = <A>(response: HttpClientResponse.HttpClientResponse) =>
     response.json as Effect.Effect<A, HttpClientError.ResponseError>
   const decodeVoid = (_response: HttpClientResponse.HttpClientResponse) =>
@@ -35740,7 +35684,7 @@ export const ${name2}Error = <Tag extends string, E>(
     > =>
       Effect.flatMap(
         response.json as Effect.Effect<E, HttpClientError.ResponseError>,
-        (cause) => Effect.fail(${name2}Error(tag, cause)),
+        (cause) => Effect.fail(${name2}Error(tag, cause, response)),
       )
   const onRequest = (
     successCodes: ReadonlyArray<string>,
@@ -35829,6 +35773,57 @@ var processPath = (path2) => {
   });
   return { path: "`" + path2 + "`", ids: ids3 };
 };
+var commonSource = `const unexpectedStatus = (response: HttpClientResponse.HttpClientResponse) =>
+    Effect.flatMap(
+      Effect.orElseSucceed(response.json, () => "Unexpected status code"),
+      (description) =>
+        Effect.fail(
+          new HttpClientError.ResponseError({
+            request: response.request,
+            response,
+            reason: "StatusCode",
+            description: typeof description === "string" ? description : JSON.stringify(description),
+          }),
+        ),
+    )
+  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)`;
+var clientErrorSource = (name2) => `export interface ${name2}Error<Tag extends string, E> {
+  readonly _tag: Tag
+  readonly request: HttpClientRequest.HttpClientRequest
+  readonly response: HttpClientResponse.HttpClientResponse
+  readonly cause: E
+}
+
+class ${name2}ErrorImpl extends Data.Error<{
+  _tag: string
+  cause: any
+  request: HttpClientRequest.HttpClientRequest
+  response: HttpClientResponse.HttpClientResponse
+}> {}
+
+export const ${name2}Error = <Tag extends string, E>(
+  tag: Tag,
+  cause: E,
+  response: HttpClientResponse.HttpClientResponse,
+): ${name2}Error<Tag, E> =>
+  new ${name2}ErrorImpl({
+    _tag: tag,
+    cause,
+    response,
+    request: response.request,
+  }) as any`;
 
 // src/main.ts
 var spec = fileParse2("spec").pipe(

package/package.json

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