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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/adapter-oas",
-  "version": "5.0.0-beta.20",
+  "version": "5.0.0-beta.21",
   "description": "OpenAPI and Swagger adapter for Kubb. Parses and validates OAS 2.0/3.x specifications into a @kubb/ast RootNode for downstream code generation plugins.",
   "keywords": [
     "adapter",
@@ -47,7 +47,7 @@
     "oas": "^32.1.18",
     "oas-normalize": "^16.0.4",
     "swagger2openapi": "^7.0.8",
-    "@kubb/core": "5.0.0-beta.20"
+    "@kubb/core": "5.0.0-beta.21"
   },
   "devDependencies": {
     "@types/swagger2openapi": "^7.0.4",

package/src/adapter.ts

@@ -136,7 +136,7 @@ export const adapterOas = createAdapter<AdapterOas>((options) => {
         nameMapping,
         resolve: (schemaName) => {
           const result = resolve(schemaName)
-          if (!result) return
+          if (!result) return null
 
           return ast.createImport({ name: [result.name], path: result.path })
         },

package/src/discriminator.ts

@@ -44,8 +44,8 @@ export function buildDiscriminatorChildMap(schemas: ast.SchemaNode[]): Map<strin
       const intersectionNode = ast.narrowSchema(member, 'intersection')
       if (!intersectionNode?.members) continue
 
-      let refNode: SchemaNodeByType['ref'] | undefined
-      let objNode: SchemaNodeByType['object'] | undefined
+      let refNode: SchemaNodeByType['ref'] | null = null
+      let objNode: SchemaNodeByType['object'] | null = null
 
       for (const m of intersectionNode.members) {
         refNode ??= ast.narrowSchema(m, 'ref')
@@ -55,7 +55,7 @@ export function buildDiscriminatorChildMap(schemas: ast.SchemaNode[]): Map<strin
       if (!refNode?.name || !objNode) continue
 
       const prop = objNode.properties.find((p) => p.name === discriminatorPropertyName)
-      const enumNode = prop ? ast.narrowSchema(prop.schema, 'enum') : undefined
+      const enumNode = prop ? ast.narrowSchema(prop.schema, 'enum') : null
       if (!enumNode?.enumValues?.length) continue
 
       const enumValues = enumNode.enumValues.filter((v): v is string | number | boolean => v !== null)

package/src/parser.ts

@@ -111,7 +111,7 @@ export function createSchemaParser(ctx: OasParserContext) {
    * Memoizing by `$ref` path reduces the overall work from O(2^depth) to O(N)
    * where N is the number of unique schema names.
    */
-  const resolvedRefCache = new Map<string, ast.SchemaNode | undefined>()
+  const resolvedRefCache = new Map<string, ast.SchemaNode | null>()
 
   /**
    * Converts a `$ref` schema into a `RefSchemaNode`.
@@ -122,7 +122,7 @@ export function createSchemaParser(ctx: OasParserContext) {
    * Circular refs are detected via `resolvingRefs` and leave `schema` as `undefined`.
    */
   function convertRef({ schema, name, nullable, defaultValue, rawOptions }: SchemaContext): ast.SchemaNode {
-    let resolvedSchema: ast.SchemaNode | undefined
+    let resolvedSchema: ast.SchemaNode | null = null
     const refPath = schema.$ref
     if (refPath && !resolvingRefs.has(refPath)) {
       if (!resolvedRefCache.has(refPath)) {
@@ -138,7 +138,7 @@ export function createSchemaParser(ctx: OasParserContext) {
         }
         resolvedRefCache.set(refPath, resolvedSchema)
       }
-      resolvedSchema = resolvedRefCache.get(refPath)
+      resolvedSchema = resolvedRefCache.get(refPath) ?? null
     }
 
     return ast.createSchema({
@@ -646,7 +646,7 @@ export function createSchemaParser(ctx: OasParserContext) {
    */
   function convertArray({ schema, name, nullable, defaultValue, rawOptions, options }: SchemaContext): ast.SchemaNode {
     const rawItems = schema.items as SchemaObject | undefined
-    const itemName = rawItems?.enum?.length && name ? ast.enumPropName(undefined, name, options.enumSuffix) : undefined
+    const itemName = rawItems?.enum?.length && name ? ast.enumPropName(null, name, options.enumSuffix) : undefined
     const items = rawItems ? [parseSchema({ schema: rawItems, name: itemName }, rawOptions)] : []
 
     return ast.createSchema({
@@ -871,8 +871,8 @@ export function createSchemaParser(ctx: OasParserContext) {
    * Collects property names whose schema has a truthy boolean flag (`readOnly` or `writeOnly`).
    * `$ref` entries are skipped since their flags live on the dereferenced target.
    */
-  function collectPropertyKeysByFlag(schema: SchemaObject | null, flag: 'readOnly' | 'writeOnly'): string[] | undefined {
-    if (!schema?.properties) return undefined
+  function collectPropertyKeysByFlag(schema: SchemaObject | null, flag: 'readOnly' | 'writeOnly'): string[] | null {
+    if (!schema?.properties) return null
 
     const keys: string[] = []
     for (const key in schema.properties) {
@@ -881,7 +881,7 @@ export function createSchemaParser(ctx: OasParserContext) {
         keys.push(key)
       }
     }
-    return keys.length ? keys : undefined
+    return keys.length ? keys : null
   }
 
   /**

package/src/stream.ts

@@ -17,7 +17,7 @@ export type PreScanResult = {
  * Reads the server URL from the document's `servers` array at `serverIndex`,
  * interpolating any `serverVariables` into the URL template.
  *
- * Returns `undefined` when `serverIndex` is omitted or out of range.
+ * Returns `null` when `serverIndex` is omitted or out of range.
  *
  * @example Resolve the first server
  * `resolveBaseUrl({ document, serverIndex: 0 })`
@@ -33,9 +33,9 @@ export function resolveBaseUrl({
   document: Document
   serverIndex?: number
   serverVariables?: Record<string, string>
-}): string | undefined {
+}): string | null {
   const server = serverIndex !== undefined ? document.servers?.at(serverIndex) : undefined
-  return server?.url ? resolveServerUrl(server, serverVariables) : undefined
+  return server?.url ? resolveServerUrl(server, serverVariables) : null
 }
 
 /**