Fix overwriting providers

Signed-off-by: Arda TANRIKULU <[email protected]>
Urigo · Mar 14, 2019 · ec07aed · ec07aed
1 parent 992406c
commit ec07aed
Show file tree

Hide file tree

Showing 4 changed files with 66 additions and 41 deletions.
diff --git a/docs/introduction/test-your-module.md b/docs/introduction/test-your-module.md
@@ -30,7 +30,6 @@ export const UserModule = new GraphQLModule({
     }
     
     type Query {
-      me: User
       userById(id: String!): User
     }
   `,
@@ -40,56 +39,27 @@ export const UserModule = new GraphQLModule({
       username: user => user.username,
     },
     Query: {
-      me: (root, args, { currentUser }) => currentUser,
       userById: (root, { id }, injector) =>
         injector.get(UsersProvider).getUserById(id),
     },
   },
 });
 ```
 
-You can mock context and providers by importing the existing module together with resolvers into a new testing module like below;
+You can mock providers by overwriting the existing provider definitions;
 
 tests/user.module.spec.ts
 ```typescript
   import { UserModule } from '../modules/user/user.module';
   import { execute } from 'graphql';
   describe('UserModule', async () => {
-    it('FieldResolver of Query: me', async () => {
-      const { schema, context } = new GraphQLModule({
-        imports: [UserModule],
-        resolvers: UserModule.resolvers,
-        context: { currentUser: { id: 'ID', username: 'USERNAME' } }
-      });
-      const result = await execute({
-        schema,
-        document: gql`
-          query {
-            me {
-              id
-              username
-            }
-          }
-        `,
-        contextValue: await context({}),
-      });
-      expect(result.errors).toBeFalsy();
-      expect(result.data['me']['id']).toBe('ID');
-      expect(result.data['me']['username']).toBe('USERNAME');
-    });
     it('FieldResolver of Query: userById', async () => {
-      const { schema, context } = new GraphQLModule({
-        imports: [UserModule],
-        resolvers: UserModule.resolvers,
-        providers: [
-          {
-            provide: UserProvider,
-            overwrite: true,
-            useValue: {
-              userById: (id: string) => { id, username: 'NAME' }
-            }
-          }
-        ]
+      UserModule.injector.provide({
+        provide: UserProvider,
+        overwrite: true,
+        useValue: {
+          userById: (id: string) => { id, username: 'USERNAME' }
+        }
       });
       const result = await execute({
         schema,

diff --git a/packages/di/src/injector.ts b/packages/di/src/injector.ts
@@ -33,7 +33,7 @@ export class Injector {
 
     if (isTypeProvider(provider)) {
       const options: ProviderOptions = Reflect.getMetadata(PROVIDER_OPTIONS, provider);
-      if (options && !options.overwrite && this.has(provider)) {
+      if (this.has(provider)) {
         throw new ProviderAlreadyDefinedError(this._name, provider);
       }
       this._classMap.set(provider, provider);
@@ -51,8 +51,26 @@ export class Injector {
       return;
     }
 
-    if (!provider.overwrite && this.has(provider.provide)) {
-      throw new ProviderAlreadyDefinedError(this._name, provider.provide);
+    if (this.has(provider.provide)) {
+      if (!provider.overwrite) {
+        throw new ProviderAlreadyDefinedError(this._name, provider.provide);
+      } else {
+        this._classMap.delete(provider.provide);
+        this._factoryMap.delete(provider.provide);
+        this._instanceMap.delete(provider.provide);
+        this._applicationScopeServiceIdentifiers.splice(
+          this._applicationScopeServiceIdentifiers.indexOf(provider.provide),
+          1,
+        );
+        this._sessionScopeServiceIdentifiers.splice(
+          this._applicationScopeServiceIdentifiers.indexOf(provider.provide),
+          1,
+        );
+        this._requestScopeServiceIdentifiers.splice(
+          this._applicationScopeServiceIdentifiers.indexOf(provider.provide),
+          1,
+        );
+      }
     }
 
     if (isValueProvider(provider)) {

diff --git a/packages/di/tests/di.spec.ts b/packages/di/tests/di.spec.ts
@@ -1,3 +1,26 @@
+import 'reflect-metadata';
+import { Injectable, Injector } from '../src';
+
 describe('Dependency Injection', async () => {
-  it('should do something', async () => {});
+  it('clear instances if provider is overwritten', async () => {
+    @Injectable()
+    class FooProvider {
+      foo() {
+        return 'FOO';
+      }
+    }
+    const injector = new Injector();
+    injector.provide(FooProvider);
+    expect(injector.get(FooProvider).foo()).toBe('FOO');
+    injector.provide({
+      provide: FooProvider,
+      overwrite: true,
+      useValue: {
+        foo() {
+          return 'BAR';
+        },
+      },
+    });
+    expect(injector.get(FooProvider).foo()).toBe('BAR');
+  });
 });
diff --git a/packages/di/tests/tsconfig.json b/packages/di/tests/tsconfig.json
@@ -0,0 +1,14 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "target": "es2018",
+    "lib": [
+      "es2018",
+      "esnext.asynciterable"
+    ],
+    "moduleResolution": "node",
+    "emitDecoratorMetadata": true,
+    "outDir": "../dist/tests",
+  }
+}