Merge branch 'master' of github.com:mercurius-js/mercurius

.github/workflows/ci.yml

@@ -10,7 +10,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3.5.1
+        uses: actions/setup-node@v3.6.0
         with:
           node-version: ${{ matrix.node-version }}
       - name: Install Dependencies

docs/integrations/nestjs.md

@@ -2,7 +2,7 @@
 
 NestJS offers Fastify and Mercurius support out of the box. It also supports both schema and code-first approaches to development. We'll be covering the code-first approach, as it is used more commonly.
 
-> **Note**: Support for NestJS can be found at their [Discord server](https://discord.gg/ErA7cNkK). 
+> **Note**: Support for NestJS can be found at their [Discord server](https://discord.com/invite/G7Qnnhy). 
 
 ## Installation
 
@@ -224,6 +224,6 @@ This is just a short and rough example of how to get going with NestJS and Mercu
 
 If you'd like to continue with Nest and Mercurius and learn more about Nest, please do read the [documention on the NestJS website](https://docs.nestjs.com/). The two make a really great combination in terms of developer experience.
 
-Should you need any help with Nest, they have a [great support community](https://discord.gg/ErA7cNkK). Please go there for support with NestJS questions or issues. 
+Should you need any help with Nest, they have a [great support community](https://discord.com/invite/G7Qnnhy). Please go there for support with NestJS questions or issues. 
 
 

index.js

@@ -271,6 +271,10 @@ const plugin = fp(async function (app, opts) {
               ...fields[prop],
               ...resolver[prop]
             }
+          } else if (prop === '__resolveReference') {
+            // TODO Investigate a way to remove this requirement
+            // Required to integrate the gateway
+            type.resolveReference = resolver[prop]
           } else if (fields[prop]) {
             fields[prop].resolve = resolver[prop]
           } else {

package.json

@@ -61,7 +61,7 @@
     "@fastify/websocket": "^7.0.0",
     "fastify-plugin": "^4.2.0",
     "graphql": "^16.0.0",
-    "graphql-jit": "^0.7.3",
+    "graphql-jit": "^0.8.0",
     "mqemitter": "^5.0.0",
     "p-map": "^4.0.0",
     "readable-stream": "^4.0.0",

test/app-decorator.js

@@ -1407,3 +1407,30 @@ test('support ast input on external requests', async (t) => {
     }
   })
 })
+
+test('defineResolvers should support __resolveReference', async (t) => {
+  const app = Fastify()
+  const schema = `
+    type Query {
+      me: User
+    }
+    type User {
+      id: String
+    }
+  `
+  const resolvers = {
+    User: {
+      __resolveReference: async () => ({ id: 1 })
+    }
+  }
+
+  app.register(GQL, { schema })
+
+  app.register(async function (app) {
+    app.graphql.defineResolvers(resolvers)
+    t.pass('No errors occurred')
+  })
+
+  // needed so that graphql is defined
+  await app.ready()
+})