@graphql-codegen/visitor-plugin-common 6.0.0-alpha-20250311213828-b0b7e86bc292eaf1e1b50e494e0e1f7af2fef9d2 → 6.0.0-alpha-20250321102504-0b0c9bfb30ea7c446d896d8710d715701d90846a

package/cjs/base-resolvers-visitor.js

@@ -642,18 +642,12 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         const declarationKind = 'type';
         return (parentName, avoidResolverOptionals) => {
             const original = parent[key];
-            const baseType = (0, utils_js_1.getBaseTypeNode)(original.type);
-            const realType = baseType.name.value;
             const parentType = this.schema.getType(parentName);
             const meta = {};
             if (this._federation.skipField({ fieldNode: original, parentType })) {
                 return { value: null, meta };
             }
             const contextType = this.getContextType(parentName, node);
-            const typeToUse = this.getTypeToUse(realType);
-            const mappedType = this._variablesTransformer.wrapAstTypeWithModifiers(typeToUse, original.type);
-            const subscriptionType = this._schema.getSubscriptionType();
-            const isSubscriptionType = subscriptionType && subscriptionType.name === parentName;
             let argsType = hasArguments
                 ? this.convertName(parentName +
                     (this.config.addUnderscoreToArgsType ? '_' : '') +
@@ -681,12 +675,35 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
                 parentTypeSignature: this.getParentTypeForSignature(node),
                 federationTypeSignature: 'FederationType',
             });
-            const mappedTypeKey = isSubscriptionType ? `${mappedType}, "${node.name}"` : mappedType;
-            const directiveMappings = node.directives
-                ?.map(directive => this._directiveResolverMappings[directive.name])
-                .filter(Boolean)
-                .reverse() ?? [];
-            const resolverType = isSubscriptionType ? 'SubscriptionResolver' : directiveMappings[0] ?? 'Resolver';
+            const { mappedTypeKey, resolverType } = (() => {
+                const baseType = (0, utils_js_1.getBaseTypeNode)(original.type);
+                const realType = baseType.name.value;
+                const typeToUse = this.getTypeToUse(realType);
+                /**
+                 * Turns GraphQL type to TypeScript types (`mappedType`) e.g.
+                 * - String!  -> ResolversTypes['String']>
+                 * - String   -> Maybe<ResolversTypes['String']>
+                 * - [String] -> Maybe<Array<Maybe<ResolversTypes['String']>>>
+                 * - [String!]! -> Array<ResolversTypes['String']>
+                 */
+                const mappedType = this._variablesTransformer.wrapAstTypeWithModifiers(typeToUse, original.type);
+                const subscriptionType = this._schema.getSubscriptionType();
+                const isSubscriptionType = subscriptionType && subscriptionType.name === parentName;
+                if (isSubscriptionType) {
+                    return {
+                        mappedTypeKey: `${mappedType}, "${node.name}"`,
+                        resolverType: 'SubscriptionResolver',
+                    };
+                }
+                const directiveMappings = node.directives
+                    ?.map(directive => this._directiveResolverMappings[directive.name])
+                    .filter(Boolean)
+                    .reverse() ?? [];
+                return {
+                    mappedTypeKey: mappedType,
+                    resolverType: directiveMappings[0] ?? 'Resolver',
+                };
+            })();
             const signature = {
                 name: node.name,
                 modifier: avoidResolverOptionals ? '' : '?',

package/esm/base-resolvers-visitor.js

@@ -638,18 +638,12 @@ export class BaseResolversVisitor extends BaseVisitor {
         const declarationKind = 'type';
         return (parentName, avoidResolverOptionals) => {
             const original = parent[key];
-            const baseType = getBaseTypeNode(original.type);
-            const realType = baseType.name.value;
             const parentType = this.schema.getType(parentName);
             const meta = {};
             if (this._federation.skipField({ fieldNode: original, parentType })) {
                 return { value: null, meta };
             }
             const contextType = this.getContextType(parentName, node);
-            const typeToUse = this.getTypeToUse(realType);
-            const mappedType = this._variablesTransformer.wrapAstTypeWithModifiers(typeToUse, original.type);
-            const subscriptionType = this._schema.getSubscriptionType();
-            const isSubscriptionType = subscriptionType && subscriptionType.name === parentName;
             let argsType = hasArguments
                 ? this.convertName(parentName +
                     (this.config.addUnderscoreToArgsType ? '_' : '') +
@@ -677,12 +671,35 @@ export class BaseResolversVisitor extends BaseVisitor {
                 parentTypeSignature: this.getParentTypeForSignature(node),
                 federationTypeSignature: 'FederationType',
             });
-            const mappedTypeKey = isSubscriptionType ? `${mappedType}, "${node.name}"` : mappedType;
-            const directiveMappings = node.directives
-                ?.map(directive => this._directiveResolverMappings[directive.name])
-                .filter(Boolean)
-                .reverse() ?? [];
-            const resolverType = isSubscriptionType ? 'SubscriptionResolver' : directiveMappings[0] ?? 'Resolver';
+            const { mappedTypeKey, resolverType } = (() => {
+                const baseType = getBaseTypeNode(original.type);
+                const realType = baseType.name.value;
+                const typeToUse = this.getTypeToUse(realType);
+                /**
+                 * Turns GraphQL type to TypeScript types (`mappedType`) e.g.
+                 * - String!  -> ResolversTypes['String']>
+                 * - String   -> Maybe<ResolversTypes['String']>
+                 * - [String] -> Maybe<Array<Maybe<ResolversTypes['String']>>>
+                 * - [String!]! -> Array<ResolversTypes['String']>
+                 */
+                const mappedType = this._variablesTransformer.wrapAstTypeWithModifiers(typeToUse, original.type);
+                const subscriptionType = this._schema.getSubscriptionType();
+                const isSubscriptionType = subscriptionType && subscriptionType.name === parentName;
+                if (isSubscriptionType) {
+                    return {
+                        mappedTypeKey: `${mappedType}, "${node.name}"`,
+                        resolverType: 'SubscriptionResolver',
+                    };
+                }
+                const directiveMappings = node.directives
+                    ?.map(directive => this._directiveResolverMappings[directive.name])
+                    .filter(Boolean)
+                    .reverse() ?? [];
+                return {
+                    mappedTypeKey: mappedType,
+                    resolverType: directiveMappings[0] ?? 'Resolver',
+                };
+            })();
             const signature = {
                 name: node.name,
                 modifier: avoidResolverOptionals ? '' : '?',

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "6.0.0-alpha-20250311213828-b0b7e86bc292eaf1e1b50e494e0e1f7af2fef9d2",
+  "version": "6.0.0-alpha-20250321102504-0b0c9bfb30ea7c446d896d8710d715701d90846a",
   "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": "^2.0.0",
-    "@graphql-codegen/plugin-helpers": "6.0.0-alpha-20250311213828-b0b7e86bc292eaf1e1b50e494e0e1f7af2fef9d2",
+    "@graphql-codegen/plugin-helpers": "6.0.0-alpha-20250321102504-0b0c9bfb30ea7c446d896d8710d715701d90846a",
     "@graphql-tools/relay-operation-optimizer": "^7.0.0",
     "@graphql-tools/utils": "^10.0.0",
     "auto-bind": "~4.0.0",

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

@@ -510,6 +510,40 @@ export interface RawResolversConfig extends RawConfig {
      * ```
      */
     enumSuffix?: boolean;
+    /**
+     * @description Configures behavior for custom directives from various GraphQL libraries.
+     * @exampleMarkdown
+     * ## `@semanticNonNull`
+     * First, install `graphql-sock` peer dependency:
+     *
+     * ```sh npm2yarn
+     * npm install -D graphql-sock
+     * ```
+     *
+     * Now, you can enable support for `@semanticNonNull` directive:
+     *
+     * ```ts filename="codegen.ts"
+     *  import type { CodegenConfig } from '@graphql-codegen/cli';
+     *
+     *  const config: CodegenConfig = {
+     *    // ...
+     *    generates: {
+     *      'path/to/file.ts': {
+     *        plugins: ['typescript-resolvers'],
+     *        config: {
+     *          customDirectives: {
+     *            semanticNonNull: true
+     *          }
+     *        },
+     *      },
+     *    },
+     *  };
+     *  export default config;
+     * ```
+     */
+    customDirectives?: {
+        semanticNonNull?: boolean;
+    };
     /**
      * @default false
      * @description Sets the `__resolveType` field as optional field.

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

@@ -510,6 +510,40 @@ export interface RawResolversConfig extends RawConfig {
      * ```
      */
     enumSuffix?: boolean;
+    /**
+     * @description Configures behavior for custom directives from various GraphQL libraries.
+     * @exampleMarkdown
+     * ## `@semanticNonNull`
+     * First, install `graphql-sock` peer dependency:
+     *
+     * ```sh npm2yarn
+     * npm install -D graphql-sock
+     * ```
+     *
+     * Now, you can enable support for `@semanticNonNull` directive:
+     *
+     * ```ts filename="codegen.ts"
+     *  import type { CodegenConfig } from '@graphql-codegen/cli';
+     *
+     *  const config: CodegenConfig = {
+     *    // ...
+     *    generates: {
+     *      'path/to/file.ts': {
+     *        plugins: ['typescript-resolvers'],
+     *        config: {
+     *          customDirectives: {
+     *            semanticNonNull: true
+     *          }
+     *        },
+     *      },
+     *    },
+     *  };
+     *  export default config;
+     * ```
+     */
+    customDirectives?: {
+        semanticNonNull?: boolean;
+    };
     /**
      * @default false
      * @description Sets the `__resolveType` field as optional field.