commit 3b78093b8801553ad04b92472446250abf4ba58e · kitten.sh/graphqlsp

.changeset/stupid-cobras-boil.md

···

       1
       +
       ---

     

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

     

       3
       +
       ---

     

       4
       +
       

     

       5
       +
       Fix quick-info getting offset by preceding fragments

+27 -3

packages/example/src/Pokemon.generated.ts

···

       1
        
       import * as Types from '../__generated__/baseGraphQLSP';

     

       2
        
       import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core';

     

       3
        
       export type PokemonFieldsFragment = {

     

       4
       -
         __typename?: 'Pokemon';

     

       5
        
         id: string;

     

       6
        
         name: string;

     

       7
        
         attacks?: {

     

       8
       -
           __typename?: 'AttacksConnection';

     

       9
        
           fast?: Array<{

     

       10
       -
             __typename?: 'Attack';

     

       11
        
             damage?: number | null;

     

       12
        
             name?: string | null;

     

       13
        
           } | null> | null;

     

       14
        
         } | null;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       };

     

       16
        
       

     

       17
        
       export const PokemonFieldsFragmentDoc = {

     
···

       57
        
           },

     

       58
        
         ],

     

       59
        
       } as unknown as DocumentNode<PokemonFieldsFragment, unknown>;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       1
        
       import * as Types from '../__generated__/baseGraphQLSP';

     

       2
        
       import { TypedDocumentNode as DocumentNode } from '@graphql-typed-document-node/core';

     

       3
        
       export type PokemonFieldsFragment = {

     

       4
       +
         __typename: 'Pokemon';

     

       5
        
         id: string;

     

       6
        
         name: string;

     

       7
        
         attacks?: {

     

       8
       +
           __typename: 'AttacksConnection';

     

       9
        
           fast?: Array<{

     

       10
       +
             __typename: 'Attack';

     

       11
        
             damage?: number | null;

     

       12
        
             name?: string | null;

     

       13
        
           } | null> | null;

     

       14
        
         } | null;

     

       15
       +
       };

     

       16
       +
       

     

       17
       +
       export type WeaknessFieldsFragment = {

     

       18
       +
         __typename: 'Pokemon';

     

       19
       +
         weaknesses?: Array<Types.PokemonType | null> | null;

     

       20
        
       };

     

       21
        
       

     

       22
        
       export const PokemonFieldsFragmentDoc = {

     
···

       62
        
           },

     

       63
        
         ],

     

       64
        
       } as unknown as DocumentNode<PokemonFieldsFragment, unknown>;

     

       65
       +
       export const WeaknessFieldsFragmentDoc = {

     

       66
       +
         kind: 'Document',

     

       67
       +
         definitions: [

     

       68
       +
           {

     

       69
       +
             kind: 'FragmentDefinition',

     

       70
       +
             name: { kind: 'Name', value: 'weaknessFields' },

     

       71
       +
             typeCondition: {

     

       72
       +
               kind: 'NamedType',

     

       73
       +
               name: { kind: 'Name', value: 'Pokemon' },

     

       74
       +
             },

     

       75
       +
             selectionSet: {

     

       76
       +
               kind: 'SelectionSet',

     

       77
       +
               selections: [

     

       78
       +
                 { kind: 'Field', name: { kind: 'Name', value: 'weaknesses' } },

     

       79
       +
               ],

     

       80
       +
             },

     

       81
       +
           },

     

       82
       +
         ],

     

       83
       +
       } as unknown as DocumentNode<WeaknessFieldsFragment, unknown>;

packages/example/src/Pokemon.ts

···

       5
        
         fragment pokemonFields on Pokemon {

     

       6
        
           id

     

       7
        
           name

     

       0
        
       
     

       8
        
           attacks {

     

       9
        
             fast {

     

       10
        
               damage

     
···

       13
        
           }

     

       14
        
         }

     

       15
        
       ` as typeof import('./Pokemon.generated').PokemonFieldsFragmentDoc;

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       16
        
       export const Pokemon = (data: any) => {

     

       17
        
         const pokemon = useFragment(PokemonFields, data);

     

       18
        
         return `hi ${pokemon.name}`;

···

       5
        
         fragment pokemonFields on Pokemon {

     

       6
        
           id

     

       7
        
           name

     

       8
       +
           ...someUnknownFragment

     

       9
        
           attacks {

     

       10
        
             fast {

     

       11
        
               damage

     
···

       14
        
           }

     

       15
        
         }

     

       16
        
       ` as typeof import('./Pokemon.generated').PokemonFieldsFragmentDoc;

     

       17
       +
       

     

       18
       +
       export const WeakFields = gql`

     

       19
       +
         fragment weaknessFields on Pokemon {

     

       20
       +
           weaknesses

     

       21
       +
           someUnknownField

     

       22
       +
         }

     

       23
       +
       ` as typeof import('./Pokemon.generated').WeaknessFieldsFragmentDoc;

     

       24
       +
       

     

       25
        
       export const Pokemon = (data: any) => {

     

       26
        
         const pokemon = useFragment(PokemonFields, data);

     

       27
        
         return `hi ${pokemon.name}`;

+100

packages/example/src/index.generated.ts

···

       12
        
         } | null> | null;

     

       13
        
       };

     

       14
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
       export type PoQueryVariables = Types.Exact<{

     

       16
        
         id: Types.Scalars['ID'];

     

       17
        
       }>;

     
···

       25
        
         } | null;

     

       26
        
       };

     

       27
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       28
        
       export const PokDocument = {

     

       29
        
         kind: 'Document',

     

       30
        
         definitions: [

···

       12
        
         } | null> | null;

     

       13
        
       };

     

       14
        
       

     

       15
       +
       export type PokemonFieldsFragment = {

     

       16
       +
         __typename: 'Pokemon';

     

       17
       +
         id: string;

     

       18
       +
         name: string;

     

       19
       +
         resistant?: Array<Types.PokemonType | null> | null;

     

       20
       +
         attacks?: {

     

       21
       +
           __typename: 'AttacksConnection';

     

       22
       +
           fast?: Array<{

     

       23
       +
             __typename: 'Attack';

     

       24
       +
             damage?: number | null;

     

       25
       +
             name?: string | null;

     

       26
       +
           } | null> | null;

     

       27
       +
         } | null;

     

       28
       +
       };

     

       29
       +
       

     

       30
       +
       export type MoreFieldsFragment = {

     

       31
       +
         __typename: 'Pokemon';

     

       32
       +
         resistant?: Array<Types.PokemonType | null> | null;

     

       33
       +
       };

     

       34
       +
       

     

       35
        
       export type PoQueryVariables = Types.Exact<{

     

       36
        
         id: Types.Scalars['ID'];

     

       37
        
       }>;

     
···

       45
        
         } | null;

     

       46
        
       };

     

       47
        
       

     

       48
       +
       export const MoreFieldsFragmentDoc = {

     

       49
       +
         kind: 'Document',

     

       50
       +
         definitions: [

     

       51
       +
           {

     

       52
       +
             kind: 'FragmentDefinition',

     

       53
       +
             name: { kind: 'Name', value: 'moreFields' },

     

       54
       +
             typeCondition: {

     

       55
       +
               kind: 'NamedType',

     

       56
       +
               name: { kind: 'Name', value: 'Pokemon' },

     

       57
       +
             },

     

       58
       +
             selectionSet: {

     

       59
       +
               kind: 'SelectionSet',

     

       60
       +
               selections: [

     

       61
       +
                 { kind: 'Field', name: { kind: 'Name', value: 'resistant' } },

     

       62
       +
               ],

     

       63
       +
             },

     

       64
       +
           },

     

       65
       +
         ],

     

       66
       +
       } as unknown as DocumentNode<MoreFieldsFragment, unknown>;

     

       67
       +
       export const PokemonFieldsFragmentDoc = {

     

       68
       +
         kind: 'Document',

     

       69
       +
         definitions: [

     

       70
       +
           {

     

       71
       +
             kind: 'FragmentDefinition',

     

       72
       +
             name: { kind: 'Name', value: 'pokemonFields' },

     

       73
       +
             typeCondition: {

     

       74
       +
               kind: 'NamedType',

     

       75
       +
               name: { kind: 'Name', value: 'Pokemon' },

     

       76
       +
             },

     

       77
       +
             selectionSet: {

     

       78
       +
               kind: 'SelectionSet',

     

       79
       +
               selections: [

     

       80
       +
                 { kind: 'Field', name: { kind: 'Name', value: 'id' } },

     

       81
       +
                 { kind: 'Field', name: { kind: 'Name', value: 'name' } },

     

       82
       +
                 {

     

       83
       +
                   kind: 'FragmentSpread',

     

       84
       +
                   name: { kind: 'Name', value: 'moreFields' },

     

       85
       +
                 },

     

       86
       +
                 {

     

       87
       +
                   kind: 'Field',

     

       88
       +
                   name: { kind: 'Name', value: 'attacks' },

     

       89
       +
                   selectionSet: {

     

       90
       +
                     kind: 'SelectionSet',

     

       91
       +
                     selections: [

     

       92
       +
                       {

     

       93
       +
                         kind: 'Field',

     

       94
       +
                         name: { kind: 'Name', value: 'fast' },

     

       95
       +
                         selectionSet: {

     

       96
       +
                           kind: 'SelectionSet',

     

       97
       +
                           selections: [

     

       98
       +
                             {

     

       99
       +
                               kind: 'Field',

     

       100
       +
                               name: { kind: 'Name', value: 'damage' },

     

       101
       +
                             },

     

       102
       +
                             { kind: 'Field', name: { kind: 'Name', value: 'name' } },

     

       103
       +
                           ],

     

       104
       +
                         },

     

       105
       +
                       },

     

       106
       +
                     ],

     

       107
       +
                   },

     

       108
       +
                 },

     

       109
       +
               ],

     

       110
       +
             },

     

       111
       +
           },

     

       112
       +
           {

     

       113
       +
             kind: 'FragmentDefinition',

     

       114
       +
             name: { kind: 'Name', value: 'moreFields' },

     

       115
       +
             typeCondition: {

     

       116
       +
               kind: 'NamedType',

     

       117
       +
               name: { kind: 'Name', value: 'Pokemon' },

     

       118
       +
             },

     

       119
       +
             selectionSet: {

     

       120
       +
               kind: 'SelectionSet',

     

       121
       +
               selections: [

     

       122
       +
                 { kind: 'Field', name: { kind: 'Name', value: 'resistant' } },

     

       123
       +
               ],

     

       124
       +
             },

     

       125
       +
           },

     

       126
       +
         ],

     

       127
       +
       } as unknown as DocumentNode<PokemonFieldsFragment, unknown>;

     

       128
        
       export const PokDocument = {

     

       129
        
         kind: 'Document',

     

       130
        
         definitions: [

+5 -2

packages/example/src/index.ts

···

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

     

       2
       -
       import { Pokemon, PokemonFields } from './Pokemon';

     

       3
        
       

     

       4
        
       const PokemonsQuery = gql`

     

       5
        
         query Pok {

     

       6
        
           pokemons {

     

       7
        
             id

     

       8
        
             name

     

       9
       -
             __typename

     

       10
        
             fleeRate

     

       0
        
       
     

       11
        
           }

     

       12
        
         }

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       13
        
       ` as typeof import('./index.generated').PokDocument;

     

       14
        
       

     

       15
        
       const client = createClient({

···

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

     

       2
       +
       import { Pokemon, PokemonFields, WeakFields } from './Pokemon';

     

       3
        
       

     

       4
        
       const PokemonsQuery = gql`

     

       5
        
         query Pok {

     

       6
        
           pokemons {

     

       7
        
             id

     

       8
        
             name

     

       0
        
       
     

       9
        
             fleeRate

     

       10
       +
             __typenam

     

       11
        
           }

     

       12
        
         }

     

       13
       +
       

     

       14
       +
         ${PokemonFields}

     

       15
       +
         ${WeakFields}

     

       16
        
       ` as typeof import('./index.generated').PokDocument;

     

       17
        
       

     

       18
        
       const client = createClient({

+3 -1

packages/graphqlsp/src/ast/index.ts

···

       4
        
         isNoSubstitutionTemplateLiteral,

     

       5
        
         isTaggedTemplateExpression,

     

       6
        
         isTemplateExpression,

     

       0
        
       
     

       7
        
         isToken,

     

       8
        
       } from 'typescript';

     

       9
        
       import fs from 'fs';

     
···

       68
        
         while (

     

       69
        
           isNoSubstitutionTemplateLiteral(node) ||

     

       70
        
           isToken(node) ||

     

       71
       -
           isTemplateExpression(node)

     

       0
        
       
     

       72
        
         ) {

     

       73
        
           node = node.parent;

     

       74
        
         }

···

       4
        
         isNoSubstitutionTemplateLiteral,

     

       5
        
         isTaggedTemplateExpression,

     

       6
        
         isTemplateExpression,

     

       7
       +
         isTemplateSpan,

     

       8
        
         isToken,

     

       9
        
       } from 'typescript';

     

       10
        
       import fs from 'fs';

     
···

       69
        
         while (

     

       70
        
           isNoSubstitutionTemplateLiteral(node) ||

     

       71
        
           isToken(node) ||

     

       72
       +
           isTemplateExpression(node) ||

     

       73
       +
           isTemplateSpan(node)

     

       74
        
         ) {

     

       75
        
           node = node.parent;

     

       76
        
         }

packages/graphqlsp/src/ast/resolve.ts

···

       12
        
       type TemplateResult = {

     

       13
        
         combinedText: string;

     

       14
        
         resolvedSpans: Array<{

     

       0
        
       
     

       15
        
           identifier: string;

     

       16
        
           original: { start: number; length: number };

     

       17
        
           new: { start: number; length: number };

     
···

       73
        
                   );

     

       74
        
       

     

       75
        
                   const alteredSpan = {

     

       0
        
       
     

       76
        
                     identifier: identifierName,

     

       77
        
                     original: originalRange,

     

       78
        
                     new: {

     
···

       97
        
                     text.combinedText

     

       98
        
                   );

     

       99
        
                   const alteredSpan = {

     

       0
        
       
     

       100
        
                     identifier: identifierName,

     

       101
        
                     original: originalRange,

     

       102
        
                     new: {

···

       12
        
       type TemplateResult = {

     

       13
        
         combinedText: string;

     

       14
        
         resolvedSpans: Array<{

     

       15
       +
           lines: number;

     

       16
        
           identifier: string;

     

       17
        
           original: { start: number; length: number };

     

       18
        
           new: { start: number; length: number };

     
···

       74
        
                   );

     

       75
        
       

     

       76
        
                   const alteredSpan = {

     

       77
       +
                     lines: text.combinedText.split('\n').length,

     

       78
        
                     identifier: identifierName,

     

       79
        
                     original: originalRange,

     

       80
        
                     new: {

     
···

       99
        
                     text.combinedText

     

       100
        
                   );

     

       101
        
                   const alteredSpan = {

     

       102
       +
                     lines: text.combinedText.split('\n').length,

     

       103
        
                     identifier: identifierName,

     

       104
        
                     original: originalRange,

     

       105
        
                     new: {

+5 -2

packages/graphqlsp/src/autoComplete.ts

···

       48
        
           const foundToken = getToken(template, cursorPosition);

     

       49
        
           if (!foundToken || !schema.current) return undefined;

     

       50
        
       

     

       51
       -
           const text = resolveTemplate(node, filename, info).combinedText;

     

       52
       -
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       53
        
           const cursor = new Cursor(foundToken.line, foundToken.start);

     

       54
        
       

     

       55
        
           const [suggestions, spreadSuggestions] = getSuggestionsInternal(

···

       48
        
           const foundToken = getToken(template, cursorPosition);

     

       49
        
           if (!foundToken || !schema.current) return undefined;

     

       50
        
       

     

       51
       +
           const { combinedText: text, resolvedSpans } = resolveTemplate(

     

       52
       +
             node,

     

       53
       +
             filename,

     

       54
       +
             info

     

       55
       +
           );

     

       56
        
           const cursor = new Cursor(foundToken.line, foundToken.start);

     

       57
        
       

     

       58
        
           const [suggestions, spreadSuggestions] = getSuggestionsInternal(

+20 -1

packages/graphqlsp/src/quickInfo.ts

···

       14
        
         schema: { current: GraphQLSchema | null },

     

       15
        
         info: ts.server.PluginCreateInfo

     

       16
        
       ): ts.QuickInfo | undefined {

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

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

     

       18
        
       

     

       19
        
         const source = getSource(info, filename);

     
···

       32
        
       

     

       33
        
           if (!foundToken || !schema.current) return undefined;

     

       34
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       35
        
           const hoverInfo = getHoverInformation(

     

       36
        
             schema.current,

     

       37
       -
             resolveTemplate(node, filename, info).combinedText,

     

       38
        
             new Cursor(foundToken.line, foundToken.start)

     

       39
        
           );

     

       40

···

       14
        
         schema: { current: GraphQLSchema | null },

     

       15
        
         info: ts.server.PluginCreateInfo

     

       16
        
       ): ts.QuickInfo | undefined {

     

       17
       +
         const logger = (msg: string) =>

     

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

     

       19
       +
       

     

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

     

       21
        
       

     

       22
        
         const source = getSource(info, filename);

     
···

       35
        
       

     

       36
        
           if (!foundToken || !schema.current) return undefined;

     

       37
        
       

     

       38
       +
           const { combinedText: text, resolvedSpans } = resolveTemplate(

     

       39
       +
             node,

     

       40
       +
             filename,

     

       41
       +
             info

     

       42
       +
           );

     

       43
       +
       

     

       44
       +
           const amountOfLines = resolvedSpans

     

       45
       +
             .filter(

     

       46
       +
               x =>

     

       47
       +
                 x.original.start < cursorPosition &&

     

       48
       +
                 x.original.start + x.original.length < cursorPosition

     

       49
       +
             )

     

       50
       +
             .reduce((acc, span) => acc + (span.lines - 1), 0);

     

       51
       +
       

     

       52
       +
           foundToken.line = foundToken.line + amountOfLines;

     

       53
       +
       

     

       54
        
           const hoverInfo = getHoverInformation(

     

       55
        
             schema.current,

     

       56
       +
             text,

     

       57
        
             new Cursor(foundToken.line, foundToken.start)

     

       58
        
           );

     

       59

+2 -2

pnpm-lock.yaml

···

       1
       -
       lockfileVersion: '6.1'

     

       2
        
       

     

       3
        
       settings:

     

       4
        
         autoInstallPeers: true

     
···

       4334
        
           resolution: {directory: packages/graphqlsp, type: directory}

     

       4335
        
           id: file:packages/graphqlsp

     

       4336
        
           name: '@0no-co/graphqlsp'

     

       4337
       -
           version: 0.7.1

     

       4338
        
           dependencies:

     

       4339
        
             '@graphql-codegen/add': 4.0.1(graphql@16.6.0)

     

       4340
        
             '@graphql-codegen/core': 3.1.0(graphql@16.6.0)

···

       1
       +
       lockfileVersion: '6.0'

     

       2
        
       

     

       3
        
       settings:

     

       4
        
         autoInstallPeers: true

     
···

       4334
        
           resolution: {directory: packages/graphqlsp, type: directory}

     

       4335
        
           id: file:packages/graphqlsp

     

       4336
        
           name: '@0no-co/graphqlsp'

     

       4337
       +
           version: 0.7.2

     

       4338
        
           dependencies:

     

       4339
        
             '@graphql-codegen/add': 4.0.1(graphql@16.6.0)

     

       4340
        
             '@graphql-codegen/core': 3.1.0(graphql@16.6.0)