@kubb/plugin-oas 2.19.5 → 2.20.0

package/src/SchemaGenerator.ts

@@ -560,6 +560,12 @@ export abstract class SchemaGenerator<
         type: 'type',
       })
 
+      const nullableEnum = schema.enum.includes(null)
+      if (nullableEnum) {
+        baseItems.push({ keyword: schemaKeywords.nullable })
+      }
+      const filteredValues = schema.enum.filter((value) => value !== null)
+
       // x-enumNames has priority
       const extensionEnums = ['x-enumNames', 'x-enum-varnames']
         .filter((extensionKey) => extensionKey in schema)
@@ -600,7 +606,7 @@ export abstract class SchemaGenerator<
                     value,
                     format: 'number',
                   }))
-                : [...new Set(schema.enum)].map((value: string) => {
+                : [...new Set(filteredValues)].map((value: string) => {
                     return {
                       name: value,
                       value,
@@ -624,7 +630,7 @@ export abstract class SchemaGenerator<
             name: enumName,
             typeName,
             asConst: false,
-            items: [...new Set(schema.enum)].map((value: string) => ({
+            items: [...new Set(filteredValues)].map((value: string) => ({
               name: transformers.stringify(value),
               value,
               format: isNumber(value) ? 'number' : 'string',

package/src/hooks/useOperationManager.ts

@@ -20,14 +20,19 @@ type SchemaNames = {
     query: string | undefined
     header: string | undefined
   }
-  responses: Record<number, string>
+  responses: { default?: string } & Record<number | string, string>
+  errors: Record<number | string, string>
 }
 
 type UseOperationManagerResult = {
   getName: (operation: OperationType, params: { pluginKey?: Plugin['key']; type: ResolveNameParams['type'] }) => string
   getFile: (operation: OperationType, params?: { pluginKey?: Plugin['key']; extName?: KubbFile.Extname }) => KubbFile.File<FileMeta>
-  groupSchemasByByName: (operation: OperationType, params: { pluginKey?: Plugin['key']; type: ResolveNameParams['type'] }) => SchemaNames
-  getSchemas: (operation: Operation, forStatusCode?: string | number) => OperationSchemas
+  groupSchemasByName: (operation: OperationType, params: { pluginKey?: Plugin['key']; type: ResolveNameParams['type'] }) => SchemaNames
+  getSchemas: (
+    operation: Operation,
+    params?: { pluginKey?: Plugin['key']; type?: ResolveNameParams['type'] },
+    forStatusCode?: string | number,
+  ) => OperationSchemas
 }
 
 /**
@@ -72,7 +77,7 @@ export function useOperationManager(): UseOperationManagerResult {
     }
   }
 
-  const groupSchemasByByName: UseOperationManagerResult['groupSchemasByByName'] = (operation, { pluginKey = plugin.key, type }) => {
+  const groupSchemasByName: UseOperationManagerResult['groupSchemasByName'] = (operation, { pluginKey = plugin.key, type }) => {
     const schemas = generator.getSchemas(operation)
 
     const errors = (schemas.errors || []).reduce(
@@ -83,7 +88,7 @@ export function useOperationManager(): UseOperationManagerResult {
 
         prev[acc.statusCode] = pluginManager.resolveName({
           name: acc.name,
-          pluginKey: plugin.key,
+          pluginKey,
           type,
         })
 
@@ -129,15 +134,30 @@ export function useOperationManager(): UseOperationManagerResult {
           pluginKey,
           type,
         }),
+        ['default']: pluginManager.resolveName({
+          name: schemas.response.name,
+          pluginKey,
+          type,
+        }),
         ...errors,
       },
+      errors,
     }
   }
 
   return {
     getName,
     getFile,
-    getSchemas: (operation, forStatusCode) => generator.getSchemas(operation, forStatusCode),
-    groupSchemasByByName,
+    getSchemas: (operation, params, forStatusCode) =>
+      generator.getSchemas(operation, {
+        forStatusCode,
+        resolveName: (name) =>
+          pluginManager.resolveName({
+            name,
+            pluginKey: params?.pluginKey,
+            type: params?.type,
+          }),
+      }),
+    groupSchemasByName,
   }
 }