Merge branch 'master' into alpha

Author: nodkz

package.json

@@ -29,7 +29,7 @@
     "graphql-compose-pagination": "8.0.1"
   },
   "peerDependencies": {
-    "graphql-compose": "^7.21.1",
+    "graphql-compose": "^7.21.4",
     "mongoose": "^5.0.0 || ^4.4.0"
   },
   "devDependencies": {
@@ -44,7 +44,7 @@
     "eslint-plugin-import": "2.22.0",
     "eslint-plugin-prettier": "3.1.4",
     "graphql": "15.3.0",
-    "graphql-compose": "7.21.1",
+    "graphql-compose": "7.21.4",
     "jest": "26.4.2",
     "mongodb-memory-server": "6.7.5",
     "mongoose": "5.10.5",

src/discriminators/__tests__/composeChildTC-test.ts

@@ -8,6 +8,15 @@ beforeAll(() => schemaComposer.clear());
 
 describe('composeChildTC ->', () => {
   const CharacterDTC = composeWithMongooseDiscriminators(CharacterModel);
+  CharacterDTC.addRelation('friends', {
+    resolver: () => CharacterDTC.getResolver('findById'),
+    prepareArgs: {
+      _id: (source) => source.friends,
+    },
+    projection: { friends: 1 },
+  });
+  CharacterDTC.extendField('friends', { type: '[String!]' });
+
   const PersonTC = CharacterDTC.discriminator(PersonModel);
   const DroidTC = CharacterDTC.discriminator(DroidModel);
 
@@ -21,6 +30,16 @@ describe('composeChildTC ->', () => {
     expect(PersonTC.getFieldNames()).toEqual(expect.arrayContaining(CharacterDTC.getFieldNames()));
   });
 
+  it('should copy all relations from BaseDTC to ChildTCs', () => {
+    expect(DroidTC.getRelations()).toEqual(CharacterDTC.getRelations());
+    expect(PersonTC.getRelations()).toEqual(CharacterDTC.getRelations());
+  });
+
+  it('should copy the extended Field from BaseDTC to ChildTCs', () => {
+    expect(DroidTC.getField('friends').type).toEqual(CharacterDTC.getField('friends').type);
+    expect(PersonTC.getField('friends').type).toEqual(CharacterDTC.getField('friends').type);
+  });
+
   it('should make childTC have same fieldTypes as baseTC', () => {
     const characterFields = CharacterDTC.getFieldNames();
 

src/discriminators/composeChildTC.ts

@@ -6,6 +6,22 @@ import type {
 import { prepareChildResolvers } from './prepareChildResolvers';
 import { reorderFields } from './utils/reorderFields';
 
+function copyBaseTcRelationsToChildTc(
+  baseDTC: ObjectTypeComposer<any, any>,
+  childTC: ObjectTypeComposer<any, any>
+) {
+  const relations = baseDTC.getRelations();
+  const childRelations = childTC.getRelations();
+  Object.keys(relations).forEach((name) => {
+    if (childRelations[name]) {
+      return;
+    }
+    childTC.addRelation(name, relations[name]);
+  });
+
+  return childTC;
+}
+
 // copy all baseTypeComposer fields to childTC
 // these are the fields before calling discriminator
 function copyBaseTCFieldsToChildTC(
@@ -35,7 +51,8 @@ export function composeChildTC<TSource, TContext>(
   childTC: ObjectTypeComposer<TSource, TContext>,
   opts: ComposeWithMongooseDiscriminatorsOpts<TContext>
 ): ObjectTypeComposer<TSource, TContext> {
-  const composedChildTC = copyBaseTCFieldsToChildTC(baseDTC, childTC);
+  let composedChildTC = copyBaseTcRelationsToChildTc(baseDTC, childTC);
+  composedChildTC = copyBaseTCFieldsToChildTC(baseDTC, composedChildTC);
 
   composedChildTC.addInterface(baseDTC.getDInterface());
 

yarn.lock

@@ -3179,10 +3179,10 @@ graphql-compose-pagination@8.0.1:
   resolved "https://registry.yarnpkg.com/graphql-compose-pagination/-/graphql-compose-pagination-8.0.1.tgz#785c4c83dec5c81dee7ce5baee71cdf5b7a55240"
   integrity sha512-DxFVSFS9fuDdVOCUz6sr8r1wwwFytUUQ6a2ihQAEdXx7a7p3ZC797RWHdprnnKtLPrioHIIWPCbIoyn4c4kVgQ==
 
-graphql-compose@7.21.1:
-  version "7.21.1"
-  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-7.21.1.tgz#e24da849c095485d1cec06c1f7517de8b81308b4"
-  integrity sha512-9Cpfdbl9EXla5SR0SmfHB7Q2cEzK9YHZzUPcyktzOO+40wfXsHfoFwCT7CtRU+TiENeHK07hG4zPyqRxD18t8w==
+graphql-compose@7.21.4:
+  version "7.21.4"
+  resolved "https://registry.yarnpkg.com/graphql-compose/-/graphql-compose-7.21.4.tgz#5927b0906322f12c8ed6de2da204d17fde8fb1f4"
+  integrity sha512-sLehZREpIAr1TDnefmZBSrIC0NsyebdQ8I1NJS+OTp/Rkpw1HOWuCzbYosbttlkMewinKgAYFcjE2B3EnS7hIA==
   dependencies:
     graphql-type-json "0.3.2"
     object-path "^0.11.4"