Merge branch 'master' into mr-feature-composeApi

thebigredgeek · May 16, 2018 · e10d9f5 · e10d9f5
2 parents d9277f6 + 0703f59
commit e10d9f5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -1,11 +1,13 @@
 import { usePromise } from './promise';
-import { combineResolvers } from './helper';
+import { combineResolvers, and, or } from './helper';
 import { createExpressContext } from './context';
 import { createResolver } from './resolver';
 
 export {
   usePromise,
   combineResolvers,
   createExpressContext,
-  createResolver
+  createResolver,
+  and,
+  or
 };
diff --git a/test/unit/index_spec.js b/test/unit/index_spec.js
@@ -1,7 +1,7 @@
 import { expect } from 'chai';
 
 import {
-  combineResolvers
+  combineResolvers, and, or
 } from '../../dist/helper';
 
 import {
@@ -24,7 +24,9 @@ describe('(unit) dist/index.js', () => {
       combineResolvers,
       usePromise,
       createExpressContext,
-      createResolver
+      createResolver,
+      and,
+      or
     });
   })
 })