@workos/oagen-emitters 0.15.0 → 0.15.2

package/.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "0.15.0"
+  ".": "0.15.2"
 }

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## [0.15.2](https://github.com/workos/oagen-emitters/compare/v0.15.1...v0.15.2) (2026-06-01)
+
+
+### Bug Fixes
+
+* **node:** align AutoPaginatable type param with serialized runtime shape ([#134](https://github.com/workos/oagen-emitters/issues/134)) ([43ddd64](https://github.com/workos/oagen-emitters/commit/43ddd64d5d56b4ff2e7ae19bfa1ee895d24cb60d))
+
+## [0.15.1](https://github.com/workos/oagen-emitters/compare/v0.15.0...v0.15.1) (2026-06-01)
+
+
+### Bug Fixes
+
+* **node:** resolve emitter bugs blocking service ownership migration ([#132](https://github.com/workos/oagen-emitters/issues/132)) ([e63cc06](https://github.com/workos/oagen-emitters/commit/e63cc06f948657965563a0d582ebbd9bedb1eb5f))
+
 ## [0.15.0](https://github.com/workos/oagen-emitters/compare/v0.14.4...v0.15.0) (2026-06-01)
 
 

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-CO4RFgAW.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-Xkr83G9A.mjs";
 export { dotnetEmitter, dotnetExtractor, elixirExtractor, goEmitter, goExtractor, kotlinEmitter, kotlinExtractor, nodeEmitter, nodeExtractor, phpEmitter, phpExtractor, pythonEmitter, pythonExtractor, rubyEmitter, rubyExtractor, rustEmitter, rustExtractor, workosEmittersPlugin };

package/dist/{plugin-CO4RFgAW.mjs → plugin-Xkr83G9A.mjs}

@@ -4781,7 +4781,7 @@ function renderOptionsParam(param) {
 	return `options${param.optional ? "?" : ""}: ${param.type}`;
 }
 function autoPaginatableItemType$1(returnType) {
-	return returnType?.match(/\bAutoPaginatable<\s*([A-Za-z_$][\w$]*)/)?.[1];
+	return returnType?.match(/\b(?:AutoPaginatable|List)<\s*([A-Za-z_$][\w$]*)/)?.[1];
 }
 function baselineTypeSourceFile(ctx, typeName) {
 	const surface = ctx.apiSurface;
@@ -4799,9 +4799,12 @@ function preferredBaselineTypeName(ctx, typeName) {
 	return typeName;
 }
 function preferredBaselineReturnType(ctx, returnType) {
+	if (!returnType) return void 0;
+	if (!/\bAutoPaginatable\b/.test(returnType)) return void 0;
 	const itemType = autoPaginatableItemType$1(returnType);
+	if (!itemType) return void 0;
 	const preferred = preferredBaselineTypeName(ctx, itemType);
-	if (!returnType || !itemType || !preferred || preferred === itemType) return returnType;
+	if (!preferred || preferred === itemType) return returnType;
 	return returnType.replace(new RegExp(`\\b${itemType}\\b`, "g"), preferred);
 }
 function requestEntityType(bodyExpr, requestType) {
@@ -5233,7 +5236,11 @@ function generateResourceClass(service, ctx) {
 					const serializerName = `serialize${optionsName}`;
 					lines.push(`const ${serializerName} = (options: ${optionsName}): PaginationOptions => {`);
 					lines.push("  const wire: Record<string, unknown> = {");
-					for (const p of PAGINATION_PARAM_NAMES) lines.push(`    ${p}: options.${p},`);
+					const baselineFields = (ctx.apiSurface?.interfaces)?.[optionsName]?.fields;
+					for (const p of PAGINATION_PARAM_NAMES) {
+						if (baselineFields && !(p in baselineFields) && !baselineFields[toCamelCase(p)]) continue;
+						lines.push(`    ${p}: options.${p},`);
+					}
 					lines.push("  };");
 					for (const param of extraParams) {
 						const camel = fieldName$6(param.name);
@@ -5466,7 +5473,7 @@ function renderMethod$2(op, plan, method, service, ctx, modelMap, specEnumNames,
 				const unwrapped = unwrapListModel$4(pModel, modelMap);
 				if (unwrapped) itemRawName = unwrapped.name;
 			}
-			const itemTypeName = resolveInterfaceName(itemRawName, ctx);
+			const itemTypeName = preferredBaselineTypeName(ctx, autoPaginatableItemType$1(baselineClassMethod?.returnType) ?? autoPaginatableItemType$1(overlayMethod?.returnType)) ?? resolveInterfaceName(itemRawName, ctx);
 			docParts.push(`@returns {Promise<AutoPaginatable<${itemTypeName}>>}`);
 		} else if (responseModel) {
 			const returnTypeDoc = plan.isArrayResponse ? `${responseModel}[]` : responseModel;
@@ -5538,10 +5545,12 @@ function renderOptionsObjectMethod(lines, op, plan, method, service, ctx, modelM
 		const itemType = preferredBaselineTypeName(ctx, autoPaginatableItemType$1(baselineMethod?.returnType)) ?? (itemRawName ? resolveInterfaceName(itemRawName, ctx) : responseModel);
 		if (!itemType) return false;
 		const wireType = wireInterfaceName(itemType);
-		const returnType = preferredBaselineReturnType(ctx, baselineMethod?.returnType) ?? `Promise<AutoPaginatable<${itemType}>>`;
-		const listOptionsExpr = op.queryParams.filter((p) => !PAGINATION_PARAM_NAMES.has(p.name)).some((p) => fieldName$6(p.name) !== wireFieldName(p.name)) ? `options ? serialize${optionParam.type}(options) : undefined` : "paginationOptions";
+		const needsWireSerializer = op.queryParams.filter((p) => !PAGINATION_PARAM_NAMES.has(p.name)).some((p) => fieldName$6(p.name) !== wireFieldName(p.name));
+		const paginationType = needsWireSerializer ? "PaginationOptions" : optionParam.type;
+		const returnType = needsWireSerializer ? `Promise<AutoPaginatable<${itemType}, ${paginationType}>>` : preferredBaselineReturnType(ctx, baselineMethod?.returnType) ?? `Promise<AutoPaginatable<${itemType}, ${paginationType}>>`;
+		const listOptionsExpr = needsWireSerializer ? `options ? serialize${optionParam.type}(options) : undefined` : "paginationOptions";
 		lines.push(`  async ${method}(${renderOptionsParam(optionParam)}): ${returnType} {`);
-		renderOptionsObjectDestructure(lines, pathBindings, "paginationOptions");
+		renderOptionsObjectDestructure(lines, pathBindings, needsWireSerializer ? void 0 : "paginationOptions");
 		lines.push(`    return new AutoPaginatable(`);
 		lines.push(`      await fetchAndDeserialize<${wireType}, ${itemType}>(`);
 		lines.push(`        this.workos,`);
@@ -5556,7 +5565,7 @@ function renderOptionsObjectMethod(lines, op, plan, method, service, ctx, modelM
 		lines.push(`          deserialize${itemType},`);
 		lines.push(`          params,`);
 		lines.push(`        ),`);
-		lines.push(`      paginationOptions,`);
+		lines.push(`      ${listOptionsExpr},`);
 		lines.push(`    );`);
 		lines.push("  }");
 		return true;
@@ -5688,12 +5697,14 @@ function resolveOptionsObjectField$1(localName, optionType, ctx) {
 function renderPaginatedMethod(lines, op, plan, method, itemType, pathStr, resolvedServiceName, specEnumNames) {
 	const extraParams = op.queryParams.filter((p) => !PAGINATION_PARAM_NAMES.has(p.name));
 	const optionsType = extraParams.length > 0 ? paginatedOptionsName(method, resolvedServiceName) : "PaginationOptions";
-	const serializerArg = extraParams.some((p) => fieldName$6(p.name) !== wireFieldName(p.name)) ? `, serialize${optionsType}` : "";
+	const needsWireSerializer = extraParams.some((p) => fieldName$6(p.name) !== wireFieldName(p.name));
+	const serializerArg = needsWireSerializer ? `, serialize${optionsType}` : "";
 	const pathParams = buildPathParams(op, specEnumNames);
 	const allParams = pathParams ? `${pathParams}, options?: ${optionsType}` : `options?: ${optionsType}`;
 	const wireType = wireInterfaceName(itemType);
 	const serializeCall = serializerArg ? `options ? serialize${optionsType}(options) : undefined` : "options";
-	lines.push(`  async ${method}(${allParams}): Promise<AutoPaginatable<${itemType}, ${optionsType}>> {`);
+	const paginationType = needsWireSerializer ? "PaginationOptions" : optionsType;
+	lines.push(`  async ${method}(${allParams}): Promise<AutoPaginatable<${itemType}, ${paginationType}>> {`);
 	lines.push(`    return new AutoPaginatable(`);
 	lines.push(`      await fetchAndDeserialize<${wireType}, ${itemType}>(`);
 	lines.push(`        this.workos,`);
@@ -5708,7 +5719,7 @@ function renderPaginatedMethod(lines, op, plan, method, itemType, pathStr, resol
 	lines.push(`          deserialize${itemType},`);
 	lines.push(`          params,`);
 	lines.push(`        ),`);
-	lines.push(`      options,`);
+	lines.push(`      ${serializeCall},`);
 	lines.push(`    );`);
 	lines.push("  }");
 }
@@ -7128,7 +7139,14 @@ function generateServiceBarrels(spec, ctx) {
 	const dirExports = /* @__PURE__ */ new Map();
 	const dirSymbols = /* @__PURE__ */ new Map();
 	const ownedDirNames = /* @__PURE__ */ new Set();
-	for (const service of spec.services) if (isNodeOwnedService(ctx, service.name)) ownedDirNames.add(resolveDir(service.name));
+	for (const service of spec.services) if (isNodeOwnedService(ctx, service.name)) {
+		const dir = resolveDir(service.name);
+		ownedDirNames.add(dir);
+		if (!dirExports.has(dir)) {
+			dirExports.set(dir, []);
+			if (!dirSymbols.has(dir)) dirSymbols.set(dir, /* @__PURE__ */ new Set());
+		}
+	}
 	const dirSymbolsFromBaseline = /* @__PURE__ */ new Map();
 	const seedFromBaseline = (sourceFile, name) => {
 		const match = sourceFile.match(/^src\/([^/]+)\/interfaces\/(.+)\.ts$/);
@@ -7294,6 +7312,28 @@ function generateServiceBarrels(spec, ctx) {
 				} catch {}
 			}
 		}
+		const ownedScanRoot = ctx.targetDir ?? ctx.outputDir;
+		if (ownedScanRoot && isDirOwned) {
+			const interfacesDir = path.join(ownedScanRoot, "src", dirName, "interfaces");
+			const symbols = dirSymbols.get(dirName) ?? /* @__PURE__ */ new Set();
+			try {
+				for (const entry of fs.readdirSync(interfacesDir)) {
+					if (entry === "index.ts") continue;
+					if (!entry.endsWith(".ts")) continue;
+					const exportLine = `export * from './${entry.replace(/\.ts$/, "")}';`;
+					if (exportSet.has(exportLine)) continue;
+					const content = fs.readFileSync(path.join(interfacesDir, entry), "utf-8");
+					const exportedNames = [];
+					for (const m of content.matchAll(/export\s+(?:interface|type|enum|class|const|function)\s+(\w+)/g)) exportedNames.push(m[1]);
+					if (exportedNames.some((name) => globalExistingSymbols.has(name))) continue;
+					for (const name of exportedNames) {
+						symbols.add(name);
+						globalExistingSymbols.add(name);
+					}
+					exportSet.add(exportLine);
+				}
+			} catch {}
+		}
 		const uniqueExports = [...exportSet];
 		uniqueExports.sort();
 		if (ctx.apiSurface) files.push({
@@ -8494,13 +8534,29 @@ function planDiscriminatedModels(models, ctx) {
 	if (!spec?.components?.schemas) return plans;
 	const rawSchemas = spec.components.schemas;
 	const { modelToService, resolveDir } = createServiceDirResolver(models, ctx.spec.services, ctx);
+	const irModelDir = /* @__PURE__ */ new Map();
+	for (const model of models) irModelDir.set(model.name, resolveDir(modelToService.get(model.name)));
+	const depDirMap = /* @__PURE__ */ new Map();
+	for (const rawName of Object.keys(rawSchemas)) {
+		if (irModelDir.has(rawName)) {
+			depDirMap.set(rawName, irModelDir.get(rawName));
+			continue;
+		}
+		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 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 modelDir = resolveDir(modelToService.get(model.name));
 		plans.set(model.name, {
 			shape,
-			modelDir
+			modelDir,
+			depDirMap
 		});
 	}
 	return plans;
@@ -8545,7 +8601,12 @@ function buildInterfaceFile(plan, _ctx) {
 function buildInterfaceBody(name, shape, variant, isWire) {
 	const lines = [];
 	lines.push(`export interface ${name} {`);
-	for (const field of shape.baseFields) pushFieldLine(lines, field, isWire);
+	const variantFieldNames = new Set(variant.fields.map((f) => f.name));
+	for (const field of shape.baseFields) {
+		if (variantFieldNames.has(field.name)) continue;
+		if (field.name === shape.discriminatorProperty) continue;
+		pushFieldLine(lines, field, isWire);
+	}
 	const discKey = isWire ? shape.discriminatorProperty : shape.discriminatorPropertyDomain;
 	if (shape.discriminatorDescription) lines.push(`  /** ${shape.discriminatorDescription} */`);
 	lines.push(`  ${discKey}: '${variant.discriminatorValue}';`);
@@ -8564,25 +8625,24 @@ function collectImports$2(plan) {
 	const deps = /* @__PURE__ */ new Set();
 	for (const field of plan.shape.baseFields) for (const d of field.modelDeps) deps.add(d);
 	for (const variant of plan.shape.variants) for (const field of variant.fields) for (const d of field.modelDeps) deps.add(d);
-	const symbols = [];
+	const result = [];
 	for (const dep of [...deps].sort()) {
 		const domain = toPascalCase(dep);
-		symbols.push(domain);
 		const wire = wireInterfaceName(domain);
-		if (wire !== domain) symbols.push(wire);
+		const symbols = wire !== domain ? [domain, wire] : [domain];
+		const depDir = plan.depDirMap.get(dep);
+		const baseName = fileName$3(toSnakeFromPascal(domain));
+		let importPath;
+		if (!depDir || depDir === plan.modelDir) importPath = `./${baseName}.interface`;
+		else importPath = `../../${depDir}/interfaces/${baseName}.interface`;
+		const existing = result.find((a) => a.path === importPath);
+		if (existing) existing.symbols.push(...symbols);
+		else result.push({
+			path: importPath,
+			symbols
+		});
 	}
-	if (symbols.length === 0) return [];
-	return symbols.map((sym) => {
-		return {
-			path: `./${fileName$3(toSnakeFromPascal(sym.replace(/Response$/, "")))}.interface`,
-			symbols: [sym]
-		};
-	}).reduce((acc, cur) => {
-		const existing = acc.find((a) => a.path === cur.path);
-		if (existing) existing.symbols.push(...cur.symbols);
-		else acc.push(cur);
-		return acc;
-	}, []);
+	return result;
 }
 function toSnakeFromPascal(s) {
 	return s.replace(/([a-z0-9])([A-Z])/g, "$1_$2").replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2").toLowerCase();
@@ -28358,4 +28418,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-CO4RFgAW.mjs.map
+//# sourceMappingURL=plugin-Xkr83G9A.mjs.map