@tim-smart/openapi-gen 0.3.1 → 0.3.3

package/main.js

@@ -29383,9 +29383,10 @@ var identifier = (operationId) => capitalize(camelize(operationId));
 var make65 = gen2(function* () {
   const store = /* @__PURE__ */ new Map();
   const classes = /* @__PURE__ */ new Set();
+  const enums = /* @__PURE__ */ new Set();
   const refStore = /* @__PURE__ */ new Map();
   const addSchema = (name, root2, context7, asStruct = false) => {
-    function addRefs(schema, asStruct2 = true) {
+    function addRefs(schema, childName, asStruct2 = true) {
       if ("$ref" in schema) {
         if (!schema.$ref.startsWith("#")) {
           return;
@@ -29404,32 +29405,39 @@ var make65 = gen2(function* () {
           current = current[key];
         }
         refStore.set(schema.$ref, current);
-        addRefs(current);
+        addRefs(current, "properties" in current ? name2 : void 0);
         store.set(name2, current);
         if (!asStruct2) {
           classes.add(name2);
         }
       } else if ("properties" in schema) {
-        Object.values(schema.properties).forEach((s) => addRefs(s));
+        Object.entries(schema.properties).forEach(
+          ([name2, s]) => addRefs(s, childName ? childName + identifier(name2) : void 0)
+        );
       } else if ("type" in schema && schema.type === "array") {
         if (Array.isArray(schema.items)) {
-          schema.items.forEach((s) => addRefs(s));
+          schema.items.forEach((s) => addRefs(s, childName));
         } else if (schema.items) {
-          addRefs(schema.items);
+          addRefs(schema.items, childName);
         }
       } else if ("allOf" in schema) {
-        schema.allOf.forEach((s) => addRefs(s));
+        schema.allOf.forEach((s) => addRefs(s, childName));
       } else if ("anyOf" in schema) {
-        schema.anyOf.forEach((s) => addRefs(s));
+        schema.anyOf.forEach((s) => addRefs(s, childName));
       } else if ("oneOf" in schema) {
-        schema.oneOf.forEach((s) => addRefs(s));
+        schema.oneOf.forEach((s) => addRefs(s, childName));
+      } else if ("enum" in schema) {
+        if (childName !== void 0) {
+          store.set(childName, schema);
+          enums.add(childName);
+        }
       }
     }
     if ("$ref" in root2) {
-      addRefs(root2, false);
+      addRefs(root2, void 0, false);
       return identifier(root2.$ref.split("/").pop());
     } else {
-      addRefs(root2);
+      addRefs(root2, "properties" in root2 ? name : void 0);
       store.set(name, root2);
       if (!asStruct) {
         classes.add(name);
@@ -29439,7 +29447,8 @@ var make65 = gen2(function* () {
   };
   const topLevelSource = (S, name, schema) => {
     const isClass = classes.has(name);
-    return toSource(S, schema, isClass).pipe(
+    const isEnum = enums.has(name);
+    return toSource(S, schema, name, isClass || isEnum).pipe(
       map((source) => {
         const isObject2 = "properties" in schema;
         if (!isObject2 || !isClass) {
@@ -29449,7 +29458,7 @@ var make65 = gen2(function* () {
       })
     );
   };
-  const toSource = (S, schema, topLevel = false) => {
+  const toSource = (S, schema, currentIdentifier, topLevel = false) => {
     if ("properties" in schema) {
       const obj = schema;
       const required2 = obj.required ?? [];
@@ -29458,7 +29467,7 @@ var make65 = gen2(function* () {
         filterMap2(([key, schema2]) => {
           const fullSchema = "$ref" in schema2 ? refStore.get(schema2.$ref) : schema2;
           const isOptional = !required2.includes(key);
-          return toSource(S, schema2).pipe(
+          return toSource(S, schema2, currentIdentifier + identifier(key)).pipe(
             map(
               applyAnnotations(S, {
                 isOptional,
@@ -29483,6 +29492,9 @@ var make65 = gen2(function* () {
         `${S}.Record({ key: ${S}.String, value: ${S}.Unknown })`
       );
     } else if ("enum" in schema) {
+      if (!topLevel && enums.has(currentIdentifier)) {
+        return some2(currentIdentifier);
+      }
       const items = schema.enum.map((_) => JSON.stringify(_)).join(", ");
       return some2(`${S}.Literal(${items})`);
     } else if ("type" in schema) {
@@ -29535,7 +29547,7 @@ var make65 = gen2(function* () {
           if ("maxItems" in schema) {
             modifiers.push(`${S}.maxItems(${schema.maxItems})`);
           }
-          return toSource(S, itemsSchema(schema.items)).pipe(
+          return toSource(S, itemsSchema(schema.items), currentIdentifier).pipe(
             map(
               (source) => `${S}.${nonEmpty ? "NonEmpty" : ""}Array(${source})${pipeSource(modifiers)}`
             )
@@ -29549,11 +29561,16 @@ var make65 = gen2(function* () {
       const name = identifier(schema.$ref.split("/").pop());
       return some2(name);
     } else if ("properties" in schema) {
-      return toSource(S, { type: "object", ...schema }, topLevel);
+      return toSource(
+        S,
+        { type: "object", ...schema },
+        currentIdentifier,
+        topLevel
+      );
     } else if ("allOf" in schema) {
       const sources = pipe(
         schema.allOf,
-        filterMap2((_) => toSource(S, _))
+        filterMap2((_) => toSource(S, _, currentIdentifier))
       );
       if (sources.length === 0) {
         return none2();
@@ -29569,7 +29586,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, _))
+        filterMap2((_) => toSource(S, _, currentIdentifier))
       );
       if (sources.length === 0) return none2();
       else if (sources.length === 1) return some2(sources[0]);
@@ -29798,7 +29815,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"),
@@ -29810,6 +29832,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  ")}
@@ -29861,9 +29885,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.1",
+  "version": "0.3.3",
   "description": "Generate Effect http clients from OpenAPI specs",
   "bin": "main.js",
   "repository": {