refactor: migrate code to [email protected]

BREAKING CHANGE: required [email protected]

Author: nodkz

README.md

@@ -407,7 +407,7 @@ This library provides some amount of ready resolvers for fetch and update data w
 The prototype of before save hook:
 
 ```js
-(doc: mixed, rp: ExtendedResolveParams) => Promise<*>,
+(doc: mixed, rp: ResolverResolveParams) => Promise<*>,
 ```
 
 The typical implementation may be like this:

src/composeWithMongoose.js

@@ -123,7 +123,7 @@ export function composeWithMongoose<TSource, TContext>(
   const name: string = (opts && opts.name) || m.modelName;
 
   const sc = opts.schemaComposer || globalSchemaComposer;
-  sc.set('MongoID', MongoID);
+  sc.add(MongoID);
   const tc = convertModelToGraphQL((m: any), name, sc);
 
   if (opts.description) {
@@ -185,7 +185,7 @@ export function prepareInputFields(
     inputTypeComposer.removeField(inputFieldsOpts.remove);
   }
   if (inputFieldsOpts.required) {
-    inputTypeComposer.makeRequired(inputFieldsOpts.required);
+    inputTypeComposer.makeFieldNonNull(inputFieldsOpts.required);
   }
 }
 

src/fieldsConverter.d.ts

@@ -2,7 +2,7 @@ import {
   EnumTypeComposer,
   SchemaComposer,
   ObjectTypeComposer,
-  ComposeOutputType,
+  ComposeOutputTypeDefinition,
 } from 'graphql-compose';
 import { GraphQLScalarType } from 'graphql-compose/lib/graphql';
 import { Model, Schema } from 'mongoose';
@@ -51,7 +51,7 @@ export function convertFieldToGraphQL(
   field: MongooseFieldT,
   prefix: string | undefined,
   schemaComposer: SchemaComposer<any>,
-): ComposeOutputType<any, any>;
+): ComposeOutputTypeDefinition<any>;
 
 export function deriveComplexType(
   field: MongooseFieldT,
@@ -63,7 +63,7 @@ export function arrayToGraphQL(
   field: MongooseFieldT,
   prefix: string | undefined,
   schemaComposer: SchemaComposer<any>,
-): ComposeOutputType<any, any>;
+): ComposeOutputTypeDefinition<any>;
 
 export function embeddedToGraphQL(
   field: MongooseFieldT,

src/fieldsConverter.js

@@ -8,7 +8,7 @@ import type {
   SchemaComposer,
   ObjectTypeComposer,
   EnumTypeComposer,
-  ComposeOutputType,
+  ComposeOutputTypeDefinition,
 } from 'graphql-compose';
 import { upperFirst } from 'graphql-compose';
 import type { GraphQLScalarType } from 'graphql-compose/lib/graphql';
@@ -190,9 +190,9 @@ export function convertFieldToGraphQL(
   field: MongooseFieldT,
   prefix?: string = '',
   schemaComposer: SchemaComposer<any>
-): ComposeOutputType<any, any> {
+): ComposeOutputTypeDefinition<any> {
   if (!schemaComposer.has('MongoID')) {
-    schemaComposer.set('MongoID', GraphQLMongoID);
+    schemaComposer.add(GraphQLMongoID);
   }
 
   const complexType = deriveComplexType(field);
@@ -276,7 +276,7 @@ export function arrayToGraphQL(
   field: MongooseFieldT,
   prefix?: string = '',
   schemaComposer: SchemaComposer<any>
-): ComposeOutputType<any, any> {
+): ComposeOutputTypeDefinition<any> {
   if (!field || !field.caster) {
     throw new Error(
       'You provide incorrect mongoose field to `arrayToGraphQL()`. ' +
@@ -286,7 +286,7 @@ export function arrayToGraphQL(
 
   const unwrappedField = { ...field.caster };
 
-  const outputType = convertFieldToGraphQL(unwrappedField, prefix, schemaComposer);
+  const outputType: any = convertFieldToGraphQL(unwrappedField, prefix, schemaComposer);
   return [outputType];
 }
 

src/resolvers/createMany.js

@@ -1,7 +1,6 @@
 /* @flow */
 
 import type { ObjectTypeComposer, Resolver } from 'graphql-compose';
-import { graphql } from 'graphql-compose';
 import type { MongooseModel, MongooseDocument } from 'mongoose';
 import { recordHelperArgs } from './helpers';
 import type { ExtendedResolveParams, GenResolverOpts } from './index';
@@ -56,7 +55,7 @@ export default function createMany<TSource: MongooseDocument, TContext>(
         description: 'Created document ID',
       },
       records: {
-        type: new graphql.GraphQLNonNull(tc.getTypePlural()),
+        type: tc.getTypePlural().getTypeNonNull(),
         description: 'Created documents',
       },
       createCount: {
@@ -73,17 +72,15 @@ export default function createMany<TSource: MongooseDocument, TContext>(
     type: outputType,
     args: {
       records: {
-        type: new graphql.GraphQLNonNull(
-          new graphql.GraphQLList(
-            (recordHelperArgs(tc, {
-              recordTypeName: `CreateMany${tc.getTypeName()}Input`,
-              removeFields: ['id', '_id'],
-              isRequired: true,
-              requiredFields,
-              ...(opts && opts.records),
-            }).record: any).type
-          )
-        ),
+        type: (recordHelperArgs(tc, {
+          recordTypeName: `CreateMany${tc.getTypeName()}Input`,
+          removeFields: ['id', '_id'],
+          isRequired: true,
+          requiredFields,
+          ...(opts && opts.records),
+        }).record: any).type
+          .getTypePlural()
+          .getTypeNonNull(),
       },
     },
     resolve: async (resolveParams: ExtendedResolveParams) => {

src/resolvers/findById.js

@@ -19,7 +19,7 @@ export default function findById<TSource: MongooseDocument, TContext>(
   }
 
   return tc.schemaComposer.createResolver({
-    type: tc.getType(),
+    type: tc,
     name: 'findById',
     kind: 'query',
     args: {

src/resolvers/findOne.js

@@ -28,7 +28,7 @@ export default function findOne<TSource: MongooseDocument, TContext>(
   }
 
   return tc.schemaComposer.createResolver({
-    type: tc.getType(),
+    type: tc,
     name: 'findOne',
     kind: 'query',
     args: {

src/resolvers/helpers/filter.d.ts

@@ -1,4 +1,7 @@
-import { ComposeFieldConfigArgumentMap, ObjectTypeComposer } from 'graphql-compose';
+import {
+  ObjectTypeComposerArgumentConfigMapDefinition,
+  ObjectTypeComposer,
+} from 'graphql-compose';
 import { Model } from 'mongoose';
 import { MongoId } from '../../types/mongoid';
 import { ExtendedResolveParams } from '../index';
@@ -29,6 +32,6 @@ export function filterHelperArgs(
   typeComposer: ObjectTypeComposer<any>,
   model: Model<any>,
   opts?: FilterHelperArgsOpts,
-): ComposeFieldConfigArgumentMap;
+): ObjectTypeComposerArgumentConfigMapDefinition;
 
 export function filterHelper(resolveParams: ExtendedResolveParams): void;

src/resolvers/helpers/filter.js

@@ -1,7 +1,10 @@
 /* @flow */
 /* eslint-disable no-use-before-define */
 
-import type { ObjectTypeComposer, ComposeFieldConfigArgumentMap } from 'graphql-compose';
+import {
+  ObjectTypeComposer,
+  type ObjectTypeComposerArgumentConfigMapDefinition,
+} from 'graphql-compose';
 import type { MongooseModel } from 'mongoose';
 import GraphQLMongoID from '../../types/mongoid';
 import { isObject, toMongoFilterDottedObject, getIndexedFieldNamesForGraphQL } from '../../utils';
@@ -35,8 +38,8 @@ export const filterHelperArgs = (
   typeComposer: ObjectTypeComposer<any, any>,
   model: MongooseModel,
   opts?: FilterHelperArgsOpts
-): ComposeFieldConfigArgumentMap<> => {
-  if (!typeComposer || typeComposer.constructor.name !== 'ObjectTypeComposer') {
+): ObjectTypeComposerArgumentConfigMapDefinition<> => {
+  if (!(typeComposer instanceof ObjectTypeComposer)) {
     throw new Error('First arg for filterHelperArgs() should be instance of ObjectTypeComposer.');
   }
 
@@ -69,7 +72,7 @@ export const filterHelperArgs = (
   const filterTypeName: string = opts.filterTypeName;
   const itc = typeComposer.getInputTypeComposer().clone(filterTypeName);
 
-  itc.makeOptional('_id');
+  itc.makeFieldNullable('_id');
 
   itc.addFields({
     _ids: [GraphQLMongoID],
@@ -78,7 +81,7 @@ export const filterHelperArgs = (
   itc.removeField(removeFields);
 
   if (opts.requiredFields) {
-    itc.makeRequired(opts.requiredFields);
+    itc.makeFieldNonNull(opts.requiredFields);
   }
 
   if (itc.getFieldNames().length === 0) {
@@ -89,7 +92,7 @@ export const filterHelperArgs = (
 
   return {
     filter: {
-      type: opts.isRequired ? itc.getTypeNonNull() : itc.getType(),
+      type: opts.isRequired ? itc.getTypeNonNull() : itc,
       description: opts.onlyIndexed ? 'Filter only by indexed fields' : 'Filter by fields',
     },
   };

src/resolvers/helpers/limit.d.ts

@@ -1,4 +1,4 @@
-import { ComposeFieldConfigArgumentMap } from 'graphql-compose';
+import { ObjectTypeComposerArgumentConfigMapDefinition } from 'graphql-compose';
 import { ExtendedResolveParams } from '../index';
 
 export type LimitHelperArgsOpts = {
@@ -13,6 +13,6 @@ export function getLimitHelperArgsOptsMap(): Partial<
 
 export function limitHelperArgs(
   opts?: LimitHelperArgsOpts,
-): ComposeFieldConfigArgumentMap;
+): ObjectTypeComposerArgumentConfigMapDefinition;
 
 export function limitHelper(resolveParams: ExtendedResolveParams): void;