@kubb/adapter-oas 5.0.0-alpha.20 → 5.0.0-alpha.21

package/src/adapter.ts

@@ -1,4 +1,5 @@
 import { collectImports, createRoot } from '@kubb/ast'
+import type { RootNode } from '@kubb/ast/types'
 import { createAdapter } from '@kubb/core'
 import { DEFAULT_PARSER_OPTIONS } from './constants.ts'
 import { applyDiscriminatorInheritance } from './discriminator.ts'
@@ -47,7 +48,8 @@ export const adapterOas = createAdapter<AdapterOas>((options) => {
 
   // Let-binding so parse() can replace it with a simple reassignment (no clear+loop).
   let nameMapping = new Map<string, string>()
-  let parsedDocument: Document | undefined
+  let parsedDocument: Document | null
+  let rootNode: RootNode | null
 
   return {
     name: adapterOasName,
@@ -69,6 +71,9 @@ export const adapterOas = createAdapter<AdapterOas>((options) => {
     get document() {
       return parsedDocument
     },
+    get rootNode() {
+      return rootNode
+    },
     getImports(node, resolve) {
       return collectImports({
         node,
@@ -100,15 +105,15 @@ export const adapterOas = createAdapter<AdapterOas>((options) => {
         enumSuffix,
       })
 
-      const root = discriminator === 'inherit' ? applyDiscriminatorInheritance(parsedRoot) : parsedRoot
+      const node = discriminator === 'inherit' ? applyDiscriminatorInheritance(parsedRoot) : parsedRoot
 
       // This must happen after parseOas() because legacy enum remapping is finalized there.
       nameMapping = parsedNameMapping
       // Expose the raw document so consumers (e.g. plugin-redoc) can access it.
       parsedDocument = document
 
-      return createRoot({
-        ...root,
+      rootNode = createRoot({
+        ...node,
         meta: {
           title: document.info?.title,
           description: document.info?.description,
@@ -116,6 +121,8 @@ export const adapterOas = createAdapter<AdapterOas>((options) => {
           baseURL,
         },
       })
+
+      return rootNode
     },
   }
 })

package/src/parser.ts

@@ -48,7 +48,7 @@ import {
   getSchemas,
   getSchemaType,
 } from './resolvers.ts'
-import type { contentType, Document, Operation, ReferenceObject, SchemaObject } from './types.ts'
+import type { ContentType, Document, Operation, ReferenceObject, SchemaObject } from './types.ts'
 
 /**
  * Construction-time context for the OAS parser.
@@ -58,7 +58,7 @@ import type { contentType, Document, Operation, ReferenceObject, SchemaObject }
  */
 export type OasParserContext = {
   document: Document
-  contentType?: contentType
+  contentType?: ContentType
 }
 
 /**
@@ -796,7 +796,7 @@ export function parseSchema(ctx: OasParserContext, { schema, name }: { schema: S
  */
 export function parseOas(
   document: Document,
-  options: Partial<ParserOptions> & { contentType?: contentType } = {},
+  options: Partial<ParserOptions> & { contentType?: ContentType } = {},
 ): { root: RootNode; nameMapping: Map<string, string> } {
   const { contentType, ...parserOptions } = options
   const mergedOptions: ParserOptions = { ...DEFAULT_PARSER_OPTIONS, ...parserOptions }

package/src/resolvers.ts

@@ -7,7 +7,7 @@ import { matchesMimeType } from 'oas/utils'
 import { formatMap, structuralKeys } from './constants.ts'
 import { isReference } from './guards.ts'
 import { dereferenceWithRef, resolveRef } from './refs.ts'
-import type { contentType, Document, MediaTypeObject, Operation, ResponseObject, SchemaObject } from './types.ts'
+import type { ContentType, Document, MediaTypeObject, Operation, ResponseObject, SchemaObject } from './types.ts'
 
 /**
  * Resolves `{variable}` placeholders in an OpenAPI server URL.
@@ -76,7 +76,7 @@ export function getMediaType(contentType: string): MediaType | null {
 }
 
 export type OperationsOptions = {
-  contentType?: contentType
+  contentType?: ContentType
 }
 
 /**
@@ -231,7 +231,7 @@ export type SchemaWithMetadata = {
 }
 
 export type GetSchemasOptions = {
-  contentType?: contentType
+  contentType?: ContentType
 }
 
 export type GetSchemasResult = {
@@ -290,7 +290,7 @@ export function flattenSchema(schema: SchemaObject | null): SchemaObject | null
  * // SchemaObject | null
  * ```
  */
-export function extractSchemaFromContent(content: Record<string, unknown> | undefined, preferredContentType?: contentType): SchemaObject | null {
+export function extractSchemaFromContent(content: Record<string, unknown> | undefined, preferredContentType?: ContentType): SchemaObject | null {
   if (!content) return null
 
   const firstContentType = Object.keys(content)[0] ?? 'application/json'

package/src/types.ts

@@ -28,7 +28,7 @@ export type { OpenAPIV3, OpenAPIV3_1 } from 'openapi-types'
  * const ct: contentType = 'application/vnd.api+json'
  * ```
  */
-export type contentType = 'application/json' | (string & {})
+export type ContentType = 'application/json' | (string & {})
 
 /**
  * Augments `oas`'s `SchemaObject` with OAS 3.1 / JSON Schema fields the parser needs.
@@ -149,7 +149,7 @@ export type AdapterOasOptions = {
    * Preferred content-type used when extracting request/response schemas.
    * Defaults to the first valid JSON media type found in the spec.
    */
-  contentType?: contentType
+  contentType?: ContentType
   /**
    * Index into `oas.api.servers` for computing `baseURL`.
    * `0` → first server, `1` → second server. Omit to leave `baseURL` undefined.