refactor: rewrite code according to a new features of graphql-compose@3

- add support for `schemaComposer`
- rewrite resolvers on async/await syntax
- bunch of code/tests cleanups
- add `node8` and `es` build for modern environments (use native
async/await)

BREAKING CHANGE: works only with `graphql-compose` v3
BREAKING CHANGE: `removeById` will not throw error if record not found
BREAKING CHANGE: drop node v4 support

Author: nodkz

.babelrc

@@ -2,13 +2,44 @@
   "plugins": [
     "transform-object-rest-spread",
     "transform-flow-strip-types",
-    ["transform-runtime", { "polyfill": false }]
-  ],
-  "presets": [
-    ["env", {
-      "targets": {
-        "node": 4
-      },
-    }]
   ],
+  "env": {
+    "lib": {
+      "plugins": [
+        ["transform-runtime", { "polyfill": false }]
+      ],
+      "presets": [
+        ["env", {
+          "targets": {
+            "node": 6
+          },
+        }]
+      ]
+    },
+    "es": {
+    },
+    "node8": {
+      "plugins": [
+        ["transform-runtime", { "polyfill": false }]
+      ],
+      "presets": [
+        ["env", {
+          "targets": {
+            "node": "8.0.0"
+          },
+          "loose": true,
+          "modules": "commonjs"
+        }]
+      ]
+    },
+    "test": {
+      "presets": [
+        ["env", {
+          "targets": {
+            "node": "current"
+          },
+        }]
+      ]
+    }
+  }
 }

.eslintignore

@@ -1,2 +1,4 @@
 lib/*
+es/*
+node8/*
 flow-typed

.gitignore

@@ -41,6 +41,7 @@ node_modules
 # Transpiled code
 /es
 /lib
+/node8
 
 coverage
 .nyc_output

README.md

@@ -23,6 +23,19 @@ If you want to add additional resolvers [`connection`](https://github.com/nodkz/
 npm install graphql-compose-connection graphql-compose-pagination --save
 ```
 
+#### Different builds
+This library contains different builds for any purposes:
+```js
+// Default import for using under node v6 and above
+import { composeWithMongoose } from 'graphql-compose-mongoose';
+
+// For using node 8 and above (native async/await)
+import { composeWithMongoose } from 'graphql-compose-mongoose/node8';
+
+// Source code without Flowtype declarations
+import { composeWithMongoose } from 'graphql-compose-mongoose/es';
+```
+
 Example
 =======
 Live demo: [https://graphql-compose.herokuapp.com/](https://graphql-compose.herokuapp.com/)
@@ -31,7 +44,7 @@ Source code: https://github.com/nodkz/graphql-compose-mongoose-example
 
 ```js
 import mongoose from 'mongoose';
-import composeWithMongoose from 'graphql-compose-mongoose';
+import { composeWithMongoose } from 'graphql-compose-mongoose';
 import { GQC } from 'graphql-compose';
 
 // STEP 1: DEFINE MONGOOSE SCHEMA AND MODEL

package.json

@@ -31,7 +31,7 @@
     "graphql-compose-pagination": ">=1.1.5"
   },
   "peerDependencies": {
-    "graphql-compose": ">=2.9.0 || >=3.0.0",
+    "graphql-compose": ">=3.0.2",
     "mongoose": ">=4.0.0 || >=5.0.0"
   },
   "devDependencies": {
@@ -47,17 +47,17 @@
     "eslint": "^4.17.0",
     "eslint-config-airbnb-base": "^12.1.0",
     "eslint-config-prettier": "^2.9.0",
-    "eslint-plugin-flowtype": "^2.43.0",
+    "eslint-plugin-flowtype": "^2.44.0",
     "eslint-plugin-import": "^2.8.0",
     "eslint-plugin-prettier": "^2.6.0",
     "flow-bin": "^0.65.0",
     "graphql": "0.13.0",
-    "graphql-compose": "^3.0.0-beta.5",
+    "graphql-compose": "^3.0.2",
     "graphql-compose-connection": ">=2.5.7",
     "graphql-compose-pagination": ">=1.1.5",
-    "jest": "^22.2.2",
+    "jest": "^22.3.0",
     "mongodb-memory-server": "^1.6.5",
-    "mongoose": "^5.0.4",
+    "mongoose": "^5.0.5",
     "prettier": "^1.10.2",
     "request": "^2.83.0",
     "rimraf": "^2.6.2",
@@ -74,9 +74,11 @@
     ]
   },
   "scripts": {
-    "build": "npm run build-cjs && npm run build-flow",
-    "build-cjs": "rimraf lib && babel src --ignore __tests__,__mocks__ -d lib",
-    "build-flow": "find ./src -name '*.js' -not -path '*/__*' | while read filepath; do cp $filepath `echo $filepath | sed 's/\\/src\\//\\/lib\\//g'`.flow; done",
+    "build": "npm run build-lib && npm run build-es && npm run build-node8",
+    "build-lib": "rimraf lib && BABEL_ENV=lib babel src --ignore __tests__,__mocks__ -d lib && COPY_TO_FOLDER=lib npm run build-flow",
+    "build-es": "rimraf es && BABEL_ENV=es babel src --ignore __tests__,__mocks__ -d es && COPY_TO_FOLDER=es npm run build-flow",
+    "build-node8": "rimraf node8 && BABEL_ENV=node8 babel src --ignore __tests__,__mocks__ -d node8 && COPY_TO_FOLDER=node8 npm run build-flow",
+    "build-flow": "echo `$1` && find ./src -name '*.js' -not -path '*/__*' | while read filepath; do cp $filepath `echo ./${COPY_TO_FOLDER:-lib}$filepath | sed 's/.\\/src\\//\\//g'`.flow; done",
     "watch": "jest --watch",
     "coverage": "jest --coverage --maxWorkers 2",
     "lint": "eslint --ext .js ./src",

src/__mocks__/languageSchema.js

@@ -1,5 +1,6 @@
 /* @flow */
 
+import { schemaComposer } from 'graphql-compose';
 import { Schema } from './mongooseCommon';
 import { convertSchemaToGraphQL } from '../fieldsConverter';
 
@@ -34,4 +35,4 @@ export default LanguageSchema;
 
 // Such way we can set Type name for Schema which is used in another schema.
 // Otherwise by default it will have name `${ParentSchemaName}${ParentSchemaFieldName}`
-convertSchemaToGraphQL(LanguageSchema, 'Language');
+convertSchemaToGraphQL(LanguageSchema, 'Language', schemaComposer);

src/__tests__/composeWithMongoose-test.js

@@ -2,23 +2,22 @@
 /* eslint-disable no-unused-expressions */
 
 import mongoose from 'mongoose';
-import { TypeComposer, InputTypeComposer } from 'graphql-compose';
+import { TypeComposer, InputTypeComposer, schemaComposer } from 'graphql-compose';
 import { GraphQLNonNull } from 'graphql-compose/lib/graphql';
 import { UserModel } from '../__mocks__/userModel';
 import { composeWithMongoose } from '../composeWithMongoose';
-import typeStorage from '../typeStorage';
 import GraphQLMongoID from '../types/mongoid';
 
 beforeAll(() => UserModel.base.connect());
 afterAll(() => UserModel.base.disconnect());
 
 describe('composeWithMongoose ->', () => {
   beforeEach(() => {
-    typeStorage.clear();
+    schemaComposer.clear();
     UserModel.schema._gqcTypeComposer = undefined;
   });
 
-  describe('MongooseModeloTypeComposer()', () => {
+  describe('MongooseModelToTypeComposer()', () => {
     describe('basics', () => {
       it('should return TypeComposer', () => {
         expect(composeWithMongoose(UserModel)).toBeInstanceOf(TypeComposer);