@workos/oagen-emitters 0.14.2 → 0.14.4

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.14.2"
+  ".": "0.14.4"
 }

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.14.4](https://github.com/workos/oagen-emitters/compare/v0.14.3...v0.14.4) (2026-05-26)
+
+
+### Bug Fixes
+
+* **ruby:** avoid double-wrapping T.nilable and skip T.untyped ([#127](https://github.com/workos/oagen-emitters/issues/127)) ([e42083f](https://github.com/workos/oagen-emitters/commit/e42083f77773f3ae96b750577db36cde01b65f4f))
+
+## [0.14.3](https://github.com/workos/oagen-emitters/compare/v0.14.2...v0.14.3) (2026-05-22)
+
+
+### Bug Fixes
+
+* include discriminator fields in generated fixtures ([#125](https://github.com/workos/oagen-emitters/issues/125)) ([6a3633e](https://github.com/workos/oagen-emitters/commit/6a3633e0e3f0497146bf89fc31a5dabc1152cce1))
+
 ## [0.14.2](https://github.com/workos/oagen-emitters/compare/v0.14.1...v0.14.2) (2026-05-22)
 
 

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/node/index.ts","../src/python/index.ts","../src/php/index.ts","../src/go/index.ts","../src/dotnet/index.ts","../src/kotlin/index.ts","../src/ruby/index.ts","../src/rust/index.ts"],"mappings":";;;;;cAuda,WAAA,EAAa,OA4GzB;;;cC5hBY,aAAA,EAAe,OA+D3B;;;cC5CY,UAAA,EAAY,OA4DxB;;;cCzFY,SAAA,EAAW,OAyEvB;;;cCnCY,aAAA,EAAe,OAiR3B;;;cCrTY,aAAA,EAAe,OA6E3B;;;cCxDY,WAAA,EAAa,OAmEzB;;;cC5DY,WAAA,EAAa,OA2DzB"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/node/index.ts","../src/python/index.ts","../src/php/index.ts","../src/go/index.ts","../src/dotnet/index.ts","../src/kotlin/index.ts","../src/ruby/index.ts","../src/rust/index.ts"],"mappings":";;;;;cA4da,WAAA,EAAa,OA4GzB;;;cCjiBY,aAAA,EAAe,OA+D3B;;;cC5CY,UAAA,EAAY,OA4DxB;;;cCzFY,SAAA,EAAW,OAyEvB;;;cCnCY,aAAA,EAAe,OAiR3B;;;cCrTY,aAAA,EAAe,OA6E3B;;;cCxDY,WAAA,EAAa,OAmEzB;;;cC5DY,WAAA,EAAa,OA2DzB"}

package/dist/index.mjs

@@ -1,2 +1,2 @@
-import { _ as pythonEmitter, a as rustExtractor, c as pythonExtractor, d as rustEmitter, f as rubyEmitter, g as phpEmitter, h as goEmitter, i as kotlinExtractor, l as rubyExtractor, m as dotnetEmitter, n as elixirExtractor, o as goExtractor, p as kotlinEmitter, r as dotnetExtractor, s as phpExtractor, t as workosEmittersPlugin, u as nodeExtractor, v as nodeEmitter } from "./plugin-BbSmT2kj.mjs";
+import { _ as pythonEmitter, a as rustExtractor, c as pythonExtractor, d as rustEmitter, f as rubyEmitter, g as phpEmitter, h as goEmitter, i as kotlinExtractor, l as rubyExtractor, m as dotnetEmitter, n as elixirExtractor, o as goExtractor, p as kotlinEmitter, r as dotnetExtractor, s as phpExtractor, t as workosEmittersPlugin, u as nodeExtractor, v as nodeEmitter } from "./plugin-BGVaMGqe.mjs";
 export { dotnetEmitter, dotnetExtractor, elixirExtractor, goEmitter, goExtractor, kotlinEmitter, kotlinExtractor, nodeEmitter, nodeExtractor, phpEmitter, phpExtractor, pythonEmitter, pythonExtractor, rubyEmitter, rubyExtractor, rustEmitter, rustExtractor, workosEmittersPlugin };

package/dist/{plugin-BbSmT2kj.mjs → plugin-BGVaMGqe.mjs}

@@ -5925,6 +5925,15 @@ function generateModelFixture$5(model, modelMap, enumMap) {
 		if (field.example !== void 0) fixture[wireName] = field.example;
 		else fixture[wireName] = generateFieldValue$4(field.type, field.name, model.name, modelMap, enumMap);
 	}
+	if (model.discriminator) {
+		const [firstValue, variantName] = Object.entries(model.discriminator.mapping)[0];
+		fixture[wireFieldName(model.discriminator.property)] = firstValue;
+		const variantModel = modelMap.get(variantName);
+		if (variantModel) for (const field of variantModel.fields) {
+			const wireName = wireFieldName(field.name);
+			if (!(wireName in fixture)) fixture[wireName] = field.example !== void 0 ? field.example : generateFieldValue$4(field.type, field.name, model.name, modelMap, enumMap);
+		}
+	}
 	return fixture;
 }
 function generateFieldValue$4(ref, fName, modelName, modelMap, enumMap) {
@@ -7758,13 +7767,13 @@ function detectDiscriminatedShape(modelName, rawSchemas) {
 		return {
 			nameSuffix: variantNameSuffix(discValue),
 			discriminatorValue: discValue,
-			fields: variantFields(fv, discProp, modelName, rawSchemas)
+			fields: variantFields(fv, discProp, modelName)
 		};
 	}).filter((v) => v !== null);
 	if (variants.length !== flattenedVariants.length) return null;
 	return {
 		modelName,
-		baseFields: baseObject ? collectObjectFields(baseObject, modelName, rawSchemas) : [],
+		baseFields: baseObject ? collectObjectFields(baseObject, modelName) : [],
 		discriminatorProperty: discProp,
 		discriminatorPropertyDomain: toCamelCase(discProp),
 		variants
@@ -7775,8 +7784,8 @@ function mergeBase(prev, next) {
 	return {
 		type: "object",
 		properties: {
-			...prev.properties ?? {},
-			...next.properties ?? {}
+			...prev.properties,
+			...next.properties
 		},
 		required: [...new Set([...prev.required ?? [], ...next.required ?? []])]
 	};
@@ -7902,29 +7911,29 @@ function readConstString(schema) {
 function variantNameSuffix(constValue) {
 	return toPascalCase(constValue);
 }
-function collectObjectFields(schema, parentName, rawSchemas) {
+function collectObjectFields(schema, parentName) {
 	const props = schema.properties ?? {};
 	const required = new Set(schema.required ?? []);
 	const fields = [];
-	for (const [name, propSchema] of Object.entries(props)) fields.push(buildField(name, propSchema, required.has(name), parentName, rawSchemas));
+	for (const [name, propSchema] of Object.entries(props)) fields.push(buildField(name, propSchema, required.has(name), parentName));
 	return fields;
 }
-function variantFields(fv, discriminatorProperty, parentName, rawSchemas) {
+function variantFields(fv, discriminatorProperty, parentName) {
 	const fields = [];
 	for (const [name, propSchema] of fv.alwaysProperties) {
 		if (name === discriminatorProperty) continue;
-		fields.push(buildField(name, propSchema, fv.required.has(name), parentName, rawSchemas));
+		fields.push(buildField(name, propSchema, fv.required.has(name), parentName));
 	}
 	for (const [name, propSchema] of fv.optionalProperties) {
 		if (name === discriminatorProperty) continue;
-		fields.push(buildField(name, propSchema, false, parentName, rawSchemas));
+		fields.push(buildField(name, propSchema, false, parentName));
 	}
 	return fields;
 }
-function buildField(rawName, schema, required, parentName, rawSchemas) {
+function buildField(rawName, schema, required, parentName) {
 	const modelDeps = /* @__PURE__ */ new Set();
-	const domainType = rawSchemaToTS(schema, parentName, rawName, false, modelDeps, rawSchemas);
-	const wireType = rawSchemaToTS(schema, parentName, rawName, true, modelDeps, rawSchemas);
+	const domainType = rawSchemaToTS(schema, parentName, rawName, false, modelDeps);
+	const wireType = rawSchemaToTS(schema, parentName, rawName, true, modelDeps);
 	return {
 		name: rawName,
 		description: schema.description,
@@ -7947,7 +7956,7 @@ function typeOf(schema) {
 function isNullable(schema) {
 	return Array.isArray(schema.type) && schema.type.includes("null");
 }
-function rawSchemaToTS(schema, parentName, fieldName, isWire, modelDeps, rawSchemas) {
+function rawSchemaToTS(schema, parentName, fieldName, isWire, modelDeps) {
 	if (schema.$ref) {
 		const refName = schema.$ref.split("/").pop();
 		modelDeps.add(refName);
@@ -7962,7 +7971,7 @@ function rawSchemaToTS(schema, parentName, fieldName, isWire, modelDeps, rawSche
 	if (baseType === "string") core = !isWire && schema.format === "date-time" ? "Date" : "string";
 	else if (baseType === "integer" || baseType === "number") core = "number";
 	else if (baseType === "boolean") core = "boolean";
-	else if (baseType === "array" && schema.items) core = `${parenthesizeUnion(rawSchemaToTS(schema.items, parentName, singularize$3(fieldName), isWire, modelDeps, rawSchemas))}[]`;
+	else if (baseType === "array" && schema.items) core = `${parenthesizeUnion(rawSchemaToTS(schema.items, parentName, singularize$3(fieldName), isWire, modelDeps))}[]`;
 	else if (baseType === "object" && schema.properties) {
 		const synthName = `${parentName}_${singularize$3(fieldName)}`;
 		modelDeps.add(synthName);
@@ -8362,6 +8371,10 @@ function markPriorManifestAutogen(surface, root, priorManifestPaths) {
 		if (!relPath.startsWith("src/")) continue;
 		if (!surface.files.has(relPath)) continue;
 		if (surface.protectedFiles.has(relPath)) continue;
+		if (/\/fixtures\/[^/]+\.json$/.test(relPath)) {
+			surface.autogenFiles.add(relPath);
+			continue;
+		}
 		try {
 			const text = fs$1.readFileSync(path$1.join(root, relPath), "utf8");
 			if (/auto-generated by oagen/i.test(text.slice(0, 400))) {
@@ -11459,6 +11472,14 @@ function generateModelFixture$4(model, modelMap, enumMap) {
 		if (field.example !== void 0) fixture[wireName] = field.example;
 		else fixture[wireName] = generateFieldValue$3(field.type, field.name, model.name, modelMap, enumMap);
 	}
+	if (model.discriminator) {
+		const [firstValue, variantName] = Object.entries(model.discriminator.mapping)[0];
+		fixture[model.discriminator.property] = firstValue;
+		const variantModel = modelMap.get(variantName);
+		if (variantModel) {
+			for (const field of variantModel.fields) if (!(field.name in fixture)) fixture[field.name] = field.example !== void 0 ? field.example : generateFieldValue$3(field.type, field.name, model.name, modelMap, enumMap);
+		}
+	}
 	return fixture;
 }
 function generateFieldValue$3(ref, fieldName, modelName, modelMap, enumMap) {
@@ -16471,6 +16492,14 @@ function generateModelFixture$2(model, modelMap, enumMap) {
 		if (field.example !== void 0) fixture[wireName] = field.example;
 		else fixture[wireName] = generateFieldValue$1(field.type, field.name, model.name, modelMap, enumMap);
 	}
+	if (model.discriminator) {
+		const [firstValue, variantName] = Object.entries(model.discriminator.mapping)[0];
+		fixture[model.discriminator.property] = firstValue;
+		const variantModel = modelMap.get(variantName);
+		if (variantModel) {
+			for (const field of variantModel.fields) if (!(field.name in fixture)) fixture[field.name] = field.example !== void 0 ? field.example : generateFieldValue$1(field.type, field.name, model.name, modelMap, enumMap);
+		}
+	}
 	return fixture;
 }
 function generateFieldValue$1(ref, fName, modelName, modelMap, enumMap) {
@@ -24933,7 +24962,7 @@ function mapSorbetType(ref) {
 			if (unique.length === 1) return unique[0];
 			return `T.any(${unique.join(", ")})`;
 		},
-		nullable: (_ref, inner) => `T.nilable(${inner})`,
+		nullable: (_ref, inner) => wrapNilable(inner),
 		literal: (r) => typeof r.value === "string" ? "String" : r.value === null ? "NilClass" : typeof r.value === "number" ? Number.isInteger(r.value) ? "Integer" : "Float" : "T::Boolean",
 		map: (_ref, value) => `T::Hash[String, ${value}]`
 	});
@@ -24961,7 +24990,7 @@ function generateRbiFiles(spec, ctx) {
 			const fname = fieldName$1(f.name);
 			if (seenFieldNames.has(fname)) continue;
 			seenFieldNames.add(fname);
-			const sorbetType = f.required ? mapSorbetType(f.type) : `T.nilable(${unwrapNilable(mapSorbetType(f.type))})`;
+			const sorbetType = f.required ? mapSorbetType(f.type) : wrapNilable(mapSorbetType(f.type));
 			lines.push(`    sig { returns(${sorbetType}) }`);
 			lines.push(`    def ${fname}; end`);
 			lines.push("");
@@ -25068,7 +25097,7 @@ function generateRbiFiles(spec, ctx) {
 				const n = fieldName$1(f.name);
 				if (seen.has(n)) continue;
 				seen.add(n);
-				sigParams.push(`${n}: T.nilable(${unwrapNilable(mapSorbetType(f.type))})`);
+				sigParams.push(`${n}: ${wrapNilable(mapSorbetType(f.type))}`);
 			}
 			for (const q of queryParams) {
 				if (hiddenParams.has(q.name)) continue;
@@ -25076,14 +25105,14 @@ function generateRbiFiles(spec, ctx) {
 				const n = safeParamName(q.name);
 				if (seen.has(n)) continue;
 				seen.add(n);
-				sigParams.push(`${n}: T.nilable(${unwrapNilable(mapSorbetType(q.type))})`);
+				sigParams.push(`${n}: ${wrapNilable(mapSorbetType(q.type))}`);
 			}
 			for (const group of parameterGroups) {
 				if (!group.optional) continue;
 				const n = fieldName$1(group.name);
 				if (seen.has(n)) continue;
 				seen.add(n);
-				sigParams.push(`${n}: T.nilable(${groupSorbetType(group)})`);
+				sigParams.push(`${n}: ${wrapNilable(groupSorbetType(group))}`);
 			}
 			sigParams.push("request_options: T::Hash[Symbol, T.untyped]");
 			const retType = mapSorbetReturnType(op.response, listWrapperModels, modelNames);
@@ -25137,12 +25166,17 @@ function unwrapNilable(type) {
 	const match = type.match(/^T\.nilable\((.+)\)$/);
 	return match ? match[1] : type;
 }
+/** Wrap a type in T.nilable(), skipping T.untyped (which already includes nil) and avoiding double-wrapping. */
+function wrapNilable(type) {
+	if (type === "T.untyped") return type;
+	return `T.nilable(${unwrapNilable(type)})`;
+}
 /** Map a response TypeRef to a Sorbet return type. */
 function mapSorbetReturnType(ref, listWrapperModels, modelNames) {
 	if (ref.kind === "model" && listWrapperModels.has(ref.name)) return "WorkOS::Types::ListStruct";
 	if (ref.kind === "model" && modelNames.has(ref.name)) return `WorkOS::${className(ref.name)}`;
 	if (ref.kind === "array" && ref.items.kind === "model" && modelNames.has(ref.items.name)) return `T::Array[WorkOS::${className(ref.items.name)}]`;
-	if (ref.kind === "nullable") return `T.nilable(${mapSorbetReturnType(ref.inner, listWrapperModels, modelNames)})`;
+	if (ref.kind === "nullable") return wrapNilable(mapSorbetReturnType(ref.inner, listWrapperModels, modelNames));
 	if (ref.kind === "primitive" && ref.type === "unknown") return "NilClass";
 	return mapSorbetType(ref);
 }
@@ -26852,6 +26886,18 @@ function generateModelFixture(model, modelMap, enumMap, visiting) {
 		const fromExample = exampleFromSpec(field.example, field.type, enumMap);
 		result[field.name] = fromExample !== void 0 ? fromExample : exampleFor(field.type, modelMap, enumMap, visiting, field.name);
 	}
+	if (model.discriminator) {
+		const [firstValue, variantName] = Object.entries(model.discriminator.mapping)[0];
+		result[model.discriminator.property] = firstValue;
+		const variantModel = modelMap.get(variantName);
+		if (variantModel) {
+			for (const field of variantModel.fields) if (!(field.name in result)) {
+				if (!field.required) continue;
+				const fromExample = exampleFromSpec(field.example, field.type, enumMap);
+				result[field.name] = fromExample !== void 0 ? fromExample : exampleFor(field.type, modelMap, enumMap, visiting, field.name);
+			}
+		}
+	}
 	visiting.delete(model.name);
 	return result;
 }
@@ -27604,4 +27650,4 @@ const workosEmittersPlugin = {
 //#endregion
 export { pythonEmitter as _, rustExtractor as a, pythonExtractor as c, rustEmitter as d, rubyEmitter as f, phpEmitter as g, goEmitter as h, kotlinExtractor as i, rubyExtractor as l, dotnetEmitter as m, elixirExtractor as n, goExtractor as o, kotlinEmitter as p, dotnetExtractor as r, phpExtractor as s, workosEmittersPlugin as t, nodeExtractor as u, nodeEmitter as v };
 
-//# sourceMappingURL=plugin-BbSmT2kj.mjs.map
+//# sourceMappingURL=plugin-BGVaMGqe.mjs.map