commit 097f83b1e156f4b1eb33c04794cdac41cb898408 · kitten.sh/graphqlsp

+3 -1

packages/example-tada/src/index.tsx

···

       1
       1
       -
       import { createClient, useQuery } from 'urql';

     

       1
       1
       +
       import { useQuery } from 'urql';

     

       2
       2
        
       import { graphql } from './graphql';

     

       3
       3
        
       import { Fields, Pokemon, PokemonFields } from './Pokemon';

     

       4
       4
        
       

     
···

       31
       31
        
           }

     

       32
       32
        
         }

     

       33
       33
        
       `, [PokemonFields, Fields.Pokemon]);

     

       34
       34
       +
       

     

       35
       35
       +
       const persisted = graphql.persisted<typeof PokemonQuery>("sha256:dc31ff9637bbc77bb95dffb2ca73b0e607639b018befd06e9ad801b54483d661")

     

       34
       36
        
       

     

       35
       37
        
       const Pokemons = () => {

     

       36
       38
        
         const [result] = useQuery({

packages/graphqlsp/src/api.ts

···

       1
       1
        
       export { getGraphQLDiagnostics } from './diagnostics';

     

       2
       2
        
       export { init } from './ts';

     

       3
       3
       +
       export { findAllPersistedCallExpressions } from './ast';

+23

packages/graphqlsp/src/ast/index.ts

···

       148
       148
        
         return { nodes: result, fragments };

     

       149
       149
        
       }

     

       150
       150
        
       

     

       151
       151
       +
       export function findAllPersistedCallExpressions(

     

       152
       152
       +
         sourceFile: ts.SourceFile

     

       153
       153
       +
       ): Array<ts.CallExpression> {

     

       154
       154
       +
         const result: Array<ts.CallExpression> = [];

     

       155
       155
       +
         function find(node: ts.Node) {

     

       156
       156
       +
           if (ts.isCallExpression(node)) {

     

       157
       157
       +
             // This expression ideally for us looks like <template>.persisted

     

       158
       158
       +
             const expression = node.expression.getText();

     

       159
       159
       +
             const parts = expression.split('.');

     

       160
       160
       +
             if (parts.length !== 2) return;

     

       161
       161
       +
       

     

       162
       162
       +
             const [template, method] = parts;

     

       163
       163
       +
             if (!templates.has(template) || method !== 'persisted') return;

     

       164
       164
       +
       

     

       165
       165
       +
             result.push(node);

     

       166
       166
       +
           } else {

     

       167
       167
       +
             ts.forEachChild(node, find);

     

       168
       168
       +
           }

     

       169
       169
       +
         }

     

       170
       170
       +
         find(sourceFile);

     

       171
       171
       +
         return result;

     

       172
       172
       +
       }

     

       173
       173
       +
       

     

       151
       174
        
       export function getAllFragments(

     

       152
       175
        
         fileName: string,

     

       153
       176
        
         node: ts.CallExpression,

+102

packages/graphqlsp/src/diagnostics.ts

···

       14
       14
        
       

     

       15
       15
        
       import {

     

       16
       16
        
         findAllCallExpressions,

     

       17
       17
       +
         findAllPersistedCallExpressions,

     

       17
       18
        
         findAllTaggedTemplateNodes,

     

       18
       19
        
         getSource,

     

       19
       20
        
       } from './ast';

     
···

       23
       24
        
         MISSING_FRAGMENT_CODE,

     

       24
       25
        
         getColocatedFragmentNames,

     

       25
       26
        
       } from './checkImports';

     

       27
       27
       +
       import { getDocumentReferenceFromTypeQuery } from './persisted';

     

       26
       28
        
       

     

       27
       29
        
       const clientDirectives = new Set([

     

       28
       30
        
         'populate',

     
···

       48
       50
        
       export const SEMANTIC_DIAGNOSTIC_CODE = 52001;

     

       49
       51
        
       export const MISSING_OPERATION_NAME_CODE = 52002;

     

       50
       52
        
       export const USING_DEPRECATED_FIELD_CODE = 52004;

     

       53
       53
       +
       export const MISSING_PERSISTED_TYPE_ARG = 520100;

     

       54
       54
       +
       export const MISSING_PERSISTED_CODE_ARG = 520101;

     

       55
       55
       +
       export const MISSING_PERSISTED_DOCUMENT = 520102;

     

       51
       56
        
       export const ALL_DIAGNOSTICS = [

     

       52
       57
        
         SEMANTIC_DIAGNOSTIC_CODE,

     

       53
       58
        
         MISSING_OPERATION_NAME_CODE,

     

       54
       59
        
         USING_DEPRECATED_FIELD_CODE,

     

       55
       60
        
         MISSING_FRAGMENT_CODE,

     

       56
       61
        
         UNUSED_FIELD_CODE,

     

       62
       62
       +
         MISSING_PERSISTED_TYPE_ARG,

     

       63
       63
       +
         MISSING_PERSISTED_CODE_ARG,

     

       64
       64
       +
         MISSING_PERSISTED_DOCUMENT,

     

       57
       65
        
       ];

     

       58
       66
        
       

     

       59
       67
        
       const cache = new LRUCache<number, ts.Diagnostic[]>({

     
···

       117
       125
        
         const shouldCheckForColocatedFragments =

     

       118
       126
        
           info.config.shouldCheckForColocatedFragments ?? true;

     

       119
       127
        
         let fragmentDiagnostics: ts.Diagnostic[] = [];

     

       128
       128
       +
       

     

       129
       129
       +
         if (isCallExpression) {

     

       130
       130
       +
           const persistedCalls = findAllPersistedCallExpressions(source);

     

       131
       131
       +
           // We need to check whether the user has correctly inserted a hash,

     

       132
       132
       +
           // by means of providing an argument to the function and that they

     

       133
       133
       +
           // are establishing a reference to the document by means of the generic.

     

       134
       134
       +
           //

     

       135
       135
       +
           // OPTIONAL: we could also check whether the hash is out of date with the

     

       136
       136
       +
           // document but this removes support for self-generating identifiers

     

       137
       137
       +
           const persistedDiagnostics = persistedCalls

     

       138
       138
       +
             .map<ts.Diagnostic | null>(callExpression => {

     

       139
       139
       +
               if (!callExpression.typeArguments) {

     

       140
       140
       +
                 return {

     

       141
       141
       +
                   category: ts.DiagnosticCategory.Warning,

     

       142
       142
       +
                   code: MISSING_PERSISTED_TYPE_ARG,

     

       143
       143
       +
                   file: source,

     

       144
       144
       +
                   messageText: 'Missing generic pointing at the GraphQL document.',

     

       145
       145
       +
                   start: callExpression.getStart(),

     

       146
       146
       +
                   length: callExpression.getEnd() - callExpression.getStart(),

     

       147
       147
       +
                 };

     

       148
       148
       +
               }

     

       149
       149
       +
       

     

       150
       150
       +
               const [typeQuery] = callExpression.typeArguments;

     

       151
       151
       +
       

     

       152
       152
       +
               if (!ts.isTypeQueryNode(typeQuery)) {

     

       153
       153
       +
                 // Provide diagnostic about wroong generic

     

       154
       154
       +
                 return {

     

       155
       155
       +
                   category: ts.DiagnosticCategory.Warning,

     

       156
       156
       +
                   code: MISSING_PERSISTED_TYPE_ARG,

     

       157
       157
       +
                   file: source,

     

       158
       158
       +
                   messageText:

     

       159
       159
       +
                     'Provided generic should be a typeQueryNode in the shape of graphql.persisted<typeof document>.',

     

       160
       160
       +
                   start: typeQuery.getStart(),

     

       161
       161
       +
                   length: typeQuery.getEnd() - typeQuery.getStart(),

     

       162
       162
       +
                 };

     

       163
       163
       +
               }

     

       164
       164
       +
       

     

       165
       165
       +
               const { node: foundNode } = getDocumentReferenceFromTypeQuery(

     

       166
       166
       +
                 typeQuery,

     

       167
       167
       +
                 filename,

     

       168
       168
       +
                 info

     

       169
       169
       +
               );

     

       170
       170
       +
       

     

       171
       171
       +
               if (!foundNode) {

     

       172
       172
       +
                 return {

     

       173
       173
       +
                   category: ts.DiagnosticCategory.Warning,

     

       174
       174
       +
                   code: MISSING_PERSISTED_DOCUMENT,

     

       175
       175
       +
                   file: source,

     

       176
       176
       +
                   messageText: `Can't find reference to "${typeQuery.getText()}".`,

     

       177
       177
       +
                   start: typeQuery.getStart(),

     

       178
       178
       +
                   length: typeQuery.getEnd() - typeQuery.getStart(),

     

       179
       179
       +
                 };

     

       180
       180
       +
               }

     

       181
       181
       +
       

     

       182
       182
       +
               const initializer = foundNode.initializer;

     

       183
       183
       +
               if (

     

       184
       184
       +
                 !initializer ||

     

       185
       185
       +
                 !ts.isCallExpression(initializer) ||

     

       186
       186
       +
                 !ts.isNoSubstitutionTemplateLiteral(initializer.arguments[0])

     

       187
       187
       +
               ) {

     

       188
       188
       +
                 // TODO: we can make this check more stringent where we also parse and resolve

     

       189
       189
       +
                 // the accompanying template.

     

       190
       190
       +
                 return {

     

       191
       191
       +
                   category: ts.DiagnosticCategory.Warning,

     

       192
       192
       +
                   code: MISSING_PERSISTED_DOCUMENT,

     

       193
       193
       +
                   file: source,

     

       194
       194
       +
                   messageText: `Referenced type "${typeQuery.getText()}" is not a GraphQL document.`,

     

       195
       195
       +
                   start: typeQuery.getStart(),

     

       196
       196
       +
                   length: typeQuery.getEnd() - typeQuery.getStart(),

     

       197
       197
       +
                 };

     

       198
       198
       +
               }

     

       199
       199
       +
       

     

       200
       200
       +
               if (!callExpression.arguments[0]) {

     

       201
       201
       +
                 // TODO: this might be covered by the API enforcing the first

     

       202
       202
       +
                 // argument so can possibly be removed.

     

       203
       203
       +
                 return {

     

       204
       204
       +
                   category: ts.DiagnosticCategory.Warning,

     

       205
       205
       +
                   code: MISSING_PERSISTED_CODE_ARG,

     

       206
       206
       +
                   file: source,

     

       207
       207
       +
                   messageText: `The call-expression is missing a hash for the persisted argument.`,

     

       208
       208
       +
                   start: callExpression.arguments.pos,

     

       209
       209
       +
                   length: callExpression.arguments.end - callExpression.arguments.pos,

     

       210
       210
       +
                 };

     

       211
       211
       +
               }

     

       212
       212
       +
       

     

       213
       213
       +
               return null;

     

       214
       214
       +
             })

     

       215
       215
       +
             .filter(Boolean);

     

       216
       216
       +
       

     

       217
       217
       +
           tsDiagnostics.push(...(persistedDiagnostics as ts.Diagnostic[]));

     

       218
       218
       +
         }

     

       219
       219
       +
       

     

       120
       220
        
         if (isCallExpression && shouldCheckForColocatedFragments) {

     

       121
       221
        
           const moduleSpecifierToFragments = getColocatedFragmentNames(source, info);

     

       122
       222
        
       

     
···

       356
       456
        
             nodes as ts.NoSubstitutionTemplateLiteral[],

     

       357
       457
        
             info

     

       358
       458
        
           ) || [];

     

       459
       459
       +
       

     

       460
       460
       +
           if (!usageDiagnostics) return tsDiagnostics

     

       359
       461
        
       

     

       360
       462
        
           return [...tsDiagnostics, ...usageDiagnostics];

     

       361
       463
        
         } else {

+84 -5

packages/graphqlsp/src/index.ts

···

       6
       6
        
       import { getGraphQLQuickInfo } from './quickInfo';

     

       7
       7
        
       import { ALL_DIAGNOSTICS, getGraphQLDiagnostics } from './diagnostics';

     

       8
       8
        
       import { templates } from './ast/templates';

     

       9
       9
       +
       import { getPersistedCodeFixAtPosition } from './persisted';

     

       9
       10
        
       

     

       10
       11
        
       function createBasicDecorator(info: ts.server.PluginCreateInfo) {

     

       11
       12
        
         const proxy: ts.LanguageService = Object.create(null);

     
···

       99
       100
        
           }

     

       100
       101
        
         };

     

       101
       102
        
       

     

       103
       103
       +
         proxy.getEditsForRefactor = (

     

       104
       104
       +
           filename,

     

       105
       105
       +
           formatOptions,

     

       106
       106
       +
           positionOrRange,

     

       107
       107
       +
           refactorName,

     

       108
       108
       +
           actionName,

     

       109
       109
       +
           preferences,

     

       110
       110
       +
           interactive

     

       111
       111
       +
         ) => {

     

       112
       112
       +
           const original = info.languageService.getEditsForRefactor(

     

       113
       113
       +
             filename,

     

       114
       114
       +
             formatOptions,

     

       115
       115
       +
             positionOrRange,

     

       116
       116
       +
             refactorName,

     

       117
       117
       +
             actionName,

     

       118
       118
       +
             preferences,

     

       119
       119
       +
             interactive

     

       120
       120
       +
           );

     

       121
       121
       +
       

     

       122
       122
       +
           const codefix = getPersistedCodeFixAtPosition(

     

       123
       123
       +
             filename,

     

       124
       124
       +
             typeof positionOrRange === 'number'

     

       125
       125
       +
               ? positionOrRange

     

       126
       126
       +
               : positionOrRange.pos,

     

       127
       127
       +
             info

     

       128
       128
       +
           );

     

       129
       129
       +
           if (!codefix) return original;

     

       130
       130
       +
           return {

     

       131
       131
       +
             edits: [

     

       132
       132
       +
               {

     

       133
       133
       +
                 fileName: filename,

     

       134
       134
       +
                 textChanges: [{ newText: codefix.replacement, span: codefix.span }],

     

       135
       135
       +
               },

     

       136
       136
       +
             ],

     

       137
       137
       +
           };

     

       138
       138
       +
         };

     

       139
       139
       +
       

     

       140
       140
       +
         proxy.getApplicableRefactors = (

     

       141
       141
       +
           filename,

     

       142
       142
       +
           positionOrRange,

     

       143
       143
       +
           preferences,

     

       144
       144
       +
           reason,

     

       145
       145
       +
           kind,

     

       146
       146
       +
           includeInteractive

     

       147
       147
       +
         ) => {

     

       148
       148
       +
           const original = info.languageService.getApplicableRefactors(

     

       149
       149
       +
             filename,

     

       150
       150
       +
             positionOrRange,

     

       151
       151
       +
             preferences,

     

       152
       152
       +
             reason,

     

       153
       153
       +
             kind,

     

       154
       154
       +
             includeInteractive

     

       155
       155
       +
           );

     

       156
       156
       +
       

     

       157
       157
       +
           const codefix = getPersistedCodeFixAtPosition(

     

       158
       158
       +
             filename,

     

       159
       159
       +
             typeof positionOrRange === 'number'

     

       160
       160
       +
               ? positionOrRange

     

       161
       161
       +
               : positionOrRange.pos,

     

       162
       162
       +
             info

     

       163
       163
       +
           );

     

       164
       164
       +
           console.log('[GraphQLSP]', JSON.stringify(codefix));

     

       165
       165
       +
           if (codefix) {

     

       166
       166
       +
             return [

     

       167
       167
       +
               {

     

       168
       168
       +
                 name: 'GraphQL',

     

       169
       169
       +
                 description: 'Operations specific to gql.tada!',

     

       170
       170
       +
                 actions: [

     

       171
       171
       +
                   {

     

       172
       172
       +
                     name: 'Insert document-id',

     

       173
       173
       +
                     description:

     

       174
       174
       +
                       'Generate a document-id for your persisted-operation, by default a SHA256 hash.',

     

       175
       175
       +
                   },

     

       176
       176
       +
                 ],

     

       177
       177
       +
                 inlineable: true,

     

       178
       178
       +
               },

     

       179
       179
       +
               ...original,

     

       180
       180
       +
             ];

     

       181
       181
       +
           } else {

     

       182
       182
       +
             return original;

     

       183
       183
       +
           }

     

       184
       184
       +
         };

     

       185
       185
       +
       

     

       102
       186
        
         proxy.getQuickInfoAtPosition = (filename: string, cursorPosition: number) => {

     

       103
       187
        
           const quickInfo = getGraphQLQuickInfo(

     

       104
       188
        
             filename,

     
···

       114
       198
        
             cursorPosition

     

       115
       199
        
           );

     

       116
       200
        
         };

     

       117
       117
       -
       

     

       118
       118
       -
         // TODO: check out the following hooks

     

       119
       119
       -
         // - getSuggestionDiagnostics, can suggest refactors

     

       120
       120
       -
         // - getCompletionEntryDetails, this can build on the auto-complete for more information

     

       121
       121
       -
         // - getCodeFixesAtPosition

     

       122
       201
        
       

     

       123
       202
        
         logger('proxy: ' + JSON.stringify(proxy));

     

       124
       203

+204

packages/graphqlsp/src/persisted.ts

···

       1
       1
       +
       import { ts } from './ts';

     

       2
       2
       +
       

     

       3
       3
       +
       import { createHash } from 'crypto';

     

       4
       4
       +
       

     

       5
       5
       +
       import { findAllCallExpressions, findNode, getSource } from './ast';

     

       6
       6
       +
       import { resolveTemplate } from './ast/resolve';

     

       7
       7
       +
       import { templates } from './ast/templates';

     

       8
       8
       +
       import { parse, print, visit } from '@0no-co/graphql.web';

     

       9
       9
       +
       

     

       10
       10
       +
       type PersistedAction = {

     

       11
       11
       +
         span: {

     

       12
       12
       +
           start: number;

     

       13
       13
       +
           length: number;

     

       14
       14
       +
         };

     

       15
       15
       +
         replacement: string;

     

       16
       16
       +
       };

     

       17
       17
       +
       

     

       18
       18
       +
       const isPersistedCall = (expr: ts.LeftHandSideExpression) => {

     

       19
       19
       +
         const expressionText = expr.getText();

     

       20
       20
       +
         const [template, method] = expressionText.split('.');

     

       21
       21
       +
         return templates.has(template) && method === 'persisted';

     

       22
       22
       +
       };

     

       23
       23
       +
       

     

       24
       24
       +
       export function getPersistedCodeFixAtPosition(

     

       25
       25
       +
         filename: string,

     

       26
       26
       +
         position: number,

     

       27
       27
       +
         info: ts.server.PluginCreateInfo

     

       28
       28
       +
       ): PersistedAction | undefined {

     

       29
       29
       +
         const isCallExpression = info.config.templateIsCallExpression ?? true;

     

       30
       30
       +
       

     

       31
       31
       +
         if (!isCallExpression) return undefined;

     

       32
       32
       +
       

     

       33
       33
       +
         let source = getSource(info, filename);

     

       34
       34
       +
         if (!source) return undefined;

     

       35
       35
       +
       

     

       36
       36
       +
         const node = findNode(source, position);

     

       37
       37
       +
         if (!node) return undefined;

     

       38
       38
       +
       

     

       39
       39
       +
         let callExpression: ts.Node = node;

     

       40
       40
       +
         // We found a node and need to check where on the path we are

     

       41
       41
       +
         // we expect this to look a little bit like

     

       42
       42
       +
         // const persistedDoc = graphql.persisted<typeof x>()

     

       43
       43
       +
         // When we are on the left half of this statement we bubble down

     

       44
       44
       +
         // looking for the correct call-expression and on the right hand

     

       45
       45
       +
         // we bubble up.

     

       46
       46
       +
         if (ts.isVariableStatement(callExpression)) {

     

       47
       47
       +
           callExpression =

     

       48
       48
       +
             callExpression.declarationList.declarations.find(declaration => {

     

       49
       49
       +
               return (

     

       50
       50
       +
                 ts.isVariableDeclaration(declaration) &&

     

       51
       51
       +
                 declaration.initializer &&

     

       52
       52
       +
                 ts.isCallExpression(declaration.initializer)

     

       53
       53
       +
               );

     

       54
       54
       +
             }) || node;

     

       55
       55
       +
         } else if (ts.isVariableDeclarationList(callExpression)) {

     

       56
       56
       +
           callExpression =

     

       57
       57
       +
             callExpression.declarations.find(declaration => {

     

       58
       58
       +
               return (

     

       59
       59
       +
                 ts.isVariableDeclaration(declaration) &&

     

       60
       60
       +
                 declaration.initializer &&

     

       61
       61
       +
                 ts.isCallExpression(declaration.initializer)

     

       62
       62
       +
               );

     

       63
       63
       +
             }) || node;

     

       64
       64
       +
         } else if (

     

       65
       65
       +
           ts.isVariableDeclaration(callExpression) &&

     

       66
       66
       +
           callExpression.initializer &&

     

       67
       67
       +
           ts.isCallExpression(callExpression.initializer)

     

       68
       68
       +
         ) {

     

       69
       69
       +
           callExpression = callExpression.initializer;

     

       70
       70
       +
         } else {

     

       71
       71
       +
           while (callExpression && !ts.isCallExpression(callExpression)) {

     

       72
       72
       +
             callExpression = callExpression.parent;

     

       73
       73
       +
           }

     

       74
       74
       +
         }

     

       75
       75
       +
       

     

       76
       76
       +
         // We want to ensure that we found a call-expression and that it looks

     

       77
       77
       +
         // like "graphql.persisted", in a future iteration when the API surface

     

       78
       78
       +
         // is more defined we will need to use the ts.Symbol to support re-exporting

     

       79
       79
       +
         // this function by means of "export const peristed = graphql.persisted".

     

       80
       80
       +
         if (

     

       81
       81
       +
           !ts.isCallExpression(callExpression) ||

     

       82
       82
       +
           !isPersistedCall(callExpression.expression) ||

     

       83
       83
       +
           !callExpression.typeArguments

     

       84
       84
       +
         )

     

       85
       85
       +
           return undefined;

     

       86
       86
       +
       

     

       87
       87
       +
         const [typeQuery] = callExpression.typeArguments;

     

       88
       88
       +
       

     

       89
       89
       +
         if (!ts.isTypeQueryNode(typeQuery)) return undefined;

     

       90
       90
       +
       

     

       91
       91
       +
         const { node: found, filename: foundFilename } =

     

       92
       92
       +
           getDocumentReferenceFromTypeQuery(typeQuery, filename, info);

     

       93
       93
       +
       

     

       94
       94
       +
         if (!found) return undefined;

     

       95
       95
       +
       

     

       96
       96
       +
         const initializer = found.initializer;

     

       97
       97
       +
         if (

     

       98
       98
       +
           !initializer ||

     

       99
       99
       +
           !ts.isCallExpression(initializer) ||

     

       100
       100
       +
           !ts.isNoSubstitutionTemplateLiteral(initializer.arguments[0])

     

       101
       101
       +
         )

     

       102
       102
       +
           return undefined;

     

       103
       103
       +
       

     

       104
       104
       +
         const externalSource = getSource(info, foundFilename)!;

     

       105
       105
       +
         const { fragments } = findAllCallExpressions(externalSource, info);

     

       106
       106
       +
       

     

       107
       107
       +
         const text = resolveTemplate(

     

       108
       108
       +
           initializer.arguments[0],

     

       109
       109
       +
           foundFilename,

     

       110
       110
       +
           info

     

       111
       111
       +
         ).combinedText;

     

       112
       112
       +
         const parsed = parse(text);

     

       113
       113
       +
         const spreads = new Set();

     

       114
       114
       +
         visit(parsed, {

     

       115
       115
       +
           FragmentSpread: node => {

     

       116
       116
       +
             spreads.add(node.name.value);

     

       117
       117
       +
           },

     

       118
       118
       +
         });

     

       119
       119
       +
       

     

       120
       120
       +
         let resolvedText = text;

     

       121
       121
       +
         [...spreads].forEach(spreadName => {

     

       122
       122
       +
           const fragmentDefinition = fragments.find(x => x.name.value === spreadName);

     

       123
       123
       +
           if (!fragmentDefinition) {

     

       124
       124
       +
             console.warn(

     

       125
       125
       +
               `[GraphQLSP] could not find fragment for spread ${spreadName}!`

     

       126
       126
       +
             );

     

       127
       127
       +
             return;

     

       128
       128
       +
           }

     

       129
       129
       +
       

     

       130
       130
       +
           resolvedText = `${resolvedText}\n\n${print(fragmentDefinition)}`;

     

       131
       131
       +
         });

     

       132
       132
       +
       

     

       133
       133
       +
         const hash = createHash('sha256').update(text).digest('hex');

     

       134
       134
       +
       

     

       135
       135
       +
         const existingHash = callExpression.arguments[0];

     

       136
       136
       +
         // We assume for now that this is either undefined or an existing string literal

     

       137
       137
       +
         if (!existingHash) {

     

       138
       138
       +
           // We have no persisted-identifier yet, suggest adding in a new one

     

       139
       139
       +
           return {

     

       140
       140
       +
             span: {

     

       141
       141
       +
               start: callExpression.arguments.pos,

     

       142
       142
       +
               length: 1,

     

       143
       143
       +
             },

     

       144
       144
       +
             replacement: `"sha256:${hash}")`,

     

       145
       145
       +
           };

     

       146
       146
       +
         } else if (

     

       147
       147
       +
           ts.isStringLiteral(existingHash) &&

     

       148
       148
       +
           existingHash.getText() !== `"sha256:${hash}"`

     

       149
       149
       +
         ) {

     

       150
       150
       +
           // We are out of sync, suggest replacing this with the updated hash

     

       151
       151
       +
           return {

     

       152
       152
       +
             span: {

     

       153
       153
       +
               start: existingHash.getStart(),

     

       154
       154
       +
               length: existingHash.end - existingHash.getStart(),

     

       155
       155
       +
             },

     

       156
       156
       +
             replacement: `"sha256:${hash}"`,

     

       157
       157
       +
           };

     

       158
       158
       +
         } else if (ts.isIdentifier(existingHash)) {

     

       159
       159
       +
           // Suggest replacing a reference with a static one

     

       160
       160
       +
           // this to make these easier to statically analyze

     

       161
       161
       +
           return {

     

       162
       162
       +
             span: {

     

       163
       163
       +
               start: existingHash.getStart(),

     

       164
       164
       +
               length: existingHash.end - existingHash.getStart(),

     

       165
       165
       +
             },

     

       166
       166
       +
             replacement: `"sha256:${hash}"`,

     

       167
       167
       +
           };

     

       168
       168
       +
         } else {

     

       169
       169
       +
           return undefined;

     

       170
       170
       +
         }

     

       171
       171
       +
       }

     

       172
       172
       +
       

     

       173
       173
       +
       export const getDocumentReferenceFromTypeQuery = (

     

       174
       174
       +
         typeQuery: ts.TypeQueryNode,

     

       175
       175
       +
         filename: string,

     

       176
       176
       +
         info: ts.server.PluginCreateInfo

     

       177
       177
       +
       ): { node: ts.VariableDeclaration | null; filename: string } => {

     

       178
       178
       +
         // We look for the references of the generic so that we can use the document

     

       179
       179
       +
         // to generate the hash.

     

       180
       180
       +
         const references = info.languageService.getReferencesAtPosition(

     

       181
       181
       +
           filename,

     

       182
       182
       +
           typeQuery.exprName.getStart()

     

       183
       183
       +
         );

     

       184
       184
       +
       

     

       185
       185
       +
         if (!references) return { node: null, filename };

     

       186
       186
       +
       

     

       187
       187
       +
         let found: ts.VariableDeclaration | null = null;

     

       188
       188
       +
         let foundFilename = filename;

     

       189
       189
       +
         references.forEach(ref => {

     

       190
       190
       +
           if (found) return;

     

       191
       191
       +
       

     

       192
       192
       +
           const source = getSource(info, ref.fileName);

     

       193
       193
       +
           if (!source) return;

     

       194
       194
       +
           const foundNode = findNode(source, ref.textSpan.start);

     

       195
       195
       +
           if (!foundNode) return;

     

       196
       196
       +
       

     

       197
       197
       +
           if (ts.isVariableDeclaration(foundNode.parent)) {

     

       198
       198
       +
             found = foundNode.parent;

     

       199
       199
       +
             foundFilename = ref.fileName;

     

       200
       200
       +
           }

     

       201
       201
       +
         });

     

       202
       202
       +
       

     

       203
       203
       +
         return { node: found, filename: foundFilename };

     

       204
       204
       +
       };

+5 -5

pnpm-lock.yaml

···

       2144
       2144
        
           peerDependencies:

     

       2145
       2145
        
             rollup: ^2.14.0||^3.0.0||^4.0.0

     

       2146
       2146
        
             tslib: '*'

     

       2147
       2147
       -
             typescript: '>=3.7.0'

     

       2147
       2147
       +
             typescript: ^5.3.3

     

       2148
       2148
        
           peerDependenciesMeta:

     

       2149
       2149
        
             rollup:

     

       2150
       2150
        
               optional: true

     
···

       3046
       3046
        
           resolution: {integrity: sha512-kcZ6+W5QzcJ3P1Mt+83OUv/oHFqZHIx8DuxG6eZ5RGMERoLqp4BuGjhHLYGK+Kf5XVkQvqBSmAy/nGWN3qDgEA==}

     

       3047
       3047
        
           engines: {node: '>=14'}

     

       3048
       3048
        
           peerDependencies:

     

       3049
       3049
       -
             typescript: '>=4.9.5'

     

       3049
       3049
       +
             typescript: ^5.3.3

     

       3050
       3050
        
           peerDependenciesMeta:

     

       3051
       3051
        
             typescript:

     

       3052
       3052
        
               optional: true

     
···

       5164
       5164
        
           engines: {node: '>=16'}

     

       5165
       5165
        
           peerDependencies:

     

       5166
       5166
        
             rollup: ^3.29.4 || ^4

     

       5167
       5167
       -
             typescript: ^4.5 || ^5.0

     

       5167
       5167
       +
             typescript: ^5.3.3

     

       5168
       5168
        
           dependencies:

     

       5169
       5169
        
             magic-string: 0.30.5

     

       5170
       5170
        
             rollup: 4.9.5

     
···

       5664
       5664
        
             '@swc/core': '>=1.2.50'

     

       5665
       5665
        
             '@swc/wasm': '>=1.2.50'

     

       5666
       5666
        
             '@types/node': '*'

     

       5667
       5667
       -
             typescript: '>=2.7'

     

       5667
       5667
       +
             typescript: ^5.3.3

     

       5668
       5668
        
           peerDependenciesMeta:

     

       5669
       5669
        
             '@swc/core':

     

       5670
       5670
        
               optional: true

     
···

       6206
       6206
        
           id: file:packages/graphqlsp

     

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

     

       6208
       6208
        
           peerDependencies:

     

       6209
       6209
       -
             typescript: ^5.0.0

     

       6209
       6209
       +
             typescript: ^5.3.3

     

       6210
       6210
        
           dependencies:

     

       6211
       6211
        
             '@gql.tada/internal': 0.1.2(graphql@16.8.1)(typescript@5.3.3)

     

       6212
       6212
        
             graphql: 16.8.1

-4

test/e2e/fixture-project-tada/introspection.d.ts

···

       422
       422
        
             {

     

       423
       423
        
               "kind": "SCALAR",

     

       424
       424
        
               "name": "Boolean"

     

       425
       425
       -
             },

     

       426
       426
       -
             {

     

       427
       427
       -
               "kind": "SCALAR",

     

       428
       428
       -
               "name": "Any"

     

       429
       425
        
             }

     

       430
       426
        
           ],

     

       431
       427
        
           "directives": []