@rxdi/graphql 0.7.182 → 0.7.184

package/dist/config.tokens.d.ts

@@ -32,7 +32,7 @@ export interface GRAPHQL_PLUGIN_CONFIG {
     route?: {
         cors?: boolean;
     };
-    graphqlOptions?: GraphQLOptions;
+    graphqlOptions?: Omit<GraphQLOptions, 'schemaHash'>;
     graphiqlOptions?: GraphiQL.GraphiQLData;
     graphiqlPlaygroundConfig?: RenderPageOptions;
 }

package/dist/services/apollo.service.js

@@ -23,7 +23,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApolloService = void 0;
 const core_1 = require("@rxdi/core");
-const Boom = require("@hapi/boom");
+const boom_1 = require("@hapi/boom");
 const hapi_1 = require("@hapi/hapi");
 const apollo_server_core_1 = require("apollo-server-core");
 const hapi_2 = require("@rxdi/hapi");
@@ -43,19 +43,18 @@ let ApolloService = class ApolloService {
             }
             catch (e) { }
             if (onRequest) {
-                return yield onRequest(context => this.makeGQLRequest(request, response, error, context), request, response, error);
+                return yield onRequest((context) => this.makeGQLRequest(request, response, error, context), request, response, error);
             }
-            this.config.graphqlOptions.context =
-                this.config.graphqlOptions.context || {};
+            this.config.graphqlOptions.context = this.config.graphqlOptions.context || {};
             if (request.headers.authorization &&
                 request.headers.authorization !== 'undefined' &&
                 this.config.authentication) {
                 try {
-                    const serviceUtilsService = core_1.Container.get((this.config.authentication));
+                    const serviceUtilsService = core_1.Container.get(this.config.authentication);
                     this.config.graphqlOptions.context['user'] = yield serviceUtilsService.validateToken(request.headers.authorization);
                 }
                 catch (e) {
-                    return Boom.unauthorized();
+                    return (0, boom_1.unauthorized)();
                 }
             }
             else {
@@ -75,7 +74,7 @@ let ApolloService = class ApolloService {
                     console.error(error);
                 }
                 if ('HttpQueryError' !== error.name) {
-                    throw Boom.boomify(error);
+                    throw (0, boom_1.boomify)(error);
                 }
                 if (error &&
                     error.message.constructor === String &&
@@ -89,9 +88,9 @@ let ApolloService = class ApolloService {
                     response.type('application/json');
                     return response;
                 }
-                const err = new Boom(error.message, { statusCode: error.statusCode });
+                const err = new boom_1.Boom(error.message, { statusCode: error.statusCode });
                 if (error.headers) {
-                    Object.keys(error.headers).forEach(header => (err.output.headers[header] = error.headers[header]));
+                    Object.keys(error.headers).forEach((header) => (err.output.headers[header] = error.headers[header]));
                 }
                 // Boom hides the error when status code is 500
                 err.output.payload.message = error.message;
@@ -133,14 +132,14 @@ let ApolloService = class ApolloService {
             this.hookService.AttachHooks([
                 this.config.graphqlOptions.schema.getQueryType(),
                 this.config.graphqlOptions.schema.getMutationType(),
-                this.config.graphqlOptions.schema.getSubscriptionType()
+                this.config.graphqlOptions.schema.getSubscriptionType(),
             ]);
             this.server.route({
                 method: ['GET', 'POST'],
                 path: this.config.path || '/graphql',
                 vhost: this.config.vhost,
                 config: this.config.route || {},
-                handler: this.handler
+                handler: this.handler,
             });
         });
     }
@@ -160,7 +159,7 @@ let ApolloService = class ApolloService {
                     ? // TODO type payload as string or Record
                         request.payload
                     : request.query,
-                request: (0, apollo_server_core_1.convertNodeHttpToRequest)(request.raw.req)
+                request: (0, apollo_server_core_1.convertNodeHttpToRequest)(request.raw.req),
             });
             const response = h.response(graphqlResponse);
             response.type('application/json');

package/dist/test/helpers/core-module.d.ts

@@ -1,6 +1,5 @@
 import { GRAPHQL_PLUGIN_CONFIG } from '../../config.tokens';
 import { HapiConfigModel } from '@rxdi/hapi';
-import { ConfigModel } from '@rxdi/core';
 import { SendRequestQueryType } from '../../plugin-init';
 import { Server } from '@hapi/hapi';
 export interface CoreModuleConfig {
@@ -61,7 +60,7 @@ export declare const setConfigGraphql: (config?: GRAPHQL_PLUGIN_CONFIG) => {
     route?: {
         cors?: boolean;
     };
-    graphqlOptions: import("apollo-server-core").GraphQLOptions<Record<string, any>, any> | {
+    graphqlOptions: Omit<import("apollo-server-core").GraphQLOptions<Record<string, any>, any>, "schemaHash"> | {
         schema: any;
     };
     graphiqlOptions: import("apollo-server-module-graphiql").GraphiQLData | {
@@ -73,7 +72,7 @@ export declare const setConfigGraphql: (config?: GRAPHQL_PLUGIN_CONFIG) => {
     };
     graphiqlPlaygroundConfig?: import("graphql-playground-html").RenderPageOptions;
 };
-export declare const startServer: (config?: CoreModuleConfig, bootstrapOptions?: ConfigModel) => import("rxjs").Observable<import("@rxdi/core/dist/container/observable-interface").ObservableContainer>;
+export declare const startServer: any;
 export declare const stopServer: () => never;
 export declare const getServer: () => import("rxjs").Observable<Server<import("@hapi/hapi").ServerApplicationState>>;
 export declare const getGraphqlSchema: () => import("rxjs").Observable<import("graphql").GraphQLSchema>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdi/graphql",
-  "version": "0.7.182",
+  "version": "0.7.184",
   "repository": {
     "type": "git",
     "url": "https://github.com/rxdi/graphql"
@@ -32,7 +32,7 @@
   "dependencies": {
     "@gapi/playground": "^1.8.146",
     "apollo-errors": "1.9.0",
-    "apollo-server-core": "2.12.0",
+    "apollo-server-core": "3.13.0",
     "apollo-server-module-graphiql": "1.4.0",
     "@hapi/boom": "^10.0.1",
     "fs-extra": "7.0.1",
@@ -40,8 +40,8 @@
   },
   "devDependencies": {
     "graphql": "^14.5.8",
-    "@rxdi/core": "^0.7.181",
-    "@rxdi/hapi": "^0.7.181",
+    "@rxdi/core": "^0.7.183",
+    "@rxdi/hapi": "^0.7.183",
     "@types/graphql": "^14.5.0",
     "@types/jest": "^24.0.22",
     "@types/node": "^12.0.10",