Use undici fetch instead of custom implementation

ardatan · Aug 13, 2021 · 182128e · 182128e
1 parent 9816707
commit 182128e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 47 deletions.
diff --git a/declarations.d.ts b/declarations.d.ts
@@ -2,3 +2,8 @@ declare interface ObjectConstructor {
   keys<T>(obj: T): Array<keyof T>;
 }
 declare module 'ajv-formats';
+declare module 'undici' {
+  export const fetch: typeof import('cross-fetch').fetch;
+  export const Request: typeof import('cross-fetch').Request;
+  export const Response: typeof import('cross-fetch').Response;
+}
diff --git a/packages/handlers/odata/src/index.ts b/packages/handlers/odata/src/index.ts
@@ -46,14 +46,13 @@ import {
 import { parseResolveInfo, ResolveTree, simplifyParsedResolveInfoFragmentWithType } from 'graphql-parse-resolve-info';
 import DataLoader from 'dataloader';
 import { parseResponse } from 'http-string-parser';
-import { nativeFetch } from './native-fetch';
 import { pascalCase } from 'pascal-case';
 import { EventEmitter } from 'events';
 import { parse as parseXML } from 'fast-xml-parser';
 import { pruneSchema } from '@graphql-tools/utils';
-import { Request, Response } from 'cross-fetch';
 import { PredefinedProxyOptions } from '@graphql-mesh/store';
 import { env } from 'process';
+import { fetch as nativeFetch, Request, Response } from 'undici';
 
 const SCALARS = new Map<string, string>([
   ['Edm.Binary', 'String'],
@@ -174,7 +173,7 @@ export default class ODataHandler implements MeshHandler {
             })
           : this.config.customFetch;
     } else {
-      fetch = getCachedFetch(this.cache);
+      fetch = nativeFetch;
     }
 
     const { baseUrl: nonInterpolatedBaseUrl, operationHeaders } = this.config;
@@ -924,7 +923,7 @@ export default class ODataHandler implements MeshHandler {
           // If entitySetPath is not available, take first parameter as entity
           // The first segment of the entity set path must match the binding parameter name
           // (see: http://docs.oasis-open.org/odata/odata-csdl-xml/v4.01/odata-csdl-xml-v4.01.html#_Toc38530388)
-          entitySetPath = entitySetPath && entitySetPath.split("/")[0] || parameterName;
+          entitySetPath = (entitySetPath && entitySetPath.split('/')[0]) || parameterName;
           if (entitySetPath === parameterName) {
             boundEntityTypeName = getTypeNameFromRef({
               typeRef: parameterTypeRef,

diff --git a/packages/handlers/odata/src/native-fetch.ts b/packages/handlers/odata/src/native-fetch.ts
diff --git a/packages/handlers/odata/test/handler.spec.ts b/packages/handlers/odata/test/handler.spec.ts
@@ -70,7 +70,7 @@ describe('odata', () => {
     });
     const source = await handler.getMeshSource();
     const personType = source.schema.getType('IPerson') as GraphQLInterfaceType;
-    const getFriendsTripsFunction = personType.getFields()['GetFriendsTrips'];
+    const getFriendsTripsFunction = personType.getFields().GetFriendsTrips;
     expect(getFriendsTripsFunction.args).toHaveLength(2);
     const personArg = getFriendsTripsFunction.args.find(arg => arg.name === 'person');
     expect(personArg).not.toBeFalsy();
@@ -301,11 +301,16 @@ describe('odata', () => {
       ],
     };
     let sentRequest: Request;
+    let sentBody: any;
     addMock(correctUrl, async request => {
       sentRequest = request;
-      const bodyObj = JSON.parse(request.body as any);
-      bodyObj['@odata.type'] = 'Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person';
-      return new Response(JSON.stringify(bodyObj));
+      sentBody = await request.json();
+      return new Response(
+        JSON.stringify({
+          ...sentBody,
+          '@odata.type': 'Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person',
+        })
+      );
     });
     const handler = new ODataHandler({
       name: 'TripPin',
@@ -337,7 +342,7 @@ describe('odata', () => {
     expect(graphqlResult.errors).toBeFalsy();
     expect(sentRequest!.method).toBe(correctMethod);
     expect(sentRequest!.url).toBe(correctUrl);
-    expect(JSON.parse(sentRequest!.body as any)).toStrictEqual(correctBody);
+    expect(sentBody).toStrictEqual(correctBody);
   });
   it('should generate correct HTTP request for deleting an entity', async () => {
     addMock('https://services.odata.org/TripPinRESTierService/$metadata', async () => new Response(TripPinMetadata));
@@ -383,11 +388,16 @@ describe('odata', () => {
       LastName: 'King',
     };
     let sentRequest: Request;
+    let sentBody: any;
     addMock(correctUrl, async request => {
       sentRequest = request;
-      const returnBody = JSON.parse(request.body as any);
-      returnBody['@odata.type'] = 'Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person';
-      return new Response(JSON.stringify(returnBody));
+      sentBody = await request.json();
+      return new Response(
+        JSON.stringify({
+          ...sentBody,
+          '@odata.type': 'Microsoft.OData.Service.Sample.TrippinInMemory.Models.Person',
+        })
+      );
     });
     const handler = new ODataHandler({
       name: 'TripPin',
@@ -420,7 +430,7 @@ describe('odata', () => {
     expect(graphqlResult.errors).toBeFalsy();
     expect(sentRequest!.method).toBe(correctMethod);
     expect(sentRequest!.url).toBe(correctUrl);
-    expect(await sentRequest!.text()).toBe(JSON.stringify(correctBody));
+    expect(sentBody).toStrictEqual(correctBody);
   });
   it('should generate correct HTTP request for invoking unbound functions', async () => {
     addMock('https://services.odata.org/TripPinRESTierService/$metadata', async () => new Response(TripPinMetadata));
@@ -568,7 +578,7 @@ describe('odata', () => {
 
     expect(graphqlResult.errors).toBeFalsy();
     expect(sentRequest!.method).toBe(correctMethod);
-    expect(sentRequest!.url).toBe(correctUrl.replace(/'/g, '%27',  ));// apostrophe gets percent-encoded
+    expect(sentRequest!.url).toBe(correctUrl);
   });
   it('should generate correct HTTP request for invoking unbound actions', async () => {
     addMock('https://services.odata.org/TripPinRESTierService/$metadata', async () => new Response(TripPinMetadata));