feat: merge completion logic (for implements &, variables) (#1747)

Author: acao

package.json

@@ -37,7 +37,8 @@
     "prebuild-bundles": "yarn build-ts-esm && yarn build-bundles-clean",
     "build-bundles-clean": "rimraf '{packages,examples,plugins}/**/{bundle,cdn,webpack}' && lerna run build-bundles-clean",
     "tsc": "tsc --build",
-    "test": "jest",
+    "test": "yarn jest && yarn test-mocha",
+    "jest": "jest",
     "test-mocha": "nyc --reporter=lcov --reporter=text-summary mocha --require packages/codemirror-graphql/resources/mochaBootload packages/codemirror-graphql/**/*-test.js",
     "test-all": "yarn test --coverage && yarn test-mocha",
     "ci": "yarn lint && yarn run check && yarn build && yarn test-all",
@@ -57,8 +58,6 @@
     "format": "yarn eslint --fix && yarn pretty",
     "prepublishOnly": "./resources/prepublish.sh",
     "postpublish": "ts-node ./resources/publishCleanup.ts",
-    "dev-graphiql": "yarn workspace graphiql run dev",
-    "dev-lsp": "echo no-op",
     "lerna-publish": "yarn ci && yarn ci-e2e && lerna publish",
     "watch": "yarn tsc --watch",
     "start-graphiql": "yarn workspace graphiql dev",

packages/codemirror-graphql/src/__tests__/hint-test.js

@@ -199,6 +199,11 @@ describe('graphql-hint', () => {
         type: TestType,
         isDeprecated: false,
       },
+      {
+        text: 'example',
+        type: GraphQLString,
+        isDeprecated: false,
+      },
       {
         text: '__typename',
         type: GraphQLNonNull(GraphQLString),
@@ -283,7 +288,7 @@ describe('graphql-hint', () => {
     expect(suggestions.list).to.deep.equal(expectedSuggestions);
   });
 
-  it('provides correct argument suggestions after fileterd', async () => {
+  it('provides correct argument suggestions after filtered', async () => {
     const suggestions = await getHintSuggestions('{ hasArgs ( f', {
       line: 0,
       ch: 13,
@@ -390,7 +395,7 @@ describe('graphql-hint', () => {
     expect(suggestions.list).to.deep.equal(expectedSuggestions);
   });
 
-  it('provides correct directive suggestion after fileterd', async () => {
+  it('provides correct directive suggestion after filtered', async () => {
     const suggestions = await getHintSuggestions('{ test (@s', {
       line: 0,
       ch: 10,
@@ -466,6 +471,55 @@ describe('graphql-hint', () => {
     expect(suggestions.list).to.deep.equal(expectedSuggestions);
   });
 
+  it('provides interface suggestions for type when using implements keyword', async () => {
+    const suggestions = await getHintSuggestions('type Type implements ', {
+      line: 0,
+      ch: 21,
+    });
+    const list = [
+      {
+        text: 'TestInterface',
+        type: TestSchema.getType('TestInterface'),
+      },
+      {
+        text: 'AnotherTestInterface',
+        type: TestSchema.getType('AnotherTestInterface'),
+      },
+    ];
+    const expectedSuggestions = getExpectedSuggestions(list);
+    expect(suggestions.list).to.deep.equal(expectedSuggestions);
+  });
+
+  it('provides interface suggestions for interface when using implements keyword', async () => {
+    const suggestions = await getHintSuggestions(
+      'interface MyInt implements An',
+      { line: 0, ch: 29 },
+    );
+    const list = [
+      {
+        text: 'AnotherTestInterface',
+        type: TestSchema.getType('AnotherTestInterface'),
+      },
+    ];
+    const expectedSuggestions = getExpectedSuggestions(list);
+    expect(suggestions.list).to.deep.equal(expectedSuggestions);
+  });
+
+  it('provides interface suggestions for interface when using implements keyword and multiple interfaces', async () => {
+    const suggestions = await getHintSuggestions(
+      'interface MyInt implements AnotherTestInterface & T',
+      { line: 0, ch: 51 },
+    );
+    const list = [
+      {
+        text: 'TestInterface',
+        type: TestSchema.getType('TestInterface'),
+      },
+    ];
+    const expectedSuggestions = getExpectedSuggestions(list);
+    expect(suggestions.list).to.deep.equal(expectedSuggestions);
+  });
+
   it('provides correct typeCondition suggestions', async () => {
     const suggestions = await getHintSuggestions('{ union { ... on ', {
       line: 0,
@@ -484,12 +538,16 @@ describe('graphql-hint', () => {
         text: 'TestInterface',
         description: '',
       },
+      {
+        text: 'AnotherTestInterface',
+        description: '',
+      },
     ];
     const expectedSuggestions = getExpectedSuggestions(list);
     expect(suggestions.list).to.deep.equal(expectedSuggestions);
   });
 
-  it('provides correct typeCondition suggestions after filterd', async () => {
+  it('provides correct typeCondition suggestions after filtered', async () => {
     const suggestions = await getHintSuggestions('{ union { ... on F', {
       line: 0,
       ch: 18,
@@ -503,6 +561,10 @@ describe('graphql-hint', () => {
         text: 'TestInterface',
         description: '',
       },
+      {
+        text: 'AnotherTestInterface',
+        description: '',
+      },
     ];
     const expectedSuggestions = getExpectedSuggestions(list);
     expect(suggestions.list).to.deep.equal(expectedSuggestions);
@@ -530,6 +592,10 @@ describe('graphql-hint', () => {
         text: 'TestInterface',
         description: '',
       },
+      {
+        text: 'AnotherTestInterface',
+        description: '',
+      },
       {
         text: 'Second',
         description: '',
@@ -707,7 +773,7 @@ describe('graphql-hint', () => {
 
   it('provides fragment names for fragments defined lower', async () => {
     const suggestions = await getHintSuggestions(
-      'query { ... } fragment Foo on Test { id }',
+      'query { ... }\nfragment Foo on Test { id }',
       { line: 0, ch: 11 },
     );
     const list = [
@@ -769,6 +835,11 @@ describe('graphql-hint', () => {
         type: TestType,
         isDeprecated: false,
       },
+      {
+        text: 'example',
+        type: GraphQLString,
+        isDeprecated: false,
+      },
       {
         text: '__typename',
         type: GraphQLNonNull(GraphQLString),
@@ -796,14 +867,21 @@ describe('graphql-hint', () => {
         type: TestType,
         isDeprecated: false,
       },
+      {
+        text: 'example',
+        type: GraphQLString,
+        isDeprecated: false,
+      },
       {
         text: '__typename',
         type: GraphQLNonNull(GraphQLString),
         description: 'The name of the current Object type at runtime.',
         isDeprecated: false,
       },
     ];
+
     const expectedSuggestions = getExpectedSuggestions(list);
+
     expect(suggestions.list).to.deep.equal(expectedSuggestions);
   });
 

packages/codemirror-graphql/src/__tests__/testSchema.js

@@ -70,9 +70,20 @@ const TestInterface = new GraphQLInterfaceType({
   },
 });
 
+const AnotherTestInterface = new GraphQLInterfaceType({
+  name: 'AnotherTestInterface',
+  resolveType: () => UnionFirst,
+  fields: {
+    example: {
+      type: GraphQLString,
+      resolve: () => ({}),
+    },
+  },
+});
+
 export const UnionFirst = new GraphQLObjectType({
   name: 'First',
-  interfaces: [TestInterface],
+  interfaces: [TestInterface, AnotherTestInterface],
   fields: () => ({
     scalar: {
       type: GraphQLString,
@@ -82,6 +93,10 @@ export const UnionFirst = new GraphQLObjectType({
       type: TestType,
       resolve: () => ({}),
     },
+    example: {
+      type: GraphQLString,
+      resolve: () => ({}),
+    },
   }),
 });