enhance(utils/rewireTypes): do not throw duplicate schema type error (#…

…4706) * enhance(utils/rewireTypes): do not throw duplicate schema type error * Improvements * Go * Ok * Tests * Warning
ardatan · Sep 9, 2022 · 43c736b · 43c736b · vercel · Sep 9, 2022
1 parent 13b9af9
commit 43c736b
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 5 deletions.
diff --git a/.changeset/good-crabs-report.md b/.changeset/good-crabs-report.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/utils': minor
+---
+
+Do not throw duplicate type error name while rewiring types
diff --git a/.changeset/nice-moose-compete.md b/.changeset/nice-moose-compete.md
@@ -0,0 +1,5 @@
+---
+'@graphql-tools/wrap': minor
+---
+
+RenameTypes: do not rename type if the new name already exists in the schema
diff --git a/packages/loaders/url/tests/url-loader.spec.ts b/packages/loaders/url/tests/url-loader.spec.ts
@@ -584,7 +584,7 @@ describe('Schema URL Loader', () => {
     })) as ExecutionResult;
     expect(result.data).toBeUndefined();
     expect(result.errors).toBeDefined();
-    expect(result.errors?.[0].message).toBe('fetch failed to http://127.0.0.1:9777/graphql');
-    expect(result.errors?.[0].originalError?.message).toContain('failed');
+    expect(result.errors?.[0].message).toContain('failed');
+    expect(result.errors?.[0].message).toContain('http://127.0.0.1:9777/graphql');
   });
 });
diff --git a/packages/utils/src/heal.ts b/packages/utils/src/heal.ts
@@ -75,8 +75,9 @@ export function healTypes(
       continue;
     }
 
-    if (actualName in actualNamedTypeMap) {
-      throw new Error(`Duplicate schema type name ${actualName}`);
+    if (actualNamedTypeMap[actualName] != null) {
+      console.warn(`Duplicate schema type name ${actualName} found; keeping the existing one found in the schema`);
+      continue;
     }
 
     actualNamedTypeMap[actualName] = namedType;

diff --git a/packages/utils/src/rewire.ts b/packages/utils/src/rewire.ts
@@ -54,7 +54,8 @@ export function rewireTypes(
     }
 
     if (newTypeMap[newName] != null) {
-      throw new Error(`Duplicate schema type name ${newName}`);
+      console.warn(`Duplicate schema type name ${newName} found; keeping the existing one found in the schema`);
+      continue;
     }
 
     newTypeMap[newName] = namedType;

diff --git a/packages/wrap/src/transforms/RenameTypes.ts b/packages/wrap/src/transforms/RenameTypes.ts
@@ -44,6 +44,7 @@ export default class RenameTypes<TContext = Record<string, any>>
     originalWrappingSchema: GraphQLSchema,
     _subschemaConfig: SubschemaConfig<any, any, any, TContext>
   ): GraphQLSchema {
+    const typeNames = new Set<string>(Object.keys(originalWrappingSchema.getTypeMap()));
     return mapSchema(originalWrappingSchema, {
       [MapperKind.TYPE]: (type: GraphQLNamedType) => {
         if (isSpecifiedScalarType(type) && !this.renameBuiltins) {
@@ -55,9 +56,16 @@ export default class RenameTypes<TContext = Record<string, any>>
         const oldName = type.name;
         const newName = this.renamer(oldName);
         if (newName !== undefined && newName !== oldName) {
+          if (typeNames.has(newName)) {
+            console.warn(`New type name ${newName} for ${oldName} already exists in the schema. Skip renaming.`);
+            return;
+          }
           this.map[oldName] = newName;
           this.reverseMap[newName] = oldName;
 
+          typeNames.delete(oldName);
+          typeNames.add(newName);
+
           return renameType(type, newName);
         }
       },