swagger-typescript-api 13.10.0 → 13.11.1

package/dist/{src-djU9KRKm.mjs → src-CdwLmxYh.mjs}

@@ -169,7 +169,7 @@ var ComponentTypeNameResolver = class extends NameResolver {
 //#endregion
 //#region package.json
 var name = "swagger-typescript-api";
-var version = "13.10.0";
+var version = "13.11.1";
 var description = "Generate the API client for Fetch or Axios from an OpenAPI Specification";
 //#endregion
 //#region src/constants.ts
@@ -375,6 +375,7 @@ var CodeGenConfig = class {
 	enumKeyPrefix = "";
 	enumKeySuffix = "";
 	patch = false;
+	preferExistingSchemaNamesForExternalRefs = false;
 	componentTypeNameResolver;
 	/** name of the main exported class */
 	apiClassName = "Api";
@@ -669,6 +670,18 @@ function pascalCase(value) {
 }
 //#endregion
 //#region src/schema-components-map.ts
+const OPENAPI_COMPONENT_NAMES = new Set([
+	"schemas",
+	"responses",
+	"requestBodies",
+	"parameters",
+	"headers",
+	"securitySchemes",
+	"links",
+	"callbacks",
+	"examples",
+	"pathItems"
+]);
 var SchemaComponentsMap = class {
 	_data = [];
 	constructor(config) {
@@ -700,18 +713,72 @@ var SchemaComponentsMap = class {
 		});
 		return matchingComponents.length === 1 ? matchingComponents[0] : null;
 	}
+	normalizeTypeNameFromFile(typeName) {
+		return typeName.replace(/\.(yaml|yml|json)$/i, "");
+	}
+	resolveComponentName(rawComponentName) {
+		const normalizedComponentName = rawComponentName === "definitions" ? "schemas" : rawComponentName;
+		return OPENAPI_COMPONENT_NAMES.has(normalizedComponentName) ? normalizedComponentName : "schemas";
+	}
+	isFileOnlyRef(ref) {
+		const [, rawPointer = ""] = ref.split("#");
+		return !rawPointer.replace(/^\/+/, "");
+	}
+	unwrapExternalComponentsDocument(ref, resolved) {
+		if (!this.isFileOnlyRef(ref)) return null;
+		const schemas = resolved.components?.schemas;
+		if (!schemas || typeof schemas !== "object") return null;
+		const schemaEntries = Object.entries(schemas).filter(([, schemaData]) => schemaData != null && typeof schemaData === "object");
+		if (schemaEntries.length !== 1) return null;
+		const [schemaName, schemaData] = schemaEntries[0];
+		return {
+			ref: `${ref}#/components/schemas/${schemaName}`,
+			resolved: schemaData
+		};
+	}
+	isRefOnlyRawTypeData(rawTypeData) {
+		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;
+		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;
 		const parsed = this.parseRef($ref);
 		const [, rawPointer = ""] = $ref.split("#");
 		const pointerParts = (rawPointer.startsWith("/") ? rawPointer : `/${rawPointer}`).split("/").filter(Boolean);
-		const typeName = pointerParts.at(-1) || parsed.at(-1) || "Unknown";
+		const typeName = this.normalizeTypeNameFromFile(pointerParts.at(-1) || parsed.at(-1) || "Unknown");
 		const rawComponentName = pointerParts.at(-2) || parsed[parsed.length - 2] || "schemas";
 		return {
 			$ref,
 			typeName,
 			rawTypeData,
-			componentName: rawComponentName === "definitions" ? "schemas" : rawComponentName,
+			componentName: this.resolveComponentName(rawComponentName),
 			/** result from schema parser */
 			typeData: null
 		};
@@ -731,6 +798,20 @@ var SchemaComponentsMap = class {
 	filter(...componentNames) {
 		return this._data.filter((it) => componentNames.some((componentName) => it.$ref.startsWith(`#/components/${componentName}`)));
 	}
+	resolveRefOnlyComponents() {
+		if (!this.config.preferExistingSchemaNamesForExternalRefs) return;
+		const { resolvedSwaggerSchema } = this.config;
+		for (const component of this._data) {
+			if (!this.isRefOnlyRawTypeData(component.rawTypeData)) continue;
+			const ref = component.rawTypeData?.$ref;
+			if (typeof ref !== "string") continue;
+			const resolved = resolvedSwaggerSchema.getRef(ref);
+			if (resolved == null || typeof resolved !== "object") continue;
+			component.rawTypeData = resolved;
+			component.typeData = null;
+			delete component.$prepared;
+		}
+	}
 	get = ($ref) => {
 		const localFound = this._data.find((c) => c.$ref === $ref) || this.getByLocalFragmentRef($ref) || null;
 		if (localFound != null) return localFound;
@@ -739,9 +820,28 @@ var SchemaComponentsMap = class {
 		const foundByRef = resolvedSwaggerSchema.getRef($ref);
 		const refDetails = resolvedSwaggerSchema.getRefDetails($ref);
 		if (foundByRef != null) {
-			const componentDraft = this.createComponentDraft($ref, foundByRef);
+			let resolvedRef = $ref;
+			let resolvedTypeData = foundByRef;
+			const unwrappedComponentsDocument = this.unwrapExternalComponentsDocument($ref, resolvedTypeData);
+			if (unwrappedComponentsDocument) {
+				resolvedRef = unwrappedComponentsDocument.ref;
+				resolvedTypeData = unwrappedComponentsDocument.resolved;
+			}
+			const componentDraft = this.createComponentDraft(resolvedRef, resolvedTypeData);
 			componentDraft.typeName = this.config.hooks.onFormatExternalTypeName?.(componentDraft.typeName, refDetails) || componentDraft.typeName;
-			if (this._data.some((component) => component.typeName === componentDraft.typeName)) componentDraft.typeName = this.config.hooks.onFixDuplicateExternalTypeName?.(componentDraft.typeName, refDetails, this._data.map((it) => it.typeName)) ?? `${pascalCase(refDetails.externalOpenapiFileName || "External")}${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.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}`;
+			}
+			const existingComponent = this._data.find((component) => component.componentName === componentDraft.componentName && component.typeName === componentDraft.typeName);
+			if (existingComponent) return existingComponent;
 			return this.createComponent($ref, componentDraft);
 		}
 		return null;
@@ -3549,6 +3649,7 @@ var CodeGenProcess = class {
 		]), rawTypeData);
 		this.schemaComponentsMap.discriminatorsFirst();
 		this.schemaComponentsMap.enumsFirst();
+		this.schemaComponentsMap.resolveRefOnlyComponents();
 		const componentsToParse = this.schemaComponentsMap.filter(compact(["schemas", this.config.extractResponses && "responses"]));
 		this.typeNameFormatter.precommit(componentsToParse.map((c) => c.typeName));
 		const parsedSchemas = componentsToParse.map((schemaComponent) => {
@@ -3640,9 +3741,17 @@ var CodeGenProcess = class {
 		while (processedCount < schemaComponentsCount) {
 			modelTypes = [];
 			processedCount = 0;
+			const seenExportNames = /* @__PURE__ */ new Set();
 			for (const component of components) if (modelTypeComponents.includes(component.componentName)) {
 				const modelType = this.prepareModelType(component);
-				if (modelType) modelTypes.push(modelType);
+				if (modelType) {
+					if (seenExportNames.has(modelType.name)) {
+						processedCount++;
+						continue;
+					}
+					seenExportNames.add(modelType.name);
+					modelTypes.push(modelType);
+				}
 				processedCount++;
 			}
 			schemaComponentsCount = getSchemaComponentsCount();
@@ -3943,4 +4052,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-djU9KRKm.mjs.map
+//# sourceMappingURL=src-CdwLmxYh.mjs.map