Merge branch 'master' of github.com:Urigo/graphql-modules

Urigo · Mar 14, 2019 · 93135db · 93135db
2 parents abb1680 + 501ce4e
commit 93135db
Show file tree

Hide file tree

Showing 12 changed files with 766 additions and 542 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
       ignore:
       - gh-pages
     docker:
-    - image: circleci/node:10.15.1-browsers-legacy
+    - image: circleci/node:10.15.3-browsers-legacy
     steps:
       - checkout
       - restore_cache:

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,57 +39,31 @@ 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' }
-            }
-          }
-        ]
+      const { schema, context, injector } = UserModule;
+
+      injector.provide({
+        provide: UserProvider,
+        overwrite: true,
+        useValue: {
+          userById: (id: string) => { id, username: 'USERNAME' }
+        }
       });
+
       const result = await execute({
         schema,
         document: gql`

diff --git a/docs/introduction/your-first-module.md b/docs/introduction/your-first-module.md
@@ -13,6 +13,7 @@ Here is a quick example:
 `modules/my-first-module/index.ts`
 ```typescript
 import { GraphQLModule } from '@graphql-modules/core';
+import gql from "graphql-tag";
 
 export const MyFirstModule = new GraphQLModule({
     typeDefs: gql`

diff --git a/package.json b/package.json
@@ -24,10 +24,10 @@
     "@types/graphql": "14.0.7",
     "@types/jest": "24.0.1",
     "graphql": "14.1.1",
-    "jest": "24.1.0",
+    "jest": "24.5.0",
     "lerna": "2.11.0",
     "reflect-metadata": "0.1.13",
-    "replace-in-file": "3.4.3",
+    "replace-in-file": "3.4.4",
     "rimraf": "2.6.3",
     "ts-jest": "24.0.0",
     "typedoc": "0.13.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "clean": "rm -rf dist",
     "prebuild": "yarn clean",
-    "build": "tsc",
+    "build": "tsc -m esnext --outDir dist/esnext && tsc -m commonjs --outDir dist/commonjs",
     "test": "jest",
     "lint": "tslint -c ../../tslint.json 'src/**/*.ts' --format stylish"
   },
@@ -33,7 +33,7 @@
   "dependencies": {
     "esm":"3.2.16",
     "@graphql-modules/di": "0.4.2",
-    "graphql-toolkit": "0.0.5",
+    "graphql-toolkit": "0.2.6",
     "graphql-tools": "4.0.4",
     "tslib": "1.9.3"
   },
@@ -42,15 +42,15 @@
     "apollo-client": "2.4.12",
     "apollo-link-schema": "1.1.6",
     "graphql-tag": "2.10.1",
-    "jest": "24.1.0",
+    "jest": "24.5.0",
     "tslint": "5.12.1",
     "typescript": "3.3.3"
   },
-  "main": "cjs/index.js",
-  "module": "dist/index.js",
-  "typings": "./dist/index.d.ts",
+  "main": "dist/commonjs/index.js",
+  "module": "dist/esnext/index.js",
+  "typings": "dist/esnext/index.d.ts",
   "typescript": {
-    "definition": "./dist/index.d.ts"
+    "definition": "dist/esnext/index.d.ts"
   },
   "publishConfig": {
     "access": "public"

diff --git a/packages/core/src/graphql-module.ts b/packages/core/src/graphql-module.ts
@@ -1,5 +1,5 @@
 import { IResolvers, SchemaDirectiveVisitor, mergeSchemas, IDirectiveResolvers, makeExecutableSchema, IResolverValidationOptions } from 'graphql-tools';
-import { mergeGraphQLSchemas, mergeResolvers, IResolversComposerMapping, composeResolvers , getSchemaDirectiveFromDirectiveResolver } from 'graphql-toolkit';
+import { mergeResolvers, IResolversComposerMapping, composeResolvers , getSchemaDirectiveFromDirectiveResolver, mergeTypeDefs } from 'graphql-toolkit';
 import { Provider, Injector, ProviderScope, ServiceIdentifier } from '@graphql-modules/di';
 import { DocumentNode, GraphQLSchema, parse, GraphQLScalarType } from 'graphql';
 import { SchemaNotValidError, DependencyModuleUndefinedError, TypeDefNotFoundError, ModuleConfigRequiredError, IllegalResolverInvocationError, ContextBuilderError } from './errors';
@@ -405,7 +405,7 @@ export class GraphQLModule<Config = any, Session = any, Context = any> {
       }
       typeDefsArr = typeDefsArr.concat(this.extraSchemas);
       if (typeDefsArr.length) {
-        this._cache.typeDefs = mergeGraphQLSchemas(typeDefsArr, {
+        this._cache.typeDefs = mergeTypeDefs(typeDefsArr, {
           useSchemaDefinition: false,
         });
       } else {
@@ -568,7 +568,7 @@ export class GraphQLModule<Config = any, Session = any, Context = any> {
       if (typeof typeDefsDefinitions === 'string') {
         typeDefs = parse(typeDefsDefinitions);
       } else if (Array.isArray(typeDefsDefinitions)) {
-        typeDefs = mergeGraphQLSchemas(typeDefsDefinitions, {
+        typeDefs = mergeTypeDefs(typeDefsDefinitions, {
           useSchemaDefinition: false,
         });
       } else if (typeDefsDefinitions) {

diff --git a/packages/di/package.json b/packages/di/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "clean": "rm -rf dist",
     "prebuild": "yarn clean",
-    "build": "tsc",
+    "build": "tsc -m esnext --outDir dist/esnext && tsc -m commonjs --outDir dist/commonjs",
     "test": "jest",
     "lint": "tslint -c ../../tslint.json 'src/**/*.ts' --format stylish"
   },
@@ -38,19 +38,19 @@
     "reflect-metadata": "^0.1.12"
   },
   "devDependencies": {
-    "jest": "24.1.0",
+    "jest": "24.5.0",
     "reflect-metadata": "0.1.13",
     "tslint": "5.12.1",
     "typescript": "3.3.3"
   },
   "dependencies": {
     "tslib": "1.9.3"
   },
-  "main": "cjs/index.js",
-  "module": "dist/index.js",
-  "typings": "./dist/index.d.ts",
+  "main": "dist/commonjs/index.js",
+  "module": "dist/esnext/index.js",
+  "typings": "dist/esnext/index.d.ts",
   "typescript": {
-    "definition": "./dist/index.d.ts"
+    "definition": "dist/esnext/index.d.ts"
   },
   "publishConfig": {
     "access": "public"

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",
+  }
+}
diff --git a/packages/graphql-modules/package.json b/packages/graphql-modules/package.json
@@ -7,7 +7,7 @@
   "scripts": {
     "clean": "rm -rf dist",
     "prebuild": "yarn clean",
-    "build": "tsc",
+    "build": "tsc -m esnext --outDir dist/esnext && tsc -m commonjs --outDir dist/commonjs",
     "test": "jest",
     "lint": "tslint -c ../../tslint.json 'src/**/*.ts' --format stylish"
   },
@@ -35,19 +35,19 @@
     ]
   },
   "devDependencies": {
-    "jest": "24.1.0",
+    "jest": "24.5.0",
     "tslint": "5.12.1",
     "typescript": "3.3.3"
   },
   "dependencies": {
     "@graphql-modules/core": "0.4.2",
     "tslib": "1.9.3"
   },
-  "main": "cjs/index.js",
-  "module": "dist/index.js",
-  "typings": "./dist/index.d.ts",
+  "main": "dist/commonjs/index.js",
+  "module": "dist/esnext/index.js",
+  "typings": "dist/esnext/index.d.ts",
   "typescript": {
-    "definition": "./dist/index.d.ts"
+    "definition": "dist/esnext/index.d.ts"
   },
   "publishConfig": {
     "access": "public"