Merge branch 'master' into zach-starter

1 files changed, 21 insertions, 21 deletions

diff --git a/src/client/util/ScriptingGlobals.ts b/src/client/util/ScriptingGlobals.ts
index ac524394a..444e8fc0a 100644
--- a/src/client/util/ScriptingGlobals.ts
+++ b/src/client/util/ScriptingGlobals.ts
@@ -2,23 +2,22 @@ import ts from 'typescript';
 
 export { ts };
 
-const _scriptingGlobals: { [name: string]: any } = {};
-const _scriptingDescriptions: { [name: string]: any } = {};
-const _scriptingParams: { [name: string]: any } = {};
-// eslint-disable-next-line import/no-mutable-exports
-export let scriptingGlobals: { [name: string]: any } = _scriptingGlobals;
+const _scriptingGlobals: { [name: string]: unknown } = {};
+const _scriptingDescriptions: { [name: string]: string } = {};
+const _scriptingParams: { [name: string]: string } = {};
+export let scriptingGlobals: { [name: string]: unknown } = _scriptingGlobals;
+
 export namespace ScriptingGlobals {
     export function getGlobals()      { return Object.keys(_scriptingGlobals); } // prettier-ignore
     export function getGlobalObj()    { return _scriptingGlobals; } // prettier-ignore
     export function getDescriptions() { return _scriptingDescriptions; } // prettier-ignore
     export function getParameters()   { return _scriptingParams; } // prettier-ignore
 
-    export function add(global: { name: string }): void;
-    export function add(name: string, global: any): void;
-    export function add(global: { name: string }, decription?: string, params?: string): void;
-    export function add(first: any, second?: any, third?: string) {
-        let n: any;
-        let obj: any;
+    export function add(name: string, namespace_func_or_object: unknown): void;
+    export function add(func: { name: string }, description?: string, params?: string): void;
+    export function add(first: string | { name: string }, second?: unknown, params?: string): void {
+        let n: string = '';
+        let obj: unknown;
 
         if (second !== undefined) {
             if (typeof first === 'string') {
@@ -27,32 +26,32 @@ export namespace ScriptingGlobals {
             } else {
                 obj = first;
                 n = first.name;
-                _scriptingDescriptions[n] = second;
-                if (third !== undefined) {
-                    _scriptingParams[n] = third;
+                _scriptingDescriptions[n] = second as string;
+                if (params !== undefined) {
+                    _scriptingParams[n] = params;
                 }
             }
-        } else if (first && typeof first.name === 'string') {
+        } else if (first instanceof Object && 'name' in first && typeof first.name === 'string') {
             n = first.name;
             obj = first;
         } else {
             throw new Error('Must either register an object with a name, or give a name and an object');
         }
         if (n === undefined || n === 'undefined') {
-            return false;
+            return; // false;
         }
         // eslint-disable-next-line no-prototype-builtins
         if (_scriptingGlobals.hasOwnProperty(n)) {
             throw new Error(`Global with name ${n} is already registered, choose another name`);
         }
         _scriptingGlobals[n] = obj;
-        return true;
+        return; // true;
     }
-    export function makeMutableGlobalsCopy(globals?: { [name: string]: any }) {
+    export function makeMutableGlobalsCopy(globals?: { [name: string]: unknown }) {
         return { ..._scriptingGlobals, ...(globals || {}) };
     }
 
-    export function setScriptingGlobals(globals: { [key: string]: any }) {
+    export function setScriptingGlobals(globals: { [key: string]: unknown }) {
         scriptingGlobals = globals;
     }
 
@@ -75,11 +74,12 @@ export namespace ScriptingGlobals {
     }
 
     // const types = Object.keys(ts.SyntaxKind).map(kind => ts.SyntaxKind[kind]);
-    export function printNodeType(node: any, indentation = '') {
+    export function printNodeType(node: ts.Node, indentation = '') {
         console.log(indentation + ts.SyntaxKind[node.kind]);
     }
 }
 
-export function scriptingGlobal(constructor: { new (...args: any[]): any }) {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function scriptingGlobal(constructor: { new (...args: any[]): unknown }) {
     ScriptingGlobals.add(constructor);
 }