@graphql-codegen/visitor-plugin-common 3.0.2-alpha-20230306101700-e8822ec25 → 3.0.2-alpha-20230306130010-da1dc7695

package/cjs/base-resolvers-visitor.js

@@ -50,6 +50,8 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         this._usedMappers = {};
         this._resolversTypes = {};
         this._resolversParentTypes = {};
+        this._hasReferencedResolversUnionTypes = false;
+        this._resolversUnionTypes = {};
         this._rootTypeNames = new Set();
         this._globalDeclarations = new Set();
         this._hasScalars = false;
@@ -61,6 +63,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         this._variablesTransformer = new variables_to_object_js_1.OperationVariablesToObject(this.scalars, this.convertName, this.config.namespacedImportName);
         this._resolversTypes = this.createResolversFields(type => this.applyResolverTypeWrapper(type), type => this.clearResolverTypeWrapper(type), name => this.getTypeToUse(name));
         this._resolversParentTypes = this.createResolversFields(type => type, type => type, name => this.getParentTypeToUse(name), namedType => !(0, graphql_1.isEnumType)(namedType));
+        this._resolversUnionTypes = this.createResolversUnionTypes();
         this._fieldContextTypeMap = this.createFieldContextTypeMap();
         this._directiveContextTypesMap = this.createDirectivedContextType();
         this._directiveResolverMappings = (_a = rawConfig.directiveResolverMappings) !== null && _a !== void 0 ? _a : {};
@@ -122,7 +125,6 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             if (typeName.startsWith('__') || (shouldInclude && !shouldInclude(schemaType))) {
                 return prev;
             }
-            let shouldApplyOmit = false;
             const isRootType = this._rootTypeNames.has(typeName);
             const isMapped = this.config.mappers[typeName];
             const isScalar = this.config.scalars[typeName];
@@ -131,7 +133,7 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
                 prev[typeName] = applyWrapper(this.config.rootValueType.type);
                 return prev;
             }
-            if (isMapped && this.config.mappers[typeName].type) {
+            if (isMapped && this.config.mappers[typeName].type && !hasPlaceholder(this.config.mappers[typeName].type)) {
                 this.markMapperAsUsed(typeName);
                 prev[typeName] = applyWrapper(this.config.mappers[typeName].type);
             }
@@ -162,71 +164,45 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
                 prev[typeName] = applyWrapper(this._getScalar(typeName));
             }
             else if ((0, graphql_1.isUnionType)(schemaType)) {
-                prev[typeName] = schemaType
-                    .getTypes()
-                    .map(type => getTypeToUse(type.name))
-                    .join(' | ');
+                this._hasReferencedResolversUnionTypes = true;
+                const resolversType = this.convertName('ResolversUnionTypes');
+                prev[typeName] = applyWrapper(`${resolversType}['${typeName}']`);
             }
             else if ((0, graphql_1.isEnumType)(schemaType)) {
                 prev[typeName] = this.convertName(typeName, { useTypesPrefix: this.config.enumPrefix }, true);
             }
             else {
-                shouldApplyOmit = true;
                 prev[typeName] = this.convertName(typeName, {}, true);
-            }
-            if (shouldApplyOmit && prev[typeName] !== 'any' && (0, graphql_1.isObjectType)(schemaType)) {
-                const fields = schemaType.getFields();
-                const relevantFields = this._federation
-                    .filterFieldNames(Object.keys(fields))
-                    .filter(fieldName => {
-                    const field = fields[fieldName];
-                    const baseType = (0, plugin_helpers_1.getBaseType)(field.type);
-                    // Filter out fields of types that are not included
-                    if (shouldInclude && !shouldInclude(baseType)) {
-                        return false;
-                    }
-                    return true;
-                })
-                    .map(fieldName => {
-                    const field = fields[fieldName];
-                    const baseType = (0, plugin_helpers_1.getBaseType)(field.type);
-                    const isUnion = (0, graphql_1.isUnionType)(baseType);
-                    if (!this.config.mappers[baseType.name] && !isUnion && !this._shouldMapType[baseType.name]) {
-                        return null;
+                if (prev[typeName] !== 'any' && (0, graphql_1.isObjectType)(schemaType)) {
+                    const relevantFields = this.getRelevantFieldsToOmit({
+                        schemaType,
+                        getTypeToUse,
+                        shouldInclude,
+                    });
+                    // If relevantFields, puts ResolverTypeWrapper on top of an entire type
+                    let internalType = relevantFields.length > 0 ? this.replaceFieldsInType(prev[typeName], relevantFields) : prev[typeName];
+                    if (isMapped) {
+                        // replace the placeholder with the actual type
+                        if (hasPlaceholder(internalType)) {
+                            internalType = replacePlaceholder(internalType, typeName);
+                        }
+                        if (this.config.mappers[typeName].type && hasPlaceholder(this.config.mappers[typeName].type)) {
+                            internalType = replacePlaceholder(this.config.mappers[typeName].type, internalType);
+                        }
                     }
-                    const addOptionalSign = !this.config.avoidOptionals && !(0, graphql_1.isNonNullType)(field.type);
-                    return {
-                        addOptionalSign,
-                        fieldName,
-                        replaceWithType: (0, utils_js_1.wrapTypeWithModifiers)(getTypeToUse(baseType.name), field.type, {
-                            wrapOptional: this.applyMaybe,
-                            wrapArray: this.wrapWithArray,
-                        }),
-                    };
-                })
-                    .filter(a => a);
-                if (relevantFields.length > 0) {
-                    // Puts ResolverTypeWrapper on top of an entire type
-                    prev[typeName] = applyWrapper(this.replaceFieldsInType(prev[typeName], relevantFields));
-                }
-                else {
-                    // We still want to use ResolverTypeWrapper, even if we don't touch any fields
-                    prev[typeName] = applyWrapper(prev[typeName]);
+                    prev[typeName] = applyWrapper(internalType);
                 }
             }
-            if (isMapped && hasPlaceholder(prev[typeName])) {
-                prev[typeName] = replacePlaceholder(prev[typeName], typeName);
-            }
             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);
-                // Don't wrap Union with ResolverTypeWrapper, each inner type already has it
+                const originalTypeName = isScalar ? this._getScalar(typeName) : prev[typeName];
                 if ((0, graphql_1.isUnionType)(schemaType)) {
-                    prev[typeName] = replaced;
+                    // Don't clear ResolverTypeWrapper from Unions
+                    prev[typeName] = replacePlaceholder(this.config.defaultMapper.type, originalTypeName);
                 }
                 else {
-                    prev[typeName] = applyWrapper(replacePlaceholder(this.config.defaultMapper.type, name));
+                    const name = clearWrapper(originalTypeName);
+                    const replaced = replacePlaceholder(this.config.defaultMapper.type, name);
+                    prev[typeName] = applyWrapper(replaced);
                 }
             }
             return prev;
@@ -265,6 +241,54 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         }
         return `Array<${t}>`;
     }
+    createResolversUnionTypes() {
+        if (!this._hasReferencedResolversUnionTypes) {
+            return {};
+        }
+        const allSchemaTypes = this._schema.getTypeMap();
+        const typeNames = this._federation.filterTypeNames(Object.keys(allSchemaTypes));
+        const unionTypes = typeNames.reduce((res, typeName) => {
+            const schemaType = allSchemaTypes[typeName];
+            if ((0, graphql_1.isUnionType)(schemaType)) {
+                const referencedTypes = schemaType.getTypes().map(unionMemberType => {
+                    var _a;
+                    const isUnionMemberMapped = this.config.mappers[unionMemberType.name];
+                    // 1. If mapped without placehoder, just use it without doing extra checks
+                    if (isUnionMemberMapped && !hasPlaceholder(isUnionMemberMapped.type)) {
+                        return isUnionMemberMapped.type;
+                    }
+                    // 2. Work out value for union member type
+                    // 2a. By default, use the typescript type
+                    let unionMemberValue = this.convertName(unionMemberType.name, {}, true);
+                    // 2b. Find fields to Omit if needed.
+                    //  - If no field to Omit, "type with maybe Omit" is typescript type i.e. no Omit
+                    //  - If there are fields to Omit, "type with maybe Omit"
+                    const fieldsToOmit = this.getRelevantFieldsToOmit({
+                        schemaType: unionMemberType,
+                        getTypeToUse: this.getTypeToUse,
+                    });
+                    if (fieldsToOmit.length > 0) {
+                        unionMemberValue = this.replaceFieldsInType(unionMemberValue, fieldsToOmit);
+                    }
+                    // 2c. If union member is mapped with placeholder, use the "type with maybe Omit" as {T}
+                    if (isUnionMemberMapped && hasPlaceholder(isUnionMemberMapped.type)) {
+                        return replacePlaceholder(isUnionMemberMapped.type, unionMemberValue);
+                    }
+                    // 2d. If has default mapper with placeholder, use the "type with maybe Omit" as {T}
+                    const hasDefaultMapper = !!((_a = this.config.defaultMapper) === null || _a === void 0 ? void 0 : _a.type);
+                    const isScalar = this.config.scalars[typeName];
+                    if (hasDefaultMapper && hasPlaceholder(this.config.defaultMapper.type)) {
+                        const finalTypename = isScalar ? this._getScalar(typeName) : unionMemberValue;
+                        return replacePlaceholder(this.config.defaultMapper.type, finalTypename);
+                    }
+                    return unionMemberValue;
+                });
+                res[typeName] = referencedTypes.map(type => `( ${type} )`).join(' | '); // Must wrap every union member in explicit "( )" to separate the members
+            }
+            return res;
+        }, {});
+        return unionTypes;
+    }
     createFieldContextTypeMap() {
         return this.config.fieldContextTypes.reduce((prev, fieldContextType) => {
             const items = fieldContextType.split('#');
@@ -309,6 +333,20 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
             .map(typeName => (0, utils_js_1.indent)(`${typeName}: ${this._resolversParentTypes[typeName]}${this.getPunctuation(declarationKind)}`))
             .join('\n')).string;
     }
+    buildResolversUnionTypes() {
+        if (Object.keys(this._resolversUnionTypes).length === 0) {
+            return '';
+        }
+        const declarationKind = 'type';
+        return new utils_js_1.DeclarationBlock(this._declarationBlockConfig)
+            .export()
+            .asKind(declarationKind)
+            .withName(this.convertName('ResolversUnionTypes'))
+            .withComment('Mapping of union types')
+            .withBlock(Object.entries(this._resolversUnionTypes)
+            .map(([typeName, value]) => (0, utils_js_1.indent)(`${typeName}: ${value}${this.getPunctuation(declarationKind)}`))
+            .join('\n')).string;
+    }
     get schema() {
         return this._schema;
     }
@@ -707,6 +745,38 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
     SchemaDefinition() {
         return null;
     }
+    getRelevantFieldsToOmit({ schemaType, shouldInclude, getTypeToUse, }) {
+        const fields = schemaType.getFields();
+        return this._federation
+            .filterFieldNames(Object.keys(fields))
+            .filter(fieldName => {
+            const field = fields[fieldName];
+            const baseType = (0, plugin_helpers_1.getBaseType)(field.type);
+            // Filter out fields of types that are not included
+            if (shouldInclude && !shouldInclude(baseType)) {
+                return false;
+            }
+            return true;
+        })
+            .map(fieldName => {
+            const field = fields[fieldName];
+            const baseType = (0, plugin_helpers_1.getBaseType)(field.type);
+            const isUnion = (0, graphql_1.isUnionType)(baseType);
+            if (!this.config.mappers[baseType.name] && !isUnion && !this._shouldMapType[baseType.name]) {
+                return null;
+            }
+            const addOptionalSign = !this.config.avoidOptionals && !(0, graphql_1.isNonNullType)(field.type);
+            return {
+                addOptionalSign,
+                fieldName,
+                replaceWithType: (0, utils_js_1.wrapTypeWithModifiers)(getTypeToUse(baseType.name), field.type, {
+                    wrapOptional: this.applyMaybe,
+                    wrapArray: this.wrapWithArray,
+                }),
+            };
+        })
+            .filter(a => a);
+    }
 }
 exports.BaseResolversVisitor = BaseResolversVisitor;
 function replacePlaceholder(pattern, typename) {

package/esm/base-resolvers-visitor.js

@@ -46,6 +46,8 @@ export class BaseResolversVisitor extends BaseVisitor {
         this._usedMappers = {};
         this._resolversTypes = {};
         this._resolversParentTypes = {};
+        this._hasReferencedResolversUnionTypes = false;
+        this._resolversUnionTypes = {};
         this._rootTypeNames = new Set();
         this._globalDeclarations = new Set();
         this._hasScalars = false;
@@ -57,6 +59,7 @@ export class BaseResolversVisitor extends BaseVisitor {
         this._variablesTransformer = new OperationVariablesToObject(this.scalars, this.convertName, this.config.namespacedImportName);
         this._resolversTypes = this.createResolversFields(type => this.applyResolverTypeWrapper(type), type => this.clearResolverTypeWrapper(type), name => this.getTypeToUse(name));
         this._resolversParentTypes = this.createResolversFields(type => type, type => type, name => this.getParentTypeToUse(name), namedType => !isEnumType(namedType));
+        this._resolversUnionTypes = this.createResolversUnionTypes();
         this._fieldContextTypeMap = this.createFieldContextTypeMap();
         this._directiveContextTypesMap = this.createDirectivedContextType();
         this._directiveResolverMappings = (_a = rawConfig.directiveResolverMappings) !== null && _a !== void 0 ? _a : {};
@@ -118,7 +121,6 @@ export class BaseResolversVisitor extends BaseVisitor {
             if (typeName.startsWith('__') || (shouldInclude && !shouldInclude(schemaType))) {
                 return prev;
             }
-            let shouldApplyOmit = false;
             const isRootType = this._rootTypeNames.has(typeName);
             const isMapped = this.config.mappers[typeName];
             const isScalar = this.config.scalars[typeName];
@@ -127,7 +129,7 @@ export class BaseResolversVisitor extends BaseVisitor {
                 prev[typeName] = applyWrapper(this.config.rootValueType.type);
                 return prev;
             }
-            if (isMapped && this.config.mappers[typeName].type) {
+            if (isMapped && this.config.mappers[typeName].type && !hasPlaceholder(this.config.mappers[typeName].type)) {
                 this.markMapperAsUsed(typeName);
                 prev[typeName] = applyWrapper(this.config.mappers[typeName].type);
             }
@@ -158,71 +160,45 @@ export class BaseResolversVisitor extends BaseVisitor {
                 prev[typeName] = applyWrapper(this._getScalar(typeName));
             }
             else if (isUnionType(schemaType)) {
-                prev[typeName] = schemaType
-                    .getTypes()
-                    .map(type => getTypeToUse(type.name))
-                    .join(' | ');
+                this._hasReferencedResolversUnionTypes = true;
+                const resolversType = this.convertName('ResolversUnionTypes');
+                prev[typeName] = applyWrapper(`${resolversType}['${typeName}']`);
             }
             else if (isEnumType(schemaType)) {
                 prev[typeName] = this.convertName(typeName, { useTypesPrefix: this.config.enumPrefix }, true);
             }
             else {
-                shouldApplyOmit = true;
                 prev[typeName] = this.convertName(typeName, {}, true);
-            }
-            if (shouldApplyOmit && prev[typeName] !== 'any' && isObjectType(schemaType)) {
-                const fields = schemaType.getFields();
-                const relevantFields = this._federation
-                    .filterFieldNames(Object.keys(fields))
-                    .filter(fieldName => {
-                    const field = fields[fieldName];
-                    const baseType = getBaseType(field.type);
-                    // Filter out fields of types that are not included
-                    if (shouldInclude && !shouldInclude(baseType)) {
-                        return false;
-                    }
-                    return true;
-                })
-                    .map(fieldName => {
-                    const field = fields[fieldName];
-                    const baseType = getBaseType(field.type);
-                    const isUnion = isUnionType(baseType);
-                    if (!this.config.mappers[baseType.name] && !isUnion && !this._shouldMapType[baseType.name]) {
-                        return null;
+                if (prev[typeName] !== 'any' && isObjectType(schemaType)) {
+                    const relevantFields = this.getRelevantFieldsToOmit({
+                        schemaType,
+                        getTypeToUse,
+                        shouldInclude,
+                    });
+                    // If relevantFields, puts ResolverTypeWrapper on top of an entire type
+                    let internalType = relevantFields.length > 0 ? this.replaceFieldsInType(prev[typeName], relevantFields) : prev[typeName];
+                    if (isMapped) {
+                        // replace the placeholder with the actual type
+                        if (hasPlaceholder(internalType)) {
+                            internalType = replacePlaceholder(internalType, typeName);
+                        }
+                        if (this.config.mappers[typeName].type && hasPlaceholder(this.config.mappers[typeName].type)) {
+                            internalType = replacePlaceholder(this.config.mappers[typeName].type, internalType);
+                        }
                     }
-                    const addOptionalSign = !this.config.avoidOptionals && !isNonNullType(field.type);
-                    return {
-                        addOptionalSign,
-                        fieldName,
-                        replaceWithType: wrapTypeWithModifiers(getTypeToUse(baseType.name), field.type, {
-                            wrapOptional: this.applyMaybe,
-                            wrapArray: this.wrapWithArray,
-                        }),
-                    };
-                })
-                    .filter(a => a);
-                if (relevantFields.length > 0) {
-                    // Puts ResolverTypeWrapper on top of an entire type
-                    prev[typeName] = applyWrapper(this.replaceFieldsInType(prev[typeName], relevantFields));
-                }
-                else {
-                    // We still want to use ResolverTypeWrapper, even if we don't touch any fields
-                    prev[typeName] = applyWrapper(prev[typeName]);
+                    prev[typeName] = applyWrapper(internalType);
                 }
             }
-            if (isMapped && hasPlaceholder(prev[typeName])) {
-                prev[typeName] = replacePlaceholder(prev[typeName], typeName);
-            }
             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);
-                // Don't wrap Union with ResolverTypeWrapper, each inner type already has it
+                const originalTypeName = isScalar ? this._getScalar(typeName) : prev[typeName];
                 if (isUnionType(schemaType)) {
-                    prev[typeName] = replaced;
+                    // Don't clear ResolverTypeWrapper from Unions
+                    prev[typeName] = replacePlaceholder(this.config.defaultMapper.type, originalTypeName);
                 }
                 else {
-                    prev[typeName] = applyWrapper(replacePlaceholder(this.config.defaultMapper.type, name));
+                    const name = clearWrapper(originalTypeName);
+                    const replaced = replacePlaceholder(this.config.defaultMapper.type, name);
+                    prev[typeName] = applyWrapper(replaced);
                 }
             }
             return prev;
@@ -261,6 +237,54 @@ export class BaseResolversVisitor extends BaseVisitor {
         }
         return `Array<${t}>`;
     }
+    createResolversUnionTypes() {
+        if (!this._hasReferencedResolversUnionTypes) {
+            return {};
+        }
+        const allSchemaTypes = this._schema.getTypeMap();
+        const typeNames = this._federation.filterTypeNames(Object.keys(allSchemaTypes));
+        const unionTypes = typeNames.reduce((res, typeName) => {
+            const schemaType = allSchemaTypes[typeName];
+            if (isUnionType(schemaType)) {
+                const referencedTypes = schemaType.getTypes().map(unionMemberType => {
+                    var _a;
+                    const isUnionMemberMapped = this.config.mappers[unionMemberType.name];
+                    // 1. If mapped without placehoder, just use it without doing extra checks
+                    if (isUnionMemberMapped && !hasPlaceholder(isUnionMemberMapped.type)) {
+                        return isUnionMemberMapped.type;
+                    }
+                    // 2. Work out value for union member type
+                    // 2a. By default, use the typescript type
+                    let unionMemberValue = this.convertName(unionMemberType.name, {}, true);
+                    // 2b. Find fields to Omit if needed.
+                    //  - If no field to Omit, "type with maybe Omit" is typescript type i.e. no Omit
+                    //  - If there are fields to Omit, "type with maybe Omit"
+                    const fieldsToOmit = this.getRelevantFieldsToOmit({
+                        schemaType: unionMemberType,
+                        getTypeToUse: this.getTypeToUse,
+                    });
+                    if (fieldsToOmit.length > 0) {
+                        unionMemberValue = this.replaceFieldsInType(unionMemberValue, fieldsToOmit);
+                    }
+                    // 2c. If union member is mapped with placeholder, use the "type with maybe Omit" as {T}
+                    if (isUnionMemberMapped && hasPlaceholder(isUnionMemberMapped.type)) {
+                        return replacePlaceholder(isUnionMemberMapped.type, unionMemberValue);
+                    }
+                    // 2d. If has default mapper with placeholder, use the "type with maybe Omit" as {T}
+                    const hasDefaultMapper = !!((_a = this.config.defaultMapper) === null || _a === void 0 ? void 0 : _a.type);
+                    const isScalar = this.config.scalars[typeName];
+                    if (hasDefaultMapper && hasPlaceholder(this.config.defaultMapper.type)) {
+                        const finalTypename = isScalar ? this._getScalar(typeName) : unionMemberValue;
+                        return replacePlaceholder(this.config.defaultMapper.type, finalTypename);
+                    }
+                    return unionMemberValue;
+                });
+                res[typeName] = referencedTypes.map(type => `( ${type} )`).join(' | '); // Must wrap every union member in explicit "( )" to separate the members
+            }
+            return res;
+        }, {});
+        return unionTypes;
+    }
     createFieldContextTypeMap() {
         return this.config.fieldContextTypes.reduce((prev, fieldContextType) => {
             const items = fieldContextType.split('#');
@@ -305,6 +329,20 @@ export class BaseResolversVisitor extends BaseVisitor {
             .map(typeName => indent(`${typeName}: ${this._resolversParentTypes[typeName]}${this.getPunctuation(declarationKind)}`))
             .join('\n')).string;
     }
+    buildResolversUnionTypes() {
+        if (Object.keys(this._resolversUnionTypes).length === 0) {
+            return '';
+        }
+        const declarationKind = 'type';
+        return new DeclarationBlock(this._declarationBlockConfig)
+            .export()
+            .asKind(declarationKind)
+            .withName(this.convertName('ResolversUnionTypes'))
+            .withComment('Mapping of union types')
+            .withBlock(Object.entries(this._resolversUnionTypes)
+            .map(([typeName, value]) => indent(`${typeName}: ${value}${this.getPunctuation(declarationKind)}`))
+            .join('\n')).string;
+    }
     get schema() {
         return this._schema;
     }
@@ -703,6 +741,38 @@ export class BaseResolversVisitor extends BaseVisitor {
     SchemaDefinition() {
         return null;
     }
+    getRelevantFieldsToOmit({ schemaType, shouldInclude, getTypeToUse, }) {
+        const fields = schemaType.getFields();
+        return this._federation
+            .filterFieldNames(Object.keys(fields))
+            .filter(fieldName => {
+            const field = fields[fieldName];
+            const baseType = getBaseType(field.type);
+            // Filter out fields of types that are not included
+            if (shouldInclude && !shouldInclude(baseType)) {
+                return false;
+            }
+            return true;
+        })
+            .map(fieldName => {
+            const field = fields[fieldName];
+            const baseType = getBaseType(field.type);
+            const isUnion = isUnionType(baseType);
+            if (!this.config.mappers[baseType.name] && !isUnion && !this._shouldMapType[baseType.name]) {
+                return null;
+            }
+            const addOptionalSign = !this.config.avoidOptionals && !isNonNullType(field.type);
+            return {
+                addOptionalSign,
+                fieldName,
+                replaceWithType: wrapTypeWithModifiers(getTypeToUse(baseType.name), field.type, {
+                    wrapOptional: this.applyMaybe,
+                    wrapArray: this.wrapWithArray,
+                }),
+            };
+        })
+            .filter(a => a);
+    }
 }
 function replacePlaceholder(pattern, typename) {
     return pattern.replace(/\{T\}/g, typename);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "3.0.2-alpha-20230306101700-e8822ec25",
+  "version": "3.0.2-alpha-20230306130010-da1dc7695",
   "peerDependencies": {
     "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },

package/typings/base-resolvers-visitor.d.cts

@@ -525,6 +525,8 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     };
     protected _resolversTypes: ResolverTypes;
     protected _resolversParentTypes: ResolverParentTypes;
+    protected _hasReferencedResolversUnionTypes: boolean;
+    protected _resolversUnionTypes: Record<string, string>;
     protected _rootTypeNames: Set<string>;
     protected _globalDeclarations: Set<string>;
     protected _federation: ApolloFederation;
@@ -539,20 +541,18 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     protected shouldMapType(type: GraphQLNamedType, duringCheck?: string[]): boolean;
     convertName(node: ASTNode | string, options?: BaseVisitorConvertOptions & ConvertOptions, applyNamespacedImport?: boolean): string;
     protected createResolversFields(applyWrapper: (str: string) => string, clearWrapper: (str: string) => string, getTypeToUse: (str: string) => string, shouldInclude?: (type: GraphQLNamedType) => boolean): ResolverTypes;
-    protected replaceFieldsInType(typeName: string, relevantFields: {
-        addOptionalSign: boolean;
-        fieldName: string;
-        replaceWithType: string;
-    }[]): string;
+    protected replaceFieldsInType(typeName: string, relevantFields: ReturnType<typeof this.getRelevantFieldsToOmit>): string;
     protected applyMaybe(str: string): string;
     protected applyResolverTypeWrapper(str: string): string;
     protected clearMaybe(str: string): string;
     protected clearResolverTypeWrapper(str: string): string;
     protected wrapWithArray(t: string): string;
+    protected createResolversUnionTypes(): Record<string, string>;
     protected createFieldContextTypeMap(): FieldContextTypeMap;
     protected createDirectivedContextType(): FieldContextTypeMap;
     buildResolversTypes(): string;
     buildResolversParentTypes(): string;
+    buildResolversUnionTypes(): string;
     get schema(): GraphQLSchema;
     get defaultMapperType(): string;
     get unusedMappers(): string[];
@@ -592,5 +592,6 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     EnumTypeDefinition(node: EnumTypeDefinitionNode): string;
     InterfaceTypeDefinition(node: InterfaceTypeDefinitionNode): string;
     SchemaDefinition(): any;
+    private getRelevantFieldsToOmit;
 }
 export {};

package/typings/base-resolvers-visitor.d.ts

@@ -525,6 +525,8 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     };
     protected _resolversTypes: ResolverTypes;
     protected _resolversParentTypes: ResolverParentTypes;
+    protected _hasReferencedResolversUnionTypes: boolean;
+    protected _resolversUnionTypes: Record<string, string>;
     protected _rootTypeNames: Set<string>;
     protected _globalDeclarations: Set<string>;
     protected _federation: ApolloFederation;
@@ -539,20 +541,18 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     protected shouldMapType(type: GraphQLNamedType, duringCheck?: string[]): boolean;
     convertName(node: ASTNode | string, options?: BaseVisitorConvertOptions & ConvertOptions, applyNamespacedImport?: boolean): string;
     protected createResolversFields(applyWrapper: (str: string) => string, clearWrapper: (str: string) => string, getTypeToUse: (str: string) => string, shouldInclude?: (type: GraphQLNamedType) => boolean): ResolverTypes;
-    protected replaceFieldsInType(typeName: string, relevantFields: {
-        addOptionalSign: boolean;
-        fieldName: string;
-        replaceWithType: string;
-    }[]): string;
+    protected replaceFieldsInType(typeName: string, relevantFields: ReturnType<typeof this.getRelevantFieldsToOmit>): string;
     protected applyMaybe(str: string): string;
     protected applyResolverTypeWrapper(str: string): string;
     protected clearMaybe(str: string): string;
     protected clearResolverTypeWrapper(str: string): string;
     protected wrapWithArray(t: string): string;
+    protected createResolversUnionTypes(): Record<string, string>;
     protected createFieldContextTypeMap(): FieldContextTypeMap;
     protected createDirectivedContextType(): FieldContextTypeMap;
     buildResolversTypes(): string;
     buildResolversParentTypes(): string;
+    buildResolversUnionTypes(): string;
     get schema(): GraphQLSchema;
     get defaultMapperType(): string;
     get unusedMappers(): string[];
@@ -592,5 +592,6 @@ export declare class BaseResolversVisitor<TRawConfig extends RawResolversConfig
     EnumTypeDefinition(node: EnumTypeDefinitionNode): string;
     InterfaceTypeDefinition(node: InterfaceTypeDefinitionNode): string;
     SchemaDefinition(): any;
+    private getRelevantFieldsToOmit;
 }
 export {};