@workos/oagen-emitters 0.14.1 → 0.14.3

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.14.1"
+  ".": "0.14.3"
 }

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # Changelog
 
+## [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)
+
+
+### Bug Fixes
+
+* emit ListMetadata-shape models referenced by surviving wrappers ([#124](https://github.com/workos/oagen-emitters/issues/124)) ([8d8efe1](https://github.com/workos/oagen-emitters/commit/8d8efe148f3665fc9de92cc6aea0e08e77e0fe78))
+* **node:** stop emitting duplicate Response-suffixed interfaces ([#123](https://github.com/workos/oagen-emitters/issues/123)) ([2077d25](https://github.com/workos/oagen-emitters/commit/2077d250d1dc7968245e9ec31d5ef5f75441fc68))
+* **node:** use toBeNull() when example is null on date-time fields ([#121](https://github.com/workos/oagen-emitters/issues/121)) ([0f5029f](https://github.com/workos/oagen-emitters/commit/0f5029f38d2dafc63df09f49a4562e3ffeeb7558))
+
 ## [0.14.1](https://github.com/workos/oagen-emitters/compare/v0.14.0...v0.14.1) (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":";;;;;cAyca,WAAA,EAAa,OA4GzB;;;cC9gBY,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-DRGwxN88.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-D0qLBiGv.mjs";
 export { dotnetEmitter, dotnetExtractor, elixirExtractor, goEmitter, goExtractor, kotlinEmitter, kotlinExtractor, nodeEmitter, nodeExtractor, phpEmitter, phpExtractor, pythonEmitter, pythonExtractor, rubyEmitter, rubyExtractor, rustEmitter, rustExtractor, workosEmittersPlugin };

package/dist/{plugin-DRGwxN88.mjs → plugin-D0qLBiGv.mjs}

@@ -2334,6 +2334,35 @@ function isListMetadataModel(model) {
 	if (!before || !after) return false;
 	return isNullableString(before) && isNullableString(after);
 }
+/**
+* Compute the `ListMetadata`-shape model names that must still be emitted
+* because some surviving wrapper references them.
+*
+* Each language emitter blanket-skips `isListMetadataModel` models on the
+* assumption that the SDK's shared pagination wrapper subsumes them. That
+* is correct for paginated list envelopes (the iterator unwraps the
+* envelope and `list_metadata` is handled at runtime), but a *non-paginated*
+* wrapper like vault's `VersionListResponse` still has a
+* `list_metadata: ListMetadata` field — and skipping emission of
+* `ListMetadata` leaves the wrapper's interface importing from a file that
+* was never written.
+*
+* Pass the same `nonPaginatedRefs` set the emitter uses for its own
+* wrapper-survival decision so the two answers stay in sync.
+*/
+function collectReferencedListMetadataModels(models, nonPaginatedRefs) {
+	const listMetadataNames = /* @__PURE__ */ new Set();
+	for (const m of models) if (isListMetadataModel(m)) listMetadataNames.add(m.name);
+	if (listMetadataNames.size === 0) return /* @__PURE__ */ new Set();
+	const referenced = /* @__PURE__ */ new Set();
+	for (const model of models) {
+		if (isListMetadataModel(model)) continue;
+		if (isListWrapperModel(model) && !nonPaginatedRefs.has(model.name)) continue;
+		const deps = collectFieldDependencies(model);
+		for (const dep of deps.models) if (listMetadataNames.has(dep)) referenced.add(dep);
+	}
+	return referenced;
+}
 /** Check if a field type is nullable string (nullable<string> or just string). */
 function isNullableString(field) {
 	if (field.type.kind === "primitive" && field.type.type === "string") return true;
@@ -2826,6 +2855,22 @@ function isAdoptedModelName(name) {
 	return adoptedModelNames.has(name);
 }
 /**
+* Domain names that `resolveInterfaceName` reached via a structural rename
+* — the resolved name differs from the IR model's own name. `wireInterfaceName`
+* consults this set to decide whether to fire the "single-form wire" case:
+* that case is *only* meant for structurally-renamed models, where the
+* baseline owns a `*Response` interface representing the wire shape with no
+* separate `*Wire` companion. Without this signal, a freshly-emitted model
+* whose IR name already ends in `Response` (e.g. `CreateDataKeyResponse`)
+* would land in the same case as soon as a prior buggy regen wrote the
+* baseline — producing two `export interface CreateDataKeyResponse { ... }`
+* declarations in the same file.
+*/
+let structurallyRenamedDomainNames = /* @__PURE__ */ new Set();
+function setStructurallyRenamedDomainNames(names) {
+	structurallyRenamedDomainNames = names;
+}
+/**
 * Wire/response interface name.
 *
 * Resolution order:
@@ -2848,7 +2893,7 @@ function wireInterfaceName(domainName) {
 	if (domainName.endsWith("Response")) {
 		const wireForm = `${domainName}Wire`;
 		if (baselineInterfaceNames.has(wireForm)) return wireForm;
-		if (baselineInterfaceNames.has(domainName)) return domainName;
+		if (structurallyRenamedDomainNames.has(domainName) && baselineInterfaceNames.has(domainName)) return domainName;
 		return wireForm;
 	}
 	return `${domainName}Response`;
@@ -4892,8 +4937,11 @@ function generateResourceClass(service, ctx) {
 		importedTypeNames.add(resolved);
 		const modelServiceDir = resolveDir(modelToService.get(name));
 		const relPath = modelServiceDir === serviceDir ? `./interfaces/${fileName$3(name)}.interface` : `../${modelServiceDir}/interfaces/${fileName$3(name)}.interface`;
-		if (usedWireTypes.has(resolved)) lines.push(`import type { ${resolved}, ${wireInterfaceName(resolved)} } from '${relPath}';`);
-		else lines.push(`import type { ${resolved} } from '${relPath}';`);
+		if (usedWireTypes.has(resolved)) {
+			const wireName = wireInterfaceName(resolved);
+			if (wireName === resolved) lines.push(`import type { ${resolved} } from '${relPath}';`);
+			else lines.push(`import type { ${resolved}, ${wireName} } from '${relPath}';`);
+		} else lines.push(`import type { ${resolved} } from '${relPath}';`);
 	}
 	for (const name of requestModels) {
 		if (allModels.has(name)) continue;
@@ -5821,11 +5869,13 @@ function generateFixtures$5(spec, ctx) {
 			walk(field.type);
 		}
 	}
+	const nonPaginatedRefs = collectNonPaginatedResponseModelNames(spec.services);
+	const listMetadataNeeded = collectReferencedListMetadataModels(spec.models, nonPaginatedRefs);
 	const seenFixturePaths = /* @__PURE__ */ new Set();
 	for (const model of spec.models) {
 		if (!fixtureReachable.has(model.name)) continue;
-		if (isListMetadataModel(model)) continue;
-		if (isListWrapperModel(model)) continue;
+		if (isListMetadataModel(model) && !listMetadataNeeded.has(model.name)) continue;
+		if (isListWrapperModel(model) && !nonPaginatedRefs.has(model.name)) continue;
 		const fixturePath = `src/${resolveDir(modelToService.get(model.name))}/fixtures/${fileName$3(model.name)}.json`;
 		if (seenFixturePaths.has(fixturePath)) continue;
 		seenFixturePaths.add(fixturePath);
@@ -5875,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) {
@@ -6014,11 +6073,12 @@ function generateModels$7(models, ctx, shared) {
 	}
 	const discriminatedSkip = ctx._discriminatedModelNames;
 	const nonPaginatedRefs = collectNonPaginatedResponseModelNames(ctx.spec.services);
+	const listMetadataNeeded = collectReferencedListMetadataModels(models, nonPaginatedRefs);
 	for (const originalModel of models) {
 		const model = projectedByName.get(originalModel.name) ?? originalModel;
 		if (!reachableModels.has(model.name)) continue;
 		if (interfaceEligibleModels && !interfaceEligibleModels.has(model.name)) continue;
-		if (isListMetadataModel(model)) continue;
+		if (isListMetadataModel(model) && !listMetadataNeeded.has(model.name)) continue;
 		if (isListWrapperModel(model) && !nonPaginatedRefs.has(model.name)) continue;
 		if (discriminatedSkip?.has(model.name)) continue;
 		const service = modelToService.get(model.name);
@@ -6208,25 +6268,27 @@ function generateModels$7(models, ctx, shared) {
 			lines.push("}");
 		}
 		lines.push("");
-		const seenWireFields = /* @__PURE__ */ new Set();
-		if (model.fields.length === 0) lines.push(`export type ${responseName}${typeParams} = object;`);
-		else {
-			lines.push(`export interface ${responseName}${typeParams} {`);
-			for (const field of model.fields) {
-				const wireField = wireFieldName(field.name);
-				if (seenWireFields.has(wireField)) continue;
-				seenWireFields.add(wireField);
-				const baselineField = baselineResponse?.fields?.[wireField];
-				if (baselineField && baselineTypeResolvable(baselineField.type, importableNames) && baselineFieldCompatible(baselineField, field)) {
-					const opt = baselineField.optional ? "?" : "";
-					lines.push(`  ${wireField}${opt}: ${baselineField.type};`);
-				} else {
-					const isNewFieldOnExistingModel = baselineResponse && !baselineField;
-					const opt = baselineField?.optional === true || !field.required || isNewFieldOnExistingModel ? "?" : "";
-					lines.push(`  ${wireField}${opt}: ${mapWireTypeRef(field.type, modelWireTypeRefOpts)};`);
+		if (responseName !== domainName) {
+			const seenWireFields = /* @__PURE__ */ new Set();
+			if (model.fields.length === 0) lines.push(`export type ${responseName}${typeParams} = object;`);
+			else {
+				lines.push(`export interface ${responseName}${typeParams} {`);
+				for (const field of model.fields) {
+					const wireField = wireFieldName(field.name);
+					if (seenWireFields.has(wireField)) continue;
+					seenWireFields.add(wireField);
+					const baselineField = baselineResponse?.fields?.[wireField];
+					if (baselineField && baselineTypeResolvable(baselineField.type, importableNames) && baselineFieldCompatible(baselineField, field)) {
+						const opt = baselineField.optional ? "?" : "";
+						lines.push(`  ${wireField}${opt}: ${baselineField.type};`);
+					} else {
+						const isNewFieldOnExistingModel = baselineResponse && !baselineField;
+						const opt = baselineField?.optional === true || !field.required || isNewFieldOnExistingModel ? "?" : "";
+						lines.push(`  ${wireField}${opt}: ${mapWireTypeRef(field.type, modelWireTypeRefOpts)};`);
+					}
 				}
+				lines.push("}");
 			}
-			lines.push("}");
 		}
 		const filePath = `src/${dirName}/interfaces/${fileName$3(model.name)}.interface.ts`;
 		if (ctx.apiSurface && ctx.targetDir) {
@@ -6354,12 +6416,13 @@ function generateSerializers(models, ctx, shared) {
 	}
 	const discriminatedSerializerSkip = ctx._discriminatedModelNames;
 	const serializerNonPaginatedRefs = collectNonPaginatedResponseModelNames(ctx.spec.services);
+	const serializerListMetadataNeeded = collectReferencedListMetadataModels(models, serializerNonPaginatedRefs);
 	const eligibleModels = [];
 	for (const originalModel of models) {
 		const model = projectedByName.get(originalModel.name) ?? originalModel;
 		if (!serializerReachable.has(model.name)) continue;
 		if (serializerEligibleModels && !serializerEligibleModels.has(model.name)) continue;
-		if (isListMetadataModel(model)) continue;
+		if (isListMetadataModel(model) && !serializerListMetadataNeeded.has(model.name)) continue;
 		if (isListWrapperModel(model) && !serializerNonPaginatedRefs.has(model.name)) continue;
 		if (discriminatedSerializerSkip?.has(model.name)) continue;
 		if (!isNodeOwnedService(ctx, modelToService.get(model.name)) && !modelHasNewFields(model, ctx) && !forceGenerateSerializer.has(model.name)) continue;
@@ -7415,7 +7478,11 @@ function buildFieldAssertions(model, accessor, modelMap) {
 		const domainField = fieldName$6(field.name);
 		const fieldAccessor = isDateTimeFieldType(field.type) ? `${accessor}.${domainField}.toISOString()` : `${accessor}.${domainField}`;
 		if (field.example !== void 0) {
-			if (typeof field.example === "object" && field.example !== null) assertions.push(`expect(${accessor}.${domainField}).toEqual(${JSON.stringify(field.example)});`);
+			if (field.example === null) {
+				assertions.push(`expect(${accessor}.${domainField}).toBeNull();`);
+				continue;
+			}
+			if (typeof field.example === "object") assertions.push(`expect(${accessor}.${domainField}).toEqual(${JSON.stringify(field.example)});`);
 			else {
 				const exampleLiteral = typeof field.example === "string" ? `'${field.example}'` : String(field.example);
 				assertions.push(`expect(${fieldAccessor}).toBe(${exampleLiteral});`);
@@ -8245,6 +8312,12 @@ function getSurface(ctx) {
 	setBaselineInterfaceNames(allInterfaces);
 	setInlineEnumUnions(/* @__PURE__ */ new Map());
 	setAdoptedModelNames(computeAdoptedModelNames(ctx, surface));
+	const renamed = /* @__PURE__ */ new Set();
+	for (const model of ctx.spec.models) {
+		const resolved = resolveInterfaceName(model.name, ctx);
+		if (resolved !== model.name) renamed.add(resolved);
+	}
+	setStructurallyRenamedDomainNames(renamed);
 	return surface;
 }
 /**
@@ -8298,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))) {
@@ -9313,9 +9390,10 @@ function generateModels$6(models, ctx) {
 	const symbolToOriginalService = /* @__PURE__ */ new Map();
 	const emittedFilePaths = /* @__PURE__ */ new Set();
 	const nonPaginatedRefs = collectNonPaginatedResponseModelNames(ctx.spec.services);
+	const listMetadataNeeded = collectReferencedListMetadataModels(models, nonPaginatedRefs);
 	for (const model of models) {
 		if (isListWrapperModel(model) && !nonPaginatedRefs.has(model.name)) continue;
-		if (isListMetadataModel(model)) continue;
+		if (isListMetadataModel(model) && !listMetadataNeeded.has(model.name)) continue;
 		const dirName = resolveDir(modelToService.get(model.name));
 		const modelClassName = className$5(model.name);
 		const modelFilePath = `src/${ctx.namespace}/${dirName}/models/${fileName$2(model.name)}.py`;
@@ -11338,9 +11416,11 @@ function generateFixtures$4(spec) {
 	const modelMap = new Map(spec.models.map((m) => [m.name, m]));
 	const enumMap = new Map(spec.enums.map((e) => [e.name, e]));
 	const files = [];
+	const nonPaginatedRefs = collectNonPaginatedResponseModelNames(spec.services);
+	const listMetadataNeeded = collectReferencedListMetadataModels(spec.models, nonPaginatedRefs);
 	for (const model of spec.models) {
-		if (isListMetadataModel(model)) continue;
-		if (isListWrapperModel(model)) continue;
+		if (isListMetadataModel(model) && !listMetadataNeeded.has(model.name)) continue;
+		if (isListWrapperModel(model) && !nonPaginatedRefs.has(model.name)) continue;
 		if (model.fields.length === 0) continue;
 		const fixture = generateModelFixture$4(model, modelMap, enumMap);
 		files.push({
@@ -11392,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) {
@@ -12418,7 +12506,9 @@ function generateModelRoundTripTests(spec, ctx) {
 		}
 	}
 	for (const name of responseModelNames) requestOnlyModelNames.delete(name);
-	const models = spec.models.filter((m) => !isListWrapperModel(m) && !isListMetadataModel(m) && !requestOnlyModelNames.has(m.name));
+	const nonPaginatedRefs = collectNonPaginatedResponseModelNames(spec.services);
+	const listMetadataNeeded = collectReferencedListMetadataModels(spec.models, nonPaginatedRefs);
+	const models = spec.models.filter((m) => !(isListWrapperModel(m) && !nonPaginatedRefs.has(m.name)) && !(isListMetadataModel(m) && !listMetadataNeeded.has(m.name)) && !requestOnlyModelNames.has(m.name));
 	if (models.length === 0) return null;
 	const modelToService = computeSchemaPlacement(spec, ctx).originalModelToService;
 	const roundTripDirMap = buildMountDirMap$1(ctx);
@@ -14764,10 +14854,12 @@ function generateModels$4(models, ctx) {
 	const requestBodyOnly = collectRequestBodyOnlyModelNames$1(ctx.spec.services, models);
 	const nonPaginatedRefs = collectNonPaginatedResponseModelNames(ctx.spec.services);
 	const skipAsListWrapper = (m) => isListWrapperModel(m) && !nonPaginatedRefs.has(m.name);
+	const listMetadataNeeded = collectReferencedListMetadataModels(models, nonPaginatedRefs);
+	const skipAsListMetadata = (m) => isListMetadataModel(m) && !listMetadataNeeded.has(m.name);
 	const modelHashMap = /* @__PURE__ */ new Map();
 	const hashGroups = /* @__PURE__ */ new Map();
 	for (const model of models) {
-		if (skipAsListWrapper(model) || isListMetadataModel(model)) continue;
+		if (skipAsListWrapper(model) || skipAsListMetadata(model)) continue;
 		if (requestBodyOnly.has(model.name)) continue;
 		const hash = structuralHash$2(model);
 		modelHashMap.set(model.name, hash);
@@ -14784,7 +14876,7 @@ function generateModels$4(models, ctx) {
 	}
 	const batchedAliases = /* @__PURE__ */ new Set();
 	for (const model of models) {
-		if (skipAsListWrapper(model) || isListMetadataModel(model)) continue;
+		if (skipAsListWrapper(model) || skipAsListMetadata(model)) continue;
 		if (requestBodyOnly.has(model.name)) continue;
 		const structName = className$3(model.name);
 		const canonicalName = aliasOf.get(model.name);
@@ -16326,9 +16418,11 @@ function generateFixtures$2(spec) {
 	const modelMap = new Map(spec.models.map((m) => [m.name, m]));
 	const enumMap = new Map(spec.enums.map((e) => [e.name, e]));
 	const files = [];
+	const nonPaginatedRefs = collectNonPaginatedResponseModelNames(spec.services);
+	const listMetadataNeeded = collectReferencedListMetadataModels(spec.models, nonPaginatedRefs);
 	for (const model of spec.models) {
-		if (isListMetadataModel(model)) continue;
-		if (isListWrapperModel(model)) continue;
+		if (isListMetadataModel(model) && !listMetadataNeeded.has(model.name)) continue;
+		if (isListWrapperModel(model) && !nonPaginatedRefs.has(model.name)) continue;
 		const fixture = model.fields.length === 0 ? {} : generateModelFixture$2(model, modelMap, enumMap);
 		files.push({
 			path: `testdata/${fileName$1(model.name)}.json`,
@@ -16398,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) {
@@ -20169,10 +20271,12 @@ function generateModels$2(models, ctx) {
 	const files = [];
 	const nonPaginatedRefs = collectNonPaginatedResponseModelNames(ctx.spec.services);
 	const skipAsListWrapper = (m) => isListWrapperModel(m) && !nonPaginatedRefs.has(m.name);
+	const listMetadataNeeded = collectReferencedListMetadataModels(models, nonPaginatedRefs);
+	const skipAsListMetadata = (m) => isListMetadataModel(m) && !listMetadataNeeded.has(m.name);
 	modelAliasMap = null;
 	const hashGroupsPass1 = /* @__PURE__ */ new Map();
 	for (const model of models) {
-		if (skipAsListWrapper(model) || isListMetadataModel(model)) continue;
+		if (skipAsListWrapper(model) || skipAsListMetadata(model)) continue;
 		if (model.fields.length === 0 && discriminatedUnions.has(className$1(model.name))) continue;
 		const hash = structuralHash(model);
 		if (!hashGroupsPass1.has(hash)) hashGroupsPass1.set(hash, []);
@@ -20191,7 +20295,7 @@ function generateModels$2(models, ctx) {
 	modelAliasMap = aliasOf;
 	const hashGroupsPass2 = /* @__PURE__ */ new Map();
 	for (const model of models) {
-		if (skipAsListWrapper(model) || isListMetadataModel(model)) continue;
+		if (skipAsListWrapper(model) || skipAsListMetadata(model)) continue;
 		if (model.fields.length === 0 && discriminatedUnions.has(className$1(model.name))) continue;
 		if (aliasOf.has(model.name)) continue;
 		const hash = structuralHash(model);
@@ -20209,7 +20313,7 @@ function generateModels$2(models, ctx) {
 		}
 	}
 	for (const model of models) {
-		if (skipAsListWrapper(model) || isListMetadataModel(model)) continue;
+		if (skipAsListWrapper(model) || skipAsListMetadata(model)) continue;
 		const typeName = className$1(model.name);
 		if (model.fields.length === 0 && discriminatedUnions.has(typeName)) {
 			files.push(emitSealedUnion(typeName, discriminatedUnions.get(typeName)));
@@ -20237,7 +20341,7 @@ function generateModels$2(models, ctx) {
 	}
 	const eventMapping = [];
 	for (const model of models) {
-		if (skipAsListWrapper(model) || isListMetadataModel(model)) continue;
+		if (skipAsListWrapper(model) || skipAsListMetadata(model)) continue;
 		if (aliasOf.has(model.name)) continue;
 		if (!isEventEnvelopeModel(model)) continue;
 		const eventField = model.fields.find((f) => f.name === "event");
@@ -21548,6 +21652,8 @@ function resolveBodyModel$2(op, ctx) {
 function registerTypeImports(ref, imports, ctx) {
 	const mapped = mapTypeRef$2(ref);
 	for (const imp of implicitImportsFor(mapped)) imports.add(imp);
+	const nonPaginatedRefs = collectNonPaginatedResponseModelNames(ctx.spec.services);
+	const listMetadataNeeded = collectReferencedListMetadataModels(ctx.spec.models, nonPaginatedRefs);
 	walk(ref, (r) => {
 		if (r.kind === "enum") {
 			const canonicalName = enumCanonicalMap.get(r.name) ?? r.name;
@@ -21555,7 +21661,11 @@ function registerTypeImports(ref, imports, ctx) {
 		}
 		if (r.kind === "model") {
 			const referenced = ctx.spec.models.find((m) => m.name === r.name);
-			if (referenced && (isListWrapperModel(referenced) || isListMetadataModel(referenced))) return;
+			if (referenced) {
+				const skipWrapper = isListWrapperModel(referenced) && !nonPaginatedRefs.has(referenced.name);
+				const skipMetadata = isListMetadataModel(referenced) && !listMetadataNeeded.has(referenced.name);
+				if (skipWrapper || skipMetadata) return;
+			}
 			imports.add(`com.workos.models.${className$1(r.name)}`);
 		}
 	});
@@ -23445,7 +23555,10 @@ function mapSorbetType$1(ref) {
 		case "array": return `T::Array[${mapSorbetType$1(ref.items)}]`;
 		case "model": return `WorkOS::${className(ref.name)}`;
 		case "enum": return "String";
-		case "nullable": return `T.nilable(${mapSorbetType$1(ref.inner)})`;
+		case "nullable": {
+			const inner = mapSorbetType$1(ref.inner);
+			return inner === "T.untyped" ? inner : `T.nilable(${inner})`;
+		}
 		case "literal":
 			if (typeof ref.value === "string") return "String";
 			if (ref.value === null) return "NilClass";
@@ -25049,6 +25162,7 @@ function generateRbiFiles(spec, ctx) {
 }
 /** Unwrap T.nilable(...) if already wrapped, to avoid double-wrapping. */
 function unwrapNilable(type) {
+	if (type === "T.untyped") return type;
 	const match = type.match(/^T\.nilable\((.+)\)$/);
 	return match ? match[1] : type;
 }
@@ -26767,6 +26881,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;
 }
@@ -27519,4 +27645,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-DRGwxN88.mjs.map
+//# sourceMappingURL=plugin-D0qLBiGv.mjs.map