合并master

.travis.yml

@@ -2,7 +2,7 @@ sudo: false
 language: node_js
 node_js:
   - '8'
-  - '10'
+  - '9'
 install:
   - npm i npminstall && npminstall
 script:

README.md

@@ -69,7 +69,7 @@ exports.graphql = {
 };
 
 // 添加中间件拦截请求
-exports.middleware = [ 'graphql' ];
+exports.middleware = ['graphql'];
 ```
 
 ## 使用方式
@@ -90,7 +90,7 @@ exports.middleware = [ 'graphql' ];
 │   │   │   └── schemaDirective.js  // 自定义 SchemaDirective
 │   │   │ 
 │   │   └── user  // 一个graphql模型
-│   │       ├── connector.js  
+│   │       ├── connector.js
 │   │       ├── resolver.js
 │   │       └── schema.graphql
 │   ├── model
@@ -103,6 +103,8 @@ exports.middleware = [ 'graphql' ];
 
 ## 增加了 schemaDireactives 的支持
 
+支持如上约定的目录结构，以及文件名作为指令名的方式.
+
 ## 参考文章
 
 - [graphql 官网](http://facebook.github.io/graphql)

appveyor.yml

@@ -1,7 +1,7 @@
 environment:
   matrix:
     - nodejs_version: '8'
-    - nodejs_version: '10'
+    - nodejs_version: '9'
 
 install:
   - ps: Install-Product node $env:nodejs_version

lib/loader/graphql-loader.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { join, dirname } = require('path');
-const { merge } = require('lodash');
+const { merge, isFunction } = require('lodash');
 const is = require('is-type-of');
 const {
   makeExecutableSchema,
@@ -65,21 +65,27 @@ module.exports = app => {
           const pathName = opt.pathName.split('.').pop();
           // 加载resolver
           if (pathName === 'resolver') {
+            if (isFunction(obj)) {
+              obj = obj(this.app);
+            }
             merge(resolvers, obj);
           }
-          // 加载schemaDirective
+          // load schemaDirective
           if (is.class(obj)) {
             const proto = Object.getPrototypeOf(obj);
             if (proto === SchemaDirectiveVisitor) {
               const name = opt.pathName.split('.').pop();
               schemaDirectives[name] = obj;
             }
           }
-          // 加载directiveResolver
+          if (pathName === 'schemaDirective') {
+            merge(schemaDirectives, obj);
+          }
+          // load directiveResolver
           if (pathName === 'directive') {
             merge(directiveResolvers, obj);
           }
-          // 加载connector
+          // load connector
           if (pathName === 'connector') {
             // 获取文件目录名
             const type = dirname(opt.path)

test/app/service/graphql.test.js

@@ -49,6 +49,7 @@ describe('test/plugin.test.js', () => {
     );
     assert.deepEqual(resp.data, { user: { upperName: 'NAME1' } });
   });
+
   it('should return createAt with @date directive', async () => {
     const ctx = app.mockContext();
     const resp = await ctx.service.graphql.query(

test/fixtures/apps/graphql-app/app/graphql/project/schema.graphql

@@ -1,4 +1,3 @@
-
 type Project {
   name: String!
 }

test/fixtures/apps/graphql-app/app/graphql/user/connector.js

@@ -16,18 +16,19 @@ class UserConnector {
         name: `name${id}`,
         upperName: `name${id}`,
         password: `password${id}`,
+        lowerName: `NAME${id}`,
         createAt: 1528375304600,
         projects: [],
       }))
     );
   }
 
-  fetchByIds(ids) {
+  async fetchByIds(ids) {
     return this.loader.loadMany(ids);
   }
 
-  fetchById(id) {
-    return this.loader.load(id);
+  async fetchById(id) {
+    return await this.loader.load(id);
   }
 }