refactor(DiscriminatorTC): change constructor on static method createFromModel.

This changes allows to create several schemas with several mongoose 
schemas in one node process with the same type names (multi-schema 
mode).

Author: nodkz

.babelrc

@@ -6,6 +6,7 @@
   "env": {
     "cjs": {
       "plugins": [
+        "transform-class-properties",
         ["transform-runtime", { "polyfill": false }]
       ],
       "presets": [
@@ -17,6 +18,7 @@
       ]
     },
     "mjs": {
+      "plugins": ["transform-class-properties"],
       "presets": [
         [
           "env",
@@ -34,6 +36,7 @@
     },
     "node8": {
       "plugins": [
+        "transform-class-properties",
         ["transform-runtime", { "polyfill": false }]
       ],
       "presets": [
@@ -47,6 +50,9 @@
       ]
     },
     "test": {
+      "plugins": [
+        "transform-class-properties",
+      ],
       "presets": [
         ["env", {
           "targets": {

package.json

@@ -43,6 +43,7 @@
     "babel-core": "^6.26.3",
     "babel-eslint": "^8.2.6",
     "babel-jest": "^23.4.0",
+    "babel-plugin-transform-class-properties": "^6.24.1",
     "babel-plugin-transform-flow-strip-types": "^6.22.0",
     "babel-plugin-transform-object-rest-spread": "^6.13.0",
     "babel-plugin-transform-runtime": "^6.23.0",

src/composeWithMongooseDiscriminators.js

@@ -6,6 +6,6 @@ import { type Options, DiscriminatorTypeComposer } from './discriminators';
 export function composeWithMongooseDiscriminators(
   baseModel: Model,
   opts?: Options
-): DiscriminatorTypeComposer {
-  return new DiscriminatorTypeComposer(baseModel, opts);
+): DiscriminatorTypeComposer<any> {
+  return DiscriminatorTypeComposer.createFromModel(baseModel, opts);
 }

src/discriminators/DiscriminatorTypeComposer.js

@@ -104,15 +104,29 @@ export class DiscriminatorTypeComposer extends TypeComposer {
 
   DKeyETC: EnumTypeComposer;
 
-  schemaComposer: SchemaComposer<any>;
-
   opts: Options;
 
   DInterface: GraphQLInterfaceType;
 
   childTCs: TypeComposer[];
+  static _getClassConnectedWithSchemaComposer(
+    sc?: SchemaComposer<TContext>
+  ): Class<DiscriminatorTypeComposer<TContext>> {
+    class _DiscriminatorTypeComposer extends DiscriminatorTypeComposer<TContext> {
+      static schemaComposer = sc || schemaComposer;
+    }
+
+    return _DiscriminatorTypeComposer;
+  }
 
-  constructor(baseModel: Model, opts?: any) {
+  /* ::
+  constructor(gqType: any): DiscriminatorTypeComposer<TContext> {
+    super(gqType);
+    return this;
+  }
+  */
+
+  static createFromModel(baseModel: Model, opts?: any): DiscriminatorTypeComposer<TContext> {
     if (!baseModel || !(baseModel: any).discriminators) {
       throw Error('Discriminator Key not Set, Use composeWithMongoose for Normal Collections');
     }
@@ -125,29 +139,31 @@ export class DiscriminatorTypeComposer extends TypeComposer {
       ...opts,
     };
 
-    super(composeWithMongoose(baseModel, opts.customizationOptions).gqType);
-
-    this.opts = opts;
-    this.childTCs = [];
-    this.discriminatorKey = (baseModel: any).schema.get('discriminatorKey') || '__t';
+    const baseTC = composeWithMongoose(baseModel, opts.customizationOptions);
 
-    this.schemaComposer =
+    const _DiscriminatorTypeComposer = this._getClassConnectedWithSchemaComposer(
       opts.customizationOptions && opts.customizationOptions.schemaComposer
-        ? opts.customizationOptions.schemaComposer
-        : schemaComposer;
+    );
+    const baseDTC = new _DiscriminatorTypeComposer(baseTC.getType());
+
+    baseDTC.opts = opts;
+    baseDTC.childTCs = [];
+    baseDTC.discriminatorKey = (baseModel: any).schema.get('discriminatorKey') || '__t';
 
     // discriminators an object containing all discriminators with key being DNames
-    this.DKeyETC = createAndSetDKeyETC(this, (baseModel: any).discriminators);
+    baseDTC.DKeyETC = createAndSetDKeyETC(baseDTC, (baseModel: any).discriminators);
 
-    reorderFields(this, (this.opts: any).reorderFields, this.discriminatorKey);
+    reorderFields(baseDTC, (baseDTC.opts: any).reorderFields, baseDTC.discriminatorKey);
 
-    this.DInterface = createDInterface(this);
-    this.setInterfaces([this.DInterface]);
+    baseDTC.DInterface = createDInterface(baseDTC);
+    baseDTC.setInterfaces([baseDTC.DInterface]);
 
-    this.schemaComposer.addSchemaMustHaveType(this);
+    baseDTC.schemaComposer.addSchemaMustHaveType(baseDTC);
 
     // prepare Base Resolvers
-    prepareBaseResolvers(this);
+    prepareBaseResolvers(baseDTC);
+
+    return baseDTC;
   }
 
   getDKey(): string {

yarn.lock

@@ -718,6 +718,10 @@ babel-plugin-syntax-async-functions@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-async-functions/-/babel-plugin-syntax-async-functions-6.13.0.tgz#cad9cad1191b5ad634bf30ae0872391e0647be95"
 
+babel-plugin-syntax-class-properties@^6.8.0:
+  version "6.13.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-syntax-class-properties/-/babel-plugin-syntax-class-properties-6.13.0.tgz#d7eb23b79a317f8543962c505b827c7d6cac27de"
+
 babel-plugin-syntax-exponentiation-operator@^6.8.0:
   version "6.13.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-syntax-exponentiation-operator/-/babel-plugin-syntax-exponentiation-operator-6.13.0.tgz#9ee7e8337290da95288201a6a57f4170317830de"
@@ -742,6 +746,15 @@ babel-plugin-transform-async-to-generator@^6.22.0:
     babel-plugin-syntax-async-functions "^6.8.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-class-properties@^6.24.1:
+  version "6.24.1"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-class-properties/-/babel-plugin-transform-class-properties-6.24.1.tgz#6a79763ea61d33d36f37b611aa9def81a81b46ac"
+  dependencies:
+    babel-helper-function-name "^6.24.1"
+    babel-plugin-syntax-class-properties "^6.8.0"
+    babel-runtime "^6.22.0"
+    babel-template "^6.24.1"
+
 babel-plugin-transform-es2015-arrow-functions@^6.22.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-es2015-arrow-functions/-/babel-plugin-transform-es2015-arrow-functions-6.22.0.tgz#452692cb711d5f79dc7f85e440ce41b9f244d221"