From 643bae0c334e01358893253308b40f939bee59ad Mon Sep 17 00:00:00 2001
From: Jacob <jbuchanan21@qub.ac.uk>
Date: Tue, 11 May 2021 00:31:11 +0100
Subject: [PATCH] Switch type check to use 'instanceof' instead of
 constructor.name for supporting extended types

---
 src/resolvers/connection.ts     |  2 +-
 src/resolvers/count.ts          |  4 ++--
 src/resolvers/createMany.ts     |  2 +-
 src/resolvers/createOne.ts      |  2 +-
 src/resolvers/dataLoader.ts     |  5 ++---
 src/resolvers/dataLoaderMany.ts |  5 ++---
 src/resolvers/findById.ts       | 10 ++++++----
 src/resolvers/findByIds.ts      |  5 ++---
 src/resolvers/findMany.ts       |  6 +++---
 src/resolvers/findOne.ts        |  4 ++--
 src/resolvers/helpers/record.ts |  2 +-
 src/resolvers/helpers/sort.ts   |  2 +-
 src/resolvers/pagination.ts     |  2 +-
 src/resolvers/removeById.ts     |  5 ++---
 src/resolvers/removeMany.ts     |  4 ++--
 src/resolvers/removeOne.ts      |  4 ++--
 src/resolvers/updateById.ts     |  5 ++---
 src/resolvers/updateMany.ts     |  4 ++--
 src/resolvers/updateOne.ts      |  2 +-
 19 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/src/resolvers/connection.ts b/src/resolvers/connection.ts
index 0bca0bee..b3d1a238 100644
--- a/src/resolvers/connection.ts
+++ b/src/resolvers/connection.ts
@@ -4,7 +4,7 @@ import {
   ConnectionResolverOpts as _ConnectionResolverOpts,
   ConnectionTArgs,
 } from 'graphql-compose-connection';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import { CountResolverOpts, count } from './count';
 import { FindManyResolverOpts, findMany } from './findMany';
 import { getUniqueIndexes, extendByReversedIndexes, IndexT } from '../utils/getIndexesFromModel';
diff --git a/src/resolvers/count.ts b/src/resolvers/count.ts
index f3bd46e4..59241134 100644
--- a/src/resolvers/count.ts
+++ b/src/resolvers/count.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   filterHelper,
@@ -29,7 +29,7 @@ export function count<TSource = any, TContext = any, TDoc extends Document = any
     throw new Error('First arg for Resolver count() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error('Second arg for Resolver count() should be instance of ObjectTypeComposer.');
   }
 
diff --git a/src/resolvers/createMany.ts b/src/resolvers/createMany.ts
index c5965aff..51d27261 100644
--- a/src/resolvers/createMany.ts
+++ b/src/resolvers/createMany.ts
@@ -29,7 +29,7 @@ export function createMany<TSource = any, TContext = any, TDoc extends Document
     throw new Error('First arg for Resolver createMany() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver createMany() should be instance of ObjectTypeComposer.'
     );
diff --git a/src/resolvers/createOne.ts b/src/resolvers/createOne.ts
index 2f162160..5ea7a0e9 100644
--- a/src/resolvers/createOne.ts
+++ b/src/resolvers/createOne.ts
@@ -30,7 +30,7 @@ export function createOne<TSource = any, TContext = any, TDoc extends Document =
     throw new Error('First arg for Resolver createOne() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver createOne() should be instance of ObjectTypeComposer.'
     );
diff --git a/src/resolvers/dataLoader.ts b/src/resolvers/dataLoader.ts
index 5116211a..b21fc2c3 100644
--- a/src/resolvers/dataLoader.ts
+++ b/src/resolvers/dataLoader.ts
@@ -1,5 +1,4 @@
-import { toInputType } from 'graphql-compose';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer, toInputType } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   projectionHelper,
@@ -40,7 +39,7 @@ export function dataLoader<TSource = any, TContext = any, TDoc extends Document
     throw new Error('First arg for Resolver dataLoader() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver dataLoader() should be instance of ObjectTypeComposer.'
     );
diff --git a/src/resolvers/dataLoaderMany.ts b/src/resolvers/dataLoaderMany.ts
index 30b126e4..c50c99e5 100644
--- a/src/resolvers/dataLoaderMany.ts
+++ b/src/resolvers/dataLoaderMany.ts
@@ -1,5 +1,4 @@
-import { toInputType } from 'graphql-compose';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer, toInputType } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   projectionHelper,
@@ -42,7 +41,7 @@ export function dataLoaderMany<TSource = any, TContext = any, TDoc extends Docum
     );
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver dataLoaderMany() should be instance of ObjectTypeComposer.'
     );
diff --git a/src/resolvers/findById.ts b/src/resolvers/findById.ts
index a3ce56c8..dac2aa68 100644
--- a/src/resolvers/findById.ts
+++ b/src/resolvers/findById.ts
@@ -1,5 +1,4 @@
-import { toInputType } from 'graphql-compose';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer, toInputType } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   projectionHelper,
@@ -9,6 +8,7 @@ import {
 } from './helpers';
 import type { ExtendedResolveParams } from './index';
 import { beforeQueryHelper, beforeQueryHelperLean } from './helpers/beforeQueryHelper';
+// import { EDiscriminatorTypeComposer } from '../enhancedDiscriminators';
 
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface FindByIdResolverOpts {
@@ -39,15 +39,17 @@ export function findById<TSource = any, TContext = any, TDoc extends Document =
     throw new Error('First arg for Resolver findById() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error('Second arg for Resolver findById() should be instance of ObjectTypeComposer.');
   }
 
   const aliases = prepareNestedAliases(model.schema);
   const aliasesReverse = prepareAliasesReverse(model.schema);
 
+  // const typeTC = tc instanceof EDiscriminatorTypeComposer ? tc.getDInterface() : tc;
+
   return tc.schemaComposer.createResolver<TSource, TArgs>({
-    type: tc,
+    type: tc.getTypeName(),
     name: 'findById',
     kind: 'query',
     args: {
diff --git a/src/resolvers/findByIds.ts b/src/resolvers/findByIds.ts
index 0a20ede0..df4b0334 100644
--- a/src/resolvers/findByIds.ts
+++ b/src/resolvers/findByIds.ts
@@ -1,5 +1,4 @@
-import { toInputType } from 'graphql-compose';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer, toInputType } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   limitHelper,
@@ -48,7 +47,7 @@ export function findByIds<TSource = any, TContext = any, TDoc extends Document =
     throw new Error('First arg for Resolver findByIds() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver findByIds() should be instance of ObjectTypeComposer.'
     );
diff --git a/src/resolvers/findMany.ts b/src/resolvers/findMany.ts
index faf15f8c..9ce17f73 100644
--- a/src/resolvers/findMany.ts
+++ b/src/resolvers/findMany.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   limitHelper,
@@ -58,7 +58,7 @@ export function findMany<TSource = any, TContext = any, TDoc extends Document =
     throw new Error('First arg for Resolver findMany() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error('Second arg for Resolver findMany() should be instance of ObjectTypeComposer.');
   }
 
@@ -66,7 +66,7 @@ export function findMany<TSource = any, TContext = any, TDoc extends Document =
   const aliasesReverse = prepareAliasesReverse(model.schema);
 
   return tc.schemaComposer.createResolver<TSource, TArgs>({
-    type: tc.NonNull.List.NonNull,
+    type: tc.schemaComposer.getAnyTC(tc.getTypeName()).NonNull.List.NonNull,
     name: 'findMany',
     kind: 'query',
     args: {
diff --git a/src/resolvers/findOne.ts b/src/resolvers/findOne.ts
index 5d4e304b..79a7fd8b 100644
--- a/src/resolvers/findOne.ts
+++ b/src/resolvers/findOne.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   skipHelper,
@@ -53,7 +53,7 @@ export function findOne<TSource = any, TContext = any, TDoc extends Document = a
     throw new Error('First arg for Resolver findOne() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error('Second arg for Resolver findOne() should be instance of ObjectTypeComposer.');
   }
 
diff --git a/src/resolvers/helpers/record.ts b/src/resolvers/helpers/record.ts
index 4ef2c02a..3061b675 100644
--- a/src/resolvers/helpers/record.ts
+++ b/src/resolvers/helpers/record.ts
@@ -45,7 +45,7 @@ export function recordHelperArgs<TDoc extends Document = any>(
   tc: ObjectTypeComposer<TDoc, any>,
   opts?: RecordHelperArgsOpts
 ): ObjectTypeComposerArgumentConfigMapDefinition<{ record: any }> {
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error('First arg for recordHelperArgs() should be instance of ObjectTypeComposer.');
   }
 
diff --git a/src/resolvers/helpers/sort.ts b/src/resolvers/helpers/sort.ts
index 51a57dd7..58c7a920 100644
--- a/src/resolvers/helpers/sort.ts
+++ b/src/resolvers/helpers/sort.ts
@@ -28,7 +28,7 @@ export function sortHelperArgs<TDoc extends Document = any>(
   model: Model<TDoc>,
   opts?: SortHelperArgsOpts
 ): ObjectTypeComposerArgumentConfigMapDefinition<{ sort: any }> {
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error('First arg for sortHelperArgs() should be instance of ObjectTypeComposer.');
   }
 
diff --git a/src/resolvers/pagination.ts b/src/resolvers/pagination.ts
index 54fdac95..763e18f2 100644
--- a/src/resolvers/pagination.ts
+++ b/src/resolvers/pagination.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   preparePaginationResolver,
diff --git a/src/resolvers/removeById.ts b/src/resolvers/removeById.ts
index 27c0bb0a..0c7851be 100644
--- a/src/resolvers/removeById.ts
+++ b/src/resolvers/removeById.ts
@@ -1,5 +1,4 @@
-import { toInputType } from 'graphql-compose';
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer, toInputType } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import { findById } from './findById';
 import type { ExtendedResolveParams } from './index';
@@ -28,7 +27,7 @@ export function removeById<TSource = any, TContext = any, TDoc extends Document
     throw new Error('First arg for Resolver removeById() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver removeById() should be instance of ObjectTypeComposer.'
     );
diff --git a/src/resolvers/removeMany.ts b/src/resolvers/removeMany.ts
index a8173ea3..94e67b78 100644
--- a/src/resolvers/removeMany.ts
+++ b/src/resolvers/removeMany.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   filterHelperArgs,
@@ -35,7 +35,7 @@ export function removeMany<TSource = any, TContext = any, TDoc extends Document
     throw new Error('First arg for Resolver removeMany() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver removeMany() should be instance of ObjectTypeComposer.'
     );
diff --git a/src/resolvers/removeOne.ts b/src/resolvers/removeOne.ts
index bd3097ff..88db2a3b 100644
--- a/src/resolvers/removeOne.ts
+++ b/src/resolvers/removeOne.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   filterHelperArgs,
@@ -37,7 +37,7 @@ export function removeOne<TSource = any, TContext = any, TDoc extends Document =
     throw new Error('First arg for Resolver removeOne() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver removeOne() should be instance of ObjectTypeComposer.'
     );
diff --git a/src/resolvers/updateById.ts b/src/resolvers/updateById.ts
index cbb296f6..76bffc3a 100644
--- a/src/resolvers/updateById.ts
+++ b/src/resolvers/updateById.ts
@@ -1,5 +1,4 @@
-import { toInputType } from 'graphql-compose';
-import { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer, toInputType } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import { recordHelperArgs, RecordHelperArgsOpts } from './helpers/record';
 import { findById } from './findById';
@@ -33,7 +32,7 @@ export function updateById<TSource = any, TContext = any, TDoc extends Document
     throw new Error('First arg for Resolver updateById() should be instance of Mongoose Model.');
   }
 
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver updateById() should be instance of ObjectTypeComposer.'
     );
diff --git a/src/resolvers/updateMany.ts b/src/resolvers/updateMany.ts
index c2cf2db1..d961b690 100644
--- a/src/resolvers/updateMany.ts
+++ b/src/resolvers/updateMany.ts
@@ -1,4 +1,4 @@
-import type { Resolver, ObjectTypeComposer } from 'graphql-compose';
+import { Resolver, ObjectTypeComposer } from 'graphql-compose';
 import type { Model, Document } from 'mongoose';
 import {
   limitHelper,
@@ -51,7 +51,7 @@ export function updateMany<TSource = any, TContext = any, TDoc extends Document
   if (!model || !model.modelName || !model.schema) {
     throw new Error('First arg for Resolver updateMany() should be instance of Mongoose Model.');
   }
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver updateMany() should be instance of ObjectTypeComposer.'
     );
diff --git a/src/resolvers/updateOne.ts b/src/resolvers/updateOne.ts
index 965101b8..0537ee83 100644
--- a/src/resolvers/updateOne.ts
+++ b/src/resolvers/updateOne.ts
@@ -45,7 +45,7 @@ export function updateOne<TSource = any, TContext = any, TDoc extends Document =
   if (!model || !model.modelName || !model.schema) {
     throw new Error('First arg for Resolver updateOne() should be instance of Mongoose Model.');
   }
-  if (!tc || tc.constructor.name !== 'ObjectTypeComposer') {
+  if (!tc || !(tc instanceof ObjectTypeComposer)) {
     throw new Error(
       'Second arg for Resolver updateOne() should be instance of ObjectTypeComposer.'
     );