From 9d714795ba843a72e5b89eff1d660ef0df302373 Mon Sep 17 00:00:00 2001
From: "Felix W. Dekker" <felix@fwdekker.com>
Date: Sun, 27 Oct 2019 01:22:23 +0200
Subject: [PATCH] Move initialising code to `main.ts`

---
 src/index.html     |  2 +-
 src/js/main.ts     | 21 +++++++++++++++++++++
 src/js/terminal.ts | 21 +--------------------
 3 files changed, 23 insertions(+), 21 deletions(-)
 create mode 100644 src/js/main.ts

diff --git a/src/index.html b/src/index.html
index 849ffbe..118c056 100644
--- a/src/index.html
+++ b/src/index.html
@@ -27,6 +27,6 @@
     </div>
 
 
-    <script type="module" src="js/terminal.js"></script>
+    <script type="module" src="js/main.js"></script>
 </body>
 </html>
diff --git a/src/js/main.ts b/src/js/main.ts
new file mode 100644
index 0000000..c97880a
--- /dev/null
+++ b/src/js/main.ts
@@ -0,0 +1,21 @@
+import {addOnLoad, q} from "./shared.js";
+import {Terminal} from "./terminal.js";
+
+
+// TODO Ignore ts-ignore in whole block
+addOnLoad(() => {
+    // @ts-ignore: Force definition
+    window.terminal = new Terminal(
+        q("#terminal"),
+        q("#terminalCurrentFocusInput"),
+        q("#terminalOutput"),
+        q("#terminalCurrentPrefix")
+    );
+    // @ts-ignore: Force definition
+    window.relToAbs = (filename: string) => window.terminal.fileSystem.pwd + filename;
+    // @ts-ignore: Force definition
+    window.run = (command: string) => window.terminal.processInput(command);
+
+    // @ts-ignore
+    window.terminal.processInput("ls");
+});
diff --git a/src/js/terminal.ts b/src/js/terminal.ts
index c20025b..e1d731d 100644
--- a/src/js/terminal.ts
+++ b/src/js/terminal.ts
@@ -1,4 +1,4 @@
-import {addOnLoad, asciiHeaderHtml, moveCaretToEndOf, q} from "./shared.js";
+import {asciiHeaderHtml, moveCaretToEndOf} from "./shared.js";
 import {FileSystem} from "./fs.js";
 import {Commands} from "./commands.js";
 import {System} from "./system.js";
@@ -242,22 +242,3 @@ class InputHistory {
         return this.getEntry(this.index);
     }
 }
-
-
-export let terminal: Terminal;
-
-addOnLoad(() => {
-    terminal = new Terminal(
-        q("#terminal"),
-        q("#terminalCurrentFocusInput"),
-        q("#terminalOutput"),
-        q("#terminalCurrentPrefix")
-    );
-
-    // @ts-ignore: Force definition
-    window.relToAbs = (filename: string) => terminal.fileSystem.pwd + filename;
-    // @ts-ignore: Force definition
-    window.run = (command: string) => terminal.processInput(command);
-
-    terminal.processInput("ls");
-});