chore: better support for object type edge cases

graphql · Jan 3, 2021 · cd4ee22 · cd4ee22
1 parent 4b5c520
commit cd4ee22
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 37 deletions.
diff --git a/packages/graphql-language-service-interface/src/__tests__/getAutocompleteSuggestions-test.ts b/packages/graphql-language-service-interface/src/__tests__/getAutocompleteSuggestions-test.ts
@@ -401,11 +401,7 @@ query name {
         'type Type implements TestInterface & ',
         new Position(0, 37),
       ),
-    ).toEqual([
-      { label: 'AnotherInterface' },
-      { label: 'Character' },
-      { label: 'TestInterface' },
-    ]));
+    ).toEqual([{ label: 'AnotherInterface' }, { label: 'Character' }]));
   it('provides correct interface suggestions when extending an interface with multiple interfaces', () =>
     expect(
       testSuggestions(

diff --git a/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts b/packages/graphql-language-service-interface/src/getAutocompleteSuggestions.ts
@@ -360,49 +360,48 @@ function getSuggestionsForImplements(
         state.kind === RuleKinds.NAMED_TYPE &&
         state.prevState?.kind === RuleKinds.IMPLEMENTS
       ) {
-        const { interfaceDef, objectTypeDef } = typeInfo;
-        if (interfaceDef) {
-          const existingType = interfaceDef
+        if (typeInfo.interfaceDef) {
+          const existingType = typeInfo.interfaceDef
             ?.getInterfaces()
             .find(({ name }) => name === state.name);
           if (existingType) {
             return;
           }
           const type = schema.getType(state.name);
-          const interfaceConfig = interfaceDef?.toConfig()!;
-          if (typeInfo.interfaceDef) {
-            typeInfo.interfaceDef = new GraphQLInterfaceType({
-              ...interfaceConfig,
-              interfaces: [
-                ...interfaceConfig.interfaces,
-                (type as GraphQLInterfaceType) ||
-                  new GraphQLInterfaceType({ name: state.name, fields: {} }),
-              ],
-            });
-          } else if (objectTypeDef) {
-            const existingType = objectTypeDef
-              ?.getInterfaces()
-              .find(({ name }) => name === state.name);
-            if (existingType) {
-              return;
-            }
-            const type = schema.getType(state.name);
-            const objectTypeConfig = objectTypeDef?.toConfig()!;
-            typeInfo.objectTypeDef = new GraphQLObjectType({
-              ...objectTypeConfig,
-              interfaces: [
-                ...objectTypeConfig.interfaces,
-                (type as GraphQLInterfaceType) ||
-                  new GraphQLInterfaceType({ name: state.name, fields: {} }),
-              ],
-            });
+          const interfaceConfig = typeInfo.interfaceDef?.toConfig()!;
+          typeInfo.interfaceDef = new GraphQLInterfaceType({
+            ...interfaceConfig,
+            interfaces: [
+              ...interfaceConfig.interfaces,
+              (type as GraphQLInterfaceType) ||
+                new GraphQLInterfaceType({ name: state.name, fields: {} }),
+            ],
+          });
+        } else if (typeInfo.objectTypeDef) {
+          const existingType = typeInfo.objectTypeDef
+            ?.getInterfaces()
+            .find(({ name }) => name === state.name);
+          if (existingType) {
+            return;
           }
+          const type = schema.getType(state.name);
+          const objectTypeConfig = typeInfo.objectTypeDef?.toConfig()!;
+          typeInfo.objectTypeDef = new GraphQLObjectType({
+            ...objectTypeConfig,
+            interfaces: [
+              ...objectTypeConfig.interfaces,
+              (type as GraphQLInterfaceType) ||
+                new GraphQLInterfaceType({ name: state.name, fields: {} }),
+            ],
+          });
         }
       }
     }
   });
 
-  const siblingInterfaces = typeInfo.interfaceDef?.getInterfaces() || [];
+  const currentTypeToExtend = typeInfo.interfaceDef || typeInfo.objectTypeDef;
+
+  const siblingInterfaces = currentTypeToExtend?.getInterfaces() || [];
   const siblingInterfaceNames = siblingInterfaces.map(({ name }) => name);
 
   // TODO: we should be using schema.getPossibleTypes() here, but
@@ -412,7 +411,7 @@ function getSuggestionsForImplements(
     )
     .filter(
       ({ name }) =>
-        name !== typeInfo.interfaceDef?.name &&
+        name !== currentTypeToExtend?.name &&
         !siblingInterfaceNames.includes(name),
     );