fix FetchRequestData type for determineBodyPromise

emberjs · Feb 4, 2021 · 759c470 · 759c470
1 parent 8a2e21d
commit 759c470
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 11 deletions.
diff --git a/packages/adapter/addon/-private/utils/determine-body-promise.ts b/packages/adapter/addon/-private/utils/determine-body-promise.ts
@@ -3,12 +3,7 @@ import { DEBUG } from '@glimmer/env';
 
 import continueOnReject from './continue-on-reject';
 
-type FetchRequestData = {
-  url?: string;
-  method?: string;
-  [key: string]: any;
-};
-
+type RequestData = import('../../rest').RequestData;
 type Payload = object | string | undefined;
 
 interface CustomSyntaxError extends SyntaxError {
@@ -68,10 +63,7 @@ function _determineContent(response: Response, requestData: JQueryAjaxSettings,
   return ret;
 }
 
-export function determineBodyPromise(
-  response: Response,
-  requestData: JQueryAjaxSettings | FetchRequestData
-): Promise<Payload> {
+export function determineBodyPromise(response: Response, requestData: RequestData): Promise<Payload> {
   // response.text() may resolve or reject
   // it is a native promise, may not have finally
   return continueOnReject(response.text()).then(payload => _determineContent(response, requestData, payload));

diff --git a/packages/adapter/addon/rest.ts b/packages/adapter/addon/rest.ts
@@ -58,7 +58,7 @@ export interface JQueryRequestInit extends JQueryAjaxSettings {
   type: string;
 }
 
-type RequestData = {
+export type RequestData = {
   url: string;
   method: string;
   [key: string]: any;