@workos/oagen-emitters 0.6.8 → 0.7.1

package/dist/plugin.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workos/oagen-emitters",
-  "version": "0.6.8",
+  "version": "0.7.1",
   "description": "WorkOS' oagen emitters",
   "license": "MIT",
   "author": "WorkOS",
@@ -54,6 +54,6 @@
     "node": ">=24.10.0"
   },
   "dependencies": {
-    "@workos/oagen": "^0.9.0"
+    "@workos/oagen": "^0.12.0"
   }
 }

package/src/node/tests.ts

@@ -854,7 +854,7 @@ function modelNeedsRoundTripTest(model: Model): boolean {
  */
 function generateSerializerTests(spec: ApiSpec, ctx: EmitterContext): GeneratedFile[] {
   const files: GeneratedFile[] = [];
-  const modelToService = assignModelsToServices(spec.models, spec.services);
+  const modelToService = assignModelsToServices(spec.models, spec.services, ctx.modelHints);
   const serviceNameMap = new Map<string, string>();
   for (const service of spec.services) {
     serviceNameMap.set(service.name, resolveResourceClassName(service, ctx));

package/src/node/utils.ts

@@ -223,7 +223,7 @@ export function createServiceDirResolver(
   serviceNameMap: Map<string, string>;
   resolveDir: (irService: string | undefined) => string;
 } {
-  const modelToService = assignModelsToServices(models, services);
+  const modelToService = assignModelsToServices(models, services, ctx.modelHints);
   const serviceNameMap = buildServiceNameMap(services, ctx);
   const resolveDir = (irService: string | undefined) =>
     irService ? resolveServiceDir(serviceNameMap.get(irService) ?? irService) : 'common';

package/src/python/client.ts

@@ -270,8 +270,13 @@ function generateServiceInits(spec: ApiSpec, ctx: EmitterContext): GeneratedFile
     const ops = mountGroups.get(mountTarget)?.operations ?? service.operations;
     const groupClassNames = collectParameterGroupClassNames(ops);
 
+    // Use `X as X` re-export form (PEP 484) so pyright recognizes these as
+    // public re-exports. Otherwise consumers importing
+    // `from workos.user_management import RoleSingle` get a private-import
+    // warning under strict mode. Models barrel uses the same convention.
     const resourceImports = [resolvedName, `Async${resolvedName}`, ...groupClassNames];
-    lines.push(`from ._resource import ${resourceImports.join(', ')}`);
+    const aliasedImports = resourceImports.map((n) => `${n} as ${n}`);
+    lines.push(`from ._resource import ${aliasedImports.join(', ')}`);
     lines.push('from .models import *');
 
     files.push({

package/src/python/models.ts

@@ -11,7 +11,7 @@ import { assignEnumsToServices, collectGeneratedEnumSymbolsByDir } from './enums
 export function generateModels(models: Model[], ctx: EmitterContext): GeneratedFile[] {
   if (models.length === 0) return [];
 
-  const modelToService = assignModelsToServices(models, ctx.spec.services);
+  const modelToService = assignModelsToServices(models, ctx.spec.services, ctx.modelHints);
   const enumToService = assignEnumsToServices(ctx.spec.enums, ctx.spec.services);
   const mountDirMap = buildMountDirMap(ctx);
   const resolveDir = (irService: string | undefined) =>

package/src/python/resources.ts

@@ -1116,7 +1116,7 @@ export function generateResources(services: Service[], ctx: EmitterContext): Gen
     const actualModelImports = [...modelImports];
 
     // Split imports into same-service and cross-service (using mount-based dirs)
-    const modelToServiceMap = assignModelsToServices(ctx.spec.models, ctx.spec.services);
+    const modelToServiceMap = assignModelsToServices(ctx.spec.models, ctx.spec.services, ctx.modelHints);
     // Discriminator variant type aliases (e.g. EventSchemaVariant) live in the same
     // service as their dispatcher model, so ensure they resolve to the same directory.
     for (const model of ctx.spec.models) {

package/src/python/tests.ts

@@ -227,7 +227,7 @@ function generateServiceTest(
   });
 
   // Group imports by their actual service directory (models may live in different services)
-  const modelToServiceMap = assignModelsToServices(spec.models, spec.services);
+  const modelToServiceMap = assignModelsToServices(spec.models, spec.services, ctx.modelHints);
   const mountDirMap = buildMountDirMap(ctx);
   const resolveModelDir = (modelName: string) => {
     const svc = modelToServiceMap.get(modelName);
@@ -1402,7 +1402,7 @@ function generateModelRoundTripTests(spec: ApiSpec, ctx: EmitterContext): Genera
   );
   if (models.length === 0) return null;
 
-  const modelToService = assignModelsToServices(spec.models, spec.services);
+  const modelToService = assignModelsToServices(spec.models, spec.services, ctx.modelHints);
   const roundTripDirMap = buildMountDirMap(ctx);
   const resolveDir = (irService: string | undefined) =>
     irService ? (roundTripDirMap.get(irService) ?? 'common') : 'common';

package/src/ruby/client.ts

@@ -182,7 +182,7 @@ function generateMainEntryFile(spec: ApiSpec, ctx: EmitterContext): GeneratedFil
  * keep the generated namespace flat while the filesystem is grouped.
  */
 function collectModelSubdirs(spec: ApiSpec, ctx: EmitterContext): string[] {
-  const modelToService = assignModelsToServices(spec.models as Model[], spec.services);
+  const modelToService = assignModelsToServices(spec.models as Model[], spec.services, ctx.modelHints);
   const mountDirMap = buildMountDirMap(ctx);
   const subdirs = new Set<string>();
   for (const model of spec.models as Model[]) {

package/src/ruby/models.ts

@@ -67,7 +67,7 @@ export function generateModels(models: Model[], ctx: EmitterContext): GeneratedF
   // Model → mount target directory. Each model is assigned to the first service
   // that references it (transitively). Orphans land in `shared/`. Zeitwerk is
   // told to collapse each subfolder (in client.ts) so the namespace stays flat.
-  const modelToService = assignModelsToServices(models, ctx.spec.services);
+  const modelToService = assignModelsToServices(models, ctx.spec.services, ctx.modelHints);
   const mountDirMap = buildMountDirMap(ctx);
   const dirFor = (modelName: string): string => {
     const service = modelToService.get(modelName);

package/test/python/client.test.ts

@@ -103,7 +103,9 @@ describe('generateClient', () => {
 
     const serviceInit = files.find((f) => f.path === 'src/workos/organizations/__init__.py');
     expect(serviceInit).toBeDefined();
-    expect(serviceInit!.content).toContain('from ._resource import Organizations, AsyncOrganizations');
+    expect(serviceInit!.content).toContain(
+      'from ._resource import Organizations as Organizations, AsyncOrganizations as AsyncOrganizations',
+    );
   });
 
   it('generates flat directory structure for services (no nested namespaces)', () => {
@@ -193,7 +195,7 @@ describe('generateClient', () => {
     expect(serviceInit!.content).toContain('RoleSingle');
     expect(serviceInit!.content).toContain('RoleMultiple');
     expect(serviceInit!.content).toContain(
-      'from ._resource import UserManagement, AsyncUserManagement, RoleSingle, RoleMultiple',
+      'from ._resource import UserManagement as UserManagement, AsyncUserManagement as AsyncUserManagement, RoleSingle as RoleSingle, RoleMultiple as RoleMultiple',
     );
   });