@hey-api/shared 0.4.8 → 0.5.0

package/dist/index.mjs

@@ -330,6 +330,15 @@ function isPlainObject(value) {
 	const proto = Object.getPrototypeOf(value);
 	return proto === Object.prototype || proto === null;
 }
+function deepMerge(target, source) {
+	if (isPlainObject(target) && isPlainObject(source)) {
+		const result = { ...target };
+		for (const key of Object.keys(source)) if (key in target) result[key] = deepMerge(target[key], source[key]);
+		else result[key] = source[key];
+		return result;
+	}
+	return source;
+}
 //#endregion
 //#region src/normalize/opaque.ts
 const OPAQUE = Symbol("opaque");
@@ -421,15 +430,20 @@ function resolveTable(input, table, { ancestor = {}, context = {}, resolvedCasca
 }
 function collectDeps(spec, resolved, deps) {
 	const { $dependencies } = spec;
-	if ($dependencies) for (const key of $dependencies) {
-		const value = resolved[key];
-		if (value && typeof value === "string") deps.add(value);
-	}
+	if ($dependencies) for (const key of $dependencies) addDependencyValue(resolved[key], deps);
 	for (const [key, specVal] of Object.entries(spec)) {
 		if (key.startsWith("$")) continue;
 		if (isPlainObject(specVal) && isPlainObject(resolved[key])) collectDeps(specVal, resolved[key], deps);
 	}
 }
+function addDependencyValue(value, deps) {
+	if (!value) return;
+	if (typeof value === "string") {
+		deps.add(value);
+		return;
+	}
+	if (Array.isArray(value)) for (const item of value) addDependencyValue(item, deps);
+}
 function resolveField(defaultVal, currentVal, key, { ancestor, context, resolvedCascade, specAncestor }) {
 	if (isCoercer(defaultVal)) return defaultVal[COERCER](currentVal, context);
 	if (isPlainObject(defaultVal)) {
@@ -975,26 +989,26 @@ const graph = {
 };
 //#endregion
 //#region src/ir/parameter.ts
-const getPaginationSchema = ({ context, parameter }) => {
+function getPaginationSchema({ context, parameter }) {
 	if (!parameter.pagination) return;
 	if (parameter.pagination === true) return parameter.schema;
 	let schema = parameter.schema;
 	if (schema.$ref) schema = context.resolveIrRef(schema.$ref);
 	return schema.properties[parameter.pagination];
-};
-const hasParameterGroupObjectRequired = (parameterGroup) => {
+}
+function hasParameterGroupObjectRequired(parameterGroup) {
 	for (const name in parameterGroup) if (parameterGroup[name].required) return true;
 	return false;
-};
-const hasParametersObjectRequired = (parameters) => {
+}
+function hasParametersObjectRequired(parameters) {
 	if (!parameters) return false;
 	if (hasParameterGroupObjectRequired(parameters.cookie)) return true;
 	if (hasParameterGroupObjectRequired(parameters.header)) return true;
 	if (hasParameterGroupObjectRequired(parameters.path)) return true;
 	if (hasParameterGroupObjectRequired(parameters.query)) return true;
 	return false;
-};
-const parameterWithPagination = ({ context, parameters }) => {
+}
+function parameterWithPagination({ context, parameters }) {
 	if (!parameters) return;
 	for (const name in parameters.cookie) {
 		const parameter = parameters.cookie[name];
@@ -1040,7 +1054,7 @@ const parameterWithPagination = ({ context, parameters }) => {
 			})
 		};
 	}
-};
+}
 //#endregion
 //#region src/ir/schema.ts
 /**
@@ -1114,13 +1128,15 @@ function addItemsToSchema({ items, logicalOperator = "or", mutateSchemaOneItem =
 }
 //#endregion
 //#region src/ir/operation.ts
-const hasOperationDataRequired = (operation) => {
+function hasOperationDataRequired(operation) {
 	if (hasParametersObjectRequired(operation.parameters)) return true;
 	if (operation.body?.required) return true;
 	return false;
-};
-const createOperationKey = ({ method, path }) => `${method.toUpperCase()} ${path}`;
-const operationPagination = ({ context, operation }) => {
+}
+function createOperationKey({ method, path }) {
+	return `${method.toUpperCase()} ${path}`;
+}
+function operationPagination({ context, operation }) {
 	const body = operation.body;
 	if (!body || !body.pagination) return parameterWithPagination({
 		context,
@@ -1143,8 +1159,8 @@ const operationPagination = ({ context, operation }) => {
 		name: body.pagination,
 		schema: paginationProp
 	};
-};
-const statusCodeToGroup = ({ statusCode }) => {
+}
+function statusCodeToGroup({ statusCode }) {
 	switch (statusCode) {
 		case "1XX": return "1XX";
 		case "2XX": return "2XX";
@@ -1154,8 +1170,8 @@ const statusCodeToGroup = ({ statusCode }) => {
 		case "default": return "default";
 		default: return `${statusCode[0]}XX`;
 	}
-};
-const operationResponsesMap = (operation) => {
+}
+function operationResponsesMap(operation) {
 	const result = {};
 	if (!operation.responses) return result;
 	const errors = {
@@ -1227,7 +1243,7 @@ const operationResponsesMap = (operation) => {
 		if (Object.keys(responseUnion).length && responseUnion.type !== "unknown") result.response = responseUnion;
 	}
 	return result;
-};
+}
 //#endregion
 //#region src/utils/naming/naming.ts
 const uppercaseRegExp = /[\p{Lu}]/u;
@@ -1985,13 +2001,6 @@ var SymbolFactory = class {
 		}
 		return result;
 	}
-	external(resource, meta = {}) {
-		return this.project.symbols.reference({
-			...meta,
-			category: "external",
-			resource
-		});
-	}
 	isRegistered(identifier) {
 		return this.project.symbols.isRegistered(identifier);
 	}
@@ -2038,12 +2047,12 @@ var SymbolFactory = class {
 //#endregion
 //#region src/plugins/shared/utils/instance.ts
 function defaultGetFilePath(symbol) {
-	if (!symbol.meta?.pluginName || typeof symbol.meta.pluginName !== "string") return;
-	if (symbol.meta.pluginName.startsWith("@hey-api/client-")) return "client";
-	if (symbol.meta.pluginName === "@hey-api/typescript") return "types";
-	if (symbol.meta.pluginName === "@hey-api/python-sdk") return "sdk";
-	if (symbol.meta.pluginName.startsWith("@hey-api/")) return symbol.meta.pluginName.split("/")[1];
-	return symbol.meta.pluginName;
+	if (!symbol.meta?.plugin || typeof symbol.meta.plugin !== "string") return;
+	if (symbol.meta.plugin.startsWith("@hey-api/client-")) return "client";
+	if (symbol.meta.plugin === "@hey-api/typescript") return "types";
+	if (symbol.meta.plugin === "@hey-api/python-sdk") return "sdk";
+	if (symbol.meta.plugin.startsWith("@hey-api/")) return symbol.meta.plugin.split("/")[1];
+	return symbol.meta.plugin;
 }
 const defaultGetKind = (operation) => {
 	switch (operation.method) {
@@ -2063,6 +2072,8 @@ var PluginInstance = class {
 	eventHooks;
 	gen;
 	handler;
+	/** External symbols imported from other modules. */
+	imports;
 	name;
 	/**
 	* The package metadata and utilities for the current context, constructed
@@ -2073,12 +2084,10 @@ var PluginInstance = class {
 	package;
 	/** Factory for creating and managing symbols. */
 	symbolFactory;
-	/** Symbols declared in the plugin config. */
-	symbols;
-	external;
+	/** Metadata merged into every symbol this plugin creates. */
+	symbolMeta;
 	isSymbolRegistered;
 	querySymbol;
-	querySymbols;
 	referenceSymbol;
 	constructor(props) {
 		this.api = props.api ?? {};
@@ -2089,18 +2098,21 @@ var PluginInstance = class {
 		this.handler = props.handler;
 		this.name = props.name;
 		this.package = props.context.package;
-		this.eventHooks = SymbolFactory.buildEventHooks([this.config["~hooks"]?.events, this.context.config.parser.hooks.events]);
+		this.symbolMeta = props.symbolMeta;
+		this.eventHooks = SymbolFactory.buildEventHooks([
+			this.config["~hooks"]?.events,
+			this.config.$hooks?.events,
+			this.context.config.parser.hooks.events
+		]);
 		this.symbolFactory = new SymbolFactory({
 			eventHooks: this.eventHooks,
 			plugin: this,
 			project: this.gen
 		});
-		this.external = this.symbolFactory.external.bind(this.symbolFactory);
 		this.isSymbolRegistered = this.symbolFactory.isRegistered.bind(this.symbolFactory);
 		this.querySymbol = this.symbolFactory.query.bind(this.symbolFactory);
-		this.querySymbols = this.symbolFactory.queryAll.bind(this.symbolFactory);
 		this.referenceSymbol = this.symbolFactory.reference.bind(this.symbolFactory);
-		this.symbols = props.symbols?.(this) ?? {};
+		this.imports = props.imports?.(this) ?? {};
 	}
 	forEach(...args) {
 		if (!this.context.graph) throw new Error("No graph available in context");
@@ -2194,8 +2206,10 @@ var PluginInstance = class {
 	getHooks(selector, ...customHooks) {
 		const result = [];
 		for (const hook of customHooks) if (hook) result.push(hook);
-		const local = selector(this.config["~hooks"] ?? {});
+		const local = selector(this.config.$hooks ?? {});
 		if (local) result.push(local);
+		const localDeprecated = selector(this.config["~hooks"] ?? {});
+		if (localDeprecated) result.push(localDeprecated);
 		const global = selector(this.context.config.parser.hooks);
 		if (global) result.push(global);
 		return result;
@@ -2257,12 +2271,6 @@ var PluginInstance = class {
 		return result;
 	}
 	/**
-	* Alias for `symbol()` method with single argument.
-	*/
-	registerSymbol(symbol) {
-		return this.symbol(symbol.name, symbol);
-	}
-	/**
 	* Executes plugin's handler function.
 	*/
 	async run() {
@@ -2270,15 +2278,25 @@ var PluginInstance = class {
 		await this.handler({ plugin: this });
 		for (const hook of this.eventHooks["plugin:handler:after"]) hook({ plugin: this });
 	}
-	symbol(name, symbol = {}) {
+	symbol(nameOrSymbol, symbolArg = {}) {
+		let name;
+		let symbol;
+		if (typeof nameOrSymbol === "object") {
+			const { name: _name, ...rest } = nameOrSymbol;
+			name = _name;
+			symbol = rest;
+		} else {
+			name = nameOrSymbol;
+			symbol = symbolArg;
+		}
+		const meta = !symbol.external && this.symbolMeta ? this.symbolMeta(symbol) : {};
+		Object.assign(meta, symbol.meta);
+		if (!symbol.external) meta.plugin = path.isAbsolute(this.name) ? "custom" : this.name;
 		return this.symbolFactory.register(name, {
 			...symbol,
 			getExportFromFilePath: symbol.getExportFromFilePath ?? this.getSymbolExportFromFilePath.bind(this),
 			getFilePath: symbol.getFilePath ?? this.getSymbolFilePath.bind(this),
-			meta: {
-				...symbol.external ? {} : { pluginName: path.isAbsolute(this.name) ? "custom" : this.name },
-				...symbol.meta
-			}
+			meta
 		});
 	}
 	/**
@@ -2289,7 +2307,7 @@ var PluginInstance = class {
 	symbolOnce(name, symbol = {}) {
 		if (symbol.external) return this.symbol(name, symbol);
 		if (symbol.meta) {
-			const existing = this.querySymbols(symbol.meta).find((s) => s.name === name);
+			const existing = this.symbolFactory.queryAll(symbol.meta).find((s) => s.name === name);
 			if (existing) return existing;
 		}
 		return this.symbol(name, symbol);
@@ -2329,6 +2347,8 @@ var PluginInstance = class {
 	isOperationKind(operation, kind) {
 		const method = kind === "query" ? "isQuery" : "isMutation";
 		const hooks = [
+			this.config.$hooks?.operations?.[method],
+			this.config.$hooks?.operations?.getKind,
 			this.config["~hooks"]?.operations?.[method],
 			this.config["~hooks"]?.operations?.getKind,
 			this.context.config.parser.hooks.operations?.[method],
@@ -2350,25 +2370,15 @@ var Context = class {
 	* is a mix of user-provided and default values.
 	*/
 	config;
-	/**
-	* The code generation project instance used to manage files, symbols,
-	*/
+	/** The code generation project instance used to manage files, symbols, */
 	gen;
-	/**
-	* The dependency graph built from the intermediate representation.
-	*/
+	/** The dependency graph built from the intermediate representation. */
 	graph;
-	/**
-	* Intents declared by plugins.
-	*/
+	/** Intents declared by plugins. */
 	intents = [];
-	/**
-	* Intermediate representation model obtained from `spec`.
-	*/
+	/** Intermediate representation model obtained from `spec`. */
 	ir = {};
-	/**
-	* Logger instance.
-	*/
+	/** Logger instance. */
 	logger;
 	/**
 	* The package metadata and utilities for the current context, constructed
@@ -2383,9 +2393,7 @@ var Context = class {
 	* their configured name from the config.
 	*/
 	plugins = {};
-	/**
-	* Resolved specification from `input`.
-	*/
+	/** Resolved specification from `input`. */
 	spec;
 	constructor({ config, dependencies, logger, project, spec }) {
 		this.config = config;
@@ -2421,8 +2429,9 @@ var Context = class {
 			dependencies: plugin.dependencies ?? /* @__PURE__ */ new Set(),
 			gen: this.gen,
 			handler: plugin.handler,
+			imports: plugin.imports,
 			name: plugin.name,
-			symbols: plugin.symbols
+			symbolMeta: plugin.symbolMeta
 		});
 		this.plugins[instance.name] = instance;
 		return instance;
@@ -4497,7 +4506,7 @@ function getPaginationKeywordsRegExp(pagination) {
 * property may be a boolean, number, or integer. This function converts the string
 * key to the correct runtime value and IR type.
 */
-const convertDiscriminatorValue = (value, propertyType) => {
+function convertDiscriminatorValue(value, propertyType) {
 	switch (propertyType) {
 		case "boolean": {
 			const lowerValue = value.toLowerCase();
@@ -4546,13 +4555,58 @@ const convertDiscriminatorValue = (value, propertyType) => {
 			type: "string"
 		};
 	}
-};
-const discriminatorValues = ($ref, mapping, shouldUseRefAsValue) => {
+}
+function discriminatorValues($ref, mapping, shouldUseRefAsValue) {
 	const values = [];
 	for (const name in mapping) if (mapping[name] === $ref) values.push(name);
 	if (!values.length && (!shouldUseRefAsValue || shouldUseRefAsValue())) return [refToName($ref)];
 	return values;
-};
+}
+function buildDiscriminatedUnion({ parentSchema, resolveIrRef, schemas }) {
+	const discriminatorKey = parentSchema.discriminator?.propertyName;
+	if (!discriminatorKey) return null;
+	const members = [];
+	for (const schema of schemas) {
+		if (schema.type === "null" || schema.const === null) continue;
+		const ref = schema.$ref;
+		if (!ref) return null;
+		let resolved;
+		try {
+			resolved = resolveIrRef(ref);
+		} catch {
+			return null;
+		}
+		if (!resolved) return null;
+		let effective = resolved;
+		while (effective.$ref && !effective.type && !effective.properties && !effective.items) try {
+			const next = resolveIrRef(effective.$ref);
+			if (!next) break;
+			effective = next;
+		} catch {
+			break;
+		}
+		const discriminatorProp = effective.properties?.[discriminatorKey];
+		const needsExtend = discriminatorProp?.const === void 0;
+		const isObjectLike = effective.type === "object" || effective.logicalOperator === "and";
+		if (needsExtend && !isObjectLike) return null;
+		const values = discriminatorValues(ref, parentSchema.discriminator.mapping);
+		if (!values.length) return null;
+		const propType = discriminatorProp?.type;
+		for (const value of values) {
+			const discriminatedValue = propType && propType !== "string" ? convertDiscriminatorValue(value, propType).const : value;
+			members.push({
+				discriminatedValue,
+				needsExtend,
+				ref
+			});
+		}
+	}
+	if (!members.length) return null;
+	return {
+		discriminatorKey,
+		members
+	};
+}
 //#endregion
 //#region src/openApi/2.0.x/parser/schema.ts
 function getSchemaType$1(schema) {
@@ -5301,6 +5355,31 @@ const parameterToIrParameter$2 = ({ $ref, context, parameter }) => {
 //#endregion
 //#region src/utils/url.ts
 const parseUrlRegExp = /^(([^:/?#]+):)?((\/\/)?([^:/?#]*)(:?([^/?#]*)))?([^?#]*)(\?([^#]*))?(#(.*))?/;
+/**
+* Resolve the base URL value based on the plugin configuration.
+*
+* The `baseUrl` config option can be:
+* - `false` to disable using the base URL
+* - a string to use as the base URL
+* - a number to pick a server from the IR `servers` array
+*/
+function resolveBaseUrl(baseUrl, ir) {
+	if (baseUrl === false) return;
+	if (typeof baseUrl === "string") return baseUrl;
+	return (ir.servers ?? [])[typeof baseUrl === "number" ? baseUrl : 0]?.url;
+}
+/**
+* Resolve the base URL string if it's a valid URL or path.
+*/
+function getBaseUrl(config, ir) {
+	const baseUrl = resolveBaseUrl(config, ir);
+	if (baseUrl === void 0) return;
+	if (baseUrl.includes("{")) return;
+	const url = parseUrl(baseUrl);
+	if (url.protocol && url.host) return baseUrl;
+	if (baseUrl !== "/" && baseUrl.startsWith("/")) return baseUrl.endsWith("/") ? baseUrl.slice(0, -1) : baseUrl;
+	return baseUrl;
+}
 function parseUrl(value) {
 	const errorResponse = {
 		host: "",
@@ -6014,30 +6093,12 @@ function parseAnyOf$1({ context, schema, state }) {
 	const schemaItems = [];
 	const schemaType = getSchemaType(schema);
 	const compositionSchemas = schema.anyOf;
-	const discriminatorPropertyType = schema.discriminator ? findDiscriminatorPropertyType$1({
-		context,
-		propertyName: schema.discriminator.propertyName,
-		schemas: compositionSchemas
-	}) : void 0;
 	for (const compositionSchema of compositionSchemas) {
-		let irCompositionSchema = schemaToIrSchema$1({
+		const irCompositionSchema = schemaToIrSchema$1({
 			context,
 			schema: compositionSchema,
 			state
 		});
-		if (schema.discriminator && irCompositionSchema.$ref) {
-			const valueSchemas = discriminatorValues(irCompositionSchema.$ref, schema.discriminator.mapping).map((value) => convertDiscriminatorValue(value, discriminatorPropertyType));
-			irCompositionSchema = {
-				items: [{
-					properties: { [schema.discriminator.propertyName]: valueSchemas.length > 1 ? {
-						items: valueSchemas,
-						logicalOperator: "or"
-					} : valueSchemas[0] },
-					type: "object"
-				}, irCompositionSchema],
-				logicalOperator: "and"
-			};
-		}
 		schemaItems.push(irCompositionSchema);
 	}
 	if (schema.nullable) schemaItems.push({ type: "null" });
@@ -6060,7 +6121,10 @@ function parseAnyOf$1({ context, schema, state }) {
 			logicalOperator: "and"
 		};
 	}
-	if (schema.discriminator && irSchema.logicalOperator === "or") irSchema.discriminator = { propertyName: schema.discriminator.propertyName };
+	if (schema.discriminator && irSchema.logicalOperator === "or") irSchema.discriminator = {
+		...schema.discriminator.mapping && { mapping: schema.discriminator.mapping },
+		propertyName: schema.discriminator.propertyName
+	};
 	return irSchema;
 }
 function parseEnum$1({ context, schema, state }) {
@@ -6109,31 +6173,12 @@ function parseOneOf$1({ context, schema, state }) {
 	let schemaItems = [];
 	const schemaType = getSchemaType(schema);
 	const compositionSchemas = schema.oneOf;
-	const discriminatorPropertyType = schema.discriminator ? findDiscriminatorPropertyType$1({
-		context,
-		propertyName: schema.discriminator.propertyName,
-		schemas: compositionSchemas
-	}) : void 0;
 	for (const compositionSchema of compositionSchemas) {
-		let irCompositionSchema = schemaToIrSchema$1({
+		const irCompositionSchema = schemaToIrSchema$1({
 			context,
 			schema: compositionSchema,
 			state
 		});
-		if (schema.discriminator && irCompositionSchema.$ref) {
-			const valueSchemas = discriminatorValues(irCompositionSchema.$ref, schema.discriminator.mapping).map((value) => convertDiscriminatorValue(value, discriminatorPropertyType));
-			irCompositionSchema = {
-				items: [{
-					properties: { [schema.discriminator.propertyName]: valueSchemas.length > 1 ? {
-						items: valueSchemas,
-						logicalOperator: "or"
-					} : valueSchemas[0] },
-					required: [schema.discriminator.propertyName],
-					type: "object"
-				}, irCompositionSchema],
-				logicalOperator: "and"
-			};
-		}
 		if (irCompositionSchema.logicalOperator === "or" && irCompositionSchema.type !== "array" && irCompositionSchema.items) schemaItems = schemaItems.concat(irCompositionSchema.items);
 		else schemaItems.push(irCompositionSchema);
 	}
@@ -6157,7 +6202,10 @@ function parseOneOf$1({ context, schema, state }) {
 			logicalOperator: "and"
 		};
 	}
-	if (schema.discriminator && irSchema.logicalOperator === "or") irSchema.discriminator = { propertyName: schema.discriminator.propertyName };
+	if (schema.discriminator && irSchema.logicalOperator === "or") irSchema.discriminator = {
+		...schema.discriminator.mapping && { mapping: schema.discriminator.mapping },
+		propertyName: schema.discriminator.propertyName
+	};
 	return irSchema;
 }
 function parseRef$1({ context, schema, state }) {
@@ -7430,30 +7478,12 @@ function parseAnyOf({ context, schema, state }) {
 	const schemaItems = [];
 	const schemaTypes = getSchemaTypes(schema);
 	const compositionSchemas = schema.anyOf;
-	const discriminatorPropertyType = schema.discriminator ? findDiscriminatorPropertyType({
-		context,
-		propertyName: schema.discriminator.propertyName,
-		schemas: compositionSchemas
-	}) : void 0;
 	for (const compositionSchema of compositionSchemas) {
-		let irCompositionSchema = schemaToIrSchema({
+		const irCompositionSchema = schemaToIrSchema({
 			context,
 			schema: compositionSchema,
 			state
 		});
-		if (schema.discriminator && irCompositionSchema.$ref) {
-			const valueSchemas = discriminatorValues(irCompositionSchema.$ref, schema.discriminator.mapping).map((value) => convertDiscriminatorValue(value, discriminatorPropertyType));
-			irCompositionSchema = {
-				items: [{
-					properties: { [schema.discriminator.propertyName]: valueSchemas.length > 1 ? {
-						items: valueSchemas,
-						logicalOperator: "or"
-					} : valueSchemas[0] },
-					type: "object"
-				}, irCompositionSchema],
-				logicalOperator: "and"
-			};
-		}
 		schemaItems.push(irCompositionSchema);
 	}
 	if (schemaTypes.includes("null")) schemaItems.push({ type: "null" });
@@ -7476,7 +7506,10 @@ function parseAnyOf({ context, schema, state }) {
 			logicalOperator: "and"
 		};
 	}
-	if (schema.discriminator && irSchema.logicalOperator === "or") irSchema.discriminator = { propertyName: schema.discriminator.propertyName };
+	if (schema.discriminator && irSchema.logicalOperator === "or") irSchema.discriminator = {
+		...schema.discriminator.mapping && { mapping: schema.discriminator.mapping },
+		propertyName: schema.discriminator.propertyName
+	};
 	return irSchema;
 }
 function parseEnum({ context, schema, state }) {
@@ -7528,31 +7561,12 @@ function parseOneOf({ context, schema, state }) {
 	let schemaItems = [];
 	const schemaTypes = getSchemaTypes(schema);
 	const compositionSchemas = schema.oneOf;
-	const discriminatorPropertyType = schema.discriminator ? findDiscriminatorPropertyType({
-		context,
-		propertyName: schema.discriminator.propertyName,
-		schemas: compositionSchemas
-	}) : void 0;
 	for (const compositionSchema of compositionSchemas) {
-		let irCompositionSchema = schemaToIrSchema({
+		const irCompositionSchema = schemaToIrSchema({
 			context,
 			schema: compositionSchema,
 			state
 		});
-		if (schema.discriminator && irCompositionSchema.$ref) {
-			const valueSchemas = discriminatorValues(irCompositionSchema.$ref, schema.discriminator.mapping).map((value) => convertDiscriminatorValue(value, discriminatorPropertyType));
-			irCompositionSchema = {
-				items: [{
-					properties: { [schema.discriminator.propertyName]: valueSchemas.length > 1 ? {
-						items: valueSchemas,
-						logicalOperator: "or"
-					} : valueSchemas[0] },
-					required: [schema.discriminator.propertyName],
-					type: "object"
-				}, irCompositionSchema],
-				logicalOperator: "and"
-			};
-		}
 		if (irCompositionSchema.logicalOperator === "or" && irCompositionSchema.type !== "array" && irCompositionSchema.items) schemaItems = schemaItems.concat(irCompositionSchema.items);
 		else schemaItems.push(irCompositionSchema);
 	}
@@ -7576,7 +7590,10 @@ function parseOneOf({ context, schema, state }) {
 			logicalOperator: "and"
 		};
 	}
-	if (schema.discriminator && irSchema.logicalOperator === "or") irSchema.discriminator = { propertyName: schema.discriminator.propertyName };
+	if (schema.discriminator && irSchema.logicalOperator === "or") irSchema.discriminator = {
+		...schema.discriminator.mapping && { mapping: schema.discriminator.mapping },
+		propertyName: schema.discriminator.propertyName
+	};
 	return irSchema;
 }
 function parseRef({ context, schema, state }) {
@@ -8807,37 +8824,7 @@ async function patchOpenApiSpec({ patchOptions, spec: _spec }) {
 	}
 }
 //#endregion
-//#region src/plugins/duplicate.ts
-function stableStringify(value) {
-	return JSON.stringify(value, (_, v) => {
-		if (typeof v === "function") return `[function:${v.toString()}]`;
-		if (v && typeof v === "object" && !Array.isArray(v)) return Object.fromEntries(Object.entries(v).sort(([a], [b]) => a.localeCompare(b)));
-		return v;
-	});
-}
-function normalizePluginEntry(plugin) {
-	if (typeof plugin === "string") return {
-		name: plugin,
-		serialized: "{}"
-	};
-	const { name, ...config } = plugin;
-	return {
-		name,
-		serialized: stableStringify(config)
-	};
-}
-function warnOnConflictingDuplicatePlugins(plugins) {
-	const seen = /* @__PURE__ */ new Map();
-	for (const plugin of plugins) {
-		const { name, serialized } = normalizePluginEntry(plugin);
-		if (!name) continue;
-		const previous = seen.get(name);
-		if (previous !== void 0 && previous !== serialized) log.warn(`Plugin "${name}" is configured multiple times. Only the last instance will take effect.`);
-		seen.set(name, serialized);
-	}
-}
-//#endregion
-//#region src/plugins/shared/utils/config.ts
+//#region src/plugins/config.ts
 function definePluginConfig(pluginConfig) {
 	return (userConfig) => ({
 		...pluginConfig,
@@ -8854,12 +8841,137 @@ function definePluginConfig(pluginConfig) {
 		name: pluginConfig.name
 	});
 }
+function isPluginClient(plugin) {
+	if (typeof plugin === "string") return plugin.startsWith("@hey-api/client");
+	return plugin.name.startsWith("@hey-api/client") || Array.isArray(plugin.tags) && plugin.tags.includes("client");
+}
+function resolvePluginsConfig({ defaultPluginConfigs, dependencies, userPlugins, userPluginsConfig }) {
+	const circularReferenceTracker = /* @__PURE__ */ new Set();
+	const pluginOrder = /* @__PURE__ */ new Set();
+	const plugins = {};
+	const warnedMessages = /* @__PURE__ */ new Set();
+	function dfs(name) {
+		if (circularReferenceTracker.has(name)) throw new Error(`Circular reference detected at '${name}'`);
+		if (pluginOrder.has(name)) return;
+		circularReferenceTracker.add(name);
+		const defaultPlugin = defaultPluginConfigs[name];
+		const userPlugin = userPluginsConfig[name];
+		if (!defaultPlugin && !userPlugin) throw new Error(`unknown plugin "${name}" - do you need to register a custom plugin with this name?`);
+		const configTable = defaultPlugin?.config ?? userPlugin?.config ?? {};
+		const userConfig = defaultPlugin && userPlugin?.config ? userPlugin.config : {};
+		const pluginContext = {
+			package: dependencyFactory(dependencies),
+			resolveTag(tag, options = {}) {
+				const { defaultPlugin, fallback = false, warn: warnMessage } = options;
+				for (const userPlugin of userPlugins) if ((defaultPluginConfigs[userPlugin] || userPluginsConfig[userPlugin])?.tags?.includes(tag) && userPlugin !== name) return userPlugin;
+				if (defaultPlugin) {
+					if ((defaultPluginConfigs[defaultPlugin] || userPluginsConfig[defaultPlugin])?.tags?.includes(tag) && defaultPlugin !== name) return defaultPlugin;
+				}
+				if (warnMessage && !warnedMessages.has(warnMessage)) {
+					warnedMessages.add(warnMessage);
+					log.warn(warnMessage);
+				}
+				return fallback;
+			}
+		};
+		const finalConfig = defineConfig(configTable)(userConfig, pluginContext);
+		const finalDependencies = new Set([...defaultPlugin?.dependencies || [], ...userPlugin?.dependencies || []]);
+		const plugin = {
+			...defaultPlugin,
+			...userPlugin,
+			config: finalConfig,
+			dependencies: finalDependencies
+		};
+		collectDeps(configTable, finalConfig, finalDependencies);
+		for (const dependency of plugin.dependencies) dfs(dependency);
+		circularReferenceTracker.delete(name);
+		pluginOrder.add(name);
+		plugins[name] = plugin;
+	}
+	for (const name of userPlugins) dfs(name);
+	return {
+		pluginOrder: Array.from(pluginOrder),
+		plugins
+	};
+}
+function resolvePlugins({ defaultPluginConfigs, defaultPlugins, dependencies, userConfig }) {
+	const userPluginsConfig = {};
+	const rawPresetPlugins = (userConfig.presets ?? []).flatMap((preset) => preset.plugins ?? []);
+	const rawUserPlugins = userConfig.plugins ?? [];
+	const rawPlugins = [...rawPresetPlugins, ...rawUserPlugins.length ? rawUserPlugins : defaultPlugins].filter((plugin) => typeof plugin === "string" && plugin || typeof plugin !== "string" && plugin.name);
+	const mergedPlugins = [];
+	const seenNames = /* @__PURE__ */ new Map();
+	for (const plugin of rawPlugins) {
+		if (typeof plugin === "string") {
+			if (!seenNames.has(plugin)) {
+				seenNames.set(plugin, {
+					index: mergedPlugins.length,
+					value: plugin
+				});
+				mergedPlugins.push(plugin);
+			}
+			continue;
+		}
+		if (!plugin?.name) continue;
+		const name = plugin.name;
+		if (!seenNames.has(name)) {
+			seenNames.set(name, {
+				index: mergedPlugins.length,
+				value: plugin
+			});
+			mergedPlugins.push(plugin);
+			continue;
+		}
+		const prev = seenNames.get(name);
+		if (typeof prev.value === "string") {
+			seenNames.set(name, {
+				index: prev.index,
+				value: { ...plugin }
+			});
+			mergedPlugins[prev.index] = { ...plugin };
+			continue;
+		}
+		const mergedObj = deepMerge(prev.value, plugin);
+		seenNames.set(name, {
+			index: prev.index,
+			value: mergedObj
+		});
+		mergedPlugins[prev.index] = mergedObj;
+	}
+	if (mergedPlugins.length > 0 && mergedPlugins.every((plugin) => isPluginClient(plugin))) {
+		for (const name of [...defaultPlugins].reverse()) if (!seenNames.has(name)) mergedPlugins.unshift(name);
+	}
+	return resolvePluginsConfig({
+		defaultPluginConfigs,
+		dependencies,
+		userPlugins: mergedPlugins.map((plugin) => {
+			if (typeof plugin === "string") return plugin;
+			const pluginName = plugin.name;
+			if (pluginName) if (plugin.handler) userPluginsConfig[pluginName] = plugin;
+			else {
+				userPluginsConfig[pluginName] = { config: { ...plugin } };
+				delete userPluginsConfig[pluginName].config.name;
+			}
+			return pluginName;
+		}).filter(Boolean),
+		userPluginsConfig
+	});
+}
+//#endregion
+//#region src/plugins/helper.ts
+function pluginHelper(name) {
+	return (config) => ({
+		...config,
+		name
+	});
+}
 //#endregion
 //#region src/plugins/symbol.ts
 /**
-* Helper function to build the input for symbol registration, applying naming hooks if provided.
+* Function to build the input for symbol registration, applying naming hooks if provided.
 */
 function buildSymbolIn({ plugin, ...ctx }) {
+	const priority = defaultPriorityFromPath(ctx.path);
 	const hooks = plugin.getHooks((hooks) => hooks.symbols?.getName);
 	for (const hook of hooks) {
 		const result = hook(ctx);
@@ -8867,18 +8979,29 @@ function buildSymbolIn({ plugin, ...ctx }) {
 			const name = result(ctx);
 			if (name) return {
 				meta: ctx.meta,
-				name
+				name,
+				priority
 			};
 		} else if (typeof result === "string") return {
 			meta: ctx.meta,
-			name: ctx.naming ? applyNaming(result, ctx.naming) : result
+			name: ctx.naming ? applyNaming(result, ctx.naming) : result,
+			priority
 		};
 	}
 	return {
 		meta: ctx.meta,
-		name: ctx.naming ? applyNaming(ctx.name, ctx.naming) : ctx.name
+		name: ctx.naming ? applyNaming(ctx.name, ctx.naming) : ctx.name,
+		priority
 	};
 }
+const MAX_PRIORITY_FROM_PATH = 100;
+/**
+* Derives naming priority from path depth.
+*/
+function defaultPriorityFromPath(path) {
+	if (!path?.length) return;
+	return Math.max(0, MAX_PRIORITY_FROM_PATH - path.length);
+}
 //#endregion
 //#region src/plugins/validator.ts
 /**
@@ -9049,6 +9172,6 @@ function pathToName(path, options) {
 	return names.join("-");
 }
 //#endregion
-export { COERCER, ConfigError, ConfigValidationError, Context, HeyApiError, InputError, IntentContext, JobError, MinHeap, OperationPath, OperationStrategy, PluginInstance, SymbolFactory, addItemsToSchema, applyNaming, buildGraph, buildSymbolIn, checkNodeVersion, childContext, coerce, collectDeps, compileInputPath, createOperationKey, createSchemaProcessor, createSchemaWalker, debugTools, deduplicateSchema, defaultPaginationKeywords, defineConfig, definePluginConfig, dependencyFactory, encodeJsonPointerSegment, ensureDirSync, escapeComment, findPackageJson, findTsConfigPath, getInput, getInputError, getLogs, getParser, getSpec, hasOperationDataRequired, hasParameterGroupObjectRequired, hasParametersObjectRequired, heyApiRegistryBaseUrl, inputToApiRegistry, isCoercer, isEnvironment, isPlainObject, isTopLevelComponent, jsonPointerToPath, loadPackageJson, logCrashReport, logInputPaths, normalizeJsonPointer, openGitHubIssueWithCrashReport, operationPagination, operationResponsesMap, outputHeaderToPrefix, parameterWithPagination, parseOpenApiSpec, parseUrl, parseV2_0_X, parseV3_0_X, parseV3_1_X, patchOpenApiSpec, pathToJsonPointer, pathToName, postprocessOutput, printCliIntro, printCrashReport, refToName, requestValidatorLayers, resolveNaming, resolveRef, resolveValidatorLayer, satisfies, shouldReportCrash, sourceConfig, statusCodeToGroup, toCase, utils, warnOnConflictingDuplicatePlugins };
+export { COERCER, ConfigError, ConfigValidationError, Context, HeyApiError, InputError, IntentContext, JobError, MinHeap, OperationPath, OperationStrategy, PluginInstance, SymbolFactory, addItemsToSchema, applyNaming, buildDiscriminatedUnion, buildGraph, buildSymbolIn, checkNodeVersion, childContext, coerce, collectDeps, compileInputPath, convertDiscriminatorValue, createOperationKey, createSchemaProcessor, createSchemaWalker, debugTools, deduplicateSchema, deepMerge, defaultPaginationKeywords, defineConfig, definePluginConfig, dependencyFactory, discriminatorValues, encodeJsonPointerSegment, ensureDirSync, escapeComment, findPackageJson, findTsConfigPath, getBaseUrl, getInput, getInputError, getLogs, getParser, getSpec, hasOperationDataRequired, hasParameterGroupObjectRequired, hasParametersObjectRequired, heyApiRegistryBaseUrl, inputToApiRegistry, isCoercer, isEnvironment, isPlainObject, isTopLevelComponent, jsonPointerToPath, loadPackageJson, logCrashReport, logInputPaths, normalizeJsonPointer, openGitHubIssueWithCrashReport, operationPagination, operationResponsesMap, outputHeaderToPrefix, parameterWithPagination, parseOpenApiSpec, parseUrl, parseV2_0_X, parseV3_0_X, parseV3_1_X, patchOpenApiSpec, pathToJsonPointer, pathToName, pluginHelper, postprocessOutput, printCliIntro, printCrashReport, refToName, requestValidatorLayers, resolveNaming, resolvePlugins, resolveRef, resolveValidatorLayer, satisfies, shouldReportCrash, sourceConfig, statusCodeToGroup, toCase, utils };
 
 //# sourceMappingURL=index.mjs.map