From fb3f2378087f8e414f4458c8f10f1eac8f1d52f8 Mon Sep 17 00:00:00 2001
From: mrjvs <jellevs@gmail.com>
Date: Wed, 27 Dec 2023 22:33:13 +0100
Subject: [PATCH] Better types for fetchers

---
 src/fetchers/types.ts | 10 +++++-----
 src/utils/context.ts  | 10 ++--------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/src/fetchers/types.ts b/src/fetchers/types.ts
index d542298..f5dbe06 100644
--- a/src/fetchers/types.ts
+++ b/src/fetchers/types.ts
@@ -28,12 +28,12 @@ export type FetcherResponse<T = any> = {
 };
 
 // This is the version that will be inputted by library users
-export type Fetcher<T = any> = {
-  (url: string, ops: DefaultedFetcherOptions): Promise<FetcherResponse<T>>;
+export type Fetcher = {
+  <T = any>(url: string, ops: DefaultedFetcherOptions): Promise<FetcherResponse<T>>;
 };
 
 // This is the version that scrapers will be interacting with
-export type UseableFetcher<T = any> = {
-  (url: string, ops?: FetcherOptions): Promise<T>;
-  full: (url: string, ops?: FetcherOptions) => Promise<FetcherResponse<T>>;
+export type UseableFetcher = {
+  <T = any>(url: string, ops?: FetcherOptions): Promise<T>;
+  full: <T = any>(url: string, ops?: FetcherOptions) => Promise<FetcherResponse<T>>;
 };
diff --git a/src/utils/context.ts b/src/utils/context.ts
index cf7acc7..6f16bca 100644
--- a/src/utils/context.ts
+++ b/src/utils/context.ts
@@ -2,14 +2,8 @@ import { MovieMedia, ShowMedia } from '@/entrypoint/utils/media';
 import { UseableFetcher } from '@/fetchers/types';
 
 export type ScrapeContext = {
-  proxiedFetcher: {
-    <T>(...params: Parameters<UseableFetcher<T>>): ReturnType<UseableFetcher<T>>;
-    full<T>(...params: Parameters<UseableFetcher<T>['full']>): ReturnType<UseableFetcher<T>['full']>;
-  };
-  fetcher: {
-    <T>(...params: Parameters<UseableFetcher<T>>): ReturnType<UseableFetcher<T>>;
-    full<T>(...params: Parameters<UseableFetcher<T>['full']>): ReturnType<UseableFetcher<T>['full']>;
-  };
+  proxiedFetcher: UseableFetcher;
+  fetcher: UseableFetcher;
   progress(val: number): void;
 };