Switch type check to use 'instanceof' instead of constructor.name for supporting extended types

Author: jhbuchanan45

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';

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.');
   }
 

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.'
     );

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.'
     );

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.'
     );

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.'
     );

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: {

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.'
     );

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,15 +58,15 @@ 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.');
   }
 
   const aliases = prepareNestedAliases(model.schema);
   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: {

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.');
   }