commit f85b47efbdee0ca1e483c90a8b18d0eb5fe4a982 · kitten.sh/urql

+5

.changeset/metal-monkeys-knock.md

···

       1
       1
       +
       ---

     

       2
       2
       +
       '@urql/core': patch

     

       3
       3
       +
       ---

     

       4
       4
       +
       

     

       5
       5
       +
       Fix issue where `maskTypename` would ignore array shapes

+14

packages/core/src/utils/maskTypename.test.ts

···

       25
       25
        
         ).toEqual({ id: 1, author: { id: 2 } });

     

       26
       26
        
       });

     

       27
       27
        
       

     

       28
       28
       +
       it('works with nested arrays', () => {

     

       29
       29
       +
         expect(

     

       30
       30
       +
           maskTypename({

     

       31
       31
       +
             __typename: 'Todo',

     

       32
       32
       +
             id: 1,

     

       33
       33
       +
             nodes: [[4, 5]],

     

       34
       34
       +
             author: {

     

       35
       35
       +
               id: 2,

     

       36
       36
       +
               __typename: 'Author',

     

       37
       37
       +
             },

     

       38
       38
       +
           })

     

       39
       39
       +
         ).toEqual({ id: 1, nodes: [[4, 5]], author: { id: 2 } });

     

       40
       40
       +
       });

     

       41
       41
       +
       

     

       28
       42
        
       it('strips typename from nested objects with arrays', () => {

     

       29
       43
        
         expect(

     

       30
       44
        
           maskTypename({

+19 -16

packages/core/src/utils/maskTypename.ts

···

       1
       1
        
       export const maskTypename = (data: any): any => {

     

       2
       2
        
         if (!data || typeof data !== 'object') return data;

     

       3
       3
        
       

     

       4
       4
       -
         return Object.keys(data).reduce((acc, key: string) => {

     

       5
       5
       -
           const value = data[key];

     

       6
       6
       -
           if (key === '__typename') {

     

       7
       7
       -
             Object.defineProperty(acc, '__typename', {

     

       8
       8
       -
               enumerable: false,

     

       9
       9
       -
               value,

     

       10
       10
       -
             });

     

       11
       11
       -
           } else if (Array.isArray(value)) {

     

       12
       12
       -
             acc[key] = value.map(maskTypename);

     

       13
       13
       -
           } else if (value && typeof value === 'object' && '__typename' in value) {

     

       14
       14
       -
             acc[key] = maskTypename(value);

     

       15
       15
       -
           } else {

     

       16
       16
       -
             acc[key] = value;

     

       17
       17
       -
           }

     

       4
       4
       +
         return Object.keys(data).reduce(

     

       5
       5
       +
           (acc, key: string) => {

     

       6
       6
       +
             const value = data[key];

     

       7
       7
       +
             if (key === '__typename') {

     

       8
       8
       +
               Object.defineProperty(acc, '__typename', {

     

       9
       9
       +
                 enumerable: false,

     

       10
       10
       +
                 value,

     

       11
       11
       +
               });

     

       12
       12
       +
             } else if (Array.isArray(value)) {

     

       13
       13
       +
               acc[key] = value.map(maskTypename);

     

       14
       14
       +
             } else if (value && typeof value === 'object' && '__typename' in value) {

     

       15
       15
       +
               acc[key] = maskTypename(value);

     

       16
       16
       +
             } else {

     

       17
       17
       +
               acc[key] = value;

     

       18
       18
       +
             }

     

       18
       19
        
       

     

       19
       19
       -
           return acc;

     

       20
       20
       -
         }, {});

     

       20
       20
       +
             return acc;

     

       21
       21
       +
           },

     

       22
       22
       +
           Array.isArray(data) ? [] : {}

     

       23
       23
       +
         );

     

       21
       24
        
       };