refactor(discriminator): replace getDBaseName() with getTypeName()

Remove other unnecessary properties on DiscriminatorTypeComposer

Author: mernxl

src/composeWithMongooseDiscriminators.js

@@ -1,7 +1,7 @@
 /* @flow */
 
 import { Model } from 'mongoose';
-import { Options, DiscriminatorTypeComposer } from './discriminators';
+import { type Options, DiscriminatorTypeComposer } from './discriminators';
 
 export function composeWithMongooseDiscriminators(
   baseModel: Model,

src/discriminators/DiscriminatorTypeComposer.js

@@ -23,7 +23,6 @@ import { reorderFields } from './utils';
 const { GraphQLInterfaceType } = graphql;
 
 export type Options = {
-  test_disTypes?: boolean,
   reorderFields?: boolean | string[], // true order: _id, DKey, DInterfaceFields, DiscriminatorFields
   customizationOptions?: TypeConverterOpts,
 };
@@ -51,8 +50,7 @@ function setDKeyETCValues(discriminators: Discriminators): any {
 // then sets this enum type as the discriminator key field type
 function createAndSetDKeyETC(dTC: DiscriminatorTypeComposer, discriminators: Discriminators) {
   const DKeyETC = EnumTypeComposer.create({
-    name: `EnumDKey${dTC.getDBaseName()}${dTC.getDKey()[0].toUpperCase() +
-      dTC.getDKey().substr(1)}`,
+    name: `EnumDKey${dTC.getTypeName()}${dTC.getDKey()[0].toUpperCase() + dTC.getDKey().substr(1)}`,
     values: setDKeyETCValues(discriminators),
   });
 
@@ -82,7 +80,7 @@ function getBaseTCFieldsWithTypes(baseTC: TypeComposer) {
 
 function createDInterface(baseModelTC: DiscriminatorTypeComposer): GraphQLInterfaceType {
   return new GraphQLInterfaceType({
-    name: `${baseModelTC.getDBaseName()}Interface`,
+    name: `${baseModelTC.getTypeName()}Interface`,
 
     resolveType: (value: any) => {
       const childDName = value[baseModelTC.getDKey()];
@@ -100,8 +98,6 @@ function createDInterface(baseModelTC: DiscriminatorTypeComposer): GraphQLInterf
 }
 
 export class DiscriminatorTypeComposer extends TypeComposer {
-  modelName: string;
-
   discriminatorKey: string;
 
   DKeyETC: EnumTypeComposer;
@@ -112,8 +108,6 @@ export class DiscriminatorTypeComposer extends TypeComposer {
 
   DInterface: GraphQLInterfaceType;
 
-  discriminators: Discriminators;
-
   childTCs: TypeComposer[];
 
   constructor(baseModel: Model, opts?: any) {
@@ -131,22 +125,17 @@ export class DiscriminatorTypeComposer extends TypeComposer {
 
     super(composeWithMongoose(baseModel, opts.customizationOptions).gqType);
 
-    // !ORDER MATTERS
     this.opts = opts;
-    this.modelName = (baseModel: any).modelName;
+    this.childTCs = [];
     this.discriminatorKey = (baseModel: any).schema.get('discriminatorKey') || '__t';
 
-    // discriminants and object containing all discriminants with key
-    // key being their DNames
-    this.discriminators = (baseModel: any).discriminators;
-
-    this.childTCs = [];
     this.schemaComposer =
       opts.customizationOptions && opts.customizationOptions.schemaComposer
         ? opts.customizationOptions.schemaComposer
         : schemaComposer;
-    this.setTypeName(this.modelName);
-    this.DKeyETC = createAndSetDKeyETC(this, this.discriminators);
+
+    // discriminators an object containing all discriminators with key being DNames
+    this.DKeyETC = createAndSetDKeyETC(this, (baseModel: any).discriminators);
 
     reorderFields(this, (this.opts: any).reorderFields, this.discriminatorKey);
 
@@ -167,10 +156,6 @@ export class DiscriminatorTypeComposer extends TypeComposer {
     return this.DKeyETC;
   }
 
-  getDBaseName(): string {
-    return this.modelName;
-  }
-
   getDInterface(): GraphQLInterfaceType {
     return this.DInterface;
   }

src/discriminators/prepare-resolvers/__tests__/recomposeBaseResolvers-test.js

@@ -142,7 +142,7 @@ describe('recomposeBaseResolvers()', () => {
   });
 
   it('should clone, rename edges field on connection resolver, connection', () => {
-    const newName = `${CharacterDTC.getDBaseName()}Edge`;
+    const newName = `${CharacterDTC.getTypeName()}Edge`;
     const connectionRS = CharacterDTC.getResolver('connection');
 
     expect(

src/discriminators/prepare-resolvers/prepareBaseResolvers.js

@@ -67,7 +67,7 @@ export function prepareBaseResolvers(baseTC: DiscriminatorTypeComposer) {
           const edgesTC = resolver // eslint-disable-line no-case-declarations
             .getTypeComposer()
             .getFieldTC('edges')
-            .clone(`${baseTC.getDBaseName()}Edge`);
+            .clone(`${baseTC.getTypeName()}Edge`);
 
           edgesTC.extendField('node', {
             type: new GraphQLNonNull(baseTC.getDInterface()),