commit 2d9daeb283174b2518dfd80e1141b6823f1f2784 · kitten.sh/graphqlsp

.changeset/wise-mangos-kick.md

···

       1
       1
       +
       ---

     

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

     

       3
       3
       +
       ---

     

       4
       4
       +
       

     

       5
       5
       +
       Add fix for nonNullAssertion and using Array.at

+14 -1

packages/example-tada/src/index.tsx

···

       21
       21
        
             name

     

       22
       22
        
             __typename

     

       23
       23
        
           }

     

       24
       24
       +
           pokemons {

     

       25
       25
       +
             name

     

       26
       26
       +
             maxCP

     

       27
       27
       +
             maxHP

     

       28
       28
       +
             types

     

       29
       29
       +
           }

     

       24
       30
        
         }

     

       25
       31
        
       `, [PokemonFields]);

     

       26
       32
        
       

     
···

       30
       36
        
           variables: { id: '' }

     

       31
       37
        
         });

     

       32
       38
        
         

     

       39
       39
       +
         const selected = result.data?.pokemons?.at(0)!

     

       40
       40
       +
         console.log(result.data?.pokemons?.at(0)?.maxCP)

     

       41
       41
       +
         console.log(selected.maxHP)

     

       42
       42
       +
         const names = result.data?.pokemons?.map(x => x?.name)

     

       43
       43
       +
         console.log(names)

     

       44
       44
       +
         const pos = result.data?.pokemons?.map(x => ({ ...x }))

     

       45
       45
       +
         console.log(pos && pos[0].types)

     

       46
       46
       +
         

     

       33
       47
        
         // Works

     

       34
       48
        
         console.log(result.data?.pokemon?.attacks && result.data?.pokemon?.attacks.special && result.data?.pokemon?.attacks.special[0] && result.data?.pokemon?.attacks.special[0].name)

     

       35
       49
        
       

     
···

       49
       63
        
       

     

       50
       64
        
         return <Pokemon data={result.data!.pokemon} />;

     

       51
       65
        
       }

     

       52
       52
       -

-3

packages/example-tada/tsconfig.json

···

       4
       4
        
             {

     

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

     

       6
       6
        
               "schema": "./schema.graphql",

     

       7
       7
       -
               "disableTypegen": true,

     

       8
       8
       -
               "shouldCheckForColocatedFragments": true,

     

       9
       9
       -
               "trackFieldUsage": true,

     

       10
       7
        
               "tadaOutputLocation": "./introspection.ts"

     

       11
       8
        
             }

     

       12
       9
        
           ],

packages/graphqlsp/package.json

···

       36
       36
        
         },

     

       37
       37
        
         "homepage": "https://github.com/0no-co/GraphQLSP#readme",

     

       38
       38
        
         "devDependencies": {

     

       39
       39
       +
           "@0no-co/graphql.web": "^1.0.4",

     

       39
       40
        
           "@sindresorhus/fnv1a": "^2.0.0",

     

       40
       41
        
           "@types/node": "^18.15.11",

     

       41
       42
        
           "@types/node-fetch": "^2.6.3",

+62 -1

packages/graphqlsp/src/fieldUsage.ts

···

       69
       69
        
         return results;

     

       70
       70
        
       };

     

       71
       71
        
       

     

       72
       72
       +
       const arrayMethods = new Set([

     

       73
       73
       +
         'map',

     

       74
       74
       +
         'filter',

     

       75
       75
       +
         'forEach',

     

       76
       76
       +
         'reduce',

     

       77
       77
       +
         'every',

     

       78
       78
       +
         'some',

     

       79
       79
       +
         'find',

     

       80
       80
       +
         'flatMap',

     

       81
       81
       +
         'sort',

     

       82
       82
       +
       ]);

     

       72
       83
        
       const crawlScope = (

     

       73
       84
        
         node: ts.Identifier | ts.BindingName,

     

       74
       85
        
         originalWip: Array<string>,

     
···

       148
       159
        
               pathParts.push(foundRef.text);

     

       149
       160
        
             } else if (

     

       150
       161
        
               ts.isPropertyAccessExpression(foundRef) &&

     

       162
       162
       +
               foundRef.name.text === 'at' &&

     

       163
       163
       +
               ts.isCallExpression(foundRef.parent)

     

       164
       164
       +
             ) {

     

       165
       165
       +
               foundRef = foundRef.parent;

     

       166
       166
       +
             } else if (

     

       167
       167
       +
               ts.isPropertyAccessExpression(foundRef) &&

     

       168
       168
       +
               arrayMethods.has(foundRef.name.text) &&

     

       169
       169
       +
               ts.isCallExpression(foundRef.parent)

     

       170
       170
       +
             ) {

     

       171
       171
       +
               const isReduce = foundRef.name.text === 'reduce';

     

       172
       172
       +
               const isSomeOrEvery =

     

       173
       173
       +
                 foundRef.name.text === 'every' || foundRef.name.text === 'some';

     

       174
       174
       +
               const callExpression = foundRef.parent;

     

       175
       175
       +
               const func = callExpression.arguments[0];

     

       176
       176
       +
               if (ts.isFunctionExpression(func) || ts.isArrowFunction(func)) {

     

       177
       177
       +
                 const param = func.parameters[isReduce ? 1 : 0];

     

       178
       178
       +
                 const res = crawlScope(

     

       179
       179
       +
                   param.name,

     

       180
       180
       +
                   pathParts,

     

       181
       181
       +
                   allFields,

     

       182
       182
       +
                   source,

     

       183
       183
       +
                   info

     

       184
       184
       +
                 );

     

       185
       185
       +
       

     

       186
       186
       +
                 // TODO: do we need to support variable destructuring here like

     

       187
       187
       +
                 // .map being used in const [x] = list.map()?

     

       188
       188
       +
                 if (

     

       189
       189
       +
                   ts.isVariableDeclaration(callExpression.parent) &&

     

       190
       190
       +
                   !isSomeOrEvery

     

       191
       191
       +
                 ) {

     

       192
       192
       +
                   const varRes = crawlScope(

     

       193
       193
       +
                     callExpression.parent.name,

     

       194
       194
       +
                     pathParts,

     

       195
       195
       +
                     allFields,

     

       196
       196
       +
                     source,

     

       197
       197
       +
                     info

     

       198
       198
       +
                   );

     

       199
       199
       +
                   res.push(...varRes);

     

       200
       200
       +
                 }

     

       201
       201
       +
       

     

       202
       202
       +
                 return res;

     

       203
       203
       +
               } else if (ts.isIdentifier(func)) {

     

       204
       204
       +
                 // TODO: get the function and do the same as the above

     

       205
       205
       +
               }

     

       206
       206
       +
             } else if (

     

       207
       207
       +
               ts.isPropertyAccessExpression(foundRef) &&

     

       151
       208
        
               allFields.includes(foundRef.name.text) &&

     

       152
       209
        
               !pathParts.includes(foundRef.name.text)

     

       153
       210
        
             ) {

     
···

       161
       218
        
               pathParts.push(foundRef.argumentExpression.text);

     

       162
       219
        
             }

     

       163
       220
        
       

     

       164
       164
       -
             foundRef = foundRef.parent;

     

       221
       221
       +
             if (ts.isNonNullExpression(foundRef.parent)) {

     

       222
       222
       +
               foundRef = foundRef.parent.parent;

     

       223
       223
       +
             } else {

     

       224
       224
       +
               foundRef = foundRef.parent;

     

       225
       225
       +
             }

     

       165
       226
        
           }

     

       166
       227
        
       

     

       167
       228
        
           return pathParts.join('.');

+12 -5

pnpm-lock.yaml

···

       171
       171
        
               specifier: ^2.0.0

     

       172
       172
        
               version: 2.6.7

     

       173
       173
        
           devDependencies:

     

       174
       174
       +
             '@0no-co/graphql.web':

     

       175
       175
       +
               specifier: ^1.0.4

     

       176
       176
       +
               version: 1.0.4(graphql@16.8.1)

     

       174
       177
        
             '@sindresorhus/fnv1a':

     

       175
       178
        
               specifier: ^2.0.0

     

       176
       179
        
               version: 2.0.1

     
···

       264
       267
        
               optional: true

     

       265
       268
        
           dependencies:

     

       266
       269
        
             graphql: 16.8.1

     

       267
       267
       -
           dev: false

     

       268
       270
        
       

     

       269
       271
        
         /@ampproject/remapping@2.2.1:

     

       270
       272
        
           resolution: {integrity: sha512-lFMjJTrFL3j7L9yBxwYfCq2k6qqwHyzuUl/XBnif78PWTJYyL/dfowQHWE3sp6U6ZzqWiiIZnpTMO96zhkjwtg==}

     
···

       3422
       3424
        
             object-assign: 4.1.1

     

       3423
       3425
        
             promise: 7.3.1

     

       3424
       3426
        
             setimmediate: 1.0.5

     

       3425
       3425
       -
             ua-parser-js: 1.0.37

     

       3427
       3427
       +
             ua-parser-js: 0.7.37

     

       3426
       3428
        
           transitivePeerDependencies:

     

       3427
       3429
        
             - encoding

     

       3428
       3430
        
           dev: true

     
···

       4587
       4589
        
           dependencies:

     

       4588
       4590
        
             hosted-git-info: 2.8.9

     

       4589
       4591
        
             resolve: 1.22.2

     

       4590
       4590
       -
             semver: 7.5.4

     

       4592
       4592
       +
             semver: 5.7.2

     

       4591
       4593
        
             validate-npm-package-license: 3.0.4

     

       4592
       4594
        
           dev: true

     

       4593
       4595
        
       

     
···

       5171
       5173
        
           resolution: {integrity: sha512-MuCAyrGZcTLfQoH2XoBlQ8C6bzwN88XT/0slOGz0pn8+gIP85BOAfYa44ZXQUTOwRwPU0QvgU+V+OSajl/59Xg==}

     

       5172
       5174
        
           dev: true

     

       5173
       5175
        
       

     

       5176
       5176
       +
         /semver@5.7.2:

     

       5177
       5177
       +
           resolution: {integrity: sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==}

     

       5178
       5178
       +
           hasBin: true

     

       5179
       5179
       +
           dev: true

     

       5180
       5180
       +
       

     

       5174
       5181
        
         /semver@6.3.1:

     

       5175
       5182
        
           resolution: {integrity: sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==}

     

       5176
       5183
        
           hasBin: true

     
···

       5687
       5694
        
           hasBin: true

     

       5688
       5695
        
           dev: true

     

       5689
       5696
        
       

     

       5690
       5690
       -
         /ua-parser-js@1.0.37:

     

       5691
       5691
       -
           resolution: {integrity: sha512-bhTyI94tZofjo+Dn8SN6Zv8nBDvyXTymAdM3LDI/0IboIUwTu1rEhW7v2TfiVsoYWgkQ4kOVqnI8APUFbIQIFQ==}

     

       5697
       5697
       +
         /ua-parser-js@0.7.37:

     

       5698
       5698
       +
           resolution: {integrity: sha512-xV8kqRKM+jhMvcHWUKthV9fNebIzrNy//2O9ZwWcfiBFR5f25XVZPLlEajk/sf3Ra15V92isyQqnIEXRDaZWEA==}

     

       5692
       5699
        
           dev: true

     

       5693
       5700
        
       

     

       5694
       5701
        
         /ufo@1.3.1: