commit 7bb841b950782040bbaadce44f6049228a2821bf · kitten.sh/graphqlsp

.changeset/thin-fishes-fry.md

···

       1
       1
       +
       ---

     

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

     

       3
       3
       +
       ---

     

       4
       4
       +
       

     

       5
       5
       +
       Bubble up unused fields to their closest parent

+1 -1

package.json

···

       9
       9
        
           "prepare": "husky install",

     

       10
       10
        
           "dev": "pnpm --filter @0no-co/graphqlsp dev",

     

       11
       11
        
           "launch-debug": "./scripts/launch-debug.sh",

     

       12
       12
       -
           "test:e2e": "vitest run --single-thread"

     

       12
       12
       +
           "test:e2e": "vitest run unused -u --single-thread"

     

       13
       13
        
         },

     

       14
       14
        
         "prettier": {

     

       15
       15
        
           "singleQuote": true,

+28 -6

packages/graphqlsp/src/fieldUsage.ts

···

       364
       364
        
               Field: {

     

       365
       365
        
                 enter(node) {

     

       366
       366
        
                   const alias = node.alias ? node.alias.value : node.name.value;

     

       367
       367
       +
                   const path = inProgress.length

     

       368
       368
       +
                     ? `${inProgress.join('.')}.${alias}`

     

       369
       369
       +
                     : alias;

     

       370
       370
       +
       

     

       367
       371
        
                   if (!node.selectionSet && !reservedKeys.has(node.name.value)) {

     

       368
       368
       -
                     const path = inProgress.length

     

       369
       369
       -
                       ? `${inProgress.join('.')}.${alias}`

     

       370
       370
       -
                       : alias;

     

       371
       372
        
                     allPaths.push(path);

     

       372
       373
        
                     fieldToLoc.set(path, {

     

       373
       374
        
                       start: node.name.loc!.start,

     
···

       375
       376
        
                     });

     

       376
       377
        
                   } else if (node.selectionSet) {

     

       377
       378
        
                     inProgress.push(alias);

     

       379
       379
       +
                     fieldToLoc.set(path, {

     

       380
       380
       +
                       start: node.name.loc!.start,

     

       381
       381
       +
                       length: node.name.loc!.end - node.name.loc!.start,

     

       382
       382
       +
                     });

     

       378
       383
        
                   }

     

       379
       384
        
                 },

     

       380
       385
        
                 leave(node) {

     
···

       463
       468
        
             }

     

       464
       469
        
       

     

       465
       470
        
             const unused = allPaths.filter(x => !allAccess.includes(x));

     

       466
       466
       -
       

     

       471
       471
       +
             const aggregatedUnusedFields = new Set<string>();

     

       472
       472
       +
             const unusedChildren: { [key: string]: Set<string> } = {};

     

       467
       473
        
             unused.forEach(unusedField => {

     

       468
       468
       -
               const loc = fieldToLoc.get(unusedField);

     

       474
       474
       +
               const split = unusedField.split('.');

     

       475
       475
       +
               split.pop();

     

       476
       476
       +
               const parentField = split.join('.');

     

       477
       477
       +
               const loc = fieldToLoc.get(parentField);

     

       469
       478
        
               if (!loc) return;

     

       470
       479
        
       

     

       480
       480
       +
               aggregatedUnusedFields.add(parentField);

     

       481
       481
       +
               if (unusedChildren[parentField]) {

     

       482
       482
       +
                 unusedChildren[parentField].add(unusedField);

     

       483
       483
       +
               } else {

     

       484
       484
       +
                 unusedChildren[parentField] = new Set([unusedField]);

     

       485
       485
       +
               }

     

       486
       486
       +
             });

     

       487
       487
       +
       

     

       488
       488
       +
             aggregatedUnusedFields.forEach(field => {

     

       489
       489
       +
               const loc = fieldToLoc.get(field)!;

     

       490
       490
       +
               const unusedFields = unusedChildren[field]!;

     

       471
       491
        
               diagnostics.push({

     

       472
       492
        
                 file: source,

     

       473
       493
        
                 length: loc.length,

     

       474
       494
        
                 start: node.getStart() + loc.start + 1,

     

       475
       495
        
                 category: ts.DiagnosticCategory.Warning,

     

       476
       496
        
                 code: UNUSED_FIELD_CODE,

     

       477
       477
       -
                 messageText: `Field '${unusedField}' is not used.`,

     

       497
       497
       +
                 messageText: `Field(s) ${[...unusedFields]

     

       498
       498
       +
                   .map(x => `'${x}'`)

     

       499
       499
       +
                   .join(', ')} are not used.`,

     

       478
       500
        
               });

     

       479
       501
        
             });

     

       480
       502
        
           });

+43 -108

test/e2e/unused-fieds.test.ts

···

       142
       142
        
                 "category": "warning",

     

       143
       143
        
                 "code": 52005,

     

       144
       144
        
                 "end": {

     

       145
       145
       -
                   "line": 10,

     

       146
       146
       -
                   "offset": 15,

     

       145
       145
       +
                   "line": 9,

     

       146
       146
       +
                   "offset": 11,

     

       147
       147
        
                 },

     

       148
       148
        
                 "start": {

     

       149
       149
       -
                   "line": 10,

     

       150
       150
       -
                   "offset": 9,

     

       151
       151
       -
                 },

     

       152
       152
       -
                 "text": "Field 'attacks.fast.damage' is not used.",

     

       153
       153
       -
               },

     

       154
       154
       -
               {

     

       155
       155
       -
                 "category": "warning",

     

       156
       156
       -
                 "code": 52005,

     

       157
       157
       -
                 "end": {

     

       158
       158
       -
                   "line": 11,

     

       159
       159
       -
                   "offset": 13,

     

       160
       160
       -
                 },

     

       161
       161
       -
                 "start": {

     

       162
       162
       -
                   "line": 11,

     

       163
       163
       -
                   "offset": 9,

     

       149
       149
       +
                   "line": 9,

     

       150
       150
       +
                   "offset": 7,

     

       164
       151
        
                 },

     

       165
       165
       -
                 "text": "Field 'attacks.fast.name' is not used.",

     

       152
       152
       +
                 "text": "Field(s) 'attacks.fast.damage', 'attacks.fast.name' are not used.",

     

       166
       153
        
               },

     

       167
       154
        
             ]

     

       168
       155
        
           `);

     
···

       187
       174
        
                 "category": "warning",

     

       188
       175
        
                 "code": 52005,

     

       189
       176
        
                 "end": {

     

       190
       190
       -
                   "line": 10,

     

       191
       191
       -
                   "offset": 15,

     

       192
       192
       -
                 },

     

       193
       193
       -
                 "start": {

     

       194
       194
       -
                   "line": 10,

     

       195
       195
       -
                   "offset": 9,

     

       196
       196
       -
                 },

     

       197
       197
       -
                 "text": "Field 'attacks.fast.damage' is not used.",

     

       198
       198
       -
               },

     

       199
       199
       -
               {

     

       200
       200
       -
                 "category": "warning",

     

       201
       201
       -
                 "code": 52005,

     

       202
       202
       -
                 "end": {

     

       203
       203
       -
                   "line": 11,

     

       204
       204
       -
                   "offset": 13,

     

       177
       177
       +
                   "line": 9,

     

       178
       178
       +
                   "offset": 11,

     

       205
       179
        
                 },

     

       206
       180
        
                 "start": {

     

       207
       207
       -
                   "line": 11,

     

       208
       208
       -
                   "offset": 9,

     

       181
       181
       +
                   "line": 9,

     

       182
       182
       +
                   "offset": 7,

     

       209
       183
        
                 },

     

       210
       210
       -
                 "text": "Field 'attacks.fast.name' is not used.",

     

       184
       184
       +
                 "text": "Field(s) 'attacks.fast.damage', 'attacks.fast.name' are not used.",

     

       211
       185
        
               },

     

       212
       186
        
             ]

     

       213
       187
        
           `);

     
···

       232
       206
        
                 "category": "warning",

     

       233
       207
        
                 "code": 52005,

     

       234
       208
        
                 "end": {

     

       235
       235
       -
                   "line": 11,

     

       236
       236
       -
                   "offset": 15,

     

       237
       237
       -
                 },

     

       238
       238
       -
                 "start": {

     

       239
       239
       -
                   "line": 11,

     

       240
       240
       -
                   "offset": 7,

     

       241
       241
       -
                 },

     

       242
       242
       -
                 "text": "Field 'pokemon.fleeRate' is not used.",

     

       243
       243
       -
               },

     

       244
       244
       -
               {

     

       245
       245
       -
                 "category": "warning",

     

       246
       246
       -
                 "code": 52005,

     

       247
       247
       -
                 "end": {

     

       248
       248
       -
                   "line": 16,

     

       249
       249
       -
                   "offset": 17,

     

       209
       209
       +
                   "line": 9,

     

       210
       210
       +
                   "offset": 12,

     

       250
       211
        
                 },

     

       251
       212
        
                 "start": {

     

       252
       252
       -
                   "line": 16,

     

       253
       253
       -
                   "offset": 11,

     

       213
       213
       +
                   "line": 9,

     

       214
       214
       +
                   "offset": 5,

     

       254
       215
        
                 },

     

       255
       255
       -
                 "text": "Field 'pokemon.attacks.special.damage' is not used.",

     

       216
       216
       +
                 "text": "Field(s) 'pokemon.fleeRate' are not used.",

     

       256
       217
        
               },

     

       257
       218
        
               {

     

       258
       219
        
                 "category": "warning",

     

       259
       220
        
                 "code": 52005,

     

       260
       221
        
                 "end": {

     

       261
       261
       -
                   "line": 20,

     

       222
       222
       +
                   "line": 14,

     

       262
       223
        
                   "offset": 16,

     

       263
       224
        
                 },

     

       264
       225
        
                 "start": {

     

       265
       265
       -
                   "line": 20,

     

       226
       226
       +
                   "line": 14,

     

       266
       227
        
                   "offset": 9,

     

       267
       228
        
                 },

     

       268
       268
       -
                 "text": "Field 'pokemon.weight.minimum' is not used.",

     

       229
       229
       +
                 "text": "Field(s) 'pokemon.attacks.special.damage' are not used.",

     

       269
       230
        
               },

     

       270
       231
        
               {

     

       271
       232
        
                 "category": "warning",

     

       272
       233
        
                 "code": 52005,

     

       273
       234
        
                 "end": {

     

       274
       274
       -
                   "line": 21,

     

       275
       275
       -
                   "offset": 16,

     

       235
       235
       +
                   "line": 19,

     

       236
       236
       +
                   "offset": 13,

     

       276
       237
        
                 },

     

       277
       238
        
                 "start": {

     

       278
       278
       -
                   "line": 21,

     

       279
       279
       -
                   "offset": 9,

     

       239
       239
       +
                   "line": 19,

     

       240
       240
       +
                   "offset": 7,

     

       280
       241
        
                 },

     

       281
       281
       -
                 "text": "Field 'pokemon.weight.maximum' is not used.",

     

       242
       242
       +
                 "text": "Field(s) 'pokemon.weight.minimum', 'pokemon.weight.maximum' are not used.",

     

       282
       243
        
               },

     

       283
       244
        
               {

     

       284
       245
        
                 "category": "error",

     
···

       310
       271
        
                 "category": "warning",

     

       311
       272
        
                 "code": 52005,

     

       312
       273
        
                 "end": {

     

       313
       313
       -
                   "line": 15,

     

       314
       314
       -
                   "offset": 15,

     

       274
       274
       +
                   "line": 14,

     

       275
       275
       +
                   "offset": 16,

     

       315
       276
        
                 },

     

       316
       277
        
                 "start": {

     

       317
       317
       -
                   "line": 15,

     

       318
       318
       -
                   "offset": 11,

     

       278
       278
       +
                   "line": 14,

     

       279
       279
       +
                   "offset": 9,

     

       319
       280
        
                 },

     

       320
       320
       -
                 "text": "Field 'pokemon.attacks.special.name' is not used.",

     

       281
       281
       +
                 "text": "Field(s) 'pokemon.attacks.special.name', 'pokemon.attacks.special.damage' are not used.",

     

       321
       282
        
               },

     

       322
       283
        
               {

     

       323
       284
        
                 "category": "warning",

     

       324
       285
        
                 "code": 52005,

     

       325
       286
        
                 "end": {

     

       326
       326
       -
                   "line": 16,

     

       327
       327
       -
                   "offset": 17,

     

       287
       287
       +
                   "line": 9,

     

       288
       288
       +
                   "offset": 12,

     

       328
       289
        
                 },

     

       329
       290
        
                 "start": {

     

       330
       330
       -
                   "line": 16,

     

       331
       331
       -
                   "offset": 11,

     

       291
       291
       +
                   "line": 9,

     

       292
       292
       +
                   "offset": 5,

     

       332
       293
        
                 },

     

       333
       333
       -
                 "text": "Field 'pokemon.attacks.special.damage' is not used.",

     

       334
       334
       -
               },

     

       335
       335
       -
               {

     

       336
       336
       -
                 "category": "warning",

     

       337
       337
       -
                 "code": 52005,

     

       338
       338
       -
                 "end": {

     

       339
       339
       -
                   "line": 23,

     

       340
       340
       -
                   "offset": 11,

     

       341
       341
       -
                 },

     

       342
       342
       -
                 "start": {

     

       343
       343
       -
                   "line": 23,

     

       344
       344
       -
                   "offset": 7,

     

       345
       345
       -
                 },

     

       346
       346
       -
                 "text": "Field 'pokemon.name' is not used.",

     

       294
       294
       +
                 "text": "Field(s) 'pokemon.name' are not used.",

     

       347
       295
        
               },

     

       348
       296
        
               {

     

       349
       297
        
                 "category": "error",

     
···

       375
       323
        
                 "category": "warning",

     

       376
       324
        
                 "code": 52005,

     

       377
       325
        
                 "end": {

     

       378
       378
       -
                   "line": 15,

     

       379
       379
       -
                   "offset": 15,

     

       326
       326
       +
                   "line": 14,

     

       327
       327
       +
                   "offset": 16,

     

       380
       328
        
                 },

     

       381
       329
        
                 "start": {

     

       382
       382
       -
                   "line": 15,

     

       383
       383
       -
                   "offset": 11,

     

       330
       330
       +
                   "line": 14,

     

       331
       331
       +
                   "offset": 9,

     

       384
       332
        
                 },

     

       385
       385
       -
                 "text": "Field 'pokemon.attacks.special.name' is not used.",

     

       333
       333
       +
                 "text": "Field(s) 'pokemon.attacks.special.name', 'pokemon.attacks.special.damage' are not used.",

     

       386
       334
        
               },

     

       387
       335
        
               {

     

       388
       336
        
                 "category": "warning",

     

       389
       337
        
                 "code": 52005,

     

       390
       338
        
                 "end": {

     

       391
       391
       -
                   "line": 16,

     

       392
       392
       -
                   "offset": 17,

     

       339
       339
       +
                   "line": 9,

     

       340
       340
       +
                   "offset": 12,

     

       393
       341
        
                 },

     

       394
       342
        
                 "start": {

     

       395
       395
       -
                   "line": 16,

     

       396
       396
       -
                   "offset": 11,

     

       397
       397
       -
                 },

     

       398
       398
       -
                 "text": "Field 'pokemon.attacks.special.damage' is not used.",

     

       399
       399
       -
               },

     

       400
       400
       -
               {

     

       401
       401
       -
                 "category": "warning",

     

       402
       402
       -
                 "code": 52005,

     

       403
       403
       -
                 "end": {

     

       404
       404
       -
                   "line": 23,

     

       405
       405
       -
                   "offset": 11,

     

       343
       343
       +
                   "line": 9,

     

       344
       344
       +
                   "offset": 5,

     

       406
       345
        
                 },

     

       407
       407
       -
                 "start": {

     

       408
       408
       -
                   "line": 23,

     

       409
       409
       -
                   "offset": 7,

     

       410
       410
       -
                 },

     

       411
       411
       -
                 "text": "Field 'pokemon.name' is not used.",

     

       346
       346
       +
                 "text": "Field(s) 'pokemon.name' are not used.",

     

       412
       347
        
               },

     

       413
       348
        
               {

     

       414
       349
        
                 "category": "error",

-7

tsconfig.json

···

       1
       1
        
       {

     

       2
       2
        
         "compilerOptions": {

     

       3
       3
       -
           "plugins": [

     

       4
       4
       -
             {

     

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

     

       6
       6
       -
               "schema": "./packages/example-tada/schema.graphql",

     

       7
       7
       -
               "tadaOutputLocation": "./packages/example-tada/introspection.ts"

     

       8
       8
       -
             }

     

       9
       9
       -
           ],

     

       10
       3
        
           "jsx": "react-jsx",

     

       11
       4
        
           /* Language and Environment */

     

       12
       5
        
           "target": "es2016" /* Set the JavaScript language version for emitted JavaScript and include compatible library declarations. */,