From 260df8036a07b5f5b004c6b8f0b70df423128d92 Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Tue, 9 Apr 2019 13:15:48 +0200
Subject: [PATCH 1/3] Allow to use {T} in mappers

---
 .../tests/mapping.spec.ts                     | 57 ++++++++++++++-----
 .../src/base-resolvers-visitor.ts             | 29 ++++++++--
 2 files changed, 67 insertions(+), 19 deletions(-)

diff --git a/packages/plugins/typescript-resolvers/tests/mapping.spec.ts b/packages/plugins/typescript-resolvers/tests/mapping.spec.ts
index 75c866f1de5..b4322609349 100644
--- a/packages/plugins/typescript-resolvers/tests/mapping.spec.ts
+++ b/packages/plugins/typescript-resolvers/tests/mapping.spec.ts
@@ -132,16 +132,16 @@ describe('ResolversTypes', () => {
     export type ResolversTypes = {
       Query: Partial<Query>,
       MyType: Partial<MyType>,
-      String: Scalars['String'],
+      String: Partial<Scalars['String']>,
       MyOtherType: Partial<MyOtherType>,
       Subscription: Partial<Subscription>,
-      Boolean: Scalars['Boolean'],
+      Boolean: Partial<Scalars['Boolean']>,
       Node: Partial<Node>,
-      ID: Scalars['ID'],
+      ID: Partial<Scalars['ID']>,
       SomeNode: Partial<SomeNode>,
       MyUnion: Partial<MyUnion>,
-      MyScalar: Scalars['MyScalar'],
-      Int: Scalars['Int'],
+      MyScalar: Partial<Scalars['MyScalar']>,
+      Int: Partial<Scalars['Int']>,
     };`);
   });
 
@@ -161,16 +161,16 @@ describe('ResolversTypes', () => {
     export type ResolversTypes = {
       Query: CustomPartial<Query>,
       MyType: CustomPartial<MyType>,
-      String: Scalars['String'],
+      String: CustomPartial<Scalars['String']>,
       MyOtherType: CustomPartial<MyOtherType>,
       Subscription: CustomPartial<Subscription>,
-      Boolean: Scalars['Boolean'],
+      Boolean: CustomPartial<Scalars['Boolean']>,
       Node: CustomPartial<Node>,
-      ID: Scalars['ID'],
+      ID: CustomPartial<Scalars['ID']>,
       SomeNode: CustomPartial<SomeNode>,
       MyUnion: CustomPartial<MyUnion>,
-      MyScalar: Scalars['MyScalar'],
-      Int: Scalars['Int'],
+      MyScalar: CustomPartial<Scalars['MyScalar']>,
+      Int: CustomPartial<Scalars['Int']>,
     };`);
   });
 
@@ -208,10 +208,10 @@ describe('ResolversTypes', () => {
     export type ResolversTypes = {
       Query: Partial<Omit<Query, 'me'> & { me: Maybe<ResolversTypes['User']> }>,
       User: number,
-      ID: Scalars['ID'],
-      String: Scalars['String'],
+      ID: Partial<Scalars['ID']>,
+      String: Partial<Scalars['String']>,
       Chat: Partial<Omit<Chat, 'owner' | 'members'> & { owner: ResolversTypes['User'], members: Maybe<Array<ResolversTypes['User']>> }>,
-      Boolean: Scalars['Boolean'],
+      Boolean: Partial<Scalars['Boolean']>,
     };
     `);
 
@@ -311,6 +311,37 @@ describe('ResolversTypes', () => {
     };`);
   });
 
+  it('Should handle {T} in a mapper', async () => {
+    const result = await plugin(
+      schema,
+      [],
+      {
+        noSchemaStitching: true,
+        mappers: {
+          MyType: 'Partial<{T}>',
+        },
+      },
+      { outputFile: '' }
+    );
+
+    expect(result).toBeSimilarStringTo(`
+      export type ResolversTypes = {
+        Query: Omit<Query, 'something'> & { something: ResolversTypes['MyType'] },
+        MyType: Partial<MyType>,
+        String: Scalars['String'],
+        MyOtherType: MyOtherType,
+        Subscription: Subscription,
+        Boolean: Scalars['Boolean'],
+        Node: Node,
+        ID: Scalars['ID'],
+        SomeNode: SomeNode,
+        MyUnion: MyUnion,
+        MyScalar: Scalars['MyScalar'],
+        Int: Scalars['Int'],
+      };
+    `);
+  });
+
   it('should warn about unused mappers by default', async () => {
     const spy = jest.spyOn(console, 'warn').mockImplementation();
     const testSchema = buildSchema(/* GraphQL */ `
diff --git a/packages/plugins/visitor-plugin-common/src/base-resolvers-visitor.ts b/packages/plugins/visitor-plugin-common/src/base-resolvers-visitor.ts
index a9ba5067407..5258d044d96 100644
--- a/packages/plugins/visitor-plugin-common/src/base-resolvers-visitor.ts
+++ b/packages/plugins/visitor-plugin-common/src/base-resolvers-visitor.ts
@@ -180,12 +180,15 @@ export class BaseResolversVisitor<TRawConfig extends RawResolversConfig = RawRes
 
         let shouldApplyOmit = false;
 
-        if (this.config.mappers[typeName] && this.config.mappers[typeName].type) {
+        const isMapped = this.config.mappers[typeName];
+        const isScalar = this.config.scalars[typeName];
+
+        if (isMapped && this.config.mappers[typeName].type) {
           this.markMapperAsUsed(typeName);
           prev[typeName] = this.config.mappers[typeName].type;
-        } else if (this.config.defaultMapper && this.config.defaultMapper.type && !this.config.defaultMapper.type.includes('{T}')) {
+        } else if (this.config.defaultMapper && this.config.defaultMapper.type && !hasPlaceholder(this.config.defaultMapper.type)) {
           prev[typeName] = this.config.defaultMapper.type;
-        } else if (this.config.scalars[typeName]) {
+        } else if (isScalar) {
           prev[typeName] = this._getScalar(typeName);
         } else {
           shouldApplyOmit = true;
@@ -193,7 +196,8 @@ export class BaseResolversVisitor<TRawConfig extends RawResolversConfig = RawRes
         }
 
         const schemaType = allSchemaTypes[typeName];
-        if ((shouldApplyOmit && prev[typeName] !== 'any' && isObjectType(schemaType)) || (isInterfaceType(schemaType) && !this.config.mappers[typeName])) {
+
+        if ((shouldApplyOmit && prev[typeName] !== 'any' && isObjectType(schemaType)) || (isInterfaceType(schemaType) && !isMapped)) {
           const fields = schemaType.getFields();
           const relevantFields = Object.keys(fields)
             .map(fieldName => {
@@ -216,8 +220,13 @@ export class BaseResolversVisitor<TRawConfig extends RawResolversConfig = RawRes
           }
         }
 
-        if (!this.config.scalars[typeName] && !this.config.mappers[typeName] && this.config.defaultMapper && this.config.defaultMapper.type.includes('{T}')) {
-          prev[typeName] = this.config.defaultMapper.type.replace('{T}', prev[typeName]);
+        if (isMapped && hasPlaceholder(prev[typeName])) {
+          prev[typeName] = replacePlaceholder(prev[typeName], typeName);
+        }
+
+        if (!isMapped && this.config.defaultMapper && this.config.defaultMapper.type && hasPlaceholder(this.config.defaultMapper.type)) {
+          const name = isScalar ? this._getScalar(typeName) : prev[typeName];
+          prev[typeName] = replacePlaceholder(this.config.defaultMapper.type, name);
         }
 
         return prev;
@@ -589,3 +598,11 @@ export type IDirectiveResolvers${contextType} = ${name}<Context>;`
     return null;
   }
 }
+
+function replacePlaceholder(pattern: string, typename: string): string {
+  return pattern.replace('{T}', typename);
+}
+
+function hasPlaceholder(pattern: string): boolean {
+  return pattern.includes('{T}');
+}

From ba6aa483bb959320ed35ab01adc129f693096d85 Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Tue, 9 Apr 2019 13:22:30 +0200
Subject: [PATCH 2/3] hasDefaultMapper

---
 .../visitor-plugin-common/src/base-resolvers-visitor.ts      | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/packages/plugins/visitor-plugin-common/src/base-resolvers-visitor.ts b/packages/plugins/visitor-plugin-common/src/base-resolvers-visitor.ts
index 5258d044d96..3e1584a4c5a 100644
--- a/packages/plugins/visitor-plugin-common/src/base-resolvers-visitor.ts
+++ b/packages/plugins/visitor-plugin-common/src/base-resolvers-visitor.ts
@@ -182,11 +182,12 @@ export class BaseResolversVisitor<TRawConfig extends RawResolversConfig = RawRes
 
         const isMapped = this.config.mappers[typeName];
         const isScalar = this.config.scalars[typeName];
+        const hasDefaultMapper = !!(this.config.defaultMapper && this.config.defaultMapper.type);
 
         if (isMapped && this.config.mappers[typeName].type) {
           this.markMapperAsUsed(typeName);
           prev[typeName] = this.config.mappers[typeName].type;
-        } else if (this.config.defaultMapper && this.config.defaultMapper.type && !hasPlaceholder(this.config.defaultMapper.type)) {
+        } else if (hasDefaultMapper && !hasPlaceholder(this.config.defaultMapper.type)) {
           prev[typeName] = this.config.defaultMapper.type;
         } else if (isScalar) {
           prev[typeName] = this._getScalar(typeName);
@@ -224,7 +225,7 @@ export class BaseResolversVisitor<TRawConfig extends RawResolversConfig = RawRes
           prev[typeName] = replacePlaceholder(prev[typeName], typeName);
         }
 
-        if (!isMapped && this.config.defaultMapper && this.config.defaultMapper.type && hasPlaceholder(this.config.defaultMapper.type)) {
+        if (!isMapped && hasDefaultMapper && hasPlaceholder(this.config.defaultMapper.type)) {
           const name = isScalar ? this._getScalar(typeName) : prev[typeName];
           prev[typeName] = replacePlaceholder(this.config.defaultMapper.type, name);
         }

From d82baad3587a489dfcdc0728c88e67ca550506db Mon Sep 17 00:00:00 2001
From: Kamil Kisiela <kamil.kisiela@gmail.com>
Date: Tue, 9 Apr 2019 13:34:46 +0200
Subject: [PATCH 3/3] Fix flow tests

---
 .../flow-resolvers/tests/mapping.spec.ts      | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/packages/plugins/flow-resolvers/tests/mapping.spec.ts b/packages/plugins/flow-resolvers/tests/mapping.spec.ts
index b4da573f499..79a20de5486 100644
--- a/packages/plugins/flow-resolvers/tests/mapping.spec.ts
+++ b/packages/plugins/flow-resolvers/tests/mapping.spec.ts
@@ -614,16 +614,16 @@ describe('ResolversTypes', () => {
     export type ResolversTypes = {
       Query: $Shape<Query>,
       MyType: $Shape<MyType>,
-      String: $ElementType<Scalars, 'String'>,
+      String: $Shape<$ElementType<Scalars, 'String'>>,
       MyOtherType: $Shape<MyOtherType>,
       Subscription: $Shape<Subscription>,
-      Boolean: $ElementType<Scalars, 'Boolean'>,
+      Boolean: $Shape<$ElementType<Scalars, 'Boolean'>>,
       Node: $Shape<Node>,
-      ID: $ElementType<Scalars, 'ID'>,
+      ID: $Shape<$ElementType<Scalars, 'ID'>>,
       SomeNode: $Shape<SomeNode>,
       MyUnion: $Shape<MyUnion>,
-      MyScalar: $ElementType<Scalars, 'MyScalar'>,
-      Int: $ElementType<Scalars, 'Int'>,
+      MyScalar: $Shape<$ElementType<Scalars, 'MyScalar'>>,
+      Int: $Shape<$ElementType<Scalars, 'Int'>>,
     };`);
   });
 
@@ -642,16 +642,16 @@ describe('ResolversTypes', () => {
     export type ResolversTypes = {
       Query: CustomPartial<Query>,
       MyType: CustomPartial<MyType>,
-      String: $ElementType<Scalars, 'String'>,
+      String: CustomPartial<$ElementType<Scalars, 'String'>>,
       MyOtherType: CustomPartial<MyOtherType>,
       Subscription: CustomPartial<Subscription>,
-      Boolean: $ElementType<Scalars, 'Boolean'>,
+      Boolean: CustomPartial<$ElementType<Scalars, 'Boolean'>>,
       Node: CustomPartial<Node>,
-      ID: $ElementType<Scalars, 'ID'>,
+      ID: CustomPartial<$ElementType<Scalars, 'ID'>>,
       SomeNode: CustomPartial<SomeNode>,
       MyUnion: CustomPartial<MyUnion>,
-      MyScalar: $ElementType<Scalars, 'MyScalar'>,
-      Int: $ElementType<Scalars, 'Int'>,
+      MyScalar: CustomPartial<$ElementType<Scalars, 'MyScalar'>>,
+      Int: CustomPartial<$ElementType<Scalars, 'Int'>>,
     };`);
   });
 });