@graphql-codegen/typescript 5.0.9 → 6.0.1

package/cjs/index.js

@@ -3,9 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.plugin = void 0;
 exports.includeIntrospectionTypesDefinitions = includeIntrospectionTypesDefinitions;
 const tslib_1 = require("tslib");
+const graphql_1 = require("graphql");
 const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
 const schema_ast_1 = require("@graphql-codegen/schema-ast");
-const graphql_1 = require("graphql");
 const introspection_visitor_js_1 = require("./introspection-visitor.js");
 const visitor_js_1 = require("./visitor.js");
 tslib_1.__exportStar(require("./config.js"), exports);
@@ -56,7 +56,9 @@ function includeIntrospectionTypesDefinitions(schema, documents, config) {
         collectTypes(type);
     }
     const visitor = new introspection_visitor_js_1.TsIntrospectionVisitor(schema, config, typesToInclude);
-    const result = (0, plugin_helpers_1.oldVisit)((0, graphql_1.parse)((0, graphql_1.printIntrospectionSchema)(schema)), { leave: visitor });
+    const result = (0, plugin_helpers_1.oldVisit)((0, graphql_1.parse)((0, graphql_1.printIntrospectionSchema)(schema)), {
+        leave: visitor,
+    });
     // recursively go through each `usedTypes` and their children and collect all used types
     // we don't care about Interfaces, Unions and others, but Objects and Enums
     function collectTypes(type) {

package/cjs/typescript-variables-to-object.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeScriptOperationVariablesToObject = void 0;
-const visitor_plugin_common_1 = require("@graphql-codegen/visitor-plugin-common");
 const graphql_1 = require("graphql");
+const visitor_plugin_common_1 = require("@graphql-codegen/visitor-plugin-common");
 class TypeScriptOperationVariablesToObject extends visitor_plugin_common_1.OperationVariablesToObject {
     _avoidOptionals;
     _immutableTypes;
@@ -48,7 +48,8 @@ class TypeScriptOperationVariablesToObject extends visitor_plugin_common_1.Opera
     }
     getAvoidOption(isNonNullType, hasDefaultValue) {
         const options = this._avoidOptionals;
-        return ((options.object || !options.defaultValue) && hasDefaultValue) || (!options.object && !isNonNullType);
+        return (((options.object || !options.defaultValue) && hasDefaultValue) ||
+            (!options.object && !isNonNullType));
     }
     getPunctuation() {
         return ';';

package/cjs/visitor.js

@@ -1,16 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TsVisitor = exports.MAKE_INCREMENTAL_SIGNATURE = exports.MAKE_EMPTY_SIGNATURE = exports.MAKE_MAYBE_SIGNATURE = exports.MAKE_OPTIONAL_SIGNATURE = exports.EXACT_SIGNATURE = void 0;
+exports.TsVisitor = void 0;
 const tslib_1 = require("tslib");
-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 visitor_plugin_common_1 = require("@graphql-codegen/visitor-plugin-common");
 const typescript_variables_to_object_js_1 = require("./typescript-variables-to-object.js");
-exports.EXACT_SIGNATURE = `type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };`;
-exports.MAKE_OPTIONAL_SIGNATURE = `type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };`;
-exports.MAKE_MAYBE_SIGNATURE = `type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };`;
-exports.MAKE_EMPTY_SIGNATURE = `type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };`;
-exports.MAKE_INCREMENTAL_SIGNATURE = `type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };`;
 class TsVisitor extends visitor_plugin_common_1.BaseTypesVisitor {
     constructor(schema, pluginConfig, additionalConfig = {}) {
         super(schema, pluginConfig, {
@@ -81,15 +76,7 @@ class TsVisitor extends visitor_plugin_common_1.BaseTypesVisitor {
     getWrapperDefinitions() {
         if (this.config.onlyEnums)
             return [];
-        const definitions = [
-            this.getMaybeValue(),
-            this.getInputMaybeValue(),
-            this.getExactDefinition(),
-            this.getMakeOptionalDefinition(),
-            this.getMakeMaybeDefinition(),
-            this.getMakeEmptyDefinition(),
-            this.getIncrementalDefinition(),
-        ];
+        const definitions = [this.getMaybeValue(), this.getInputMaybeValue()];
         if (this.config.wrapFieldDefinitions) {
             definitions.push(this.getFieldWrapperValue());
         }
@@ -98,25 +85,6 @@ class TsVisitor extends visitor_plugin_common_1.BaseTypesVisitor {
         }
         return definitions;
     }
-    getExactDefinition() {
-        if (this.config.onlyEnums)
-            return '';
-        return `${this.getExportPrefix()}${exports.EXACT_SIGNATURE}`;
-    }
-    getMakeOptionalDefinition() {
-        return `${this.getExportPrefix()}${exports.MAKE_OPTIONAL_SIGNATURE}`;
-    }
-    getMakeMaybeDefinition() {
-        if (this.config.onlyEnums)
-            return '';
-        return `${this.getExportPrefix()}${exports.MAKE_MAYBE_SIGNATURE}`;
-    }
-    getMakeEmptyDefinition() {
-        return `${this.getExportPrefix()}${exports.MAKE_EMPTY_SIGNATURE}`;
-    }
-    getIncrementalDefinition() {
-        return `${this.getExportPrefix()}${exports.MAKE_INCREMENTAL_SIGNATURE}`;
-    }
     getMaybeValue() {
         return `${this.getExportPrefix()}type Maybe<T> = ${this.config.maybeValue};`;
     }
@@ -155,12 +123,14 @@ class TsVisitor extends visitor_plugin_common_1.BaseTypesVisitor {
         let withFutureAddedValue = [];
         if (this.config.futureProofUnions) {
             withFutureAddedValue = [
-                this.config.immutableTypes ? `{ readonly __typename?: "%other" }` : `{ __typename?: "%other" }`,
+                this.config.immutableTypes
+                    ? `{ readonly __typename?: "%other" }`
+                    : `{ __typename?: "%other" }`,
             ];
         }
         const originalNode = parent[key];
         const possibleTypes = originalNode.types
-            .map(t => (this.scalars[t.name.value] ? this._getScalar(t.name.value, 'output') : this.convertName(t)))
+            .map(t => this.scalars[t.name.value] ? this._getScalar(t.name.value, 'output') : this.convertName(t))
             .concat(...withFutureAddedValue)
             .join(' | ');
         return new visitor_plugin_common_1.DeclarationBlock(this._declarationBlockConfig)
@@ -184,7 +154,7 @@ class TsVisitor extends visitor_plugin_common_1.BaseTypesVisitor {
             : node.type;
         const originalFieldNode = parent[key];
         const addOptionalSign = !this.config.avoidOptionals.field && originalFieldNode.type.kind !== graphql_1.Kind.NON_NULL_TYPE;
-        const comment = this.getNodeComment(node);
+        const comment = (0, visitor_plugin_common_1.getNodeComment)(node);
         const { type } = this.config.declarationKind;
         return (comment +
             (0, visitor_plugin_common_1.indent)(`${this.config.immutableTypes ? 'readonly ' : ''}${node.name.value}${addOptionalSign ? '?' : ''}: ${typeString}${this.getPunctuation(type)}`));
@@ -194,7 +164,7 @@ class TsVisitor extends visitor_plugin_common_1.BaseTypesVisitor {
         const addOptionalSign = !this.config.avoidOptionals.inputValue &&
             (originalFieldNode.type.kind !== graphql_1.Kind.NON_NULL_TYPE ||
                 (!this.config.avoidOptionals.defaultValue && node.defaultValue !== undefined));
-        const comment = this.getNodeComment(node);
+        const comment = (0, visitor_plugin_common_1.getNodeComment)(node);
         const declarationKind = this.config.declarationKind.type;
         let type = node.type;
         if (node.directives && this.config.directiveArgumentAndInputFieldMappings) {
@@ -226,93 +196,37 @@ class TsVisitor extends visitor_plugin_common_1.BaseTypesVisitor {
     }
     EnumTypeDefinition(node) {
         const enumName = node.name.value;
-        // In case of mapped external enum string
-        if (this.config.enumValues[enumName]?.sourceFile) {
-            return `export { ${this.config.enumValues[enumName].typeIdentifier} };\n`;
-        }
-        const getValueFromConfig = (enumValue) => {
-            if (typeof this.config.enumValues[enumName]?.mappedValues?.[enumValue] !== 'undefined') {
-                return this.config.enumValues[enumName].mappedValues[enumValue];
+        const outputType = (() => {
+            if (this.config.enumsAsTypes) {
+                return 'string-literal';
             }
-            return null;
-        };
-        const withFutureAddedValue = [
-            this.config.futureProofEnums ? [(0, visitor_plugin_common_1.indent)('| ' + (0, visitor_plugin_common_1.wrapWithSingleQuotes)('%future added value'))] : [],
-        ];
-        const enumTypeName = this.convertName(node, {
-            useTypesPrefix: this.config.enumPrefix,
-            useTypesSuffix: this.config.enumSuffix,
-        });
-        if (this.config.enumsAsTypes) {
-            return new visitor_plugin_common_1.DeclarationBlock(this._declarationBlockConfig)
-                .export()
-                .asKind('type')
-                .withComment(node.description?.value)
-                .withName(enumTypeName)
-                .withContent('\n' +
-                node.values
-                    .map(enumOption => {
-                    const name = enumOption.name.value;
-                    const enumValue = getValueFromConfig(name) ?? name;
-                    const comment = (0, visitor_plugin_common_1.transformComment)(enumOption.description?.value, 1);
-                    return comment + (0, visitor_plugin_common_1.indent)('| ' + (0, visitor_plugin_common_1.wrapWithSingleQuotes)(enumValue));
-                })
-                    .concat(...withFutureAddedValue)
-                    .join('\n')).string;
-        }
-        if (this.config.numericEnums) {
-            const block = new visitor_plugin_common_1.DeclarationBlock(this._declarationBlockConfig)
-                .export()
-                .withComment(node.description?.value)
-                .withName(enumTypeName)
-                .asKind('enum')
-                .withBlock(node.values
-                .map((enumOption, i) => {
-                const valueFromConfig = getValueFromConfig(enumOption.name.value);
-                const enumValue = valueFromConfig ?? i;
-                const comment = (0, visitor_plugin_common_1.transformComment)(enumOption.description?.value, 1);
-                const optionName = this.makeValidEnumIdentifier(this.convertName(enumOption, {
-                    useTypesPrefix: false,
-                    transformUnderscore: true,
-                }));
-                return comment + (0, visitor_plugin_common_1.indent)(optionName) + ` = ${enumValue}`;
-            })
-                .concat(...withFutureAddedValue)
-                .join(',\n')).string;
-            return block;
-        }
-        if (this.config.enumsAsConst) {
-            const typeName = `export type ${enumTypeName} = typeof ${enumTypeName}[keyof typeof ${enumTypeName}];`;
-            const enumAsConst = new visitor_plugin_common_1.DeclarationBlock({
-                ...this._declarationBlockConfig,
-                blockTransformer: block => {
-                    return block + ' as const';
+            if (this.config.numericEnums) {
+                return 'native-numeric';
+            }
+            if (this.config.enumsAsConst) {
+                return 'const';
+            }
+            return this.config.constEnums ? 'native-const' : 'native';
+        })();
+        return (0, visitor_plugin_common_1.convertSchemaEnumToDeclarationBlockString)({
+            schema: this._schema,
+            node,
+            declarationBlockConfig: this._declarationBlockConfig,
+            enumName,
+            enumValues: this.config.enumValues,
+            futureProofEnums: this.config.futureProofEnums,
+            ignoreEnumValuesFromSchema: this.config.ignoreEnumValuesFromSchema,
+            outputType,
+            naming: {
+                convert: this.config.convert,
+                options: {
+                    typesPrefix: this.config.typesPrefix,
+                    typesSuffix: this.config.typesSuffix,
+                    useTypesPrefix: this.config.enumPrefix,
+                    useTypesSuffix: this.config.enumSuffix,
                 },
-            })
-                .export()
-                .asKind('const')
-                .withName(enumTypeName)
-                .withComment(node.description?.value)
-                .withBlock(node.values
-                .map(enumOption => {
-                const optionName = this.makeValidEnumIdentifier(this.convertName(enumOption, {
-                    useTypesPrefix: false,
-                    transformUnderscore: true,
-                }));
-                const comment = (0, visitor_plugin_common_1.transformComment)(enumOption.description?.value, 1);
-                const name = enumOption.name.value;
-                const enumValue = getValueFromConfig(name) ?? name;
-                return comment + (0, visitor_plugin_common_1.indent)(`${optionName}: ${(0, visitor_plugin_common_1.wrapWithSingleQuotes)(enumValue)}`);
-            })
-                .join(',\n')).string;
-            return [enumAsConst, typeName].join('\n');
-        }
-        return new visitor_plugin_common_1.DeclarationBlock(this._declarationBlockConfig)
-            .export()
-            .asKind(this.config.constEnums ? 'const enum' : 'enum')
-            .withName(enumTypeName)
-            .withComment(node.description?.value)
-            .withBlock(this.buildEnumValuesBlock(enumName, node.values)).string;
+            },
+        });
     }
     getPunctuation(_declarationKind) {
         return ';';

package/esm/index.js

@@ -1,6 +1,6 @@
+import { getNamedType, isIntrospectionType, isObjectType, parse, printIntrospectionSchema, TypeInfo, visit, visitWithTypeInfo, } from 'graphql';
 import { oldVisit } from '@graphql-codegen/plugin-helpers';
 import { transformSchemaAST } from '@graphql-codegen/schema-ast';
-import { getNamedType, isIntrospectionType, isObjectType, parse, printIntrospectionSchema, TypeInfo, visit, visitWithTypeInfo, } from 'graphql';
 import { TsIntrospectionVisitor } from './introspection-visitor.js';
 import { TsVisitor } from './visitor.js';
 export * from './config.js';
@@ -50,7 +50,9 @@ export function includeIntrospectionTypesDefinitions(schema, documents, config)
         collectTypes(type);
     }
     const visitor = new TsIntrospectionVisitor(schema, config, typesToInclude);
-    const result = oldVisit(parse(printIntrospectionSchema(schema)), { leave: visitor });
+    const result = oldVisit(parse(printIntrospectionSchema(schema)), {
+        leave: visitor,
+    });
     // recursively go through each `usedTypes` and their children and collect all used types
     // we don't care about Interfaces, Unions and others, but Objects and Enums
     function collectTypes(type) {

package/esm/typescript-variables-to-object.js

@@ -1,5 +1,5 @@
-import { OperationVariablesToObject, } from '@graphql-codegen/visitor-plugin-common';
 import { Kind } from 'graphql';
+import { OperationVariablesToObject, } from '@graphql-codegen/visitor-plugin-common';
 export class TypeScriptOperationVariablesToObject extends OperationVariablesToObject {
     _avoidOptionals;
     _immutableTypes;
@@ -45,7 +45,8 @@ export class TypeScriptOperationVariablesToObject extends OperationVariablesToOb
     }
     getAvoidOption(isNonNullType, hasDefaultValue) {
         const options = this._avoidOptionals;
-        return ((options.object || !options.defaultValue) && hasDefaultValue) || (!options.object && !isNonNullType);
+        return (((options.object || !options.defaultValue) && hasDefaultValue) ||
+            (!options.object && !isNonNullType));
     }
     getPunctuation() {
         return ';';

package/esm/visitor.js

@@ -1,12 +1,7 @@
-import { BaseTypesVisitor, DeclarationBlock, getConfigValue, indent, isOneOfInputObjectType, normalizeAvoidOptionals, transformComment, wrapWithSingleQuotes, } from '@graphql-codegen/visitor-plugin-common';
 import autoBind from 'auto-bind';
 import { GraphQLObjectType, isEnumType, Kind, } from 'graphql';
+import { BaseTypesVisitor, convertSchemaEnumToDeclarationBlockString, DeclarationBlock, getConfigValue, getNodeComment, indent, isOneOfInputObjectType, normalizeAvoidOptionals, } from '@graphql-codegen/visitor-plugin-common';
 import { TypeScriptOperationVariablesToObject } from './typescript-variables-to-object.js';
-export const EXACT_SIGNATURE = `type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };`;
-export const MAKE_OPTIONAL_SIGNATURE = `type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };`;
-export const MAKE_MAYBE_SIGNATURE = `type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };`;
-export const MAKE_EMPTY_SIGNATURE = `type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };`;
-export const MAKE_INCREMENTAL_SIGNATURE = `type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };`;
 export class TsVisitor extends BaseTypesVisitor {
     constructor(schema, pluginConfig, additionalConfig = {}) {
         super(schema, pluginConfig, {
@@ -77,15 +72,7 @@ export class TsVisitor extends BaseTypesVisitor {
     getWrapperDefinitions() {
         if (this.config.onlyEnums)
             return [];
-        const definitions = [
-            this.getMaybeValue(),
-            this.getInputMaybeValue(),
-            this.getExactDefinition(),
-            this.getMakeOptionalDefinition(),
-            this.getMakeMaybeDefinition(),
-            this.getMakeEmptyDefinition(),
-            this.getIncrementalDefinition(),
-        ];
+        const definitions = [this.getMaybeValue(), this.getInputMaybeValue()];
         if (this.config.wrapFieldDefinitions) {
             definitions.push(this.getFieldWrapperValue());
         }
@@ -94,25 +81,6 @@ export class TsVisitor extends BaseTypesVisitor {
         }
         return definitions;
     }
-    getExactDefinition() {
-        if (this.config.onlyEnums)
-            return '';
-        return `${this.getExportPrefix()}${EXACT_SIGNATURE}`;
-    }
-    getMakeOptionalDefinition() {
-        return `${this.getExportPrefix()}${MAKE_OPTIONAL_SIGNATURE}`;
-    }
-    getMakeMaybeDefinition() {
-        if (this.config.onlyEnums)
-            return '';
-        return `${this.getExportPrefix()}${MAKE_MAYBE_SIGNATURE}`;
-    }
-    getMakeEmptyDefinition() {
-        return `${this.getExportPrefix()}${MAKE_EMPTY_SIGNATURE}`;
-    }
-    getIncrementalDefinition() {
-        return `${this.getExportPrefix()}${MAKE_INCREMENTAL_SIGNATURE}`;
-    }
     getMaybeValue() {
         return `${this.getExportPrefix()}type Maybe<T> = ${this.config.maybeValue};`;
     }
@@ -151,12 +119,14 @@ export class TsVisitor extends BaseTypesVisitor {
         let withFutureAddedValue = [];
         if (this.config.futureProofUnions) {
             withFutureAddedValue = [
-                this.config.immutableTypes ? `{ readonly __typename?: "%other" }` : `{ __typename?: "%other" }`,
+                this.config.immutableTypes
+                    ? `{ readonly __typename?: "%other" }`
+                    : `{ __typename?: "%other" }`,
             ];
         }
         const originalNode = parent[key];
         const possibleTypes = originalNode.types
-            .map(t => (this.scalars[t.name.value] ? this._getScalar(t.name.value, 'output') : this.convertName(t)))
+            .map(t => this.scalars[t.name.value] ? this._getScalar(t.name.value, 'output') : this.convertName(t))
             .concat(...withFutureAddedValue)
             .join(' | ');
         return new DeclarationBlock(this._declarationBlockConfig)
@@ -180,7 +150,7 @@ export class TsVisitor extends BaseTypesVisitor {
             : node.type;
         const originalFieldNode = parent[key];
         const addOptionalSign = !this.config.avoidOptionals.field && originalFieldNode.type.kind !== Kind.NON_NULL_TYPE;
-        const comment = this.getNodeComment(node);
+        const comment = getNodeComment(node);
         const { type } = this.config.declarationKind;
         return (comment +
             indent(`${this.config.immutableTypes ? 'readonly ' : ''}${node.name.value}${addOptionalSign ? '?' : ''}: ${typeString}${this.getPunctuation(type)}`));
@@ -190,7 +160,7 @@ export class TsVisitor extends BaseTypesVisitor {
         const addOptionalSign = !this.config.avoidOptionals.inputValue &&
             (originalFieldNode.type.kind !== Kind.NON_NULL_TYPE ||
                 (!this.config.avoidOptionals.defaultValue && node.defaultValue !== undefined));
-        const comment = this.getNodeComment(node);
+        const comment = getNodeComment(node);
         const declarationKind = this.config.declarationKind.type;
         let type = node.type;
         if (node.directives && this.config.directiveArgumentAndInputFieldMappings) {
@@ -222,93 +192,37 @@ export class TsVisitor extends BaseTypesVisitor {
     }
     EnumTypeDefinition(node) {
         const enumName = node.name.value;
-        // In case of mapped external enum string
-        if (this.config.enumValues[enumName]?.sourceFile) {
-            return `export { ${this.config.enumValues[enumName].typeIdentifier} };\n`;
-        }
-        const getValueFromConfig = (enumValue) => {
-            if (typeof this.config.enumValues[enumName]?.mappedValues?.[enumValue] !== 'undefined') {
-                return this.config.enumValues[enumName].mappedValues[enumValue];
+        const outputType = (() => {
+            if (this.config.enumsAsTypes) {
+                return 'string-literal';
             }
-            return null;
-        };
-        const withFutureAddedValue = [
-            this.config.futureProofEnums ? [indent('| ' + wrapWithSingleQuotes('%future added value'))] : [],
-        ];
-        const enumTypeName = this.convertName(node, {
-            useTypesPrefix: this.config.enumPrefix,
-            useTypesSuffix: this.config.enumSuffix,
-        });
-        if (this.config.enumsAsTypes) {
-            return new DeclarationBlock(this._declarationBlockConfig)
-                .export()
-                .asKind('type')
-                .withComment(node.description?.value)
-                .withName(enumTypeName)
-                .withContent('\n' +
-                node.values
-                    .map(enumOption => {
-                    const name = enumOption.name.value;
-                    const enumValue = getValueFromConfig(name) ?? name;
-                    const comment = transformComment(enumOption.description?.value, 1);
-                    return comment + indent('| ' + wrapWithSingleQuotes(enumValue));
-                })
-                    .concat(...withFutureAddedValue)
-                    .join('\n')).string;
-        }
-        if (this.config.numericEnums) {
-            const block = new DeclarationBlock(this._declarationBlockConfig)
-                .export()
-                .withComment(node.description?.value)
-                .withName(enumTypeName)
-                .asKind('enum')
-                .withBlock(node.values
-                .map((enumOption, i) => {
-                const valueFromConfig = getValueFromConfig(enumOption.name.value);
-                const enumValue = valueFromConfig ?? i;
-                const comment = transformComment(enumOption.description?.value, 1);
-                const optionName = this.makeValidEnumIdentifier(this.convertName(enumOption, {
-                    useTypesPrefix: false,
-                    transformUnderscore: true,
-                }));
-                return comment + indent(optionName) + ` = ${enumValue}`;
-            })
-                .concat(...withFutureAddedValue)
-                .join(',\n')).string;
-            return block;
-        }
-        if (this.config.enumsAsConst) {
-            const typeName = `export type ${enumTypeName} = typeof ${enumTypeName}[keyof typeof ${enumTypeName}];`;
-            const enumAsConst = new DeclarationBlock({
-                ...this._declarationBlockConfig,
-                blockTransformer: block => {
-                    return block + ' as const';
+            if (this.config.numericEnums) {
+                return 'native-numeric';
+            }
+            if (this.config.enumsAsConst) {
+                return 'const';
+            }
+            return this.config.constEnums ? 'native-const' : 'native';
+        })();
+        return convertSchemaEnumToDeclarationBlockString({
+            schema: this._schema,
+            node,
+            declarationBlockConfig: this._declarationBlockConfig,
+            enumName,
+            enumValues: this.config.enumValues,
+            futureProofEnums: this.config.futureProofEnums,
+            ignoreEnumValuesFromSchema: this.config.ignoreEnumValuesFromSchema,
+            outputType,
+            naming: {
+                convert: this.config.convert,
+                options: {
+                    typesPrefix: this.config.typesPrefix,
+                    typesSuffix: this.config.typesSuffix,
+                    useTypesPrefix: this.config.enumPrefix,
+                    useTypesSuffix: this.config.enumSuffix,
                 },
-            })
-                .export()
-                .asKind('const')
-                .withName(enumTypeName)
-                .withComment(node.description?.value)
-                .withBlock(node.values
-                .map(enumOption => {
-                const optionName = this.makeValidEnumIdentifier(this.convertName(enumOption, {
-                    useTypesPrefix: false,
-                    transformUnderscore: true,
-                }));
-                const comment = transformComment(enumOption.description?.value, 1);
-                const name = enumOption.name.value;
-                const enumValue = getValueFromConfig(name) ?? name;
-                return comment + indent(`${optionName}: ${wrapWithSingleQuotes(enumValue)}`);
-            })
-                .join(',\n')).string;
-            return [enumAsConst, typeName].join('\n');
-        }
-        return new DeclarationBlock(this._declarationBlockConfig)
-            .export()
-            .asKind(this.config.constEnums ? 'const enum' : 'enum')
-            .withName(enumTypeName)
-            .withComment(node.description?.value)
-            .withBlock(this.buildEnumValuesBlock(enumName, node.values)).string;
+            },
+        });
     }
     getPunctuation(_declarationKind) {
         return ';';

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@graphql-codegen/typescript",
-  "version": "5.0.9",
+  "version": "6.0.1",
   "description": "GraphQL Code Generator plugin for generating TypeScript types",
   "peerDependencies": {
     "graphql": "^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "^6.1.1",
-    "@graphql-codegen/schema-ast": "^5.0.1",
-    "@graphql-codegen/visitor-plugin-common": "^6.2.4",
-    "auto-bind": "~4.0.0",
-    "tslib": "~2.6.0"
+    "@graphql-codegen/plugin-helpers": "^7.0.0",
+    "@graphql-codegen/schema-ast": "^6.0.0",
+    "@graphql-codegen/visitor-plugin-common": "^7.0.1",
+    "auto-bind": "^5.0.0",
+    "tslib": "~2.8.0"
   },
   "repository": {
     "type": "git",

package/typings/index.d.cts

@@ -1,5 +1,5 @@
-import { PluginFunction, Types } from '@graphql-codegen/plugin-helpers';
 import { GraphQLSchema } from 'graphql';
+import { PluginFunction, Types } from '@graphql-codegen/plugin-helpers';
 import { TypeScriptPluginConfig } from './config.cjs';
 export * from './config.cjs';
 export * from './introspection-visitor.cjs';

package/typings/index.d.ts

@@ -1,5 +1,5 @@
-import { PluginFunction, Types } from '@graphql-codegen/plugin-helpers';
 import { GraphQLSchema } from 'graphql';
+import { PluginFunction, Types } from '@graphql-codegen/plugin-helpers';
 import { TypeScriptPluginConfig } from './config.js';
 export * from './config.js';
 export * from './introspection-visitor.js';

package/typings/typescript-variables-to-object.d.cts

@@ -1,11 +1,11 @@
-import { ConvertNameFn, NormalizedAvoidOptionalsConfig, NormalizedScalarsMap, OperationVariablesToObject, ParsedDirectiveArgumentAndInputFieldMappings, ParsedEnumValuesMap } from '@graphql-codegen/visitor-plugin-common';
 import { TypeNode } from 'graphql';
+import { ConvertNameFn, NormalizedAvoidOptionalsConfig, NormalizedScalarsMap, OperationVariablesToObject, ParsedDirectiveArgumentAndInputFieldMappings, ParsedEnumValuesMap } from '@graphql-codegen/visitor-plugin-common';
 export declare class TypeScriptOperationVariablesToObject extends OperationVariablesToObject {
     private _avoidOptionals;
     private _immutableTypes;
     private _maybeType;
     constructor(_scalars: NormalizedScalarsMap, _convertName: ConvertNameFn, _avoidOptionals: NormalizedAvoidOptionalsConfig, _immutableTypes: boolean, _namespacedImportName?: string | null, _enumNames?: string[], _enumPrefix?: boolean, _enumSuffix?: boolean, _enumValues?: ParsedEnumValuesMap, _applyCoercion?: boolean, _directiveArgumentAndInputFieldMappings?: ParsedDirectiveArgumentAndInputFieldMappings, _maybeType?: string);
-    private clearOptional;
+    protected clearOptional(str: string): string;
     wrapAstTypeWithModifiers(baseType: string, typeNode: TypeNode, applyCoercion?: boolean): string;
     protected formatFieldString(fieldName: string, isNonNullType: boolean, hasDefaultValue: boolean): string;
     protected formatTypeString(fieldType: string, isNonNullType: boolean, hasDefaultValue: boolean): string;

package/typings/typescript-variables-to-object.d.ts

@@ -1,11 +1,11 @@
-import { ConvertNameFn, NormalizedAvoidOptionalsConfig, NormalizedScalarsMap, OperationVariablesToObject, ParsedDirectiveArgumentAndInputFieldMappings, ParsedEnumValuesMap } from '@graphql-codegen/visitor-plugin-common';
 import { TypeNode } from 'graphql';
+import { ConvertNameFn, NormalizedAvoidOptionalsConfig, NormalizedScalarsMap, OperationVariablesToObject, ParsedDirectiveArgumentAndInputFieldMappings, ParsedEnumValuesMap } from '@graphql-codegen/visitor-plugin-common';
 export declare class TypeScriptOperationVariablesToObject extends OperationVariablesToObject {
     private _avoidOptionals;
     private _immutableTypes;
     private _maybeType;
     constructor(_scalars: NormalizedScalarsMap, _convertName: ConvertNameFn, _avoidOptionals: NormalizedAvoidOptionalsConfig, _immutableTypes: boolean, _namespacedImportName?: string | null, _enumNames?: string[], _enumPrefix?: boolean, _enumSuffix?: boolean, _enumValues?: ParsedEnumValuesMap, _applyCoercion?: boolean, _directiveArgumentAndInputFieldMappings?: ParsedDirectiveArgumentAndInputFieldMappings, _maybeType?: string);
-    private clearOptional;
+    protected clearOptional(str: string): string;
     wrapAstTypeWithModifiers(baseType: string, typeNode: TypeNode, applyCoercion?: boolean): string;
     protected formatFieldString(fieldName: string, isNonNullType: boolean, hasDefaultValue: boolean): string;
     protected formatTypeString(fieldType: string, isNonNullType: boolean, hasDefaultValue: boolean): string;

package/typings/visitor.d.cts

@@ -1,5 +1,5 @@
-import { BaseTypesVisitor, DeclarationKind, NormalizedAvoidOptionalsConfig, ParsedTypesConfig } from '@graphql-codegen/visitor-plugin-common';
 import { EnumTypeDefinitionNode, FieldDefinitionNode, GraphQLSchema, InputValueDefinitionNode, ListTypeNode, NamedTypeNode, NonNullTypeNode, TypeDefinitionNode, UnionTypeDefinitionNode } from 'graphql';
+import { BaseTypesVisitor, DeclarationKind, NormalizedAvoidOptionalsConfig, ParsedTypesConfig } from '@graphql-codegen/visitor-plugin-common';
 import { TypeScriptPluginConfig } from './config.cjs';
 export interface TypeScriptPluginParsedConfig extends ParsedTypesConfig {
     avoidOptionals: NormalizedAvoidOptionalsConfig;
@@ -17,20 +17,10 @@ export interface TypeScriptPluginParsedConfig extends ParsedTypesConfig {
     noExport: boolean;
     useImplementingTypes: boolean;
 }
-export declare const EXACT_SIGNATURE = "type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };";
-export declare const MAKE_OPTIONAL_SIGNATURE = "type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };";
-export declare const MAKE_MAYBE_SIGNATURE = "type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };";
-export declare const MAKE_EMPTY_SIGNATURE = "type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };";
-export declare const MAKE_INCREMENTAL_SIGNATURE = "type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };";
 export declare class TsVisitor<TRawConfig extends TypeScriptPluginConfig = TypeScriptPluginConfig, TParsedConfig extends TypeScriptPluginParsedConfig = TypeScriptPluginParsedConfig> extends BaseTypesVisitor<TRawConfig, TParsedConfig> {
     constructor(schema: GraphQLSchema, pluginConfig: TRawConfig, additionalConfig?: Partial<TParsedConfig>);
     protected _getTypeForNode(node: NamedTypeNode, isVisitingInputType: boolean): string;
     getWrapperDefinitions(): string[];
-    getExactDefinition(): string;
-    getMakeOptionalDefinition(): string;
-    getMakeMaybeDefinition(): string;
-    getMakeEmptyDefinition(): string;
-    getIncrementalDefinition(): string;
     getMaybeValue(): string;
     getInputMaybeValue(): string;
     protected clearOptional(str: string): string;

package/typings/visitor.d.ts

@@ -1,5 +1,5 @@
-import { BaseTypesVisitor, DeclarationKind, NormalizedAvoidOptionalsConfig, ParsedTypesConfig } from '@graphql-codegen/visitor-plugin-common';
 import { EnumTypeDefinitionNode, FieldDefinitionNode, GraphQLSchema, InputValueDefinitionNode, ListTypeNode, NamedTypeNode, NonNullTypeNode, TypeDefinitionNode, UnionTypeDefinitionNode } from 'graphql';
+import { BaseTypesVisitor, DeclarationKind, NormalizedAvoidOptionalsConfig, ParsedTypesConfig } from '@graphql-codegen/visitor-plugin-common';
 import { TypeScriptPluginConfig } from './config.js';
 export interface TypeScriptPluginParsedConfig extends ParsedTypesConfig {
     avoidOptionals: NormalizedAvoidOptionalsConfig;
@@ -17,20 +17,10 @@ export interface TypeScriptPluginParsedConfig extends ParsedTypesConfig {
     noExport: boolean;
     useImplementingTypes: boolean;
 }
-export declare const EXACT_SIGNATURE = "type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };";
-export declare const MAKE_OPTIONAL_SIGNATURE = "type MakeOptional<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]?: Maybe<T[SubKey]> };";
-export declare const MAKE_MAYBE_SIGNATURE = "type MakeMaybe<T, K extends keyof T> = Omit<T, K> & { [SubKey in K]: Maybe<T[SubKey]> };";
-export declare const MAKE_EMPTY_SIGNATURE = "type MakeEmpty<T extends { [key: string]: unknown }, K extends keyof T> = { [_ in K]?: never };";
-export declare const MAKE_INCREMENTAL_SIGNATURE = "type Incremental<T> = T | { [P in keyof T]?: P extends ' $fragmentName' | '__typename' ? T[P] : never };";
 export declare class TsVisitor<TRawConfig extends TypeScriptPluginConfig = TypeScriptPluginConfig, TParsedConfig extends TypeScriptPluginParsedConfig = TypeScriptPluginParsedConfig> extends BaseTypesVisitor<TRawConfig, TParsedConfig> {
     constructor(schema: GraphQLSchema, pluginConfig: TRawConfig, additionalConfig?: Partial<TParsedConfig>);
     protected _getTypeForNode(node: NamedTypeNode, isVisitingInputType: boolean): string;
     getWrapperDefinitions(): string[];
-    getExactDefinition(): string;
-    getMakeOptionalDefinition(): string;
-    getMakeMaybeDefinition(): string;
-    getMakeEmptyDefinition(): string;
-    getIncrementalDefinition(): string;
     getMaybeValue(): string;
     getInputMaybeValue(): string;
     protected clearOptional(str: string): string;