@kubb/adapter-oas 5.0.0-alpha.7 → 5.0.0-alpha.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/adapter-oas",
-  "version": "5.0.0-alpha.7",
+  "version": "5.0.0-alpha.9",
   "description": "OpenAPI / Swagger adapter for Kubb — converts OAS input into a @kubb/ast RootNode.",
   "keywords": [
     "openapi",
@@ -46,8 +46,8 @@
     "openapi-types": "^12.1.3",
     "remeda": "^2.33.6",
     "swagger2openapi": "^7.0.8",
-    "@kubb/ast": "5.0.0-alpha.7",
-    "@kubb/core": "5.0.0-alpha.7"
+    "@kubb/ast": "5.0.0-alpha.9",
+    "@kubb/core": "5.0.0-alpha.9"
   },
   "devDependencies": {
     "@types/swagger2openapi": "^7.0.4",

package/src/adapter.ts

@@ -1,7 +1,7 @@
 import path from 'node:path'
 import { createRoot } from '@kubb/ast'
 import type { AdapterSource } from '@kubb/core'
-import { defineAdapter } from '@kubb/core'
+import { createAdapter } from '@kubb/core'
 import { resolveServerUrl } from './oas/resolveServerUrl.ts'
 import { parseFromConfig } from './oas/utils.ts'
 import { createOasParser } from './parser.ts'
@@ -28,7 +28,7 @@ export const adapterOasName = 'oas' satisfies OasAdapter['name']
  * })
  * ```
  */
-export const adapterOas = defineAdapter<OasAdapter>((options) => {
+export const adapterOas = createAdapter<OasAdapter>((options) => {
   const {
     validate = true,
     oasClass,

package/src/constants.ts

@@ -1,4 +1,4 @@
-import type { MediaType, SchemaType } from '@kubb/ast/types'
+import type { SchemaType } from '@kubb/ast/types'
 import type { HttpMethods as OASHttpMethods } from 'oas/types'
 
 // ─── Merge defaults ────────────────────────────────────────────────────────────
@@ -25,7 +25,7 @@ export const MERGE_DEFAULT_VERSION = '1.0.0' as const
  * A schema fragment containing any of these keys must not be inlined into its
  * parent during `allOf` flattening — it carries semantic meaning of its own.
  */
-export const structuralKeys = new Set<string>(['properties', 'items', 'additionalProperties', 'oneOf', 'anyOf', 'allOf', 'not'])
+export const structuralKeys = new Set(['properties', 'items', 'additionalProperties', 'oneOf', 'anyOf', 'allOf', 'not'] as const)
 
 /**
  * Maps OAS/JSON Schema `format` strings to their Kubb `SchemaType` equivalents.
@@ -59,9 +59,8 @@ export const formatMap = {
 
 /**
  * Exhaustive list of media types that Kubb recognizes.
- * Kept as a module-level constant to avoid re-allocating the array on every call.
  */
-export const knownMediaTypes = [
+export const knownMediaTypes = new Set([
   'application/json',
   'application/xml',
   'application/x-www-form-urlencoded',
@@ -81,7 +80,7 @@ export const knownMediaTypes = [
   'image/svg+xml',
   'audio/mpeg',
   'video/mp4',
-] as const satisfies ReadonlyArray<MediaType>
+] as const)
 
 /**
  * Vendor extension keys used to attach human-readable labels to enum values.
@@ -89,6 +88,11 @@ export const knownMediaTypes = [
  */
 export const enumExtensionKeys = ['x-enumNames', 'x-enum-varnames'] as const
 
+/**
+ * Scalar primitive schema types used for union member simplification.
+ */
+export const SCALAR_PRIMITIVE_TYPES = new Set(['string', 'number', 'integer', 'bigint', 'boolean'] as const)
+
 // ─── HTTP ──────────────────────────────────────────────────────────────────────
 
 /**

package/src/oas/Oas.ts

@@ -431,14 +431,15 @@ export class Oas extends BaseOas {
     return this.dereferenceWithRef(schema)
   }
 
-  getParametersSchema(operation: Operation, inKey: 'path' | 'query' | 'header'): SchemaObject | null {
-    const { contentType = operation.getContentType() } = this.#options
-
-    // Collect parameters from both operation-level and path-level, resolving $ref pointers.
-    // oas v31+ filters out $ref parameters in getParameters(), so we access raw parameters
-    // directly and resolve refs ourselves to preserve backward compatibility.
-    // Note: dereferenceWithRef preserves the $ref property on resolved objects, so we check
-    // for 'in' and 'name' fields to validate successful resolution instead of !isReference().
+  /**
+   * Returns all resolved parameters for an operation, merging path-level and operation-level
+   * parameters and deduplicating by `in:name` (operation-level takes precedence).
+   *
+   * oas v31+ filters out `$ref` parameters in `getParameters()`, so this method accesses the
+   * raw `operation.schema.parameters` and path-item parameters directly and resolves `$ref`
+   * pointers via `dereferenceWithRef` to preserve backward compatibility.
+   */
+  getParameters(operation: Operation): Array<ParameterObject> {
     const resolveParams = (params: unknown[]): Array<ParameterObject> =>
       params.map((p) => this.dereferenceWithRef(p)).filter((p): p is ParameterObject => !!p && typeof p === 'object' && 'in' in p && 'name' in p)
 
@@ -459,7 +460,13 @@ export class Oas extends BaseOas {
       }
     }
 
-    const params = Array.from(paramMap.values()).filter((v) => v.in === inKey)
+    return Array.from(paramMap.values())
+  }
+
+  getParametersSchema(operation: Operation, inKey: 'path' | 'query' | 'header'): SchemaObject | null {
+    const { contentType = operation.getContentType() } = this.#options
+
+    const params = this.getParameters(operation).filter((v) => v.in === inKey)
 
     if (!params.length) {
       return null

package/src/oas/utils.ts

@@ -183,7 +183,7 @@ export function flattenSchema(schema: SchemaObject | null): SchemaObject | null
   if (!schema?.allOf || schema.allOf.length === 0) return schema ?? null
   if (schema.allOf.some((item) => isRef(item))) return schema
 
-  const isPlainFragment = (item: SchemaObject) => !Object.keys(item).some((key) => structuralKeys.has(key))
+  const isPlainFragment = (item: SchemaObject) => !Object.keys(item).some((key) => structuralKeys.has(key as 'properties'))
   if (!schema.allOf.every((item) => isPlainFragment(item as SchemaObject))) return schema
 
   const merged: SchemaObject = { ...schema }

package/src/parser.ts

@@ -183,7 +183,7 @@ function getPrimitiveType(type: string | undefined): PrimitiveSchemaType {
  * Returns `undefined` for content types not present in `KNOWN_MEDIA_TYPES`.
  */
 function toMediaType(contentType: string): MediaType | undefined {
-  return knownMediaTypes.includes(contentType as MediaType) ? (contentType as MediaType) : undefined
+  return knownMediaTypes.has(contentType as MediaType) ? (contentType as MediaType) : undefined
 }
 
 /**
@@ -973,6 +973,7 @@ export function createOasParser(oas: Oas, { contentType, collisionDetection }: O
       in: param['in'] as ParameterLocation,
       schema: {
         ...schema,
+        description: (param['description'] as string | undefined) ?? schema.description,
         optional: !required || !!schema.optional ? true : undefined,
       },
       required,
@@ -984,11 +985,7 @@ export function createOasParser(oas: Oas, { contentType, collisionDetection }: O
    * request body, and all response codes into their AST node equivalents.
    */
   function parseOperation(options: Options, oas: Oas, operation: Operation): OperationNode {
-    const parameters: Array<ParameterNode> = operation.getParameters().map((param) => {
-      const dereferenced = oas.dereferenceWithRef(param) as unknown as Record<string, unknown>
-
-      return parseParameter(options, dereferenced)
-    })
+    const parameters: Array<ParameterNode> = oas.getParameters(operation).map((param) => parseParameter(options, param as unknown as Record<string, unknown>))
 
     const requestBodySchema = oas.getRequestSchema(operation)
     const requestBody = requestBodySchema ? convertSchema({ schema: requestBodySchema }, options) : undefined
@@ -997,7 +994,10 @@ export function createOasParser(oas: Oas, { contentType, collisionDetection }: O
       const responseObj = operation.getResponseByStatusCode(statusCode)
       const responseSchema = oas.getResponseSchema(operation, statusCode)
 
-      const schema = responseSchema && Object.keys(responseSchema).length > 0 ? convertSchema({ schema: responseSchema }, options) : undefined
+      const schema =
+        responseSchema && Object.keys(responseSchema).length > 0
+          ? convertSchema({ schema: responseSchema }, options)
+          : createSchema({ type: resolveTypeOption(options.emptySchemaType) })
 
       const description = typeof responseObj === 'object' && responseObj !== null && !Array.isArray(responseObj) ? responseObj.description : undefined
 

package/src/utils.ts

@@ -1,6 +1,7 @@
 import { collect, createProperty, createSchema, narrowSchema } from '@kubb/ast'
 import type { SchemaNode } from '@kubb/ast/types'
 import type { KubbFile } from '@kubb/fabric-core/types'
+import { SCALAR_PRIMITIVE_TYPES } from './constants.ts'
 
 /**
  * Extracts the schema name from a `$ref` string.
@@ -96,9 +97,13 @@ export function mergeAdjacentAnonymousObjects(members: Array<SchemaNode>): Array
  *
  * Only scalar primitives (`string`, `number`, `integer`, `bigint`, `boolean`) are
  * considered — object, array, and ref members are left untouched.
+ *
+ * Const-derived enums (those without an `enumType`, produced from an OpenAPI `const`
+ * keyword) are **never** removed — `'accepted' | string` must stay as-is because the
+ * literal is intentional.
  */
 export function simplifyUnionMembers(members: Array<SchemaNode>): Array<SchemaNode> {
-  const scalarPrimitives = new Set(members.filter((m) => ['string', 'number', 'integer', 'bigint', 'boolean'].includes(m.type)).map((m) => m.type as string))
+  const scalarPrimitives = new Set(members.filter((m) => SCALAR_PRIMITIVE_TYPES.has(m.type as 'string')).map((m) => m.type as string))
   if (!scalarPrimitives.size) return members
 
   return members.filter((m) => {
@@ -106,6 +111,8 @@ export function simplifyUnionMembers(members: Array<SchemaNode>): Array<SchemaNo
     const prim = m.primitive
     // Keep the enum if its primitive isn't fully subsumed.
     if (!prim) return true
+    // Const-derived enums have no `enumType`; keep them as intentional literals.
+    if (!m.enumType) return true
     // `number` subsumes `integer` literals and vice-versa for our purposes.
     if (scalarPrimitives.has(prim)) return false
     if ((prim === 'integer' || prim === 'number') && (scalarPrimitives.has('integer') || scalarPrimitives.has('number'))) return false