Merge pull request #1017 from BitGo/openapi

feat: ouput boolean query parameters as booleans, not string enums

Author: ericcrosson-bitgo

packages/openapi-generator/src/knownImports.ts

@@ -338,8 +338,7 @@ export const KNOWN_IMPORTS: KnownImports = {
       E.right({ type: 'string', format: 'number', decodedType: 'bigint' }),
     BooleanFromNumber: () =>
       E.right({ type: 'number', enum: [0, 1], decodedType: 'boolean' }),
-    BooleanFromString: () =>
-      E.right({ type: 'string', enum: ['true', 'false'], decodedType: 'boolean' }),
+    BooleanFromString: () => E.right({ type: 'boolean' }),
     DateFromISOString: () =>
       E.right({ type: 'string', format: 'date-time', title: 'ISO Date String' }),
     DateFromNumber: () =>

packages/openapi-generator/src/optimize.ts

@@ -40,6 +40,14 @@ function consolidateUnion(schema: Schema): Schema {
   const consolidatableTypes = ['boolean', 'number', 'string'];
   const innerSchemas = schema.schemas.map(optimize);
 
+  const booleanSchemas = innerSchemas.filter(
+    (s) => s.type === 'boolean' || s.decodedType === 'boolean',
+  );
+
+  if (booleanSchemas.length === innerSchemas.length && booleanSchemas.length > 0) {
+    return { type: 'boolean' };
+  }
+
   const isConsolidatableType = (s: Schema): boolean => {
     return (
       (s.primitive && consolidatableTypes.includes(s.type)) ||

packages/openapi-generator/test/openapi/misc.test.ts

@@ -292,4 +292,3 @@ testCase("route with record types", ROUTE_WITH_RECORD_TYPES, {
     }
   }
 });
-

packages/openapi-generator/test/openapi/union.test.ts

@@ -215,8 +215,8 @@ testCase("route with consolidatable union schemas", ROUTE_WITH_CONSOLIDATABLE_UN
             required: true,
             schema: {
               oneOf: [
-                { type: 'string', format: 'number' },
-                { type: 'string', enum: ['true', 'false'] }
+                { type: 'boolean' },
+                { type: 'string', format: 'number' }
               ]
             }
           },
@@ -227,15 +227,15 @@ testCase("route with consolidatable union schemas", ROUTE_WITH_CONSOLIDATABLE_UN
             schema: {
               oneOf: [
                 { type: 'string' },
-                { type: 'string', enum: ['true', 'false'] }
+                { type: 'boolean' }
               ]
             }
           },
           {
             name: 'firstNonUnion',
             in: 'query',
             required: true,
-            schema: { type: 'string', enum: ['true', 'false'] }
+            schema: { type: 'boolean' }
           },
           {
             name: 'secondNonUnion',