* feat: support nullable field of combine schemas (#61)

keita1714 · hinaiji-at-exp-t · web-flow · commit a0f63f388448 · 2021-10-26T22:53:45.000+09:00
Co-authored-by: hinaiji &lt;hinaiji@exp-t.com&gt;
diff --git a/src/internal/OpenApiTools/toTypeNode.ts b/src/internal/OpenApiTools/toTypeNode.ts
@@ -124,13 +124,13 @@ export const convert: Convert = (
   }
 
   if (Guard.isOneOfSchema(schema)) {
-    return generateMultiTypeNode(entryPoint, currentPoint, factory, schema.oneOf, context, convert, converterContext, "oneOf");
+    return nullable(factory, generateMultiTypeNode(entryPoint, currentPoint, factory, schema.oneOf, context, convert, converterContext, "oneOf"), !!schema.nullable);
   }
   if (Guard.isAllOfSchema(schema)) {
-    return generateMultiTypeNode(entryPoint, currentPoint, factory, schema.allOf, context, convert, converterContext, "allOf");
+    return nullable(factory, generateMultiTypeNode(entryPoint, currentPoint, factory, schema.allOf, context, convert, converterContext, "allOf"), !!schema.nullable);
   }
   if (Guard.isAnyOfSchema(schema)) {
-    return generateMultiTypeNode(entryPoint, currentPoint, factory, schema.anyOf, context, convert, converterContext, "anyOf");
+    return nullable(factory, generateMultiTypeNode(entryPoint, currentPoint, factory, schema.anyOf, context, convert, converterContext, "anyOf"), !!schema.nullable);
   }
 
   if (Guard.isHasNoMembersObject(schema)) {

Original file line number	Diff line number	Diff line change
`@@ -124,13 +124,13 @@ export const convert: Convert = (`
`124`	`124`	`}`
`125`	`125`
`126`	`126`	`if (Guard.isOneOfSchema(schema)) {`
`127`		`- return generateMultiTypeNode(entryPoint, currentPoint, factory, schema.oneOf, context, convert, converterContext, "oneOf");`
	`127`	`+ return nullable(factory, generateMultiTypeNode(entryPoint, currentPoint, factory, schema.oneOf, context, convert, converterContext, "oneOf"), !!schema.nullable);`
`128`	`128`	`}`
`129`	`129`	`if (Guard.isAllOfSchema(schema)) {`
`130`		`- return generateMultiTypeNode(entryPoint, currentPoint, factory, schema.allOf, context, convert, converterContext, "allOf");`
	`130`	`+ return nullable(factory, generateMultiTypeNode(entryPoint, currentPoint, factory, schema.allOf, context, convert, converterContext, "allOf"), !!schema.nullable);`
`131`	`131`	`}`
`132`	`132`	`if (Guard.isAnyOfSchema(schema)) {`
`133`		`- return generateMultiTypeNode(entryPoint, currentPoint, factory, schema.anyOf, context, convert, converterContext, "anyOf");`
	`133`	`+ return nullable(factory, generateMultiTypeNode(entryPoint, currentPoint, factory, schema.anyOf, context, convert, converterContext, "anyOf"), !!schema.nullable);`
`134`	`134`	`}`
`135`	`135`
`136`	`136`	`if (Guard.isHasNoMembersObject(schema)) {`