@workos/oagen-emitters 0.6.4 → 0.6.6

package/dist/plugin.mjs

@@ -1,2 +1,2 @@
-import { t as workosEmittersPlugin } from "./plugin-CZoeqixh.mjs";
+import { t as workosEmittersPlugin } from "./plugin-BgVrq-hM.mjs";
 export { workosEmittersPlugin };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workos/oagen-emitters",
-  "version": "0.6.4",
+  "version": "0.6.6",
   "description": "WorkOS' oagen emitters",
   "license": "MIT",
   "author": "WorkOS",

package/src/dotnet/index.ts

@@ -127,7 +127,7 @@ export const dotnetEmitter: Emitter = {
         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)',
+          '        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);');
@@ -143,7 +143,7 @@ export const dotnetEmitter: Emitter = {
         lines.push('        }');
         lines.push('');
         lines.push(
-          '        public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer)',
+          '        public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object? value, Newtonsoft.Json.JsonSerializer serializer)',
         );
         lines.push('        {');
         lines.push('            serializer.Serialize(writer, value);');
@@ -161,8 +161,10 @@ export const dotnetEmitter: Emitter = {
 
     // Generate converters for discriminated base models (model-level
     // discriminators detected by enrichModelsFromSpec, e.g. EventSchema).
-    // Uses Populate to avoid infinite recursion with the [JsonConverter]
-    // attribute applied to the base class.
+    // ReadJson uses Populate (not Deserialize) to avoid infinite recursion
+    // with the [JsonConverter] attribute applied to the base class.
+    // CanWrite is false so serialization uses the default path and never
+    // re-enters WriteJson.
     for (const [baseName, disc] of modelDiscriminators) {
       const baseClass = modelClassName(baseName);
       const converterName = `${baseClass}DiscriminatorConverter`;
@@ -184,7 +186,7 @@ export const dotnetEmitter: Emitter = {
       );
       lines.push('');
       lines.push(
-        '        public override object ReadJson(Newtonsoft.Json.JsonReader reader, Type objectType, object existingValue, Newtonsoft.Json.JsonSerializer serializer)',
+        '        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);');
@@ -204,11 +206,15 @@ export const dotnetEmitter: Emitter = {
       lines.push('            return target;');
       lines.push('        }');
       lines.push('');
+      lines.push('        public override bool CanWrite => false;');
+      lines.push('');
       lines.push(
-        '        public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object value, Newtonsoft.Json.JsonSerializer serializer)',
+        '        public override void WriteJson(Newtonsoft.Json.JsonWriter writer, object? value, Newtonsoft.Json.JsonSerializer serializer)',
       );
       lines.push('        {');
-      lines.push('            serializer.Serialize(writer, value);');
+      lines.push(
+        '            throw new NotImplementedException("Serialization is handled by the default serializer.");',
+      );
       lines.push('        }');
       lines.push('    }');
       lines.push('}');

package/src/dotnet/models.ts

@@ -161,10 +161,12 @@ export function generateModels(models: Model[], ctx: EmitterContext, discCtx?: D
       let initializer = '';
       let setterModifier = '';
 
-      if (constInit !== null) {
+      if (constInit !== null && !isOptional) {
         // Discriminator-style single-value enum/literal: emit with a const
         // initializer and a non-public setter so callers can't drift the
         // wire value. The converter still reads whatever the server sends.
+        // Only for required fields — optional literal fields must be nullable
+        // so absent keys round-trip correctly.
         csType = baseType;
         initializer = ` = ${constInit};`;
         setterModifier = 'internal ';

package/src/go/fixtures.ts

@@ -24,12 +24,11 @@ export const ID_PREFIXES: Record<string, string> = {
 /**
  * Generate JSON fixture files for test data.
  */
-export function generateFixtures(spec: {
-  models: Model[];
-  enums: Enum[];
-  services: any[];
-}): { path: string; content: string }[] {
-  if (spec.models.length === 0) return [];
+export function generateFixtures(spec: { models: Model[]; enums: Enum[]; services: any[] }): {
+  files: { path: string; content: string }[];
+  pathRewrites: Map<string, string>;
+} {
+  if (spec.models.length === 0) return { files: [], pathRewrites: new Map() };
 
   const modelMap = new Map(spec.models.map((m) => [m.name, m]));
   const enumMap = new Map(spec.enums.map((e) => [e.name, e]));
@@ -96,7 +95,7 @@ export function generateFixtures(spec: {
   // Remove duplicate files (they'll reference the canonical)
   const deduped = files.filter((f) => !pathRewrites.has(f.path));
 
-  return deduped;
+  return { files: deduped, pathRewrites };
 }
 
 function unwrapListModel(model: Model, modelMap: Map<string, Model>): Model | null {

package/src/go/tests.ts

@@ -72,7 +72,7 @@ export function generateTests(spec: ApiSpec, ctx: EmitterContext): GeneratedFile
   });
 
   // Generate fixture JSON files
-  const fixtures = generateFixtures(spec);
+  const { files: fixtures, pathRewrites: fixtureRewrites } = generateFixtures(spec);
   for (const fixture of fixtures) {
     files.push({
       path: fixture.path,
@@ -97,7 +97,7 @@ export function generateTests(spec: ApiSpec, ctx: EmitterContext): GeneratedFile
   for (const { name: mountName, operations } of testEntries) {
     if (operations.length === 0) continue;
     const mergedService: Service = { name: mountName, operations };
-    const testFile = generateServiceTest(mergedService, spec, ctx, accessPaths);
+    const testFile = generateServiceTest(mergedService, spec, ctx, accessPaths, fixtureRewrites);
     if (testFile) files.push(testFile);
   }
 
@@ -109,6 +109,7 @@ function generateServiceTest(
   spec: ApiSpec,
   ctx: EmitterContext,
   _accessPaths: Map<string, string>,
+  fixtureRewrites: Map<string, string>,
 ): GeneratedFile | null {
   if (service.operations.length === 0) return null;
 
@@ -213,6 +214,10 @@ function generateServiceTest(
             }
           }
           fixturePath = `testdata/list_${fileName(resolved.name)}.json`;
+          // If this fixture was deduplicated, use the canonical path
+          if (fixtureRewrites.has(fixturePath)) {
+            fixturePath = fixtureRewrites.get(fixturePath)!;
+          }
         }
       }
 

package/src/kotlin/models.ts

@@ -304,11 +304,13 @@ function renderFields(fields: Field[], overrideFields: Set<string> = new Set()):
     let kotlinType: string;
     let defaultExpr: string | null = null;
 
-    // Const literal fields: always emit a hardcoded default matching the
-    // literal value so callers don't have to pass it.
+    // Const literal fields: emit a hardcoded default matching the literal
+    // value so callers don't have to pass it — but only when the field is
+    // required. Optional literal fields must default to null so that absent
+    // keys round-trip correctly.
     const literalDefault = literalDefaultExpr(field.type);
 
-    if (literalDefault !== null) {
+    if (literalDefault !== null && field.required) {
       kotlinType = baseType;
       defaultExpr = literalDefault;
     } else if (!field.required) {

package/src/python/client.ts

@@ -163,15 +163,17 @@ function generateWorkOSClient(spec: ApiSpec, ctx: EmitterContext): GeneratedFile
       lines.push(importLine);
     }
   }
-  // Non-spec service imports — wrapped in ignore markers so the merger
-  // matches them positionally and doesn't displace them.
-  lines.push('');
-  lines.push('# @oagen-ignore-start — non-spec service imports (hand-maintained)');
+  // Non-spec service imports — emitted as plain imports (not wrapped in
+  // ignore markers). The overwriteWithPreservedRegions() machinery in oagen
+  // relocates top-level ignore blocks to EOF because they have no containing
+  // class, stripping the markers from the imports while spliceExtraImports()
+  // preserves the bare import lines. Emitting them directly avoids the
+  // displacement entirely; spliceExtraImports() will preserve any additional
+  // hand-added imports from the existing file on subsequent regenerations.
   for (const s of NON_SPEC_SERVICES) {
     const w = PYTHON_NON_SPEC_WIRING[s.id];
     if (w) lines.push(w.importLine);
   }
-  lines.push('# @oagen-ignore-end');
   lines.push('');
   lines.push('');
 

package/src/python/models.ts

@@ -357,8 +357,8 @@ export function generateModels(models: Model[], ctx: EmitterContext): GeneratedF
       const wireKey = field.name; // Wire keys are snake_case from the spec
       const isRequired = !isOptionalField(model.name, field, ctx);
       let accessor: string;
-      if (field.type.kind === 'literal') {
-        // Literal fields have a statically known value; use .get() with a default
+      if (field.type.kind === 'literal' && isRequired) {
+        // Required literal fields have a statically known value; use .get() with a default
         // so deserialization is resilient when the API omits the key.
         accessor = `data.get("${wireKey}", ${pythonLiteralDefault(field.type.value)})`;
       } else {