@tim-smart/openapi-gen 0.3.2 → 0.3.4

package/main.js

@@ -29405,7 +29405,7 @@ var make65 = gen2(function* () {
           current = current[key];
         }
         refStore.set(schema.$ref, current);
-        addRefs(current, "properties" in current ? name2 : void 0);
+        addRefs(current, name2);
         store.set(name2, current);
         if (!asStruct2) {
           classes.add(name2);
@@ -29416,16 +29416,22 @@ var make65 = gen2(function* () {
         );
       } else if ("type" in schema && schema.type === "array") {
         if (Array.isArray(schema.items)) {
-          schema.items.forEach((s) => addRefs(s, childName));
+          schema.items.forEach((s) => addRefs(s, void 0));
         } else if (schema.items) {
-          addRefs(schema.items, childName);
+          addRefs(schema.items, void 0);
         }
       } else if ("allOf" in schema) {
-        schema.allOf.forEach((s) => addRefs(s, childName));
+        schema.allOf.forEach(
+          (s) => addRefs(s, childName ? childName + "Enum" : void 0)
+        );
       } else if ("anyOf" in schema) {
-        schema.anyOf.forEach((s) => addRefs(s, childName));
+        schema.anyOf.forEach(
+          (s) => addRefs(s, childName ? childName + "Enum" : void 0)
+        );
       } else if ("oneOf" in schema) {
-        schema.oneOf.forEach((s) => addRefs(s, childName));
+        schema.oneOf.forEach(
+          (s) => addRefs(s, childName ? childName + "Enum" : void 0)
+        );
       } else if ("enum" in schema) {
         if (childName !== void 0) {
           store.set(childName, schema);
@@ -29450,6 +29456,12 @@ var make65 = gen2(function* () {
     const isEnum = enums.has(name);
     return toSource(S, schema, name, isClass || isEnum).pipe(
       map((source) => {
+        if (name === "Model") {
+          console.error({
+            name,
+            source
+          });
+        }
         const isObject2 = "properties" in schema;
         if (!isObject2 || !isClass) {
           return `export class ${name} extends ${source} {}`;
@@ -29497,7 +29509,7 @@ var make65 = gen2(function* () {
       }
       const items = schema.enum.map((_) => JSON.stringify(_)).join(", ");
       return some2(`${S}.Literal(${items})`);
-    } else if ("type" in schema) {
+    } else if ("type" in schema && schema.type) {
       switch (schema.type) {
         case "string": {
           const modifiers = [];
@@ -29570,7 +29582,7 @@ var make65 = gen2(function* () {
     } else if ("allOf" in schema) {
       const sources = pipe(
         schema.allOf,
-        filterMap2((_) => toSource(S, _, currentIdentifier))
+        filterMap2((_) => toSource(S, _, currentIdentifier + "Enum"))
       );
       if (sources.length === 0) {
         return none2();
@@ -29586,7 +29598,7 @@ var make65 = gen2(function* () {
     } else if ("anyOf" in schema || "oneOf" in schema) {
       const sources = pipe(
         "anyOf" in schema ? schema.anyOf : schema.oneOf,
-        filterMap2((_) => toSource(S, _, currentIdentifier))
+        filterMap2((_) => toSource(S, _, currentIdentifier + "Enum"))
       );
       if (sources.length === 0) return none2();
       else if (sources.length === 1) return some2(sources[0]);
@@ -29815,7 +29827,12 @@ var operationToMethod = (operation) => {
   }
   return `readonly "${operation.id}": (${args.join(", ")}) => Effect.Effect<${success}, ${errors.join(" | ")}>`;
 };
-var operationsToImpl = (name, operations) => `export const make = (httpClient: HttpClient.HttpClient): ${name} => {
+var operationsToImpl = (name, operations) => `export const make = (
+  httpClient: HttpClient.HttpClient, 
+  options: {
+    readonly transformClient?: ((client: HttpClient.HttpClient) => Effect.Effect<HttpClient.HttpClient>) | undefined
+  } = {}
+): ${name} => {
   const unexpectedStatus = (request: HttpClientRequest.HttpClientRequest, response: HttpClientResponse.HttpClientResponse) =>
     Effect.flatMap(
       Effect.orElseSucceed(response.text, () => "Unexpected status code"),
@@ -29827,6 +29844,8 @@ var operationsToImpl = (name, operations) => `export const make = (httpClient: H
           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)
   return {
     ${operations.map(operationToImpl).join(",\n  ")}
@@ -29850,7 +29869,7 @@ var operationToImpl = (operation) => {
     }
     if (operation.headers.length > 0) {
       const props = operation.headers.map(
-        (param) => `"${param}": ${varName}["${param}"]`
+        (param) => `"${param}": ${varName}["${param}"] ?? undefined`
       );
       pipeline.push(`HttpClientRequest.setHeaders({ ${props.join(", ")} })`);
     }
@@ -29878,9 +29897,9 @@ var operationToImpl = (operation) => {
     decodes.push(`"${status2}": r => decodeError(r, ${schema})`);
   });
   decodes.push(`orElse: (response) => unexpectedStatus(request, response)`);
-  pipeline.push(`Effect.flatMap(request => Effect.flatMap(httpClient.execute(request), HttpClientResponse.matchStatus({
+  pipeline.push(`Effect.flatMap(request => Effect.flatMap(applyClientTransform(httpClient), (httpClient) => Effect.flatMap(httpClient.execute(request), HttpClientResponse.matchStatus({
       ${decodes.join(",\n      ")}
-    })))`);
+    }))))`);
   pipeline.push(`Effect.scoped`);
   return `"${operation.id}": (${params}) => HttpClientRequest.make("${operation.method.toUpperCase()}")(${operation.pathTemplate}).pipe(
     ${pipeline.join(",\n    ")}

package/package.json

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