@workos/oagen-emitters 0.6.3 → 0.6.5

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.6.3"
+  ".": "0.6.5"
 }

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.6.5](https://github.com/workos/oagen-emitters/compare/v0.6.4...v0.6.5) (2026-04-28)
+
+
+### Bug Fixes
+
+* **python,kotlin,dotnet:** skip literal defaults for optional fields; fix dotnet JsonConverter nullability ([#56](https://github.com/workos/oagen-emitters/issues/56)) ([78d4c4c](https://github.com/workos/oagen-emitters/commit/78d4c4c303d67f7399d799dc37ad06d8e8997faa))
+
+## [0.6.4](https://github.com/workos/oagen-emitters/compare/v0.6.3...v0.6.4) (2026-04-28)
+
+
+### Bug Fixes
+
+* **dotnet,kotlin:** restore fields on discriminated base models ([#54](https://github.com/workos/oagen-emitters/issues/54)) ([6928b8f](https://github.com/workos/oagen-emitters/commit/6928b8f5012d2dc77069950cb438a72963086277))
+* **php,python:** use fallback defaults for literal fields during deserialization ([#55](https://github.com/workos/oagen-emitters/issues/55)) ([0affb47](https://github.com/workos/oagen-emitters/commit/0affb47296f14121e2797545edc0b6fa0f8ba30f))
+* **ruby:** eagerly load configuration.rb to fix WorkOS.configure ([#52](https://github.com/workos/oagen-emitters/issues/52)) ([fc99d36](https://github.com/workos/oagen-emitters/commit/fc99d365fe14778fa3e000335ead369dfe7abec6))
+
 ## [0.6.3](https://github.com/workos/oagen-emitters/compare/v0.6.2...v0.6.3) (2026-04-27)
 
 

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"],"mappings":";;;;;cAgCa,WAAA,EAAa,OAAA;;;cCOb,aAAA,EAAe,OAAA;;;cCHf,UAAA,EAAY,OAAA;;;cCPZ,SAAA,EAAW,OAAA;;;cCqCX,aAAA,EAAe,OAAA;;;cCnCf,aAAA,EAAe,OAAA;;;cCHf,WAAA,EAAa,OAAA"}
+{"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"],"mappings":";;;;;cAgCa,WAAA,EAAa,OAAA;;;cCOb,aAAA,EAAe,OAAA;;;cCHf,UAAA,EAAY,OAAA;;;cCPZ,SAAA,EAAW,OAAA;;;cCsCX,aAAA,EAAe,OAAA;;;cCpCf,aAAA,EAAe,OAAA;;;cCHf,WAAA,EAAa,OAAA"}

package/dist/index.mjs

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

package/dist/{plugin-DgjQSh2G.mjs → plugin-BV_wDWDO.mjs}

@@ -7321,7 +7321,9 @@ function generateModels$5(models, ctx) {
 			const pyFieldName = fieldName$4(field.name);
 			const wireKey = field.name;
 			const isRequired = !isOptionalField(model.name, field, ctx);
-			const accessor = isRequired ? `data["${wireKey}"]` : `data.get("${wireKey}")`;
+			let accessor;
+			if (field.type.kind === "literal" && isRequired) accessor = `data.get("${wireKey}", ${pythonLiteralDefault(field.type.value)})`;
+			else accessor = isRequired ? `data["${wireKey}"]` : `data.get("${wireKey}")`;
 			const deserRequired = isRequired && field.type.kind !== "nullable";
 			const walrusVar = `_v_${pyFieldName}`;
 			const deserExpr = deserializeField(field.type, accessor, deserRequired, walrusVar);
@@ -7514,6 +7516,13 @@ function isOptionalField(modelName, field, ctx) {
 	if (!field.required || field.deprecated) return true;
 	return false;
 }
+/** Convert a LiteralType value to a Python default expression for use in data.get(). */
+function pythonLiteralDefault(value) {
+	if (value === null) return "None";
+	if (typeof value === "boolean") return value ? "True" : "False";
+	if (typeof value === "string") return `"${value}"`;
+	return String(value);
+}
 function resolveModelFieldType(ref) {
 	if (ref.kind === "nullable" && isDateTimeType(ref.inner)) return "Optional[datetime]";
 	if (isDateTimeType(ref)) return "datetime";
@@ -10629,6 +10638,7 @@ function generateFromArrayAccessor(ref, wireName, required) {
 		if (isNullable) return `$data['${wireName}'] ?? null`;
 		return `$data['${wireName}'] ?? null`;
 	}
+	if (ref.kind === "literal") return `$data['${wireName}'] ?? ${phpLiteralDefault(ref.value)}`;
 	return generateFromArrayValue(ref, `$data['${wireName}']`);
 }
 /**
@@ -10652,6 +10662,13 @@ function generateFromArrayValue(ref, accessor) {
 		case "literal": return accessor;
 	}
 }
+/** Convert a LiteralType value to a PHP default expression for use with ??. */
+function phpLiteralDefault(value) {
+	if (value === null) return "null";
+	if (typeof value === "boolean") return value ? "true" : "false";
+	if (typeof value === "string") return `'${value}'`;
+	return String(value);
+}
 /**
 * Check if a TypeRef needs special handling (not a simple key access).
 */
@@ -14917,12 +14934,20 @@ function joinUnionVariants$1(_ref, variants) {
 * Each model becomes a separate .cs file under Services/{mount}/Entities/.
 * For initial generation, all models go into a flat Entities/ directory.
 */
-function generateModels$2(models, ctx) {
+function generateModels$2(models, ctx, discCtx) {
 	if (models.length === 0) return [];
 	const enumConstByName = /* @__PURE__ */ new Map();
 	for (const e of ctx.spec.enums) if (e.values.length === 1) enumConstByName.set(e.name, String(e.values[0].value));
 	const files = [];
 	primeModelAliases(models);
+	const baseFieldLookup = /* @__PURE__ */ new Map();
+	if (discCtx) {
+		for (const model of models) if (discCtx.discriminatorBases.has(model.name)) {
+			const fieldMap = /* @__PURE__ */ new Map();
+			for (const field of model.fields) fieldMap.set(fieldName$1(field.name), mapTypeRef$2(field.type));
+			baseFieldLookup.set(model.name, fieldMap);
+		}
+	}
 	for (const model of models) {
 		if (isListWrapperModel(model) || isListMetadataModel(model)) continue;
 		const csClassName = modelClassName(model.name);
@@ -14946,7 +14971,12 @@ function generateModels$2(models, ctx) {
 			const human = humanize$1(model.name);
 			lines.push(`    /// <summary>Represents ${articleFor(human)} ${human}.</summary>`);
 		}
-		lines.push(`    public class ${csClassName}`);
+		if (discCtx?.discriminatorBases.has(model.name) ?? false) lines.push(`    [Newtonsoft.Json.JsonConverter(typeof(${csClassName}DiscriminatorConverter))]`);
+		const baseName = discCtx?.variantToBase.get(model.name);
+		const baseClassName = baseName ? modelClassName(baseName) : null;
+		const baseFields = baseName ? baseFieldLookup.get(baseName) : void 0;
+		if (baseClassName) lines.push(`    public class ${csClassName} : ${baseClassName}`);
+		else lines.push(`    public class ${csClassName}`);
 		lines.push("    {");
 		const dictObjectFields = [];
 		const seenFieldNames = /* @__PURE__ */ new Set();
@@ -14954,6 +14984,14 @@ function generateModels$2(models, ctx) {
 			const csFieldName = fieldName$1(field.name);
 			if (seenFieldNames.has(csFieldName)) continue;
 			seenFieldNames.add(csFieldName);
+			let useNewModifier = false;
+			if (baseFields) {
+				const baseType = baseFields.get(csFieldName);
+				if (baseType !== void 0) {
+					if (baseType === mapTypeRef$2(field.type)) continue;
+					useNewModifier = true;
+				}
+			}
 			const isOptional = !field.required;
 			const baseType = mapTypeRef$2(field.type);
 			const isAlreadyNullable = baseType.endsWith("?");
@@ -14961,7 +14999,7 @@ function generateModels$2(models, ctx) {
 			let csType;
 			let initializer = "";
 			let setterModifier = "";
-			if (constInit !== null) {
+			if (constInit !== null && !isOptional) {
 				csType = baseType;
 				initializer = ` = ${constInit};`;
 				setterModifier = "internal ";
@@ -14983,7 +15021,8 @@ function generateModels$2(models, ctx) {
 			}
 			const isRequiredEnum = field.required && isEnumRef(field.type) && constInit === null;
 			lines.push(...emitJsonPropertyAttributes(field.name, { isRequiredEnum }));
-			lines.push(`        public ${csType} ${csFieldName} { get; ${setterModifier}set; }${initializer}`);
+			const newMod = useNewModifier ? "new " : "";
+			lines.push(`        public ${newMod}${csType} ${csFieldName} { get; ${setterModifier}set; }${initializer}`);
 			if (isDictionaryOfObject(csType) && !field.deprecated) dictObjectFields.push({
 				csName: csFieldName,
 				typeText: csType
@@ -16814,15 +16853,35 @@ const dotnetEmitter = {
 		const enriched = enrichModelsFromSpec(models);
 		const synEnumsForModels = getSyntheticEnums();
 		if (synEnumsForModels.length > 0) primeEnumAliases([...c.spec.enums, ...synEnumsForModels]);
-		const files = generateModels$2(enriched, c);
+		const originalByName = new Map(models.map((m) => [m.name, m]));
+		const discriminatorBases = /* @__PURE__ */ new Set();
+		const variantToBase = /* @__PURE__ */ new Map();
+		const modelDiscriminators = /* @__PURE__ */ new Map();
+		const files = generateModels$2(enriched.map((m) => {
+			const disc = m.discriminator;
+			if (disc && m.fields.length === 0) {
+				const original = originalByName.get(m.name);
+				if (original && original.fields.length > 0) {
+					discriminatorBases.add(m.name);
+					modelDiscriminators.set(m.name, disc);
+					for (const variantName of Object.values(disc.mapping)) variantToBase.set(variantName, m.name);
+					return {
+						...m,
+						fields: original.fields
+					};
+				}
+			}
+			return m;
+		}), c, {
+			discriminatorBases,
+			variantToBase
+		});
 		if (discriminatedUnions$1.size > 0) for (const [baseName, disc] of discriminatedUnions$1) {
 			const converterName = `${baseName}DiscriminatorConverter`;
 			const lines = [];
 			lines.push(`namespace ${c.namespacePascal}`);
 			lines.push("{");
 			lines.push("    using System;");
-			lines.push("    using System.Text.Json;");
-			lines.push("    using System.Text.Json.Serialization;");
 			lines.push("    using Newtonsoft.Json;");
 			lines.push("    using Newtonsoft.Json.Linq;");
 			lines.push("");
@@ -16834,21 +16893,70 @@ const dotnetEmitter = {
 			lines.push("    {");
 			lines.push("        public override bool CanConvert(Type objectType) => objectType == typeof(object);");
 			lines.push("");
-			lines.push("        public override object ReadJson(Newtonsoft.Json.JsonReader reader, Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer)");
+			lines.push("        public override object ReadJson(Newtonsoft.Json.JsonReader reader, Type objectType, object? existingValue, Newtonsoft.Json.JsonSerializer serializer)");
 			lines.push("        {");
 			lines.push("            var jObject = JObject.Load(reader);");
 			lines.push(`            var discriminatorValue = jObject["${disc.property}"]?.ToString();`);
 			lines.push("            switch (discriminatorValue)");
 			lines.push("            {");
 			for (const [value, modelName] of Object.entries(disc.mapping)) {
-				const csName = modelName.replace(/([a-z])([A-Z])/g, "$1$2");
+				const csName = modelClassName(modelName);
 				lines.push(`                case "${value}": return jObject.ToObject<${csName}>(serializer);`);
 			}
 			lines.push("                default: return jObject.ToObject<object>(serializer);");
 			lines.push("            }");
 			lines.push("        }");
 			lines.push("");
-			lines.push("        public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer)");
+			lines.push("        public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object? value, Newtonsoft.Json.JsonSerializer serializer)");
+			lines.push("        {");
+			lines.push("            serializer.Serialize(writer, value);");
+			lines.push("        }");
+			lines.push("    }");
+			lines.push("}");
+			files.push({
+				path: `Client/Utilities/${converterName}.cs`,
+				content: lines.join("\n"),
+				overwriteExisting: true
+			});
+		}
+		for (const [baseName, disc] of modelDiscriminators) {
+			const baseClass = modelClassName(baseName);
+			const converterName = `${baseClass}DiscriminatorConverter`;
+			const lines = [];
+			lines.push(`namespace ${c.namespacePascal}`);
+			lines.push("{");
+			lines.push("    using System;");
+			lines.push("    using Newtonsoft.Json;");
+			lines.push("    using Newtonsoft.Json.Linq;");
+			lines.push("");
+			lines.push(`    /// <summary>`);
+			lines.push(`    /// JSON converter that deserializes <see cref="${baseClass}"/> into the`);
+			lines.push(`    /// correct variant subclass based on the "${disc.property}" property.`);
+			lines.push(`    /// </summary>`);
+			lines.push(`    public class ${converterName} : Newtonsoft.Json.JsonConverter`);
+			lines.push("    {");
+			lines.push(`        public override bool CanConvert(Type objectType) => typeof(${baseClass}).IsAssignableFrom(objectType);`);
+			lines.push("");
+			lines.push("        public override object ReadJson(Newtonsoft.Json.JsonReader reader, Type objectType, object? existingValue, Newtonsoft.Json.JsonSerializer serializer)");
+			lines.push("        {");
+			lines.push("            var jObject = JObject.Load(reader);");
+			lines.push(`            var discriminatorValue = jObject["${disc.property}"]?.ToString();`);
+			lines.push("");
+			lines.push("            object target;");
+			lines.push("            switch (discriminatorValue)");
+			lines.push("            {");
+			for (const [value, variantModelName] of Object.entries(disc.mapping)) {
+				const csName = modelClassName(variantModelName);
+				lines.push(`                case "${value}": target = new ${csName}(); break;`);
+			}
+			lines.push(`                default: target = new ${baseClass}(); break;`);
+			lines.push("            }");
+			lines.push("");
+			lines.push("            serializer.Populate(jObject.CreateReader(), target);");
+			lines.push("            return target;");
+			lines.push("        }");
+			lines.push("");
+			lines.push("        public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object? value, Newtonsoft.Json.JsonSerializer serializer)");
 			lines.push("        {");
 			lines.push("            serializer.Serialize(writer, value);");
 			lines.push("        }");
@@ -17543,7 +17651,7 @@ function renderFields(fields, overrideFields = /* @__PURE__ */ new Set()) {
 		let kotlinType;
 		let defaultExpr = null;
 		const literalDefault = literalDefaultExpr(field.type);
-		if (literalDefault !== null) {
+		if (literalDefault !== null && field.required) {
 			kotlinType = baseType;
 			defaultExpr = literalDefault;
 		} else if (!field.required) {
@@ -19369,7 +19477,18 @@ function ensureTrailingNewlines$1(files) {
 const kotlinEmitter = {
 	language: "kotlin",
 	generateModels(models, ctx) {
-		return ensureTrailingNewlines$1(generateModels$1(enrichModelsFromSpec(models), ctx));
+		const enriched = enrichModelsFromSpec(models);
+		const originalByName = new Map(models.map((m) => [m.name, m]));
+		return ensureTrailingNewlines$1(generateModels$1(enriched.map((m) => {
+			if (m.discriminator && m.fields.length === 0) {
+				const original = originalByName.get(m.name);
+				if (original && original.fields.length > 0) return {
+					...m,
+					fields: original.fields
+				};
+			}
+			return m;
+		}), ctx));
 	},
 	generateEnums(enums, ctx) {
 		const syntheticEnums = getSyntheticEnums();
@@ -20734,9 +20853,11 @@ function generateMainEntryFile(spec, ctx) {
 	for (const dir of modelSubdirs) lines.push(`loader.collapse("#{__dir__}/workos/${dir}")`);
 	lines.push(`loader.ignore("#{__dir__}/workos/errors.rb")`);
 	lines.push(`loader.ignore("#{__dir__}/workos/inflections.rb")`);
+	lines.push(`loader.ignore("#{__dir__}/workos/configuration.rb")`);
 	lines.push("loader.setup");
 	lines.push("");
 	lines.push(`require 'workos/errors'`);
+	lines.push(`require 'workos/configuration'`);
 	return {
 		path: "lib/workos.rb",
 		content: lines.join("\n"),
@@ -21468,4 +21589,4 @@ const workosEmittersPlugin = {
 //#endregion
 export { nodeEmitter as _, rustExtractor as a, pythonExtractor as c, rubyEmitter as d, kotlinEmitter as f, pythonEmitter as g, phpEmitter as h, kotlinExtractor as i, rubyExtractor as l, goEmitter as m, elixirExtractor as n, goExtractor as o, dotnetEmitter as p, dotnetExtractor as r, phpExtractor as s, workosEmittersPlugin as t, nodeExtractor as u };
 
-//# sourceMappingURL=plugin-DgjQSh2G.mjs.map
+//# sourceMappingURL=plugin-BV_wDWDO.mjs.map