swagger-typescript-api 13.11.0 → 13.11.2

package/dist/{src-CxQXlsuV.mjs → src-C0d8cMi-.mjs}

@@ -169,7 +169,7 @@ var ComponentTypeNameResolver = class extends NameResolver {
 //#endregion
 //#region package.json
 var name = "swagger-typescript-api";
-var version = "13.11.0";
+var version = "13.11.2";
 var description = "Generate the API client for Fetch or Axios from an OpenAPI Specification";
 //#endregion
 //#region src/constants.ts
@@ -740,9 +740,32 @@ var SchemaComponentsMap = class {
 		if (!rawTypeData || typeof rawTypeData !== "object") return false;
 		return Object.keys(rawTypeData).length === 1 && typeof rawTypeData.$ref === "string";
 	}
+	extractComponentSchemaNameFromRef(ref) {
+		const [, rawPointer = ""] = ref.split("#");
+		if (!rawPointer) return null;
+		const pointerParts = (rawPointer.startsWith("/") ? rawPointer.slice(1) : rawPointer).split("/").filter(Boolean);
+		if (pointerParts.length < 2) return null;
+		const collection = pointerParts.at(-2);
+		if (collection !== "schemas" && collection !== "definitions") return null;
+		return this.normalizeTypeNameFromFile(pointerParts.at(-1) || "");
+	}
+	findExistingComponentBySchemaFragment(ref, typeName) {
+		const fragmentSchemaName = this.extractComponentSchemaNameFromRef(ref);
+		if (!fragmentSchemaName || fragmentSchemaName !== typeName) return null;
+		const localRef = this.createRef([
+			"components",
+			"schemas",
+			typeName
+		]);
+		const byLocalRef = this._data.find((component) => component.$ref === localRef);
+		if (byLocalRef) return byLocalRef;
+		const matching = this._data.filter((component) => component.typeName === typeName);
+		return matching.length === 1 ? matching[0] : null;
+	}
 	preferExistingSchemaNameForExternalRef(typeName, refDetails) {
 		if (!this.config.preferExistingSchemaNamesForExternalRefs) return false;
-		return pascalCase(refDetails.externalOpenapiFileName || "External") === typeName;
+		if (pascalCase(refDetails.externalOpenapiFileName || "External") === typeName) return true;
+		return this.findExistingComponentBySchemaFragment(refDetails.ref, typeName) != null;
 	}
 	createComponentDraft($ref, rawTypeData) {
 		if (typeGuard.isObject(rawTypeData) && rawTypeData.typeName && rawTypeData.rawTypeData && rawTypeData.$ref) return rawTypeData;
@@ -806,9 +829,13 @@ var SchemaComponentsMap = class {
 			}
 			const componentDraft = this.createComponentDraft(resolvedRef, resolvedTypeData);
 			componentDraft.typeName = this.config.hooks.onFormatExternalTypeName?.(componentDraft.typeName, refDetails) || componentDraft.typeName;
+			if (this.config.preferExistingSchemaNamesForExternalRefs) {
+				const existingByFragment = this.findExistingComponentBySchemaFragment(refDetails.ref, componentDraft.typeName);
+				if (existingByFragment) return existingByFragment;
+			}
 			if (this._data.some((component) => component.typeName === componentDraft.typeName)) {
 				if (this.preferExistingSchemaNameForExternalRef(componentDraft.typeName, refDetails)) {
-					const existingComponent = this._data.find((component) => component.typeName === componentDraft.typeName);
+					const existingComponent = this.findExistingComponentBySchemaFragment(refDetails.ref, componentDraft.typeName) ?? this._data.find((component) => component.typeName === componentDraft.typeName);
 					if (existingComponent) return existingComponent;
 				}
 				componentDraft.typeName = this.config.hooks.onFixDuplicateExternalTypeName?.(componentDraft.typeName, refDetails, this._data.map((it) => it.typeName)) ?? `${pascalCase(refDetails.externalOpenapiFileName || "External")}${componentDraft.typeName}`;
@@ -3631,6 +3658,14 @@ var CodeGenProcess = class {
 			return parsed;
 		});
 		this.schemaRoutes.attachSchema(resolvedSwaggerSchema, parsedSchemas);
+		if (!this.config.preferExistingSchemaNamesForExternalRefs) {
+			this.typeNameFormatter.precommit(this.schemaComponentsMap.getComponents().map((component) => component.typeName));
+			for (const component of componentsToParse) {
+				component.typeData = null;
+				delete component.$prepared;
+				component.typeData = this.schemaParserFabric.parseSchema(component.rawTypeData, component.typeName);
+			}
+		}
 		const rawConfiguration = {
 			apiConfig: this.createApiConfig(resolvedSwaggerSchema.usageSchema),
 			config: this.config,
@@ -4025,4 +4060,4 @@ async function generateApi(config) {
 //#endregion
 export { SCHEMA_TYPES as a, constants_exports as c, version as d, RequestContentKind as i, description as l, generateTemplates as n, CodeGenConfig as o, TemplatesGenConfig as r, HTTP_CLIENT as s, generateApi as t, name as u };
 
-//# sourceMappingURL=src-CxQXlsuV.mjs.map
+//# sourceMappingURL=src-C0d8cMi-.mjs.map