2.11.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "scraper",
-  "version": "2.10.0",
+  "version": "2.11.0",
   "description": "Scrape the data from the page you're on.",
   "main": "index.js",
   "types": "types/index.d.ts",

types/scrapers/any-image.d.ts

@@ -1,9 +1,12 @@
-import { Scraper } from './scraper';
-export type Image = {
-    typeName: 'Image';
+import { BaseScrapeResult, Scraper } from './scraper';
+export interface Image extends BaseScrapeResult<'Image'> {
     imageURL: string;
-};
-export declare class ImageScraper extends Scraper<'Image', Image> {
+}
+export declare class ImageScraper extends Scraper<Image> {
     readonly pattern: URLPattern;
-    readonly scrape: () => Image;
+    scrape(): {
+        typeName: "Image";
+        version: number;
+        imageURL: string;
+    };
 }

types/scrapers/imdb-film.d.ts

@@ -1,6 +1,5 @@
-import { Scraper } from './scraper';
-export type IMDBFilm = {
-    typeName: 'IMDBFilm';
+import { BaseScrapeResult, Scraper } from './scraper';
+export interface IMDBFilm extends BaseScrapeResult<'IMDBFilm'> {
     title: string;
     coverURL: string;
     releaseDate: string;
@@ -12,8 +11,22 @@ export type IMDBFilm = {
     episodes?: number;
     duration: string;
     description: string;
-};
-export declare class IMDBFilmScraper extends Scraper<'IMDBFilm', IMDBFilm> {
+}
+export declare class IMDBFilmScraper extends Scraper<IMDBFilm> {
     readonly pattern: URLPattern;
-    readonly scrape: () => Promise<IMDBFilm>;
+    scrape(): Promise<{
+        typeName: "IMDBFilm";
+        version: number;
+        title: string;
+        coverURL: string;
+        releaseDate: string;
+        originalLanguage: string;
+        countriesOfOrigin: string;
+        creators: string;
+        cast: string;
+        seasons: number | undefined;
+        episodes: number | undefined;
+        duration: string;
+        description: string;
+    }>;
 }

types/scrapers/index.d.ts

@@ -6,4 +6,4 @@ import { IMDBFilm } from './imdb-film';
 import { Image } from './any-image';
 export type { YakabooBook, SteamGame, MyAnimeListAnime, IMDBFilm, Image };
 export type ScrapedData = YakabooBook | SteamGame | MyAnimeListAnime | IMDBFilm | Image;
-export declare const SCRAPERS: Scraper<ScrapedData['typeName'], ScrapedData>[];
+export declare const SCRAPERS: Scraper<ScrapedData>[];

types/scrapers/myanimelist-anime.d.ts

@@ -1,14 +1,22 @@
-import { Scraper } from './scraper';
-export type MyAnimeListAnime = {
-    typeName: 'MyAnimeListAnime';
+import { BaseScrapeResult, Scraper } from './scraper';
+export interface MyAnimeListAnime extends BaseScrapeResult<'MyAnimeListAnime'> {
     title: string;
     coverURL: string;
     releaseDate: string;
     creators: string;
     duration: string;
     description: string;
-};
-export declare class MyAnimeListAnimeScraper extends Scraper<'MyAnimeListAnime', MyAnimeListAnime> {
+}
+export declare class MyAnimeListAnimeScraper extends Scraper<MyAnimeListAnime> {
     readonly pattern: URLPattern;
-    readonly scrape: () => MyAnimeListAnime;
+    scrape(): {
+        typeName: "MyAnimeListAnime";
+        version: number;
+        title: string;
+        coverURL: string;
+        releaseDate: string;
+        creators: string;
+        duration: string;
+        description: string;
+    };
 }

types/scrapers/scraper.d.ts

@@ -1,7 +1,9 @@
 import 'urlpattern-polyfill';
-export declare abstract class Scraper<TypeName extends string, Data extends {
+export interface BaseScrapeResult<TypeName extends string> {
     typeName: TypeName;
-}> {
+    version: number;
+}
+export declare abstract class Scraper<R extends BaseScrapeResult<string>> {
     abstract readonly pattern: URLPattern;
-    abstract readonly scrape: (() => Data) | (() => Promise<Data>);
+    abstract scrape(): Promise<R> | R;
 }

types/scrapers/steam-game.d.ts

@@ -1,13 +1,20 @@
-import { Scraper } from './scraper';
-export type SteamGame = {
-    typeName: 'SteamGame';
+import { BaseScrapeResult, Scraper } from './scraper';
+export interface SteamGame extends BaseScrapeResult<'SteamGame'> {
     coverURL: string;
     name: string;
     releaseDate: string;
     developers: string;
     description: string;
-};
-export declare class SteamGameScraper extends Scraper<'SteamGame', SteamGame> {
+}
+export declare class SteamGameScraper extends Scraper<SteamGame> {
     readonly pattern: URLPattern;
-    readonly scrape: () => SteamGame;
+    scrape(): {
+        typeName: "SteamGame";
+        version: number;
+        coverURL: string;
+        name: string;
+        releaseDate: string;
+        developers: string;
+        description: string;
+    };
 }

types/scrapers/yakaboo-book.d.ts

@@ -1,6 +1,5 @@
-import { Scraper } from './scraper';
-export type YakabooBook = {
-    typeName: 'YakabooBook';
+import { BaseScrapeResult, Scraper } from './scraper';
+export interface YakabooBook extends BaseScrapeResult<'YakabooBook'> {
     coverURL: string;
     title: string;
     authors: string;
@@ -10,8 +9,20 @@ export type YakabooBook = {
     publisher: string;
     pages: number;
     language: string;
-};
-export declare class YakabooBookScraper extends Scraper<'YakabooBook', YakabooBook> {
+}
+export declare class YakabooBookScraper extends Scraper<YakabooBook> {
     readonly pattern: URLPattern;
-    readonly scrape: () => Promise<YakabooBook>;
+    scrape(): Promise<{
+        typeName: "YakabooBook";
+        version: number;
+        coverURL: string;
+        title: string;
+        authors: string;
+        publicationDate: string;
+        description: string;
+        translators: string;
+        publisher: string;
+        pages: number;
+        language: string;
+    }>;
 }