better context detection

graphql · Sep 10, 2024 · 4c50024 · 4c50024
1 parent 937bab3
commit 4c50024
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 12 deletions.
diff --git a/packages/graphql-language-service/src/interface/__tests__/__schema__/StarWarsSchema.graphql b/packages/graphql-language-service/src/interface/__tests__/__schema__/StarWarsSchema.graphql
@@ -47,7 +47,7 @@ input InputType {
 }
 
 input OneOfInputType @oneOf {
-  key: String!
+  key: String
   value: Int
   obj: InputType
 }

diff --git a/packages/graphql-language-service/src/interface/__tests__/getAutocompleteSuggestions-test.ts b/packages/graphql-language-service/src/interface/__tests__/getAutocompleteSuggestions-test.ts
@@ -683,9 +683,14 @@ describe('getAutocompleteSuggestions', () => {
     });
 
     it('provides correct oneOf input type field suggestions', () => {
+      const args = [
+        { ...inputArgs[0], detail: 'String' },
+        inputArgs[1],
+        inputArgs[2],
+      ];
       expect(
         testSuggestions('{ oneOfInputTypeTest(oneOf: {', new Position(0, 29)),
-      ).toEqual(inputArgs);
+      ).toEqual(args);
     });
 
     it('provides no more field suggestions once a oneOf field is chosen', () => {
@@ -697,6 +702,17 @@ describe('getAutocompleteSuggestions', () => {
       ).toEqual([]);
     });
 
+    // TODO: decide if we want this. Discussing with @benjie, we might want to actually give the user flexibility here,
+    // instead of being strict
+    // it('provides no more field suggestions once a oneOf field is chose and a user begins typing another field', () => {
+    //   expect(
+    //     testSuggestions(
+    //       '{ oneOfInputTypeTest(oneOf: { value: 2 d',
+    //       new Position(0, 40),
+    //     ),
+    //   ).toEqual([]);
+    // });
+
     it('provides correct field name suggestion inside inline fragment', () => {
       expect(
         testSuggestions(

diff --git a/packages/graphql-language-service/src/interface/getAutocompleteSuggestions.ts b/packages/graphql-language-service/src/interface/getAutocompleteSuggestions.ts
@@ -312,20 +312,21 @@ export function getAutocompleteSuggestions(
       (kind === RuleKinds.OBJECT_FIELD && step === 0)) &&
     typeInfo.objectFieldDefs
   ) {
-    const objectFields = objectValues(typeInfo.objectFieldDefs);
-    const completionKind =
-      kind === RuleKinds.OBJECT_VALUE
-        ? CompletionItemKind.Value
-        : CompletionItemKind.Field;
     // @oneOf logic!
+    console.log(state.prevState?.prevState?.kind, !!typeInfo.inputType);
     if (
-      typeInfo?.inputType &&
-      'isOneOf' in typeInfo.inputType &&
-      typeInfo.inputType.isOneOf === true &&
-      context.token.string !== '{'
+      typeInfo?.inputType?.isOneOf === true &&
+      (state.prevState?.prevState?.kind !== 'Argument' || token.string !== '{')
     ) {
+      // return empty array early if a oneOf field has already been provided
       return [];
     }
+    const objectFields = objectValues(typeInfo.objectFieldDefs);
+    const completionKind =
+      kind === RuleKinds.OBJECT_VALUE
+        ? CompletionItemKind.Value
+        : CompletionItemKind.Field;
+
     return hintList(
       token,
       objectFields.map(field => ({

diff --git a/packages/graphql-language-service/src/parser/getTypeInfo.ts b/packages/graphql-language-service/src/parser/getTypeInfo.ts
@@ -213,8 +213,11 @@ export function getTypeInfo(
             }
           }
         }
-        inputType = argDef?.type;
+        if (argDef?.type) {
+          inputType = argDef.type;
+        }
         break;
+
       case RuleKinds.VARIABLE_DEFINITION:
       case RuleKinds.VARIABLE:
         type = inputType;
@@ -241,6 +244,8 @@ export function getTypeInfo(
           objectType instanceof GraphQLInputObjectType
             ? objectType.getFields()
             : null;
+        inputType = objectType;
+        console.log(inputType);
         break;
       // TODO: needs tests
       case RuleKinds.OBJECT_FIELD:

diff --git a/packages/graphql-language-service/src/types.ts b/packages/graphql-language-service/src/types.ts
@@ -29,6 +29,8 @@ import type {
   GraphQLObjectType,
   GraphQLType,
   GraphQLDirective,
+  GraphQLInputType,
+  GraphQLInputObjectType,
 } from 'graphql';
 
 export type Maybe<T> = T | null | undefined;