Merge branch 'master' into master

thebigredgeek · Jun 6, 2018 · 6428799 · 6428799
2 parents 5b877aa + f0a1267
commit 6428799
Show file tree

Hide file tree

Showing 20 changed files with 22 additions and 204 deletions.
diff --git a/dist/context.d.ts b/dist/context.d.ts
diff --git a/dist/context.js b/dist/context.js
diff --git a/dist/context.js.map b/dist/context.js.map
diff --git a/dist/helper.d.ts b/dist/helper.d.ts
diff --git a/dist/helper.js b/dist/helper.js
diff --git a/dist/helper.js.map b/dist/helper.js.map
diff --git a/dist/index.d.ts b/dist/index.d.ts
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/promise.d.ts b/dist/promise.d.ts
diff --git a/dist/promise.js b/dist/promise.js
diff --git a/dist/promise.js.map b/dist/promise.js.map
diff --git a/dist/resolver.d.ts b/dist/resolver.d.ts
diff --git a/dist/resolver.js b/dist/resolver.js
diff --git a/dist/resolver.js.map b/dist/resolver.js.map
diff --git a/dist/util.d.ts b/dist/util.d.ts
diff --git a/dist/util.js b/dist/util.js
diff --git a/dist/util.js.map b/dist/util.js.map
diff --git a/src/resolver.ts b/src/resolver.ts
@@ -1,10 +1,28 @@
 import { getPromise } from './promise';
 import { isFunction, Promisify, isNotNullOrUndefined } from './util';
 
+const Promise = getPromise();
 
-export const createResolver = (resFn, errFn) => {
+export interface ResultFunction<ResulType> {
+  (root, args, context, info): Promise<ResulType> | ResulType | void
+}
+
+export interface ErrorFunction<ErrorType> {
+  (root, args, context, err): ErrorType | void
+}
+
+export interface CreateResolverFunction {
+  <R, E>(resFn: ResultFunction<R>, errFn?: ErrorFunction<E>): Resolver<R>
+}
+
+export interface Resolver<ResulType> {
+  (root, args: {}, context: {}, info: {}): Promise<ResulType>
+  createResolver?: CreateResolverFunction
+}
+
+export const createResolver: CreateResolverFunction = <R, E>(resFn: ResultFunction<R>, errFn: ErrorFunction<E>) => {
   const Promise = getPromise();
-  const baseResolver = (root, args = {}, context = {}, info = {}) => {
+  const baseResolver: Resolver<R> = (root, args = {}, context = {}, info = {}) => {
     // Return resolving promise with `null` if the resolver function param is not a function
     if (!isFunction(resFn)) return Promise.resolve(null);
     return Promisify(resFn)(root, args, context, info).catch(e => {
@@ -20,7 +38,7 @@ export const createResolver = (resFn, errFn) => {
       });
     });
   };
-  baseResolver['createResolver'] = (cResFn, cErrFn) => {
+  baseResolver.createResolver = (cResFn, cErrFn) => {
     const Promise = getPromise();
 
     const childResFn = (root, args, context, info = {}) => {

diff --git a/src/util.ts b/src/util.ts
@@ -1,6 +1,6 @@
 import { getPromise } from './promise';
 
-export const isFunction = fn => typeof fn === 'function';
+export const isFunction = fn => typeof fn === 'function' || fn instanceof Function;
 
 export const Promisify = fn => {
   const Promise = getPromise();