cli: Fixed generation for schema with nullable and allOf

Fredx87 · Feb 3, 2022 · 39494f5 · 39494f5
1 parent fe95f90
commit 39494f5
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/.changeset/smooth-guests-repair.md b/.changeset/smooth-guests-repair.md
@@ -0,0 +1,5 @@
+---
+"@openapi-io-ts/cli": patch
+---
+
+Fixed generation for schema with nullable and allOf
diff --git a/packages/cli/src/parser/__tests__/schema.ts b/packages/cli/src/parser/__tests__/schema.ts
@@ -222,4 +222,24 @@ describe("OpenAPI schema", () => {
 
     expect(result).toEqual(E.right(expected));
   });
+
+  it("parses a nullable schema with allOf", () => {
+    const schema: OpenAPIV3.SchemaObject = {
+      nullable: true,
+      allOf: [
+        {
+          type: "array",
+          items: { type: "string" },
+        },
+      ],
+    };
+
+    const result = parseSchema(schema);
+    const expected = gen.unionCombinator([
+      gen.arrayCombinator(gen.stringType),
+      gen.nullType,
+    ]);
+
+    expect(result).toEqual(E.right(expected));
+  });
 });
diff --git a/packages/cli/src/parser/schema.ts b/packages/cli/src/parser/schema.ts
@@ -13,6 +13,13 @@ export function parseSchema(
     return parseJsonReference(schema.$ref);
   }
 
+  if (schema.nullable && schema.allOf) {
+    return pipe(
+      parseAllOf(schema.allOf),
+      E.map((allOf) => gen.unionCombinator([allOf, gen.nullType]))
+    );
+  }
+
   return pipe(
     parseBaseSchema(schema),
     E.map((baseSchema) =>
@@ -76,7 +83,9 @@ function parseAllOf(
 ): E.Either<Error, gen.TypeReference> {
   return pipe(
     parseSchemas(schemas),
-    E.map((schemas) => gen.intersectionCombinator(schemas))
+    E.map((schemas) =>
+      schemas.length === 1 ? schemas[0] : gen.intersectionCombinator(schemas)
+    )
   );
 }
 
@@ -85,7 +94,9 @@ function parseOneOf(
 ): E.Either<Error, gen.TypeReference> {
   return pipe(
     parseSchemas(schemas),
-    E.map((schemas) => gen.unionCombinator(schemas))
+    E.map((schemas) =>
+      schemas.length === 1 ? schemas[0] : gen.unionCombinator(schemas)
+    )
   );
 }