swagger-typescript-api 13.6.6 → 13.6.8

package/dist/{src-BROE-dEG.cjs → src-DyV7bb1c.cjs}

@@ -43,6 +43,7 @@ let _biomejs_js_api = require("@biomejs/js-api");
 let nanoid = require("nanoid");
 nanoid = __toESM(nanoid);
 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);
 let swagger2openapi = require("swagger2openapi");
@@ -182,12 +183,6 @@ var NameResolver = class {
 	}
 };
 //#endregion
-//#region src/util/random.ts
-const getRandomInt = (min = 0, max = 1) => {
-	if (min === max) return min;
-	return Math.round(Math.random() * (max - min) + min);
-};
-//#endregion
 //#region src/component-type-name-resolver.ts
 var ComponentTypeNameResolver = class extends NameResolver {
 	counter = 1;
@@ -195,12 +190,12 @@ var ComponentTypeNameResolver = class extends NameResolver {
 	countersByVariant = /* @__PURE__ */ new Map();
 	constructor(config, reservedNames) {
 		super(config, reservedNames, (variants) => {
-			const randomVariant = variants[getRandomInt(0, variants.length - 1)];
-			if (randomVariant) {
-				if (!this.countersByVariant.has(randomVariant)) this.countersByVariant.set(randomVariant, 0);
-				const variantCounter = this.countersByVariant.get(randomVariant) + 1;
-				this.countersByVariant.set(randomVariant, variantCounter);
-				const dirtyResolvedName = `${randomVariant}${variantCounter}`;
+			const baseVariant = (0, es_toolkit.uniq)((0, es_toolkit.compact)(variants)).sort((a, b) => a.localeCompare(b))[0];
+			if (baseVariant) {
+				if (!this.countersByVariant.has(baseVariant)) this.countersByVariant.set(baseVariant, 0);
+				const variantCounter = this.countersByVariant.get(baseVariant) + 1;
+				this.countersByVariant.set(baseVariant, variantCounter);
+				const dirtyResolvedName = `${baseVariant}${variantCounter}`;
 				consola.consola.debug("generated dirty resolved type name for component - ", dirtyResolvedName);
 				return dirtyResolvedName;
 			}
@@ -213,7 +208,7 @@ var ComponentTypeNameResolver = class extends NameResolver {
 //#endregion
 //#region package.json
 var name = "swagger-typescript-api";
-var version = "13.6.6";
+var version = "13.6.8";
 var description = "Generate the API client for Fetch or Axios from an OpenAPI Specification";
 //#endregion
 //#region src/constants.ts
@@ -673,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}`)));
 	}
@@ -1702,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 = [];
@@ -1724,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 = {};
@@ -2076,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
 			});
@@ -2144,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
 			});
@@ -3706,4 +3736,4 @@ Object.defineProperty(exports, "version", {
 	}
 });
 
-//# sourceMappingURL=src-BROE-dEG.cjs.map
+//# sourceMappingURL=src-DyV7bb1c.cjs.map