chore: remove leftovers, integrate graph serializer

Author: kamilmysliwiec

packages/graphql/lib/interfaces/gql-entrypoint-metadata.interface.ts

@@ -0,0 +1,4 @@
+export interface GqlEntrypointMetadata {
+  key: string;
+  parentType: string;
+}

packages/graphql/lib/services/resolvers-explorer.service.ts

@@ -2,22 +2,23 @@ import { Inject, Injectable, Logger } from '@nestjs/common';
 import { isUndefined } from '@nestjs/common/utils/shared.utils';
 import {
   ContextIdFactory,
-  createContextId,
   MetadataScanner,
   ModuleRef,
   ModulesContainer,
   REQUEST,
 } from '@nestjs/core';
 import { ExternalContextCreator } from '@nestjs/core/helpers/external-context-creator';
 import { ParamMetadata } from '@nestjs/core/helpers/interfaces/params-metadata.interface';
-import { Injector } from '@nestjs/core/injector/injector';
 import { CONTROLLER_ID_KEY } from '@nestjs/core/injector/constants';
+import { Injector } from '@nestjs/core/injector/injector';
 import {
   ContextId,
   InstanceWrapper,
 } from '@nestjs/core/injector/instance-wrapper';
 import { InternalCoreModule } from '@nestjs/core/injector/internal-core-module';
 import { Module } from '@nestjs/core/injector/module';
+import { Entrypoint } from '@nestjs/core/inspector/interfaces/entrypoint.interface';
+import { SerializedGraph } from '@nestjs/core/inspector/serialized-graph';
 import { REQUEST_CONTEXT_ID } from '@nestjs/core/router/request/request-constants';
 import { GraphQLResolveInfo } from 'graphql';
 import { head, identity } from 'lodash';
@@ -35,21 +36,13 @@ import {
   SUBSCRIPTION_TYPE,
 } from '../graphql.constants';
 import { GqlModuleOptions } from '../interfaces';
+import { GqlEntrypointMetadata } from '../interfaces/gql-entrypoint-metadata.interface';
 import { ResolverMetadata } from '../interfaces/resolver-metadata.interface';
-import { getNumberOfArguments } from '../utils';
 import { decorateFieldResolverWithMiddleware } from '../utils/decorate-field-resolver.util';
 import { extractMetadata } from '../utils/extract-metadata.util';
 import { BaseExplorerService } from './base-explorer.service';
 import { GqlContextType } from './gql-execution-context';
 
-// TODO remove in the next version (backward-compatibility layer)
-// "ContextIdFactory.getByRequest.length" returns an incorrent number
-// as parameters with default values do not count in.
-// @ref https://github.com/nestjs/graphql/pull/2214
-const getByRequestNumberOfArguments = getNumberOfArguments(
-  ContextIdFactory.getByRequest,
-);
-
 @Injectable()
 export class ResolversExplorerService extends BaseExplorerService {
   private readonly logger = new Logger(ResolversExplorerService.name);
@@ -63,6 +56,7 @@ export class ResolversExplorerService extends BaseExplorerService {
     @Inject(GRAPHQL_MODULE_OPTIONS)
     private readonly gqlOptions: GqlModuleOptions,
     private readonly moduleRef: ModuleRef,
+    private readonly serializedGraph: SerializedGraph,
   ) {
     super();
   }
@@ -113,6 +107,20 @@ export class ResolversExplorerService extends BaseExplorerService {
       .map((resolver) => {
         this.assignResolverConstructorUniqueId(instance.constructor, moduleRef);
 
+        const entrypointDefinition: Entrypoint<GqlEntrypointMetadata> = {
+          id: `${wrapper.id}_${resolver.methodName}`,
+          type: 'graphql-entrypoint',
+          methodName: resolver.methodName,
+          className: wrapper.name,
+          classNodeId: wrapper.id,
+          metadata: {
+            key: resolver.name,
+            parentType: resolver.type,
+          },
+        };
+
+        this.serializedGraph.insertEntrypoint(entrypointDefinition, wrapper.id);
+
         const createContext = (transform?: Function) =>
           this.createContextCallback(
             instance,
@@ -305,10 +313,7 @@ export class ResolversExplorerService extends BaseExplorerService {
     }
     const wrapper = coreModuleRef.getProviderByKey(REQUEST);
     wrapper.setInstanceByContextId(contextId, {
-      // TODO: remove "as any" in the next major release (backward compatibility)
-      instance: (contextId as any).getParent
-        ? (contextId as any).payload
-        : request,
+      instance: contextId.getParent ? contextId.payload : request,
       isResolved: true,
     });
   }
@@ -346,42 +351,16 @@ export class ResolversExplorerService extends BaseExplorerService {
   }
 
   private getContextId(gqlContext: Record<string | symbol, any>): ContextId {
-    if (getByRequestNumberOfArguments === 2) {
-      const contextId = ContextIdFactory.getByRequest(gqlContext, ['req']);
-      if (!gqlContext[REQUEST_CONTEXT_ID as any]) {
-        Object.defineProperty(gqlContext, REQUEST_CONTEXT_ID, {
-          value: contextId,
-          enumerable: false,
-          configurable: false,
-          writable: false,
-        });
-      }
-      return contextId;
-    } else {
-      // TODO remove in the next version (backward-compatibility layer)
-      // Left for backward compatibility purposes
-      let contextId: ContextId;
-
-      if (gqlContext && gqlContext[REQUEST_CONTEXT_ID]) {
-        contextId = gqlContext[REQUEST_CONTEXT_ID];
-      } else if (
-        gqlContext &&
-        gqlContext.req &&
-        gqlContext.req[REQUEST_CONTEXT_ID]
-      ) {
-        contextId = gqlContext.req[REQUEST_CONTEXT_ID];
-      } else {
-        contextId = createContextId();
-        Object.defineProperty(gqlContext, REQUEST_CONTEXT_ID, {
-          value: contextId,
-          enumerable: false,
-          configurable: false,
-          writable: false,
-        });
-      }
-
-      return contextId;
+    const contextId = ContextIdFactory.getByRequest(gqlContext, ['req']);
+    if (!gqlContext[REQUEST_CONTEXT_ID as any]) {
+      Object.defineProperty(gqlContext, REQUEST_CONTEXT_ID, {
+        value: contextId,
+        enumerable: false,
+        configurable: false,
+        writable: false,
+      });
     }
+    return contextId;
   }
 
   private assignResolverConstructorUniqueId(

packages/graphql/package.json

@@ -35,17 +35,17 @@
   },
   "devDependencies": {
     "@apollo/subgraph": "2.0.0",
-    "@nestjs/common": "9.2.1",
-    "@nestjs/core": "9.2.1",
+    "@nestjs/common": "9.3.5",
+    "@nestjs/core": "9.3.5",
     "@nestjs/testing": "8.4.7",
     "graphql": "16.6.0",
     "reflect-metadata": "0.1.13",
     "ts-morph": "17.0.1"
   },
   "peerDependencies": {
     "@apollo/subgraph": "^2.0.0",
-    "@nestjs/common": "^9.2.1",
-    "@nestjs/core": "^9.2.1",
+    "@nestjs/common": "^9.3.5",
+    "@nestjs/core": "^9.3.5",
     "class-transformer": "*",
     "class-validator": "*",
     "graphql": "^16.6.0",

packages/mercurius/package.json

@@ -29,8 +29,8 @@
   "devDependencies": {
     "@mercuriusjs/gateway": "^1.0.0",
     "@mercuriusjs/federation": "^1.0.0",
-    "@nestjs/common": "9.2.1",
-    "@nestjs/platform-fastify": "9.2.1",
+    "@nestjs/common": "9.3.5",
+    "@nestjs/platform-fastify": "9.3.5",
     "@nestjs/testing": "8.4.7",
     "fastify": "4.12.0",
     "mercurius": "12.0.0",
@@ -40,7 +40,7 @@
     "@apollo/subgraph": "^2.0.0",
     "@mercuriusjs/gateway": "^1.0.0",
     "@mercuriusjs/federation": "^1.0.0",
-    "@nestjs/common": "^9.2.1",
+    "@nestjs/common": "^9.3.5",
     "@nestjs/graphql": "^10.1.7",
     "fastify": "^4.12.0",
     "graphql": "^16.0.0",