comparing 69f75e0066469cec9eea471a3d1bfa2ec736e3e1 and main on kitten.sh/graphqlsp

+4 -1

.github/workflows/release.yaml

···

       30
        
             - name: Setup pnpm

     

       31
        
               uses: pnpm/action-setup@v3

     

       32
        
               with:

     

       33
       -
                 version: 9

     

       34
        
                 run_install: false

     

       35
        
       

     

       36
        
             - name: Get pnpm store directory

     
···

       48
        
       

     

       49
        
             - name: Install Dependencies

     

       50
        
               run: pnpm install --frozen-lockfile --prefer-offline

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       51
        
       

     

       52
        
             - name: PR or Publish

     

       53
        
               id: changesets

···

       30
        
             - name: Setup pnpm

     

       31
        
               uses: pnpm/action-setup@v3

     

       32
        
               with:

     

       33
       +
                 version: 8.6.1

     

       34
        
                 run_install: false

     

       35
        
       

     

       36
        
             - name: Get pnpm store directory

     
···

       48
        
       

     

       49
        
             - name: Install Dependencies

     

       50
        
               run: pnpm install --frozen-lockfile --prefer-offline

     

       51
       +
       

     

       52
       +
             - name: Update npm

     

       53
       +
               run: npm install -g npm@11.6.2

     

       54
        
       

     

       55
        
             - name: PR or Publish

     

       56
        
               id: changesets

+10 -1

packages/example-tada/src/index.tsx

···

       32
        
         }

     

       33
        
       `, [PokemonFields, Fields.Pokemon])

     

       34
        
       

     

       35
       -
       const persisted = graphql.persisted<typeof PokemonQuery>("sha256:78c769ed6cfef67e17e579a2abfe4da27bd51e09ed832a88393148bcce4c5a7d")

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       36
        
       

     

       37
        
       const Pokemons = () => {

     

       38
        
         const [result] = useQuery({

···

       32
        
         }

     

       33
        
       `, [PokemonFields, Fields.Pokemon])

     

       34
        
       

     

       35
       +
       const Test = graphql(`

     

       36
       +
         query Po($id: ID!) {

     

       37
       +
           pokemon(id: $id) {

     

       38
       +
             id

     

       39
       +
             fleeRate

     

       40
       +
             ...Pok

     

       41
       +
             ...pokemonFields

     

       42
       +
           }

     

       43
       +
         }

     

       44
       +
       `, [])

     

       45
        
       

     

       46
        
       const Pokemons = () => {

     

       47
        
         const [result] = useQuery({

+14

packages/graphqlsp/CHANGELOG.md

···

       1
        
       # @0no-co/graphqlsp

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       ## 1.15.0

     

       4
        
       

     

       5
        
       ### Minor Changes

···

       1
        
       # @0no-co/graphqlsp

     

       2
        
       

     

       3
       +
       ## 1.15.2

     

       4
       +
       

     

       5
       +
       ### Patch Changes

     

       6
       +
       

     

       7
       +
       - Detect fragment usage in `maskFragments` calls to prevent false positive unused fragment warnings

     

       8
       +
         Submitted by [@takumiyoshikawa](https://github.com/takumiyoshikawa) (See [#379](https://github.com/0no-co/GraphQLSP/pull/379))

     

       9
       +
       

     

       10
       +
       ## 1.15.1

     

       11
       +
       

     

       12
       +
       ### Patch Changes

     

       13
       +
       

     

       14
       +
       - Correctly identify missing fragments for gql.tada graphql call-expressions

     

       15
       +
         Submitted by [@JoviDeCroock](https://github.com/JoviDeCroock) (See [#376](https://github.com/0no-co/GraphQLSP/pull/376))

     

       16
       +
       

     

       17
        
       ## 1.15.0

     

       18
        
       

     

       19
        
       ### Minor Changes

+1 -1

packages/graphqlsp/package.json

···

       1
        
       {

     

       2
        
         "name": "@0no-co/graphqlsp",

     

       3
       -
         "version": "1.15.0",

     

       4
        
         "description": "TypeScript LSP plugin that finds GraphQL documents in your code and provides hints and auto-generates types.",

     

       5
        
         "main": "./dist/graphqlsp",

     

       6
        
         "module": "./dist/graphqlsp.mjs",

···

       1
        
       {

     

       2
        
         "name": "@0no-co/graphqlsp",

     

       3
       +
         "version": "1.15.2",

     

       4
        
         "description": "TypeScript LSP plugin that finds GraphQL documents in your code and provides hints and auto-generates types.",

     

       5
        
         "main": "./dist/graphqlsp",

     

       6
        
         "module": "./dist/graphqlsp.mjs",

+10

packages/graphqlsp/src/ast/checks.ts

···

       123
        
         }

     

       124
        
         return null;

     

       125
        
       };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0

···

       123
        
         }

     

       124
        
         return null;

     

       125
        
       };

     

       126
       +
       

     

       127
       +
       /** Checks if node is a maskFragments() call */

     

       128
       +
       export const isMaskFragmentsCall = (

     

       129
       +
         node: ts.Node

     

       130
       +
       ): node is ts.CallExpression => {

     

       131
       +
         if (!ts.isCallExpression(node)) return false;

     

       132
       +
         if (!ts.isIdentifier(node.expression)) return false;

     

       133
       +
         // Only checks function name, not whether it's from gql.tada

     

       134
       +
         return node.expression.escapedText === 'maskFragments';

     

       135
       +
       };

+34 -5

packages/graphqlsp/src/ast/index.ts

···

       68
        
         return checks.isGraphQLCall(value, checker) ? value : null;

     

       69
        
       }

     

       70
        
       

     

       71
       -
       function unrollFragment(

     

       72
        
         element: ts.Identifier,

     

       73
        
         info: ts.server.PluginCreateInfo,

     

       74
        
         checker: ts.TypeChecker | undefined

     
···

       135
        
         nodes: Array<{

     

       136
        
           node: ts.StringLiteralLike;

     

       137
        
           schema: string | null;

     

       0
        
       
     

       0
        
       
     

       138
        
         }>;

     

       139
        
         fragments: Array<FragmentDefinitionNode>;

     

       140
        
       } {

     
···

       142
        
         const result: Array<{

     

       143
        
           node: ts.StringLiteralLike;

     

       144
        
           schema: string | null;

     

       0
        
       
     

       145
        
         }> = [];

     

       146
        
         let fragments: Array<FragmentDefinitionNode> = [];

     

       147
        
         let hasTriedToFindFragments = shouldSearchFragments ? false : true;

     
···

       160
        
           const name = checks.getSchemaName(node, typeChecker);

     

       161
        
           const text = node.arguments[0];

     

       162
        
           const fragmentRefs = resolveTadaFragmentArray(node.arguments[1]);

     

       0
        
       
     

       163
        
       

     

       164
        
           if (!hasTriedToFindFragments && !fragmentRefs) {

     

       165
       -
             hasTriedToFindFragments = true;

     

       166
       -
             fragments.push(...getAllFragments(sourceFile.fileName, node, info));

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       167
        
           } else if (fragmentRefs) {

     

       168
        
             for (const identifier of fragmentRefs) {

     

       169
        
               fragments.push(...unrollFragment(identifier, info, typeChecker));

     
···

       171
        
           }

     

       172
        
       

     

       173
        
           if (text && ts.isStringLiteralLike(text)) {

     

       174
       -
             result.push({ node: text, schema: name });

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       175
        
           }

     

       176
        
         }

     

       177
        
         find(sourceFile);

     
···

       213
        
       }

     

       214
        
       

     

       215
        
       export function getAllFragments(

     

       216
       -
         fileName: string,

     

       217
        
         node: ts.Node,

     

       218
        
         info: ts.server.PluginCreateInfo

     

       219
        
       ) {

     
···

       311
        
         sourceFile: ts.SourceFile

     

       312
        
       ): Array<ts.ImportDeclaration> {

     

       313
        
         return sourceFile.statements.filter(ts.isImportDeclaration);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       314
        
       }

     

       315
        
       

     

       316
        
       export function bubbleUpTemplate(node: ts.Node): ts.Node {

···

       68
        
         return checks.isGraphQLCall(value, checker) ? value : null;

     

       69
        
       }

     

       70
        
       

     

       71
       +
       export function unrollFragment(

     

       72
        
         element: ts.Identifier,

     

       73
        
         info: ts.server.PluginCreateInfo,

     

       74
        
         checker: ts.TypeChecker | undefined

     
···

       135
        
         nodes: Array<{

     

       136
        
           node: ts.StringLiteralLike;

     

       137
        
           schema: string | null;

     

       138
       +
           // For gql.tada call-expressions, this contains the identifiers of explicitly declared fragments

     

       139
       +
           tadaFragmentRefs?: readonly ts.Identifier[] | null;

     

       140
        
         }>;

     

       141
        
         fragments: Array<FragmentDefinitionNode>;

     

       142
        
       } {

     
···

       144
        
         const result: Array<{

     

       145
        
           node: ts.StringLiteralLike;

     

       146
        
           schema: string | null;

     

       147
       +
           tadaFragmentRefs?: readonly ts.Identifier[];

     

       148
        
         }> = [];

     

       149
        
         let fragments: Array<FragmentDefinitionNode> = [];

     

       150
        
         let hasTriedToFindFragments = shouldSearchFragments ? false : true;

     
···

       163
        
           const name = checks.getSchemaName(node, typeChecker);

     

       164
        
           const text = node.arguments[0];

     

       165
        
           const fragmentRefs = resolveTadaFragmentArray(node.arguments[1]);

     

       166
       +
           const isTadaCall = checks.isTadaGraphQLCall(node, typeChecker);

     

       167
        
       

     

       168
        
           if (!hasTriedToFindFragments && !fragmentRefs) {

     

       169
       +
             // Only collect global fragments if this is NOT a gql.tada call

     

       170
       +
             if (!isTadaCall) {

     

       171
       +
               hasTriedToFindFragments = true;

     

       172
       +
               fragments.push(...getAllFragments(node, info));

     

       173
       +
             }

     

       174
        
           } else if (fragmentRefs) {

     

       175
        
             for (const identifier of fragmentRefs) {

     

       176
        
               fragments.push(...unrollFragment(identifier, info, typeChecker));

     
···

       178
        
           }

     

       179
        
       

     

       180
        
           if (text && ts.isStringLiteralLike(text)) {

     

       181
       +
             result.push({

     

       182
       +
               node: text,

     

       183
       +
               schema: name,

     

       184
       +
               tadaFragmentRefs: isTadaCall

     

       185
       +
                 ? fragmentRefs === undefined

     

       186
       +
                   ? []

     

       187
       +
                   : fragmentRefs

     

       188
       +
                 : undefined,

     

       189
       +
             });

     

       190
        
           }

     

       191
        
         }

     

       192
        
         find(sourceFile);

     
···

       228
        
       }

     

       229
        
       

     

       230
        
       export function getAllFragments(

     

       0
        
       
     

       231
        
         node: ts.Node,

     

       232
        
         info: ts.server.PluginCreateInfo

     

       233
        
       ) {

     
···

       325
        
         sourceFile: ts.SourceFile

     

       326
        
       ): Array<ts.ImportDeclaration> {

     

       327
        
         return sourceFile.statements.filter(ts.isImportDeclaration);

     

       328
       +
       }

     

       329
       +
       

     

       330
       +
       export function findAllMaskFragmentsCalls(

     

       331
       +
         sourceFile: ts.SourceFile

     

       332
       +
       ): Array<ts.CallExpression> {

     

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

     

       334
       +
       

     

       335
       +
         function find(node: ts.Node): void {

     

       336
       +
           if (checks.isMaskFragmentsCall(node)) {

     

       337
       +
             result.push(node);

     

       338
       +
           }

     

       339
       +
           ts.forEachChild(node, find);

     

       340
       +
         }

     

       341
       +
         find(sourceFile);

     

       342
       +
         return result;

     

       343
        
       }

     

       344
        
       

     

       345
        
       export function bubbleUpTemplate(node: ts.Node): ts.Node {

+1 -1

packages/graphqlsp/src/autoComplete.ts

···

       66
        
             return undefined;

     

       67
        
       

     

       68
        
           const queryText = node.arguments[0].getText().slice(1, -1);

     

       69
       -
           const fragments = getAllFragments(filename, node, info);

     

       70
        
       

     

       71
        
           text = `${queryText}\n${fragments.map(x => print(x)).join('\n')}`;

     

       72
        
           cursor = new Cursor(foundToken.line, foundToken.start - 1);

···

       66
        
             return undefined;

     

       67
        
       

     

       68
        
           const queryText = node.arguments[0].getText().slice(1, -1);

     

       69
       +
           const fragments = getAllFragments(node, info);

     

       70
        
       

     

       71
        
           text = `${queryText}\n${fragments.map(x => print(x)).join('\n')}`;

     

       72
        
           cursor = new Cursor(foundToken.line, foundToken.start - 1);

+36

packages/graphqlsp/src/diagnostics.ts

···

       15
        
         findAllCallExpressions,

     

       16
        
         findAllPersistedCallExpressions,

     

       17
        
         findAllTaggedTemplateNodes,

     

       0
        
       
     

       18
        
         getSource,

     

       0
        
       
     

       19
        
       } from './ast';

     

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

     

       21
        
       import { UNUSED_FIELD_CODE, checkFieldUsageInFile } from './fieldUsage';

     
···

       291
        
       

     

       292
        
         if (isCallExpression && shouldCheckForColocatedFragments) {

     

       293
        
           const moduleSpecifierToFragments = getColocatedFragmentNames(source, info);

     

       0
        
       
     

       294
        
       

     

       295
        
           const usedFragments = new Set();

     

       296
        
           nodes.forEach(({ node }) => {

     
···

       306
        
             } catch (e) {}

     

       307
        
           });

     

       308
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       309
        
           Object.keys(moduleSpecifierToFragments).forEach(moduleSpecifier => {

     

       310
        
             const {

     

       311
        
               fragments: fragmentNames,

     
···

       344
        
           nodes: {

     

       345
        
             node: ts.TaggedTemplateExpression | ts.StringLiteralLike;

     

       346
        
             schema: string | null;

     

       0
        
       
     

       347
        
           }[];

     

       348
        
           fragments: FragmentDefinitionNode[];

     

       349
        
         },

     
···

       352
        
       ): ts.Diagnostic[] => {

     

       353
        
         const filename = source.fileName;

     

       354
        
         const isCallExpression = info.config.templateIsCallExpression ?? true;

     

       0
        
       
     

       355
        
       

     

       356
        
         const diagnostics = nodes

     

       357
        
           .map(originalNode => {

     
···

       394
        
                   (isExpression ? 2 : 0));

     

       395
        
             const endPosition = startingPosition + node.getText().length;

     

       396
        
             let docFragments = [...fragments];

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       397
        
             if (isCallExpression) {

     

       398
        
               try {

     

       399
        
                 const documentFragments = parse(text, {

···

       15
        
         findAllCallExpressions,

     

       16
        
         findAllPersistedCallExpressions,

     

       17
        
         findAllTaggedTemplateNodes,

     

       18
       +
         findAllMaskFragmentsCalls,

     

       19
        
         getSource,

     

       20
       +
         unrollFragment,

     

       21
        
       } from './ast';

     

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

     

       23
        
       import { UNUSED_FIELD_CODE, checkFieldUsageInFile } from './fieldUsage';

     
···

       293
        
       

     

       294
        
         if (isCallExpression && shouldCheckForColocatedFragments) {

     

       295
        
           const moduleSpecifierToFragments = getColocatedFragmentNames(source, info);

     

       296
       +
           const typeChecker = info.languageService.getProgram()?.getTypeChecker();

     

       297
        
       

     

       298
        
           const usedFragments = new Set();

     

       299
        
           nodes.forEach(({ node }) => {

     
···

       309
        
             } catch (e) {}

     

       310
        
           });

     

       311
        
       

     

       312
       +
           // check for maskFragments() calls

     

       313
       +
           const maskFragmentsCalls = findAllMaskFragmentsCalls(source);

     

       314
       +
           maskFragmentsCalls.forEach(call => {

     

       315
       +
             const firstArg = call.arguments[0];

     

       316
       +
             if (!firstArg) return;

     

       317
       +
       

     

       318
       +
             // Handle array of fragments: maskFragments([Fragment1, Fragment2], data)

     

       319
       +
             if (ts.isArrayLiteralExpression(firstArg)) {

     

       320
       +
               firstArg.elements.forEach(element => {

     

       321
       +
                 if (ts.isIdentifier(element)) {

     

       322
       +
                   const fragmentDefs = unrollFragment(element, info, typeChecker);

     

       323
       +
                   fragmentDefs.forEach(def => usedFragments.add(def.name.value));

     

       324
       +
                 }

     

       325
       +
               });

     

       326
       +
             }

     

       327
       +
           });

     

       328
       +
       

     

       329
        
           Object.keys(moduleSpecifierToFragments).forEach(moduleSpecifier => {

     

       330
        
             const {

     

       331
        
               fragments: fragmentNames,

     
···

       364
        
           nodes: {

     

       365
        
             node: ts.TaggedTemplateExpression | ts.StringLiteralLike;

     

       366
        
             schema: string | null;

     

       367
       +
             tadaFragmentRefs?: readonly ts.Identifier[];

     

       368
        
           }[];

     

       369
        
           fragments: FragmentDefinitionNode[];

     

       370
        
         },

     
···

       373
        
       ): ts.Diagnostic[] => {

     

       374
        
         const filename = source.fileName;

     

       375
        
         const isCallExpression = info.config.templateIsCallExpression ?? true;

     

       376
       +
         const typeChecker = info.languageService.getProgram()?.getTypeChecker();

     

       377
        
       

     

       378
        
         const diagnostics = nodes

     

       379
        
           .map(originalNode => {

     
···

       416
        
                   (isExpression ? 2 : 0));

     

       417
        
             const endPosition = startingPosition + node.getText().length;

     

       418
        
             let docFragments = [...fragments];

     

       419
       +
       

     

       420
       +
             if (originalNode.tadaFragmentRefs !== undefined) {

     

       421
       +
               const fragmentNames = new Set<string>();

     

       422
       +
               for (const identifier of originalNode.tadaFragmentRefs) {

     

       423
       +
                 const unrolled = unrollFragment(identifier, info, typeChecker);

     

       424
       +
                 unrolled.forEach((frag: FragmentDefinitionNode) =>

     

       425
       +
                   fragmentNames.add(frag.name.value)

     

       426
       +
                 );

     

       427
       +
               }

     

       428
       +
               docFragments = docFragments.filter(frag =>

     

       429
       +
                 fragmentNames.has(frag.name.value)

     

       430
       +
               );

     

       431
       +
             }

     

       432
       +
       

     

       433
        
             if (isCallExpression) {

     

       434
        
               try {

     

       435
        
                 const documentFragments = parse(text, {

+1 -1

test/e2e/fixture-project-tada/fixtures/graphql.ts

···

       6
        
       }>();

     

       7
        
       

     

       8
        
       export type { FragmentOf, ResultOf, VariablesOf } from 'gql.tada';

     

       9
       -
       export { readFragment } from 'gql.tada';

···

       6
        
       }>();

     

       7
        
       

     

       8
        
       export type { FragmentOf, ResultOf, VariablesOf } from 'gql.tada';

     

       9
       +
       export { readFragment, maskFragments } from 'gql.tada';

+33

test/e2e/fixture-project-tada/fixtures/missing-fragment-dep.ts

···

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

     

       2
       +
       

     

       3
       +
       const pokemonFragment = graphql(`

     

       4
       +
         fragment PokemonBasicInfo on Pokemon {

     

       5
       +
           id

     

       6
       +
           name

     

       7
       +
         }

     

       8
       +
       `);

     

       9
       +
       

     

       10
       +
       // This query correctly includes the fragment as a dep

     

       11
       +
       const FirstQuery = graphql(

     

       12
       +
         `

     

       13
       +
           query FirstQuery {

     

       14
       +
             pokemons(limit: 1) {

     

       15
       +
               ...PokemonBasicInfo

     

       16
       +
             }

     

       17
       +
           }

     

       18
       +
         `,

     

       19
       +
         [pokemonFragment]

     

       20
       +
       );

     

       21
       +
       

     

       22
       +
       // This query uses the fragment but DOES NOT include it as a dep

     

       23
       +
       // It should show an error, but currently doesn't because the fragment

     

       24
       +
       // was already added as a dep in FirstQuery above

     

       25
       +
       const SecondQuery = graphql(`

     

       26
       +
         query SecondQuery {

     

       27
       +
           pokemons(limit: 2) {

     

       28
       +
             ...PokemonBasicInfo

     

       29
       +
           }

     

       30
       +
         }

     

       31
       +
       `);

     

       32
       +
       

     

       33
       +
       export { FirstQuery, SecondQuery };

test/e2e/fixture-project-tada/fixtures/used-fragment-mask.ts

···

       1
       +
       import { maskFragments } from './graphql';

     

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

     

       3
       +
       

     

       4
       +
       const data = { id: '1', name: 'Pikachu', fleeRate: 0.1 };

     

       5
       +
       const x = maskFragments([PokemonFields], data);

     

       6
       +
       

     

       7
       +
       console.log(Pokemon);

+1 -1

test/e2e/fixture-project-tada/graphql.ts

···

       6
        
       }>();

     

       7
        
       

     

       8
        
       export type { FragmentOf, ResultOf, VariablesOf } from 'gql.tada';

     

       9
       -
       export { readFragment } from 'gql.tada';

···

       6
        
       }>();

     

       7
        
       

     

       8
        
       export type { FragmentOf, ResultOf, VariablesOf } from 'gql.tada';

     

       9
       +
       export { readFragment, maskFragments } from 'gql.tada';

+115

test/e2e/tada.test.ts

···

       12
        
         const outfileCombo = path.join(projectPath, 'simple.ts');

     

       13
        
         const outfileTypeCondition = path.join(projectPath, 'type-condition.ts');

     

       14
        
         const outfileUnusedFragment = path.join(projectPath, 'unused-fragment.ts');

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       15
        
         const outfileCombinations = path.join(projectPath, 'fragment.ts');

     

       16
        
       

     

       17
        
         let server: TSServer;

     
···

       35
        
           } satisfies ts.server.protocol.OpenRequestArgs);

     

       36
        
           server.sendCommand('open', {

     

       37
        
             file: outfileUnusedFragment,

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       38
        
             fileContent: '// empty',

     

       39
        
             scriptKindName: 'TS',

     

       40
        
           } satisfies ts.server.protocol.OpenRequestArgs);

     
···

       69
        
                   'utf-8'

     

       70
        
                 ),

     

       71
        
               },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       72
        
             ],

     

       73
        
           } satisfies ts.server.protocol.UpdateOpenRequestArgs);

     

       74
        
       

     
···

       88
        
             file: outfileUnusedFragment,

     

       89
        
             tmpfile: outfileUnusedFragment,

     

       90
        
           } satisfies ts.server.protocol.SavetoRequestArgs);

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       91
        
         });

     

       92
        
       

     

       93
        
         afterAll(() => {

     

       94
        
           try {

     

       95
        
             fs.unlinkSync(outfileUnusedFragment);

     

       0
        
       
     

       96
        
             fs.unlinkSync(outfileCombinations);

     

       97
        
             fs.unlinkSync(outfileCombo);

     

       98
        
             fs.unlinkSync(outfileTypeCondition);

     
···

       386
        
           `);

     

       387
        
         }, 30000);

     

       388
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       389
        
         it('gives quick-info at start of word (#15)', async () => {

     

       390
        
           server.send({

     

       391
        
             seq: 11,

     
···

       619
        
           `);

     

       620
        
         }, 30000);

     

       621
        
       });

     

       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

···

       12
        
         const outfileCombo = path.join(projectPath, 'simple.ts');

     

       13
        
         const outfileTypeCondition = path.join(projectPath, 'type-condition.ts');

     

       14
        
         const outfileUnusedFragment = path.join(projectPath, 'unused-fragment.ts');

     

       15
       +
         const outfileUsedFragmentMask = path.join(

     

       16
       +
           projectPath,

     

       17
       +
           'used-fragment-mask.ts'

     

       18
       +
         );

     

       19
        
         const outfileCombinations = path.join(projectPath, 'fragment.ts');

     

       20
        
       

     

       21
        
         let server: TSServer;

     
···

       39
        
           } satisfies ts.server.protocol.OpenRequestArgs);

     

       40
        
           server.sendCommand('open', {

     

       41
        
             file: outfileUnusedFragment,

     

       42
       +
             fileContent: '// empty',

     

       43
       +
             scriptKindName: 'TS',

     

       44
       +
           } satisfies ts.server.protocol.OpenRequestArgs);

     

       45
       +
           server.sendCommand('open', {

     

       46
       +
             file: outfileUsedFragmentMask,

     

       47
        
             fileContent: '// empty',

     

       48
        
             scriptKindName: 'TS',

     

       49
        
           } satisfies ts.server.protocol.OpenRequestArgs);

     
···

       78
        
                   'utf-8'

     

       79
        
                 ),

     

       80
        
               },

     

       81
       +
               {

     

       82
       +
                 file: outfileUsedFragmentMask,

     

       83
       +
                 fileContent: fs.readFileSync(

     

       84
       +
                   path.join(projectPath, 'fixtures/used-fragment-mask.ts'),

     

       85
       +
                   'utf-8'

     

       86
       +
                 ),

     

       87
       +
               },

     

       88
        
             ],

     

       89
        
           } satisfies ts.server.protocol.UpdateOpenRequestArgs);

     

       90
        
       

     
···

       104
        
             file: outfileUnusedFragment,

     

       105
        
             tmpfile: outfileUnusedFragment,

     

       106
        
           } satisfies ts.server.protocol.SavetoRequestArgs);

     

       107
       +
           server.sendCommand('saveto', {

     

       108
       +
             file: outfileUsedFragmentMask,

     

       109
       +
             tmpfile: outfileUsedFragmentMask,

     

       110
       +
           } satisfies ts.server.protocol.SavetoRequestArgs);

     

       111
        
         });

     

       112
        
       

     

       113
        
         afterAll(() => {

     

       114
        
           try {

     

       115
        
             fs.unlinkSync(outfileUnusedFragment);

     

       116
       +
             fs.unlinkSync(outfileUsedFragmentMask);

     

       117
        
             fs.unlinkSync(outfileCombinations);

     

       118
        
             fs.unlinkSync(outfileCombo);

     

       119
        
             fs.unlinkSync(outfileTypeCondition);

     
···

       407
        
           `);

     

       408
        
         }, 30000);

     

       409
        
       

     

       410
       +
         it('should not warn about unused fragments when using maskFragments', async () => {

     

       411
       +
           server.sendCommand('saveto', {

     

       412
       +
             file: outfileUsedFragmentMask,

     

       413
       +
             tmpfile: outfileUsedFragmentMask,

     

       414
       +
           } satisfies ts.server.protocol.SavetoRequestArgs);

     

       415
       +
       

     

       416
       +
           await server.waitForResponse(

     

       417
       +
             e =>

     

       418
       +
               e.type === 'event' &&

     

       419
       +
               e.event === 'semanticDiag' &&

     

       420
       +
               e.body?.file === outfileUsedFragmentMask

     

       421
       +
           );

     

       422
       +
       

     

       423
       +
           const res = server.responses.filter(

     

       424
       +
             resp =>

     

       425
       +
               resp.type === 'event' &&

     

       426
       +
               resp.event === 'semanticDiag' &&

     

       427
       +
               resp.body?.file === outfileUsedFragmentMask

     

       428
       +
           );

     

       429
       +
           // Should have no diagnostics about unused fragments since maskFragments uses them

     

       430
       +
           expect(res[0].body.diagnostics).toMatchInlineSnapshot(`[]`);

     

       431
       +
         }, 30000);

     

       432
       +
       

     

       433
        
         it('gives quick-info at start of word (#15)', async () => {

     

       434
        
           server.send({

     

       435
        
             seq: 11,

     
···

       663
        
           `);

     

       664
        
         }, 30000);

     

       665
        
       });

     

       666
       +
       

     

       667
       +
       describe('Fragment dependencies - Issue #494', () => {

     

       668
       +
         const projectPath = path.resolve(__dirname, 'fixture-project-tada');

     

       669
       +
         const outfileMissingFragmentDep = path.join(

     

       670
       +
           projectPath,

     

       671
       +
           'missing-fragment-dep.ts'

     

       672
       +
         );

     

       673
       +
       

     

       674
       +
         let server: TSServer;

     

       675
       +
         beforeAll(async () => {

     

       676
       +
           server = new TSServer(projectPath, { debugLog: false });

     

       677
       +
       

     

       678
       +
           server.sendCommand('open', {

     

       679
       +
             file: outfileMissingFragmentDep,

     

       680
       +
             fileContent: '// empty',

     

       681
       +
             scriptKindName: 'TS',

     

       682
       +
           } satisfies ts.server.protocol.OpenRequestArgs);

     

       683
       +
       

     

       684
       +
           server.sendCommand('updateOpen', {

     

       685
       +
             openFiles: [

     

       686
       +
               {

     

       687
       +
                 file: outfileMissingFragmentDep,

     

       688
       +
                 fileContent: fs.readFileSync(

     

       689
       +
                   path.join(projectPath, 'fixtures/missing-fragment-dep.ts'),

     

       690
       +
                   'utf-8'

     

       691
       +
                 ),

     

       692
       +
               },

     

       693
       +
             ],

     

       694
       +
           } satisfies ts.server.protocol.UpdateOpenRequestArgs);

     

       695
       +
       

     

       696
       +
           server.sendCommand('saveto', {

     

       697
       +
             file: outfileMissingFragmentDep,

     

       698
       +
             tmpfile: outfileMissingFragmentDep,

     

       699
       +
           } satisfies ts.server.protocol.SavetoRequestArgs);

     

       700
       +
         });

     

       701
       +
       

     

       702
       +
         afterAll(() => {

     

       703
       +
           try {

     

       704
       +
             fs.unlinkSync(outfileMissingFragmentDep);

     

       705
       +
           } catch {}

     

       706
       +
         });

     

       707
       +
       

     

       708
       +
         it('warns about missing fragment dep even when fragment is used in another query in same file', async () => {

     

       709
       +
           await server.waitForResponse(

     

       710
       +
             e =>

     

       711
       +
               e.type === 'event' &&

     

       712
       +
               e.event === 'semanticDiag' &&

     

       713
       +
               e.body?.file === outfileMissingFragmentDep

     

       714
       +
           );

     

       715
       +
       

     

       716
       +
           const res = server.responses.filter(

     

       717
       +
             resp =>

     

       718
       +
               resp.type === 'event' &&

     

       719
       +
               resp.event === 'semanticDiag' &&

     

       720
       +
               resp.body?.file === outfileMissingFragmentDep

     

       721
       +
           );

     

       722
       +
       

     

       723
       +
           // Should have a diagnostic about the unknown fragment in SecondQuery

     

       724
       +
           expect(res.length).toBeGreaterThan(0);

     

       725
       +
           expect(res[0].body.diagnostics.length).toBeGreaterThan(0);

     

       726
       +
       

     

       727
       +
           const fragmentError = res[0].body.diagnostics.find((diag: any) =>

     

       728
       +
             diag.text.includes('PokemonBasicInfo')

     

       729
       +
           );

     

       730
       +
       

     

       731
       +
           expect(fragmentError).toBeDefined();

     

       732
       +
           expect(fragmentError.text).toBe('Unknown fragment "PokemonBasicInfo".');

     

       733
       +
           expect(fragmentError.code).toBe(52001);

     

       734
       +
           expect(fragmentError.category).toBe('error');

     

       735
       +
         }, 30000);

     

       736
       +
       });

Compare changes