···

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
1
       
+
       
---

     

       
2
       
+
       
'@0no-co/graphqlsp': patch

     

       
3
       
+
       
---

     

       
4
       
+
       


     

       
5
       
+
       
Adjust documentation display

     

···

       
1
       
 
       
import { TypedDocumentNode } from '@graphql-typed-document-node/core';

     

       
2
       
-
       
import { gql } from '@urql/core';

     

       
3
       
 
       


     

       
4
       
 
       
export const PokemonFields = gql`

     

       
5
       
 
       
  fragment pokemonFields on Pokemon {

     

···

       
1
       
 
       
import { TypedDocumentNode } from '@graphql-typed-document-node/core';

     

       
2
       
+
       
import { createClient, gql } from '@urql/core';

     

       
3
       
 
       


     

       
4
       
 
       
export const PokemonFields = gql`

     

       
5
       
 
       
  fragment pokemonFields on Pokemon {

     

···

       
15
       
 
       
  .query(PokemonQuery, { id: '' })

     

       
16
       
 
       
  .toPromise()

     

       
17
       
 
       
  .then(result => {

     

       
18
       
-
       
    result.data?.pokemon;

     

       
19
       
 
       
  });

     

···

       
15
       
 
       
  .query(PokemonQuery, { id: '' })

     

       
16
       
 
       
  .toPromise()

     

       
17
       
 
       
  .then(result => {

     

       
18
       
+
       
    result.data?.pokemons;

     

       
19
       
 
       
  });

     

···

       
11
       
 
       
import { resolveTemplate } from './ast/resolve';

     

       
12
       
 
       
import { getToken } from './ast/token';

     

       
13
       
 
       
import { Cursor } from './ast/cursor';

     

       
0
       
 
       

     

       
14
       
 
       


     

       
15
       
 
       
export function getGraphQLQuickInfo(

     

       
16
       
 
       
  filename: string,

     
···

       
18
       
 
       
  schema: { current: GraphQLSchema | null },

     

       
19
       
 
       
  info: ts.server.PluginCreateInfo

     

       
20
       
 
       
): ts.QuickInfo | undefined {

     

       
0
       
 
       

     

       
0
       
 
       

     

       
21
       
 
       
  const tagTemplate = info.config.template || 'gql';

     

       
22
       
 
       
  const isCallExpression = info.config.templateIsCallExpression ?? false;

     

       
23
       
 
       


     
···

       
51
       
 
       
        start: cursorPosition,

     

       
52
       
 
       
        length: 1,

     

       
53
       
 
       
      },

     

       
54
       
-
       
      kindModifiers: '',

     

       
55
       
-
       
      displayParts: Array.isArray(hoverInfo)

     

       
56
       
-
       
        ? hoverInfo.map(item => ({ kind: '', text: item as string }))

     

       
57
       
-
       
        : [{ kind: '', text: hoverInfo as string }],

     

       
58
       
 
       
    };

     

       
59
       
 
       
  } else if (ts.isTaggedTemplateExpression(node)) {

     

       
60
       
 
       
    const { template, tag } = node;

     
···

       
87
       
 
       
    );

     

       
88
       
 
       


     

       
89
       
 
       
    return {

     

       
90
       
-
       
      kind: ts.ScriptElementKind.string,

     

       
91
       
 
       
      textSpan: {

     

       
92
       
 
       
        start: cursorPosition,

     

       
93
       
 
       
        length: 1,

     

       
94
       
 
       
      },

     

       
95
       
-
       
      kindModifiers: '',

     

       
96
       
-
       
      displayParts: Array.isArray(hoverInfo)

     

       
97
       
-
       
        ? hoverInfo.map(item => ({ kind: '', text: item as string }))

     

       
98
       
-
       
        : [{ kind: '', text: hoverInfo as string }],

     

       
99
       
-
       
    };

     

       
100
       
 
       
  } else {

     

       
101
       
 
       
    return undefined;

     

       
102
       
 
       
  }

     

···

       
11
       
 
       
import { resolveTemplate } from './ast/resolve';

     

       
12
       
 
       
import { getToken } from './ast/token';

     

       
13
       
 
       
import { Cursor } from './ast/cursor';

     

       
14
       
+
       
import { Logger } from '.';

     

       
15
       
 
       


     

       
16
       
 
       
export function getGraphQLQuickInfo(

     

       
17
       
 
       
  filename: string,

     
···

       
19
       
 
       
  schema: { current: GraphQLSchema | null },

     

       
20
       
 
       
  info: ts.server.PluginCreateInfo

     

       
21
       
 
       
): ts.QuickInfo | undefined {

     

       
22
       
+
       
  const logger: Logger = (msg: string) =>

     

       
23
       
+
       
    info.project.projectService.logger.info(`[GraphQLSP] ${msg}`);

     

       
24
       
 
       
  const tagTemplate = info.config.template || 'gql';

     

       
25
       
 
       
  const isCallExpression = info.config.templateIsCallExpression ?? false;

     

       
26
       
 
       


     
···

       
54
       
 
       
        start: cursorPosition,

     

       
55
       
 
       
        length: 1,

     

       
56
       
 
       
      },

     

       
57
       
+
       
      kindModifiers: 'text',

     

       
58
       
+
       
      documentation: Array.isArray(hoverInfo)

     

       
59
       
+
       
        ? hoverInfo.map(item => ({ kind: 'text', text: item as string }))

     

       
60
       
+
       
        : [{ kind: 'text', text: hoverInfo as string }],

     

       
61
       
 
       
    };

     

       
62
       
 
       
  } else if (ts.isTaggedTemplateExpression(node)) {

     

       
63
       
 
       
    const { template, tag } = node;

     
···

       
90
       
 
       
    );

     

       
91
       
 
       


     

       
92
       
 
       
    return {

     

       
93
       
+
       
      kind: ts.ScriptElementKind.label,

     

       
94
       
 
       
      textSpan: {

     

       
95
       
 
       
        start: cursorPosition,

     

       
96
       
 
       
        length: 1,

     

       
97
       
 
       
      },

     

       
98
       
+
       
      kindModifiers: 'text',

     

       
99
       
+
       
      documentation: Array.isArray(hoverInfo)

     

       
100
       
+
       
        ? hoverInfo.map(item => ({ kind: 'text', text: item as string }))

     

       
101
       
+
       
        : [{ kind: 'text', text: hoverInfo as string }],

     

       
102
       
+
       
    } as ts.QuickInfo;

     

       
103
       
 
       
  } else {

     

       
104
       
 
       
    return undefined;

     

       
105
       
 
       
  }

     

···

       
148
       
 
       


     

       
149
       
 
       
    expect(res).toBeDefined();

     

       
150
       
 
       
    expect(typeof res?.body).toEqual('object');

     

       
151
       
-
       
    expect(res?.body.displayString).toEqual(`Pokemon.name: String!`);

     

       
152
       
 
       
  }, 30000);

     

       
153
       
 
       


     

       
154
       
 
       
  it('gives quick-info with documents', async () => {

     
···

       
174
       
 
       


     

       
175
       
 
       
    expect(res).toBeDefined();

     

       
176
       
 
       
    expect(typeof res?.body).toEqual('object');

     

       
177
       
-
       
    expect(res?.body.displayString).toEqual(

     

       
178
       
 
       
      `Query.pokemons: [Pokemon]

     

       
179
       
 
       


     

       
180
       
 
       
List out all Pokémon, optionally in pages`

     

···

       
148
       
 
       


     

       
149
       
 
       
    expect(res).toBeDefined();

     

       
150
       
 
       
    expect(typeof res?.body).toEqual('object');

     

       
151
       
+
       
    expect(res?.body.documentation).toEqual(`Pokemon.name: String!`);

     

       
152
       
 
       
  }, 30000);

     

       
153
       
 
       


     

       
154
       
 
       
  it('gives quick-info with documents', async () => {

     
···

       
174
       
 
       


     

       
175
       
 
       
    expect(res).toBeDefined();

     

       
176
       
 
       
    expect(typeof res?.body).toEqual('object');

     

       
177
       
+
       
    expect(res?.body.documentation).toEqual(

     

       
178
       
 
       
      `Query.pokemons: [Pokemon]

     

       
179
       
 
       


     

       
180
       
 
       
List out all Pokémon, optionally in pages`

     

···

       
120
       
 
       


     

       
121
       
 
       
    expect(res).toBeDefined();

     

       
122
       
 
       
    expect(typeof res?.body).toEqual('object');

     

       
123
       
-
       
    expect(res?.body.displayString).toEqual(

     

       
124
       
 
       
      `Query.posts: [Post]\n\nList out all posts`

     

       
125
       
 
       
    );

     

       
126
       
 
       
  }, 30000);

     

···

       
120
       
 
       


     

       
121
       
 
       
    expect(res).toBeDefined();

     

       
122
       
 
       
    expect(typeof res?.body).toEqual('object');

     

       
123
       
+
       
    expect(res?.body.documentation).toEqual(

     

       
124
       
 
       
      `Query.posts: [Post]\n\nList out all posts`

     

       
125
       
 
       
    );

     

       
126
       
 
       
  }, 30000);

     

···

       
131
       
 
       
      .find(resp => resp.type === 'response' && resp.command === 'quickinfo');

     

       
132
       
 
       
    expect(res).toBeDefined();

     

       
133
       
 
       
    expect(typeof res?.body).toEqual('object');

     

       
134
       
-
       
    expect(res?.body.displayString).toEqual(`Query.posts: [Post]

     

       
135
       
-
       


     

       
136
       
-
       
List out all posts`);

     

       
137
       
 
       
  }, 7500);

     

       
138
       
 
       
});

     

···

       
131
       
 
       
      .find(resp => resp.type === 'response' && resp.command === 'quickinfo');

     

       
132
       
 
       
    expect(res).toBeDefined();

     

       
133
       
 
       
    expect(typeof res?.body).toEqual('object');

     

       
134
       
+
       
    expect(res?.body.documentation).toEqual(

     

       
135
       
+
       
      `Query.posts: [Post]\n\nList out all posts`

     

       
136
       
+
       
    );

     

       
137
       
 
       
  }, 7500);

     

       
138
       
 
       
});