@nestjs/apollo 13.2.5 → 13.3.0

package/dist/drivers/apollo-base.driver.d.ts

@@ -14,6 +14,7 @@ export declare abstract class ApolloBaseDriver<T extends Record<string, any> = A
     protected registerFastify(options: T, { preStartHook }?: {
         preStartHook?: () => void;
     }): Promise<void>;
+    private createPreserveHttpStatusPlugin;
     private wrapFormatErrorFn;
     private createTransformHttpErrorFn;
     private wrapContextResolver;

package/dist/drivers/apollo-base.driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apollo-base.driver.d.ts","sourceRoot":"","sources":["../../lib/drivers/apollo-base.driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAWhE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAKxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAUnD,8BAAsB,gBAAgB,CACpC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAClD,SAAQ,qBAAqB,CAAC,CAAC,CAAC;IAChC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;IAElD,IAAI,QAAQ,IAAI,YAAY,CAAC,WAAW,CAAC,CAExC;IAEY,KAAK,CAAC,aAAa,EAAE,CAAC;IAa5B,IAAI;IAIE,mBAAmB,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAsDjD,sBAAsB,CAC3B,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,CACR,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,GAAG,EACd,OAAO,EAAE,GAAG,KACT,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,EAC/B,sBAAsB,EAAE,QAAQ,IAExB,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAC3C,GAAG,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,CAAC,KAC/C,GAAG;cAMQ,eAAe,CAC7B,OAAO,EAAE,CAAC,EACV,EAAE,YAAY,EAAE,GAAE;QAAE,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;KAAO;cAmDtC,eAAe,CAC7B,OAAO,EAAE,CAAC,EACV,EAAE,YAAY,EAAE,GAAE;QAAE,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;KAAO;IAuCtD,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,0BAA0B;IA0ClC,OAAO,CAAC,mBAAmB;IA8B3B,OAAO,CAAC,iBAAiB;CAgB1B"}
+{"version":3,"file":"apollo-base.driver.d.ts","sourceRoot":"","sources":["../../lib/drivers/apollo-base.driver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,KAAK,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAWhE,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AAKxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,eAAe,CAAC;AAUnD,8BAAsB,gBAAgB,CACpC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,kBAAkB,CAClD,SAAQ,qBAAqB,CAAC,CAAC,CAAC;IAChC,SAAS,CAAC,YAAY,EAAE,YAAY,CAAC,WAAW,CAAC,CAAC;IAElD,IAAI,QAAQ,IAAI,YAAY,CAAC,WAAW,CAAC,CAExC;IAEY,KAAK,CAAC,aAAa,EAAE,CAAC;IAa5B,IAAI;IAIE,mBAAmB,CAAC,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IA+DjD,sBAAsB,CAC3B,WAAW,EAAE,OAAO,EACpB,QAAQ,EAAE,CACR,OAAO,EAAE,GAAG,EACZ,SAAS,EAAE,GAAG,EACd,OAAO,EAAE,GAAG,KACT,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,EAC/B,sBAAsB,EAAE,QAAQ,IAExB,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAC3C,GAAG,MAAM,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,CAAC,KAC/C,GAAG;cAMQ,eAAe,CAC7B,OAAO,EAAE,CAAC,EACV,EAAE,YAAY,EAAE,GAAE;QAAE,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;KAAO;cAmDtC,eAAe,CAC7B,OAAO,EAAE,CAAC,EACV,EAAE,YAAY,EAAE,GAAE;QAAE,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;KAAO;IAuCtD,OAAO,CAAC,8BAA8B;IA4BtC,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,0BAA0B;IA0ClC,OAAO,CAAC,mBAAmB;IA8B3B,OAAO,CAAC,iBAAiB;CAgB1B"}

package/dist/drivers/apollo-base.driver.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApolloBaseDriver = void 0;
+const tslib_1 = require("tslib");
 const server_1 = require("@apollo/server");
 const server_plugin_landing_page_graphql_playground_1 = require("@apollo/server-plugin-landing-page-graphql-playground");
 const errors_1 = require("@apollo/server/errors");
@@ -11,7 +12,7 @@ const load_package_util_1 = require("@nestjs/common/utils/load-package.util");
 const shared_utils_1 = require("@nestjs/common/utils/shared.utils");
 const graphql_1 = require("@nestjs/graphql");
 const graphql_2 = require("graphql");
-const omit = require("lodash.omit");
+const lodash_omit_1 = tslib_1.__importDefault(require("lodash.omit"));
 const graphiql_playground_plugin_1 = require("../graphiql/graphiql-playground.plugin");
 const async_iterator_util_1 = require("../utils/async-iterator.util");
 const apolloPredefinedExceptions = {
@@ -73,14 +74,20 @@ class ApolloBaseDriver extends graphql_1.AbstractGraphQLDriver {
                 plugins: [(0, disabled_1.ApolloServerPluginLandingPageDisabled)()],
             };
         }
-        options = await super.mergeDefaultOptions(options, omit(defaults, 'plugins'));
+        options = await super.mergeDefaultOptions(options, (0, lodash_omit_1.default)(defaults, 'plugins'));
         options.plugins = (options.plugins || []).concat(defaults.plugins || []);
         this.wrapContextResolver(options);
         this.wrapFormatErrorFn(options);
+        if (options.autoTransformHttpErrors !== false) {
+            options.plugins = [
+                ...(options.plugins || []),
+                this.createPreserveHttpStatusPlugin(),
+            ];
+        }
         return options;
     }
     subscriptionWithFilter(instanceRef, filterFn, createSubscribeContext) {
-        return (...args) => (0, async_iterator_util_1.createAsyncIterator)(createSubscribeContext()(...args), (payload) => filterFn.call(instanceRef, payload, ...args.slice(1)));
+        return (...args) => (0, async_iterator_util_1.createAsyncIterator)(createSubscribeContext()(...args), (payload) => filterFn.call(instanceRef, payload, args[1], args[2]));
     }
     async registerExpress(options, { preStartHook } = {}) {
         const { expressMiddleware } = (0, load_package_util_1.loadPackage)('@as-integrations/express5', 'GraphQLModule', () => require('@as-integrations/express5'));
@@ -141,6 +148,31 @@ class ApolloBaseDriver extends graphql_1.AbstractGraphQLDriver {
         });
         this.apolloServer = server;
     }
+    createPreserveHttpStatusPlugin() {
+        // When a resolver throws an error whose `extensions.http.status` is set
+        // (either directly via GraphQLError or transitively via NestJS HTTP
+        // exceptions in user code), Apollo Server uses that value as the HTTP
+        // response status. Some GraphQL clients/UIs then refuse to parse the
+        // response as a normal `{ data, errors }` payload and instead wrap it as
+        // a transport-level error. Reset the HTTP status to 200 once execution
+        // has run so the response shape stays stable. Request-level failures
+        // (parse, validate) are unaffected because their body has no `data` key.
+        // @see https://github.com/nestjs/graphql/issues/2940
+        return {
+            async requestDidStart() {
+                return {
+                    async willSendResponse(requestContext) {
+                        const body = requestContext.response?.body;
+                        if (body?.kind === 'single' &&
+                            'data' in (body.singleResult ?? {}) &&
+                            requestContext.response?.http) {
+                            requestContext.response.http.status = 200;
+                        }
+                    },
+                };
+            },
+        };
+    }
     wrapFormatErrorFn(options) {
         if (options.autoTransformHttpErrors === false) {
             return;

package/dist/drivers/apollo-gateway.driver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"apollo-gateway.driver.d.ts","sourceRoot":"","sources":["../../lib/drivers/apollo-gateway.driver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;GAEG;AACH,qBACa,mBAAoB,SAAQ,gBAAgB,CAAC,yBAAyB,CAAC;IAClF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;gBAEpD,gBAAgB,EAAE,gBAAgB;IAKjC,KAAK,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAoBxD,mBAAmB,CAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAOxB,cAAc,CAAC,CAAC,EAAE,yBAAyB;CAGnD"}
+{"version":3,"file":"apollo-gateway.driver.d.ts","sourceRoot":"","sources":["../../lib/drivers/apollo-gateway.driver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEhD,OAAO,EAAE,yBAAyB,EAAE,MAAM,eAAe,CAAC;AAE1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD;;GAEG;AACH,qBACa,mBAAoB,SAAQ,gBAAgB,CAAC,yBAAyB,CAAC;IAClF,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAyB;gBAEpD,gBAAgB,EAAE,gBAAgB;IAKjC,KAAK,CAAC,OAAO,EAAE,yBAAyB,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBxD,mBAAmB,CAC9B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAOxB,cAAc,CAAC,CAAC,EAAE,yBAAyB;CAGnD"}

package/dist/drivers/apollo-gateway.driver.js

@@ -17,6 +17,7 @@ let ApolloGatewayDriver = class ApolloGatewayDriver extends apollo_base_driver_1
         this.pluginsExplorerService = new plugins_explorer_service_1.PluginsExplorerService(modulesContainer);
     }
     async start(options) {
+        options.server ??= {};
         options.server.plugins = (0, graphql_1.extend)(options.server.plugins || [], this.pluginsExplorerService.explore(options));
         const { ApolloGateway } = (0, load_package_util_1.loadPackage)('@apollo/gateway', 'ApolloGateway', () => require('@apollo/gateway'));
         const { server: serverOpts = {}, gateway: gatewayOpts = {} } = options;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nestjs/apollo",
-  "version": "13.2.5",
+  "version": "13.3.0",
   "description": "Nest - modern, fast, powerful node.js web framework (@apollo)",
   "author": "Kamil Mysliwiec",
   "license": "MIT",
@@ -15,8 +15,8 @@
     "url": "git+https://github.com/nestjs/graphql.git"
   },
   "scripts": {
-    "test:e2e": "jest --config ./tests/jest-e2e.ts --runInBand",
-    "test:e2e:dev": "jest --config ./tests/jest-e2e.ts --runInBand --watch"
+    "test:e2e": "vitest run",
+    "test:e2e:dev": "vitest watch"
   },
   "bugs": {
     "url": "https://github.com/nestjs/graphql/issues"
@@ -28,11 +28,11 @@
     "@apollo/subgraph": "2.11.2",
     "@as-integrations/express5": "^1.1.2",
     "@as-integrations/fastify": "3.1.0",
-    "@nestjs/common": "11.1.18",
-    "@nestjs/core": "11.1.18",
-    "@nestjs/platform-express": "11.1.18",
-    "@nestjs/platform-fastify": "11.1.18",
-    "@nestjs/testing": "11.1.18",
+    "@nestjs/common": "11.1.19",
+    "@nestjs/core": "11.1.19",
+    "@nestjs/platform-express": "11.1.19",
+    "@nestjs/platform-fastify": "11.1.19",
+    "@nestjs/testing": "11.1.19",
     "apollo-cache-inmemory": "1.6.6",
     "apollo-client": "2.6.10",
     "apollo-link-ws": "1.0.20"
@@ -67,5 +67,5 @@
       "optional": true
     }
   },
-  "gitHead": "1421cc43aa53ae61c38f8353b654be657a1dfb3b"
+  "gitHead": "e1e841c4e0ac5592291ed9b146170d500a8270ff"
 }