refactor: _disTypes replaced via new schemaComposer.addSchemaMustHaveType() method

Author: nodkz

src/__tests__/_disTypes-test.js

@@ -16,7 +16,7 @@ describe('_disTypes Test With and Without test_disTypes Options set', () => {
 
   afterEach(() => Event.remove({}));
 
-  describe('No test_disTypes, Include types Manually in Query', () => {
+  describe('opts test_disTypes FALSE', () => {
     let EventTC;
     let ClickedLinkEventTC;
 
@@ -31,67 +31,6 @@ describe('_disTypes Test With and Without test_disTypes Options set', () => {
       expect(ClickedLinkEventTC.getFieldNames()).toEqual(['_id', 'kind', 'refId', 'url']);
     });
 
-    it('manually override resolver output type for findMany', async () => {
-      // let's check graphql response
-
-      await Event.create({ refId: 'aaa' });
-      await Event.create({ refId: 'bbb' });
-      await ClickedLinkEvent.create({ refId: 'ccc', url: 'url1' });
-      await ClickedLinkEvent.create({ refId: 'ddd', url: 'url2' });
-
-      schemaComposer.rootQuery().addFields({
-        eventFindMany: EventTC.getResolver('findMany'),
-        ClickedLinkEvent: ClickedLinkEventTC.getResolver('findMany'),
-        GenericEvent: EventTC.getResolver('findOne').setType(EventTC),
-      });
-
-      const schema = schemaComposer.buildSchema();
-
-      const res = await graphql.graphql(
-        schema,
-        `{
-        eventFindMany {
-          __typename
-          ... on GenericEvent {
-            refId
-          }
-          ... on ClickedLinkEvent {
-            kind
-            refId
-            url
-          }
-        }
-      }`
-      );
-
-      expect(res).toEqual({
-        data: {
-          eventFindMany: [
-            { __typename: 'GenericEvent', refId: 'aaa' },
-            { __typename: 'GenericEvent', refId: 'bbb' },
-            { __typename: 'ClickedLinkEvent', kind: 'ClickedLinkEvent', refId: 'ccc', url: 'url1' },
-            { __typename: 'ClickedLinkEvent', kind: 'ClickedLinkEvent', refId: 'ddd', url: 'url2' },
-          ],
-        },
-      });
-    });
-  });
-
-  describe('opts test_disTypes TRUE', () => {
-    let EventTC;
-    let ClickedLinkEventTC;
-
-    beforeAll(() => {
-      schemaComposer.clear();
-      EventTC = composeWithMongooseDiscriminators(Event, { test_disTypes: true });
-      ClickedLinkEventTC = EventTC.discriminator(ClickedLinkEvent);
-    });
-
-    it('creating Types from models', () => {
-      expect(EventTC.getFieldNames()).toEqual(['_id', 'kind', 'refId']);
-      expect(ClickedLinkEventTC.getFieldNames()).toEqual(['_id', 'kind', 'refId', 'url']);
-    });
-
     it('manually override resolver output type for findMany', async () => {
       // let's check graphql response
 
@@ -111,7 +50,7 @@ describe('_disTypes Test With and Without test_disTypes Options set', () => {
         `{
         eventFindMany {
           __typename
-          ... on GenericEvent {
+          ... on Event {
             refId
           }
           ... on ClickedLinkEvent {
@@ -126,64 +65,13 @@ describe('_disTypes Test With and Without test_disTypes Options set', () => {
       expect(res).toEqual({
         data: {
           eventFindMany: [
-            { __typename: 'GenericEvent', refId: 'aaa' },
-            { __typename: 'GenericEvent', refId: 'bbb' },
+            { __typename: 'Event', refId: 'aaa' },
+            { __typename: 'Event', refId: 'bbb' },
             { __typename: 'ClickedLinkEvent', kind: 'ClickedLinkEvent', refId: 'ccc', url: 'url1' },
             { __typename: 'ClickedLinkEvent', kind: 'ClickedLinkEvent', refId: 'ddd', url: 'url2' },
           ],
         },
       });
     });
   });
-
-  describe('opts test_disTypes FALSE', () => {
-    let EventTC;
-    let ClickedLinkEventTC;
-
-    beforeAll(() => {
-      schemaComposer.clear();
-      EventTC = composeWithMongooseDiscriminators(Event, { test_disTypes: false });
-      ClickedLinkEventTC = EventTC.discriminator(ClickedLinkEvent);
-    });
-
-    it('creating Types from models', () => {
-      expect(EventTC.getFieldNames()).toEqual(['_id', 'kind', 'refId']);
-      expect(ClickedLinkEventTC.getFieldNames()).toEqual(['_id', 'kind', 'refId', 'url']);
-    });
-
-    it('manually override resolver output type for findMany', async () => {
-      // let's check graphql response
-
-      await Event.create({ refId: 'aaa' });
-      await Event.create({ refId: 'bbb' });
-      await ClickedLinkEvent.create({ refId: 'ccc', url: 'url1' });
-      await ClickedLinkEvent.create({ refId: 'ddd', url: 'url2' });
-
-      schemaComposer.rootQuery().addFields({
-        eventFindMany: EventTC.getResolver('findMany'),
-      });
-
-      const schema = schemaComposer.buildSchema();
-
-      const res = await graphql.graphql(
-        schema,
-        `{
-        eventFindMany {
-          __typename
-          ... on GenericEvent {
-            refId
-          }
-          ... on ClickedLinkEvent {
-            kind
-            refId
-            url
-          }
-        }
-      }`
-      );
-
-      expect(res.errors[0].message).toEqual('Unknown type "GenericEvent".');
-      expect(res.errors[1].message).toEqual('Unknown type "ClickedLinkEvent".');
-    });
-  });
 });

src/__tests__/integration-discriminators-test.js

@@ -17,7 +17,7 @@ describe('#78 Mongoose and Discriminators', () => {
   const clickedLinkSchema = new mongoose.Schema({ url: String });
   const ClickedLinkEvent = Event.discriminator('ClickedLinkEvent', clickedLinkSchema);
 
-  const EventTC = composeWithMongooseDiscriminators(Event, { test_disTypes: true });
+  const EventTC = composeWithMongooseDiscriminators(Event);
   const ClickedLinkEventTC = EventTC.discriminator(ClickedLinkEvent);
 
   // Todo: Remove

src/composeWithMongooseDiscriminators.js

@@ -154,23 +154,7 @@ export class DiscriminatorTypeComposer extends TypeComposer {
     this.DInterface = createDInterface(this);
     this.setInterfaces([this.DInterface]);
 
-    // Hoist on _disTypes
-    if (opts.test_disTypes) {
-      if (!this.GQC.rootQuery().hasField('_disTypes')) {
-        this.GQC.rootQuery().addFields({
-          _disTypes: TypeComposer.create({
-            name: '_disTypes',
-            description: 'Hoisting for Discriminator Types',
-          }),
-        });
-      }
-
-      this.GQC.rootQuery()
-        .getFieldTC('_disTypes')
-        .addFields({
-          [this.getTypeName()]: this,
-        });
-    }
+    this.schemaComposer.addSchemaMustHaveType(this);
 
     // prepare Base Resolvers
     prepareBaseResolvers(this);
@@ -246,6 +230,7 @@ export class DiscriminatorTypeComposer extends TypeComposer {
 
     childTC = composeChildTC(this, childTC, this.opts);
 
+    this.schemaComposer.addSchemaMustHaveType(childTC);
     this.childTCs.push(childTC);
 
     return childTC;

src/discriminators/composeChildTC.js

@@ -35,17 +35,6 @@ export function composeChildTC(
 
   composedChildTC.setInterfaces([baseDTC.getDInterface()]);
 
-  // hoist this type
-  if (opts.test_disTypes) {
-    baseDTC
-      .getGQC()
-      .rootQuery()
-      .getFieldTC('_disTypes')
-      .addFields({
-        [composedChildTC.getTypeName()]: composedChildTC,
-      });
-  }
-
   prepareChildResolvers(baseDTC, composedChildTC, opts);
 
   reorderFields(