@workos/oagen-emitters 0.17.0 → 0.18.0

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.17.0"
+  ".": "0.18.0"
 }

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.18.0](https://github.com/workos/oagen-emitters/compare/v0.17.0...v0.18.0) (2026-06-16)
+
+
+### Features
+
+* **node:** emit discriminated unions for pure oneOf token response ([#150](https://github.com/workos/oagen-emitters/issues/150)) ([1433bcc](https://github.com/workos/oagen-emitters/commit/1433bcc2f61db52aeadd7b947b79bb90c184c0a1))
+
 ## [0.17.0](https://github.com/workos/oagen-emitters/compare/v0.16.1...v0.17.0) (2026-06-15)
 
 

package/dist/index.mjs

@@ -1,4 +1,4 @@
-import { A as fieldName$4, B as servicePropertyName, C as apiClassName, D as dotnetEmitter, E as propertyName, F as fieldName$3, H as fieldName$1, I as methodName, L as trimMountedResourceFromMethod, M as trimMountedResourceFromMethod$1, N as goEmitter, O as appendAsyncSuffix, P as className, R as phpEmitter, S as kotlinEmitter, T as packageSegment, U as safeParamName$1, V as pythonEmitter, W as nodeEmitter, _ as rubyEmitter, a as rustExtractor, b as resolveServiceTarget, c as pythonExtractor, d as rustEmitter, f as fieldName$5, g as typeName, h as resourceAccessorName, i as kotlinExtractor, j as methodName$1, k as className$1, l as rubyExtractor, m as moduleName, n as elixirExtractor, o as goExtractor, p as methodName$3, r as dotnetExtractor, s as phpExtractor, t as workosEmittersPlugin, u as nodeExtractor, v as buildExportedClassNameSet, w as methodName$2, x as safeParamName, y as fieldName, z as fieldName$2 } from "./plugin-BLnR-FMi.mjs";
+import { A as fieldName$4, B as servicePropertyName, C as apiClassName, D as dotnetEmitter, E as propertyName, F as fieldName$3, H as fieldName$1, I as methodName, L as trimMountedResourceFromMethod, M as trimMountedResourceFromMethod$1, N as goEmitter, O as appendAsyncSuffix, P as className, R as phpEmitter, S as kotlinEmitter, T as packageSegment, U as safeParamName$1, V as pythonEmitter, W as nodeEmitter, _ as rubyEmitter, a as rustExtractor, b as resolveServiceTarget, c as pythonExtractor, d as rustEmitter, f as fieldName$5, g as typeName, h as resourceAccessorName, i as kotlinExtractor, j as methodName$1, k as className$1, l as rubyExtractor, m as moduleName, n as elixirExtractor, o as goExtractor, p as methodName$3, r as dotnetExtractor, s as phpExtractor, t as workosEmittersPlugin, u as nodeExtractor, v as buildExportedClassNameSet, w as methodName$2, x as safeParamName, y as fieldName, z as fieldName$2 } from "./plugin-DAa-HsN5.mjs";
 import { collectSnippetArgs, collectWrapperArgs, toSnakeCase } from "@workos/oagen";
 //#region src/snippets/ruby.ts
 const INDENT$6 = "  ";

package/dist/{plugin-BLnR-FMi.mjs → plugin-DAa-HsN5.mjs}

@@ -5603,6 +5603,17 @@ function renderOptionsParam(param) {
 function isValidTypeIdentifier(name) {
 	return /^[A-Za-z_$][\w$]*$/.test(name);
 }
+/**
+* Extract candidate named type references from a compound type expression such
+* as `GetAccessTokenOptions & { provider: string }`. PascalCase tokens are type
+* names worth importing; lowercase tokens are property keys or primitives and
+* are skipped. The caller only imports the ones that resolve to a known source
+* file, so unrecognized PascalCase tokens (e.g. `Date`, `Record`) are harmless.
+*/
+function extractNamedTypeRefs(typeExpr) {
+	const matches = typeExpr.match(/\b[A-Z][A-Za-z0-9_$]*\b/g) ?? [];
+	return [...new Set(matches)];
+}
 function autoPaginatableItemType$1(returnType) {
 	return returnType?.match(/\b(?:AutoPaginatable|List)<\s*([A-Za-z_$][\w$]*)/)?.[1];
 }
@@ -5937,12 +5948,21 @@ function generateResourceClass(service, ctx) {
 	if (hasIdempotentPost || hasCustomEncoding) lines.push("import type { PostOptions } from '../common/interfaces/post-options.interface';");
 	const importedTypeNames = /* @__PURE__ */ new Set();
 	for (const optionType of optionObjectTypes) {
-		if (!isValidTypeIdentifier(optionType)) continue;
-		if (importedTypeNames.has(optionType)) continue;
-		importedTypeNames.add(optionType);
-		const sourceFile = baselineTypeSourceFile(ctx, optionType);
-		const relPath = sourceFile ? relativeImport(resourcePath, sourceFile) : `./interfaces/${fileName$3(optionType)}.interface`;
-		lines.push(`import type { ${optionType} } from '${relPath}';`);
+		if (isValidTypeIdentifier(optionType)) {
+			if (importedTypeNames.has(optionType)) continue;
+			importedTypeNames.add(optionType);
+			const sourceFile = baselineTypeSourceFile(ctx, optionType);
+			const relPath = sourceFile ? relativeImport(resourcePath, sourceFile) : `./interfaces/${fileName$3(optionType)}.interface`;
+			lines.push(`import type { ${optionType} } from '${relPath}';`);
+			continue;
+		}
+		for (const typeName of extractNamedTypeRefs(optionType)) {
+			if (importedTypeNames.has(typeName)) continue;
+			const sourceFile = baselineTypeSourceFile(ctx, typeName) ?? liveSurfaceInterfacePath(typeName);
+			if (!sourceFile) continue;
+			importedTypeNames.add(typeName);
+			lines.push(`import type { ${typeName} } from '${relativeImport(resourcePath, sourceFile)}';`);
+		}
 	}
 	for (const typeName of returnTypeImports) {
 		if (importedTypeNames.has(typeName)) continue;
@@ -9374,10 +9394,11 @@ function dedupeLiteralTypes(types) {
 //#region src/node/discriminated-models.ts
 function detectDiscriminatedShape(modelName, rawSchemas) {
 	const schema = rawSchemas[modelName];
-	if (!schema?.allOf) return null;
+	if (!schema) return null;
 	let baseObject = null;
 	let oneOfVariants = null;
-	for (const member of schema.allOf) {
+	let inlineUnion = false;
+	if (schema.allOf) for (const member of schema.allOf) {
 		const resolved = resolveRef(member, rawSchemas);
 		if (resolved.oneOf) {
 			if (oneOfVariants) return null;
@@ -9388,16 +9409,22 @@ function detectDiscriminatedShape(modelName, rawSchemas) {
 			baseObject = mergeBase(baseObject, nestedBase);
 		}
 	}
+	else if (schema.oneOf && schema.oneOf.length >= 2) {
+		if (!schema.oneOf.every((v) => v.properties && !v.$ref && (v.type === "object" || !v.type) && !v.allOf && !v.oneOf)) return null;
+		oneOfVariants = schema.oneOf;
+		inlineUnion = true;
+	} else return null;
 	if (!oneOfVariants || oneOfVariants.length < 2) return null;
 	const flattenedVariants = oneOfVariants.map((v) => flattenVariant(v, rawSchemas));
 	const discProp = findSharedDiscriminator(flattenedVariants);
 	if (!discProp) return null;
 	const variants = flattenedVariants.map((fv) => {
-		const discValue = readConstString(fv.alwaysProperties.get(discProp));
-		if (!discValue) return null;
+		const discValue = readConst(fv.alwaysProperties.get(discProp));
+		if (discValue === null) return null;
 		return {
-			nameSuffix: variantNameSuffix(discValue),
-			discriminatorValue: discValue,
+			nameSuffix: variantNameSuffix(String(discValue)),
+			discriminatorValue: String(discValue),
+			discriminatorIsBoolean: typeof discValue === "boolean",
 			fields: variantFields(fv, discProp, modelName)
 		};
 	}).filter((v) => v !== null);
@@ -9410,7 +9437,8 @@ function detectDiscriminatedShape(modelName, rawSchemas) {
 		discriminatorProperty: discProp,
 		discriminatorPropertyDomain: toCamelCase(discProp),
 		discriminatorDescription,
-		variants
+		variants,
+		inlineUnion
 	};
 }
 function mergeBase(prev, next) {
@@ -9525,21 +9553,29 @@ function findSharedDiscriminator(variants) {
 		let allConst = true;
 		const values = [];
 		for (const v of variants) {
-			const val = readConstString(v.alwaysProperties.get(propName));
+			const val = readConst(v.alwaysProperties.get(propName));
 			if (val === null) {
 				allConst = false;
 				break;
 			}
-			values.push(val);
+			values.push(String(val));
 		}
 		if (allConst && new Set(values).size === values.length) return propName;
 	}
 	return null;
 }
-function readConstString(schema) {
+/**
+* Read a discriminator value pinned by `const` (or a single-value `enum`).
+* Supports string and boolean literals — the latter drives the
+* `active: true | false` style token response union.
+*/
+function readConst(schema) {
 	if (!schema) return null;
-	if (typeof schema.const === "string") return schema.const;
-	if (Array.isArray(schema.enum) && schema.enum.length === 1 && typeof schema.enum[0] === "string") return schema.enum[0];
+	if (typeof schema.const === "string" || typeof schema.const === "boolean") return schema.const;
+	if (Array.isArray(schema.enum) && schema.enum.length === 1) {
+		const only = schema.enum[0];
+		if (typeof only === "string" || typeof only === "boolean") return only;
+	}
 	return null;
 }
 function variantNameSuffix(constValue) {
@@ -9568,6 +9604,7 @@ function buildField(rawName, schema, required, parentName) {
 	const modelDeps = /* @__PURE__ */ new Set();
 	const domainType = rawSchemaToTS(schema, parentName, rawName, false, modelDeps);
 	const wireType = rawSchemaToTS(schema, parentName, rawName, true, modelDeps);
+	const enumValues = Array.isArray(schema.enum) && schema.enum.length > 0 && schema.enum.every((e) => typeof e === "string") ? schema.enum : void 0;
 	return {
 		name: rawName,
 		description: schema.description,
@@ -9575,7 +9612,8 @@ function buildField(rawName, schema, required, parentName) {
 		domainType,
 		wireType,
 		modelDeps,
-		hasDateTime: schemaHasDateTime(schema)
+		hasDateTime: schemaHasDateTime(schema),
+		enumValues
 	};
 }
 function schemaHasDateTime(schema) {
@@ -9644,13 +9682,15 @@ function planDiscriminatedModels(models, ctx) {
 		const stripped = rawName.replace(/Dto/g, "").replace(/DTO/g, "").replace(/Json$/, "");
 		if (stripped !== rawName && irModelDir.has(stripped)) depDirMap.set(rawName, irModelDir.get(stripped));
 	}
+	for (const [irName, dir] of irModelDir) if (!depDirMap.has(irName)) depDirMap.set(irName, dir);
 	for (const model of models) {
 		const shape = detectDiscriminatedShape(model.name, rawSchemas);
 		if (!shape) continue;
 		const allDeps = /* @__PURE__ */ new Set();
 		for (const field of shape.baseFields) for (const d of field.modelDeps) allDeps.add(d);
 		for (const variant of shape.variants) for (const field of variant.fields) for (const d of field.modelDeps) allDeps.add(d);
-		if ([...allDeps].some((dep) => !depDirMap.has(dep) && !irModelDir.has(dep))) continue;
+		const resolvable = (dep) => depDirMap.has(dep) || irModelDir.has(dep) || depDirMap.has(toPascalCase(dep)) || irModelDir.has(toPascalCase(dep));
+		if ([...allDeps].some((dep) => !resolvable(dep))) continue;
 		const modelDir = resolveDir(modelToService.get(model.name));
 		plans.set(model.name, {
 			shape,
@@ -9670,6 +9710,7 @@ function generateDiscriminatedFiles(plans, ctx) {
 }
 function buildInterfaceFile(plan, _ctx) {
 	const { shape, modelDir } = plan;
+	if (shape.inlineUnion) return buildInlineUnionFile(plan);
 	const domain = toPascalCase(shape.modelName);
 	const wire = wireInterfaceName(domain);
 	const lines = [];
@@ -9697,6 +9738,45 @@ function buildInterfaceFile(plan, _ctx) {
 		overwriteExisting: true
 	};
 }
+/**
+* Emit a pure-`oneOf` discriminated union as a single inline type alias
+* (`export type X = { … } | { … }`) for both the domain and wire shapes. Used
+* instead of named per-variant interfaces, which read poorly for small
+* (often two-variant, boolean-discriminated) unions like the token response.
+*/
+function buildInlineUnionFile(plan) {
+	const { shape, modelDir } = plan;
+	const domain = toPascalCase(shape.modelName);
+	const wire = wireInterfaceName(domain);
+	const lines = [];
+	const imports = collectImports$2(plan);
+	if (imports.length > 0) {
+		for (const imp of imports) lines.push(`import type { ${imp.symbols.join(", ")} } from '${imp.path}';`);
+		lines.push("");
+	}
+	lines.push(...buildInlineUnionAlias(domain, shape, false));
+	lines.push("");
+	lines.push(...buildInlineUnionAlias(wire, shape, true));
+	return {
+		path: `src/${modelDir}/interfaces/${fileName$3(shape.modelName)}.interface.ts`,
+		content: lines.join("\n") + "\n",
+		overwriteExisting: true
+	};
+}
+function buildInlineUnionAlias(name, shape, isWire) {
+	const lines = [`export type ${name} =`];
+	shape.variants.forEach((variant, idx) => {
+		const isLast = idx === shape.variants.length - 1;
+		const members = [`${isWire ? shape.discriminatorProperty : shape.discriminatorPropertyDomain}: ${discLiteral(variant)}`];
+		for (const field of variant.fields) {
+			const key = isWire ? field.name : toCamelCase(field.name);
+			const opt = field.required ? "" : "?";
+			members.push(`${key}${opt}: ${inlineFieldType(field, isWire)}`);
+		}
+		lines.push(`  | { ${members.join("; ")} }${isLast ? ";" : ""}`);
+	});
+	return lines;
+}
 function buildInterfaceBody(name, shape, variant, isWire) {
 	const lines = [];
 	lines.push(`export interface ${name} {`);
@@ -9708,11 +9788,32 @@ function buildInterfaceBody(name, shape, variant, isWire) {
 	}
 	const discKey = isWire ? shape.discriminatorProperty : shape.discriminatorPropertyDomain;
 	if (shape.discriminatorDescription) lines.push(`  /** ${shape.discriminatorDescription} */`);
-	lines.push(`  ${discKey}: '${variant.discriminatorValue}';`);
+	lines.push(`  ${discKey}: ${discLiteral(variant)};`);
 	for (const field of variant.fields) pushFieldLine(lines, field, isWire);
 	lines.push("}");
 	return lines;
 }
+/**
+* The discriminator value as a TS literal: quoted for strings (`'oauth'`),
+* bare for booleans (`true`).
+*/
+function discLiteral(variant) {
+	return variant.discriminatorIsBoolean ? variant.discriminatorValue : `'${variant.discriminatorValue}'`;
+}
+/**
+* Field type for an inline-union member: a literal union for inline string
+* enums, otherwise the resolved domain/wire type.
+*
+* The `enumValues` branch deliberately ignores `isWire`: `enumValues` is only
+* populated for string enums (see `buildField`), whose domain and wire
+* representations are identical literal unions. Any field whose domain/wire
+* types actually differ (model refs, dates, non-string enums) leaves
+* `enumValues` undefined and falls through to the type-specific branch.
+*/
+function inlineFieldType(field, isWire) {
+	if (field.enumValues) return field.enumValues.map((v) => `'${v}'`).join(" | ");
+	return isWire ? field.wireType : field.domainType;
+}
 function pushFieldLine(lines, field, isWire) {
 	const key = isWire ? field.name : toCamelCase(field.name);
 	const opt = field.required ? "" : "?";
@@ -9729,7 +9830,7 @@ function collectImports$2(plan) {
 		const domain = toPascalCase(dep);
 		const wire = wireInterfaceName(domain);
 		const symbols = wire !== domain ? [domain, wire] : [domain];
-		const depDir = plan.depDirMap.get(dep);
+		const depDir = plan.depDirMap.get(dep) ?? plan.depDirMap.get(domain);
 		const baseName = fileName$3(toSnakeFromPascal(domain));
 		let importPath;
 		if (!depDir || depDir === plan.modelDir) importPath = `./${baseName}.interface`;
@@ -9756,39 +9857,43 @@ function buildSerializerFile(plan, _ctx) {
 	const allDeps = /* @__PURE__ */ new Set();
 	for (const field of shape.baseFields) for (const d of field.modelDeps) allDeps.add(d);
 	for (const variant of shape.variants) for (const field of variant.fields) for (const d of field.modelDeps) allDeps.add(d);
+	const deserializeOnly = shape.inlineUnion === true;
 	for (const dep of [...allDeps].sort()) {
 		const depDomain = toPascalCase(dep);
 		const depFile = fileName$3(toSnakeFromPascal(depDomain));
-		lines.push(`import { deserialize${depDomain}, serialize${depDomain} } from './${depFile}.serializer';`);
+		const helpers = deserializeOnly ? `deserialize${depDomain}` : `deserialize${depDomain}, serialize${depDomain}`;
+		lines.push(`import { ${helpers} } from './${depFile}.serializer';`);
 	}
 	lines.push("");
 	lines.push(`export const deserialize${domain} = (response: ${wire}): ${domain} => {`);
 	lines.push(`  switch (response.${shape.discriminatorProperty}) {`);
 	for (const variant of shape.variants) {
-		lines.push(`    case '${variant.discriminatorValue}':`);
+		lines.push(`    case ${discLiteral(variant)}:`);
 		lines.push(`      return {`);
 		for (const field of shape.baseFields) lines.push(`        ${assignmentLine(field, false, allDeps)},`);
-		lines.push(`        ${shape.discriminatorPropertyDomain}: '${variant.discriminatorValue}',`);
+		lines.push(`        ${shape.discriminatorPropertyDomain}: ${discLiteral(variant)},`);
 		for (const field of variant.fields) lines.push(`        ${assignmentLine(field, false, allDeps)},`);
 		lines.push(`      };`);
 	}
 	lines.push(`    default:`);
-	lines.push(`      throw new Error(\`Unknown ${shape.discriminatorProperty}: \${(response as { ${shape.discriminatorProperty}: string }).${shape.discriminatorProperty}}\`);`);
+	lines.push(`      throw new Error(\`Unknown ${shape.discriminatorProperty}: \${String((response as Record<string, unknown>).${shape.discriminatorProperty})}\`);`);
 	lines.push(`  }`);
 	lines.push(`};`);
-	lines.push("");
-	lines.push(`export const serialize${domain} = (model: ${domain}): ${wire} => {`);
-	lines.push(`  switch (model.${shape.discriminatorPropertyDomain}) {`);
-	for (const variant of shape.variants) {
-		lines.push(`    case '${variant.discriminatorValue}':`);
-		lines.push(`      return {`);
-		for (const field of shape.baseFields) lines.push(`        ${assignmentLine(field, true, allDeps)},`);
-		lines.push(`        ${shape.discriminatorProperty}: '${variant.discriminatorValue}',`);
-		for (const field of variant.fields) lines.push(`        ${assignmentLine(field, true, allDeps)},`);
-		lines.push(`      };`);
+	if (!deserializeOnly) {
+		lines.push("");
+		lines.push(`export const serialize${domain} = (model: ${domain}): ${wire} => {`);
+		lines.push(`  switch (model.${shape.discriminatorPropertyDomain}) {`);
+		for (const variant of shape.variants) {
+			lines.push(`    case ${discLiteral(variant)}:`);
+			lines.push(`      return {`);
+			for (const field of shape.baseFields) lines.push(`        ${assignmentLine(field, true, allDeps)},`);
+			lines.push(`        ${shape.discriminatorProperty}: ${discLiteral(variant)},`);
+			for (const field of variant.fields) lines.push(`        ${assignmentLine(field, true, allDeps)},`);
+			lines.push(`      };`);
+		}
+		lines.push(`  }`);
+		lines.push(`};`);
 	}
-	lines.push(`  }`);
-	lines.push(`};`);
 	return {
 		path: `src/${modelDir}/serializers/${fileName$3(shape.modelName)}.serializer.ts`,
 		content: lines.join("\n") + "\n",
@@ -29764,4 +29869,4 @@ const workosEmittersPlugin = {
 //#endregion
 export { fieldName$2 as A, servicePropertyName$2 as B, apiClassName as C, dotnetEmitter as D, propertyName as E, fieldName$3 as F, fieldName$5 as H, methodName$3 as I, trimMountedResourceFromMethod$2 as L, trimMountedResourceFromMethod$1 as M, goEmitter as N, appendAsyncSuffix as O, className$3 as P, phpEmitter as R, kotlinEmitter as S, packageSegment as T, safeParamName$1 as U, pythonEmitter as V, nodeEmitter as W, rubyEmitter as _, rustExtractor as a, resolveServiceTarget as b, pythonExtractor as c, rustEmitter as d, fieldName as f, typeName as g, resourceAccessorName as h, kotlinExtractor as i, methodName$2 as j, className$2 as k, rubyExtractor as l, moduleName as m, elixirExtractor as n, goExtractor as o, methodName as p, dotnetExtractor as r, phpExtractor as s, workosEmittersPlugin as t, nodeExtractor as u, buildExportedClassNameSet as v, methodName$1 as w, safeParamName as x, fieldName$1 as y, fieldName$4 as z };
 
-//# sourceMappingURL=plugin-BLnR-FMi.mjs.map
+//# sourceMappingURL=plugin-DAa-HsN5.mjs.map