@tim-smart/openapi-gen 0.3.13 → 0.3.15

package/main.js

@@ -8524,6 +8524,7 @@ var identity = (a) => a;
 var constant = (value5) => () => value5;
 var constTrue = /* @__PURE__ */ constant(true);
 var constFalse = /* @__PURE__ */ constant(false);
+var constNull = /* @__PURE__ */ constant(null);
 var constUndefined = /* @__PURE__ */ constant(void 0);
 var constVoid = constUndefined;
 function pipe(a, ab, bc, cd, de, ef, fg, gh, hi) {
@@ -9360,6 +9361,7 @@ var getOrElse = /* @__PURE__ */ dual(2, (self, onNone) => isNone2(self) ? onNone
 var orElse = /* @__PURE__ */ dual(2, (self, that) => isNone2(self) ? that() : self);
 var orElseSome = /* @__PURE__ */ dual(2, (self, onNone) => isNone2(self) ? some2(onNone()) : self);
 var fromNullable = (nullableValue) => nullableValue == null ? none2() : some2(nullableValue);
+var getOrNull = /* @__PURE__ */ getOrElse(constNull);
 var getOrUndefined = /* @__PURE__ */ getOrElse(constUndefined);
 var liftThrowable = (f) => (...a) => {
   try {
@@ -34844,11 +34846,19 @@ var make63 = gen2(function* () {
   const topLevelSource = (importName, name2, schema) => {
     const isClass = classes.has(name2);
     const isEnum = enums.has(name2);
-    return toSource(importName, schema, name2, isClass || isEnum).pipe(
+    const topLevel = transformer.supportsTopLevel({
+      importName,
+      schema,
+      name: name2,
+      isClass,
+      isEnum
+    });
+    return toSource(importName, schema, name2, topLevel).pipe(
       map2(
         (source) => transformer.onTopLevel({
           importName,
           schema,
+          description: fromNullable(schema.description),
           name: name2,
           source,
           isClass,
@@ -34895,6 +34905,7 @@ var make63 = gen2(function* () {
             map2(
               (source) => transformer.onProperty({
                 importName,
+                description: fromNullable(schema2.description),
                 key,
                 source,
                 isOptional,
@@ -34963,15 +34974,23 @@ var make63 = gen2(function* () {
         topLevel
       );
     } else if ("anyOf" in schema || "oneOf" in schema) {
-      const sources = pipe(
+      const items = pipe(
         "anyOf" in schema ? schema.anyOf : schema.oneOf,
         filterMap2(
-          (_) => toSource(importName, _, currentIdentifier + "Enum")
+          (_) => toSource(importName, _, currentIdentifier + "Enum").pipe(
+            map2(
+              (source) => ({
+                description: fromNullable(_.description),
+                title: fromNullable(_.title),
+                source
+              })
+            )
+          )
         )
       );
-      if (sources.length === 0) return none2();
-      else if (sources.length === 1) return some2(sources[0]);
-      return some2(transformer.onUnion({ importName, sources }));
+      if (items.length === 0) return none2();
+      else if (items.length === 1) return some2(items[0].source);
+      return some2(transformer.onUnion({ importName, items, topLevel }));
     } else if ("const" in schema) {
       return some2(
         transformer.onEnum({
@@ -35066,6 +35085,9 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
   };
   const pipeSource = (modifers) => modifers.length === 0 ? "" : `.pipe(${modifers.join(", ")})`;
   return JsonSchemaTransformer.of({
+    supportsTopLevel({ isClass, isEnum }) {
+      return isClass || isEnum;
+    },
     onTopLevel({ importName, schema, name: name2, source, isClass }) {
       const isObject2 = "properties" in schema;
       if (!isObject2 || !isClass) {
@@ -35147,20 +35169,23 @@ var layerTransformerSchema = sync6(JsonSchemaTransformer, () => {
       }
       return `${importName}.${nonEmpty ? "NonEmpty" : ""}Array(${item})${pipeSource(modifiers)}`;
     },
-    onUnion({ importName, sources }) {
-      return `${importName}.Union(${sources.join(", ")})`;
+    onUnion({ importName, items }) {
+      return `${importName}.Union(${items.map((_) => _.source).join(", ")})`;
     }
   });
 });
 var layerTransformerTs = succeed10(
   JsonSchemaTransformer,
   JsonSchemaTransformer.of({
-    onTopLevel({ name: name2, source }) {
-      return source[0] === "{" ? `export interface ${name2} ${source}` : `export type ${name2} = ${source}`;
+    supportsTopLevel() {
+      return true;
+    },
+    onTopLevel({ name: name2, source, schema, description }) {
+      return source[0] === "{" ? "oneOf" in schema ? `${toComment(description)}export enum ${name2} ${source}` : `${toComment(description)}export interface ${name2} ${source}` : `${toComment(description)}export type ${name2} = ${source}`;
     },
     propertySeparator: ";\n  ",
-    onProperty: (options3) => {
-      return `readonly "${options3.key}"${options3.isOptional ? "?" : ""}: ${options3.source}${options3.isNullable ? " | null" : ""}`;
+    onProperty(options3) {
+      return `${toComment(options3.description)}readonly "${options3.key}"${options3.isOptional ? "?" : ""}: ${options3.source}${options3.isNullable ? " | null" : ""}`;
     },
     onRef({ name: name2 }) {
       return name2;
@@ -35191,11 +35216,22 @@ var layerTransformerTs = succeed10(
     onArray({ item }) {
       return `ReadonlyArray<${item}>`;
     },
-    onUnion({ sources }) {
-      return sources.join(" | ");
+    onUnion({ items, topLevel }) {
+      const useEnum = topLevel && !items.some((_) => isNone2(_.title));
+      if (!useEnum) {
+        return items.map((_) => _.source).join(" | ");
+      }
+      return `{
+  ${items.map(({ description, title, source }) => `${toComment(description)}${JSON.stringify(getOrNull(title))} = ${source}`).join(",\n  ")}}
+`;
     }
   })
 );
+var toComment = match2({
+  onNone: () => "",
+  onSome: (description) => `/** ${description} */
+`
+});
 function mergeSchemas(self, other) {
   if ("properties" in self && "properties" in other) {
     return {
@@ -35422,6 +35458,7 @@ 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) => {
@@ -35481,6 +35518,7 @@ var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
     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)
   return {
+    httpClient,
     ${operations.map(operationToImpl).join(",\n  ")}
   }
 }`;
@@ -35554,6 +35592,7 @@ var layerTransformerSchema2 = sync6(OpenApiTransformer, () => {
 }).pipe(merge7(layerTransformerSchema));
 var layerTransformerTs2 = sync6(OpenApiTransformer, () => {
   const operationsToInterface = (name2, operations) => `export interface ${name2} {
+  readonly httpClient: HttpClient.HttpClient
   ${operations.map((s) => operationToMethod(name2, s)).join("\n  ")}
 }
 
@@ -35668,6 +35707,7 @@ export const ${name2}Error = <Tag extends string, E>(
       )
   }
   return {
+    httpClient,
     ${operations.map(operationToImpl).join(",\n  ")}
   }
 }`;

package/package.json

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