1 files changed, 42 insertions, 9 deletions
diff --git a/src/client/util/Scripting.ts b/src/client/util/Scripting.ts
index ab577315c..f618a9e6e 100644
--- a/src/client/util/Scripting.ts
+++ b/src/client/util/Scripting.ts
@@ -10,6 +10,8 @@ export { ts };
 // @ts-ignore
 import * as typescriptlib from '!!raw-loader!./type_decls.d';
 import { Doc, Field } from '../../fields/Doc';
+import { Cast } from "../../fields/Types";
+import { listSpec } from "../../fields/Schema";
 
 export interface ScriptSucccess {
     success: true;
@@ -49,19 +51,37 @@ export function isCompileError(toBeDetermined: CompileResult): toBeDetermined is
 export namespace Scripting {
     export function addGlobal(global: { name: string }): void;
     export function addGlobal(name: string, global: any): void;
-    export function addGlobal(nameOrGlobal: any, global?: any) {
-        let n: string;
+
+    export function addGlobal(global: { name: string }, decription?: string, params?: string): void;
+
+    export function addGlobal(first: any, second?: any, third?: string) {
+        let n: any;
         let obj: any;
-        if (global !== undefined && typeof nameOrGlobal === "string") {
-            n = nameOrGlobal;
-            obj = global;
-        } else if (nameOrGlobal && typeof nameOrGlobal.name === "string") {
-            n = nameOrGlobal.name;
-            obj = nameOrGlobal;
+
+        console.log("adding global");
+
+        if (second !== undefined) {
+            if (typeof first === "string") {
+                console.log("name first");
+                n = first;
+                obj = second;
+            } else {
+                obj = [first];
+                obj.push(second);
+                if (third !== undefined) {
+                    obj.push(third);
+                }
+                n = first.name;
+            }
+        } else if (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 (_scriptingGlobals.hasOwnProperty(n)) {
+        if (n === undefined || n === "undefined") {
+            return false;
+        } else if (_scriptingGlobals.hasOwnProperty(n)) {
             throw new Error(`Global with name ${n} is already registered, choose another name`);
         }
         _scriptingGlobals[n] = obj;
@@ -75,6 +95,14 @@ export namespace Scripting {
         scriptingGlobals = globals;
     }
 
+    export function removeGlobal(name: string) {
+        if (getGlobals().includes(name)) {
+            delete _scriptingGlobals.container[name];
+            return true;
+        }
+        return false;
+    }
+
     export function resetScriptingGlobals() {
         scriptingGlobals = _scriptingGlobals;
     }
@@ -87,6 +115,10 @@ export namespace Scripting {
     export function getGlobals() {
         return Object.keys(scriptingGlobals);
     }
+
+    export function getGlobalObj() {
+        return _scriptingGlobals;
+    }
 }
 
 export function scriptingGlobal(constructor: { new(...args: any[]): any }) {
@@ -133,6 +165,7 @@ function Run(script: string | undefined, customParams: string[], diagnostics: an
             }
             return { success: true, result };
         } catch (error) {
+
             if (batch) {
                 batch.end();
             }