From a16d3a59b8554c2333f68a81c1e3f0d50223e4b6 Mon Sep 17 00:00:00 2001 From: Matic Zavadlal Date: Sun, 22 Apr 2018 19:59:08 +0200 Subject: [PATCH] fix(types): Export IMiddleware, language in README and code --- README.md | 8 ++++---- src/index.ts | 6 ++++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 9c1b4067..2518481a 100644 --- a/README.md +++ b/README.md @@ -26,13 +26,13 @@ yarn add graphql-middleware ```ts import { applyMiddleware } from 'graphql-middleware' import { makeExecutableSchema } from 'graphql-tools' -import { authMiddleware, metricsMiddleware } from './middlewares' +import { authMiddleware, metricsMiddleware } from './middleware' // Minimal example middleware (before & after) const beepMiddleware = { Query: { hello: async (resolve, parent, args, context, info) => { - // You can you middlewares to override arguments + // You can you middleware to override arguments const argsWithDefault = { name: 'Bob', ...args } const result = await resolve(parent, argsWithDefault, context, info) // Or change the returned values of resolvers @@ -68,7 +68,7 @@ const schemaWithMiddleware = applyMiddleware( ```ts import { GraphQLServer } from 'graphql-yoga' -import { authMiddleware, metricsMiddleware } from './middlewares' +import { authMiddleware, metricsMiddleware } from './middleware' const typeDefs = ` type Query { @@ -117,7 +117,7 @@ type IMiddleware = IMiddlewareFunction | IMiddlewareTypeMap function applyMiddleware( schema: GraphQLSchema, - ...middlewares: IMiddleware[] + ...middleware: IMiddleware[] ): GraphQLSchema ``` diff --git a/src/index.ts b/src/index.ts index be4ad48f..256f183e 100644 --- a/src/index.ts +++ b/src/index.ts @@ -19,6 +19,8 @@ import { IMiddlewareFieldMap, } from './types' +export { IMiddleware } + // Type checks function isMiddlewareFunction(obj: any): boolean { @@ -162,9 +164,9 @@ function addMiddlewareToSchema( export function applyMiddleware( schema: GraphQLSchema, - ...middlewares: IMiddleware[] + ...middleware: IMiddleware[] ): GraphQLSchema { - const schemaWithMiddleware = middlewares.reduce( + const schemaWithMiddleware = middleware.reduce( (currentSchema, middleware) => addMiddlewareToSchema(currentSchema, middleware), schema,