@rxdi/graphql 0.7.186 → 0.7.187

package/dist/config.tokens.d.ts

@@ -1,11 +1,10 @@
 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/hapi';
 import { RenderPageOptions } from 'graphql-playground-html';
 export interface HapiOptionsFunction {
-    (req?: Request): GraphQLOptions | Promise<GraphQLOptions>;
+    (req?: Request): any | Promise<any>;
 }
 export interface HapiGraphiQLOptionsFunction {
     (req?: Request): GraphiQL.GraphiQLData | Promise<GraphiQL.GraphiQLData>;
@@ -32,7 +31,7 @@ export interface GRAPHQL_PLUGIN_CONFIG {
     route?: {
         cors?: boolean;
     };
-    graphqlOptions?: GraphQLOptions;
+    graphqlOptions?: any;
     graphiqlOptions?: GraphiQL.GraphiQLData;
     graphiqlPlaygroundConfig?: RenderPageOptions;
 }

package/dist/services/apollo.service.js

@@ -25,11 +25,11 @@ exports.ApolloService = void 0;
 const core_1 = require("@rxdi/core");
 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");
 const config_tokens_1 = require("../config.tokens");
 const bootstrap_service_1 = require("../services/bootstrap.service");
 const hooks_service_1 = require("./hooks.service");
+const graphql_1 = require("graphql");
 let ApolloService = class ApolloService {
     constructor(server, config, bootstrapService, hookService) {
         this.server = server;
@@ -152,14 +152,11 @@ let ApolloService = class ApolloService {
                 this.isInitQuery = false;
             }
             this.config.graphqlOptions.context = Object.assign(Object.assign({}, this.config.graphqlOptions.context), context);
-            const { graphqlResponse, responseInit } = yield (0, apollo_server_core_1.runHttpQuery)([request, h], {
-                method: request.method.toUpperCase(),
-                options: this.config.graphqlOptions,
-                query: request.method === 'post'
-                    ? // TODO type payload as string or Record
-                        request.payload
-                    : request.query,
-                request: (0, apollo_server_core_1.convertNodeHttpToRequest)(request.raw.req),
+            const graphqlResponse = yield (0, graphql_1.graphql)({
+                schema: this.config.graphqlOptions.schema,
+                source: request.method === 'post' ? request.payload['query'] : request.query,
+                variableValues: request.payload['variables'],
+                contextValue: this.config.graphqlOptions.context,
             });
             const response = h.response(graphqlResponse);
             response.type('application/json');

package/dist/services/hooks.service.js

@@ -28,7 +28,7 @@ const config_tokens_1 = require("../config.tokens");
 const bootstrap_service_1 = require("./bootstrap.service");
 const effect_service_1 = require("./effect.service");
 const rxjs_1 = require("rxjs");
-const fs_extra_1 = require("fs-extra");
+const fs_1 = require("fs");
 let HookService = class HookService {
     constructor(config, effectService, logger) {
         this.config = config;
@@ -65,8 +65,8 @@ export type EffectTypes = keyof typeof EffectTypes;
 `;
         try {
             const folder = process.env.INTROSPECTION_FOLDER || `./src/app/core/api-introspection/`;
-            (0, fs_extra_1.ensureDirSync)(folder);
-            (0, fs_extra_1.writeFileSync)(folder + 'EffectTypes.ts', types, 'utf8');
+            (0, fs_1.mkdirSync)(folder, { recursive: true });
+            (0, fs_1.writeFileSync)(folder + 'EffectTypes.ts', types, 'utf8');
         }
         catch (e) {
             console.error(e, 'Effects are not saved to directory');

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

@@ -60,9 +60,7 @@ export declare const setConfigGraphql: (config?: GRAPHQL_PLUGIN_CONFIG) => {
     route?: {
         cors?: boolean;
     };
-    graphqlOptions: import("apollo-server-core").GraphQLOptions<Record<string, any>, any> | {
-        schema: any;
-    };
+    graphqlOptions: any;
     graphiqlOptions: import("apollo-server-module-graphiql").GraphiQLData | {
         endpointURL: string;
         subscriptionsEndpoint: string;
@@ -75,5 +73,5 @@ export declare const setConfigGraphql: (config?: GRAPHQL_PLUGIN_CONFIG) => {
 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>;
+export declare const getGraphqlSchema: () => import("rxjs").Observable<any>;
 export declare const sendRequest: <T = {}>(request: SendRequestQueryType, url?: string) => PromiseLike<import("../../plugin-init").Response<T>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rxdi/graphql",
-  "version": "0.7.186",
+  "version": "0.7.187",
   "repository": {
     "type": "git",
     "url": "https://github.com/rxdi/graphql"
@@ -32,16 +32,14 @@
   "dependencies": {
     "@gapi/playground": "^1.8.146",
     "apollo-errors": "1.9.0",
-    "apollo-server-core": "2.12.0",
     "apollo-server-module-graphiql": "1.4.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.185",
-    "@rxdi/hapi": "^0.7.185",
+    "@rxdi/core": "^0.7.186",
+    "@rxdi/hapi": "^0.7.186",
     "@types/graphql": "^14.5.0",
     "@types/jest": "^24.0.22",
     "@types/node": "^12.0.10",