@workos/oagen 0.25.1 → 0.26.1

package/dist/cli/index.mjs

@@ -475,6 +475,14 @@ function extractInlineModelsFromProperties(schema, results, parentName) {
 				extractInlineModelsFromProperties(items, results, modelName);
 			}
 		}
+		if (fieldSchema.allOf && fieldSchema.allOf.every((s) => !s.$ref && !s.oneOf && !s.anyOf)) {
+			const merged = mergeAllOfObjectSchema(fieldSchema);
+			if (Object.keys(merged.properties ?? {}).length > 0) {
+				const modelName = qualifyInlineModelName(toPascalCase(fieldName), parentName);
+				results.push(buildInlineModel(modelName, merged));
+				extractInlineModelsFromProperties(merged, results, modelName);
+			}
+		}
 		if (fieldSchema.oneOf) {
 			const inlineObjectVariants = fieldSchema.oneOf.filter((v) => !v.$ref && v.properties && (v.type === "object" || !v.type));
 			if (inlineObjectVariants.length > 0) {
@@ -534,6 +542,31 @@ function nameOneOfVariant(variant, parentName, alreadyEmitted, discriminatorProp
 	}
 	return `${parentName}${alreadyEmitted.length + 1}`;
 }
+/**
+* Merge the object members of an `allOf` (recursively) into a single
+* object-shaped schema, so an inline object expressed via `allOf` can be
+* materialized as one model — mirroring how schemaToTypeRef collapses such a
+* field into a single merged model ref. Earlier members win on key conflicts,
+* matching the merge order used elsewhere in the parser.
+*/
+function mergeAllOfObjectSchema(schema) {
+	const properties = {};
+	const required = [];
+	const visit = (s) => {
+		if (s.properties) {
+			for (const [key, value] of Object.entries(s.properties)) if (value && !(key in properties)) properties[key] = value;
+		}
+		if (s.required) required.push(...s.required);
+		if (s.allOf) for (const sub of s.allOf) visit(sub);
+	};
+	visit(schema);
+	return {
+		type: "object",
+		properties,
+		required,
+		description: schema.description
+	};
+}
 function buildInlineModel(name, schema) {
 	const requiredSet = new Set(schema.required ?? []);
 	const fields = [];
@@ -2417,6 +2450,7 @@ function extractRequestBody(body, op, inlineModels) {
 			description: void 0,
 			fields
 		});
+		extractInlineModelsFromProperties(schema, inlineModels, contextName);
 		return {
 			body: {
 				kind: "model",
@@ -2443,6 +2477,7 @@ function extractRequestBody(body, op, inlineModels) {
 				description: variant.description,
 				fields
 			});
+			extractInlineModelsFromProperties(variant, inlineModels, variantName);
 			variants.push({
 				kind: "model",
 				name: variantName