@workos/oagen-emitters 0.7.0 → 0.7.2

package/dist/plugin.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workos/oagen-emitters",
-  "version": "0.7.0",
+  "version": "0.7.2",
   "description": "WorkOS' oagen emitters",
   "license": "MIT",
   "author": "WorkOS",

package/src/php/models.ts

@@ -133,6 +133,31 @@ export function generateModels(models: Model[], ctx: EmitterContext): GeneratedF
   return files;
 }
 
+/**
+ * Resolve a degenerate union to a single TypeRef when possible.
+ * - allOf: PHP collapses to the first variant (mirrors `mapTypeRef`).
+ * - oneOf/anyOf where every variant has the same generated PHP type: collapse
+ *   to that variant (e.g. discriminated unions whose branches the IR pinned to
+ *   one model name).
+ * Returns null when the union is genuinely polymorphic.
+ */
+function resolveDegenerateUnion(ref: TypeRef): TypeRef | null {
+  if (ref.kind !== 'union') return null;
+  if (ref.compositionKind === 'allOf') return ref.variants[0] ?? null;
+  if (ref.variants.length === 0) return null;
+  const signature = (v: TypeRef): string => {
+    if (v.kind === 'model') return `model:${v.name}`;
+    if (v.kind === 'enum') return `enum:${v.name}`;
+    return `kind:${v.kind}`;
+  };
+  const first = ref.variants[0];
+  const firstSig = signature(first);
+  for (const v of ref.variants) {
+    if (signature(v) !== firstSig) return null;
+  }
+  return first;
+}
+
 /**
  * Generate the fromArray accessor expression for a field.
  */
@@ -194,8 +219,11 @@ function generateFromArrayValue(ref: TypeRef, accessor: string): string {
       return accessor;
     case 'nullable':
       return generateFromArrayValue(ref.inner, accessor);
-    case 'union':
+    case 'union': {
+      const resolved = resolveDegenerateUnion(ref);
+      if (resolved) return generateFromArrayValue(resolved, accessor);
       return accessor;
+    }
     case 'map':
       return accessor;
     case 'literal':
@@ -225,6 +253,10 @@ function isComplexType(ref: TypeRef): boolean {
       return isComplexType(ref.items);
     case 'nullable':
       return isComplexType(ref.inner);
+    case 'union': {
+      const resolved = resolveDegenerateUnion(ref);
+      return resolved ? isComplexType(resolved) : false;
+    }
     default:
       return false;
   }
@@ -266,8 +298,11 @@ function generateToArrayValue(ref: TypeRef, accessor: string, nullable = false):
       return generateToArrayValue(ref.inner, accessor, true);
     case 'map':
       return accessor;
-    case 'union':
+    case 'union': {
+      const resolved = resolveDegenerateUnion(ref);
+      if (resolved) return generateToArrayValue(resolved, accessor, nullable);
       return accessor;
+    }
     case 'literal':
       return accessor;
   }

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/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',
     );
   });