@workos/oagen-emitters 0.12.5 → 0.14.0

package/dist/plugin.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workos/oagen-emitters",
-  "version": "0.12.5",
+  "version": "0.14.0",
   "description": "WorkOS' oagen emitters",
   "license": "MIT",
   "author": "WorkOS",
@@ -40,20 +40,20 @@
   "devDependencies": {
     "@commitlint/cli": "^21.0.1",
     "@commitlint/config-conventional": "^21.0.1",
-    "@types/node": "^25.9.0",
+    "@types/node": "^25.9.1",
     "husky": "^9.1.7",
-    "oxfmt": "^0.50.0",
-    "oxlint": "^1.65.0",
+    "oxfmt": "^0.51.0",
+    "oxlint": "^1.66.0",
     "prettier": "^3.8.3",
     "tsdown": "^0.22.0",
-    "tsx": "^4.22.2",
+    "tsx": "^4.22.3",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.6"
+    "vitest": "^4.1.7"
   },
   "engines": {
     "node": ">=24.10.0"
   },
   "dependencies": {
-    "@workos/oagen": "^0.19.1"
+    "@workos/oagen": "^0.20.0"
   }
 }

package/src/kotlin/client.ts

@@ -1,5 +1,5 @@
 import type { ApiSpec, EmitterContext, GeneratedFile, Service } from '@workos/oagen';
-import { apiClassName, packageSegment, servicePropertyName } from './naming.js';
+import { resolveApiClassName, packageSegment, servicePropertyName, buildExportedClassNameSet } from './naming.js';
 import { getMountTarget } from '../shared/resolved-ops.js';
 
 const KOTLIN_SRC_PREFIX = 'src/main/kotlin/';
@@ -23,8 +23,9 @@ export function generateClient(spec: ApiSpec, ctx: EmitterContext): GeneratedFil
 
   const imports = new Set<string>();
   const accessorLines: string[] = [];
+  const exportedClasses = buildExportedClassNameSet(ctx);
   for (const mount of targets) {
-    const apiCls = apiClassName(mount);
+    const apiCls = resolveApiClassName(mount, exportedClasses);
     const fqn = `com.workos.${packageSegment(mount)}.${apiCls}`;
     imports.add(fqn);
     const prop = servicePropertyName(mount);

package/src/kotlin/naming.ts

@@ -1,4 +1,8 @@
 import type { Operation, Service, EmitterContext, TypeRef } from '@workos/oagen';
+import {
+  buildExportedClassNameSet as buildExportedClassNameSetShared,
+  resolveServiceTarget as resolveServiceTargetShared,
+} from '../shared/service-name-collision.js';
 import { toPascalCase, toCamelCase, toSnakeCase } from '@workos/oagen';
 import { buildResolvedLookup, lookupMethodName, getMountTarget } from '../shared/resolved-ops.js';
 import { stripUrnPrefix } from '../shared/naming-utils.js';
@@ -73,6 +77,36 @@ export function apiClassName(name: string): string {
   return className(name);
 }
 
+/**
+ * Resolve the Kotlin service class name with the collision suffix applied
+ * when needed. Wraps `apiClassName` so callers don't need to thread the
+ * exported-classes set through unrelated emission logic.
+ */
+export function resolveApiClassName(name: string, exportedClasses: Set<string>): string {
+  return apiClassName(resolveServiceTarget(name, exportedClasses));
+}
+
+/**
+ * Build the set of model + enum class names exported by the SDK. Used to
+ * detect collisions with operation-client class names — a colliding service
+ * gets a `Service` suffix appended.
+ */
+export function buildExportedClassNameSet(ctx: EmitterContext): Set<string> {
+  return buildExportedClassNameSetShared(ctx, className);
+}
+
+/**
+ * Resolve a service's mount-target identifier, appending `Service` on
+ * collision with an exported model/enum class. Kotlin sees the collision
+ * when a service class shares a simple name with an imported model class
+ * (e.g. `com.workos.models.OrganizationMembership` vs
+ * `com.workos.organizationmembership.OrganizationMembership`) — the file's
+ * local declaration shadows the import for unqualified references.
+ */
+export function resolveServiceTarget(target: string, exportedClasses: Set<string>): string {
+  return resolveServiceTargetShared(target, exportedClasses, className);
+}
+
 /** Accessor property exposed on the WorkOS client (camelCase). */
 export function servicePropertyName(name: string): string {
   return toCamelCase(name);

package/src/kotlin/resources.ts

@@ -16,7 +16,7 @@ import { enumCanonicalMap } from './enums.js';
 import {
   className,
   propertyName,
-  apiClassName,
+  resolveApiClassName,
   packageSegment,
   resolveMethodName,
   ktLiteral,
@@ -24,6 +24,7 @@ import {
   escapeReserved,
   humanize,
   maybeShortenEnumParamDescription,
+  buildExportedClassNameSet,
 } from './naming.js';
 import {
   buildResolvedLookup,
@@ -96,13 +97,14 @@ export function generateResources(services: Service[], ctx: EmitterContext): Gen
 
   const files: GeneratedFile[] = [];
   const resolvedLookup = buildResolvedLookup(ctx);
+  const exportedClasses = buildExportedClassNameSet(ctx);
 
   for (const [mountName, group] of mountGroups) {
     const classCode = generateApiClass(mountName, group.operations, ctx, resolvedLookup);
     if (!classCode) continue;
     const pkg = packageSegment(mountName);
     files.push({
-      path: `${KOTLIN_SRC_PREFIX}com/workos/${pkg}/${apiClassName(mountName)}.kt`,
+      path: `${KOTLIN_SRC_PREFIX}com/workos/${pkg}/${resolveApiClassName(mountName, exportedClasses)}.kt`,
       content: classCode,
       overwriteExisting: true,
     });
@@ -118,7 +120,7 @@ function generateApiClass(
   resolvedLookup: Map<string, ResolvedOperation>,
 ): string | null {
   if (operations.length === 0) return null;
-  const apiClass = apiClassName(mountName);
+  const apiClass = resolveApiClassName(mountName, buildExportedClassNameSet(ctx));
   const pkg = `com.workos.${packageSegment(mountName)}`;
 
   const imports = new Set<string>();

package/src/kotlin/tests.ts

@@ -10,7 +10,15 @@ import type {
   ResolvedWrapper,
 } from '@workos/oagen';
 import { planOperation } from '@workos/oagen';
-import { apiClassName, packageSegment, resolveMethodName, ktStringLiteral, className, propertyName } from './naming.js';
+import {
+  resolveApiClassName,
+  packageSegment,
+  resolveMethodName,
+  ktStringLiteral,
+  className,
+  propertyName,
+  buildExportedClassNameSet,
+} from './naming.js';
 import { mapTypeRef } from './type-map.js';
 import {
   groupByMount,
@@ -70,12 +78,13 @@ export function generateTests(spec: ApiSpec, ctx: EmitterContext): GeneratedFile
   const mountGroups = groupByMount(ctx);
   const resolvedLookup = buildResolvedLookup(ctx);
 
+  const exportedClasses = buildExportedClassNameSet(ctx);
   for (const [mountName, group] of mountGroups) {
     const content = generateServiceTestClass(mountName, group.operations, ctx, resolvedLookup);
     if (!content) continue;
     const pkg = packageSegment(mountName);
     files.push({
-      path: `${TEST_PREFIX}com/workos/${pkg}/${apiClassName(mountName)}Test.kt`,
+      path: `${TEST_PREFIX}com/workos/${pkg}/${resolveApiClassName(mountName, exportedClasses)}Test.kt`,
       content,
       overwriteExisting: true,
     });
@@ -203,7 +212,7 @@ function generateServiceTestClass(
   }
 
   const pkg = packageSegment(mountName);
-  const apiCls = apiClassName(mountName);
+  const apiCls = resolveApiClassName(mountName, buildExportedClassNameSet(ctx));
 
   // If any operation would emit a disabled placeholder test, preregister
   // the `Disabled` import before we serialize the header.

package/src/node/client.ts

@@ -2,7 +2,13 @@ import fs from 'node:fs';
 import path from 'node:path';
 import type { ApiSpec, AuthScheme, EmitterContext, GeneratedFile } from '@workos/oagen';
 
-import { fileName, servicePropertyName, resolveInterfaceName, wireInterfaceName } from './naming.js';
+import {
+  fileName,
+  servicePropertyName,
+  resolveInterfaceName,
+  wireInterfaceName,
+  resolveServiceName,
+} from './naming.js';
 import { isInlineEnum } from './type-map.js';
 import {
   docComment,
@@ -89,7 +95,10 @@ function generateWorkOSClient(spec: ApiSpec, ctx: EmitterContext): GeneratedFile
   for (const service of spec.services) {
     if (coveredServices.has(service.name)) continue;
     const resolvedName = resolveResourceClassName(service, ctx);
-    const propName = servicePropertyName(resolvedName);
+    // Accessor name uses the un-suffixed service name so that the public API
+    // stays `client.organizationMembership` even when the class itself was
+    // renamed to `OrganizationMembershipService` to avoid a model collision.
+    const propName = servicePropertyName(resolveServiceName(service, ctx));
     if (existingProps.has(propName)) continue;
     // Propagate `@deprecated` from the service class to the property so
     // IDEs surface the strikethrough at `workos.xyz` access sites, not