swagger-typescript-api 13.6.7 → 13.6.9

package/dist/{src-CUhSthD5.cjs → src-WlO7cZjP.cjs}

@@ -30,33 +30,34 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 //#endregion
 let consola = require("consola");
-consola = __toESM(consola);
+consola = __toESM(consola, 1);
 let es_toolkit = require("es-toolkit");
-es_toolkit = __toESM(es_toolkit);
+es_toolkit = __toESM(es_toolkit, 1);
 let es_toolkit_compat = require("es-toolkit/compat");
-es_toolkit_compat = __toESM(es_toolkit_compat);
+es_toolkit_compat = __toESM(es_toolkit_compat, 1);
 let typescript = require("typescript");
-typescript = __toESM(typescript);
+typescript = __toESM(typescript, 1);
 let node_path = require("node:path");
-node_path = __toESM(node_path);
+node_path = __toESM(node_path, 1);
 let _biomejs_js_api = require("@biomejs/js-api");
 let nanoid = require("nanoid");
-nanoid = __toESM(nanoid);
+nanoid = __toESM(nanoid, 1);
 let yummies_type_guard = require("yummies/type-guard");
+let yummies_common = require("yummies/common");
 let node_crypto = require("node:crypto");
-node_crypto = __toESM(node_crypto);
+node_crypto = __toESM(node_crypto, 1);
 let swagger2openapi = require("swagger2openapi");
-swagger2openapi = __toESM(swagger2openapi);
+swagger2openapi = __toESM(swagger2openapi, 1);
 let node_fs = require("node:fs");
-node_fs = __toESM(node_fs);
+node_fs = __toESM(node_fs, 1);
 let _apidevtools_swagger_parser = require("@apidevtools/swagger-parser");
-_apidevtools_swagger_parser = __toESM(_apidevtools_swagger_parser);
+_apidevtools_swagger_parser = __toESM(_apidevtools_swagger_parser, 1);
 let yaml = require("yaml");
-yaml = __toESM(yaml);
+yaml = __toESM(yaml, 1);
 let node_module = require("node:module");
-node_module = __toESM(node_module);
+node_module = __toESM(node_module, 1);
 let node_url = require("node:url");
-node_url = __toESM(node_url);
+node_url = __toESM(node_url, 1);
 let eta = require("eta");
 //#region src/code-formatter.ts
 var CodeFormatter = class {
@@ -207,7 +208,7 @@ var ComponentTypeNameResolver = class extends NameResolver {
 //#endregion
 //#region package.json
 var name = "swagger-typescript-api";
-var version = "13.6.7";
+var version = "13.6.9";
 var description = "Generate the API client for Fetch or Axios from an OpenAPI Specification";
 //#endregion
 //#region src/constants.ts
@@ -667,9 +668,9 @@ var SchemaComponentsMap = class {
 		else this._data[refIndex] = usageComponent;
 		return usageComponent;
 	}
-	getComponents() {
+	getComponents = () => {
 		return this._data;
-	}
+	};
 	filter(...componentNames) {
 		return this._data.filter((it) => componentNames.some((componentName) => it.$ref.startsWith(`#/components/${componentName}`)));
 	}
@@ -1696,6 +1697,11 @@ const CONTENT_KIND = {
 	OTHER: "OTHER",
 	TEXT: "TEXT"
 };
+/**
+* When a colliding extract name is repeatedly resolved, cap iterations so a resolver
+* bug cannot loop forever. In practice 1–2 attempts are enough (suffix list is short).
+*/
+const MAX_EXTRACT_SCHEMA_KEY_COLLISION_ATTEMPTS = 32;
 var SchemaRoutes = class {
 	schemaUtils;
 	FORM_DATA_TYPES = [];
@@ -1718,6 +1724,36 @@ var SchemaRoutes = class {
 			format: "binary"
 		})]);
 	}
+	/**
+	* `extractResponseBody` / `extractResponseError` call `createParsedComponent`, which
+	* registers `#/components/schemas/<typeName>`. If that key already exists (e.g.
+	* `MergeFluffyData` in definitions), the map entry would be overwritten unless we
+	* pick another name via `resolveTypeName` after reserving the colliding one.
+	*
+	* `getComponents` may be missing in narrow unit tests that pass a stub map.
+	*
+	* `resolveTypeName` ends in `NameResolver.resolve`, which **reserves** the chosen
+	* string when `shouldReserve` is true (default). So after a colliding first pick,
+	* the next `resolveTypeName` skips that variant. The extra `reserve([typeName])`
+	* is still needed when callers pass `shouldReserve: false` — then the first pick
+	* is not auto-reserved and we must block it before retrying.
+	*/
+	extractTypeNameWithoutSchemaKeyCollision = (routeNameUsage, options) => {
+		const refFor = (name) => this.schemaComponentsMap.createRef([
+			"components",
+			"schemas",
+			name
+		]);
+		const existingComponents = (0, yummies_common.callFunction)(this.schemaComponentsMap.getComponents) ?? [];
+		const collides = (name) => !!name && existingComponents.some((c) => c.$ref === refFor(name));
+		let typeName = this.schemaUtils.resolveTypeName(routeNameUsage, options);
+		for (let attempt = 0; attempt < MAX_EXTRACT_SCHEMA_KEY_COLLISION_ATTEMPTS; attempt++) {
+			if (!collides(typeName)) break;
+			this.config.componentTypeNameResolver.reserve([typeName]);
+			typeName = this.schemaUtils.resolveTypeName(routeNameUsage, options);
+		}
+		return typeName;
+	};
 	createRequestsMap = (resolvedSwaggerSchema, routesByMethod) => {
 		const parameters = (0, es_toolkit_compat.get)(routesByMethod, "parameters");
 		const result = {};
@@ -2070,7 +2106,7 @@ var SchemaRoutes = class {
 	};
 	extractResponseBodyIfItNeeded = (routeInfo, responseBodyInfo, routeName) => {
 		if (responseBodyInfo.responses.length && responseBodyInfo.success && responseBodyInfo.success.schema) {
-			const typeName = this.schemaUtils.resolveTypeName(routeName.usage, {
+			const typeName = this.extractTypeNameWithoutSchemaKeyCollision(routeName.usage, {
 				suffixes: this.config.extractingOptions.responseBodySuffix,
 				resolver: this.config.extractingOptions.responseBodyNameResolver
 			});
@@ -2138,7 +2174,7 @@ var SchemaRoutes = class {
 	};
 	extractResponseErrorIfItNeeded = (routeInfo, responseBodyInfo, routeName) => {
 		if (responseBodyInfo.responses.length && responseBodyInfo.error.schemas && responseBodyInfo.error.schemas.length) {
-			const typeName = this.schemaUtils.resolveTypeName(routeName.usage, {
+			const typeName = this.extractTypeNameWithoutSchemaKeyCollision(routeName.usage, {
 				suffixes: this.config.extractingOptions.responseErrorSuffix,
 				resolver: this.config.extractingOptions.responseErrorNameResolver
 			});
@@ -2198,7 +2234,7 @@ var SchemaRoutes = class {
 		const pathArgsNames = pathArgs.map((arg) => arg.name);
 		const responseBodyInfo = this.getResponseBodyInfo(routeInfo, parsedSchemas, resolvedSwaggerSchema, rawRouteName, method);
 		const rawRouteInfo = {
-			...otherInfo,
+			...routeInfo,
 			pathArgs,
 			operationId,
 			method,
@@ -3700,4 +3736,4 @@ Object.defineProperty(exports, "version", {
 	}
 });
 
-//# sourceMappingURL=src-CUhSthD5.cjs.map
+//# sourceMappingURL=src-WlO7cZjP.cjs.map