Ensure backward compatibility when using defaultMappers with placeholder

Author: eddeee888

packages/plugins/other/visitor-plugin-common/src/base-resolvers-visitor.ts

@@ -788,10 +788,16 @@ export class BaseResolversVisitor<
       }
 
       if (!isMapped && hasDefaultMapper && hasPlaceholder(this.config.defaultMapper.type)) {
-        // Make sure the inner type has no ResolverTypeWrapper
-        const name = clearWrapper(isScalar ? this._getScalar(typeName) : prev[typeName]);
-        const replaced = replacePlaceholder(this.config.defaultMapper.type, name);
-        prev[typeName] = applyWrapper(replaced);
+        const originalTypeName = isScalar ? this._getScalar(typeName) : prev[typeName];
+
+        if (isUnionType(schemaType)) {
+          // Don't clear ResolverTypeWrapper from Unions
+          prev[typeName] = replacePlaceholder(this.config.defaultMapper.type, originalTypeName);
+        } else {
+          const name = clearWrapper(originalTypeName);
+          const replaced = replacePlaceholder(this.config.defaultMapper.type, name);
+          prev[typeName] = applyWrapper(replaced);
+        }
       }
 
       return prev;

packages/plugins/typescript/resolvers/tests/mapping.spec.ts

@@ -365,13 +365,13 @@ describe('ResolversTypes', () => {
       String: ResolverTypeWrapper<Partial<Scalars['String']>>;
       Child: ResolverTypeWrapper<Partial<Child>>;
       MyOtherType: ResolverTypeWrapper<Partial<MyOtherType>>;
-      ChildUnion: ResolverTypeWrapper<Partial<ResolversUnionTypes['ChildUnion']>>;
+      ChildUnion: Partial<ResolverTypeWrapper<ResolversUnionTypes['ChildUnion']>>;
       Query: ResolverTypeWrapper<{}>;
       Subscription: ResolverTypeWrapper<{}>;
       Node: ResolversTypes['SomeNode'];
       ID: ResolverTypeWrapper<Partial<Scalars['ID']>>;
       SomeNode: ResolverTypeWrapper<Partial<SomeNode>>;
-      MyUnion: ResolverTypeWrapper<Partial<ResolversUnionTypes['MyUnion']>>;
+      MyUnion: Partial<ResolverTypeWrapper<ResolversUnionTypes['MyUnion']>>;
       MyScalar: ResolverTypeWrapper<Partial<Scalars['MyScalar']>>;
       Int: ResolverTypeWrapper<Partial<Scalars['Int']>>;
       Boolean: ResolverTypeWrapper<Partial<Scalars['Boolean']>>;
@@ -420,13 +420,13 @@ describe('ResolversTypes', () => {
       String: ResolverTypeWrapper<CustomPartial<Scalars['String']>>;
       Child: ResolverTypeWrapper<CustomPartial<Child>>;
       MyOtherType: ResolverTypeWrapper<CustomPartial<MyOtherType>>;
-      ChildUnion: ResolverTypeWrapper<CustomPartial<ResolversUnionTypes['ChildUnion']>>;
+      ChildUnion: CustomPartial<ResolverTypeWrapper<ResolversUnionTypes['ChildUnion']>>;
       Query: ResolverTypeWrapper<{}>;
       Subscription: ResolverTypeWrapper<{}>;
       Node: ResolversTypes['SomeNode'];
       ID: ResolverTypeWrapper<CustomPartial<Scalars['ID']>>;
       SomeNode: ResolverTypeWrapper<CustomPartial<SomeNode>>;
-      MyUnion: ResolverTypeWrapper<CustomPartial<ResolversUnionTypes['MyUnion']>>;
+      MyUnion: CustomPartial<ResolverTypeWrapper<ResolversUnionTypes['MyUnion']>>;
       MyScalar: ResolverTypeWrapper<CustomPartial<Scalars['MyScalar']>>;
       Int: ResolverTypeWrapper<CustomPartial<Scalars['Int']>>;
       Boolean: ResolverTypeWrapper<CustomPartial<Scalars['Boolean']>>;
@@ -1706,13 +1706,13 @@ describe('ResolversTypes', () => {
         String: ResolverTypeWrapper<MyNamespace.MyDefaultMapper<Scalars['String']>>;
         Child: ResolverTypeWrapper<MyNamespace.MyDefaultMapper<Omit<Child, 'parent'> & { parent?: Maybe<ResolversTypes['MyType']> }>>;
         MyOtherType: ResolverTypeWrapper<MyNamespace.MyDefaultMapper<MyOtherType>>;
-        ChildUnion: ResolverTypeWrapper<MyNamespace.MyDefaultMapper<ResolversUnionTypes['ChildUnion']>>;
+        ChildUnion: MyNamespace.MyDefaultMapper<ResolverTypeWrapper<ResolversUnionTypes['ChildUnion']>>;
         Query: ResolverTypeWrapper<{}>;
         Subscription: ResolverTypeWrapper<{}>;
         Node: ResolversTypes['SomeNode'];
         ID: ResolverTypeWrapper<MyNamespace.MyDefaultMapper<Scalars['ID']>>;
         SomeNode: ResolverTypeWrapper<MyNamespace.MyDefaultMapper<SomeNode>>;
-        MyUnion: ResolverTypeWrapper<MyNamespace.MyDefaultMapper<ResolversUnionTypes['MyUnion']>>;
+        MyUnion: MyNamespace.MyDefaultMapper<ResolverTypeWrapper<ResolversUnionTypes['MyUnion']>>;
         MyScalar: ResolverTypeWrapper<MyNamespace.MyDefaultMapper<Scalars['MyScalar']>>;
         Int: ResolverTypeWrapper<MyNamespace.MyDefaultMapper<Scalars['Int']>>;
         Boolean: ResolverTypeWrapper<MyNamespace.MyDefaultMapper<Scalars['Boolean']>>;