interfaces -> types, listtype as type

src/classes/ClassLoginSession.ts

@@ -2,7 +2,7 @@ import axios, { AxiosInstance } from "axios";
 import { CookieJar } from "tough-cookie";
 import { wrapper } from "axios-cookiejar-support";
 import * as cheerio from "cheerio";
-import { Login } from "../interfaces/InterfaceUserData";
+import { Login } from "../types/TypesUserData";
 import { axiosDefaults } from "../config/axiosDefaults";
 
 import fs from "fs";

src/classes/ClassUser.ts

@@ -1,4 +1,4 @@
-import { Login } from "../interfaces/InterfaceUserData";
+import { Login } from "../types/TypesUserData";
 
 /**
  * Class defining information about a single user

src/classes/ClassWork.ts

@@ -1,4 +1,4 @@
-import WorkContent from "../interfaces/InterfaceWorkContent";
+import { WorkContent } from "../types/TypesWorkContent";
 import getWorkContent from "../utils/getWorkContent";
 import getWorkInfo from "../utils/getWorkInfo";
 import WorkInfo from "./ClassWorkInfo";

src/classes/ClassWorkInfo.ts

@@ -9,7 +9,7 @@ import {
   Relationship,
   SeriesInfo,
   Tag,
-} from "../interfaces/InterfaceWorkInfo";
+} from "../types/TypesWorkInfo";
 import User from "./ClassUser";
 
 /**

src/classes/ClassWorkUserData.ts

@@ -1,7 +1,4 @@
-import {
-  WorkHistory,
-  WorkBookmark,
-} from "../interfaces/InterfaceWorkUsersData";
+import { WorkHistory, WorkBookmark } from "../types/TypesWorkUsersData";
 import User from "./ClassUser";
 
 /**

src/index.ts

@@ -6,9 +6,9 @@ import WorkList from "./classes/ClassWorkList";
 import WorkUserData from "./classes/ClassWorkUserData";
 import { axiosDefaults } from "./config/axiosDefaults";
 import { LanguageCodes } from "./config/LanguageCodes";
-import { Listtype } from "./enums/EnumWorkLists";
-import { Login } from "./interfaces/InterfaceUserData";
-import WorkContent, { Notes, Chapter } from "./interfaces/InterfaceWorkContent";
+
+import { Login } from "./types/TypesUserData";
+import { Notes, Chapter, WorkContent } from "./types/TypesWorkContent";
 import {
   Fandom,
   Relationship,
@@ -20,9 +20,9 @@ import {
   SeriesInfo,
   Collection,
   ChapterInformation,
-} from "./interfaces/InterfaceWorkInfo";
-import { PageSpan } from "./interfaces/InterfaceWorkList";
-import { WorkHistory, WorkBookmark } from "./interfaces/InterfaceWorkUsersData";
+} from "./types/TypesWorkInfo";
+import { Listtype, PageSpan } from "./types/TypesWorkList";
+import { WorkHistory, WorkBookmark } from "./types/TypesWorkUsersData";
 import getWorkContent from "./utils/getWorkContent";
 import getWorkInfo, {
   getArchiveWarnings,

src/interfaces/InterfaceUserData.ts → src/types/TypesUserData.ts

@@ -1,7 +1,7 @@
 /**
  * Type that describes the two parts of login data: username and password
  */
-export interface Login {
+export type Login = {
   username: string;
   password: string;
-}
+};

src/interfaces/InterfaceWorkContent.ts → src/types/TypesWorkContent.ts

@@ -1,19 +1,19 @@
 /**
  * WorkConten is an object containing of the {@link Notes} at the beginning and the end of the work and an array of {@link Chapter}s
  */
-export default interface WorkContent {
+export type WorkContent = {
   notes: Notes;
   chapters: Chapter[];
-}
+};
 
-export interface Notes {
+export type Notes = {
   preNote: string;
   endNote: string;
-}
+};
 
-export interface Chapter {
+export type Chapter = {
   chapterTitle?: string;
   chapterSummary?: string;
   chapterNotes?: string;
   chapterContent?: string | null;
-}
+};

src/interfaces/InterfaceWorkInfo.ts → src/types/TypesWorkInfo.ts

@@ -1,50 +1,50 @@
-export interface Fandom {
+export type Fandom = {
   fandomName: string;
   fandomLink: string | undefined;
-}
+};
 
-export interface Relationship {
+export type Relationship = {
   relationshipName: string;
   relationshipLink: string | undefined;
-}
+};
 
-export interface Character {
+export type Character = {
   characterName: string;
   characterLink: string | undefined;
-}
+};
 
-export interface Rating {
+export type Rating = {
   ratingName: string;
   ratingLink: string | undefined;
-}
+};
 
-export interface ArchiveWarning {
+export type ArchiveWarning = {
   warningName: string;
   warningLink: string | undefined;
-}
+};
 
-export interface Category {
+export type Category = {
   categoryName: string;
   categoryLink: string | undefined;
-}
+};
 
-export interface Tag {
+export type Tag = {
   tagName: string;
   tagLink: string | undefined;
-}
+};
 
-export interface SeriesInfo {
+export type SeriesInfo = {
   seriesName: string;
   seriesLink: string | undefined;
   seriesPart: number;
-}
+};
 
-export interface Collection {
+export type Collection = {
   collectionName: string;
   collectionLink: string | undefined;
-}
+};
 
-export interface ChapterInformation {
+export type ChapterInformation = {
   chaptersWritten: number;
   chaptersMax: number;
-}
+};

src/interfaces/InterfaceWorkList.ts → src/types/TypesWorkList.ts

@@ -1,8 +1,10 @@
 /**
  * a span of Pages that should be parsed when fetching a list of pages. The exclude key is an array of numbers that define the pages that should be ignored
  */
-export interface PageSpan {
+export type PageSpan = {
   start: number;
   end: number;
   exclude?: number[];
-}
+};
+
+export type Listtype = "History" | "Bookmarks";

src/interfaces/InterfaceWorkUsersData.ts → src/types/TypesWorkUsersData.ts

@@ -1,14 +1,14 @@
-import { Tag } from "./InterfaceWorkInfo";
+import { Tag } from "./TypesWorkInfo";
 
-export interface WorkHistory {
+export type WorkHistory = {
   lastVisit: Date;
   timesVisited: number;
   ratio: number;
   wordsRead: number;
-}
+};
 
-export interface WorkBookmark {
+export type WorkBookmark = {
   dateBookmarked: Date;
   bookmarkerTags?: Tag[];
   bookmarkNotes?: string;
-}
+};

src/utils/getWorkContent.ts

@@ -2,9 +2,9 @@ import * as cheerio from "cheerio";
 import axios from "axios";
 import fs from "fs";
 
-import WorkContent from "../interfaces/InterfaceWorkContent";
 import { getAxiosSuccess, getParsableInfodata } from "./helpers";
 import { axiosDefaults } from "../config/axiosDefaults";
+import { WorkContent } from "../types/TypesWorkContent";
 
 /**
  * This function takes a work id or cheerio object, parses the data and returns an object containing the forword, afterword and each chapter

src/utils/getWorkInfo.ts

@@ -13,7 +13,7 @@ import {
   Relationship,
   SeriesInfo,
   Tag,
-} from "../interfaces/InterfaceWorkInfo";
+} from "../types/TypesWorkInfo";
 import User from "../classes/ClassUser";
 
 /**

src/utils/getWorkList.ts

@@ -1,9 +1,9 @@
 import { AxiosInstance, AxiosResponse } from "axios";
 import * as cheerio from "cheerio";
 
-import { Login } from "../interfaces/InterfaceUserData";
-import { Listtype } from "../enums/EnumWorkLists";
-import { PageSpan } from "../interfaces/InterfaceWorkList";
+import { Login } from "../types/TypesUserData";
+
+import { Listtype, PageSpan } from "../types/TypesWorkList";
 import {
   defineParseIntString,
   delay,
@@ -14,10 +14,7 @@ import {
 import { axiosDefaults } from "../config/axiosDefaults";
 import WorkList from "../classes/ClassWorkList";
 import Work from "../classes/ClassWork";
-import {
-  WorkBookmark,
-  WorkHistory,
-} from "../interfaces/InterfaceWorkUsersData";
+import { WorkBookmark, WorkHistory } from "../types/TypesWorkUsersData";
 import User from "../classes/ClassUser";
 import WorkUserData from "../classes/ClassWorkUserData";
 import WorkInfo, { WorkStats } from "../classes/ClassWorkInfo";
@@ -30,7 +27,7 @@ import {
   Relationship,
   SeriesInfo,
   Tag,
-} from "../interfaces/InterfaceWorkInfo";
+} from "../types/TypesWorkInfo";
 
 import LoginSession from "../classes/ClassLoginSession";
 
@@ -56,10 +53,10 @@ export default async function getWorkList(
 
   let firstUrl = "";
   switch (listtype) {
-    case Listtype.History:
+    case "History":
       firstUrl = `/users/${encodeURIComponent(logindata.username)}/readings`;
       break;
-    case Listtype.Bookmarks:
+    case "Bookmarks":
       firstUrl = `/users/${encodeURIComponent(logindata.username)}/bookmarks`;
       break;
     default:
@@ -190,11 +187,11 @@ function parseListWork(
   let userHistoryData: WorkHistory | undefined;
   let userBookmarkData: WorkBookmark | undefined;
   switch (listtype) {
-    case Listtype.History:
+    case "History":
       userHistoryData = parseHistoryWork($);
       break;
 
-    case Listtype.Bookmarks:
+    case "Bookmarks":
       userBookmarkData = parseBookmarkWork($);
       break;