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

package/dist/index.cjs

@@ -21,45 +21,210 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 	enumerable: true
 }) : target, mod));
 //#endregion
-let node_path = require("node:path");
-node_path = __toESM(node_path);
 let _kubb_ast = require("@kubb/ast");
 let _kubb_core = require("@kubb/core");
+let node_path = require("node:path");
+node_path = __toESM(node_path);
 let _redocly_openapi_core = require("@redocly/openapi-core");
 let _stoplight_yaml = require("@stoplight/yaml");
 _stoplight_yaml = __toESM(_stoplight_yaml);
-let oas_types = require("oas/types");
 let oas_normalize = require("oas-normalize");
 oas_normalize = __toESM(oas_normalize);
 let remeda = require("remeda");
 let swagger2openapi = require("swagger2openapi");
 swagger2openapi = __toESM(swagger2openapi);
-let jsonpointer = require("jsonpointer");
-jsonpointer = __toESM(jsonpointer);
 let oas = require("oas");
 oas = __toESM(oas);
+let jsonpointer = require("jsonpointer");
+jsonpointer = __toESM(jsonpointer);
+let oas_types = require("oas/types");
 let oas_utils = require("oas/utils");
-//#region src/oas/resolveServerUrl.ts
+//#region src/constants.ts
 /**
-* Resolves an OpenAPI server URL by substituting `{variable}` placeholders.
+* Default parser options applied when no explicit options are provided.
 *
-* Resolution priority per variable:
-* 1. `overrides[key]` — caller-supplied value.
-* 2. `variable.default` — spec-defined default, coerced to `string`.
-* 3. Variable is left unreplaced when neither is available.
+* @example
+* ```ts
+* import { DEFAULT_PARSER_OPTIONS } from '@kubb/adapter-oas'
 *
-* Throws when an `overrides` value is not present in the variable's `enum` list.
+* const parser = createOasParser(oas)
+* const root = parser.parse({ ...DEFAULT_PARSER_OPTIONS, dateType: 'date' })
+* ```
 */
-function resolveServerUrl(server, overrides) {
-	if (!server.variables) return server.url;
-	let url = server.url;
-	for (const [key, variable] of Object.entries(server.variables)) {
-		const value = overrides?.[key] ?? (variable.default != null ? String(variable.default) : void 0);
-		if (value === void 0) continue;
-		if (variable.enum?.length && !variable.enum.some((e) => String(e) === value)) throw new Error(`Invalid server variable value '${value}' for '${key}' when resolving ${server.url}. Valid values are: ${variable.enum.join(", ")}.`);
-		url = url.replaceAll(`{${key}}`, value);
+const DEFAULT_PARSER_OPTIONS = {
+	dateType: "string",
+	integerType: "number",
+	unknownType: "any",
+	emptySchemaType: "any",
+	enumSuffix: "enum"
+};
+/**
+* OpenAPI version string written into the stub document created during multi-spec merges.
+*/
+const MERGE_OPENAPI_VERSION = "3.0.0";
+/**
+* Fallback `info.title` placed in the stub document when merging multiple API files.
+*/
+const MERGE_DEFAULT_TITLE = "Merged API";
+/**
+* Fallback `info.version` placed in the stub document when merging multiple API files.
+*/
+const MERGE_DEFAULT_VERSION = "1.0.0";
+/**
+* Set of JSON Schema keywords that prevent a schema fragment from being inlined during `allOf` flattening.
+*
+* A fragment that contains any of these keys carries structural meaning of its own and must stay as a separate
+* intersection member rather than being merged into the parent.
+*
+* @example
+* ```ts
+* import { structuralKeys } from '@kubb/adapter-oas'
+*
+* const isStructural = Object.keys(fragment).some((key) => structuralKeys.has(key))
+* // true when fragment has e.g. 'properties' or 'oneOf'
+* ```
+*/
+const structuralKeys = new Set([
+	"properties",
+	"items",
+	"additionalProperties",
+	"oneOf",
+	"anyOf",
+	"allOf",
+	"not"
+]);
+/**
+* Static map from OAS `format` strings to Kubb `SchemaType` values.
+*
+* Only formats whose AST type differs from the OAS `type` field appear here.
+* Formats that depend on runtime options (`int64`, `date-time`, `date`, `time`) are handled separately
+* in the parser. `ipv4`, `ipv6`, and `hostname` map to `'url'` as the closest supported scalar.
+*
+* @example
+* ```ts
+* import { formatMap } from '@kubb/adapter-oas'
+*
+* formatMap['uuid']   // 'uuid'
+* formatMap['binary'] // 'blob'
+* formatMap['float']  // 'number'
+* ```
+*/
+const formatMap = {
+	uuid: "uuid",
+	email: "email",
+	"idn-email": "email",
+	uri: "url",
+	"uri-reference": "url",
+	url: "url",
+	ipv4: "url",
+	ipv6: "url",
+	hostname: "url",
+	"idn-hostname": "url",
+	binary: "blob",
+	byte: "blob",
+	int32: "integer",
+	float: "number",
+	double: "number"
+};
+/**
+* Vendor extension keys that attach human-readable labels to enum values, checked in priority order.
+*
+* @example
+* ```ts
+* import { enumExtensionKeys } from '@kubb/adapter-oas'
+*
+* const key = enumExtensionKeys.find((k) => k in schema) // 'x-enumNames' | 'x-enum-varnames' | undefined
+* ```
+*/
+const enumExtensionKeys = ["x-enumNames", "x-enum-varnames"];
+/**
+* Maps `'any' | 'unknown' | 'void'` option strings to their `ScalarSchemaType` constant.
+* Replaces a plain object lookup with a `Map` for explicit key membership testing via `.has()`.
+*/
+const typeOptionMap = new Map([
+	["any", _kubb_ast.schemaTypes.any],
+	["unknown", _kubb_ast.schemaTypes.unknown],
+	["void", _kubb_ast.schemaTypes.void]
+]);
+//#endregion
+//#region src/discriminator.ts
+/**
+* Injects discriminator enum values into child schemas so they know which value identifies them.
+*
+* Finds every union schema in `root.schemas` that has a `discriminatorPropertyName`, collects the
+* enum value each union member is mapped to, then adds (or replaces) that property on the matching
+* child object schema.
+*
+* Returns a new `RootNode` — the original is never mutated.
+*
+* @example
+* ```ts
+* const { root } = parseOas(document, options)
+* const next = applyDiscriminatorInheritance(root)
+* ```
+*/
+function applyDiscriminatorInheritance(root) {
+	const childMap = /* @__PURE__ */ new Map();
+	for (const schema of root.schemas) {
+		let unionNode = (0, _kubb_ast.narrowSchema)(schema, "union");
+		if (!unionNode) {
+			const intersectionMembers = (0, _kubb_ast.narrowSchema)(schema, "intersection")?.members;
+			if (intersectionMembers) for (const m of intersectionMembers) {
+				const u = (0, _kubb_ast.narrowSchema)(m, "union");
+				if (u) {
+					unionNode = u;
+					break;
+				}
+			}
+		}
+		if (!unionNode?.discriminatorPropertyName || !unionNode.members) continue;
+		const { discriminatorPropertyName, members } = unionNode;
+		for (const member of members) {
+			const intersectionNode = (0, _kubb_ast.narrowSchema)(member, "intersection");
+			if (!intersectionNode?.members) continue;
+			let refNode;
+			let objNode;
+			for (const m of intersectionNode.members) {
+				refNode ??= (0, _kubb_ast.narrowSchema)(m, "ref");
+				objNode ??= (0, _kubb_ast.narrowSchema)(m, "object");
+			}
+			if (!refNode?.name || !objNode) continue;
+			const prop = objNode.properties.find((p) => p.name === discriminatorPropertyName);
+			const enumNode = prop ? (0, _kubb_ast.narrowSchema)(prop.schema, "enum") : void 0;
+			if (!enumNode?.enumValues?.length) continue;
+			const enumValues = enumNode.enumValues.filter((v) => v !== null);
+			if (!enumValues.length) continue;
+			const existing = childMap.get(refNode.name);
+			if (existing) existing.enumValues.push(...enumValues);
+			else childMap.set(refNode.name, {
+				propertyName: discriminatorPropertyName,
+				enumValues: [...enumValues]
+			});
+		}
 	}
-	return url;
+	if (childMap.size === 0) return root;
+	return (0, _kubb_ast.transform)(root, { schema(node, { parent }) {
+		if (parent?.kind !== "Root" || !node.name) return;
+		const entry = childMap.get(node.name);
+		if (!entry) return;
+		const objectNode = (0, _kubb_ast.narrowSchema)(node, "object");
+		if (!objectNode) return;
+		const { propertyName, enumValues } = entry;
+		const newProp = (0, _kubb_ast.createProperty)({
+			name: propertyName,
+			required: true,
+			schema: (0, _kubb_ast.createSchema)({
+				type: "enum",
+				enumValues
+			})
+		});
+		const existingIdx = objectNode.properties.findIndex((p) => p.name === propertyName);
+		const newProperties = existingIdx >= 0 ? objectNode.properties.map((p, i) => i === existingIdx ? newProp : p) : [...objectNode.properties, newProp];
+		return {
+			...objectNode,
+			properties: newProperties
+		};
+	} });
 }
 //#endregion
 //#region ../../internals/utils/src/casing.ts
@@ -81,9 +246,12 @@ function toCamelOrPascal(text, pascal) {
 * Splits `text` on `.` and applies `transformPart` to each segment.
 * The last segment receives `isLast = true`, all earlier segments receive `false`.
 * Segments are joined with `/` to form a file path.
+*
+* Only splits on dots followed by a letter so that version numbers
+* embedded in operationIds (e.g. `v2025.0`) are kept intact.
 */
 function applyToFileParts(text, transformPart) {
-	const parts = text.split(".");
+	const parts = text.split(/\.(?=[a-zA-Z])/);
 	return parts.map((part, i) => transformPart(part, i === parts.length - 1)).join("/");
 }
 /**
@@ -120,6 +288,13 @@ function pascalCase(text, { isFile, prefix = "", suffix = "" } = {}) {
 //#region ../../internals/utils/src/reserved.ts
 /**
 * Returns `true` when `name` is a syntactically valid JavaScript variable name.
+*
+* @example
+* ```ts
+* isValidVarName('status')  // true
+* isValidVarName('class')   // false (reserved word)
+* isValidVarName('42foo')   // false (starts with digit)
+* ```
 */
 function isValidVarName(name) {
 	try {
@@ -140,18 +315,33 @@ function isValidVarName(name) {
 * p.template // '`/pet/${petId}`'
 */
 var URLPath = class {
-	/** The raw OpenAPI/Swagger path string, e.g. `/pet/{petId}`. */
+	/**
+	* The raw OpenAPI/Swagger path string, e.g. `/pet/{petId}`.
+	*/
 	path;
 	#options;
 	constructor(path, options = {}) {
 		this.path = path;
 		this.#options = options;
 	}
-	/** Converts the OpenAPI path to Express-style colon syntax, e.g. `/pet/{petId}` → `/pet/:petId`. */
+	/** Converts the OpenAPI path to Express-style colon syntax, e.g. `/pet/{petId}` → `/pet/:petId`.
+	*
+	* @example
+	* ```ts
+	* new URLPath('/pet/{petId}').URL // '/pet/:petId'
+	* ```
+	*/
 	get URL() {
 		return this.toURLPath();
 	}
-	/** Returns `true` when `path` is a fully-qualified URL (e.g. starts with `https://`). */
+	/** Returns `true` when `path` is a fully-qualified URL (e.g. starts with `https://`).
+	*
+	* @example
+	* ```ts
+	* new URLPath('https://petstore.swagger.io/v2/pet').isURL // true
+	* new URLPath('/pet/{petId}').isURL                       // false
+	* ```
+	*/
 	get isURL() {
 		try {
 			return !!new URL(this.path).href;
@@ -169,11 +359,25 @@ var URLPath = class {
 	get template() {
 		return this.toTemplateString();
 	}
-	/** Returns the path and its extracted params as a structured `URLObject`, or as a stringified expression when `stringify` is set. */
+	/** Returns the path and its extracted params as a structured `URLObject`, or as a stringified expression when `stringify` is set.
+	*
+	* @example
+	* ```ts
+	* new URLPath('/pet/{petId}').object
+	* // { url: '/pet/:petId', params: { petId: 'petId' } }
+	* ```
+	*/
 	get object() {
 		return this.toObject();
 	}
-	/** Returns a map of path parameter names, or `undefined` when the path has no parameters. */
+	/** Returns a map of path parameter names, or `undefined` when the path has no parameters.
+	*
+	* @example
+	* ```ts
+	* new URLPath('/pet/{petId}').params // { petId: 'petId' }
+	* new URLPath('/pet').params         // undefined
+	* ```
+	*/
 	get params() {
 		return this.getParams();
 	}
@@ -181,7 +385,9 @@ var URLPath = class {
 		const param = isValidVarName(raw) ? raw : camelCase(raw);
 		return this.#options.casing === "camelcase" ? camelCase(param) : param;
 	}
-	/** Iterates over every `{param}` token in `path`, calling `fn` with the raw token and transformed name. */
+	/**
+	* Iterates over every `{param}` token in `path`, calling `fn` with the raw token and transformed name.
+	*/
 	#eachParam(fn) {
 		for (const match of this.path.matchAll(/\{([^}]+)\}/g)) {
 			const raw = match[1];
@@ -218,6 +424,12 @@ var URLPath = class {
 	* Extracts all `{param}` segments from the path and returns them as a key-value map.
 	* An optional `replacer` transforms each parameter name in both key and value positions.
 	* Returns `undefined` when no path parameters are found.
+	*
+	* @example
+	* ```ts
+	* new URLPath('/pet/{petId}/tag/{tagId}').getParams()
+	* // { petId: 'petId', tagId: 'tagId' }
+	* ```
 	*/
 	getParams(replacer) {
 		const params = {};
@@ -227,439 +439,28 @@ var URLPath = class {
 		});
 		return Object.keys(params).length > 0 ? params : void 0;
 	}
-	/** Converts the OpenAPI path to Express-style colon syntax, e.g. `/pet/{petId}` → `/pet/:petId`. */
+	/** Converts the OpenAPI path to Express-style colon syntax.
+	*
+	* @example
+	* ```ts
+	* new URLPath('/pet/{petId}').toURLPath() // '/pet/:petId'
+	* ```
+	*/
 	toURLPath() {
 		return this.path.replace(/\{([^}]+)\}/g, ":$1");
 	}
 };
 //#endregion
-//#region src/constants.ts
-/**
-* OpenAPI version string written into merged document stubs.
-*/
-const MERGE_OPENAPI_VERSION = "3.0.0";
-/**
-* Fallback `info.title` used when merging multiple API documents.
-*/
-const MERGE_DEFAULT_TITLE = "Merged API";
+//#region src/guards.ts
 /**
-* Fallback `info.version` used when merging multiple API documents.
-*/
-const MERGE_DEFAULT_VERSION = "1.0.0";
-/**
-* JSON Schema keywords that indicate structural composition.
-* 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.
-*/
-const structuralKeys = new Set([
-	"properties",
-	"items",
-	"additionalProperties",
-	"oneOf",
-	"anyOf",
-	"allOf",
-	"not"
-]);
-/**
-* Maps OAS/JSON Schema `format` strings to their Kubb `SchemaType` equivalents.
-*
-* Only formats that need a type different from the raw OAS `type` are listed.
-* `int64`, `date-time`, `date`, and `time` are handled separately because their
-* mapping depends on runtime parser options.
+* Returns `true` when `doc` is a Swagger 2.0 document (no `openapi` key).
 *
-* Note: `ipv4`, `ipv6`, and `hostname` map to `'url'` — the closest supported
-* scalar type in the Kubb AST, even though these are not strictly URLs.
-*/
-const formatMap = {
-	uuid: "uuid",
-	email: "email",
-	"idn-email": "email",
-	uri: "url",
-	"uri-reference": "url",
-	url: "url",
-	ipv4: "url",
-	ipv6: "url",
-	hostname: "url",
-	"idn-hostname": "url",
-	binary: "blob",
-	byte: "blob",
-	int32: "integer",
-	float: "number",
-	double: "number"
-};
-/**
-* Exhaustive list of media types that Kubb recognizes.
-* Kept as a module-level constant to avoid re-allocating the array on every call.
-*/
-const knownMediaTypes = [
-	"application/json",
-	"application/xml",
-	"application/x-www-form-urlencoded",
-	"application/octet-stream",
-	"application/pdf",
-	"application/zip",
-	"application/graphql",
-	"multipart/form-data",
-	"text/plain",
-	"text/html",
-	"text/csv",
-	"text/xml",
-	"image/png",
-	"image/jpeg",
-	"image/gif",
-	"image/webp",
-	"image/svg+xml",
-	"audio/mpeg",
-	"video/mp4"
-];
-/**
-* Vendor extension keys used to attach human-readable labels to enum values.
-* Checked in priority order: the first key found wins.
-*/
-const enumExtensionKeys = ["x-enumNames", "x-enum-varnames"];
-//#endregion
-//#region src/oas/Oas.ts
-/**
-* Prefix used to create synthetic `$ref` values for anonymous (inline) discriminator schemas.
-* The suffix is the schema index within the discriminator's `oneOf`/`anyOf` array.
-* @example `#kubb-inline-0`
-*/
-const KUBB_INLINE_REF_PREFIX = "#kubb-inline-";
-var Oas = class extends oas.default {
-	#options = { discriminator: "strict" };
-	document;
-	constructor(document) {
-		super(document, void 0);
-		this.document = document;
-	}
-	setOptions(options) {
-		this.#options = {
-			...this.#options,
-			...options
-		};
-		if (this.#options.discriminator === "inherit") this.#applyDiscriminatorInheritance();
-	}
-	get options() {
-		return this.#options;
-	}
-	get($ref) {
-		const origRef = $ref;
-		$ref = $ref.trim();
-		if ($ref === "") return null;
-		if ($ref.startsWith("#")) $ref = globalThis.decodeURIComponent($ref.substring(1));
-		else return null;
-		const current = jsonpointer.default.get(this.api, $ref);
-		if (!current) throw new Error(`Could not find a definition for ${origRef}.`);
-		return current;
-	}
-	getKey($ref) {
-		const key = $ref.split("/").pop();
-		return key === "" ? void 0 : key;
-	}
-	set($ref, value) {
-		$ref = $ref.trim();
-		if ($ref === "") return false;
-		if ($ref.startsWith("#")) {
-			$ref = globalThis.decodeURIComponent($ref.substring(1));
-			jsonpointer.default.set(this.api, $ref, value);
-		}
-	}
-	#setDiscriminator(schema) {
-		const { mapping = {}, propertyName } = schema.discriminator;
-		if (this.#options.discriminator === "inherit") Object.entries(mapping).forEach(([mappingKey, mappingValue]) => {
-			if (mappingValue) {
-				const childSchema = this.get(mappingValue);
-				if (!childSchema) return;
-				if (!childSchema.properties) childSchema.properties = {};
-				const property = childSchema.properties[propertyName];
-				if (childSchema.properties) {
-					childSchema.properties[propertyName] = {
-						...childSchema.properties ? childSchema.properties[propertyName] : {},
-						enum: [...property?.enum?.filter((value) => value !== mappingKey) ?? [], mappingKey]
-					};
-					childSchema.required = typeof childSchema.required === "boolean" ? childSchema.required : [...new Set([...childSchema.required ?? [], propertyName])];
-					this.set(mappingValue, childSchema);
-				}
-			}
-		});
-	}
-	getDiscriminator(schema) {
-		if (!isDiscriminator(schema) || !schema) return null;
-		const { mapping = {}, propertyName } = schema.discriminator;
-		/**
-		* Helper to extract discriminator value from a schema.
-		* Checks in order:
-		* 1. Extension property matching propertyName (e.g., x-linode-ref-name)
-		* 2. Property with const value
-		* 3. Property with single enum value
-		* 4. Title as fallback
-		*/
-		const getDiscriminatorValue = (schema) => {
-			if (!schema) return null;
-			if (propertyName.startsWith("x-")) {
-				const extensionValue = schema[propertyName];
-				if (extensionValue && typeof extensionValue === "string") return extensionValue;
-			}
-			const propertySchema = schema.properties?.[propertyName];
-			if (propertySchema && "const" in propertySchema && propertySchema.const !== void 0) return String(propertySchema.const);
-			if (propertySchema && propertySchema.enum?.length === 1) return String(propertySchema.enum[0]);
-			return schema.title || null;
-		};
-		/**
-		* Process oneOf/anyOf items to build mapping.
-		* Handles both $ref and inline schemas.
-		*/
-		const processSchemas = (schemas, existingMapping) => {
-			schemas.forEach((schemaItem, index) => {
-				if (isReference(schemaItem)) {
-					const key = this.getKey(schemaItem.$ref);
-					try {
-						const discriminatorValue = getDiscriminatorValue(this.get(schemaItem.$ref));
-						const canAdd = key && !Object.values(existingMapping).includes(schemaItem.$ref);
-						if (canAdd && discriminatorValue) existingMapping[discriminatorValue] = schemaItem.$ref;
-						else if (canAdd) existingMapping[key] = schemaItem.$ref;
-					} catch (_error) {
-						if (key && !Object.values(existingMapping).includes(schemaItem.$ref)) existingMapping[key] = schemaItem.$ref;
-					}
-				} else {
-					const discriminatorValue = getDiscriminatorValue(schemaItem);
-					if (discriminatorValue) existingMapping[discriminatorValue] = `${KUBB_INLINE_REF_PREFIX}${index}`;
-				}
-			});
-		};
-		if (schema.oneOf) processSchemas(schema.oneOf, mapping);
-		if (schema.anyOf) processSchemas(schema.anyOf, mapping);
-		return {
-			...schema.discriminator,
-			mapping
-		};
-	}
-	dereferenceWithRef(schema) {
-		if (isReference(schema)) return {
-			...schema,
-			...this.get(schema.$ref),
-			$ref: schema.$ref
-		};
-		return schema;
-	}
-	#applyDiscriminatorInheritance() {
-		const components = this.api.components;
-		if (!components?.schemas) return;
-		const visited = /* @__PURE__ */ new WeakSet();
-		const enqueue = (value) => {
-			if (!value) return;
-			if (Array.isArray(value)) {
-				for (const item of value) enqueue(item);
-				return;
-			}
-			if (typeof value === "object") visit(value);
-		};
-		const visit = (schema) => {
-			if (!schema || typeof schema !== "object") return;
-			if (isReference(schema)) {
-				visit(this.get(schema.$ref));
-				return;
-			}
-			const schemaObject = schema;
-			if (visited.has(schemaObject)) return;
-			visited.add(schemaObject);
-			if (isDiscriminator(schemaObject)) this.#setDiscriminator(schemaObject);
-			if ("allOf" in schemaObject) enqueue(schemaObject.allOf);
-			if ("oneOf" in schemaObject) enqueue(schemaObject.oneOf);
-			if ("anyOf" in schemaObject) enqueue(schemaObject.anyOf);
-			if ("not" in schemaObject) enqueue(schemaObject.not);
-			if ("items" in schemaObject) enqueue(schemaObject.items);
-			if ("prefixItems" in schemaObject) enqueue(schemaObject.prefixItems);
-			if (schemaObject.properties) enqueue(Object.values(schemaObject.properties));
-			if (schemaObject.additionalProperties && typeof schemaObject.additionalProperties === "object") enqueue(schemaObject.additionalProperties);
-		};
-		for (const schema of Object.values(components.schemas)) visit(schema);
-	}
-	/**
-	* Oas does not have a getResponseBody(contentType)
-	*/
-	#getResponseBodyFactory(responseBody) {
-		function hasResponseBody(res = responseBody) {
-			return !!res;
-		}
-		return (contentType) => {
-			if (!hasResponseBody(responseBody)) return false;
-			if (isReference(responseBody)) return false;
-			if (!responseBody.content) return false;
-			if (contentType) {
-				if (!(contentType in responseBody.content)) return false;
-				return responseBody.content[contentType];
-			}
-			let availableContentType;
-			const contentTypes = Object.keys(responseBody.content);
-			contentTypes.forEach((mt) => {
-				if (!availableContentType && oas_utils.matchesMimeType.json(mt)) availableContentType = mt;
-			});
-			if (!availableContentType) contentTypes.forEach((mt) => {
-				if (!availableContentType) availableContentType = mt;
-			});
-			if (availableContentType) return [
-				availableContentType,
-				responseBody.content[availableContentType],
-				...responseBody.description ? [responseBody.description] : []
-			];
-			return false;
-		};
-	}
-	getResponseSchema(operation, statusCode) {
-		if (operation.schema.responses) Object.keys(operation.schema.responses).forEach((key) => {
-			const schema = operation.schema.responses[key];
-			const $ref = isReference(schema) ? schema.$ref : void 0;
-			if (schema && $ref) operation.schema.responses[key] = this.get($ref);
-		});
-		const getResponseBody = this.#getResponseBodyFactory(operation.getResponseByStatusCode(statusCode));
-		const { contentType } = this.#options;
-		const responseBody = getResponseBody(contentType);
-		if (responseBody === false) return {};
-		const schema = Array.isArray(responseBody) ? responseBody[1].schema : responseBody.schema;
-		if (!schema) return {};
-		return this.dereferenceWithRef(schema);
-	}
-	getRequestSchema(operation) {
-		const { contentType } = this.#options;
-		if (operation.schema.requestBody) operation.schema.requestBody = this.dereferenceWithRef(operation.schema.requestBody);
-		const requestBody = operation.getRequestBody(contentType);
-		if (requestBody === false) return;
-		const schema = Array.isArray(requestBody) ? requestBody[1].schema : requestBody.schema;
-		if (!schema) return;
-		return this.dereferenceWithRef(schema);
-	}
-	getParametersSchema(operation, inKey) {
-		const { contentType = operation.getContentType() } = this.#options;
-		const resolveParams = (params) => params.map((p) => this.dereferenceWithRef(p)).filter((p) => !!p && typeof p === "object" && "in" in p && "name" in p);
-		const operationParams = resolveParams(operation.schema?.parameters || []);
-		const pathItem = this.api?.paths?.[operation.path];
-		const pathLevelParams = resolveParams(pathItem && !isReference(pathItem) && pathItem.parameters ? pathItem.parameters : []);
-		const paramMap = /* @__PURE__ */ new Map();
-		for (const p of pathLevelParams) if (p.name && p.in) paramMap.set(`${p.in}:${p.name}`, p);
-		for (const p of operationParams) if (p.name && p.in) paramMap.set(`${p.in}:${p.name}`, p);
-		const params = Array.from(paramMap.values()).filter((v) => v.in === inKey);
-		if (!params.length) return null;
-		return params.reduce((schema, pathParameters) => {
-			const property = pathParameters.content?.[contentType]?.schema ?? pathParameters.schema;
-			const required = typeof schema.required === "boolean" ? schema.required : [...schema.required || [], pathParameters.required ? pathParameters.name : void 0].filter(Boolean);
-			const getDefaultStyle = (location) => {
-				if (location === "query") return "form";
-				if (location === "path") return "simple";
-				return "simple";
-			};
-			const style = pathParameters.style || getDefaultStyle(inKey);
-			const explode = pathParameters.explode !== void 0 ? pathParameters.explode : style === "form";
-			if (inKey === "query" && style === "form" && explode === true && property?.type === "object" && property?.additionalProperties && !property?.properties) return {
-				...schema,
-				description: pathParameters.description || schema.description,
-				deprecated: schema.deprecated,
-				example: property.example || schema.example,
-				additionalProperties: property.additionalProperties
-			};
-			return {
-				...schema,
-				description: schema.description,
-				deprecated: schema.deprecated,
-				example: schema.example,
-				required,
-				properties: {
-					...schema.properties,
-					[pathParameters.name]: {
-						description: pathParameters.description,
-						...property
-					}
-				}
-			};
-		}, {
-			type: "object",
-			required: [],
-			properties: {}
-		});
-	}
-	async validate() {
-		return validate(this.api);
-	}
-	flattenSchema(schema) {
-		return flattenSchema(schema);
-	}
-	/**
-	* Get schemas from OpenAPI components (schemas, responses, requestBodies).
-	* Returns schemas in dependency order along with name mapping for collision resolution.
-	*/
-	getSchemas(options = {}) {
-		const contentType = options.contentType ?? this.#options.contentType;
-		const includes = options.includes ?? [
-			"schemas",
-			"requestBodies",
-			"responses"
-		];
-		const shouldResolveCollisions = options.collisionDetection ?? this.#options.collisionDetection ?? false;
-		const components = this.getDefinition().components;
-		const schemasWithMeta = [];
-		if (includes.includes("schemas")) {
-			const componentSchemas = components?.schemas || {};
-			for (const [name, schemaObject] of Object.entries(componentSchemas)) {
-				let schema = schemaObject;
-				if (isReference(schemaObject)) {
-					const resolved = this.get(schemaObject.$ref);
-					if (resolved && !isReference(resolved)) schema = resolved;
-				}
-				schemasWithMeta.push({
-					schema,
-					source: "schemas",
-					originalName: name
-				});
-			}
-		}
-		if (includes.includes("responses")) {
-			const responses = components?.responses || {};
-			for (const [name, response] of Object.entries(responses)) {
-				const schema = extractSchemaFromContent(response.content, contentType);
-				if (schema) {
-					let resolvedSchema = schema;
-					if (isReference(schema)) {
-						const resolved = this.get(schema.$ref);
-						if (resolved && !isReference(resolved)) resolvedSchema = resolved;
-					}
-					schemasWithMeta.push({
-						schema: resolvedSchema,
-						source: "responses",
-						originalName: name
-					});
-				}
-			}
-		}
-		if (includes.includes("requestBodies")) {
-			const requestBodies = components?.requestBodies || {};
-			for (const [name, request] of Object.entries(requestBodies)) {
-				const schema = extractSchemaFromContent(request.content, contentType);
-				if (schema) {
-					let resolvedSchema = schema;
-					if (isReference(schema)) {
-						const resolved = this.get(schema.$ref);
-						if (resolved && !isReference(resolved)) resolvedSchema = resolved;
-					}
-					schemasWithMeta.push({
-						schema: resolvedSchema,
-						source: "requestBodies",
-						originalName: name
-					});
-				}
-			}
-		}
-		const { schemas, nameMapping } = shouldResolveCollisions ? resolveCollisions(schemasWithMeta) : legacyResolve(schemasWithMeta);
-		return {
-			schemas: sortSchemas(schemas),
-			nameMapping
-		};
-	}
-};
-//#endregion
-//#region src/oas/utils.ts
-/**
-* Narrows `doc` to a Swagger 2.0 document.
-* Swagger 2.0 documents do not have an `openapi` version key.
+* @example
+* ```ts
+* if (isOpenApiV2Document(doc)) {
+*   // doc is OpenAPIV2.Document
+* }
+* ```
 */
 function isOpenApiV2Document(doc) {
 	return !!doc && (0, remeda.isPlainObject)(doc) && !("openapi" in doc);
@@ -667,9 +468,15 @@ function isOpenApiV2Document(doc) {
 /**
 * Returns `true` when a schema should be treated as nullable.
 *
-* Covers three nullable signals across OAS versions:
-* - OAS 3.0: `nullable: true` or the vendor extension `x-nullable: true`.
-* - OAS 3.1 / JSON Schema: `type: 'null'` or `type: ['null', ...]` (multi-type array).
+* Recognizes all nullable signals across OAS versions: `nullable: true` (OAS 3.0),
+* `x-nullable: true` (vendor extension), `type: 'null'`, and `type: ['null', ...]` (OAS 3.1).
+*
+* @example
+* ```ts
+* isNullable({ type: 'string', nullable: true }) // true
+* isNullable({ type: ['string', 'null'] })       // true
+* isNullable({ type: 'string' })                 // false
+* ```
 */
 function isNullable(schema) {
 	if ((schema?.nullable ?? schema?.["x-nullable"]) === true) return true;
@@ -679,34 +486,51 @@ function isNullable(schema) {
 	return false;
 }
 /**
-* Narrows `obj` to an OpenAPI `$ref` pointer object.
-* Delegates to the `oas` package's own `isRef` helper.
+* Returns `true` when `obj` is an OpenAPI `$ref` pointer object.
+*
+* @example
+* ```ts
+* isReference({ $ref: '#/components/schemas/Pet' }) // true
+* isReference({ type: 'string' })                   // false
+* ```
 */
 function isReference(obj) {
-	return !!obj && (0, oas_types.isRef)(obj);
+	return !!obj && typeof obj === "object" && "$ref" in obj;
 }
 /**
-* Returns `true` when `obj` is a schema that carries a structured OAS 3.x `discriminator`
-* object — as opposed to a plain-string discriminator found in some Swagger 2 specs.
+* Returns `true` when `obj` is a schema with a structured OAS 3.x `discriminator` object.
+*
+* @example
+* ```ts
+* isDiscriminator({ discriminator: { propertyName: 'type', mapping: {} } }) // true
+* isDiscriminator({ discriminator: 'type' })                                 // false (Swagger 2 string form)
+* ```
 */
 function isDiscriminator(obj) {
 	const record = obj;
 	return !!obj && !!record["discriminator"] && typeof record["discriminator"] !== "string";
 }
+//#endregion
+//#region src/factory.ts
 /**
-* Loads, dereferences, and wraps a raw OpenAPI document into an `Oas` instance.
+* Loads and dereferences an OpenAPI document, returning the raw `Document`.
+*
+* Accepts a file path string or an already-parsed document object. File paths are bundled via
+* Redocly to resolve external `$ref`s. Swagger 2.0 documents are automatically up-converted
+* to OpenAPI 3.0 via `swagger2openapi`.
 *
-* When given a file path string with `canBundle: true` (the default), Redocly's
-* bundler resolves all external `$ref`s first. Swagger 2.0 documents are
-* automatically up-converted to OpenAPI 3.0 via `swagger2openapi`.
+* @example
+* ```ts
+* const document = await parseDocument('./openapi.yaml')
+* const document = await parse(rawDocumentObject, { canBundle: false })
+* ```
 */
-async function parse(pathOrApi, { oasClass = Oas, canBundle = true, enablePaths = true } = {}) {
-	if (typeof pathOrApi === "string" && canBundle) return parse((await (0, _redocly_openapi_core.bundle)({
+async function parseDocument(pathOrApi, { canBundle = true, enablePaths = true } = {}) {
+	if (typeof pathOrApi === "string" && canBundle) return parseDocument((await (0, _redocly_openapi_core.bundle)({
 		ref: pathOrApi,
 		config: await (0, _redocly_openapi_core.loadConfig)(),
 		base: pathOrApi
 	})).bundle.parsed, {
-		oasClass,
 		canBundle,
 		enablePaths
 	});
@@ -716,26 +540,27 @@ async function parse(pathOrApi, { oasClass = Oas, canBundle = true, enablePaths
 	}).load();
 	if (isOpenApiV2Document(document)) {
 		const { openapi } = await swagger2openapi.default.convertObj(document, { anchors: true });
-		return new oasClass(openapi);
+		return openapi;
 	}
-	return new oasClass(document);
+	return document;
 }
 /**
-* Deep-merges multiple OpenAPI documents into a single `Oas` instance.
+* Deep-merges multiple OpenAPI documents into a single `Document`.
 *
-* Each document is parsed independently (without path dereferencing) and then
-* recursively merged using `remeda`'s `mergeDeep`. The result is re-parsed so
-* the returned `Oas` instance is fully initialized.
+* Each document is parsed independently then recursively merged with `remeda`'s `mergeDeep`.
+* Throws when the input array is empty.
 *
-* Throws when the input array is empty — at least one document is required.
+* @example
+* ```ts
+* const document = await mergeDocuments(['./pets.yaml', './orders.yaml'])
+* ```
 */
-async function merge(pathOrApi, { oasClass = Oas } = {}) {
-	const instances = await Promise.all(pathOrApi.map((p) => parse(p, {
-		oasClass,
+async function mergeDocuments(pathOrApi) {
+	const documents = await Promise.all(pathOrApi.map((p) => parseDocument(p, {
 		enablePaths: false,
 		canBundle: false
 	})));
-	if (instances.length === 0) throw new Error("No OAS instances provided for merging.");
+	if (documents.length === 0) throw new Error("No OAS documents provided for merging.");
 	const seed = {
 		openapi: MERGE_OPENAPI_VERSION,
 		info: {
@@ -745,38 +570,248 @@ async function merge(pathOrApi, { oasClass = Oas } = {}) {
 		paths: {},
 		components: { schemas: {} }
 	};
-	return parse(instances.reduce((acc, current) => (0, remeda.mergeDeep)(acc, current.document), seed), { oasClass });
+	return parseDocument(documents.reduce((acc, current) => (0, remeda.mergeDeep)(acc, current), seed));
+}
+/**
+* Creates a `Document` from an `AdapterSource`.
+*
+* Handles all three source types:
+* - `{ type: 'path' }` — resolves and bundles a local file path or remote URL.
+* - `{ type: 'paths' }` — merges multiple file paths into a single document.
+* - `{ type: 'data' }` — parses an inline string (YAML/JSON) or raw object.
+*
+* @example
+* ```ts
+* const document = await parseFromConfig({ type: 'path', path: './openapi.yaml' })
+* const document = await parseFromConfig({ type: 'data', data: '{"openapi":"3.0.0",...}' })
+* ```
+*/
+function parseFromConfig(source) {
+	if (source.type === "data") {
+		if (typeof source.data === "object") return parseDocument(structuredClone(source.data));
+		try {
+			return parseDocument(_stoplight_yaml.default.parse(source.data));
+		} catch {
+			return parseDocument(source.data);
+		}
+	}
+	if (source.type === "paths") return mergeDocuments(source.paths);
+	if (new URLPath(source.path).isURL) return parseDocument(source.path);
+	return parseDocument(node_path.default.resolve(node_path.default.dirname(source.path), source.path));
+}
+/**
+* Validates an OpenAPI document using `oas-normalize` with colorized error output.
+*
+* @example
+* ```ts
+* await validateDocument(document)
+* ```
+*/
+async function validateDocument(document) {
+	try {
+		await new oas_normalize.default(document, {
+			enablePaths: true,
+			colorizeErrors: true
+		}).validate({ parser: { validate: { errors: { colorize: true } } } });
+	} catch (_err) {}
+}
+//#endregion
+//#region src/refs.ts
+/**
+* Resolves a local JSON pointer reference from a document.
+*
+* Accepts `#/...` refs. Returns `null` for empty or non-local refs.
+* Throws when the pointer cannot be resolved.
+*
+* @example
+* ```ts
+* resolveRef<SchemaObject>(document, '#/components/schemas/Pet') // SchemaObject | null
+* ```
+*/
+function resolveRef(document, $ref) {
+	const origRef = $ref;
+	$ref = $ref.trim();
+	if ($ref === "") return null;
+	if ($ref.startsWith("#")) $ref = globalThis.decodeURIComponent($ref.substring(1));
+	else return null;
+	const current = jsonpointer.default.get(document, $ref);
+	if (!current) throw new Error(`Could not find a definition for ${origRef}.`);
+	return current;
+}
+/**
+* Resolves a `$ref` object while preserving the original `$ref` field on the result.
+*
+* Useful for parser flows that need both dereferenced fields and pointer
+* identity (for naming/import purposes). Non-reference values are returned as-is.
+*
+* @example
+* ```ts
+* dereferenceWithRef(document, { $ref: '#/components/schemas/Pet' })
+* // { $ref: '#/components/schemas/Pet', type: 'object', properties: { ... } }
+* ```
+*/
+function dereferenceWithRef(document, schema) {
+	if (isReference(schema)) return {
+		...schema,
+		...resolveRef(document, schema.$ref),
+		$ref: schema.$ref
+	};
+	return schema;
 }
+//#endregion
+//#region src/resolvers.ts
 /**
-* Constructs an `Oas` instance from a Kubb `Config` object.
+* Resolves `{variable}` placeholders in an OpenAPI server URL.
+*
+* Resolution order per variable: `overrides[key]` → `variable.default` → left unreplaced.
+* Throws when an override value is not in the variable's allowed `enum` list.
 *
-* Handles all three input forms supported by `Config`:
-* - `data` — an inline YAML string, JSON string, or pre-parsed object.
-* - Array — multiple file paths that are deep-merged via {@link merge}.
-* - `path` — a local file path or a remote URL.
+* @example
+* ```ts
+* resolveServerUrl(
+*   { url: 'https://{env}.api.example.com', variables: { env: { default: 'dev', enum: ['dev', 'prod'] } } },
+*   { env: 'prod' },
+* )
+* // 'https://prod.api.example.com'
+* ```
+*/
+function resolveServerUrl(server, overrides) {
+	if (!server.variables) return server.url;
+	let url = server.url;
+	for (const [key, variable] of Object.entries(server.variables)) {
+		const value = overrides?.[key] ?? (variable.default != null ? String(variable.default) : void 0);
+		if (value === void 0) continue;
+		if (variable.enum?.length && !variable.enum.some((e) => String(e) === value)) throw new Error(`Invalid server variable value '${value}' for '${key}' when resolving ${server.url}. Valid values are: ${variable.enum.join(", ")}.`);
+		url = url.replaceAll(`{${key}}`, value);
+	}
+	return url;
+}
+/**
+* Looks up the Kubb `SchemaType` for a given OAS `format` string.
+* Returns `undefined` for formats not in `formatMap` (e.g. `int64`, `date-time`),
+* which are handled separately because their output depends on parser options.
+*/
+function getSchemaType(format) {
+	return formatMap[format] ?? null;
+}
+/**
+* Maps an OAS primitive type string to its `PrimitiveSchemaType` equivalent.
+* Numeric types (`number`, `integer`, `bigint`) are returned unchanged;
+* `boolean` maps to `'boolean'`; everything else defaults to `'string'`.
+*/
+function getPrimitiveType(type) {
+	if (type === "number" || type === "integer" || type === "bigint") return type;
+	if (type === "boolean") return "boolean";
+	return "string";
+}
+/**
+* Narrows a raw content-type string to the `MediaType` union recognized by Kubb.
+* Returns `undefined` for content types not present in `KNOWN_MEDIA_TYPES`.
+*/
+function getMediaType(contentType) {
+	return Object.values(_kubb_ast.mediaTypes).includes(contentType) ? contentType : null;
+}
+/**
+* Returns all resolved parameters for an operation, merging path-level and operation-level entries.
+*
+* Operation-level parameters take precedence over path-level ones with the same `in:name` key.
+* `$ref` parameters are resolved via `dereferenceWithRef` to restore backward compatibility
+* with `oas` v31+ which otherwise filters them out.
+*
+* @example
+* ```ts
+* getParameters(document, operation)
+* // [{ name: 'petId', in: 'path', required: true, schema: { type: 'integer' } }]
+* ```
+*/
+function getParameters(document, operation) {
+	const resolveParams = (params) => params.map((p) => dereferenceWithRef(document, p)).filter((p) => !!p && typeof p === "object" && "in" in p && "name" in p);
+	const operationParams = resolveParams(operation.schema?.parameters || []);
+	const pathItem = document.paths?.[operation.path];
+	const pathLevelParams = resolveParams(pathItem && !isReference(pathItem) && pathItem.parameters ? pathItem.parameters : []);
+	const paramMap = /* @__PURE__ */ new Map();
+	for (const p of pathLevelParams) if (p.name && p.in) paramMap.set(`${p.in}:${p.name}`, p);
+	for (const p of operationParams) if (p.name && p.in) paramMap.set(`${p.in}:${p.name}`, p);
+	return Array.from(paramMap.values());
+}
+function getResponseBody(responseBody, contentType) {
+	if (!responseBody) return false;
+	if (isReference(responseBody)) return false;
+	const body = responseBody;
+	if (!body.content) return false;
+	if (contentType) {
+		if (!(contentType in body.content)) return false;
+		return body.content[contentType];
+	}
+	let availableContentType;
+	const contentTypes = Object.keys(body.content);
+	contentTypes.forEach((mt) => {
+		if (!availableContentType && oas_utils.matchesMimeType.json(mt)) availableContentType = mt;
+	});
+	if (!availableContentType) contentTypes.forEach((mt) => {
+		if (!availableContentType) availableContentType = mt;
+	});
+	if (availableContentType) return [
+		availableContentType,
+		body.content[availableContentType],
+		...body.description ? [body.description] : []
+	];
+	return false;
+}
+/**
+* Returns the response schema for a given operation and HTTP status code.
+*
+* Returns an empty object `{}` when no response body schema is available.
+*
+* @example
+* ```ts
+* getResponseSchema(document, operation, 200)         // SchemaObject
+* getResponseSchema(document, operation, '4XX')       // {}
+* ```
+*/
+function getResponseSchema(document, operation, statusCode, options = {}) {
+	if (operation.schema.responses) Object.keys(operation.schema.responses).forEach((key) => {
+		const schema = operation.schema.responses[key];
+		const $ref = isReference(schema) ? schema.$ref : void 0;
+		if (schema && $ref) operation.schema.responses[key] = resolveRef(document, $ref);
+	});
+	const responseBody = getResponseBody(operation.getResponseByStatusCode(statusCode), options.contentType);
+	if (responseBody === false) return {};
+	const schema = Array.isArray(responseBody) ? responseBody[1].schema : responseBody.schema;
+	if (!schema) return {};
+	return dereferenceWithRef(document, schema);
+}
+/**
+* Returns the request body schema for an operation, or `undefined` when absent.
+*
+* @example
+* ```ts
+* getRequestSchema(document, operation) // SchemaObject | null
+* ```
 */
-function parseFromConfig(config, oasClass = Oas) {
-	if ("data" in config.input) {
-		if (typeof config.input.data === "object") return parse(structuredClone(config.input.data), { oasClass });
-		try {
-			return parse(_stoplight_yaml.default.parse(config.input.data), { oasClass });
-		} catch {
-			return parse(config.input.data, { oasClass });
-		}
-	}
-	if (Array.isArray(config.input)) return merge(config.input.map((input) => node_path.default.resolve(config.root, input.path)), { oasClass });
-	if (new URLPath(config.input.path).isURL) return parse(config.input.path, { oasClass });
-	return parse(node_path.default.resolve(config.root, config.input.path), { oasClass });
+function getRequestSchema(document, operation, options = {}) {
+	if (operation.schema.requestBody) operation.schema.requestBody = dereferenceWithRef(document, operation.schema.requestBody);
+	const requestBody = operation.getRequestBody(options.contentType);
+	if (requestBody === false) return null;
+	const schema = Array.isArray(requestBody) ? requestBody[1].schema : requestBody.schema;
+	if (!schema) return null;
+	return dereferenceWithRef(document, schema);
 }
 /**
-* Flattens a single-member or keyword-only `allOf` into its parent schema.
+* Flattens a keyword-only `allOf` into its parent schema.
+*
+* Only flattens when every member is a plain fragment — no `$ref` and no structural keywords
+* (see `structuralKeys`). Outer schema values take precedence over fragment values.
+* Returns `null` for a `null` input, and the original schema unchanged when flattening is unsafe.
 *
-* Flattening is only performed when every `allOf` member is a "plain fragment" —
-* i.e. contains no structural composition keywords (see `structuralKeys`) and no
-* `$ref`. When any member carries structural meaning, the schema is returned unchanged.
+* @example
+* ```ts
+* flattenSchema({ allOf: [{ description: 'A pet' }], type: 'object', properties: {} })
+* // { type: 'object', properties: {}, description: 'A pet' }
 *
-* Keyword values from allOf members are merged into the parent on a first-write basis:
-* outer schema values always win over fragment values.
+* flattenSchema({ allOf: [{ $ref: '#/components/schemas/Pet' }] })
+* // returned unchanged — contains a $ref
+* ```
 */
 function flattenSchema(schema) {
 	if (!schema?.allOf || schema.allOf.length === 0) return schema ?? null;
@@ -789,18 +824,26 @@ function flattenSchema(schema) {
 	return merged;
 }
 /**
-* Validates an OpenAPI document using `oas-normalize`.
-* Enables path validation and colorized error output.
+* Extracts the inline schema from a media-type `content` map.
+*
+* Prefers `preferredContentType` when given; otherwise uses the first key in the map.
+* Returns `null` when `content` is absent, the schema is missing, or the schema is a `$ref`.
+*
+* @example
+* ```ts
+* extractSchemaFromContent(operation.content, 'application/json')
+* // SchemaObject | null
+* ```
 */
-async function validate(document) {
-	return new oas_normalize.default(document, {
-		enablePaths: true,
-		colorizeErrors: true
-	}).validate({ parser: { validate: { errors: { colorize: true } } } });
+function extractSchemaFromContent(content, preferredContentType) {
+	if (!content) return null;
+	const firstContentType = Object.keys(content)[0] ?? "application/json";
+	const schema = content[preferredContentType ?? firstContentType]?.schema;
+	if (schema && "$ref" in schema) return null;
+	return schema ?? null;
 }
 /**
-* Walks a schema tree and collects the names of all `#/components/schemas/<name>` refs.
-* Used by `sortSchemas` to build the dependency graph.
+* Walks a schema tree and collects the names of all `#/components/schemas/<name>` `$ref`s.
 */
 function collectRefs(schema, refs = /* @__PURE__ */ new Set()) {
 	if (Array.isArray(schema)) {
@@ -816,11 +859,14 @@ function collectRefs(schema, refs = /* @__PURE__ */ new Set()) {
 /**
 * Returns a copy of `schemas` topologically sorted by `$ref` dependency.
 *
-* Schemas with no references come first; schemas that are referenced by others
-* come before those that reference them. This ensures code generators emit
-* referenced types before the types that depend on them.
+* Referenced schemas appear before the schemas that depend on them, so code generators
+* can emit types in the correct order. Cycles are silently skipped.
 *
-* Cycles are silently skipped via the `stack` guard inside `visit`.
+* @example
+* ```ts
+* const sorted = sortSchemas({ Order: orderSchema, Pet: petSchema })
+* // Pet appears before Order when Order.$ref points at Pet
+* ```
 */
 function sortSchemas(schemas) {
 	const deps = /* @__PURE__ */ new Map();
@@ -840,283 +886,172 @@ function sortSchemas(schemas) {
 	for (const name of sorted) result[name] = schemas[name];
 	return result;
 }
-/**
-* Extracts the inline schema from a media-type `content` map.
-*
-* Prefers `preferredContentType` when provided; otherwise falls back to the
-* first key in the map. Returns `null` when:
-* - `content` is absent.
-* - The target content-type has no `schema` entry.
-* - The schema is a `$ref` (callers resolve refs separately).
-*/
-function extractSchemaFromContent(content, preferredContentType) {
-	if (!content) return null;
-	const firstContentType = Object.keys(content)[0] ?? "application/json";
-	const schema = content[preferredContentType ?? firstContentType]?.schema;
-	if (schema && "$ref" in schema) return null;
-	return schema ?? null;
-}
-/**
-* Returns the PascalCase suffix appended to a component name when resolving
-* cross-source name collisions (schemas vs. responses vs. requestBodies).
-*/
+const semanticSuffixes = {
+	schemas: "Schema",
+	responses: "Response",
+	requestBodies: "Request"
+};
 function getSemanticSuffix(source) {
-	switch (source) {
-		case "schemas": return "Schema";
-		case "responses": return "Response";
-		case "requestBodies": return "Request";
-	}
+	return semanticSuffixes[source];
 }
-/**
-* Builds `GetSchemasResult` without any collision detection.
-* Each schema is registered under its original component name and its full
-* `#/components/<source>/<name>` ref path.
-*/
-function legacyResolve(schemasWithMeta) {
-	const schemas = {};
-	const nameMapping = /* @__PURE__ */ new Map();
-	for (const item of schemasWithMeta) {
-		schemas[item.originalName] = item.schema;
-		nameMapping.set(`#/components/${item.source}/${item.originalName}`, item.originalName);
-	}
-	return {
-		schemas,
-		nameMapping
-	};
+function resolveSchemaRef(document, schema) {
+	if (!isReference(schema)) return schema;
+	const resolved = resolveRef(document, schema.$ref);
+	return resolved && !isReference(resolved) ? resolved : schema;
 }
 /**
-* Builds `GetSchemasResult` with automatic name-collision resolution.
+* Collects component schemas from one or more sources and resolves name collisions.
+*
+* Sources default to `['schemas', 'requestBodies', 'responses']`. Returned schemas are
+* topologically sorted by `$ref` dependency so generators emit types in the correct order.
 *
 * When two or more schemas normalize to the same PascalCase name:
-* - If they share the same source, a numeric suffix (`2`, `3`, …) is appended.
-* - If they come from different sources (schemas / responses / requestBodies),
-*   a semantic suffix (`Schema`, `Response`, `Request`) is appended.
+* - Same source → numeric suffix (`2`, `3`, …).
+* - Different sources → semantic suffix (`Schema`, `Response`, `Request`).
 *
-* Non-colliding schemas are left unchanged.
+* @example
+* ```ts
+* const { schemas, nameMapping } = getSchemas(document, { contentType: 'application/json' })
+* ```
 */
-function resolveCollisions(schemasWithMeta) {
-	const schemas = {};
-	const nameMapping = /* @__PURE__ */ new Map();
+function getSchemas(document, { contentType }) {
+	const components = document.components;
+	const candidates = [...Object.entries(components?.schemas ?? {}).map(([name, schema]) => ({
+		schema: resolveSchemaRef(document, schema),
+		source: "schemas",
+		originalName: name
+	})), ...["responses", "requestBodies"].flatMap((source) => Object.entries(components?.[source] ?? {}).flatMap(([name, item]) => {
+		const schema = extractSchemaFromContent(item.content, contentType);
+		return schema ? [{
+			schema: resolveSchemaRef(document, schema),
+			source,
+			originalName: name
+		}] : [];
+	}))];
 	const normalizedNames = /* @__PURE__ */ new Map();
-	for (const item of schemasWithMeta) {
-		const normalized = pascalCase(item.originalName);
-		const bucket = normalizedNames.get(normalized) ?? [];
+	for (const item of candidates) {
+		const key = pascalCase(item.originalName);
+		const bucket = normalizedNames.get(key) ?? [];
 		bucket.push(item);
-		normalizedNames.set(normalized, bucket);
-	}
-	for (const [, items] of normalizedNames) {
-		if (items.length === 1) {
-			const item = items[0];
-			schemas[item.originalName] = item.schema;
-			nameMapping.set(`#/components/${item.source}/${item.originalName}`, item.originalName);
-			continue;
-		}
-		if (new Set(items.map((item) => item.source)).size === 1) items.forEach((item, index) => {
-			const uniqueName = item.originalName + (index === 0 ? "" : (index + 1).toString());
-			schemas[uniqueName] = item.schema;
-			nameMapping.set(`#/components/${item.source}/${item.originalName}`, uniqueName);
-		});
-		else items.forEach((item) => {
-			const uniqueName = item.originalName + getSemanticSuffix(item.source);
-			schemas[uniqueName] = item.schema;
-			nameMapping.set(`#/components/${item.source}/${item.originalName}`, uniqueName);
-		});
+		normalizedNames.set(key, bucket);
 	}
+	const schemas = {};
+	const nameMapping = /* @__PURE__ */ new Map();
+	const multipleSources = (items) => new Set(items.map((i) => i.source)).size > 1;
+	for (const [, items] of normalizedNames) items.forEach((item, index) => {
+		const suffix = items.length === 1 ? "" : multipleSources(items) ? getSemanticSuffix(item.source) : index === 0 ? "" : String(index + 1);
+		const uniqueName = item.originalName + suffix;
+		schemas[uniqueName] = item.schema;
+		nameMapping.set(`#/components/${item.source}/${item.originalName}`, uniqueName);
+	});
 	return {
-		schemas,
+		schemas: sortSchemas(schemas),
 		nameMapping
 	};
 }
-//#endregion
-//#region src/parser.ts
-/**
-* Default values for all `Options` fields.
-*/
-const DEFAULT_OPTIONS = {
-	dateType: "string",
-	integerType: "number",
-	unknownType: "any",
-	emptySchemaType: "any",
-	enumSuffix: "enum"
-};
-/**
-* Looks up the Kubb `SchemaType` for a given OAS `format` string.
-* Returns `undefined` for formats not in `formatMap` (e.g. `int64`, `date-time`),
-* which are handled separately because their output depends on parser options.
-*/
-function formatToSchemaType(format) {
-	return formatMap[format];
-}
-/**
-* Extracts the final path segment of a JSON Pointer `$ref` string.
-* For `#/components/schemas/Order` this returns `'Order'`.
-* Falls back to the full ref string when no slash is present.
-*/
-function extractRefName($ref) {
-	return $ref.split("/").at(-1) ?? $ref;
-}
 /**
-* Maps an OAS primitive type string to its `PrimitiveSchemaType` equivalent.
-* Numeric types (`number`, `integer`, `bigint`) are returned unchanged;
-* `boolean` maps to `'boolean'`; everything else defaults to `'string'`.
+* Resolves the AST type descriptor for a date/time format, honoring the `dateType` option.
+* Returns `null` when `dateType: false`, signalling the format should fall through to `string`.
 */
-function getPrimitiveType(type) {
-	if (type === "number" || type === "integer" || type === "bigint") return type;
-	if (type === "boolean") return "boolean";
-	return "string";
+function getDateType(options, format) {
+	if (!options.dateType) return null;
+	if (format === "date-time") {
+		if (options.dateType === "date") return {
+			type: "date",
+			representation: "date"
+		};
+		if (options.dateType === "stringOffset") return {
+			type: "datetime",
+			offset: true
+		};
+		if (options.dateType === "stringLocal") return {
+			type: "datetime",
+			local: true
+		};
+		return {
+			type: "datetime",
+			offset: false
+		};
+	}
+	if (format === "date") return {
+		type: "date",
+		representation: options.dateType === "date" ? "date" : "string"
+	};
+	return {
+		type: "time",
+		representation: options.dateType === "date" ? "date" : "string"
+	};
 }
 /**
-* Narrows a raw content-type string to the `MediaType` union recognized by Kubb.
-* Returns `undefined` for content types not present in `KNOWN_MEDIA_TYPES`.
+* Collects the shared metadata fields passed to every `createSchema` call.
 */
-function toMediaType(contentType) {
-	return knownMediaTypes.includes(contentType) ? contentType : void 0;
+function buildSchemaNode(schema, name, nullable, defaultValue) {
+	return {
+		name,
+		nullable,
+		title: schema.title,
+		description: schema.description,
+		deprecated: schema.deprecated,
+		readOnly: schema.readOnly,
+		writeOnly: schema.writeOnly,
+		default: defaultValue,
+		example: schema.example
+	};
 }
+//#endregion
+//#region src/parser.ts
 /**
-* When a discriminator is present, replaces the discriminator property's schema with
-* an enum of the mapping keys so downstream code emits a precise literal-union type.
-* Returns the original schema unchanged when there is no discriminator or no mapping.
+* Normalize a malformed `{ type: 'array', enum: [...] }` schema by moving the
+* enum values into the items sub-schema. This pattern is technically invalid OAS
+* but appears in the wild and must be handled gracefully.
 */
-function applyDiscriminatorEnum(schema) {
-	if (!isDiscriminator(schema)) return schema;
-	const propName = schema.discriminator.propertyName;
-	if (!schema.properties?.[propName]) return schema;
+function normalizeArrayEnum(schema) {
+	const normalizedItems = {
+		...typeof schema.items === "object" && !Array.isArray(schema.items) ? schema.items : {},
+		enum: schema.enum
+	};
+	const { enum: _enum, ...schemaWithoutEnum } = schema;
 	return {
-		...schema,
-		properties: {
-			...schema.properties,
-			[propName]: {
-				...schema.properties[propName],
-				enum: schema.discriminator.mapping ? Object.keys(schema.discriminator.mapping) : void 0
-			}
-		}
+		...schemaWithoutEnum,
+		items: normalizedItems
 	};
 }
 /**
-* Creates an OAS parser that converts an OpenAPI/Swagger spec into
-* the `@kubb/ast` tree.
-*
-* Options are passed per-call to `parse` or `convertSchema` rather than
-* at construction time, keeping the factory lightweight.
+* Builds the internal converter functions for a given `OasParserContext`.
 *
-* This is the **kubb-parser** stage of the compilation lifecycle:
-*   OpenAPI / Swagger  →  Kubb AST
-*
-* No code is generated here; the resulting tree is spec-agnostic and can
-* be consumed by any downstream plugin (plugin-ts, plugin-zod, …).
-*
-* @example
-* ```ts
-* const parser = createOasParser(oas)
-* const root = parser.parse({ emptySchemaType: 'unknown' })
-* ```
+* All `convert*` functions are defined as function declarations so they can freely
+* reference each other and `parseSchema` via JS hoisting (mutual recursion).
 */
-function createOasParser(oas, { contentType, collisionDetection } = {}) {
-	const { schemas: schemaObjects, nameMapping } = oas.getSchemas({
-		contentType,
-		collisionDetection
-	});
-	/**
-	* Maps an `'any' | 'unknown' | 'void'` option string to the corresponding `SchemaType` constant.
-	* Used for both `unknownType` (unannotated schemas) and `emptySchemaType` (empty `{}` schemas).
-	*/
-	function resolveTypeOption(value) {
-		if (value === "any") return _kubb_ast.schemaTypes.any;
-		if (value === "void") return _kubb_ast.schemaTypes.void;
-		return _kubb_ast.schemaTypes.unknown;
-	}
-	/**
-	* Resolves the AST type and datetime modifiers for a date/time format, honoring the `dateType` option.
-	* Returns `undefined` when `dateType` is `false`, meaning the format should fall through to `string`.
-	*/
-	function getDateType(options, format) {
-		if (!options.dateType) return;
-		if (format === "date-time") {
-			if (options.dateType === "date") return {
-				type: "date",
-				representation: "date"
-			};
-			if (options.dateType === "stringOffset") return {
-				type: "datetime",
-				offset: true
-			};
-			if (options.dateType === "stringLocal") return {
-				type: "datetime",
-				local: true
-			};
-			return {
-				type: "datetime",
-				offset: false
-			};
-		}
-		if (format === "date") return {
-			type: "date",
-			representation: options.dateType === "date" ? "date" : "string"
-		};
-		return {
-			type: "time",
-			representation: options.dateType === "date" ? "date" : "string"
-		};
-	}
+function createSchemaParser(ctx) {
+	const document = ctx.document;
 	/**
-	* Shared metadata fields included in every `createSchema` call.
-	* Centralizes the common properties so sub-handlers don't repeat them.
+	* Converts a `$ref` schema into a `RefSchemaNode`.
 	*/
-	function buildSchemaBase(schema, name, nullable, defaultValue) {
-		return {
-			name,
+	function convertRef({ schema, nullable, defaultValue }) {
+		return (0, _kubb_ast.createSchema)({
+			type: "ref",
+			name: (0, _kubb_ast.extractRefName)(schema.$ref),
+			ref: schema.$ref,
 			nullable,
-			title: schema.title,
 			description: schema.description,
 			deprecated: schema.deprecated,
 			readOnly: schema.readOnly,
 			writeOnly: schema.writeOnly,
-			default: defaultValue,
-			example: schema.example
-		};
-	}
-	/**
-	* Converts a `$ref` schema pointer into a `RefSchemaNode`.
-	*
-	* In OAS 3.0 siblings of `$ref` are technically ignored by the spec, but Kubb intentionally
-	* preserves them so that annotations like `pattern`, `description`, and `nullable` are
-	* reflected in generated JSDoc and type modifiers.
-	*/
-	function convertRef({ schema, nullable, defaultValue }) {
-		const schemaObject = schema;
-		return (0, _kubb_ast.createSchema)({
-			type: "ref",
-			name: extractRefName(schemaObject.$ref),
-			ref: schemaObject.$ref,
-			nullable,
-			description: schemaObject.description,
-			deprecated: schemaObject.deprecated,
-			readOnly: schemaObject.readOnly,
-			writeOnly: schemaObject.writeOnly,
-			pattern: schemaObject.type === "string" ? schemaObject.pattern : void 0,
-			example: schemaObject.example,
+			pattern: schema.type === "string" ? schema.pattern : void 0,
+			example: schema.example,
 			default: defaultValue
 		});
 	}
 	/**
-	* Converts a `allOf` schema into either a flattened member node (single-member `allOf`)
-	* or an `IntersectionSchemaNode` (multi-member `allOf`).
-	*
-	* Single-member `allOf` without sibling structural keys is the common OAS 3.0 pattern for
-	* annotating a `$ref` or primitive with extra constraints; it is flattened to avoid
-	* producing needless intersection wrappers.
-	*
-	* The flatten path is skipped when the outer schema carries structural keys that cannot be
-	* merged into annotation fields: `properties`, `required`, or `additionalProperties`.
-	* Those cases must become an intersection so the constraints are preserved.
-	*
-	* Circular references through discriminator parents are detected and skipped to prevent
-	* infinite recursion during code generation.
+	* Converts an `allOf` schema into a flattened node or an `IntersectionSchemaNode`.
 	*/
-	function convertAllOf({ schema, name, nullable, defaultValue, options }) {
+	function convertAllOf({ schema, name, nullable, defaultValue, rawOptions }) {
 		if (schema.allOf.length === 1 && !schema.properties && !(Array.isArray(schema.required) && schema.required.length) && schema.additionalProperties === void 0) {
 			const [memberSchema] = schema.allOf;
-			const memberNode = convertSchema({ schema: memberSchema }, options);
+			const memberNode = parseSchema({
+				schema: memberSchema,
+				name: null
+			}, rawOptions);
 			const { kind: _kind, ...memberNodeProps } = memberNode;
 			const mergedNullable = nullable || memberNode.nullable || void 0;
 			const mergedDefault = schema.default === null && mergedNullable ? void 0 : schema.default ?? memberNode.default;
@@ -1134,81 +1069,123 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 				pattern: schema.pattern ?? ("pattern" in memberNode ? memberNode.pattern : void 0)
 			});
 		}
+		const filteredDiscriminantValues = [];
 		const allOfMembers = schema.allOf.filter((item) => {
 			if (!isReference(item) || !name) return true;
-			const deref = oas.get(item.$ref);
+			const deref = resolveRef(document, item.$ref);
 			if (!deref || !isDiscriminator(deref)) return true;
 			const parentUnion = deref.oneOf ?? deref.anyOf;
 			if (!parentUnion) return true;
 			const childRef = `#/components/schemas/${name}`;
 			const inOneOf = parentUnion.some((oneOfItem) => isReference(oneOfItem) && oneOfItem.$ref === childRef);
 			const inMapping = Object.values(deref.discriminator.mapping ?? {}).some((v) => v === childRef);
-			return !inOneOf && !inMapping;
-		}).map((s) => convertSchema({ schema: s }, options));
+			if (inOneOf || inMapping) {
+				const discriminatorValue = (0, _kubb_ast.findDiscriminator)(deref.discriminator.mapping, childRef);
+				if (discriminatorValue) filteredDiscriminantValues.push({
+					propertyName: deref.discriminator.propertyName,
+					value: discriminatorValue
+				});
+				return false;
+			}
+			return true;
+		}).map((s) => parseSchema({ schema: s }, rawOptions));
+		const syntheticStart = allOfMembers.length;
 		if (Array.isArray(schema.required) && schema.required.length) {
 			const outerKeys = schema.properties ? new Set(Object.keys(schema.properties)) : /* @__PURE__ */ new Set();
 			const missingRequired = schema.required.filter((key) => !outerKeys.has(key));
 			if (missingRequired.length) {
 				const resolvedMembers = schema.allOf.flatMap((item) => {
 					if (!isReference(item)) return [item];
-					const deref = oas.get(item.$ref);
+					const deref = resolveRef(document, item.$ref);
 					return deref && !isReference(deref) ? [deref] : [];
 				});
 				for (const key of missingRequired) for (const resolved of resolvedMembers) if (resolved.properties?.[key]) {
-					allOfMembers.push(convertSchema({ schema: {
+					allOfMembers.push(parseSchema({ schema: {
 						properties: { [key]: resolved.properties[key] },
 						required: [key]
-					} }, options));
+					} }, rawOptions));
 					break;
 				}
 			}
 		}
 		if (schema.properties) {
 			const { allOf: _allOf, ...schemaWithoutAllOf } = schema;
-			allOfMembers.push(convertSchema({ schema: schemaWithoutAllOf }, options));
+			allOfMembers.push(parseSchema({ schema: schemaWithoutAllOf }, rawOptions));
 		}
+		for (const { propertyName, value } of filteredDiscriminantValues) allOfMembers.push((0, _kubb_ast.createDiscriminantNode)({
+			propertyName,
+			value
+		}));
 		return (0, _kubb_ast.createSchema)({
 			type: "intersection",
-			members: allOfMembers,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			members: [...(0, _kubb_ast.mergeAdjacentObjects)(allOfMembers.slice(0, syntheticStart)), ...(0, _kubb_ast.mergeAdjacentObjects)(allOfMembers.slice(syntheticStart))],
+			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
 	* Converts a `oneOf` / `anyOf` schema into a `UnionSchemaNode`.
-	*
-	* Both keywords are treated identically — their members are concatenated into a single union.
-	* When sibling `properties` are present alongside `oneOf`/`anyOf`, each union member is
-	* individually intersected with the shared properties node to match the OAS pattern of
-	* adding common fields next to a discriminated union.
 	*/
-	function convertUnion({ schema, name, nullable, defaultValue, options }) {
+	function convertUnion({ schema, name, nullable, defaultValue, rawOptions }) {
+		function pickDiscriminatorPropertyNode(node, propertyName) {
+			const discriminatorProperty = (0, _kubb_ast.narrowSchema)(node, "object")?.properties?.find((property) => property.name === propertyName);
+			if (!discriminatorProperty) return null;
+			return (0, _kubb_ast.createSchema)({
+				type: "object",
+				primitive: "object",
+				properties: [discriminatorProperty]
+			});
+		}
 		const unionMembers = [...schema.oneOf ?? [], ...schema.anyOf ?? []];
 		const unionBase = {
-			...buildSchemaBase(schema, name, nullable, defaultValue),
+			...buildSchemaNode(schema, name, nullable, defaultValue),
 			discriminatorPropertyName: isDiscriminator(schema) ? schema.discriminator.propertyName : void 0
 		};
-		if (schema.properties) {
+		const discriminator = isDiscriminator(schema) ? schema.discriminator : void 0;
+		const sharedPropertiesNode = schema.properties ? (() => {
 			const { oneOf: _oneOf, anyOf: _anyOf, ...schemaWithoutUnion } = schema;
-			const propertiesNode = convertSchema({ schema: schemaWithoutUnion }, options);
-			return (0, _kubb_ast.createSchema)({
+			return parseSchema({
+				schema: discriminator ? Object.fromEntries(Object.entries(schemaWithoutUnion).filter(([key]) => key !== "discriminator")) : schemaWithoutUnion,
+				name
+			}, rawOptions);
+		})() : void 0;
+		if (sharedPropertiesNode || discriminator?.mapping) {
+			const members = unionMembers.map((s) => {
+				const ref = isReference(s) ? s.$ref : void 0;
+				const discriminatorValue = (0, _kubb_ast.findDiscriminator)(discriminator?.mapping, ref);
+				const memberNode = parseSchema({ schema: s }, rawOptions);
+				if (!discriminatorValue || !discriminator) return memberNode;
+				return (0, _kubb_ast.createSchema)({
+					type: "intersection",
+					members: [memberNode, (sharedPropertiesNode ? pickDiscriminatorPropertyNode((0, _kubb_ast.setDiscriminatorEnum)({
+						node: sharedPropertiesNode,
+						propertyName: discriminator.propertyName,
+						values: [discriminatorValue]
+					}), discriminator.propertyName) : void 0) ?? (0, _kubb_ast.createDiscriminantNode)({
+						propertyName: discriminator.propertyName,
+						value: discriminatorValue
+					})]
+				});
+			});
+			const unionNode = (0, _kubb_ast.createSchema)({
 				type: "union",
 				...unionBase,
-				members: unionMembers.map((s) => (0, _kubb_ast.createSchema)({
-					type: "intersection",
-					members: [convertSchema({ schema: s }, options), propertiesNode]
-				}))
+				members
+			});
+			if (!sharedPropertiesNode) return unionNode;
+			return (0, _kubb_ast.createSchema)({
+				type: "intersection",
+				...buildSchemaNode(schema, name, nullable, defaultValue),
+				members: [unionNode, sharedPropertiesNode]
 			});
 		}
 		return (0, _kubb_ast.createSchema)({
 			type: "union",
 			...unionBase,
-			members: unionMembers.map((s) => convertSchema({ schema: s }, options))
+			members: (0, _kubb_ast.simplifyUnion)(unionMembers.map((s) => parseSchema({ schema: s }, rawOptions)))
 		});
 	}
 	/**
-	* Converts an OAS 3.1 `const` schema into either a null scalar or a single-value `EnumSchemaNode`.
-	* `const: null` maps to a null scalar; any other value becomes a one-item enum so that generators
-	* can produce a precise literal type.
+	* Converts an OAS 3.1 `const` schema into a null scalar or a single-value `EnumSchemaNode`.
 	*/
 	function convertConst({ schema, name, nullable, defaultValue }) {
 		const constValue = schema.const;
@@ -1218,25 +1195,23 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			name,
 			title: schema.title,
 			description: schema.description,
-			deprecated: schema.deprecated,
-			nullable
+			deprecated: schema.deprecated
 		});
 		return (0, _kubb_ast.createSchema)({
 			type: "enum",
 			primitive: getPrimitiveType(typeof constValue === "number" ? "number" : typeof constValue === "boolean" ? "boolean" : "string"),
 			enumValues: [constValue],
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
-	* Handles `format`-based special types (date/time, uuid, email, blob, etc.).
-	* Returns `undefined` when the format should fall through to string handling
-	* (i.e. `format: 'date-time'` with `dateType: false`).
+	* Converts a format-annotated schema into a special-type `SchemaNode`.
+	* Returns `null` when the format should fall through to string handling (`dateType: false`).
 	*/
-	function convertFormat({ schema, name, nullable, defaultValue, mergedOptions }) {
-		const base = buildSchemaBase(schema, name, nullable, defaultValue);
+	function convertFormat({ schema, name, nullable, defaultValue, options }) {
+		const base = buildSchemaNode(schema, name, nullable, defaultValue);
 		if (schema.format === "int64") return (0, _kubb_ast.createSchema)({
-			type: mergedOptions.integerType === "bigint" ? "bigint" : "integer",
+			type: options.integerType === "bigint" ? "bigint" : "integer",
 			primitive: "integer",
 			...base,
 			min: schema.minimum,
@@ -1245,8 +1220,8 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			exclusiveMaximum: typeof schema.exclusiveMaximum === "number" ? schema.exclusiveMaximum : void 0
 		});
 		if (schema.format === "date-time" || schema.format === "date" || schema.format === "time") {
-			const dateType = getDateType(mergedOptions, schema.format);
-			if (!dateType) return void 0;
+			const dateType = getDateType(options, schema.format);
+			if (!dateType) return null;
 			if (dateType.type === "datetime") return (0, _kubb_ast.createSchema)({
 				...base,
 				primitive: "string",
@@ -1261,14 +1236,19 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 				representation: dateType.representation
 			});
 		}
-		const specialType = formatToSchemaType(schema.format);
-		if (!specialType) return void 0;
+		const specialType = getSchemaType(schema.format);
+		if (!specialType) return null;
 		const specialPrimitive = specialType === "number" || specialType === "integer" || specialType === "bigint" ? specialType : "string";
 		if (specialType === "number" || specialType === "integer" || specialType === "bigint") return (0, _kubb_ast.createSchema)({
 			...base,
 			primitive: specialPrimitive,
 			type: specialType
 		});
+		if (specialType === "url") return (0, _kubb_ast.createSchema)({
+			...base,
+			primitive: "string",
+			type: "url"
+		});
 		return (0, _kubb_ast.createSchema)({
 			...base,
 			primitive: specialPrimitive,
@@ -1277,37 +1257,20 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 	}
 	/**
 	* Converts an `enum` schema into an `EnumSchemaNode`.
-	*
-	* Handles several edge cases:
-	* - `{ type: 'array', enum }` (technically invalid OAS) — the enum is normalized into `items`.
-	* - `null` in enum values (OAS 3.0 nullable enum convention) — stripped and reflected as `nullable`.
-	* - `x-enumNames` / `x-enum-varnames` vendor extensions — produce named enum variants with explicit labels.
-	* - Numeric and boolean enums require a const-map representation because most generators cannot
-	*   use string-enum syntax for non-string values.
 	*/
-	function convertEnum({ schema, name, nullable, type, options }) {
-		if (type === "array") {
-			const rawSchema = schema;
-			const normalizedItems = {
-				...typeof rawSchema.items === "object" && !Array.isArray(rawSchema.items) ? rawSchema.items : {},
-				enum: schema.enum
-			};
-			const { enum: _enum, ...schemaWithoutEnum } = schema;
-			return convertSchema({
-				schema: {
-					...schemaWithoutEnum,
-					items: normalizedItems
-				},
-				name
-			}, options);
-		}
+	function convertEnum({ schema, name, nullable, type, rawOptions }) {
+		if (type === "array") return parseSchema({
+			schema: normalizeArrayEnum(schema),
+			name
+		}, rawOptions);
 		const nullInEnum = schema.enum.includes(null);
 		const filteredValues = nullInEnum ? schema.enum.filter((v) => v !== null) : schema.enum;
 		const enumNullable = nullable || nullInEnum || void 0;
 		const enumDefault = schema.default === null && enumNullable ? void 0 : schema.default;
+		const enumPrimitive = getPrimitiveType(type);
 		const enumBase = {
 			type: "enum",
-			primitive: getPrimitiveType(type),
+			primitive: enumPrimitive,
 			name,
 			title: schema.title,
 			description: schema.description,
@@ -1319,138 +1282,115 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			example: schema.example
 		};
 		const extensionKey = enumExtensionKeys.find((key) => key in schema);
-		if (extensionKey) {
-			const rawNames = schema[extensionKey];
-			const uniqueNames = [...new Set(rawNames)];
-			const enumType = getPrimitiveType(type) === "number" || getPrimitiveType(type) === "integer" ? "number" : getPrimitiveType(type) === "boolean" ? "boolean" : "string";
+		if (extensionKey || enumPrimitive === "number" || enumPrimitive === "integer" || enumPrimitive === "boolean") {
+			const enumPrimitiveType = enumPrimitive === "number" || enumPrimitive === "integer" ? "number" : enumPrimitive === "boolean" ? "boolean" : "string";
+			const sourceValues = extensionKey ? [...new Set(schema[extensionKey])] : [...new Set(filteredValues)];
 			return (0, _kubb_ast.createSchema)({
 				...enumBase,
-				enumType,
-				namedEnumValues: uniqueNames.map((label, index) => ({
+				primitive: enumPrimitiveType,
+				namedEnumValues: sourceValues.map((label, index) => ({
 					name: String(label),
-					value: filteredValues[index] ?? label,
-					format: enumType
+					value: extensionKey ? filteredValues[index] ?? label : label,
+					primitive: enumPrimitiveType
 				}))
 			});
 		}
-		if (type === "number" || type === "integer") return (0, _kubb_ast.createSchema)({
-			...enumBase,
-			enumType: "number",
-			namedEnumValues: [...new Set(filteredValues)].map((value) => ({
-				name: String(value),
-				value,
-				format: "number"
-			}))
-		});
-		if (type === "boolean") return (0, _kubb_ast.createSchema)({
-			...enumBase,
-			enumType: "boolean",
-			namedEnumValues: [...new Set(filteredValues)].map((value) => ({
-				name: String(value),
-				value,
-				format: "boolean"
-			}))
-		});
 		return (0, _kubb_ast.createSchema)({
 			...enumBase,
 			enumValues: [...new Set(filteredValues)]
 		});
 	}
 	/**
-	* Converts an object-like schema (`type: 'object'`, `properties`, `additionalProperties`,
-	* or `patternProperties`) into an `ObjectSchemaNode`.
-	*
-	* When a `discriminator` is present, the discriminator property's schema is replaced with an
-	* enum of the mapping keys so generators can produce a precise literal-union type for it.
-	*
-	* Property optionality follows OAS semantics:
-	* - required + not nullable → `required: true`
-	* - not required + not nullable → `optional: true`
-	* - not required + nullable → `nullish: true`
+	* Converts an object-like schema into an `ObjectSchemaNode`.
 	*/
-	function convertObject({ schema, name, nullable, defaultValue, options, mergedOptions }) {
-		const resolvedSchema = applyDiscriminatorEnum(schema);
-		const properties = resolvedSchema.properties ? Object.entries(resolvedSchema.properties).map(([propName, propSchema]) => {
-			const required = Array.isArray(resolvedSchema.required) ? resolvedSchema.required.includes(propName) : !!resolvedSchema.required;
+	function convertObject({ schema, name, nullable, defaultValue, rawOptions, options }) {
+		const properties = schema.properties ? Object.entries(schema.properties).map(([propName, propSchema]) => {
+			const required = Array.isArray(schema.required) ? schema.required.includes(propName) : !!schema.required;
 			const resolvedPropSchema = propSchema;
 			const propNullable = isNullable(resolvedPropSchema);
+			let schemaNode = (0, _kubb_ast.setEnumName)(parseSchema({
+				schema: resolvedPropSchema,
+				name: (0, _kubb_ast.childName)(name, propName)
+			}, rawOptions), name, propName, options.enumSuffix);
+			const tupleNode = (0, _kubb_ast.narrowSchema)(schemaNode, "tuple");
+			if (tupleNode?.items) {
+				const namedItems = tupleNode.items.map((item) => (0, _kubb_ast.setEnumName)(item, name, propName, options.enumSuffix));
+				if (namedItems.some((item, i) => item !== tupleNode.items[i])) schemaNode = {
+					...tupleNode,
+					items: namedItems
+				};
+			}
 			return (0, _kubb_ast.createProperty)({
 				name: propName,
 				schema: {
-					...convertSchema({
-						schema: resolvedPropSchema,
-						name: name ? pascalCase([
-							name,
-							propName,
-							mergedOptions.enumSuffix
-						].filter(Boolean).join(" ")) : void 0
-					}, options),
-					nullable: propNullable || void 0,
-					optional: !required && !propNullable ? true : void 0,
-					nullish: !required && propNullable ? true : void 0
+					...schemaNode,
+					nullable: schemaNode.type === "null" ? void 0 : propNullable || void 0
 				},
 				required
 			});
 		}) : [];
-		const additionalProperties = resolvedSchema.additionalProperties;
+		const additionalProperties = schema.additionalProperties;
 		let additionalPropertiesNode;
 		if (additionalProperties === true) additionalPropertiesNode = true;
-		else if (additionalProperties && Object.keys(additionalProperties).length > 0) additionalPropertiesNode = convertSchema({ schema: additionalProperties }, options);
+		else if (additionalProperties && Object.keys(additionalProperties).length > 0) additionalPropertiesNode = parseSchema({ schema: additionalProperties }, rawOptions);
 		else if (additionalProperties === false) additionalPropertiesNode = void 0;
-		else if (additionalProperties) additionalPropertiesNode = (0, _kubb_ast.createSchema)({ type: resolveTypeOption(mergedOptions.unknownType) });
-		const rawPatternProperties = "patternProperties" in resolvedSchema ? resolvedSchema.patternProperties : void 0;
-		const patternProperties = rawPatternProperties ? Object.fromEntries(Object.entries(rawPatternProperties).map(([pattern, patternSchema]) => [pattern, patternSchema === true || Object.keys(patternSchema).length === 0 ? (0, _kubb_ast.createSchema)({ type: resolveTypeOption(mergedOptions.unknownType) }) : convertSchema({ schema: patternSchema }, options)])) : void 0;
-		return (0, _kubb_ast.createSchema)({
+		else if (additionalProperties) additionalPropertiesNode = (0, _kubb_ast.createSchema)({ type: typeOptionMap.get(options.unknownType) });
+		const rawPatternProperties = "patternProperties" in schema ? schema.patternProperties : void 0;
+		const patternProperties = rawPatternProperties ? Object.fromEntries(Object.entries(rawPatternProperties).map(([pattern, patternSchema]) => [pattern, patternSchema === true || typeof patternSchema === "object" && Object.keys(patternSchema).length === 0 ? (0, _kubb_ast.createSchema)({ type: typeOptionMap.get(options.unknownType) }) : parseSchema({ schema: patternSchema }, rawOptions)])) : void 0;
+		const objectNode = (0, _kubb_ast.createSchema)({
 			type: "object",
 			primitive: "object",
 			properties,
 			additionalProperties: additionalPropertiesNode,
 			patternProperties,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
+		if (isDiscriminator(schema) && schema.discriminator.mapping) {
+			const discPropName = schema.discriminator.propertyName;
+			return (0, _kubb_ast.setDiscriminatorEnum)({
+				node: objectNode,
+				propertyName: discPropName,
+				values: Object.keys(schema.discriminator.mapping),
+				enumName: name ? (0, _kubb_ast.enumPropName)(name, discPropName, options.enumSuffix) : void 0
+			});
+		}
+		return objectNode;
 	}
 	/**
 	* Converts an OAS 3.1 `prefixItems` tuple into a `TupleSchemaNode`.
-	*
-	* Each `prefixItems` element maps to a positional tuple slot. An optional `items` schema
-	* after the prefix items is mapped to the rest parameter of the tuple.
 	*/
-	function convertTuple({ schema, name, nullable, defaultValue, options }) {
-		const rawSchema = schema;
+	function convertTuple({ schema, name, nullable, defaultValue, rawOptions }) {
 		return (0, _kubb_ast.createSchema)({
 			type: "tuple",
 			primitive: "array",
-			items: rawSchema.prefixItems.map((item) => convertSchema({ schema: item }, options)),
-			rest: rawSchema.items ? convertSchema({ schema: rawSchema.items }, options) : void 0,
+			items: (schema.prefixItems ?? []).map((item) => parseSchema({ schema: item }, rawOptions)),
+			rest: schema.items ? parseSchema({ schema: schema.items }, rawOptions) : (0, _kubb_ast.createSchema)({ type: "any" }),
 			min: schema.minItems,
 			max: schema.maxItems,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
 	* Converts a `type: 'array'` schema into an `ArraySchemaNode`.
-	*
-	* When the items schema is an inline enum, a name derived from the parent array's name and
-	* `enumSuffix` is forwarded so generators can emit a named enum declaration.
 	*/
-	function convertArray({ schema, name, nullable, defaultValue, options, mergedOptions }) {
-		const rawSchema = schema;
-		const itemName = rawSchema.items?.enum?.length && name ? pascalCase([name, mergedOptions.enumSuffix].join(" ")) : void 0;
+	function convertArray({ schema, name, nullable, defaultValue, rawOptions, options }) {
+		const rawItems = schema.items;
+		const itemName = rawItems?.enum?.length && name ? (0, _kubb_ast.enumPropName)(void 0, name, options.enumSuffix) : void 0;
 		return (0, _kubb_ast.createSchema)({
 			type: "array",
 			primitive: "array",
-			items: rawSchema.items ? [convertSchema({
-				schema: rawSchema.items,
+			items: rawItems ? [parseSchema({
+				schema: rawItems,
 				name: itemName
-			}, options)] : [],
+			}, rawOptions)] : [],
 			min: schema.minItems,
 			max: schema.maxItems,
 			unique: schema.uniqueItems ?? void 0,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
-	* Converts a `type: 'string'` schema (without a special format) into a `StringSchemaNode`.
+	* Converts a `type: 'string'` schema into a `StringSchemaNode`.
 	*/
 	function convertString({ schema, name, nullable, defaultValue }) {
 		return (0, _kubb_ast.createSchema)({
@@ -1459,11 +1399,11 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			min: schema.minLength,
 			max: schema.maxLength,
 			pattern: schema.pattern,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
-	* Converts a `type: 'number'` or `type: 'integer'` schema into the corresponding `SchemaNode`.
+	* Converts a `type: 'number'` or `type: 'integer'` schema.
 	*/
 	function convertNumeric({ schema, name, nullable, defaultValue }, type) {
 		return (0, _kubb_ast.createSchema)({
@@ -1473,21 +1413,21 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			max: schema.maximum,
 			exclusiveMinimum: typeof schema.exclusiveMinimum === "number" ? schema.exclusiveMinimum : void 0,
 			exclusiveMaximum: typeof schema.exclusiveMaximum === "number" ? schema.exclusiveMaximum : void 0,
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
-	* Converts a `type: 'boolean'` schema into a `BooleanSchemaNode`.
+	* Converts a `type: 'boolean'` schema.
 	*/
 	function convertBoolean({ schema, name, nullable, defaultValue }) {
 		return (0, _kubb_ast.createSchema)({
 			type: "boolean",
 			primitive: "boolean",
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
 	}
 	/**
-	* Converts an explicit `type: 'null'` or `const: null` schema into a `NullSchemaNode`.
+	* Converts an explicit `type: 'null'` schema.
 	*/
 	function convertNull({ schema, name, nullable }) {
 		return (0, _kubb_ast.createSchema)({
@@ -1501,31 +1441,22 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 		});
 	}
 	/**
-	* Central dispatcher: converts an OAS `SchemaObject` into a `SchemaNode`.
+	* Central dispatcher that converts an OAS `SchemaObject` into a `SchemaNode`.
 	*
-	* Dispatch order (first match wins):
-	* 1. `$ref` pointer
-	* 2. `allOf` composition
-	* 3. `oneOf` / `anyOf` union
-	* 4. `const` literal (OAS 3.1)
-	* 5. `format`-based special type (date/time, uuid, blob, …)
-	* 6. OAS 3.1 `contentMediaType: 'application/octet-stream'` blob
-	* 7. OAS 3.1 multi-type array → union or fallthrough
-	* 8. Constraint-inferred type (minLength/maxLength → string; minimum/maximum → number)
-	* 9. `enum` values
-	* 10. Object / array / tuple / scalar by `type`
-	* 11. Empty schema fallback (`emptySchemaType` option)
+	* Dispatch order (first match wins): `$ref` → `allOf` → `oneOf`/`anyOf` → `const` → `format`
+	* → octet-stream blob → multi-type array → constraint-inferred type → `enum` → object/array/tuple/scalar
+	* → empty-schema fallback (`emptySchemaType` option).
 	*/
-	function convertSchema({ schema, name }, options) {
-		const mergedOptions = {
-			...DEFAULT_OPTIONS,
-			...options
+	function parseSchema({ schema, name }, rawOptions) {
+		const options = {
+			...DEFAULT_PARSER_OPTIONS,
+			...rawOptions
 		};
 		const flattenedSchema = flattenSchema(schema);
-		if (flattenedSchema && flattenedSchema !== schema) return convertSchema({
+		if (flattenedSchema && flattenedSchema !== schema) return parseSchema({
 			schema: flattenedSchema,
 			name
-		}, options);
+		}, rawOptions);
 		const nullable = isNullable(schema) || void 0;
 		const defaultValue = schema.default === null && nullable ? void 0 : schema.default;
 		const type = Array.isArray(schema.type) ? schema.type[0] : schema.type;
@@ -1535,8 +1466,8 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			nullable,
 			defaultValue,
 			type,
-			options,
-			mergedOptions
+			rawOptions,
+			options
 		};
 		if (isReference(schema)) return convertRef(ctx);
 		if (schema.allOf?.length) return convertAllOf(ctx);
@@ -1549,18 +1480,21 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 		if (schema.type === "string" && schema.contentMediaType === "application/octet-stream") return (0, _kubb_ast.createSchema)({
 			type: "blob",
 			primitive: "string",
-			...buildSchemaBase(schema, name, nullable, defaultValue)
+			...buildSchemaNode(schema, name, nullable, defaultValue)
 		});
 		if (Array.isArray(schema.type) && schema.type.length > 1) {
 			const nonNullTypes = schema.type.filter((t) => t !== "null");
 			const arrayNullable = schema.type.includes("null") || nullable || void 0;
 			if (nonNullTypes.length > 1) return (0, _kubb_ast.createSchema)({
 				type: "union",
-				members: nonNullTypes.map((t) => convertSchema({ schema: {
-					...schema,
-					type: t
-				} }, options)),
-				...buildSchemaBase(schema, name, arrayNullable, defaultValue)
+				members: nonNullTypes.map((t) => parseSchema({
+					schema: {
+						...schema,
+						type: t
+					},
+					name
+				}, rawOptions)),
+				...buildSchemaNode(schema, name, arrayNullable, defaultValue)
 			});
 		}
 		if (!type) {
@@ -1577,52 +1511,62 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 		if (type === "boolean") return convertBoolean(ctx);
 		if (type === "null") return convertNull(ctx);
 		return (0, _kubb_ast.createSchema)({
-			type: resolveTypeOption(mergedOptions.emptySchemaType),
+			type: typeOptionMap.get(options.emptySchemaType),
 			name,
 			title: schema.title,
 			description: schema.description
 		});
 	}
 	/**
-	* Converts a single dereferenced OAS parameter object into a `ParameterNode`.
-	* When the parameter has no `schema` or its schema is a `$ref`, falls back to `unknownType`.
+	* Converts a dereferenced OAS parameter object into a `ParameterNode`.
 	*/
 	function parseParameter(options, param) {
-		const schema = param["schema"] && !isReference(param["schema"]) ? convertSchema({ schema: param["schema"] }, options) : (0, _kubb_ast.createSchema)({ type: resolveTypeOption(options.unknownType) });
+		const required = param["required"] ?? false;
+		const schema = param["schema"] ? parseSchema({ schema: param["schema"] }, options) : (0, _kubb_ast.createSchema)({ type: typeOptionMap.get(options.unknownType) });
 		return (0, _kubb_ast.createParameter)({
 			name: param["name"],
 			in: param["in"],
-			schema,
-			required: param["required"] ?? false
+			schema: {
+				...schema,
+				description: param["description"] ?? schema.description
+			},
+			required
 		});
 	}
 	/**
-	* Converts an OAS `Operation` into an `OperationNode`, resolving parameters,
-	* request body, and all response codes into their AST node equivalents.
+	* Converts an OAS `Operation` into an `OperationNode`.
 	*/
-	function parseOperation(options, oas, operation) {
-		const parameters = operation.getParameters().map((param) => {
-			return parseParameter(options, oas.dereferenceWithRef(param));
-		});
-		const requestBodySchema = oas.getRequestSchema(operation);
-		const requestBody = requestBodySchema ? convertSchema({ schema: requestBodySchema }, options) : void 0;
+	function parseOperation(options, operation) {
+		const parameters = getParameters(document, operation).map((param) => parseParameter(options, param));
+		const requestBodySchema = getRequestSchema(document, operation, { contentType: ctx.contentType });
+		const requestBodySchemaNode = requestBodySchema ? parseSchema({ schema: requestBodySchema }, options) : void 0;
+		const requestBodyDescription = operation.schema.requestBody && !isReference(operation.schema.requestBody) ? operation.schema.requestBody.description : void 0;
+		const requestBodyKeysToOmit = requestBodySchema?.properties ? Object.entries(requestBodySchema.properties).filter(([, prop]) => !isReference(prop) && prop.readOnly).map(([key]) => key) : void 0;
+		const requestBody = requestBodySchemaNode ? {
+			description: requestBodyDescription,
+			schema: requestBodySchemaNode,
+			keysToOmit: requestBodyKeysToOmit?.length ? requestBodyKeysToOmit : void 0
+		} : void 0;
 		const responses = operation.getResponseStatusCodes().map((statusCode) => {
 			const responseObj = operation.getResponseByStatusCode(statusCode);
-			const responseSchema = oas.getResponseSchema(operation, statusCode);
-			const schema = responseSchema && Object.keys(responseSchema).length > 0 ? convertSchema({ schema: responseSchema }, options) : void 0;
+			const responseSchema = getResponseSchema(document, operation, statusCode, { contentType: ctx.contentType });
+			const schema = responseSchema && Object.keys(responseSchema).length > 0 ? parseSchema({ schema: responseSchema }, options) : (0, _kubb_ast.createSchema)({ type: typeOptionMap.get(options.emptySchemaType) });
 			const description = typeof responseObj === "object" && responseObj !== null && !Array.isArray(responseObj) ? responseObj.description : void 0;
 			const rawContent = typeof responseObj === "object" && responseObj !== null && !Array.isArray(responseObj) ? responseObj.content : void 0;
+			const mediaType = rawContent ? getMediaType(Object.keys(rawContent)[0] ?? "") : getMediaType(operation.contentType ?? "");
+			const keysToOmit = responseSchema?.properties ? Object.entries(responseSchema.properties).filter(([, prop]) => !isReference(prop) && prop.writeOnly).map(([key]) => key) : void 0;
 			return (0, _kubb_ast.createResponse)({
 				statusCode,
 				description,
 				schema,
-				mediaType: rawContent ? toMediaType(Object.keys(rawContent)[0] ?? "") : toMediaType(operation.contentType ?? "")
+				mediaType,
+				keysToOmit: keysToOmit?.length ? keysToOmit : void 0
 			});
 		});
 		return (0, _kubb_ast.createOperation)({
 			operationId: operation.getOperationId(),
 			method: operation.method.toUpperCase(),
-			path: operation.path,
+			path: new URLPath(operation.path).URL,
 			tags: operation.getTags().map((tag) => tag.name),
 			summary: operation.getSummary() || void 0,
 			description: operation.getDescription() || void 0,
@@ -1632,165 +1576,145 @@ function createOasParser(oas, { contentType, collisionDetection } = {}) {
 			responses
 		});
 	}
-	/**
-	* Converts an OpenAPI/Swagger spec (wrapped in a Kubb `Oas` instance) into
-	* a `RootNode` — the top-level node of the `@kubb/ast` tree.
-	*/
-	function parse(options) {
-		const mergedOptions = {
-			...DEFAULT_OPTIONS,
-			...options
-		};
-		const schemas = Object.entries(schemaObjects).map(([name, schemaObject]) => convertSchema({
-			schema: schemaObject,
-			name
-		}, mergedOptions));
-		const paths = oas.getPaths();
-		return (0, _kubb_ast.createRoot)({
-			schemas,
-			operations: Object.entries(paths).flatMap(([_path, methods]) => Object.entries(methods).map(([, operation]) => operation ? parseOperation(mergedOptions, oas, operation) : null).filter((op) => op !== null))
-		});
-	}
-	/**
-	* Walks a `SchemaNode` tree and resolves all `ref` node names through the provided callbacks.
-	*
-	* `resolveName` handles all schema types; `resolveEnumName` (when provided) takes precedence
-	* for `enum` nodes, enabling a separate naming strategy for enums (e.g. different suffix).
-	*
-	* Collision-resolved names (from `nameMapping`) are applied before user-supplied resolvers.
-	*/
-	function resolveRefs(node, resolveName, resolveEnumName) {
-		return (0, _kubb_ast.transform)(node, { schema(schemaNode) {
-			const schemaRef = (0, _kubb_ast.narrowSchema)(schemaNode, _kubb_ast.schemaTypes.ref);
-			if (schemaRef && (schemaRef.ref || schemaRef.name)) {
-				const rawRef = schemaRef.ref ?? schemaRef.name;
-				const resolved = resolveName(nameMapping.get(rawRef) ?? rawRef);
-				if (resolved) return {
-					...schemaNode,
-					name: resolved
-				};
-			}
-			if (schemaNode.type === "enum" && schemaNode.name) {
-				const resolved = (resolveEnumName ?? resolveName)(schemaNode.name);
-				if (resolved) return {
-					...schemaNode,
-					name: resolved
-				};
-			}
-		} });
-	}
-	/**
-	* Collects all `KubbFile.Import` descriptors needed by a `SchemaNode` tree.
-	*
-	* Walks the tree looking for `ref` nodes, verifies each `$ref` is resolvable in the spec,
-	* applies collision-resolved names from `nameMapping`, and calls `resolve` to obtain the
-	* import path and name. Returns an empty array for refs that cannot be resolved.
-	*/
-	function getImports(node, resolve) {
-		return (0, _kubb_ast.collect)(node, { schema(schemaNode) {
-			if (schemaNode.type !== "ref" || !schemaNode.ref) return;
-			if (!oas.get(schemaNode.ref)) return;
-			const rawName = extractRefName(schemaNode.ref);
-			const result = resolve(nameMapping.get(rawName) ?? rawName);
-			if (!result) return;
-			return {
-				name: [result.name],
-				path: result.path
-			};
-		} });
-	}
 	return {
-		parse,
-		convertSchema,
-		resolveRefs,
-		getImports
+		parseSchema,
+		parseOperation,
+		parseParameter
+	};
+}
+/**
+* Converts the entire OpenAPI spec into a `RootNode` (the top-level `@kubb/ast` tree).
+*
+* This is the main entry point: `OpenAPI / Swagger → Kubb AST`.
+* No code is generated here — the resulting tree is spec-agnostic and consumed by
+* downstream plugins (`plugin-ts`, `plugin-zod`, …).
+*
+* @example
+* ```ts
+* const document = await parseFromConfig(config)
+* const root = parseOas(document, { dateType: 'date', contentType: 'application/json' })
+* ```
+*/
+function parseOas(document, options = {}) {
+	const { contentType, ...parserOptions } = options;
+	const mergedOptions = {
+		...DEFAULT_PARSER_OPTIONS,
+		...parserOptions
+	};
+	const { schemas: schemaObjects, nameMapping } = getSchemas(document, { contentType });
+	const { parseSchema: _parseSchema, parseOperation: _parseOperation } = createSchemaParser({
+		document,
+		contentType
+	});
+	const schemas = Object.entries(schemaObjects).map(([name, schema]) => _parseSchema({
+		schema,
+		name
+	}, mergedOptions));
+	const paths = new oas.default(document).getPaths();
+	return {
+		root: (0, _kubb_ast.createRoot)({
+			schemas,
+			operations: Object.entries(paths).flatMap(([_path, methods]) => Object.entries(methods).map(([, operation]) => operation ? _parseOperation(mergedOptions, operation) : null).filter((op) => op !== null))
+		}),
+		nameMapping
 	};
 }
 //#endregion
 //#region src/adapter.ts
+/**
+* Stable string identifier for the OAS adapter used in Kubb's adapter registry.
+*/
 const adapterOasName = "oas";
 /**
-* Creates an OpenAPI / Swagger adapter for Kubb.
+* Creates the default OpenAPI / Swagger adapter for Kubb.
 *
-* This is the default adapter — you can omit it from your config when using
-* an OpenAPI spec, but supplying it explicitly lets you pass options.
+* Parses the spec, optionally validates it, resolves the base URL, and converts
+* everything into a `RootNode` that downstream plugins consume.
 *
 * @example
 * ```ts
 * import { defineConfig } from '@kubb/core'
 * import { adapterOas } from '@kubb/adapter-oas'
+* import { pluginTs } from '@kubb/plugin-ts'
 *
 * export default defineConfig({
-*   adapter: adapterOas({ validate: true, dateType: 'date' }),
-*   input:   { path: './openapi.yaml' },
-*   plugins: [pluginTs(), pluginZod()],
+*   adapter: adapterOas({ dateType: 'date', serverIndex: 0 }),
+*   input: { path: './openapi.yaml' },
+*   plugins: [pluginTs()],
 * })
 * ```
 */
-const adapterOas = (0, _kubb_core.defineAdapter)((options) => {
-	const { validate = true, oasClass, contentType, serverIndex, serverVariables, discriminator = "strict", collisionDetection = false, dateType = "string", integerType = "number", unknownType = "any", emptySchemaType = unknownType } = options;
+const adapterOas = (0, _kubb_core.createAdapter)((options) => {
+	const { validate = true, contentType, serverIndex, serverVariables, discriminator = "strict", dateType = DEFAULT_PARSER_OPTIONS.dateType, integerType = DEFAULT_PARSER_OPTIONS.integerType, unknownType = DEFAULT_PARSER_OPTIONS.unknownType, enumSuffix = DEFAULT_PARSER_OPTIONS.enumSuffix, emptySchemaType = unknownType || DEFAULT_PARSER_OPTIONS.emptySchemaType } = options;
+	let nameMapping = /* @__PURE__ */ new Map();
+	let parsedDocument;
+	let rootNode;
 	return {
 		name: "oas",
-		options: {
-			validate,
-			oasClass,
-			contentType,
-			serverIndex,
-			serverVariables,
-			discriminator,
-			collisionDetection,
-			dateType,
-			integerType,
-			unknownType,
-			emptySchemaType
-		},
-		async parse(source) {
-			const oas = await parseFromConfig(sourceToFakeConfig(source), oasClass);
-			oas.setOptions({
+		get options() {
+			return {
+				validate,
 				contentType,
+				serverIndex,
+				serverVariables,
 				discriminator,
-				collisionDetection
+				dateType,
+				integerType,
+				unknownType,
+				emptySchemaType,
+				enumSuffix,
+				nameMapping
+			};
+		},
+		get document() {
+			return parsedDocument;
+		},
+		get rootNode() {
+			return rootNode;
+		},
+		getImports(node, resolve) {
+			return (0, _kubb_ast.collectImports)({
+				node,
+				nameMapping,
+				resolve: (schemaName) => {
+					const result = resolve(schemaName);
+					if (!result) return;
+					return {
+						name: [result.name],
+						path: result.path
+					};
+				}
 			});
-			if (validate) try {
-				await oas.validate();
-			} catch (_err) {}
-			const server = serverIndex !== void 0 ? oas.api.servers?.at(serverIndex) : void 0;
+		},
+		async parse(source) {
+			const document = await parseFromConfig(source);
+			if (validate) await validateDocument(document);
+			const server = serverIndex !== void 0 ? document.servers?.at(serverIndex) : void 0;
 			const baseURL = server?.url ? resolveServerUrl(server, serverVariables) : void 0;
-			return (0, _kubb_ast.createRoot)({
-				...createOasParser(oas, {
-					contentType,
-					collisionDetection
-				}).parse({
-					dateType,
-					integerType,
-					unknownType,
-					emptySchemaType
-				}),
+			const { root: parsedRoot, nameMapping: parsedNameMapping } = parseOas(document, {
+				contentType,
+				dateType,
+				integerType,
+				unknownType,
+				emptySchemaType,
+				enumSuffix
+			});
+			const node = discriminator === "inherit" ? applyDiscriminatorInheritance(parsedRoot) : parsedRoot;
+			nameMapping = parsedNameMapping;
+			parsedDocument = document;
+			rootNode = (0, _kubb_ast.createRoot)({
+				...node,
 				meta: {
-					title: oas.api.info?.title,
-					version: oas.api.info?.version,
+					title: document.info?.title,
+					description: document.info?.description,
+					version: document.info?.version,
 					baseURL
 				}
 			});
+			return rootNode;
 		}
 	};
 });
-function sourceToFakeConfig(source) {
-	switch (source.type) {
-		case "path": return {
-			root: node_path.default.dirname(source.path),
-			input: { path: source.path }
-		};
-		case "data": return {
-			root: process.cwd(),
-			input: { data: source.data }
-		};
-		case "paths": return {
-			root: source.paths[0] ? node_path.default.dirname(source.paths[0]) : process.cwd(),
-			input: source.paths.map((p) => ({ path: p }))
-		};
-	}
-}
 //#endregion
 exports.adapterOas = adapterOas;
 exports.adapterOasName = adapterOasName;