fix d.ts

Author: icebob

index.d.ts

@@ -12,7 +12,7 @@ import {
 } from "@apollo/server";
 import { ServerOptions as WsServerOptions } from "graphql-ws";
 
-export interface GraphQLActionOptions {
+interface GraphQLActionOptions {
 	query?: string | string[];
 	mutation?: string | string[];
 	subscription?: string | string[];
@@ -27,37 +27,6 @@ export interface GraphQLActionOptions {
 	dataLoaderBatchParam?: string;
 }
 
-export interface ActionResolverSchema {
-	action: string;
-	rootParams?: {
-		[key: string]: string;
-	};
-	dataLoader?: boolean;
-	nullIfError?: boolean;
-	skipNullKeys?: boolean;
-	params?: { [key: string]: any };
-}
-
-export interface ServiceResolverSchema {
-	[key: string]:
-		| {
-				[key: string]: ActionResolverSchema;
-			}
-		| GraphQLScalarType;
-}
-
-export interface ServiceGraphQLSettings {
-	query?: string | string[];
-	mutation?: string | string[];
-	subscription?: string | string[];
-	type?: string | string[];
-	interface?: string | string[];
-	union?: string | string[];
-	enum?: string | string[];
-	input?: string | string[];
-	resolvers?: ServiceResolverSchema;
-}
-
 declare module "moleculer-apollo-server" {
 	export { GraphQLError } from "graphql";
 
@@ -77,6 +46,37 @@ declare module "moleculer-apollo-server" {
 		): (req: IncomingRequest, res: GatewayResponse) => Promise<void>;
 	}
 
+	export interface ActionResolverSchema {
+		action: string;
+		rootParams?: {
+			[key: string]: string;
+		};
+		dataLoader?: boolean;
+		nullIfError?: boolean;
+		skipNullKeys?: boolean;
+		params?: { [key: string]: any };
+	}
+
+	export interface ServiceResolverSchema {
+		[key: string]:
+			| {
+					[key: string]: ActionResolverSchema;
+			  }
+			| GraphQLScalarType;
+	}
+
+	export interface ServiceGraphQLSettings {
+		query?: string | string[];
+		mutation?: string | string[];
+		subscription?: string | string[];
+		type?: string | string[];
+		interface?: string | string[];
+		union?: string | string[];
+		enum?: string | string[];
+		input?: string | string[];
+		resolvers?: ServiceResolverSchema;
+	}
+
 	export interface ApolloMixinOptions {
 		serverOptions?: BaseApolloServerOptions<BaseContext> & {
 			subscriptions?: boolean | WsServerOptions;
@@ -146,6 +146,10 @@ declare module "moleculer-apollo-server" {
 		wsServer?: WebSocketServer;
 	}
 
+	export interface ApolloServiceSettings {
+		graphql?: ServiceGraphQLSettings;
+	}
+
 	export function ApolloService(options: ApolloMixinOptions): ServiceSchema;
 
 	export function moleculerGql(
@@ -158,8 +162,4 @@ declare module "moleculer" {
 	interface ActionSchema {
 		graphql?: GraphQLActionOptions;
 	}
-
-	interface ServiceSettingSchema {
-		graphql?: ServiceGraphQLSettings;
-	}
 }