fix: Simplify GenericTypeAnnotation structure in mapperFor function and tests

Author: Giacomo117

resources/buildConfigDefinitions.js

@@ -158,7 +158,7 @@ function mapperFor(elt, t) {
   } else if (t.isObjectTypeAnnotation(elt)) {
     return wrap(t.identifier('objectParser'));
   } else if (t.isGenericTypeAnnotation(elt)) {
-    const type = elt.typeAnnotation.id.name;
+    const type = elt.id.name;
     if (type == 'Adapter') {
       return wrap(t.identifier('moduleOrObjectParser'));
     }

spec/buildConfigDefinitions.spec.js

@@ -67,10 +67,8 @@ describe('buildConfigDefinitions', () => {
     it('should return moduleOrObjectParser for Adapter GenericTypeAnnotation', () => {
       const mockElement = {
         type: 'GenericTypeAnnotation',
-        typeAnnotation: {
-          id: {
-            name: 'Adapter',
-          },
+        id: {
+          name: 'Adapter',
         },
       };
 
@@ -84,10 +82,8 @@ describe('buildConfigDefinitions', () => {
     it('should return numberOrBooleanParser for NumberOrBoolean GenericTypeAnnotation', () => {
       const mockElement = {
         type: 'GenericTypeAnnotation',
-        typeAnnotation: {
-          id: {
-            name: 'NumberOrBoolean',
-          },
+        id: {
+          name: 'NumberOrBoolean',
         },
       };
 
@@ -102,10 +98,8 @@ describe('buildConfigDefinitions', () => {
       const mockElement = {
         type: 'GenericTypeAnnotation',
         name: 'testString',
-        typeAnnotation: {
-          id: {
-            name: 'NumberOrString',
-          },
+        id: {
+          name: 'NumberOrString',
         },
       };
 
@@ -119,10 +113,8 @@ describe('buildConfigDefinitions', () => {
     it('should return arrayParser for StringOrStringArray GenericTypeAnnotation', () => {
       const mockElement = {
         type: 'GenericTypeAnnotation',
-        typeAnnotation: {
-          id: {
-            name: 'StringOrStringArray',
-          },
+        id: {
+          name: 'StringOrStringArray',
         },
       };
 
@@ -136,10 +128,8 @@ describe('buildConfigDefinitions', () => {
     it('should return objectParser for unknown GenericTypeAnnotation', () => {
       const mockElement = {
         type: 'GenericTypeAnnotation',
-        typeAnnotation: {
-          id: {
-            name: 'UnknownType',
-          },
+        id: {
+          name: 'UnknownType',
         },
       };