fix: conversion for anyOf type: null to nullable: true (#44)

Co-authored-by: Eva Arnika Varga <[email protected]>
openapi-contrib · Nov 8, 2023 · 9318da1 · 9318da1
1 parent ade6d2f
commit 9318da1
Show file tree

Hide file tree

Showing 2 changed files with 64 additions and 55 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -201,6 +201,8 @@ function convertDependencies(schema: SchemaType) {
 function convertNullable(schema: SchemaType) {
 	for (const key of ['oneOf', 'anyOf'] as const) {
 		const schemas = schema[key] as JSONSchema4[];
+		if (!schemas) continue;
+
 		if (!Array.isArray(schemas)) {
 			return schema;
 		}

diff --git a/test/nullable.test.ts b/test/nullable.test.ts
@@ -17,18 +17,22 @@ describe('nullable', () => {
 		});
 	});
 
-	it('supports nullables inside sub-schemas', async ({ expect }) => {
-		const schema = {
-			$schema: 'http://json-schema.org/draft-04/schema#',
-			oneOf: [{ type: 'string' }, { type: 'null' }],
-		} satisfies JSONSchema4;
+	it.each(['oneOf', 'anyOf'] as const)(
+		'supports nullables inside sub-schemas %s',
+		async (key) => {
+			const schema = {
+				$schema: 'http://json-schema.org/draft-04/schema#',
+				[key]: [{ type: 'string' }, { type: 'null' }],
+			} satisfies JSONSchema4;
 
-		const result = await convert(schema);
+			const result = await convert(schema);
+
+			expect(result).toEqual({
+				[key]: [{ type: 'string', nullable: true }],
+			});
+		}
+	);
 
-		expect(result).toEqual({
-			oneOf: [{ type: 'string', nullable: true }],
-		});
-	});
 	it('supports nullables inside definitions', async ({ expect }) => {
 		const schema = {
 			$schema: 'http://json-schema.org/draft-07/schema#',
@@ -149,59 +153,62 @@ describe('nullable', () => {
 		});
 	});
 
-	it('adds nullable for types with null', async ({ expect }) => {
-		const schema = {
-			$schema: 'http://json-schema.org/draft-04/schema#',
-			title: 'NullExample',
-			description: 'Null Example',
-			oneOf: [
-				{
-					type: 'object',
-					properties: {
-						foo: {
-							type: 'string',
+	it.each(['oneOf', 'anyOf'] as const)(
+		'adds nullable for types with null',
+		async (key) => {
+			const schema = {
+				$schema: 'http://json-schema.org/draft-04/schema#',
+				title: 'NullExample',
+				description: 'Null Example',
+				[key]: [
+					{
+						type: 'object',
+						properties: {
+							foo: {
+								type: 'string',
+							},
 						},
 					},
-				},
-				{
-					type: 'object',
-					properties: {
-						bar: {
-							type: 'number',
+					{
+						type: 'object',
+						properties: {
+							bar: {
+								type: 'number',
+							},
 						},
 					},
-				},
-				{
-					type: 'null',
-				},
-			],
-		} satisfies JSONSchema4;
+					{
+						type: 'null',
+					},
+				],
+			} satisfies JSONSchema4;
 
-		const result = await convert(schema);
+			const result = await convert(schema);
 
-		expect(result).toEqual({
-			title: 'NullExample',
-			description: 'Null Example',
-			oneOf: [
-				{
-					type: 'object',
-					properties: {
-						foo: {
-							type: 'string',
+			expect(result).toEqual({
+				title: 'NullExample',
+				description: 'Null Example',
+				[key]: [
+					{
+						type: 'object',
+						properties: {
+							foo: {
+								type: 'string',
+							},
 						},
+						nullable: true,
 					},
-					nullable: true,
-				},
-				{
-					type: 'object',
-					properties: {
-						bar: {
-							type: 'number',
+					{
+						type: 'object',
+						properties: {
+							bar: {
+								type: 'number',
+							},
 						},
+						nullable: true,
 					},
-					nullable: true,
-				},
-			],
-		});
-	});
+				],
+			});
+		}
+	);
 });