Merge branch 'main' into tgriesser/bug/parseIdType

moonflare · Feb 23, 2023 · 420e975 · 420e975
2 parents 07d8df5 + 9c17ca4
commit 420e975
Show file tree

Hide file tree

Showing 49 changed files with 319 additions and 35 deletions.
diff --git a/examples/complex-app/CHANGELOG.md b/examples/complex-app/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @pothos-examples/complex-app
 
+## 1.4.28
+
+### Patch Changes
+
+- Updated dependencies [d60cb49e]
+  - @pothos/plugin-relay@3.36.0
+  - @pothos/plugin-dataloader@3.14.0
+  - @pothos/plugin-prisma@3.41.0
+  - @pothos/plugin-scope-auth@3.18.0
+
 ## 1.4.27
 
 ### Patch Changes

diff --git a/examples/complex-app/package.json b/examples/complex-app/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "1.4.27",
+  "version": "1.4.28",
   "name": "@pothos-examples/complex-app",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/envelope-helix-fastify/CHANGELOG.md b/examples/envelope-helix-fastify/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pothos-examples/envelope-helix-fastify
 
+## 2.4.20
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+
 ## 2.4.19
 
 ### Patch Changes

diff --git a/examples/envelope-helix-fastify/package.json b/examples/envelope-helix-fastify/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.4.19",
+  "version": "2.4.20",
   "name": "@pothos-examples/envelope-helix-fastify",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/graphql-shield/CHANGELOG.md b/examples/graphql-shield/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pothos-examples/graphql-shield
 
+## 2.2.20
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+
 ## 2.2.19
 
 ### Patch Changes

diff --git a/examples/graphql-shield/package.json b/examples/graphql-shield/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.2.19",
+  "version": "2.2.20",
   "name": "@pothos-examples/graphql-shield",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/helix/CHANGELOG.md b/examples/helix/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pothos-examples/helix
 
+## 2.4.20
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+
 ## 2.4.19
 
 ### Patch Changes

diff --git a/examples/helix/package.json b/examples/helix/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.4.19",
+  "version": "2.4.20",
   "name": "@pothos-examples/helix",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/nextjs/CHANGELOG.md b/examples/nextjs/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pothos-examples/nextjs
 
+## 2.6.3
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+
 ## 2.6.2
 
 ### Patch Changes

diff --git a/examples/nextjs/package.json b/examples/nextjs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pothos-examples/nextjs",
-  "version": "2.6.2",
+  "version": "2.6.3",
   "private": true,
   "scripts": {
     "generate": "graphql-codegen",

diff --git a/examples/open-telemetry/CHANGELOG.md b/examples/open-telemetry/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @pothos-examples/open-telemetry
 
+## 1.2.20
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+  - @pothos/plugin-tracing@0.5.7
+  - @pothos/tracing-opentelemetry@0.6.8
+
 ## 1.2.19
 
 ### Patch Changes

diff --git a/examples/open-telemetry/package.json b/examples/open-telemetry/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pothos-examples/open-telemetry",
-  "version": "1.2.19",
+  "version": "1.2.20",
   "main": "index.js",
   "license": "MIT",
   "dependencies": {

diff --git a/examples/prisma-federation/CHANGELOG.md b/examples/prisma-federation/CHANGELOG.md
@@ -1,5 +1,15 @@
 # @pothos-examples/relay
 
+## 2.7.4
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+  - @pothos/plugin-directives@3.9.2
+  - @pothos/plugin-federation@3.9.1
+  - @pothos/plugin-prisma@3.41.0
+
 ## 2.7.3
 
 ### Patch Changes

diff --git a/examples/prisma-federation/package.json b/examples/prisma-federation/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.7.3",
+  "version": "2.7.4",
   "name": "@pothos-examples/prisma-federation",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/prisma-relay/CHANGELOG.md b/examples/prisma-relay/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @pothos-examples/prisma-relay
 
+## 2.7.26
+
+### Patch Changes
+
+- Updated dependencies [d60cb49e]
+  - @pothos/plugin-relay@3.36.0
+  - @pothos/plugin-prisma@3.41.0
+
 ## 2.7.25
 
 ### Patch Changes

diff --git a/examples/prisma-relay/package.json b/examples/prisma-relay/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.7.25",
+  "version": "2.7.26",
   "name": "@pothos-examples/prisma-relay",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/prisma-smart-subscriptions-apollo/CHANGELOG.md b/examples/prisma-smart-subscriptions-apollo/CHANGELOG.md
@@ -1,5 +1,14 @@
 # @pothos-examples/prisma-smart-subscriptions-apollo
 
+## 2.5.3
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+  - @pothos/plugin-prisma@3.41.0
+  - @pothos/plugin-smart-subscriptions@3.7.0
+
 ## 2.5.2
 
 ### Patch Changes

diff --git a/examples/prisma-smart-subscriptions-apollo/package.json b/examples/prisma-smart-subscriptions-apollo/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.5.2",
+  "version": "2.5.3",
   "name": "@pothos-examples/prisma-smart-subscriptions-apollo",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/prisma-subscriptions/CHANGELOG.md b/examples/prisma-subscriptions/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @pothos-examples/prisma-subscriptions
 
+## 2.4.25
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+  - @pothos/plugin-prisma@3.41.0
+
 ## 2.4.24
 
 ### Patch Changes

diff --git a/examples/prisma-subscriptions/package.json b/examples/prisma-subscriptions/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.4.24",
+  "version": "2.4.25",
   "name": "@pothos-examples/prisma-subscriptions",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/prisma/CHANGELOG.md b/examples/prisma/CHANGELOG.md
@@ -1,5 +1,13 @@
 # @pothos-examples/relay
 
+## 2.4.25
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+  - @pothos/plugin-prisma@3.41.0
+
 ## 2.4.24
 
 ### Patch Changes

diff --git a/examples/prisma/package.json b/examples/prisma/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.4.24",
+  "version": "2.4.25",
   "name": "@pothos-examples/prisma",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/relay-windowed-pagination/CHANGELOG.md b/examples/relay-windowed-pagination/CHANGELOG.md
@@ -1,5 +1,20 @@
 # @pothos-examples/prisma-relay
 
+## 2.7.26
+
+### Patch Changes
+
+- Updated dependencies [d60cb49e]
+  - @pothos/plugin-relay@3.36.0
+
+## 2.7.25
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+  - @pothos/plugin-relay@3.35.0
+
 ## 2.7.24
 
 ### Patch Changes

diff --git a/examples/relay-windowed-pagination/package.json b/examples/relay-windowed-pagination/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.7.24",
+  "version": "2.7.26",
   "name": "@pothos-examples/relay-windowed-pagination",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/simple-classes/CHANGELOG.md b/examples/simple-classes/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pothos-examples/simple-classes
 
+## 2.4.20
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+
 ## 2.4.19
 
 ### Patch Changes

diff --git a/examples/simple-classes/package.json b/examples/simple-classes/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.4.19",
+  "version": "2.4.20",
   "name": "@pothos-examples/simple-classes",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/examples/simple-interfaces/CHANGELOG.md b/examples/simple-interfaces/CHANGELOG.md
@@ -1,5 +1,12 @@
 # @pothos-examples/simple-interfaces
 
+## 2.4.20
+
+### Patch Changes
+
+- Updated dependencies [42bf6190]
+  - @pothos/core@3.27.0
+
 ## 2.4.19
 
 ### Patch Changes

diff --git a/examples/simple-interfaces/package.json b/examples/simple-interfaces/package.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://json.schemastore.org/package.json",
-  "version": "2.4.19",
+  "version": "2.4.20",
   "name": "@pothos-examples/simple-interfaces",
   "main": "src/index.ts",
   "types": "src/index.ts",

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Change Log
 
+## 3.27.0
+
+### Minor Changes
+
+- 42bf6190: Allow unionType to receive types as a thunk
+
 ## 3.26.0
 
 ### Minor Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@pothos/core",
-  "version": "3.26.0",
+  "version": "3.27.0",
   "description": "Pothos (formerly GiraphQL) is a plugin based schema builder for creating code-first GraphQL schemas in typescript",
   "main": "./lib/index.js",
   "types": "./dts/index.d.ts",

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;
   }