Merge pull request #374 from contiamo/all-of-one-of-root-with-empty-r…

…equired Fix: empty required should not generate invalid types.
contiamo · Sep 23, 2021 · a86ef29 · a86ef29
2 parents 15f04ca + adc09c4
commit a86ef29
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/scripts/import-open-api.ts b/src/scripts/import-open-api.ts
@@ -132,7 +132,7 @@ export const getObject = (item: SchemaObject): string => {
 
   if (item.allOf) {
     const composedType = item.allOf.map(resolveValue).join(" & ");
-    if (item.required) {
+    if (item.required && item.required.length) {
       return requireProperties(composedType, item.required);
     }
     return composedType;
@@ -144,7 +144,7 @@ export const getObject = (item: SchemaObject): string => {
 
   if (item.oneOf) {
     const unionType = item.oneOf.map(resolveValue).join(" | ");
-    if (item.required) {
+    if (item.required && item.required.length) {
       return requireProperties(unionType, item.required);
     }
     return unionType;

diff --git a/src/scripts/tests/import-open-api.test.ts b/src/scripts/tests/import-open-api.test.ts
@@ -401,6 +401,15 @@ describe("scripts/import-open-api", () => {
       expect(getObject(item)).toEqual(`Require<Foo & Bar, "a_bar_property" | "a_foo_property">`);
     });
 
+    it("should deal with allOf and an empty required at root level", () => {
+      const item = {
+        type: "object",
+        allOf: [{ $ref: "#/components/schemas/foo" }, { $ref: "#/components/schemas/bar" }],
+        required: [],
+      };
+      expect(getObject(item)).toEqual(`Foo & Bar`);
+    });
+
     it("should deal with oneOf and required at root level", () => {
       const item = {
         type: "object",
@@ -410,6 +419,15 @@ describe("scripts/import-open-api", () => {
       expect(getObject(item)).toEqual(`Require<Foo | Bar, "a_common_property">`);
     });
 
+    it("should deal with oneOf and an empty required at root level", () => {
+      const item = {
+        type: "object",
+        oneOf: [{ $ref: "#/components/schemas/foo" }, { $ref: "#/components/schemas/bar" }],
+        required: [],
+      };
+      expect(getObject(item)).toEqual(`Foo | Bar`);
+    });
+
     it("should deal with oneOf with null", () => {
       const item = {
         type: "object",