commit c35e7a98659828726de29f9b8a1aed036d34e8ed · kitten.sh/urql

.changeset/olive-schools-prove.md

···

       1
       1
       +
       ---

     

       2
       2
       +
       '@urql/core': patch

     

       3
       3
       +
       ---

     

       4
       4
       +
       

     

       5
       5
       +
       Support non spec-compliant error bodies, i.e. the Shopify API does return `errors` but as an object. Adding

     

       6
       6
       +
       a check whether we are really dealing with an Array of errors enables this.

+146

packages/core/src/internal/__snapshots__/fetchSource.test.ts.snap

···

       438
       438
        
       }

     

       439
       439
        
       `;

     

       440
       440
        
       

     

       441
       441
       +
       exports[`on error with non spec-compliant body > handles network errors 1`] = `

     

       442
       442
       +
       {

     

       443
       443
       +
         "data": undefined,

     

       444
       444
       +
         "error": [CombinedError: [Network] Forbidden],

     

       445
       445
       +
         "extensions": undefined,

     

       446
       446
       +
         "hasNext": false,

     

       447
       447
       +
         "operation": {

     

       448
       448
       +
           "context": {

     

       449
       449
       +
             "fetchOptions": {

     

       450
       450
       +
               "method": "POST",

     

       451
       451
       +
             },

     

       452
       452
       +
             "requestPolicy": "cache-first",

     

       453
       453
       +
             "url": "http://localhost:3000/graphql",

     

       454
       454
       +
           },

     

       455
       455
       +
           "key": 2,

     

       456
       456
       +
           "kind": "query",

     

       457
       457
       +
           "query": {

     

       458
       458
       +
             "__key": -2395444236,

     

       459
       459
       +
             "definitions": [

     

       460
       460
       +
               {

     

       461
       461
       +
                 "directives": [],

     

       462
       462
       +
                 "kind": "OperationDefinition",

     

       463
       463
       +
                 "name": {

     

       464
       464
       +
                   "kind": "Name",

     

       465
       465
       +
                   "value": "getUser",

     

       466
       466
       +
                 },

     

       467
       467
       +
                 "operation": "query",

     

       468
       468
       +
                 "selectionSet": {

     

       469
       469
       +
                   "kind": "SelectionSet",

     

       470
       470
       +
                   "selections": [

     

       471
       471
       +
                     {

     

       472
       472
       +
                       "alias": undefined,

     

       473
       473
       +
                       "arguments": [

     

       474
       474
       +
                         {

     

       475
       475
       +
                           "kind": "Argument",

     

       476
       476
       +
                           "name": {

     

       477
       477
       +
                             "kind": "Name",

     

       478
       478
       +
                             "value": "name",

     

       479
       479
       +
                           },

     

       480
       480
       +
                           "value": {

     

       481
       481
       +
                             "kind": "Variable",

     

       482
       482
       +
                             "name": {

     

       483
       483
       +
                               "kind": "Name",

     

       484
       484
       +
                               "value": "name",

     

       485
       485
       +
                             },

     

       486
       486
       +
                           },

     

       487
       487
       +
                         },

     

       488
       488
       +
                       ],

     

       489
       489
       +
                       "directives": [],

     

       490
       490
       +
                       "kind": "Field",

     

       491
       491
       +
                       "name": {

     

       492
       492
       +
                         "kind": "Name",

     

       493
       493
       +
                         "value": "user",

     

       494
       494
       +
                       },

     

       495
       495
       +
                       "selectionSet": {

     

       496
       496
       +
                         "kind": "SelectionSet",

     

       497
       497
       +
                         "selections": [

     

       498
       498
       +
                           {

     

       499
       499
       +
                             "alias": undefined,

     

       500
       500
       +
                             "arguments": [],

     

       501
       501
       +
                             "directives": [],

     

       502
       502
       +
                             "kind": "Field",

     

       503
       503
       +
                             "name": {

     

       504
       504
       +
                               "kind": "Name",

     

       505
       505
       +
                               "value": "id",

     

       506
       506
       +
                             },

     

       507
       507
       +
                             "selectionSet": undefined,

     

       508
       508
       +
                           },

     

       509
       509
       +
                           {

     

       510
       510
       +
                             "alias": undefined,

     

       511
       511
       +
                             "arguments": [],

     

       512
       512
       +
                             "directives": [],

     

       513
       513
       +
                             "kind": "Field",

     

       514
       514
       +
                             "name": {

     

       515
       515
       +
                               "kind": "Name",

     

       516
       516
       +
                               "value": "firstName",

     

       517
       517
       +
                             },

     

       518
       518
       +
                             "selectionSet": undefined,

     

       519
       519
       +
                           },

     

       520
       520
       +
                           {

     

       521
       521
       +
                             "alias": undefined,

     

       522
       522
       +
                             "arguments": [],

     

       523
       523
       +
                             "directives": [],

     

       524
       524
       +
                             "kind": "Field",

     

       525
       525
       +
                             "name": {

     

       526
       526
       +
                               "kind": "Name",

     

       527
       527
       +
                               "value": "lastName",

     

       528
       528
       +
                             },

     

       529
       529
       +
                             "selectionSet": undefined,

     

       530
       530
       +
                           },

     

       531
       531
       +
                         ],

     

       532
       532
       +
                       },

     

       533
       533
       +
                     },

     

       534
       534
       +
                   ],

     

       535
       535
       +
                 },

     

       536
       536
       +
                 "variableDefinitions": [

     

       537
       537
       +
                   {

     

       538
       538
       +
                     "defaultValue": undefined,

     

       539
       539
       +
                     "directives": [],

     

       540
       540
       +
                     "kind": "VariableDefinition",

     

       541
       541
       +
                     "type": {

     

       542
       542
       +
                       "kind": "NamedType",

     

       543
       543
       +
                       "name": {

     

       544
       544
       +
                         "kind": "Name",

     

       545
       545
       +
                         "value": "String",

     

       546
       546
       +
                       },

     

       547
       547
       +
                     },

     

       548
       548
       +
                     "variable": {

     

       549
       549
       +
                       "kind": "Variable",

     

       550
       550
       +
                       "name": {

     

       551
       551
       +
                         "kind": "Name",

     

       552
       552
       +
                         "value": "name",

     

       553
       553
       +
                       },

     

       554
       554
       +
                     },

     

       555
       555
       +
                   },

     

       556
       556
       +
                 ],

     

       557
       557
       +
               },

     

       558
       558
       +
             ],

     

       559
       559
       +
             "kind": "Document",

     

       560
       560
       +
             "loc": {

     

       561
       561
       +
               "end": 92,

     

       562
       562
       +
               "source": {

     

       563
       563
       +
                 "body": "query getUser($name: String) {

     

       564
       564
       +
         user(name: $name) {

     

       565
       565
       +
           id

     

       566
       566
       +
           firstName

     

       567
       567
       +
           lastName

     

       568
       568
       +
         }

     

       569
       569
       +
       }",

     

       570
       570
       +
                 "locationOffset": {

     

       571
       571
       +
                   "column": 1,

     

       572
       572
       +
                   "line": 1,

     

       573
       573
       +
                 },

     

       574
       574
       +
                 "name": "gql",

     

       575
       575
       +
               },

     

       576
       576
       +
               "start": 0,

     

       577
       577
       +
             },

     

       578
       578
       +
           },

     

       579
       579
       +
           "variables": {

     

       580
       580
       +
             "name": "Clara",

     

       581
       581
       +
           },

     

       582
       582
       +
         },

     

       583
       583
       +
         "stale": false,

     

       584
       584
       +
       }

     

       585
       585
       +
       `;

     

       586
       586
       +
       

     

       441
       587
        
       exports[`on success > returns response data 1`] = `

     

       442
       588
        
       {

     

       443
       589
        
         "data": {

+21

packages/core/src/internal/fetchSource.test.ts

···

       172
       172
        
         });

     

       173
       173
        
       });

     

       174
       174
        
       

     

       175
       175
       +
       describe('on error with non spec-compliant body', () => {

     

       176
       176
       +
         beforeEach(() => {

     

       177
       177
       +
           fetch.mockResolvedValue({

     

       178
       178
       +
             status: 400,

     

       179
       179
       +
             statusText: 'Forbidden',

     

       180
       180
       +
             headers: { get: () => 'application/json' },

     

       181
       181
       +
             text: vi.fn().mockResolvedValue('{"errors":{"detail":"Bad Request"}}'),

     

       182
       182
       +
           });

     

       183
       183
       +
         });

     

       184
       184
       +
       

     

       185
       185
       +
         it('handles network errors', async () => {

     

       186
       186
       +
           const data = await pipe(

     

       187
       187
       +
             makeFetchSource(queryOperation, 'https://test.com/graphql', {}),

     

       188
       188
       +
             toPromise

     

       189
       189
       +
           );

     

       190
       190
       +
       

     

       191
       191
       +
           expect(data).toMatchSnapshot();

     

       192
       192
       +
           expect(data).toHaveProperty('error.networkError.message', 'Forbidden');

     

       193
       193
       +
         });

     

       194
       194
       +
       });

     

       195
       195
       +
       

     

       175
       196
        
       describe('on teardown', () => {

     

       176
       197
        
         const fail = () => {

     

       177
       198
        
           expect(true).toEqual(false);

+4 -1

packages/core/src/utils/result.ts

···

       28
       28
        
         result: ExecutionResult,

     

       29
       29
        
         response?: any

     

       30
       30
        
       ): OperationResult => {

     

       31
       31
       -
         if (!('data' in result) && !('errors' in result)) {

     

       31
       31
       +
         if (

     

       32
       32
       +
           !('data' in result) &&

     

       33
       33
       +
           (!('errors' in result) || !Array.isArray(result.errors))

     

       34
       34
       +
         ) {

     

       32
       35
        
           throw new Error('No Content');

     

       33
       36
        
         }

     

       34
       37