@graphql-codegen/visitor-plugin-common 3.1.0 → 3.1.1-alpha-20230405162832-a31e8a154

package/cjs/base-resolvers-visitor.js

@@ -274,12 +274,14 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
         const unionTypes = typeNames.reduce((res, typeName) => {
             const schemaType = allSchemaTypes[typeName];
             if ((0, graphql_1.isUnionType)(schemaType)) {
-                const referencedTypes = schemaType.getTypes().map(unionMemberType => {
+                const referencedTypes = schemaType
+                    .getTypes()
+                    .map(unionMemberType => {
                     var _a;
                     const isUnionMemberMapped = this.config.mappers[unionMemberType.name];
                     // 1. If mapped without placehoder, just use it without doing extra checks
                     if (isUnionMemberMapped && !hasPlaceholder(isUnionMemberMapped.type)) {
-                        return isUnionMemberMapped.type;
+                        return { typename: unionMemberType.name, unionMemberValue: isUnionMemberMapped.type };
                     }
                     // 2. Work out value for union member type
                     // 2a. By default, use the typescript type
@@ -293,21 +295,30 @@ class BaseResolversVisitor extends base_visitor_js_1.BaseVisitor {
                     }
                     // 2c. If union member is mapped with placeholder, use the "type with maybe Omit" as {T}
                     if (isUnionMemberMapped && hasPlaceholder(isUnionMemberMapped.type)) {
-                        return replacePlaceholder(isUnionMemberMapped.type, unionMemberValue);
+                        return {
+                            typename: unionMemberType.name,
+                            unionMemberValue: replacePlaceholder(isUnionMemberMapped.type, unionMemberValue),
+                        };
                     }
                     // 2d. If has default mapper with placeholder, use the "type with maybe Omit" as {T}
                     const hasDefaultMapper = !!((_a = this.config.defaultMapper) === null || _a === void 0 ? void 0 : _a.type);
                     const isScalar = this.config.scalars[typeName];
                     if (hasDefaultMapper && hasPlaceholder(this.config.defaultMapper.type)) {
                         const finalTypename = isScalar ? this._getScalar(typeName) : unionMemberValue;
-                        return replacePlaceholder(this.config.defaultMapper.type, finalTypename);
+                        return {
+                            typename: unionMemberType.name,
+                            unionMemberValue: replacePlaceholder(this.config.defaultMapper.type, finalTypename),
+                        };
                     }
+                    return { typename: unionMemberType.name, unionMemberValue };
+                })
+                    .map(({ typename, unionMemberValue }) => {
                     const nonOptionalTypenameModifier = this.config.resolversNonOptionalTypename.unionMember
-                        ? ` & { __typename: "${unionMemberType}" }`
+                        ? ` & { __typename: '${typename}' }`
                         : '';
-                    return `${unionMemberValue}${nonOptionalTypenameModifier}`;
+                    return `( ${unionMemberValue}${nonOptionalTypenameModifier} )`; // Must wrap every union member in explicit "( )" to separate the members
                 });
-                res[typeName] = referencedTypes.map(type => `( ${type} )`).join(' | '); // Must wrap every union member in explicit "( )" to separate the members
+                res[typeName] = referencedTypes.join(' | ');
             }
             return res;
         }, {});

package/esm/base-resolvers-visitor.js

@@ -270,12 +270,14 @@ export class BaseResolversVisitor extends BaseVisitor {
         const unionTypes = typeNames.reduce((res, typeName) => {
             const schemaType = allSchemaTypes[typeName];
             if (isUnionType(schemaType)) {
-                const referencedTypes = schemaType.getTypes().map(unionMemberType => {
+                const referencedTypes = schemaType
+                    .getTypes()
+                    .map(unionMemberType => {
                     var _a;
                     const isUnionMemberMapped = this.config.mappers[unionMemberType.name];
                     // 1. If mapped without placehoder, just use it without doing extra checks
                     if (isUnionMemberMapped && !hasPlaceholder(isUnionMemberMapped.type)) {
-                        return isUnionMemberMapped.type;
+                        return { typename: unionMemberType.name, unionMemberValue: isUnionMemberMapped.type };
                     }
                     // 2. Work out value for union member type
                     // 2a. By default, use the typescript type
@@ -289,21 +291,30 @@ export class BaseResolversVisitor extends BaseVisitor {
                     }
                     // 2c. If union member is mapped with placeholder, use the "type with maybe Omit" as {T}
                     if (isUnionMemberMapped && hasPlaceholder(isUnionMemberMapped.type)) {
-                        return replacePlaceholder(isUnionMemberMapped.type, unionMemberValue);
+                        return {
+                            typename: unionMemberType.name,
+                            unionMemberValue: replacePlaceholder(isUnionMemberMapped.type, unionMemberValue),
+                        };
                     }
                     // 2d. If has default mapper with placeholder, use the "type with maybe Omit" as {T}
                     const hasDefaultMapper = !!((_a = this.config.defaultMapper) === null || _a === void 0 ? void 0 : _a.type);
                     const isScalar = this.config.scalars[typeName];
                     if (hasDefaultMapper && hasPlaceholder(this.config.defaultMapper.type)) {
                         const finalTypename = isScalar ? this._getScalar(typeName) : unionMemberValue;
-                        return replacePlaceholder(this.config.defaultMapper.type, finalTypename);
+                        return {
+                            typename: unionMemberType.name,
+                            unionMemberValue: replacePlaceholder(this.config.defaultMapper.type, finalTypename),
+                        };
                     }
+                    return { typename: unionMemberType.name, unionMemberValue };
+                })
+                    .map(({ typename, unionMemberValue }) => {
                     const nonOptionalTypenameModifier = this.config.resolversNonOptionalTypename.unionMember
-                        ? ` & { __typename: "${unionMemberType}" }`
+                        ? ` & { __typename: '${typename}' }`
                         : '';
-                    return `${unionMemberValue}${nonOptionalTypenameModifier}`;
+                    return `( ${unionMemberValue}${nonOptionalTypenameModifier} )`; // Must wrap every union member in explicit "( )" to separate the members
                 });
-                res[typeName] = referencedTypes.map(type => `( ${type} )`).join(' | '); // Must wrap every union member in explicit "( )" to separate the members
+                res[typeName] = referencedTypes.join(' | ');
             }
             return res;
         }, {});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@graphql-codegen/visitor-plugin-common",
-  "version": "3.1.0",
+  "version": "3.1.1-alpha-20230405162832-a31e8a154",
   "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"
   },