@graphql-codegen/typescript-resolvers 4.4.5-alpha-20250314001208-26b650f2e9df4ac12ed3c6875084807691bbe9f0 → 4.5.0-alpha-20250320115712-0c95c1869f1781093936579f0f8ebc1091082c5c

package/cjs/index.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TypeScriptResolversVisitor = exports.plugin = void 0;
 const plugin_helpers_1 = require("@graphql-codegen/plugin-helpers");
@@ -6,7 +29,7 @@ const visitor_plugin_common_1 = require("@graphql-codegen/visitor-plugin-common"
 const visitor_js_1 = require("./visitor.js");
 Object.defineProperty(exports, "TypeScriptResolversVisitor", { enumerable: true, get: function () { return visitor_js_1.TypeScriptResolversVisitor; } });
 const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
-const plugin = (schema, documents, config) => {
+const plugin = async (schema, documents, config) => {
     const imports = [];
     if (!config.customResolveInfo) {
         imports.push('GraphQLResolveInfo');
@@ -57,7 +80,10 @@ export type Resolver${capitalizedDirectiveName}WithResolve<TResult, TParent, TCo
             directiveResolverMappings[directiveName] = resolverTypeName;
         }
     }
-    const transformedSchema = config.federation ? (0, plugin_helpers_1.addFederationReferencesToSchema)(schema) : schema;
+    let transformedSchema = config.federation ? (0, plugin_helpers_1.addFederationReferencesToSchema)(schema) : schema;
+    transformedSchema = config.customDirectives.semanticNonNull
+        ? await semanticToStrict(transformedSchema)
+        : transformedSchema;
     const visitor = new visitor_js_1.TypeScriptResolversVisitor({ ...config, directiveResolverMappings }, transformedSchema);
     const namespacedImportPrefix = visitor.config.namespacedImportName ? `${visitor.config.namespacedImportName}.` : '';
     const astNode = (0, plugin_helpers_1.getCachedDocumentNodeFromSchema)(transformedSchema);
@@ -257,3 +283,12 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
     };
 };
 exports.plugin = plugin;
+const semanticToStrict = async (schema) => {
+    try {
+        const sock = await Promise.resolve().then(() => __importStar(require('graphql-sock')));
+        return sock.semanticToStrict(schema);
+    }
+    catch {
+        throw new Error("To use the `customDirective.semanticNonNull` option, you must install the 'graphql-sock' package.");
+    }
+};

package/cjs/visitor.js

@@ -35,12 +35,6 @@ class TypeScriptResolversVisitor extends visitor_plugin_common_1.BaseResolversVi
         const avoidOptionals = this.config.avoidOptionals.resolvers;
         return `${schemaTypeName}${avoidOptionals ? '' : '?'}: ${resolverType}${this.getPunctuation(declarationKind)}`;
     }
-    clearOptional(str) {
-        if (str.startsWith('Maybe')) {
-            return str.replace(/Maybe<(.*?)>$/, '$1');
-        }
-        return str;
-    }
     ListType(node) {
         return `Maybe<${super.ListType(node)}>`;
     }

package/esm/index.js

@@ -2,7 +2,7 @@ import { addFederationReferencesToSchema, getCachedDocumentNodeFromSchema, oldVi
 import { parseMapper } from '@graphql-codegen/visitor-plugin-common';
 import { TypeScriptResolversVisitor } from './visitor.js';
 const capitalize = (s) => s.charAt(0).toUpperCase() + s.slice(1);
-export const plugin = (schema, documents, config) => {
+export const plugin = async (schema, documents, config) => {
     const imports = [];
     if (!config.customResolveInfo) {
         imports.push('GraphQLResolveInfo');
@@ -53,7 +53,10 @@ export type Resolver${capitalizedDirectiveName}WithResolve<TResult, TParent, TCo
             directiveResolverMappings[directiveName] = resolverTypeName;
         }
     }
-    const transformedSchema = config.federation ? addFederationReferencesToSchema(schema) : schema;
+    let transformedSchema = config.federation ? addFederationReferencesToSchema(schema) : schema;
+    transformedSchema = config.customDirectives.semanticNonNull
+        ? await semanticToStrict(transformedSchema)
+        : transformedSchema;
     const visitor = new TypeScriptResolversVisitor({ ...config, directiveResolverMappings }, transformedSchema);
     const namespacedImportPrefix = visitor.config.namespacedImportName ? `${visitor.config.namespacedImportName}.` : '';
     const astNode = getCachedDocumentNodeFromSchema(transformedSchema);
@@ -253,3 +256,12 @@ export type DirectiveResolverFn<TResult = {}, TParent = {}, TContext = {}, TArgs
     };
 };
 export { TypeScriptResolversVisitor };
+const semanticToStrict = async (schema) => {
+    try {
+        const sock = await import('graphql-sock');
+        return sock.semanticToStrict(schema);
+    }
+    catch {
+        throw new Error("To use the `customDirective.semanticNonNull` option, you must install the 'graphql-sock' package.");
+    }
+};

package/esm/visitor.js

@@ -31,12 +31,6 @@ export class TypeScriptResolversVisitor extends BaseResolversVisitor {
         const avoidOptionals = this.config.avoidOptionals.resolvers;
         return `${schemaTypeName}${avoidOptionals ? '' : '?'}: ${resolverType}${this.getPunctuation(declarationKind)}`;
     }
-    clearOptional(str) {
-        if (str.startsWith('Maybe')) {
-            return str.replace(/Maybe<(.*?)>$/, '$1');
-        }
-        return str;
-    }
     ListType(node) {
         return `Maybe<${super.ListType(node)}>`;
     }

package/package.json

@@ -1,17 +1,18 @@
 {
   "name": "@graphql-codegen/typescript-resolvers",
-  "version": "4.4.5-alpha-20250314001208-26b650f2e9df4ac12ed3c6875084807691bbe9f0",
+  "version": "4.5.0-alpha-20250320115712-0c95c1869f1781093936579f0f8ebc1091082c5c",
   "description": "GraphQL Code Generator plugin for generating TypeScript types for resolvers signature",
   "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"
+    "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",
+    "graphql-sock": "^1.0.0"
   },
   "dependencies": {
-    "@graphql-codegen/plugin-helpers": "5.1.1-alpha-20250314001208-26b650f2e9df4ac12ed3c6875084807691bbe9f0",
-    "@graphql-codegen/typescript": "4.1.6-alpha-20250314001208-26b650f2e9df4ac12ed3c6875084807691bbe9f0",
-    "@graphql-codegen/visitor-plugin-common": "5.7.2-alpha-20250314001208-26b650f2e9df4ac12ed3c6875084807691bbe9f0",
+    "@graphql-codegen/plugin-helpers": "^5.1.0",
+    "@graphql-codegen/typescript": "4.1.6-alpha-20250320115712-0c95c1869f1781093936579f0f8ebc1091082c5c",
+    "@graphql-codegen/visitor-plugin-common": "5.8.0-alpha-20250320115712-0c95c1869f1781093936579f0f8ebc1091082c5c",
     "@graphql-tools/utils": "^10.0.0",
     "auto-bind": "~4.0.0",
-    "tslib": "~2.8.0"
+    "tslib": "~2.6.0"
   },
   "repository": {
     "type": "git",

package/typings/visitor.d.cts

@@ -12,7 +12,6 @@ export declare class TypeScriptResolversVisitor extends BaseResolversVisitor<Typ
     constructor(pluginConfig: TypeScriptResolversPluginConfig, schema: GraphQLSchema);
     protected transformParentGenericType(parentType: string): string;
     protected formatRootResolver(schemaTypeName: string, resolverType: string, declarationKind: DeclarationKind): string;
-    private clearOptional;
     ListType(node: ListTypeNode): string;
     protected wrapWithListType(str: string): string;
     protected getParentTypeForSignature(node: FieldDefinitionNode): "ParentType" | "UnwrappedObject<ParentType>";

package/typings/visitor.d.ts

@@ -12,7 +12,6 @@ export declare class TypeScriptResolversVisitor extends BaseResolversVisitor<Typ
     constructor(pluginConfig: TypeScriptResolversPluginConfig, schema: GraphQLSchema);
     protected transformParentGenericType(parentType: string): string;
     protected formatRootResolver(schemaTypeName: string, resolverType: string, declarationKind: DeclarationKind): string;
-    private clearOptional;
     ListType(node: ListTypeNode): string;
     protected wrapWithListType(str: string): string;
     protected getParentTypeForSignature(node: FieldDefinitionNode): "ParentType" | "UnwrappedObject<ParentType>";