fix: allow to pass IntefaceTC to resolver generators

nodkz · nodkz · commit e4b916bf4c7a · 2021-07-09T19:52:37.000+06:00
diff --git a/package.json b/package.json
@@ -25,15 +25,15 @@
   "homepage": "https://github.com/graphql-compose/graphql-compose-mongoose",
   "dependencies": {
     "dataloader": "^2.0.0",
-    "graphql-compose-connection": "8.2.0",
-    "graphql-compose-pagination": "8.2.0"
+    "graphql-compose-connection": "8.2.1",
+    "graphql-compose-pagination": "8.2.1"
   },
   "peerDependencies": {
     "graphql-compose": "^7.21.4 || ^8.0.0 || ^9.0.0",
     "mongoose": "^5.0.0 || ^4.4.0"
   },
   "devDependencies": {
-    "@types/jest": "26.0.23",
+    "@types/jest": "26.0.24",
     "@typescript-eslint/eslint-plugin": "4.28.2",
     "@typescript-eslint/parser": "4.28.2",
     "eslint": "7.30.0",
@@ -44,7 +44,7 @@
     "graphql": "15.5.1",
     "graphql-compose": "9.0.1",
     "jest": "27.0.6",
-    "mongodb-memory-server": "7.1.0",
+    "mongodb-memory-server": "7.2.0",
     "mongoose": "5.13.2",
     "prettier": "2.3.2",
     "request": "2.88.2",
diff --git a/src/resolvers/connection.ts b/src/resolvers/connection.ts
@@ -5,7 +5,7 @@ import {
   ConnectionSortMapOpts as _ConnectionSortMapOpts,
   ConnectionTArgs,
 } from 'graphql-compose-connection';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import { CountResolverOpts, count } from './count';
 import { FindManyResolverOpts, findMany } from './findMany';
 import { getUniqueIndexes, extendByReversedIndexes, IndexT } from '../utils/getIndexesFromModel';
@@ -30,7 +30,7 @@ export type ConnectionResolverOpts<TContext = any> = Omit<
 
 export function connection<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: ConnectionResolverOpts<TContext>
 ): Resolver<TSource, TContext, ConnectionTArgs, TDoc> {
   const uniqueIndexes = extendByReversedIndexes(getUniqueIndexes(model), {
diff --git a/src/resolvers/count.ts b/src/resolvers/count.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   filterHelper,
@@ -22,7 +22,7 @@ type TArgs = {
 
 export function count<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: CountResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/createMany.ts b/src/resolvers/createMany.ts
@@ -1,4 +1,4 @@
-import { ObjectTypeComposer, Resolver } from 'graphql-compose';
+import { ObjectTypeComposer, InterfaceTypeComposer, Resolver } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import { recordHelperArgs, RecordHelperArgsOpts } from './helpers';
 import { addErrorCatcherField } from './helpers/errorCatcher';
@@ -22,7 +22,7 @@ type TArgs = {
 
 export function createMany<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: CreateManyResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/createOne.ts b/src/resolvers/createOne.ts
@@ -1,4 +1,4 @@
-import { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import { recordHelperArgs, RecordHelperArgsOpts } from './helpers';
 import type { ExtendedResolveParams } from './index';
@@ -23,7 +23,7 @@ type TArgs = {
 
 export function createOne<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: CreateOneResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/dataLoader.ts b/src/resolvers/dataLoader.ts
@@ -1,5 +1,5 @@
 import { toInputType } from 'graphql-compose';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   projectionHelper,
@@ -33,7 +33,7 @@ type TArgs = {
 
 export function dataLoader<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: DataLoaderResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/dataLoaderMany.ts b/src/resolvers/dataLoaderMany.ts
@@ -1,5 +1,5 @@
 import { toInputType } from 'graphql-compose';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   projectionHelper,
@@ -33,7 +33,7 @@ type TArgs = {
 
 export function dataLoaderMany<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: DataLoaderManyResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/findById.ts b/src/resolvers/findById.ts
@@ -1,5 +1,5 @@
 import { toInputType } from 'graphql-compose';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   projectionHelper,
@@ -32,7 +32,7 @@ type TArgs = {
 
 export function findById<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: FindByIdResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/findByIds.ts b/src/resolvers/findByIds.ts
@@ -1,5 +1,5 @@
 import { toInputType } from 'graphql-compose';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   limitHelper,
@@ -41,7 +41,7 @@ type TArgs = {
 
 export function findByIds<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: FindByIdsResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/findMany.ts b/src/resolvers/findMany.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   limitHelper,
@@ -51,7 +51,7 @@ type TArgs = {
 
 export function findMany<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: FindManyResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/findOne.ts b/src/resolvers/findOne.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   skipHelper,
@@ -46,7 +46,7 @@ type TArgs = {
 
 export function findOne<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: FindOneResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/helpers/filter.ts b/src/resolvers/helpers/filter.ts
@@ -1,6 +1,10 @@
 /* eslint-disable no-use-before-define */
 
-import { ObjectTypeComposer, ObjectTypeComposerArgumentConfigMap } from 'graphql-compose';
+import {
+  ObjectTypeComposer,
+  InterfaceTypeComposer,
+  ObjectTypeComposerArgumentConfigMap,
+} from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import { isObject, toMongoFilterDottedObject, getIndexedFieldNamesForGraphQL } from '../../utils';
 import type { ExtendedResolveParams } from '../index';
@@ -62,7 +66,7 @@ export const getFilterHelperArgOptsMap = (): Record<string, string | string[]> =
 });
 
 export function filterHelperArgs<TDoc extends Document = any>(
-  typeComposer: ObjectTypeComposer<TDoc, any>,
+  typeComposer: ObjectTypeComposer<TDoc, any> | InterfaceTypeComposer<TDoc, any>,
   model: Model<TDoc>,
   opts?: FilterHelperArgsOpts
 ): ObjectTypeComposerArgumentConfigMap<{ filter: any }> {
diff --git a/src/resolvers/helpers/payloadRecordId.ts b/src/resolvers/helpers/payloadRecordId.ts
@@ -1,5 +1,6 @@
 import {
   ObjectTypeComposer,
+  InterfaceTypeComposer,
   ComposeOutputTypeDefinition,
   ObjectTypeComposerFieldConfigMapDefinition,
   toInputType,
@@ -13,7 +14,7 @@ export type PayloadRecordIdHelperOpts = {
 };
 
 export function payloadRecordId<TSource = any, TContext = any>(
-  tc: ObjectTypeComposer<TSource, TContext>,
+  tc: ObjectTypeComposer<TSource, TContext> | InterfaceTypeComposer<TSource, TContext>,
   opts?: PayloadRecordIdHelperOpts | false
 ): ObjectTypeComposerFieldConfigMapDefinition<TSource, TContext> | null {
   if (opts === false) return null;
@@ -39,7 +40,7 @@ export type PayloadRecordIdsHelperOpts = {
 };
 
 export function payloadRecordIds<TSource = any, TContext = any>(
-  tc: ObjectTypeComposer<TSource, TContext>,
+  tc: ObjectTypeComposer<TSource, TContext> | InterfaceTypeComposer<TSource, TContext>,
   opts?: PayloadRecordIdHelperOpts | false
 ): ObjectTypeComposerFieldConfigMapDefinition<TSource, TContext> | null {
   if (opts === false) return null;
diff --git a/src/resolvers/helpers/record.ts b/src/resolvers/helpers/record.ts
@@ -1,5 +1,6 @@
 import {
   ObjectTypeComposer,
+  InterfaceTypeComposer,
   ObjectTypeComposerArgumentConfigMapDefinition,
   InputTypeComposer,
 } from 'graphql-compose';
@@ -42,7 +43,7 @@ export const getRecordHelperArgsOptsMap = (): Record<string, string> => ({
 });
 
 export function recordHelperArgs<TDoc extends Document = any>(
-  tc: ObjectTypeComposer<TDoc, any>,
+  tc: ObjectTypeComposer<TDoc, any> | InterfaceTypeComposer<TDoc, any>,
   opts?: RecordHelperArgsOpts
 ): ObjectTypeComposerArgumentConfigMapDefinition<{ record: any }> {
   if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
diff --git a/src/resolvers/helpers/sort.ts b/src/resolvers/helpers/sort.ts
@@ -4,6 +4,7 @@ import type { Model, Document } from 'mongoose';
 import {
   ObjectTypeComposerArgumentConfigMapDefinition,
   ObjectTypeComposer,
+  InterfaceTypeComposer,
   SchemaComposer,
   EnumTypeComposer,
   isObject,
@@ -24,7 +25,7 @@ export type SortHelperArgsOpts = {
 };
 
 export function sortHelperArgs<TDoc extends Document = any>(
-  tc: ObjectTypeComposer<TDoc, any>,
+  tc: ObjectTypeComposer<TDoc, any> | InterfaceTypeComposer<TDoc, any>,
   model: Model<TDoc>,
   opts?: SortHelperArgsOpts
 ): ObjectTypeComposerArgumentConfigMapDefinition<{ sort: any }> {
diff --git a/src/resolvers/pagination.ts b/src/resolvers/pagination.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   preparePaginationResolver,
@@ -18,7 +18,7 @@ export type PaginationResolverOpts = Omit<
 
 export function pagination<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: PaginationResolverOpts
 ): Resolver<TSource, TContext, PaginationTArgs, TDoc> {
   const { countOpts, findManyOpts, ...restOpts } = opts || {};
diff --git a/src/resolvers/removeById.ts b/src/resolvers/removeById.ts
@@ -1,5 +1,5 @@
 import { toInputType } from 'graphql-compose';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import { findById } from './findById';
 import type { ExtendedResolveParams } from './index';
@@ -21,7 +21,7 @@ type TArgs = {
 
 export function removeById<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: RemoveByIdResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/removeMany.ts b/src/resolvers/removeMany.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   filterHelperArgs,
@@ -28,7 +28,7 @@ type TArgs = {
 
 export function removeMany<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: RemoveManyResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/removeOne.ts b/src/resolvers/removeOne.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   filterHelperArgs,
@@ -30,7 +30,7 @@ type TArgs = {
 
 export function removeOne<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: RemoveOneResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/updateById.ts b/src/resolvers/updateById.ts
@@ -1,5 +1,5 @@
 import { toInputType } from 'graphql-compose';
-import { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import { recordHelperArgs, RecordHelperArgsOpts } from './helpers/record';
 import { findById } from './findById';
@@ -26,7 +26,7 @@ type TArgs = {
 
 export function updateById<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: UpdateByIdResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/updateMany.ts b/src/resolvers/updateMany.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import type { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   limitHelper,
@@ -45,7 +45,7 @@ type TArgs = {
 
 export function updateMany<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: UpdateManyResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/src/resolvers/updateOne.ts b/src/resolvers/updateOne.ts
@@ -1,4 +1,4 @@
-import { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer, InterfaceTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import type { ExtendedResolveParams } from './index';
 import {
@@ -39,7 +39,7 @@ type TArgs = {
 
 export function updateOne<TSource = any, TContext = any, TDoc extends Document = any>(
   model: Model<TDoc>,
-  tc: ObjectTypeComposer<TDoc, TContext>,
+  tc: ObjectTypeComposer<TDoc, TContext> | InterfaceTypeComposer<TDoc, TContext>,
   opts?: UpdateOneResolverOpts
 ): Resolver<TSource, TContext, TArgs, TDoc> {
   if (!model || !model.modelName || !model.schema) {
diff --git a/yarn.lock b/yarn.lock
