Merge branch 'master' into alpha

Author: nodkz

package.json

@@ -60,6 +60,7 @@
     "typescript": "4.0.2"
   },
   "scripts": {
+    "prepare": "tsc -p ./tsconfig.build.json",
     "build": "rimraf lib && tsc -p ./tsconfig.build.json",
     "watch": "jest --watch",
     "coverage": "jest --coverage --maxWorkers 4",

src/resolvers/helpers/__tests__/aliases-test.ts

@@ -25,5 +25,43 @@ describe('Resolver helper `alises` ->', () => {
       const aliases = prepareAliases(User);
       expect(aliases).toEqual(false);
     });
+
+    it('should extract field aliases from discriminator Models', () => {
+      const UserSchema = new mongoose.Schema({
+        e: {
+          type: String,
+          alias: 'emailAddress',
+        },
+      });
+      const User = mongoose.model('User111', UserSchema);
+      const VIPUserSchema = new mongoose.Schema({
+        f: {
+          type: Number,
+          alias: 'freeDrinks',
+        },
+      });
+      User.discriminator('VIPUser111', VIPUserSchema);
+      const aliases = prepareAliases(User);
+      expect(aliases).toEqual({ emailAddress: 'e', freeDrinks: 'f' });
+    });
+
+    it('should extract field aliases in discriminator Models inherited from base Model', () => {
+      const UserSchema = new mongoose.Schema({
+        e: {
+          type: String,
+          alias: 'emailAddress',
+        },
+      });
+      const User = mongoose.model('User789', UserSchema);
+      const VIPUserSchema = new mongoose.Schema({
+        f: {
+          type: Number,
+          alias: 'freeDrinks',
+        },
+      });
+      const VIPUser = User.discriminator('VIPUser789', VIPUserSchema);
+      const aliases = prepareAliases(VIPUser);
+      expect(aliases).toEqual({ emailAddress: 'e', freeDrinks: 'f' });
+    });
   });
 });

src/resolvers/helpers/aliases.ts

@@ -3,7 +3,14 @@ import type { Model } from 'mongoose';
 export type AliasesMap = Record<string, string>;
 
 export function prepareAliases(model: Model<any>): AliasesMap | false {
-  const aliases = (model?.schema as any)?.aliases;
+  const aliases = (model?.schema as any)?.aliases || {};
+
+  if (model.discriminators) {
+    Object.keys(model.discriminators).forEach((subModelName: string) => {
+      const submodel: Model<any> = (model.discriminators as any)[subModelName];
+      Object.assign(aliases, (submodel?.schema as any)?.aliases);
+    });
+  }
   if (Object.keys(aliases).length > 0) {
     return aliases;
   }

yarn.lock

@@ -5201,9 +5201,9 @@ node-fetch-npm@^2.0.2:
     safe-buffer "^5.1.1"
 
 node-fetch@^2.3.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
-  integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
 
 node-gyp@^5.0.2, node-gyp@^5.1.0:
   version "5.1.1"