@workos/oagen 0.24.4 → 0.24.6

package/dist/cli/index.mjs

@@ -1614,7 +1614,7 @@ function detectPagination(response, queryParams, dataPath) {
 }
 //#endregion
 //#region src/parser/responses.ts
-function classifyAndExtractResponse(schema, contextName) {
+function classifyAndExtractResponse(schema, contextName, componentSchemas) {
 	if (schema.$ref) return {
 		response: schemaToTypeRef(schema, contextName),
 		inlineModels: [],
@@ -1623,7 +1623,7 @@ function classifyAndExtractResponse(schema, contextName) {
 	const envelope = detectListEnvelope(schema);
 	if (envelope.isEnvelope) return extractListResponse(schema, contextName, envelope.dataPath);
 	if (isSingleResourceWrapper(schema)) return extractWrappedResource(schema, contextName);
-	return extractDirectResource(schema, contextName);
+	return extractDirectResource(schema, contextName, componentSchemas);
 }
 const KNOWN_DATA_PATHS = new Set([
 	"data",
@@ -1800,7 +1800,7 @@ function extractWrappedResource(schema, contextName) {
 		isPaginated: false
 	};
 }
-function extractDirectResource(schema, contextName) {
+function extractDirectResource(schema, contextName, componentSchemas) {
 	const inlineModels = [];
 	if (schema.properties && (schema.type === "object" || !schema.type)) {
 		const modelName = deriveModelName(schema, contextName);
@@ -1817,17 +1817,43 @@ function extractDirectResource(schema, contextName) {
 	if (schema.allOf) {
 		const mergedProperties = {};
 		const mergedRequired = [];
-		for (const sub of schema.allOf) {
-			if (sub.properties) Object.assign(mergedProperties, sub.properties);
-			if (sub.required) mergedRequired.push(...sub.required);
-		}
+		const unresolvedRefs = [];
+		const seenRefs = /* @__PURE__ */ new Set();
+		let mergedRefFields = false;
+		const mergeSubSchemas = (subs) => {
+			for (const sub of subs) {
+				let resolved = sub;
+				if (sub.$ref) {
+					if (seenRefs.has(sub.$ref)) continue;
+					seenRefs.add(sub.$ref);
+					const segments = sub.$ref.split("/");
+					const refName = segments[segments.length - 1];
+					const refSchema = refName ? componentSchemas?.[refName] : void 0;
+					if (!refSchema) {
+						unresolvedRefs.push(sub.$ref);
+						continue;
+					}
+					resolved = refSchema;
+					mergedRefFields = true;
+				}
+				if (resolved.allOf) mergeSubSchemas(resolved.allOf);
+				if (resolved.properties) Object.assign(mergedProperties, resolved.properties);
+				if (resolved.required) mergedRequired.push(...resolved.required);
+			}
+		};
+		mergeSubSchemas(schema.allOf);
+		if (unresolvedRefs.length === 1 && !mergedRefFields) return {
+			response: schemaToTypeRef({ $ref: unresolvedRefs[0] }, contextName),
+			inlineModels,
+			isPaginated: false
+		};
 		if (Object.keys(mergedProperties).length > 0) {
 			const merged = {
 				type: "object",
 				properties: mergedProperties,
 				required: mergedRequired
 			};
-			const modelName = deriveModelName(merged, contextName);
+			const modelName = mergedRefFields ? toPascalCase(contextName) : deriveModelName(merged, contextName);
 			inlineModels.push(...extractInlineModel(modelName, merged));
 			return {
 				response: {
@@ -2230,7 +2256,7 @@ function buildOperation(method, path, op, pathLevelParams, operationIdTransform,
 	const cookieParams = extractParams(allParams, "cookie", opContext, componentSchemas);
 	const reqBodyModels = [];
 	const { body: requestBody, encoding: requestBodyEncoding } = extractRequestBody(op.requestBody, op, reqBodyModels);
-	const { response, successResponses, errors, inlineModels, isPaginated, dataPath: responseDataPath, itemType: responseItemType } = extractResponses(op.responses, op, path, method);
+	const { response, successResponses, errors, inlineModels, isPaginated, dataPath: responseDataPath, itemType: responseItemType } = extractResponses(op.responses, op, path, method, componentSchemas);
 	inlineModels.push(...reqBodyModels);
 	const paginationFromParams = detectPagination(response, queryParams, responseDataPath);
 	let pagination;
@@ -2523,7 +2549,7 @@ function deriveResponseName(op, path, method) {
 	if (op?.operationId) return cleanSchemaName(toPascalCase(normalizeOperationIdForNaming(op.operationId)) + "Response");
 	return toPascalCase(path.split("/").filter(Boolean)[0] ?? "Unknown") + toPascalCase(method) + "Response";
 }
-function extractResponses(responses, op, path, method) {
+function extractResponses(responses, op, path, method, componentSchemas) {
 	const errors = [];
 	let response = {
 		kind: "primitive",
@@ -2550,7 +2576,7 @@ function extractResponses(responses, op, path, method) {
 			const jsonContent = resp.content?.["application/json"];
 			if (jsonContent?.schema) {
 				const contextName = deriveResponseName(op, path ?? "/", method ?? "get");
-				const result = classifyAndExtractResponse(jsonContent.schema, contextName);
+				const result = classifyAndExtractResponse(jsonContent.schema, contextName, componentSchemas);
 				extractedType = result.response;
 				inlineModels = result.inlineModels;
 				isPaginated = result.isPaginated;
@@ -6278,7 +6304,7 @@ async function readManifest(dir) {
 	}
 	try {
 		const parsed = JSON.parse(raw);
-		if (typeof parsed.version !== "number" || typeof parsed.language !== "string" || typeof parsed.generatedAt !== "string" || !Array.isArray(parsed.files) || !parsed.files.every((p) => typeof p === "string")) return null;
+		if (typeof parsed.version !== "number" || typeof parsed.language !== "string" || !Array.isArray(parsed.files) || !parsed.files.every((p) => typeof p === "string")) return null;
 		if (parsed.version > MANIFEST_VERSION) {
 			console.warn(`[oagen] ${MANIFEST_FILENAME} schema version ${parsed.version} is newer than supported (${MANIFEST_VERSION}); ignoring for pruning.`);
 			return null;
@@ -6295,7 +6321,6 @@ async function writeManifest(dir, opts) {
 		version: MANIFEST_VERSION,
 		language: opts.language,
 		...opts.sdkName !== void 0 ? { sdkName: opts.sdkName } : {},
-		generatedAt: (/* @__PURE__ */ new Date()).toISOString(),
 		...opts.specSha !== void 0 ? { specSha: opts.specSha } : {},
 		...opts.specPath !== void 0 ? { specPath: opts.specPath } : {},
 		...opts.emitterSha !== void 0 ? { emitterSha: opts.emitterSha } : {},
@@ -6305,16 +6330,9 @@ async function writeManifest(dir, opts) {
 		files: [...new Set(opts.files)].sort(),
 		...opts.operations !== void 0 ? { operations: opts.operations } : {}
 	};
-	const previous = await readManifest(dir);
-	if (previous && sameManifestExceptGeneratedAt(previous, manifest)) manifest.generatedAt = previous.generatedAt;
 	await fs.mkdir(dir, { recursive: true });
 	await fs.writeFile(manifestPath, JSON.stringify(manifest, null, 2) + "\n", "utf-8");
 }
-function sameManifestExceptGeneratedAt(a, b) {
-	const { generatedAt: _aGeneratedAt, ...aComparable } = a;
-	const { generatedAt: _bGeneratedAt, ...bComparable } = b;
-	return JSON.stringify(aComparable) === JSON.stringify(bComparable);
-}
 /** Return the set of previous paths no longer present in the current emission. */
 function computeStalePaths(prev, currentPaths) {
 	const current = new Set(currentPaths);