@rxdi/graphql 0.7.171 → 0.7.172

package/dist/config.tokens.d.ts

@@ -2,7 +2,7 @@ import { InjectionToken } from '@rxdi/core';
 import * as GraphiQL from 'apollo-server-module-graphiql';
 import { GraphQLOptions } from 'apollo-server-core';
 import { GraphQLSchema, GraphQLField, GraphQLDirective } from 'graphql';
-import { Server, ResponseToolkit } from 'hapi';
+import { Server, ResponseToolkit } from '@hapi/hapi';
 import { RenderPageOptions } from 'graphql-playground-html';
 export interface HapiOptionsFunction {
     (req?: Request): GraphQLOptions | Promise<GraphQLOptions>;

package/dist/decorators/query/query.decorator.d.ts

@@ -19,4 +19,4 @@ export declare class GenericGapiResolversType implements GraphQLControllerOption
         };
     };
 }
-export declare function Query<T>(options?: any): (t: any, propKey: string, descriptor: TypedPropertyDescriptor<any>) => TypedPropertyDescriptor<any>;
+export declare function Query<T>(options?: any): (t: any, propKey: any, descriptor: TypedPropertyDescriptor<any>) => TypedPropertyDescriptor<any>;

package/dist/plugin-init.d.ts

@@ -1,5 +1,5 @@
 import { PluginInterface, AfterStarterService } from '@rxdi/core';
-import { Server } from 'hapi';
+import { Server } from '@hapi/hapi';
 import { GRAPHQL_PLUGIN_CONFIG } from './config.tokens';
 export interface Response<T> {
     raw: string;

package/dist/plugin-init.js

@@ -25,7 +25,7 @@ exports.PluginInit = void 0;
 const core_1 = require("@rxdi/core");
 const graphql_tester_1 = require("graphql-tester");
 const hapi_1 = require("@rxdi/hapi");
-const hapi_2 = require("hapi");
+const hapi_2 = require("@hapi/hapi");
 const operators_1 = require("rxjs/operators");
 const config_tokens_1 = require("./config.tokens");
 let PluginInit = class PluginInit {

package/dist/services/apollo.service.d.ts

@@ -1,5 +1,5 @@
 import { PluginInterface } from '@rxdi/core';
-import { Server, Request, ResponseToolkit } from 'hapi';
+import { Server, Request, ResponseToolkit } from '@hapi/hapi';
 import { GRAPHQL_PLUGIN_CONFIG } from '../config.tokens';
 import { BootstrapService } from '../services/bootstrap.service';
 import { HookService } from './hooks.service';
@@ -14,6 +14,6 @@ export declare class ApolloService implements PluginInterface {
     init(): void;
     register(): Promise<void>;
     defaultOrNew: (request: Request, response: ResponseToolkit, error: Error) => Promise<any>;
-    makeGQLRequest(request: Request, h: ResponseToolkit, err?: Error, context?: {}): Promise<import("hapi").ResponseObject>;
+    makeGQLRequest(request: Request, h: ResponseToolkit, err?: Error, context?: {}): Promise<import("@hapi/hapi").ResponseObject>;
     handler: (request: Request, h: ResponseToolkit, err?: Error) => Promise<any>;
 }

package/dist/services/apollo.service.js

@@ -24,7 +24,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ApolloService = void 0;
 const core_1 = require("@rxdi/core");
 const Boom = require("boom");
-const hapi_1 = require("hapi");
+const hapi_1 = require("@hapi/hapi");
 const apollo_server_core_1 = require("apollo-server-core");
 const hapi_2 = require("@rxdi/hapi");
 const config_tokens_1 = require("../config.tokens");
@@ -52,14 +52,14 @@ let ApolloService = class ApolloService {
                 this.config.authentication) {
                 try {
                     const serviceUtilsService = core_1.Container.get((this.config.authentication));
-                    this.config.graphqlOptions.context.user = yield serviceUtilsService.validateToken(request.headers.authorization);
+                    this.config.graphqlOptions.context['user'] = yield serviceUtilsService.validateToken(request.headers.authorization);
                 }
                 catch (e) {
                     return Boom.unauthorized();
                 }
             }
             else {
-                this.config.graphqlOptions.context.user = null;
+                this.config.graphqlOptions.context['user'] = null;
             }
             return this.makeGQLRequest(request, response, error, this.config.graphqlOptions.context);
         });

package/dist/services/error.service.d.ts

@@ -1,5 +1,5 @@
 import * as formatError from 'apollo-errors';
-import * as boom from 'boom';
+import * as boom from '@hapi/boom';
 export interface ServerErrors {
     name: any;
     data: {

package/dist/services/error.service.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.errorUnauthorized = exports.createError = exports.Boom = exports.clientErrors = exports.attachErrorHandlers = void 0;
 const formatError = require("apollo-errors");
-const boom = require("boom");
+const boom = require("@hapi/boom");
 exports.attachErrorHandlers = formatError.formatError;
 exports.clientErrors = formatError;
 exports.Boom = boom;

package/dist/services/graphiql.service.d.ts

@@ -1,11 +1,11 @@
 import { PluginInterface } from '@rxdi/core';
 import { GRAPHQL_PLUGIN_CONFIG } from '../config.tokens';
-import { Request, Server, ResponseToolkit } from 'hapi';
+import { Request, Server, ResponseToolkit } from '@hapi/hapi';
 export declare class GraphiQLService implements PluginInterface {
     private server;
     private config;
     constructor(server: Server, config: GRAPHQL_PLUGIN_CONFIG);
     OnInit(): void;
     register(): Promise<void>;
-    handler: (request: Request, h: ResponseToolkit, err?: Error) => Promise<import("hapi").ResponseObject>;
+    handler: (request: Request, h: ResponseToolkit, err?: Error) => Promise<import("@hapi/hapi").ResponseObject>;
 }

package/dist/services/graphiql.service.js

@@ -25,7 +25,7 @@ exports.GraphiQLService = void 0;
 const core_1 = require("@rxdi/core");
 const hapi_1 = require("@rxdi/hapi");
 const config_tokens_1 = require("../config.tokens");
-const hapi_2 = require("hapi");
+const hapi_2 = require("@hapi/hapi");
 const GraphiQL = require("apollo-server-module-graphiql");
 let GraphiQLService = class GraphiQLService {
     constructor(server, config) {

package/dist/services/server-push.service.d.ts

@@ -2,7 +2,7 @@
 import { PluginInterface, ExitHandlerService, AfterStarterService } from '@rxdi/core';
 import { GRAPHQL_PLUGIN_CONFIG } from '../config.tokens';
 import { Server, IncomingMessage, ServerResponse } from 'http';
-import { Server as HapiServer } from 'hapi';
+import { Server as HapiServer } from '@hapi/hapi';
 import { Subject, Observable } from 'rxjs';
 import { StartService } from './start.service';
 export declare class ServerPushPlugin implements PluginInterface {

package/dist/services/server-push.service.js

@@ -25,7 +25,7 @@ exports.ServerPushPlugin = void 0;
 const core_1 = require("@rxdi/core");
 const config_tokens_1 = require("../config.tokens");
 const http_1 = require("http");
-const hapi_1 = require("hapi");
+const hapi_1 = require("@hapi/hapi");
 const hapi_2 = require("@rxdi/hapi");
 const rxjs_1 = require("rxjs");
 const operators_1 = require("rxjs/operators");

package/dist/services/start.service.d.ts

@@ -1,6 +1,6 @@
 import { BootstrapLogger } from '@rxdi/core';
 import { OpenService } from '@rxdi/hapi';
-import { Server } from 'hapi';
+import { Server } from '@hapi/hapi';
 import { GRAPHQL_PLUGIN_CONFIG } from '../config.tokens';
 export declare class StartService {
     private server;

package/dist/services/start.service.js

@@ -15,7 +15,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StartService = void 0;
 const core_1 = require("@rxdi/core");
 const hapi_1 = require("@rxdi/hapi");
-const hapi_2 = require("hapi");
+const hapi_2 = require("@hapi/hapi");
 const config_tokens_1 = require("../config.tokens");
 let StartService = class StartService {
     constructor(server, config, logger, openService) {

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

@@ -2,7 +2,7 @@ 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';
+import { Server } from '@hapi/hapi';
 export interface CoreModuleConfig {
     server?: HapiConfigModel;
     graphql?: GRAPHQL_PLUGIN_CONFIG;
@@ -38,11 +38,11 @@ export declare const DEFAULT_CONFIG: {
 };
 export declare const setConfigServer: (config?: HapiConfigModel) => {
     randomPort: boolean;
-    staticConfig?: import("hapi").ServerRoute | import("hapi").ServerRoute[];
+    staticConfig?: import("@hapi/hapi").ServerRoute<import("@hapi/hapi").ReqRefDefaults> | import("@hapi/hapi").ServerRoute<import("@hapi/hapi").ReqRefDefaults>[];
     hapi: {
         port: number;
-    } | import("hapi").ServerOptions;
-    plugins?: (import("hapi").PluginBase<any> & (import("hapi").PluginNameVersion | import("hapi").PluginPackage))[];
+    } | import("@hapi/hapi").ServerOptions;
+    plugins?: (import("@hapi/hapi").PluginBase<any, any> & (import("@hapi/hapi").PluginNameVersion | import("@hapi/hapi").PluginPackage))[];
 };
 export declare const setConfigGraphql: (config?: GRAPHQL_PLUGIN_CONFIG) => {
     path: string;
@@ -75,6 +75,6 @@ export declare const setConfigGraphql: (config?: GRAPHQL_PLUGIN_CONFIG) => {
 };
 export declare const startServer: (config?: CoreModuleConfig, bootstrapOptions?: ConfigModel) => import("rxjs").Observable<import("@rxdi/core/dist/container/observable-interface").ObservableContainer>;
 export declare const stopServer: () => never;
-export declare const getServer: () => import("rxjs").Observable<Server>;
+export declare const getServer: () => import("rxjs").Observable<Server<import("@hapi/hapi").ServerApplicationState>>;
 export declare const getGraphqlSchema: () => import("rxjs").Observable<import("graphql").GraphQLSchema>;
 export declare const sendRequest: <T = {}>(request: SendRequestQueryType, url?: string) => PromiseLike<import("../../plugin-init").Response<T>>;

package/dist/test/helpers/core-module.js

@@ -56,8 +56,8 @@ const startServer = (config = {}, bootstrapOptions) => {
 };
 exports.startServer = startServer;
 const stopServer = () => {
-    process.exit();
     core_1.Container.get(hapi_1.HAPI_SERVER).stop();
+    process.exit();
 };
 exports.stopServer = stopServer;
 const getServer = () => (0, rxjs_1.of)(core_1.Container.get(hapi_1.HAPI_SERVER));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdi/graphql",
-  "version": "0.7.171",
+  "version": "0.7.172",
   "repository": {
     "type": "git",
     "url": "https://github.com/rxdi/graphql"
@@ -34,16 +34,15 @@
     "apollo-errors": "1.9.0",
     "apollo-server-core": "2.12.0",
     "apollo-server-module-graphiql": "1.4.0",
-    "boom": "^7.3.0",
+    "@hapi/boom": "^10.0.1",
     "fs-extra": "7.0.1",
     "graphql-tester": "0.0.5"
   },
   "devDependencies": {
     "graphql": "^14.5.8",
-    "@rxdi/core": "^0.7.170",
-    "@rxdi/hapi": "^0.7.170",
+    "@rxdi/core": "^0.7.171",
+    "@rxdi/hapi": "^0.7.171",
     "@types/graphql": "^14.5.0",
-    "@types/hapi": "^18.0.4",
     "@types/jest": "^24.0.22",
     "@types/node": "^12.0.10",
     "jest": "^24.8.0",