@graphql-codegen/visitor-plugin-common 3.1.0-alpha-20230323121829-b809ff838 → 3.1.0-alpha-20230323123056-e823c9bbd

package/cjs/selection-set-processor/base.js

@@ -17,13 +17,13 @@ class BaseSelectionSetProcessor {
         }
         return `(\n  ${pieces.join(`\n  & `)}\n)`;
     }
-    transformPrimitiveFields(_schemaType, _fields, _unsetTypes) {
+    transformPrimitiveFields(_schemaType, _fields) {
         throw new Error(`Please override "transformPrimitiveFields" as part of your BaseSelectionSetProcessor implementation!`);
     }
-    transformAliasesPrimitiveFields(_schemaType, _fields, _unsetTypes) {
+    transformAliasesPrimitiveFields(_schemaType, _fields) {
         throw new Error(`Please override "transformAliasesPrimitiveFields" as part of your BaseSelectionSetProcessor implementation!`);
     }
-    transformLinkFields(_fields, _unsetTypes) {
+    transformLinkFields(_fields) {
         throw new Error(`Please override "transformLinkFields" as part of your BaseSelectionSetProcessor implementation!`);
     }
     transformTypenameField(_type, _name) {

package/cjs/selection-set-processor/pre-resolve-types.js

@@ -13,7 +13,7 @@ class PreResolveTypesProcessor extends base_js_1.BaseSelectionSetProcessor {
             },
         ];
     }
-    transformPrimitiveFields(schemaType, fields, unsetTypes) {
+    transformPrimitiveFields(schemaType, fields) {
         if (fields.length === 0) {
             return [];
         }
@@ -23,13 +23,6 @@ class PreResolveTypesProcessor extends base_js_1.BaseSelectionSetProcessor {
             let typeToUse = baseType.name;
             const useInnerType = field.isConditional && (0, graphql_1.isNonNullType)(fieldObj.type);
             const innerType = useInnerType ? (0, plugin_helpers_1.removeNonNullWrapper)(fieldObj.type) : undefined;
-            const name = this.config.formatNamedField(field.fieldName, useInnerType ? innerType : fieldObj.type, field.isConditional, unsetTypes);
-            if (unsetTypes) {
-                return {
-                    name,
-                    type: 'never',
-                };
-            }
             if ((0, graphql_1.isEnumType)(baseType)) {
                 typeToUse =
                     (this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : '') +
@@ -38,6 +31,7 @@ class PreResolveTypesProcessor extends base_js_1.BaseSelectionSetProcessor {
             else if (this.config.scalars[baseType.name]) {
                 typeToUse = this.config.scalars[baseType.name];
             }
+            const name = this.config.formatNamedField(field.fieldName, useInnerType ? innerType : fieldObj.type, field.isConditional);
             const wrappedType = this.config.wrapTypeWithModifiers(typeToUse, fieldObj.type);
             return {
                 name,
@@ -45,7 +39,7 @@ class PreResolveTypesProcessor extends base_js_1.BaseSelectionSetProcessor {
             };
         });
     }
-    transformAliasesPrimitiveFields(schemaType, fields, unsetTypes) {
+    transformAliasesPrimitiveFields(schemaType, fields) {
         if (fields.length === 0) {
             return [];
         }
@@ -65,13 +59,7 @@ class PreResolveTypesProcessor extends base_js_1.BaseSelectionSetProcessor {
                     (this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : '') +
                         this.config.convertName(baseType.name, { useTypesPrefix: this.config.enumPrefix });
             }
-            const name = this.config.formatNamedField(aliasedField.alias, fieldObj.type, undefined, unsetTypes);
-            if (unsetTypes) {
-                return {
-                    type: 'never',
-                    name,
-                };
-            }
+            const name = this.config.formatNamedField(aliasedField.alias, fieldObj.type);
             const wrappedType = this.config.wrapTypeWithModifiers(typeToUse, fieldObj.type);
             return {
                 name,
@@ -79,13 +67,13 @@ class PreResolveTypesProcessor extends base_js_1.BaseSelectionSetProcessor {
             };
         });
     }
-    transformLinkFields(fields, unsetTypes) {
+    transformLinkFields(fields) {
         if (fields.length === 0) {
             return [];
         }
         return fields.map(field => ({
             name: field.alias || field.name,
-            type: unsetTypes ? 'never' : field.selectionSet,
+            type: field.selectionSet,
         }));
     }
 }

package/cjs/selection-set-to-object.js

@@ -48,17 +48,8 @@ class SelectionSetToObject {
                 const { fields, inlines, spreads } = (0, utils_js_1.separateSelectionSet)(node.selectionSet.selections);
                 const spreadsUsage = this.buildFragmentSpreadsUsage(spreads);
                 const directives = node.directives || undefined;
-                // When we collect the selection sets of inline fragments we need to
-                // make sure directives on the inline fragments are stored in a way
-                // that can be associated back to the fields in the fragment, to
-                // support things like making those fields optional when deferring a
-                // fragment (using @defer).
-                const fieldsWithFragmentDirectives = fields.map(field => ({
-                    ...field,
-                    fragmentDirectives: field.fragmentDirectives || directives,
-                }));
                 if ((0, graphql_1.isObjectType)(typeOnSchema)) {
-                    this._appendToTypeMap(types, typeOnSchema.name, fieldsWithFragmentDirectives);
+                    this._appendToTypeMap(types, typeOnSchema.name, fields);
                     this._appendToTypeMap(types, typeOnSchema.name, spreadsUsage[typeOnSchema.name]);
                     this._appendToTypeMap(types, typeOnSchema.name, directives);
                     this._collectInlineFragments(typeOnSchema, inlines, types);
@@ -169,7 +160,6 @@ class SelectionSetToObject {
                         typeName: usage,
                         onType: fragmentSpreadObject.onType,
                         selectionNodes: [...fragmentSpreadObject.node.selectionSet.selections],
-                        fragmentDirectives: [...spread.directives],
                     });
                 }
             }
@@ -231,17 +221,8 @@ class SelectionSetToObject {
                 if (!(0, graphql_1.isObjectType)(schemaType)) {
                     throw new TypeError(`Invalid state! Schema type ${typeName} is not a valid GraphQL object!`);
                 }
-                const allNodes = selectionNodesByTypeName.get(typeName) || [];
+                const selectionNodes = selectionNodesByTypeName.get(typeName) || [];
                 prev[typeName] || (prev[typeName] = []);
-                const { incrementalNodes, selectionNodes } = allNodes.reduce((acc, node) => {
-                    if ('fragmentDirectives' in node && (0, utils_js_1.hasIncrementalDeliveryDirectives)(node.fragmentDirectives)) {
-                        acc.incrementalNodes.push(node);
-                    }
-                    else {
-                        acc.selectionNodes.push(node);
-                    }
-                    return acc;
-                }, { selectionNodes: [], incrementalNodes: [] });
                 const { fields } = this.buildSelectionSet(schemaType, selectionNodes);
                 const transformedSet = this.selectionSetStringFromFields(fields);
                 if (transformedSet) {
@@ -250,22 +231,6 @@ class SelectionSetToObject {
                 else {
                     mustAddEmptyObject = true;
                 }
-                for (const incrementalNode of incrementalNodes) {
-                    if (this._config.inlineFragmentTypes === 'mask' && 'fragmentName' in incrementalNode) {
-                        const { fields: incrementalFields } = this.buildSelectionSet(schemaType, [incrementalNode], {
-                            unsetTypes: true,
-                        });
-                        prev[typeName].push(this.selectionSetStringFromFields(incrementalFields));
-                        continue;
-                    }
-                    const { fields: initialFields } = this.buildSelectionSet(schemaType, [incrementalNode]);
-                    const { fields: subsequentFields } = this.buildSelectionSet(schemaType, [incrementalNode], {
-                        unsetTypes: true,
-                    });
-                    const initialSet = this.selectionSetStringFromFields(initialFields);
-                    const subsequentSet = this.selectionSetStringFromFields(subsequentFields);
-                    prev[typeName].push({ union: [initialSet, subsequentSet] });
-                }
                 return prev;
             }, {});
             return { grouped, mustAddEmptyObject };
@@ -338,7 +303,7 @@ class SelectionSetToObject {
         const transformedSet = this._processor.buildSelectionSetFromStrings([...allStrings, mergedObjects].filter(Boolean));
         return transformedSet;
     }
-    buildSelectionSet(parentSchemaType, selectionNodes, options) {
+    buildSelectionSet(parentSchemaType, selectionNodes) {
         var _a, _b, _c;
         const primitiveFields = new Map();
         const primitiveAliasFields = new Map();
@@ -429,10 +394,9 @@ class SelectionSetToObject {
             const realSelectedFieldType = (0, plugin_helpers_1.getBaseType)(selectedFieldType);
             const selectionSet = this.createNext(realSelectedFieldType, field.selectionSet);
             const isConditional = (0, utils_js_1.hasConditionalDirectives)(field) || inlineFragmentConditional;
-            const isOptional = options === null || options === void 0 ? void 0 : options.unsetTypes;
             linkFields.push({
                 alias: field.alias ? this._processor.config.formatNamedField(field.alias.value, selectedFieldType) : undefined,
-                name: this._processor.config.formatNamedField(field.name.value, selectedFieldType, isConditional, isOptional),
+                name: this._processor.config.formatNamedField(field.name.value, selectedFieldType, isConditional),
                 type: realSelectedFieldType.name,
                 selectionSet: this._processor.config.wrapTypeWithModifiers(selectionSet.transformSelectionSet().split(`\n`).join(`\n  `), selectedFieldType),
             });
@@ -448,12 +412,12 @@ class SelectionSetToObject {
             ...this._processor.transformPrimitiveFields(parentSchemaType, Array.from(primitiveFields.values()).map(field => ({
                 isConditional: (0, utils_js_1.hasConditionalDirectives)(field),
                 fieldName: field.name.value,
-            })), options === null || options === void 0 ? void 0 : options.unsetTypes),
+            }))),
             ...this._processor.transformAliasesPrimitiveFields(parentSchemaType, Array.from(primitiveAliasFields.values()).map(field => ({
                 alias: field.alias.value,
                 fieldName: field.name.value,
-            })), options === null || options === void 0 ? void 0 : options.unsetTypes),
-            ...this._processor.transformLinkFields(linkFields, options === null || options === void 0 ? void 0 : options.unsetTypes),
+            }))),
+            ...this._processor.transformLinkFields(linkFields),
         ].filter(Boolean);
         const allStrings = transformed.filter(t => typeof t === 'string');
         const allObjectsMerged = transformed
@@ -469,9 +433,7 @@ class SelectionSetToObject {
                 fields.push(...fragmentsSpreadUsages);
             }
             else if (this._config.inlineFragmentTypes === 'mask') {
-                fields.push(`{ ' $fragmentRefs'?: { ${fragmentsSpreadUsages
-                    .map(name => `'${name}': ${(options === null || options === void 0 ? void 0 : options.unsetTypes) ? `Incremental<${name}>` : name}`)
-                    .join(`;`)} } }`);
+                fields.push(`{ ' $fragmentRefs'?: { ${fragmentsSpreadUsages.map(name => `'${name}': ${name}`).join(`;`)} } }`);
             }
         }
         return { typeInfo: typeInfoField, fields };
@@ -509,19 +471,14 @@ class SelectionSetToObject {
         }
         return (Object.keys(grouped)
             .map(typeName => {
-            const hasUnions = grouped[typeName].filter(s => typeof s !== 'string' && s.union).length > 0;
             const relevant = grouped[typeName].filter(Boolean);
             if (relevant.length === 0) {
                 return null;
             }
-            const res = relevant
-                .map(selectionObject => {
-                if (typeof selectionObject === 'string')
-                    return selectionObject;
-                return '(' + selectionObject.union.join(' | ') + ')';
-            })
-                .join(' & ');
-            return relevant.length > 1 && !hasUnions ? `( ${res} )` : res;
+            if (relevant.length === 1) {
+                return relevant[0];
+            }
+            return `( ${relevant.join(' & ')} )`;
         })
             .filter(Boolean)
             .join(' | ') + this.getEmptyObjectTypeString(mustAddEmptyObject));

package/cjs/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isOneOfInputObjectType = exports.wrapTypeNodeWithModifiers = exports.removeDescription = exports.wrapTypeWithModifiers = exports.hasIncrementalDeliveryDirectives = exports.hasConditionalDirectives = exports.getPossibleTypes = exports.separateSelectionSet = exports.getFieldNodeNameValue = exports.mergeSelectionSets = exports.REQUIRE_FIELDS_TYPE = exports.OMIT_TYPE = exports.stripMapperTypeInterpolation = exports.getRootTypeNames = exports.buildScalars = exports.buildScalarsFromConfig = exports.convertNameParts = exports.getBaseTypeNode = exports.DeclarationBlock = exports.transformComment = exports.indentMultiline = exports.indent = exports.breakLine = exports.wrapWithSingleQuotes = exports.block = exports.quoteIfNeeded = exports.getConfigValue = void 0;
+exports.isOneOfInputObjectType = exports.wrapTypeNodeWithModifiers = exports.removeDescription = exports.wrapTypeWithModifiers = exports.hasConditionalDirectives = exports.getPossibleTypes = exports.separateSelectionSet = exports.getFieldNodeNameValue = exports.mergeSelectionSets = exports.REQUIRE_FIELDS_TYPE = exports.OMIT_TYPE = exports.stripMapperTypeInterpolation = exports.getRootTypeNames = exports.buildScalars = exports.buildScalarsFromConfig = exports.convertNameParts = exports.getBaseTypeNode = exports.DeclarationBlock = exports.transformComment = exports.indentMultiline = exports.indent = exports.breakLine = exports.wrapWithSingleQuotes = exports.block = exports.quoteIfNeeded = exports.getConfigValue = void 0;
 const graphql_1 = require("graphql");
 const mappers_js_1 = require("./mappers.js");
 const scalars_js_1 = require("./scalars.js");
@@ -342,11 +342,6 @@ function hasConditionalDirectives(field) {
     return (_a = field.directives) === null || _a === void 0 ? void 0 : _a.some(directive => CONDITIONAL_DIRECTIVES.includes(directive.name.value));
 }
 exports.hasConditionalDirectives = hasConditionalDirectives;
-function hasIncrementalDeliveryDirectives(directives) {
-    const INCREMENTAL_DELIVERY_DIRECTIVES = ['defer'];
-    return directives === null || directives === void 0 ? void 0 : directives.some(directive => INCREMENTAL_DELIVERY_DIRECTIVES.includes(directive.name.value));
-}
-exports.hasIncrementalDeliveryDirectives = hasIncrementalDeliveryDirectives;
 function wrapTypeWithModifiers(baseType, type, options) {
     let currentType = type;
     const modifiers = [];

package/esm/selection-set-processor/base.js

@@ -14,13 +14,13 @@ export class BaseSelectionSetProcessor {
         }
         return `(\n  ${pieces.join(`\n  & `)}\n)`;
     }
-    transformPrimitiveFields(_schemaType, _fields, _unsetTypes) {
+    transformPrimitiveFields(_schemaType, _fields) {
         throw new Error(`Please override "transformPrimitiveFields" as part of your BaseSelectionSetProcessor implementation!`);
     }
-    transformAliasesPrimitiveFields(_schemaType, _fields, _unsetTypes) {
+    transformAliasesPrimitiveFields(_schemaType, _fields) {
         throw new Error(`Please override "transformAliasesPrimitiveFields" as part of your BaseSelectionSetProcessor implementation!`);
     }
-    transformLinkFields(_fields, _unsetTypes) {
+    transformLinkFields(_fields) {
         throw new Error(`Please override "transformLinkFields" as part of your BaseSelectionSetProcessor implementation!`);
     }
     transformTypenameField(_type, _name) {

package/esm/selection-set-processor/pre-resolve-types.js

@@ -10,7 +10,7 @@ export class PreResolveTypesProcessor extends BaseSelectionSetProcessor {
             },
         ];
     }
-    transformPrimitiveFields(schemaType, fields, unsetTypes) {
+    transformPrimitiveFields(schemaType, fields) {
         if (fields.length === 0) {
             return [];
         }
@@ -20,13 +20,6 @@ export class PreResolveTypesProcessor extends BaseSelectionSetProcessor {
             let typeToUse = baseType.name;
             const useInnerType = field.isConditional && isNonNullType(fieldObj.type);
             const innerType = useInnerType ? removeNonNullWrapper(fieldObj.type) : undefined;
-            const name = this.config.formatNamedField(field.fieldName, useInnerType ? innerType : fieldObj.type, field.isConditional, unsetTypes);
-            if (unsetTypes) {
-                return {
-                    name,
-                    type: 'never',
-                };
-            }
             if (isEnumType(baseType)) {
                 typeToUse =
                     (this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : '') +
@@ -35,6 +28,7 @@ export class PreResolveTypesProcessor extends BaseSelectionSetProcessor {
             else if (this.config.scalars[baseType.name]) {
                 typeToUse = this.config.scalars[baseType.name];
             }
+            const name = this.config.formatNamedField(field.fieldName, useInnerType ? innerType : fieldObj.type, field.isConditional);
             const wrappedType = this.config.wrapTypeWithModifiers(typeToUse, fieldObj.type);
             return {
                 name,
@@ -42,7 +36,7 @@ export class PreResolveTypesProcessor extends BaseSelectionSetProcessor {
             };
         });
     }
-    transformAliasesPrimitiveFields(schemaType, fields, unsetTypes) {
+    transformAliasesPrimitiveFields(schemaType, fields) {
         if (fields.length === 0) {
             return [];
         }
@@ -62,13 +56,7 @@ export class PreResolveTypesProcessor extends BaseSelectionSetProcessor {
                     (this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : '') +
                         this.config.convertName(baseType.name, { useTypesPrefix: this.config.enumPrefix });
             }
-            const name = this.config.formatNamedField(aliasedField.alias, fieldObj.type, undefined, unsetTypes);
-            if (unsetTypes) {
-                return {
-                    type: 'never',
-                    name,
-                };
-            }
+            const name = this.config.formatNamedField(aliasedField.alias, fieldObj.type);
             const wrappedType = this.config.wrapTypeWithModifiers(typeToUse, fieldObj.type);
             return {
                 name,
@@ -76,13 +64,13 @@ export class PreResolveTypesProcessor extends BaseSelectionSetProcessor {
             };
         });
     }
-    transformLinkFields(fields, unsetTypes) {
+    transformLinkFields(fields) {
         if (fields.length === 0) {
             return [];
         }
         return fields.map(field => ({
             name: field.alias || field.name,
-            type: unsetTypes ? 'never' : field.selectionSet,
+            type: field.selectionSet,
         }));
     }
 }

package/esm/selection-set-to-object.js

@@ -3,7 +3,7 @@ import { getBaseType } from '@graphql-codegen/plugin-helpers';
 import { getRootTypes } from '@graphql-tools/utils';
 import autoBind from 'auto-bind';
 import { isInterfaceType, isListType, isNonNullType, isObjectType, isTypeSubTypeOf, isUnionType, Kind, SchemaMetaFieldDef, TypeMetaFieldDef, } from 'graphql';
-import { DeclarationBlock, getFieldNodeNameValue, getPossibleTypes, hasConditionalDirectives, hasIncrementalDeliveryDirectives, mergeSelectionSets, separateSelectionSet, } from './utils.js';
+import { DeclarationBlock, getFieldNodeNameValue, getPossibleTypes, hasConditionalDirectives, mergeSelectionSets, separateSelectionSet, } from './utils.js';
 function isMetadataFieldName(name) {
     return ['__schema', '__type'].includes(name);
 }
@@ -44,17 +44,8 @@ export class SelectionSetToObject {
                 const { fields, inlines, spreads } = separateSelectionSet(node.selectionSet.selections);
                 const spreadsUsage = this.buildFragmentSpreadsUsage(spreads);
                 const directives = node.directives || undefined;
-                // When we collect the selection sets of inline fragments we need to
-                // make sure directives on the inline fragments are stored in a way
-                // that can be associated back to the fields in the fragment, to
-                // support things like making those fields optional when deferring a
-                // fragment (using @defer).
-                const fieldsWithFragmentDirectives = fields.map(field => ({
-                    ...field,
-                    fragmentDirectives: field.fragmentDirectives || directives,
-                }));
                 if (isObjectType(typeOnSchema)) {
-                    this._appendToTypeMap(types, typeOnSchema.name, fieldsWithFragmentDirectives);
+                    this._appendToTypeMap(types, typeOnSchema.name, fields);
                     this._appendToTypeMap(types, typeOnSchema.name, spreadsUsage[typeOnSchema.name]);
                     this._appendToTypeMap(types, typeOnSchema.name, directives);
                     this._collectInlineFragments(typeOnSchema, inlines, types);
@@ -165,7 +156,6 @@ export class SelectionSetToObject {
                         typeName: usage,
                         onType: fragmentSpreadObject.onType,
                         selectionNodes: [...fragmentSpreadObject.node.selectionSet.selections],
-                        fragmentDirectives: [...spread.directives],
                     });
                 }
             }
@@ -227,17 +217,8 @@ export class SelectionSetToObject {
                 if (!isObjectType(schemaType)) {
                     throw new TypeError(`Invalid state! Schema type ${typeName} is not a valid GraphQL object!`);
                 }
-                const allNodes = selectionNodesByTypeName.get(typeName) || [];
+                const selectionNodes = selectionNodesByTypeName.get(typeName) || [];
                 prev[typeName] || (prev[typeName] = []);
-                const { incrementalNodes, selectionNodes } = allNodes.reduce((acc, node) => {
-                    if ('fragmentDirectives' in node && hasIncrementalDeliveryDirectives(node.fragmentDirectives)) {
-                        acc.incrementalNodes.push(node);
-                    }
-                    else {
-                        acc.selectionNodes.push(node);
-                    }
-                    return acc;
-                }, { selectionNodes: [], incrementalNodes: [] });
                 const { fields } = this.buildSelectionSet(schemaType, selectionNodes);
                 const transformedSet = this.selectionSetStringFromFields(fields);
                 if (transformedSet) {
@@ -246,22 +227,6 @@ export class SelectionSetToObject {
                 else {
                     mustAddEmptyObject = true;
                 }
-                for (const incrementalNode of incrementalNodes) {
-                    if (this._config.inlineFragmentTypes === 'mask' && 'fragmentName' in incrementalNode) {
-                        const { fields: incrementalFields } = this.buildSelectionSet(schemaType, [incrementalNode], {
-                            unsetTypes: true,
-                        });
-                        prev[typeName].push(this.selectionSetStringFromFields(incrementalFields));
-                        continue;
-                    }
-                    const { fields: initialFields } = this.buildSelectionSet(schemaType, [incrementalNode]);
-                    const { fields: subsequentFields } = this.buildSelectionSet(schemaType, [incrementalNode], {
-                        unsetTypes: true,
-                    });
-                    const initialSet = this.selectionSetStringFromFields(initialFields);
-                    const subsequentSet = this.selectionSetStringFromFields(subsequentFields);
-                    prev[typeName].push({ union: [initialSet, subsequentSet] });
-                }
                 return prev;
             }, {});
             return { grouped, mustAddEmptyObject };
@@ -334,7 +299,7 @@ export class SelectionSetToObject {
         const transformedSet = this._processor.buildSelectionSetFromStrings([...allStrings, mergedObjects].filter(Boolean));
         return transformedSet;
     }
-    buildSelectionSet(parentSchemaType, selectionNodes, options) {
+    buildSelectionSet(parentSchemaType, selectionNodes) {
         var _a, _b, _c;
         const primitiveFields = new Map();
         const primitiveAliasFields = new Map();
@@ -425,10 +390,9 @@ export class SelectionSetToObject {
             const realSelectedFieldType = getBaseType(selectedFieldType);
             const selectionSet = this.createNext(realSelectedFieldType, field.selectionSet);
             const isConditional = hasConditionalDirectives(field) || inlineFragmentConditional;
-            const isOptional = options === null || options === void 0 ? void 0 : options.unsetTypes;
             linkFields.push({
                 alias: field.alias ? this._processor.config.formatNamedField(field.alias.value, selectedFieldType) : undefined,
-                name: this._processor.config.formatNamedField(field.name.value, selectedFieldType, isConditional, isOptional),
+                name: this._processor.config.formatNamedField(field.name.value, selectedFieldType, isConditional),
                 type: realSelectedFieldType.name,
                 selectionSet: this._processor.config.wrapTypeWithModifiers(selectionSet.transformSelectionSet().split(`\n`).join(`\n  `), selectedFieldType),
             });
@@ -444,12 +408,12 @@ export class SelectionSetToObject {
             ...this._processor.transformPrimitiveFields(parentSchemaType, Array.from(primitiveFields.values()).map(field => ({
                 isConditional: hasConditionalDirectives(field),
                 fieldName: field.name.value,
-            })), options === null || options === void 0 ? void 0 : options.unsetTypes),
+            }))),
             ...this._processor.transformAliasesPrimitiveFields(parentSchemaType, Array.from(primitiveAliasFields.values()).map(field => ({
                 alias: field.alias.value,
                 fieldName: field.name.value,
-            })), options === null || options === void 0 ? void 0 : options.unsetTypes),
-            ...this._processor.transformLinkFields(linkFields, options === null || options === void 0 ? void 0 : options.unsetTypes),
+            }))),
+            ...this._processor.transformLinkFields(linkFields),
         ].filter(Boolean);
         const allStrings = transformed.filter(t => typeof t === 'string');
         const allObjectsMerged = transformed
@@ -465,9 +429,7 @@ export class SelectionSetToObject {
                 fields.push(...fragmentsSpreadUsages);
             }
             else if (this._config.inlineFragmentTypes === 'mask') {
-                fields.push(`{ ' $fragmentRefs'?: { ${fragmentsSpreadUsages
-                    .map(name => `'${name}': ${(options === null || options === void 0 ? void 0 : options.unsetTypes) ? `Incremental<${name}>` : name}`)
-                    .join(`;`)} } }`);
+                fields.push(`{ ' $fragmentRefs'?: { ${fragmentsSpreadUsages.map(name => `'${name}': ${name}`).join(`;`)} } }`);
             }
         }
         return { typeInfo: typeInfoField, fields };
@@ -505,19 +467,14 @@ export class SelectionSetToObject {
         }
         return (Object.keys(grouped)
             .map(typeName => {
-            const hasUnions = grouped[typeName].filter(s => typeof s !== 'string' && s.union).length > 0;
             const relevant = grouped[typeName].filter(Boolean);
             if (relevant.length === 0) {
                 return null;
             }
-            const res = relevant
-                .map(selectionObject => {
-                if (typeof selectionObject === 'string')
-                    return selectionObject;
-                return '(' + selectionObject.union.join(' | ') + ')';
-            })
-                .join(' & ');
-            return relevant.length > 1 && !hasUnions ? `( ${res} )` : res;
+            if (relevant.length === 1) {
+                return relevant[0];
+            }
+            return `( ${relevant.join(' & ')} )`;
         })
             .filter(Boolean)
             .join(' | ') + this.getEmptyObjectTypeString(mustAddEmptyObject));

package/esm/utils.js

@@ -319,10 +319,6 @@ export function hasConditionalDirectives(field) {
     const CONDITIONAL_DIRECTIVES = ['skip', 'include'];
     return (_a = field.directives) === null || _a === void 0 ? void 0 : _a.some(directive => CONDITIONAL_DIRECTIVES.includes(directive.name.value));
 }
-export function hasIncrementalDeliveryDirectives(directives) {
-    const INCREMENTAL_DELIVERY_DIRECTIVES = ['defer'];
-    return directives === null || directives === void 0 ? void 0 : directives.some(directive => INCREMENTAL_DELIVERY_DIRECTIVES.includes(directive.name.value));
-}
 export function wrapTypeWithModifiers(baseType, type, options) {
     let currentType = type;
     const modifiers = [];

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "3.1.0-alpha-20230323121829-b809ff838",
+  "version": "3.1.0-alpha-20230323123056-e823c9bbd",
   "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"
   },
   "dependencies": {
     "@graphql-tools/optimize": "^1.3.0",
-    "@graphql-codegen/plugin-helpers": "4.2.0-alpha-20230323121829-b809ff838",
+    "@graphql-codegen/plugin-helpers": "4.2.0-alpha-20230323123056-e823c9bbd",
     "@graphql-tools/relay-operation-optimizer": "^6.5.0",
     "@graphql-tools/utils": "^9.0.0",
     "auto-bind": "~4.0.0",

package/typings/selection-set-processor/base.d.cts

@@ -24,7 +24,7 @@ export type SelectionSetProcessorConfig = {
     convertName: ConvertNameFn<any>;
     enumPrefix: boolean | null;
     scalars: ScalarsMap;
-    formatNamedField(name: string, type?: GraphQLOutputType | GraphQLNamedType | null, isConditional?: boolean, isOptional?: boolean): string;
+    formatNamedField(name: string, type?: GraphQLOutputType | GraphQLNamedType | null, isConditional?: boolean): string;
     wrapTypeWithModifiers(baseType: string, type: GraphQLOutputType | GraphQLNamedType): string;
     avoidOptionals?: AvoidOptionalsConfig | boolean;
 };
@@ -33,8 +33,8 @@ export declare class BaseSelectionSetProcessor<Config extends SelectionSetProces
     constructor(config: Config);
     buildFieldsIntoObject(allObjectsMerged: string[]): string;
     buildSelectionSetFromStrings(pieces: string[]): string;
-    transformPrimitiveFields(_schemaType: GraphQLObjectType | GraphQLInterfaceType, _fields: PrimitiveField[], _unsetTypes?: boolean): ProcessResult;
-    transformAliasesPrimitiveFields(_schemaType: GraphQLObjectType | GraphQLInterfaceType, _fields: PrimitiveAliasedFields[], _unsetTypes?: boolean): ProcessResult;
-    transformLinkFields(_fields: LinkField[], _unsetTypes?: boolean): ProcessResult;
+    transformPrimitiveFields(_schemaType: GraphQLObjectType | GraphQLInterfaceType, _fields: PrimitiveField[]): ProcessResult;
+    transformAliasesPrimitiveFields(_schemaType: GraphQLObjectType | GraphQLInterfaceType, _fields: PrimitiveAliasedFields[]): ProcessResult;
+    transformLinkFields(_fields: LinkField[]): ProcessResult;
     transformTypenameField(_type: string, _name: string): ProcessResult;
 }

package/typings/selection-set-processor/base.d.ts

@@ -24,7 +24,7 @@ export type SelectionSetProcessorConfig = {
     convertName: ConvertNameFn<any>;
     enumPrefix: boolean | null;
     scalars: ScalarsMap;
-    formatNamedField(name: string, type?: GraphQLOutputType | GraphQLNamedType | null, isConditional?: boolean, isOptional?: boolean): string;
+    formatNamedField(name: string, type?: GraphQLOutputType | GraphQLNamedType | null, isConditional?: boolean): string;
     wrapTypeWithModifiers(baseType: string, type: GraphQLOutputType | GraphQLNamedType): string;
     avoidOptionals?: AvoidOptionalsConfig | boolean;
 };
@@ -33,8 +33,8 @@ export declare class BaseSelectionSetProcessor<Config extends SelectionSetProces
     constructor(config: Config);
     buildFieldsIntoObject(allObjectsMerged: string[]): string;
     buildSelectionSetFromStrings(pieces: string[]): string;
-    transformPrimitiveFields(_schemaType: GraphQLObjectType | GraphQLInterfaceType, _fields: PrimitiveField[], _unsetTypes?: boolean): ProcessResult;
-    transformAliasesPrimitiveFields(_schemaType: GraphQLObjectType | GraphQLInterfaceType, _fields: PrimitiveAliasedFields[], _unsetTypes?: boolean): ProcessResult;
-    transformLinkFields(_fields: LinkField[], _unsetTypes?: boolean): ProcessResult;
+    transformPrimitiveFields(_schemaType: GraphQLObjectType | GraphQLInterfaceType, _fields: PrimitiveField[]): ProcessResult;
+    transformAliasesPrimitiveFields(_schemaType: GraphQLObjectType | GraphQLInterfaceType, _fields: PrimitiveAliasedFields[]): ProcessResult;
+    transformLinkFields(_fields: LinkField[]): ProcessResult;
     transformTypenameField(_type: string, _name: string): ProcessResult;
 }

package/typings/selection-set-processor/pre-resolve-types.d.cts

@@ -2,7 +2,7 @@ import { GraphQLInterfaceType, GraphQLObjectType } from 'graphql';
 import { BaseSelectionSetProcessor, LinkField, PrimitiveAliasedFields, PrimitiveField, ProcessResult, SelectionSetProcessorConfig } from './base.cjs';
 export declare class PreResolveTypesProcessor extends BaseSelectionSetProcessor<SelectionSetProcessorConfig> {
     transformTypenameField(type: string, name: string): ProcessResult;
-    transformPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveField[], unsetTypes?: boolean): ProcessResult;
-    transformAliasesPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveAliasedFields[], unsetTypes?: boolean): ProcessResult;
-    transformLinkFields(fields: LinkField[], unsetTypes?: boolean): ProcessResult;
+    transformPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveField[]): ProcessResult;
+    transformAliasesPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveAliasedFields[]): ProcessResult;
+    transformLinkFields(fields: LinkField[]): ProcessResult;
 }

package/typings/selection-set-processor/pre-resolve-types.d.ts

@@ -2,7 +2,7 @@ import { GraphQLInterfaceType, GraphQLObjectType } from 'graphql';
 import { BaseSelectionSetProcessor, LinkField, PrimitiveAliasedFields, PrimitiveField, ProcessResult, SelectionSetProcessorConfig } from './base.js';
 export declare class PreResolveTypesProcessor extends BaseSelectionSetProcessor<SelectionSetProcessorConfig> {
     transformTypenameField(type: string, name: string): ProcessResult;
-    transformPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveField[], unsetTypes?: boolean): ProcessResult;
-    transformAliasesPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveAliasedFields[], unsetTypes?: boolean): ProcessResult;
-    transformLinkFields(fields: LinkField[], unsetTypes?: boolean): ProcessResult;
+    transformPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveField[]): ProcessResult;
+    transformAliasesPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveAliasedFields[]): ProcessResult;
+    transformLinkFields(fields: LinkField[]): ProcessResult;
 }

package/typings/selection-set-to-object.d.cts

@@ -2,18 +2,13 @@ import { DirectiveNode, FieldNode, FragmentSpreadNode, GraphQLNamedType, GraphQL
 import { ParsedDocumentsConfig } from './base-documents-visitor.cjs';
 import { BaseVisitorConvertOptions } from './base-visitor.cjs';
 import { BaseSelectionSetProcessor, LinkField, NameAndType, PrimitiveAliasedFields, PrimitiveField } from './selection-set-processor/base.cjs';
-import { ConvertNameFn, FragmentDirectives, GetFragmentSuffixFn, LoadedFragment, NormalizedScalarsMap } from './types.cjs';
+import { ConvertNameFn, GetFragmentSuffixFn, LoadedFragment, NormalizedScalarsMap } from './types.cjs';
 type FragmentSpreadUsage = {
     fragmentName: string;
     typeName: string;
     onType: string;
     selectionNodes: Array<SelectionNode>;
-    fragmentDirectives?: DirectiveNode[];
 };
-type CollectedFragmentNode = (SelectionNode | FragmentSpreadUsage | DirectiveNode) & FragmentDirectives;
-type GroupedStringifedTypes = Record<string, Array<string | {
-    union: string[];
-}>>;
 export declare class SelectionSetToObject<Config extends ParsedDocumentsConfig = ParsedDocumentsConfig> {
     protected _processor: BaseSelectionSetProcessor<any>;
     protected _scalars: NormalizedScalarsMap;
@@ -33,7 +28,7 @@ export declare class SelectionSetToObject<Config extends ParsedDocumentsConfig =
     /**
      * traverse the inline fragment nodes recursively for collecting the selectionSets on each type
      */
-    _collectInlineFragments(parentType: GraphQLNamedType, nodes: Array<InlineFragmentNode & FragmentDirectives>, types: Map<string, Array<CollectedFragmentNode>>): any;
+    _collectInlineFragments(parentType: GraphQLNamedType, nodes: InlineFragmentNode[], types: Map<string, Array<SelectionNode | FragmentSpreadUsage | DirectiveNode>>): any;
     protected _createInlineFragmentForFieldNodes(parentType: GraphQLNamedType, fieldNodes: FieldNode[]): InlineFragmentNode;
     protected buildFragmentSpreadsUsage(spreads: FragmentSpreadNode[]): Record<string, FragmentSpreadUsage[]>;
     protected flattenSelectionSet(selections: ReadonlyArray<SelectionNode>, parentSchemaType?: GraphQLObjectType<any, any>): Map<string, Array<SelectionNode | FragmentSpreadUsage>>;
@@ -42,13 +37,11 @@ export declare class SelectionSetToObject<Config extends ParsedDocumentsConfig =
      * mustAddEmptyObject indicates that not all possible types on a union or interface field are covered.
      */
     protected _buildGroupedSelections(): {
-        grouped: GroupedStringifedTypes;
+        grouped: Record<string, string[]>;
         mustAddEmptyObject: boolean;
     };
     protected selectionSetStringFromFields(fields: (string | NameAndType)[]): string | null;
-    protected buildSelectionSet(parentSchemaType: GraphQLObjectType, selectionNodes: Array<SelectionNode | FragmentSpreadUsage | DirectiveNode>, options?: {
-        unsetTypes: boolean;
-    }): {
+    protected buildSelectionSet(parentSchemaType: GraphQLObjectType, selectionNodes: Array<SelectionNode | FragmentSpreadUsage | DirectiveNode>): {
         typeInfo: {
             name: string;
             type: string;

package/typings/selection-set-to-object.d.ts

@@ -2,18 +2,13 @@ import { DirectiveNode, FieldNode, FragmentSpreadNode, GraphQLNamedType, GraphQL
 import { ParsedDocumentsConfig } from './base-documents-visitor.js';
 import { BaseVisitorConvertOptions } from './base-visitor.js';
 import { BaseSelectionSetProcessor, LinkField, NameAndType, PrimitiveAliasedFields, PrimitiveField } from './selection-set-processor/base.js';
-import { ConvertNameFn, FragmentDirectives, GetFragmentSuffixFn, LoadedFragment, NormalizedScalarsMap } from './types.js';
+import { ConvertNameFn, GetFragmentSuffixFn, LoadedFragment, NormalizedScalarsMap } from './types.js';
 type FragmentSpreadUsage = {
     fragmentName: string;
     typeName: string;
     onType: string;
     selectionNodes: Array<SelectionNode>;
-    fragmentDirectives?: DirectiveNode[];
 };
-type CollectedFragmentNode = (SelectionNode | FragmentSpreadUsage | DirectiveNode) & FragmentDirectives;
-type GroupedStringifedTypes = Record<string, Array<string | {
-    union: string[];
-}>>;
 export declare class SelectionSetToObject<Config extends ParsedDocumentsConfig = ParsedDocumentsConfig> {
     protected _processor: BaseSelectionSetProcessor<any>;
     protected _scalars: NormalizedScalarsMap;
@@ -33,7 +28,7 @@ export declare class SelectionSetToObject<Config extends ParsedDocumentsConfig =
     /**
      * traverse the inline fragment nodes recursively for collecting the selectionSets on each type
      */
-    _collectInlineFragments(parentType: GraphQLNamedType, nodes: Array<InlineFragmentNode & FragmentDirectives>, types: Map<string, Array<CollectedFragmentNode>>): any;
+    _collectInlineFragments(parentType: GraphQLNamedType, nodes: InlineFragmentNode[], types: Map<string, Array<SelectionNode | FragmentSpreadUsage | DirectiveNode>>): any;
     protected _createInlineFragmentForFieldNodes(parentType: GraphQLNamedType, fieldNodes: FieldNode[]): InlineFragmentNode;
     protected buildFragmentSpreadsUsage(spreads: FragmentSpreadNode[]): Record<string, FragmentSpreadUsage[]>;
     protected flattenSelectionSet(selections: ReadonlyArray<SelectionNode>, parentSchemaType?: GraphQLObjectType<any, any>): Map<string, Array<SelectionNode | FragmentSpreadUsage>>;
@@ -42,13 +37,11 @@ export declare class SelectionSetToObject<Config extends ParsedDocumentsConfig =
      * mustAddEmptyObject indicates that not all possible types on a union or interface field are covered.
      */
     protected _buildGroupedSelections(): {
-        grouped: GroupedStringifedTypes;
+        grouped: Record<string, string[]>;
         mustAddEmptyObject: boolean;
     };
     protected selectionSetStringFromFields(fields: (string | NameAndType)[]): string | null;
-    protected buildSelectionSet(parentSchemaType: GraphQLObjectType, selectionNodes: Array<SelectionNode | FragmentSpreadUsage | DirectiveNode>, options?: {
-        unsetTypes: boolean;
-    }): {
+    protected buildSelectionSet(parentSchemaType: GraphQLObjectType, selectionNodes: Array<SelectionNode | FragmentSpreadUsage | DirectiveNode>): {
         typeInfo: {
             name: string;
             type: string;

package/typings/types.d.cts

@@ -1,4 +1,4 @@
-import { ASTNode, FragmentDefinitionNode, DirectiveNode } from 'graphql';
+import { ASTNode, FragmentDefinitionNode } from 'graphql';
 import { ParsedMapper } from './mappers.cjs';
 /**
  * A map between the GraphQL directive name and the identifier that should be used
@@ -99,9 +99,6 @@ export interface ParsedImport {
     moduleName: string | null;
     propName: string;
 }
-export type FragmentDirectives = {
-    fragmentDirectives?: Array<DirectiveNode>;
-};
 export interface ResolversNonOptionalTypenameConfig {
     unionMember?: boolean;
 }

package/typings/types.d.ts

@@ -1,4 +1,4 @@
-import { ASTNode, FragmentDefinitionNode, DirectiveNode } from 'graphql';
+import { ASTNode, FragmentDefinitionNode } from 'graphql';
 import { ParsedMapper } from './mappers.js';
 /**
  * A map between the GraphQL directive name and the identifier that should be used
@@ -99,9 +99,6 @@ export interface ParsedImport {
     moduleName: string | null;
     propName: string;
 }
-export type FragmentDirectives = {
-    fragmentDirectives?: Array<DirectiveNode>;
-};
 export interface ResolversNonOptionalTypenameConfig {
     unionMember?: boolean;
 }

package/typings/utils.d.cts

@@ -1,6 +1,6 @@
-import { FieldNode, FragmentSpreadNode, GraphQLInputObjectType, GraphQLNamedType, GraphQLObjectType, GraphQLOutputType, GraphQLSchema, InlineFragmentNode, NamedTypeNode, NameNode, SelectionNode, SelectionSetNode, StringValueNode, TypeNode, DirectiveNode } from 'graphql';
+import { FieldNode, FragmentSpreadNode, GraphQLInputObjectType, GraphQLNamedType, GraphQLObjectType, GraphQLOutputType, GraphQLSchema, InlineFragmentNode, NamedTypeNode, NameNode, SelectionNode, SelectionSetNode, StringValueNode, TypeNode } from 'graphql';
 import { RawConfig } from './base-visitor.cjs';
-import { NormalizedScalarsMap, ParsedScalarsMap, ScalarsMap, FragmentDirectives } from './types.cjs';
+import { NormalizedScalarsMap, ParsedScalarsMap, ScalarsMap } from './types.cjs';
 export declare const getConfigValue: <T = any>(value: T, defaultValue: T) => T;
 export declare function quoteIfNeeded(array: string[], joinWith?: string): string;
 export declare function block(array: any): string;
@@ -52,13 +52,12 @@ export declare const REQUIRE_FIELDS_TYPE = "export type RequireFields<T, K exten
 export declare function mergeSelectionSets(selectionSet1: SelectionSetNode, selectionSet2: SelectionSetNode): SelectionSetNode;
 export declare const getFieldNodeNameValue: (node: FieldNode) => string;
 export declare function separateSelectionSet(selections: ReadonlyArray<SelectionNode>): {
-    fields: (FieldNode & FragmentDirectives)[];
+    fields: FieldNode[];
     spreads: FragmentSpreadNode[];
     inlines: InlineFragmentNode[];
 };
 export declare function getPossibleTypes(schema: GraphQLSchema, type: GraphQLNamedType): GraphQLObjectType[];
 export declare function hasConditionalDirectives(field: FieldNode): boolean;
-export declare function hasIncrementalDeliveryDirectives(directives: DirectiveNode[]): boolean;
 type WrapModifiersOptions = {
     wrapOptional(type: string): string;
     wrapArray(type: string): string;

package/typings/utils.d.ts

@@ -1,6 +1,6 @@
-import { FieldNode, FragmentSpreadNode, GraphQLInputObjectType, GraphQLNamedType, GraphQLObjectType, GraphQLOutputType, GraphQLSchema, InlineFragmentNode, NamedTypeNode, NameNode, SelectionNode, SelectionSetNode, StringValueNode, TypeNode, DirectiveNode } from 'graphql';
+import { FieldNode, FragmentSpreadNode, GraphQLInputObjectType, GraphQLNamedType, GraphQLObjectType, GraphQLOutputType, GraphQLSchema, InlineFragmentNode, NamedTypeNode, NameNode, SelectionNode, SelectionSetNode, StringValueNode, TypeNode } from 'graphql';
 import { RawConfig } from './base-visitor.js';
-import { NormalizedScalarsMap, ParsedScalarsMap, ScalarsMap, FragmentDirectives } from './types.js';
+import { NormalizedScalarsMap, ParsedScalarsMap, ScalarsMap } from './types.js';
 export declare const getConfigValue: <T = any>(value: T, defaultValue: T) => T;
 export declare function quoteIfNeeded(array: string[], joinWith?: string): string;
 export declare function block(array: any): string;
@@ -52,13 +52,12 @@ export declare const REQUIRE_FIELDS_TYPE = "export type RequireFields<T, K exten
 export declare function mergeSelectionSets(selectionSet1: SelectionSetNode, selectionSet2: SelectionSetNode): SelectionSetNode;
 export declare const getFieldNodeNameValue: (node: FieldNode) => string;
 export declare function separateSelectionSet(selections: ReadonlyArray<SelectionNode>): {
-    fields: (FieldNode & FragmentDirectives)[];
+    fields: FieldNode[];
     spreads: FragmentSpreadNode[];
     inlines: InlineFragmentNode[];
 };
 export declare function getPossibleTypes(schema: GraphQLSchema, type: GraphQLNamedType): GraphQLObjectType[];
 export declare function hasConditionalDirectives(field: FieldNode): boolean;
-export declare function hasIncrementalDeliveryDirectives(directives: DirectiveNode[]): boolean;
 type WrapModifiersOptions = {
     wrapOptional(type: string): string;
     wrapArray(type: string): string;