More scripting/typescript stuff

1 files changed, 13 insertions, 9 deletions

diff --git a/src/util/Scripting.ts b/src/util/Scripting.ts
index ac7d1550a..eae138fcd 100644
--- a/src/util/Scripting.ts
+++ b/src/util/Scripting.ts
@@ -1,5 +1,8 @@
-import * as ts from "typescript"
+// import * as ts from "typescript"
 import { Opt, Field } from "../fields/Field";
+import { Document } from "../fields/Document";
+import { NumberField } from "../fields/NumberField";
+import { KeyStore } from "../fields/Key";
 
 export interface ExecutableScript {
     (): any;
@@ -7,15 +10,20 @@ export interface ExecutableScript {
     compiled: boolean;
 }
 
-function ExecScript(script: string, diagnostics: Opt<ts.Diagnostic[]>): ExecutableScript {
-    const compiled = !(diagnostics && diagnostics.some(diag => diag.category == ts.DiagnosticCategory.Error));
+function ExecScript(script: string, diagnostics: Opt<any[]>): ExecutableScript {
+    const compiled = !(diagnostics && diagnostics.some(diag => diag.category == 1));
 
     let func: () => Opt<Field>;
     if (compiled) {
         func = function (): Opt<Field> {
             let window = undefined;
             let document = undefined;
-            let retVal = eval.call(undefined, script);
+            let scope = {
+                Document,
+                NumberField,
+                KeyStore
+            }
+            let retVal = function () { return eval(script); }.call(scope);
 
             return retVal;
         };
@@ -30,11 +38,7 @@ function ExecScript(script: string, diagnostics: Opt<ts.Diagnostic[]>): Executab
 }
 
 export function CompileScript(script: string): ExecutableScript {
-    let result = ts.transpileModule(script, {
-        compilerOptions: {
-            module: ts.ModuleKind.CommonJS
-        }
-    })
+    let result = (window as any).ts.transpileModule(script, {})
 
     return ExecScript(result.outputText, result.diagnostics);
 }
\ No newline at end of file