more type fixes

Author: itsRems

packages/plexus-api/src/api.ts

@@ -6,6 +6,7 @@ import {
 	PlexusApiReq,
 	PlexusApiRes,
 	PlexusApiSendOptions,
+	PlexusApiFetchOptions,
 } from './types'
 // let's get Blob from Node.js or browser
 let Blob
@@ -284,7 +285,7 @@ export class ApiInstance {
 	get<ResponseType = any>(
 		path: string,
 		query?: Record<string, any>,
-		options?: PlexusApiSendOptions
+		options?: PlexusApiFetchOptions
 	) {
 		const params = new URLSearchParams(query)
 
@@ -309,7 +310,7 @@ export class ApiInstance {
 	>(
 		path: string,
 		body: BodyType = {} as BodyType,
-		reqOptions = {} as PlexusApiSendOptions
+		reqOptions = {} as PlexusApiFetchOptions
 	) {
 		const bodyString = typeof body === 'string' ? body : JSON.stringify(body)
 		const options = {
@@ -340,7 +341,7 @@ export class ApiInstance {
 	put<ResponseType = any>(
 		path: string,
 		body: Record<string, any> | string = {},
-		options?: PlexusApiSendOptions
+		options?: PlexusApiFetchOptions
 	) {
 		if (typeof body !== 'string') {
 			body = JSON.stringify(body)
@@ -359,7 +360,7 @@ export class ApiInstance {
 	delete<ResponseType = any>(
 		path: string,
 		body: Record<string, any> | string = {},
-		options?: PlexusApiSendOptions
+		options?: PlexusApiFetchOptions
 	) {
 		if (typeof body !== 'string') {
 			body = JSON.stringify(body)
@@ -379,7 +380,7 @@ export class ApiInstance {
 	patch<ResponseType = any>(
 		path: string,
 		body: Record<string, any> | string = {},
-		options?: PlexusApiSendOptions
+		options?: PlexusApiFetchOptions
 	) {
 		if (typeof body !== 'string') {
 			body = JSON.stringify(body)
@@ -399,7 +400,7 @@ export class ApiInstance {
 	gql<ResponseType = any>(
 		query: string,
 		variables?: Record<string, any>,
-		options?: PlexusApiSendOptions
+		options?: PlexusApiFetchOptions
 	) {
 		this._headers.set('Content-Type', 'application/json')
 

packages/plexus-api/src/types.ts

@@ -41,10 +41,13 @@ export interface PlexusApiOptions {
 	window?: RequestInit['window']
 }
 
-export interface PlexusApiSendOptions extends PlexusApiOptions {
+export interface PlexusApiFetchOptions extends PlexusApiOptions {
+	headers?: RequestInit['headers']
+}
+
+export interface PlexusApiSendOptions extends PlexusApiFetchOptions {
 	method: ApiMethod
 	body?: RequestInit['body']
-	headers?: RequestInit['headers']
 }
 
 export interface ApiStore {