feat: allow unionType types to be a thunk

moonflare · Feb 22, 2023 · 42bf619 · 42bf619
1 parent 4b3ebc7
commit 42bf619
Show file tree

Hide file tree

Showing 11 changed files with 63 additions and 21 deletions.
diff --git a/.changeset/great-suits-provide.md b/.changeset/great-suits-provide.md
@@ -0,0 +1,6 @@
+---
+'@pothos/core': minor
+'@pothos/deno': minor
+---
+
+Allow unionType to receive types as a thunk
diff --git a/packages/core/src/builder.ts b/packages/core/src/builder.ts
@@ -423,22 +423,25 @@ export default class SchemaBuilder<Types extends SchemaTypes> {
       ParentShape<Types, Member>
     >(name);
 
-    options.types.forEach((type) => {
-      verifyRef(type);
-    });
+    if (Array.isArray(options.types)) {
+      options.types.forEach((type) => {
+        verifyRef(type);
+      });
+    }
 
     const config: PothosUnionTypeConfig = {
       kind: 'Union',
       graphqlKind: 'Union',
       name,
-      types: (options.types || []) as ObjectParam<SchemaTypes>[],
+      types: [],
       description: options.description,
       resolveType: options.resolveType as GraphQLTypeResolver<unknown, object>,
       pothosOptions: options as unknown as PothosSchemaTypes.UnionTypeOptions,
       extensions: options.extensions,
     };
 
     this.configStore.addTypeConfig(config, ref);
+    this.configStore.addUnionTypes(name, options.types);
 
     return ref;
   }

diff --git a/packages/core/src/config-store.ts b/packages/core/src/config-store.ts
@@ -26,6 +26,7 @@ import type {
   InputType,
   InputTypeParam,
   InterfaceParam,
+  ObjectParam,
   OutputRef,
   OutputType,
   PothosFieldConfig,
@@ -62,6 +63,8 @@ export default class ConfigStore<Types extends SchemaTypes> {
 
   private pendingInterfaces = new Map<string, (() => InterfaceParam<Types>[])[]>();
 
+  private pendingUnionTypes = new Map<string, (() => ObjectParam<Types>[])[]>();
+
   private pendingRefResolutions = new Map<
     ConfigurableRef<Types>,
     ((config: PothosTypeConfig) => void)[]
@@ -98,6 +101,31 @@ export default class ConfigStore<Types extends SchemaTypes> {
     return this.refsToName.has(typeParam);
   }
 
+  addUnionTypes(typeName: string, unionTypes: ObjectParam<Types>[] | (() => ObjectParam<Types>[])) {
+    if (typeof unionTypes === 'function' && this.pending) {
+      if (this.pendingUnionTypes.has(typeName)) {
+        this.pendingUnionTypes.get(typeName)!.push(unionTypes);
+      } else {
+        this.pendingUnionTypes.set(typeName, [unionTypes]);
+      }
+    } else {
+      const typeConfig = this.getTypeConfig(typeName);
+
+      if (typeConfig.graphqlKind !== 'Union') {
+        throw new PothosSchemaError(
+          `Can not add types to ${typeName} because it is a ${typeConfig.kind}`,
+        );
+      }
+
+      typeConfig.types = [
+        ...typeConfig.types,
+        ...((typeof unionTypes === 'function'
+          ? unionTypes()
+          : unionTypes) as ObjectParam<SchemaTypes>[]),
+      ];
+    }
+  }
+
   addInterfaces(
     typeName: string,
     interfaces: InterfaceParam<Types>[] | (() => InterfaceParam<Types>[]),
@@ -428,6 +456,12 @@ export default class ConfigStore<Types extends SchemaTypes> {
       );
     }
 
+    for (const [typeName, unionFns] of this.pendingUnionTypes) {
+      for (const fn of unionFns) {
+        this.addUnionTypes(typeName, fn);
+      }
+    }
+
     for (const [typeName, interfacesFns] of this.pendingInterfaces) {
       for (const fn of interfacesFns) {
         this.addInterfaces(typeName, fn);

diff --git a/packages/core/src/types/global/type-options.ts b/packages/core/src/types/global/type-options.ts
@@ -98,7 +98,7 @@ declare global {
       Member extends ObjectParam<Types> = ObjectParam<Types>,
       ResolveType = unknown,
     > extends BaseTypeOptions<Types> {
-      types: Member[];
+      types: Member[] | (() => Member[]);
       resolveType?: ResolveType &
         ((
           parent: ParentShape<Types, Member>,

diff --git a/packages/core/tests/examples/giraffes/unions.ts b/packages/core/tests/examples/giraffes/unions.ts
@@ -14,7 +14,7 @@ const GiraffeNumericFact = builder.objectType('GiraffeNumericFact', {
 });
 
 const GiraffeFact = builder.unionType('GiraffeFact', {
-  types: ['GiraffeStringFact', GiraffeNumericFact],
+  types: () => ['GiraffeStringFact', GiraffeNumericFact],
   resolveType: (fact) => {
     switch (fact.factKind) {
       case 'number':

diff --git a/packages/deno/packages/core/build-cache.ts b/packages/deno/packages/core/build-cache.ts
diff --git a/packages/deno/packages/core/builder.ts b/packages/deno/packages/core/builder.ts
diff --git a/packages/deno/packages/core/types/configs.ts b/packages/deno/packages/core/types/configs.ts
diff --git a/packages/deno/packages/core/types/global/type-options.ts b/packages/deno/packages/core/types/global/type-options.ts
diff --git a/packages/deno/packages/plugin-tracing/README.md b/packages/deno/packages/plugin-tracing/README.md
@@ -767,13 +767,7 @@ import { schema } from './schema';
 
 const yoga = createYoga({
   schema,
-  plugins: [
-    useSentry({
-      // Disable resolver tracking since this is covered by the pothos tracing plugin
-      // If all resolvers are being traced, you could use the Sentry envelop plug instead of the pothos tracing plugin
-      trackResolvers: false,
-    }),
-  ],
+  plugins: [useSentry({})],
 });
 
 const server = createServer(yoga);

diff --git a/website/pages/docs/api/schema-builder.mdx b/website/pages/docs/api/schema-builder.mdx
@@ -295,7 +295,7 @@ all types in SchemaTypes, or import the actual implementation of each interface
 ```typescript
 type UnionTypeOptions = {
   description?: string;
-  types: Member[];
+  types: Member[] | (() => Member[]);
   resolveType: (parent: UnionShape, context) => MaybePromise<GraphQLObjectType | TypeName>;
 };
 ```