@tim-smart/openapi-gen 0.3.7 → 0.3.9

package/main.js

@@ -30037,7 +30037,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;
+        const isObject2 = "properties" in schema || "allOf" in schema;
         if (!isObject2 || !isClass) {
           return `export class ${name} extends ${source} {}`;
         }
@@ -30045,6 +30045,26 @@ var make63 = gen2(function* () {
       })
     );
   };
+  const getSchema = (raw) => {
+    if ("$ref" in raw) {
+      return refStore.get(raw.$ref) ?? raw;
+    }
+    return raw;
+  };
+  const flattenAllOf = (schema) => {
+    if ("allOf" in schema) {
+      let out = {};
+      for (const member of schema.allOf) {
+        let s = getSchema(member);
+        if ("allOf" in s) {
+          s = flattenAllOf(s);
+        }
+        out = mergeSchemas(out, s);
+      }
+      return out;
+    }
+    return getSchema(schema);
+  };
   const toSource = (S, schema, currentIdentifier, topLevel = false) => {
     if ("properties" in schema) {
       const obj = schema;
@@ -30052,7 +30072,7 @@ var make63 = gen2(function* () {
       const properties = pipe(
         Object.entries(obj.properties ?? {}),
         filterMap2(([key, schema2]) => {
-          const fullSchema = "$ref" in schema2 ? refStore.get(schema2.$ref) : schema2;
+          const fullSchema = getSchema(schema2);
           const isOptional = !required2.includes(key);
           return toSource(S, schema2, currentIdentifier + identifier2(key)).pipe(
             map2(
@@ -30155,21 +30175,14 @@ var make63 = gen2(function* () {
         topLevel
       );
     } else if ("allOf" in schema) {
-      const sources = pipe(
-        schema.allOf,
-        filterMap2((_) => toSource(S, _, currentIdentifier + "Enum"))
-      );
+      const sources = schema.allOf;
       if (sources.length === 0) {
         return none2();
       } else if (sources.length === 1) {
-        return some2(sources[0]);
-      }
-      const first3 = sources[0];
-      const modifiers = [];
-      for (let i = 1; i < sources.length; i++) {
-        modifiers.push(sources[i]);
+        return toSource(S, sources[0], currentIdentifier + "Enum", topLevel);
       }
-      return some2(`${first3}${pipeSource(modifiers)}`);
+      const flattened2 = flattenAllOf(schema);
+      return toSource(S, flattened2, currentIdentifier + "Enum", topLevel);
     } else if ("anyOf" in schema || "oneOf" in schema) {
       const sources = pipe(
         "anyOf" in schema ? schema.anyOf : schema.oneOf,
@@ -30178,6 +30191,8 @@ var make63 = gen2(function* () {
       if (sources.length === 0) return none2();
       else if (sources.length === 1) return some2(sources[0]);
       return some2(`${S}.Union(${sources.join(", ")})`);
+    } else if ("const" in schema) {
+      return some2(`${S}.Literal(${JSON.stringify(schema.const)})`);
     }
     return none2();
   };
@@ -30219,6 +30234,23 @@ var _JsonSchemaGen = class _JsonSchemaGen extends Tag2("JsonSchemaGen")() {
 };
 _JsonSchemaGen.with = provideServiceEffect2(_JsonSchemaGen, make63);
 var JsonSchemaGen = _JsonSchemaGen;
+function mergeSchemas(self, other) {
+  if ("properties" in self && "properties" in other) {
+    return {
+      ...other,
+      ...self,
+      properties: {
+        ...other.properties,
+        ...self.properties
+      },
+      required: [...other.required || [], ...self.required || []]
+    };
+  }
+  return {
+    ...self,
+    ...other
+  };
+}
 
 // src/OpenApi.ts
 var methodNames = [

package/package.json

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