@workos/oagen 0.21.0 → 0.21.1

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { A as walkTypeRef, C as assertNever, D as collectModelRefs, E as collectFieldDependencies, O as collectRequestBodyModels, S as SpecParseError, T as collectEnumRefs, _ as ConfigVersionMismatchError, a as singularize, b as OagenError, c as stripListItemMarkers, d as toPascalCase, f as toSnakeCase, g as ConfigLoadError, h as ConfigError, k as mapTypeRef, l as toCamelCase, m as CommandError, n as ACRONYM_SET, o as splitWords, p as toUpperSnakeCase, r as cleanSchemaName, s as stripBackendPrefixes, u as toKebabCase, v as ExtractorError, w as assignModelsToServices, x as RegistryError, y as InternalError } from "./tree-sitter-DcUvm0KA.mjs";
-import { c as treeShakeFiles, d as collectReferencedNames, f as generateAllFiles, h as resolveOperations, i as generate, l as applyFileHeaders, m as deriveMethodName, n as getEmitter, o as integrateGeneratedFiles, p as generateFiles, r as registerEmitter, s as mapFilesForTargetIntegration, t as diffSpecs, u as buildEmitterContext } from "./diff-CBFCoTCw.mjs";
+import { c as treeShakeFiles, d as collectReferencedNames, f as generateAllFiles, h as resolveOperations, i as generate, l as applyFileHeaders, m as deriveMethodName, n as getEmitter, o as integrateGeneratedFiles, p as generateFiles, r as registerEmitter, s as mapFilesForTargetIntegration, t as diffSpecs, u as buildEmitterContext } from "./diff-Dobf9PHC.mjs";
 import { readFile } from "node:fs/promises";
 import { resolve } from "node:path";
 import { pathToFileURL } from "node:url";
@@ -185,7 +185,7 @@ function qualifyInlineModelName(baseName, parentName) {
 function extractInlineModelsFromSchemas(schemas) {
 	if (!schemas) return [];
 	const inlineModels = [];
-	for (const [schemaName, schema] of Object.entries(schemas)) extractInlineModelsFromProperties(schema, inlineModels, cleanSchemaName(toPascalCase(schemaName)));
+	for (const [schemaName, schema] of Object.entries(schemas)) extractInlineModelsFromProperties(schema, inlineModels, resolveSchemaName(schemaName));
 	return inlineModels;
 }
 function extractInlineModelsFromProperties(schema, results, parentName) {
@@ -2369,6 +2369,27 @@ function collapseJsonSuffixModels(models, services) {
 		rewriteModelRefs(normalizedModels, services, jsonModel.name, baseModel.name);
 		console.warn(`[oagen] Merged "${jsonModel.name}" into "${baseModel.name}" (${jsonModel.fields.length} fields, superset)`);
 	}
+	for (const { jsonModel, baseModel } of mergeCandidates) {
+		const jsonPrefix = jsonModel.name;
+		const basePrefix = baseModel.name;
+		for (const model of normalizedModels) {
+			if (toRemove.has(model.name)) continue;
+			if (model.name.length <= jsonPrefix.length) continue;
+			if (!model.name.startsWith(jsonPrefix)) continue;
+			const newName = basePrefix + model.name.slice(jsonPrefix.length);
+			const existing = byName.get(newName);
+			if (existing && !toRemove.has(existing.name)) {
+				toRemove.add(model.name);
+				rewriteModelRefs(normalizedModels, services, model.name, newName);
+				console.warn(`[oagen] Collapsed child "${model.name}" into existing "${newName}"`);
+			} else {
+				rewriteModelRefs(normalizedModels, services, model.name, newName);
+				model.name = newName;
+				byName.set(newName, model);
+				console.warn(`[oagen] Renamed child "${jsonPrefix}…" → "${newName}"`);
+			}
+		}
+	}
 	return normalizedModels.filter((m) => !toRemove.has(m.name));
 }
 //#endregion
@@ -2421,8 +2442,10 @@ async function parseSpec(specPath, options) {
 	if (!version.startsWith("3.")) throw new SpecParseError(`Unsupported OpenAPI version: ${version}. oagen requires OpenAPI 3.x`, `Update the spec to OpenAPI 3.0 or 3.1. If you are using Swagger 2.x, convert it first with \`npx swagger2openapi ${specPath}\`.`);
 	const { models, enums } = extractSchemas(spec.components?.schemas, { schemaNameTransform: options?.schemaNameTransform });
 	const { services, inlineModels } = extractOperations(spec.paths, options?.operationIdTransform, spec.components?.schemas);
+	const responseNormalizedModels = mergeInlineResponseModels(models, inlineModels);
+	const fieldInlineModels = extractInlineModelsFromSchemas(spec.components?.schemas);
 	clearSchemaNameTransform();
-	const finalModels = collapseJsonSuffixModels(mergeFieldInlineModels(mergeInlineResponseModels(models, inlineModels), extractInlineModelsFromSchemas(spec.components?.schemas)), services);
+	const finalModels = collapseJsonSuffixModels(mergeFieldInlineModels(responseNormalizedModels, fieldInlineModels), services);
 	collectInlineEnumsFromModels(finalModels, enums);
 	collectInlineEnumsFromOperations(services, enums);
 	const auth = extractAuthSchemes(spec.components?.securitySchemes);