@graphql-codegen/typescript-operations 6.0.0-alpha-20251228140020-a092ba2d84c819dfbb62365e419f28df54571fbe → 6.0.0-alpha-20260101112751-5609723f4ba2f3da5adf38c7347e2569216e3b5a

package/cjs/visitor.js

@@ -6,7 +6,6 @@ const visitor_plugin_common_1 = require("@graphql-codegen/visitor-plugin-common"
 const auto_bind_1 = tslib_1.__importDefault(require("auto-bind"));
 const graphql_1 = require("graphql");
 const ts_operation_variables_to_object_js_1 = require("./ts-operation-variables-to-object.js");
-const ts_selection_set_processor_js_1 = require("./ts-selection-set-processor.js");
 class TypeScriptDocumentsVisitor extends visitor_plugin_common_1.BaseDocumentsVisitor {
     _usedNamedInputTypes = {};
     _outputPath;
@@ -17,7 +16,6 @@ class TypeScriptDocumentsVisitor extends visitor_plugin_common_1.BaseDocumentsVi
             avoidOptionals: (0, visitor_plugin_common_1.normalizeAvoidOptionals)((0, visitor_plugin_common_1.getConfigValue)(config.avoidOptionals, false)),
             immutableTypes: (0, visitor_plugin_common_1.getConfigValue)(config.immutableTypes, false),
             nonOptionalTypename: (0, visitor_plugin_common_1.getConfigValue)(config.nonOptionalTypename, false),
-            preResolveTypes: (0, visitor_plugin_common_1.getConfigValue)(config.preResolveTypes, true),
             mergeFragmentTypes: (0, visitor_plugin_common_1.getConfigValue)(config.mergeFragmentTypes, false),
             allowUndefinedQueryVariables: (0, visitor_plugin_common_1.getConfigValue)(config.allowUndefinedQueryVariables, false),
             enumType: (0, visitor_plugin_common_1.getConfigValue)(config.enumType, 'string-literal'),
@@ -30,20 +28,8 @@ class TypeScriptDocumentsVisitor extends visitor_plugin_common_1.BaseDocumentsVi
         }, schema);
         this._outputPath = outputPath;
         (0, auto_bind_1.default)(this);
-        const preResolveTypes = (0, visitor_plugin_common_1.getConfigValue)(config.preResolveTypes, true);
         const defaultMaybeValue = 'T | null';
         const maybeValue = (0, visitor_plugin_common_1.getConfigValue)(config.maybeValue, defaultMaybeValue);
-        const wrapOptional = (type) => {
-            if (preResolveTypes === true) {
-                return maybeValue.replace('T', type);
-            }
-            const prefix = this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : '';
-            return `${prefix}Maybe<${type}>`;
-        };
-        const wrapArray = (type) => {
-            const listModifier = this.config.immutableTypes ? 'ReadonlyArray' : 'Array';
-            return `${listModifier}<${type}>`;
-        };
         const allFragments = [
             ...documentNode.definitions.filter(d => d.kind === graphql_1.Kind.FRAGMENT_DEFINITION).map(fragmentDef => ({
                 node: fragmentDef,
@@ -63,12 +49,18 @@ class TypeScriptDocumentsVisitor extends visitor_plugin_common_1.BaseDocumentsVi
             formatNamedField: ({ name, isOptional }) => {
                 return (this.config.immutableTypes ? `readonly ${name}` : name) + (isOptional ? '?' : '');
             },
-            wrapTypeWithModifiers(baseType, type) {
-                return (0, visitor_plugin_common_1.wrapTypeWithModifiers)(baseType, type, { wrapOptional, wrapArray });
+            wrapTypeWithModifiers: (baseType, type) => {
+                return (0, visitor_plugin_common_1.wrapTypeWithModifiers)(baseType, type, {
+                    wrapOptional: type => maybeValue.replace('T', type),
+                    wrapArray: type => {
+                        const listModifier = this.config.immutableTypes ? 'ReadonlyArray' : 'Array';
+                        return `${listModifier}<${type}>`;
+                    },
+                });
             },
             printFieldsOnNewLines: this.config.printFieldsOnNewLines,
         };
-        const processor = new (preResolveTypes ? visitor_plugin_common_1.PreResolveTypesProcessor : ts_selection_set_processor_js_1.TypeScriptSelectionSetProcessor)(processorConfig);
+        const processor = new visitor_plugin_common_1.PreResolveTypesProcessor(processorConfig);
         this.setSelectionSetHandler(new visitor_plugin_common_1.SelectionSetToObject(processor, this.scalars, this.schema, this.convertName.bind(this), this.getFragmentSuffix.bind(this), allFragments, this.config));
         const enumsNames = Object.keys(schema.getTypeMap()).filter(typeName => (0, graphql_1.isEnumType)(schema.getType(typeName)));
         this.setVariablesTransformer(new ts_operation_variables_to_object_js_1.TypeScriptOperationVariablesToObject(this.scalars, this.convertName.bind(this), 

package/esm/visitor.js

@@ -2,7 +2,6 @@ import { BaseDocumentsVisitor, convertSchemaEnumToDeclarationBlockString, Declar
 import autoBind from 'auto-bind';
 import { getNamedType, GraphQLEnumType, GraphQLInputObjectType, GraphQLScalarType, isEnumType, Kind, TypeInfo, visit, visitWithTypeInfo, } from 'graphql';
 import { TypeScriptOperationVariablesToObject, SCALARS } from './ts-operation-variables-to-object.js';
-import { TypeScriptSelectionSetProcessor } from './ts-selection-set-processor.js';
 export class TypeScriptDocumentsVisitor extends BaseDocumentsVisitor {
     _usedNamedInputTypes = {};
     _outputPath;
@@ -13,7 +12,6 @@ export class TypeScriptDocumentsVisitor extends BaseDocumentsVisitor {
             avoidOptionals: normalizeAvoidOptionals(getConfigValue(config.avoidOptionals, false)),
             immutableTypes: getConfigValue(config.immutableTypes, false),
             nonOptionalTypename: getConfigValue(config.nonOptionalTypename, false),
-            preResolveTypes: getConfigValue(config.preResolveTypes, true),
             mergeFragmentTypes: getConfigValue(config.mergeFragmentTypes, false),
             allowUndefinedQueryVariables: getConfigValue(config.allowUndefinedQueryVariables, false),
             enumType: getConfigValue(config.enumType, 'string-literal'),
@@ -26,20 +24,8 @@ export class TypeScriptDocumentsVisitor extends BaseDocumentsVisitor {
         }, schema);
         this._outputPath = outputPath;
         autoBind(this);
-        const preResolveTypes = getConfigValue(config.preResolveTypes, true);
         const defaultMaybeValue = 'T | null';
         const maybeValue = getConfigValue(config.maybeValue, defaultMaybeValue);
-        const wrapOptional = (type) => {
-            if (preResolveTypes === true) {
-                return maybeValue.replace('T', type);
-            }
-            const prefix = this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : '';
-            return `${prefix}Maybe<${type}>`;
-        };
-        const wrapArray = (type) => {
-            const listModifier = this.config.immutableTypes ? 'ReadonlyArray' : 'Array';
-            return `${listModifier}<${type}>`;
-        };
         const allFragments = [
             ...documentNode.definitions.filter(d => d.kind === Kind.FRAGMENT_DEFINITION).map(fragmentDef => ({
                 node: fragmentDef,
@@ -59,12 +45,18 @@ export class TypeScriptDocumentsVisitor extends BaseDocumentsVisitor {
             formatNamedField: ({ name, isOptional }) => {
                 return (this.config.immutableTypes ? `readonly ${name}` : name) + (isOptional ? '?' : '');
             },
-            wrapTypeWithModifiers(baseType, type) {
-                return wrapTypeWithModifiers(baseType, type, { wrapOptional, wrapArray });
+            wrapTypeWithModifiers: (baseType, type) => {
+                return wrapTypeWithModifiers(baseType, type, {
+                    wrapOptional: type => maybeValue.replace('T', type),
+                    wrapArray: type => {
+                        const listModifier = this.config.immutableTypes ? 'ReadonlyArray' : 'Array';
+                        return `${listModifier}<${type}>`;
+                    },
+                });
             },
             printFieldsOnNewLines: this.config.printFieldsOnNewLines,
         };
-        const processor = new (preResolveTypes ? PreResolveTypesProcessor : TypeScriptSelectionSetProcessor)(processorConfig);
+        const processor = new PreResolveTypesProcessor(processorConfig);
         this.setSelectionSetHandler(new SelectionSetToObject(processor, this.scalars, this.schema, this.convertName.bind(this), this.getFragmentSuffix.bind(this), allFragments, this.config));
         const enumsNames = Object.keys(schema.getTypeMap()).filter(typeName => isEnumType(schema.getType(typeName)));
         this.setVariablesTransformer(new TypeScriptOperationVariablesToObject(this.scalars, this.convertName.bind(this), 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/typescript-operations",
-  "version": "6.0.0-alpha-20251228140020-a092ba2d84c819dfbb62365e419f28df54571fbe",
+  "version": "6.0.0-alpha-20260101112751-5609723f4ba2f3da5adf38c7347e2569216e3b5a",
   "description": "GraphQL Code Generator plugin for generating TypeScript types for GraphQL queries, mutations, subscriptions and fragments",
   "peerDependenciesMeta": {
     "graphql-sock": {
@@ -13,9 +13,9 @@
   },
   "dependencies": {
     "@graphql-codegen/plugin-helpers": "^6.0.0",
-    "@graphql-codegen/typescript": "6.0.0-alpha-20251228140020-a092ba2d84c819dfbb62365e419f28df54571fbe",
+    "@graphql-codegen/typescript": "6.0.0-alpha-20260101112751-5609723f4ba2f3da5adf38c7347e2569216e3b5a",
     "@graphql-codegen/schema-ast": "^5.0.0",
-    "@graphql-codegen/visitor-plugin-common": "7.0.0-alpha-20251228140020-a092ba2d84c819dfbb62365e419f28df54571fbe",
+    "@graphql-codegen/visitor-plugin-common": "7.0.0-alpha-20260101112751-5609723f4ba2f3da5adf38c7347e2569216e3b5a",
     "auto-bind": "~4.0.0",
     "tslib": "~2.6.0"
   },

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

@@ -1,72 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.TypeScriptSelectionSetProcessor = void 0;
-const visitor_plugin_common_1 = require("@graphql-codegen/visitor-plugin-common");
-class TypeScriptSelectionSetProcessor extends visitor_plugin_common_1.BaseSelectionSetProcessor {
-    transformPrimitiveFields(schemaType, fields, unsetTypes) {
-        if (fields.length === 0) {
-            return [];
-        }
-        const parentName = (this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : '') +
-            this.config.convertName(schemaType.name, {
-                useTypesPrefix: true,
-            });
-        if (unsetTypes) {
-            const escapedFieldNames = fields.map(field => `'${field.fieldName}'`);
-            return [formattedUnionTransform('MakeEmpty', parentName, escapedFieldNames)];
-        }
-        let hasConditionals = false;
-        const escapedConditionalsList = [];
-        const escapedFieldNames = fields.map(field => {
-            if (field.isConditional) {
-                hasConditionals = true;
-                escapedConditionalsList.push(`'${field.fieldName}'`);
-            }
-            return `'${field.fieldName}'`;
-        });
-        let resString = formattedUnionTransform('Pick', parentName, escapedFieldNames);
-        if (hasConditionals) {
-            resString = `${this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : ''}${formattedUnionTransform('MakeOptional', resString, escapedConditionalsList)}`;
-        }
-        return [resString];
-    }
-    transformTypenameField(type, name) {
-        return [`{ ${name}: ${type} }`];
-    }
-    transformAliasesPrimitiveFields(schemaType, fields) {
-        if (fields.length === 0) {
-            return [];
-        }
-        const parentName = (this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : '') +
-            this.config.convertName(schemaType.name, {
-                useTypesPrefix: true,
-            });
-        const selections = fields.map(aliasedField => {
-            const value = aliasedField.fieldName === '__typename' ? `'${schemaType.name}'` : `${parentName}['${aliasedField.fieldName}']`;
-            return `${aliasedField.alias}: ${value}`;
-        });
-        return [formatSelections(selections)];
-    }
-    transformLinkFields(fields) {
-        if (fields.length === 0) {
-            return [];
-        }
-        const selections = fields.map(field => `${field.alias || field.name}: ${field.selectionSet}`);
-        return [formatSelections(selections)];
-    }
-}
-exports.TypeScriptSelectionSetProcessor = TypeScriptSelectionSetProcessor;
-/** Equivalent to `${transformName}<${target}, ${unionElements.join(' | ')}>`, but with line feeds if necessary */
-function formattedUnionTransform(transformName, target, unionElements) {
-    if (unionElements.length > 3) {
-        return `${transformName}<\n    ${target},\n    | ${unionElements.join('\n    | ')}\n  >`;
-    }
-    return `${transformName}<${target}, ${unionElements.join(' | ')}>`;
-}
-/** Equivalent to `{ ${selections.join(', ')} }`, but with line feeds if necessary */
-function formatSelections(selections) {
-    if (selections.length > 1) {
-        return `{\n    ${selections.map(s => s.replace(/\n/g, '\n  ')).join(',\n    ')},\n  }`;
-    }
-    return `{ ${selections.join(', ')} }`;
-}

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

@@ -1,68 +0,0 @@
-import { BaseSelectionSetProcessor, } from '@graphql-codegen/visitor-plugin-common';
-export class TypeScriptSelectionSetProcessor extends BaseSelectionSetProcessor {
-    transformPrimitiveFields(schemaType, fields, unsetTypes) {
-        if (fields.length === 0) {
-            return [];
-        }
-        const parentName = (this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : '') +
-            this.config.convertName(schemaType.name, {
-                useTypesPrefix: true,
-            });
-        if (unsetTypes) {
-            const escapedFieldNames = fields.map(field => `'${field.fieldName}'`);
-            return [formattedUnionTransform('MakeEmpty', parentName, escapedFieldNames)];
-        }
-        let hasConditionals = false;
-        const escapedConditionalsList = [];
-        const escapedFieldNames = fields.map(field => {
-            if (field.isConditional) {
-                hasConditionals = true;
-                escapedConditionalsList.push(`'${field.fieldName}'`);
-            }
-            return `'${field.fieldName}'`;
-        });
-        let resString = formattedUnionTransform('Pick', parentName, escapedFieldNames);
-        if (hasConditionals) {
-            resString = `${this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : ''}${formattedUnionTransform('MakeOptional', resString, escapedConditionalsList)}`;
-        }
-        return [resString];
-    }
-    transformTypenameField(type, name) {
-        return [`{ ${name}: ${type} }`];
-    }
-    transformAliasesPrimitiveFields(schemaType, fields) {
-        if (fields.length === 0) {
-            return [];
-        }
-        const parentName = (this.config.namespacedImportName ? `${this.config.namespacedImportName}.` : '') +
-            this.config.convertName(schemaType.name, {
-                useTypesPrefix: true,
-            });
-        const selections = fields.map(aliasedField => {
-            const value = aliasedField.fieldName === '__typename' ? `'${schemaType.name}'` : `${parentName}['${aliasedField.fieldName}']`;
-            return `${aliasedField.alias}: ${value}`;
-        });
-        return [formatSelections(selections)];
-    }
-    transformLinkFields(fields) {
-        if (fields.length === 0) {
-            return [];
-        }
-        const selections = fields.map(field => `${field.alias || field.name}: ${field.selectionSet}`);
-        return [formatSelections(selections)];
-    }
-}
-/** Equivalent to `${transformName}<${target}, ${unionElements.join(' | ')}>`, but with line feeds if necessary */
-function formattedUnionTransform(transformName, target, unionElements) {
-    if (unionElements.length > 3) {
-        return `${transformName}<\n    ${target},\n    | ${unionElements.join('\n    | ')}\n  >`;
-    }
-    return `${transformName}<${target}, ${unionElements.join(' | ')}>`;
-}
-/** Equivalent to `{ ${selections.join(', ')} }`, but with line feeds if necessary */
-function formatSelections(selections) {
-    if (selections.length > 1) {
-        return `{\n    ${selections.map(s => s.replace(/\n/g, '\n  ')).join(',\n    ')},\n  }`;
-    }
-    return `{ ${selections.join(', ')} }`;
-}

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

@@ -1,8 +0,0 @@
-import { BaseSelectionSetProcessor, LinkField, PrimitiveAliasedFields, PrimitiveField, ProcessResult, SelectionSetProcessorConfig } from '@graphql-codegen/visitor-plugin-common';
-import { GraphQLInterfaceType, GraphQLObjectType } from 'graphql';
-export declare class TypeScriptSelectionSetProcessor extends BaseSelectionSetProcessor<SelectionSetProcessorConfig> {
-    transformPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveField[], unsetTypes?: boolean): ProcessResult;
-    transformTypenameField(type: string, name: string): ProcessResult;
-    transformAliasesPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveAliasedFields[]): ProcessResult;
-    transformLinkFields(fields: LinkField[]): ProcessResult;
-}

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

@@ -1,8 +0,0 @@
-import { BaseSelectionSetProcessor, LinkField, PrimitiveAliasedFields, PrimitiveField, ProcessResult, SelectionSetProcessorConfig } from '@graphql-codegen/visitor-plugin-common';
-import { GraphQLInterfaceType, GraphQLObjectType } from 'graphql';
-export declare class TypeScriptSelectionSetProcessor extends BaseSelectionSetProcessor<SelectionSetProcessorConfig> {
-    transformPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveField[], unsetTypes?: boolean): ProcessResult;
-    transformTypenameField(type: string, name: string): ProcessResult;
-    transformAliasesPrimitiveFields(schemaType: GraphQLObjectType | GraphQLInterfaceType, fields: PrimitiveAliasedFields[]): ProcessResult;
-    transformLinkFields(fields: LinkField[]): ProcessResult;
-}