@tim-smart/openapi-gen 0.3.9 → 0.3.11

package/main.js

@@ -29969,27 +29969,21 @@ var make63 = gen2(function* () {
   const addSchema = (name, root2, context7, asStruct = false) => {
     function addRefs(schema, childName, asStruct2 = true) {
       if ("$ref" in schema) {
-        if (!schema.$ref.startsWith("#")) {
+        const resolved = resolveRef(schema, {
+          ...root2,
+          ...context7
+        });
+        if (!resolved) {
           return;
         }
-        const path2 = schema.$ref.slice(2).split("/");
-        const name2 = identifier2(path2[path2.length - 1]);
-        if (store.has(name2)) {
+        if (store.has(resolved.name)) {
           return;
         }
-        let current = {
-          ...root2,
-          ...context7
-        };
-        for (const key of path2) {
-          if (!current) return;
-          current = current[key];
-        }
-        refStore.set(schema.$ref, current);
-        addRefs(current, name2);
-        store.set(name2, current);
+        refStore.set(schema.$ref, resolved.schema);
+        addRefs(resolved.schema, resolved.name);
+        store.set(resolved.name, resolved.schema);
         if (!asStruct2) {
-          classes.add(name2);
+          classes.add(resolved.name);
         }
       } else if ("properties" in schema) {
         Object.entries(schema.properties).forEach(
@@ -30002,9 +29996,22 @@ var make63 = gen2(function* () {
           addRefs(schema.items, void 0);
         }
       } else if ("allOf" in schema) {
-        schema.allOf.forEach(
-          (s) => addRefs(s, childName ? childName + "Enum" : void 0)
-        );
+        if (schema.allOf.length === 1) {
+          const resolved = { ...schema, ...schema.allOf[0] };
+          delete resolved.allOf;
+          addRefs(resolved, childName, asStruct2);
+        } else {
+          const resolved = resolveAllOf(schema, {
+            ...root2,
+            ...context7
+          });
+          if (childName !== void 0) {
+            addRefs(resolved, childName + "Enum", asStruct2);
+            store.set(childName, resolved);
+          } else {
+            addRefs(resolved, void 0, asStruct2);
+          }
+        }
       } else if ("anyOf" in schema) {
         schema.anyOf.forEach(
           (s) => addRefs(s, childName ? childName + "Enum" : void 0)
@@ -30037,7 +30044,7 @@ var make63 = gen2(function* () {
     const isEnum = enums.has(name);
     return toSource(S, schema, name, isClass || isEnum).pipe(
       map2((source) => {
-        const isObject2 = "properties" in schema || "allOf" in schema;
+        const isObject2 = "properties" in schema;
         if (!isObject2 || !isClass) {
           return `export class ${name} extends ${source} {}`;
         }
@@ -30175,6 +30182,9 @@ var make63 = gen2(function* () {
         topLevel
       );
     } else if ("allOf" in schema) {
+      if (store.has(currentIdentifier)) {
+        return some2(currentIdentifier);
+      }
       const sources = schema.allOf;
       if (sources.length === 0) {
         return none2();
@@ -30245,12 +30255,56 @@ function mergeSchemas(self, other) {
       },
       required: [...other.required || [], ...self.required || []]
     };
+  } else if ("anyOf" in self && "anyOf" in other) {
+    return {
+      ...other,
+      ...self,
+      anyOf: [...self.anyOf, ...other.anyOf]
+    };
   }
   return {
     ...self,
     ...other
   };
 }
+function resolveAllOf(schema, context7, resolveRefs = true) {
+  if ("$ref" in schema) {
+    const resolved = resolveRef(schema, context7, resolveRefs);
+    if (!resolved) {
+      return schema;
+    }
+    return resolved.schema;
+  } else if ("allOf" in schema) {
+    if (schema.allOf.length <= 1) {
+      let out2 = { ...schema };
+      delete out2.allOf;
+      if (schema.allOf.length === 0) {
+        return out2;
+      }
+      Object.assign(out2, schema.allOf[0]);
+      return resolveAllOf(out2, context7, resolveRefs);
+    }
+    let out = {};
+    for (const member of schema.allOf) {
+      out = mergeSchemas(out, resolveAllOf(member, context7, resolveRefs));
+    }
+    return out;
+  }
+  return schema;
+}
+function resolveRef(schema, context7, recursive = false) {
+  if (!schema.$ref.startsWith("#")) {
+    return;
+  }
+  const path2 = schema.$ref.slice(2).split("/");
+  const name = identifier2(path2[path2.length - 1]);
+  let current = context7;
+  for (const key of path2) {
+    if (!current) return;
+    current = current[key];
+  }
+  return { name, schema: resolveAllOf(current, context7, recursive) };
+}
 
 // src/OpenApi.ts
 var methodNames = [
@@ -30369,6 +30423,7 @@ var make64 = gen2(function* () {
       '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"'
@@ -30474,7 +30529,7 @@ var operationToImpl = (operation) => {
     const varName = operation.payload ? "options.params" : "options";
     if (operation.urlParams.length > 0) {
       const props = operation.urlParams.map(
-        (param) => `"${param}": ${varName}["${param}"]`
+        (param) => `"${param}": ${varName}["${param}"] as UrlParams.Coercible`
       );
       pipeline.push(`HttpClientRequest.setUrlParams({ ${props.join(", ")} })`);
     }

package/package.json

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