@kubb/oas 4.12.7 → 4.12.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/oas",
-  "version": "4.12.7",
+  "version": "4.12.9",
   "description": "OpenAPI Specification (OAS) utilities and helpers for Kubb, providing parsing, normalization, and manipulation of OpenAPI/Swagger schemas.",
   "keywords": [
     "openapi",
@@ -56,7 +56,7 @@
     }
   ],
   "dependencies": {
-    "@redocly/openapi-core": "^2.13.0",
+    "@redocly/openapi-core": "^2.14.0",
     "hotscript": "^1.0.13",
     "json-schema-to-ts": "^3.1.1",
     "jsonpointer": "^5.0.1",
@@ -66,7 +66,7 @@
     "remeda": "^2.32.0",
     "swagger2openapi": "^7.0.8",
     "ts-toolbelt": "^9.6.0",
-    "@kubb/core": "4.12.7"
+    "@kubb/core": "4.12.9"
   },
   "devDependencies": {
     "@stoplight/yaml": "^4.3.0",

package/src/Oas.ts

@@ -7,7 +7,7 @@ import OASNormalize from 'oas-normalize'
 import type { OpenAPIV3 } from 'openapi-types'
 import type { OasTypes } from './index.ts'
 import type { contentType } from './types.ts'
-import { isDiscriminator, isReference } from './utils.ts'
+import { isDiscriminator, isReference, STRUCTURAL_KEYS } from './utils.ts'
 
 type Options = {
   contentType?: contentType
@@ -445,4 +445,36 @@ export class Oas<const TOAS = unknown> extends BaseOas {
       },
     })
   }
+
+  flattenSchema(schema?: SchemaObject): SchemaObject | undefined {
+    if (!schema?.allOf || schema.allOf.length === 0) {
+      return schema
+    }
+
+    // Never touch ref-based or structural composition
+    if (schema.allOf.some((item) => isReference(item))) {
+      return schema
+    }
+
+    const isPlainFragment = (item: SchemaObject) => !Object.keys(item).some((key) => STRUCTURAL_KEYS.has(key))
+
+    // Only flatten keyword-only fragments
+    if (!schema.allOf.every((item) => isPlainFragment(item as SchemaObject))) {
+      return schema
+    }
+
+    const merged: SchemaObject = { ...schema }
+    delete merged.allOf
+
+    for (const fragment of schema.allOf as SchemaObject[]) {
+      for (const [key, value] of Object.entries(fragment)) {
+        if ((merged as any)[key] === undefined) {
+          ;(merged as any)[key] = value
+        }
+      }
+    }
+
+    // biome-ignore lint/suspicious/noAssignInExpressions: should not trigger this
+    return merged
+  }
 }

package/src/utils.spec.ts

@@ -1,6 +1,7 @@
 import path from 'node:path'
 import type { Config } from '@kubb/core'
 import yaml from '@stoplight/yaml'
+import { describe, expect, test } from 'vitest'
 import { merge, parse, parseFromConfig } from './utils.ts'
 
 describe('utils', () => {

package/src/utils.ts

@@ -11,6 +11,8 @@ import { isPlainObject, mergeDeep } from 'remeda'
 import swagger2openapi from 'swagger2openapi'
 import { Oas } from './Oas.ts'
 
+export const STRUCTURAL_KEYS = new Set(['properties', 'items', 'additionalProperties', 'oneOf', 'anyOf', 'allOf', 'not'])
+
 export function isOpenApiV2Document(doc: any): doc is OpenAPIV2.Document {
   return doc && isPlainObject(doc) && !('openapi' in doc)
 }