From f26d75b56f00552638775664ee57a41fad518856 Mon Sep 17 00:00:00 2001
From: Johannes Loher <johannes.loher@fg4f.de>
Date: Thu, 1 Jul 2021 02:56:09 +0200
Subject: [PATCH] Do a bit of cleanup

---
 src/module/common/common-data.ts  |  2 --
 src/module/global.d.ts            |  8 ++------
 src/module/hooks/init.ts          | 17 +++++++++++++++++
 src/module/item/item-sheet.ts     |  4 +---
 src/module/logger.ts              | 29 +++++++++++------------------
 src/module/macros/helpers.ts      |  4 ++--
 src/module/rolls/check-factory.ts |  4 +---
 7 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/module/common/common-data.ts b/src/module/common/common-data.ts
index fee14dd..c2c1a52 100644
--- a/src/module/common/common-data.ts
+++ b/src/module/common/common-data.ts
@@ -15,8 +15,6 @@ export interface HasTotal<T> {
     total: T;
 }
 
-export interface ModifiableDataTotal<T> extends ModifiableData<T>, HasTotal<T> {}
-
 export interface ModifiableDataBaseTotal<T> extends ModifiableDataBase<T>, HasTotal<T> {}
 
 export interface ResourceData<T> extends ModifiableData<T> {
diff --git a/src/module/global.d.ts b/src/module/global.d.ts
index 2b405c5..91fc6c1 100644
--- a/src/module/global.d.ts
+++ b/src/module/global.d.ts
@@ -2,8 +2,6 @@
 //
 // SPDX-License-Identifier: MIT
 
-import { DS4 } from "./config";
-
 declare global {
     namespace ClientSettings {
         interface Values {
@@ -18,8 +16,6 @@ declare global {
             x: (this: PoolTerm, modifier: string) => void;
         }
     }
-
-    interface CONFIG {
-        DS4: typeof DS4;
-    }
 }
+
+export {};
diff --git a/src/module/hooks/init.ts b/src/module/hooks/init.ts
index 187b8f2..4fbba4a 100644
--- a/src/module/hooks/init.ts
+++ b/src/module/hooks/init.ts
@@ -63,3 +63,20 @@ async function init() {
     await registerHandlebarsPartials();
     registerHandlebarsHelpers();
 }
+
+declare global {
+    interface Game {
+        ds4: {
+            DS4Actor: typeof DS4Actor;
+            DS4Item: typeof DS4Item;
+            DS4: typeof DS4;
+            createCheckRoll: typeof createCheckRoll;
+            migration: typeof migration;
+            macros: typeof macros;
+        };
+    }
+
+    interface CONFIG {
+        DS4: typeof DS4;
+    }
+}
diff --git a/src/module/item/item-sheet.ts b/src/module/item/item-sheet.ts
index 02269fb..e9dcba8 100644
--- a/src/module/item/item-sheet.ts
+++ b/src/module/item/item-sheet.ts
@@ -95,10 +95,8 @@ export class DS4ItemSheet extends ItemSheet<ItemSheet.Options, DS4ItemSheetData>
      * Create a new ActiveEffect for the item using default data.
      */
     protected async _createActiveEffect(): Promise<ActiveEffect | undefined> {
-        const label = `New Effect`;
-
         const createData = {
-            label: label,
+            label: "New Effect",
             changes: [],
             duration: {},
             transfer: true,
diff --git a/src/module/logger.ts b/src/module/logger.ts
index 4edd6b1..c5c9a56 100644
--- a/src/module/logger.ts
+++ b/src/module/logger.ts
@@ -8,24 +8,17 @@ const loggingSeparator = "|";
 type LogLevel = "debug" | "info" | "warning" | "error";
 type LoggingFunction = (...data: unknown[]) => void;
 
-class Logger {
-    readonly debug: LoggingFunction;
-    readonly info: LoggingFunction;
-    readonly warn: LoggingFunction;
-    readonly error: LoggingFunction;
+const getLoggingFunction = (type: LogLevel = "info"): LoggingFunction => {
+    const log = { debug: console.debug, info: console.info, warning: console.warn, error: console.error }[type];
+    return (...data: unknown[]) => log(loggingContext, loggingSeparator, ...data);
+};
 
-    constructor() {
-        this.debug = this.getLoggingFunction("debug");
-        this.info = this.getLoggingFunction("info");
-        this.warn = this.getLoggingFunction("warning");
-        this.error = this.getLoggingFunction("error");
-    }
+const logger = Object.freeze({
+    debug: getLoggingFunction("debug"),
+    info: getLoggingFunction("info"),
+    warn: getLoggingFunction("warning"),
+    error: getLoggingFunction("error"),
+    getLoggingFunction,
+});
 
-    getLoggingFunction(type: LogLevel = "info") {
-        const log = { debug: console.debug, info: console.info, warning: console.warn, error: console.error }[type];
-        return (...data: unknown[]) => log(loggingContext, loggingSeparator, ...data);
-    }
-}
-
-const logger = new Logger();
 export default logger;
diff --git a/src/module/macros/helpers.ts b/src/module/macros/helpers.ts
index 1c97868..f29b14a 100644
--- a/src/module/macros/helpers.ts
+++ b/src/module/macros/helpers.ts
@@ -18,11 +18,11 @@ export function getActiveActor(): DS4Actor | undefined {
 
     const speakerToken = speaker.token ? getCanvas().tokens.get(speaker.token) : undefined;
     if (speakerToken) {
-        return speakerToken.actor as DS4Actor;
+        return speakerToken.actor ?? undefined;
     }
 
     const speakerActor = speaker.actor ? game.actors?.get(speaker.actor) : undefined;
     if (speakerActor) {
-        return speakerActor as DS4Actor;
+        return speakerActor;
     }
 }
diff --git a/src/module/rolls/check-factory.ts b/src/module/rolls/check-factory.ts
index 9cbaec3..0e28ac5 100644
--- a/src/module/rolls/check-factory.ts
+++ b/src/module/rolls/check-factory.ts
@@ -49,12 +49,10 @@ class CheckFactory {
         // @ts-ignore
         const speaker = ChatMessage.getSpeaker();
 
-        const a = roll.toMessage(
+        return roll.toMessage(
             { speaker, flavor: this.options.flavor },
             { rollMode: this.options.rollMode, create: true },
         );
-
-        return a;
     }
 
     createCheckTargetNumberModifier(): string {