fix: properties + anyOf with only required properties (#643)

* test: properties + anyOf with only required properties

* fix: properties + anyOf with only required properties

* style: prettier `expected/github*.ts`

* test: update `expected/github*ts` fixtures

* Update snapshots

Co-authored-by: Drew Powers <[email protected]>

Author: gr2m

src/transform/schema.ts

@@ -39,7 +39,19 @@ export function transformSchemaObjMap(obj: Record<string, any>, options: Transfo
 
 /** transform anyOf */
 export function transformAnyOf(anyOf: any, options: TransformSchemaObjOptions): string {
-  return tsIntersectionOf(anyOf.map((s: any) => tsPartial(transformSchemaObj(s, options))));
+  // filter out anyOf keys that only have a `required` key. #642
+  const schemas = anyOf.filter((s: any) => {
+    if (Object.keys(s).length > 1) return true;
+
+    if (s.required) return false;
+
+    return true;
+  });
+
+  if (schemas.length === 0) {
+    return "";
+  }
+  return tsIntersectionOf(schemas.map((s: any) => tsPartial(transformSchemaObj(s, options))));
 }
 
 /** transform oneOf */

src/utils.ts

@@ -119,8 +119,10 @@ export function tsTupleOf(types: string[]): string {
 
 /** Convert T, U into T & U; */
 export function tsIntersectionOf(types: string[]): string {
-  if (types.length === 1) return types[0]; // don’t add parentheses around one thing
-  return `(${types.join(") & (")})`;
+  const typesWithValues = types.filter(Boolean);
+
+  if (typesWithValues.length === 1) return typesWithValues[0]; // don’t add parentheses around one thing
+  return `(${typesWithValues.join(") & (")})`;
 }
 
 /** Convert T into Partial<T> */

tests/schema.test.ts

@@ -340,6 +340,34 @@ describe("SchemaObject", () => {
 
 })`);
     });
+
+    it("properties + anyOf with only required properties", () => {
+      expect(
+        transform(
+          {
+            properties: {
+              a: {
+                type: "string",
+              },
+
+              b: {
+                type: "string",
+              },
+            },
+
+            anyOf: [{ required: ["a"] }, { required: ["b"] }],
+          },
+
+          { ...defaults }
+        )
+      ).toMatchInlineSnapshot(`
+        "{
+        \\"a\\"?: string;
+        \\"b\\"?: string;
+
+        }"
+      `);
+    });
   });
 
   describe("comments", () => {

tests/v3/expected/github.additional.ts

@@ -12235,15 +12235,11 @@ export interface operations {
     requestBody: {
       content: {
         "application/json":
-          | ((Partial<{ [key: string]: any }> & Partial<{ [key: string]: any }>) & {
+          | ({
               /** Description of the gist */
               description?: string;
               /** Names of files to be updated */
-              files?: {
-                [key: string]: Partial<{ [key: string]: any }> &
-                  Partial<{ [key: string]: any }> &
-                  Partial<{ [key: string]: any }>;
-              };
+              files?: { [key: string]: Partial<{ [key: string]: any }> };
             } & { [key: string]: any })
           | null;
       };
@@ -25505,7 +25501,7 @@ export interface operations {
     };
     requestBody: {
       content: {
-        "application/json": (Partial<{ [key: string]: any }> & Partial<{ [key: string]: any }>) & {
+        "application/json": {
           /** An array of user `login`s that will be requested. */
           reviewers?: string[];
           /** An array of team `slug`s that will be requested. */

tests/v3/expected/github.immutable.ts

@@ -12199,18 +12199,12 @@ export interface operations {
     };
     readonly requestBody: {
       readonly content: {
-        readonly "application/json":
-          | ((Partial<{ readonly [key: string]: any }> & Partial<{ readonly [key: string]: any }>) & {
-              /** Description of the gist */
-              readonly description?: string;
-              /** Names of files to be updated */
-              readonly files?: {
-                readonly [key: string]: Partial<{ readonly [key: string]: any }> &
-                  Partial<{ readonly [key: string]: any }> &
-                  Partial<{ readonly [key: string]: any }>;
-              };
-            })
-          | null;
+        readonly "application/json": {
+          /** Description of the gist */
+          readonly description?: string;
+          /** Names of files to be updated */
+          readonly files?: { readonly [key: string]: Partial<{ readonly [key: string]: any }> };
+        } | null;
       };
     };
   };
@@ -25452,8 +25446,7 @@ export interface operations {
     };
     readonly requestBody: {
       readonly content: {
-        readonly "application/json": (Partial<{ readonly [key: string]: any }> &
-          Partial<{ readonly [key: string]: any }>) & {
+        readonly "application/json": {
           /** An array of user `login`s that will be requested. */
           readonly reviewers?: readonly string[];
           /** An array of team `slug`s that will be requested. */

tests/v3/expected/github.ts

@@ -12195,18 +12195,12 @@ export interface operations {
     };
     requestBody: {
       content: {
-        "application/json":
-          | ((Partial<{ [key: string]: any }> & Partial<{ [key: string]: any }>) & {
-              /** Description of the gist */
-              description?: string;
-              /** Names of files to be updated */
-              files?: {
-                [key: string]: Partial<{ [key: string]: any }> &
-                  Partial<{ [key: string]: any }> &
-                  Partial<{ [key: string]: any }>;
-              };
-            })
-          | null;
+        "application/json": {
+          /** Description of the gist */
+          description?: string;
+          /** Names of files to be updated */
+          files?: { [key: string]: Partial<{ [key: string]: any }> };
+        } | null;
       };
     };
   };
@@ -25448,7 +25442,7 @@ export interface operations {
     };
     requestBody: {
       content: {
-        "application/json": (Partial<{ [key: string]: any }> & Partial<{ [key: string]: any }>) & {
+        "application/json": {
           /** An array of user `login`s that will be requested. */
           reviewers?: string[];
           /** An array of team `slug`s that will be requested. */