From d3cec6e15b3dafd9f8ff1a5afed7c6cce79a5b08 Mon Sep 17 00:00:00 2001
From: Fred Boniface <fred@fjla.uk>
Date: Mon, 24 Jul 2023 11:44:38 +0100
Subject: [PATCH] Type scriptify 'Welcome' store

---
 src/lib/islands/input-island-form.svelte  |  2 +-
 src/lib/islands/island.svelte             |  2 +-
 src/lib/islands/overlay-island.svelte     |  2 +-
 src/lib/islands/result-island.svelte      | 11 +++++++++--
 src/lib/stores/version.js                 |  3 ---
 src/lib/stores/version.ts                 |  3 +++
 src/lib/stores/{welcome.js => welcome.ts} |  8 ++++----
 7 files changed, 19 insertions(+), 12 deletions(-)
 delete mode 100644 src/lib/stores/version.js
 create mode 100644 src/lib/stores/version.ts
 rename src/lib/stores/{welcome.js => welcome.ts} (63%)

diff --git a/src/lib/islands/input-island-form.svelte b/src/lib/islands/input-island-form.svelte
index 7505a6d..433c6de 100644
--- a/src/lib/islands/input-island-form.svelte
+++ b/src/lib/islands/input-island-form.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import Island from '$lib/islands/island.svelte';
   export let variables = {
     title: 'Uninitialised',
diff --git a/src/lib/islands/island.svelte b/src/lib/islands/island.svelte
index d036ab2..a41a4d0 100644
--- a/src/lib/islands/island.svelte
+++ b/src/lib/islands/island.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { fade } from 'svelte/transition';
 
   export let variables = { title: '' };
diff --git a/src/lib/islands/overlay-island.svelte b/src/lib/islands/overlay-island.svelte
index c03b5d3..c75b6d8 100644
--- a/src/lib/islands/overlay-island.svelte
+++ b/src/lib/islands/overlay-island.svelte
@@ -1,4 +1,4 @@
-<script>
+<script lang="ts">
   import { fade } from 'svelte/transition';
 
   export let variables = { title: '' };
diff --git a/src/lib/islands/result-island.svelte b/src/lib/islands/result-island.svelte
index 59208f6..c2cbf0c 100644
--- a/src/lib/islands/result-island.svelte
+++ b/src/lib/islands/result-island.svelte
@@ -1,6 +1,13 @@
-<script>
+<script lang="ts">
   import Island from '$lib/islands/island.svelte';
-  export let resultObject = {
+  
+  interface resultObj {
+    results: boolean,
+    title: string,
+    resultLines: string[]
+  }
+  
+  export let resultObject: resultObj = {
     results: true,
     title: '',
     resultLines: []
diff --git a/src/lib/stores/version.js b/src/lib/stores/version.js
deleted file mode 100644
index 45e2a2e..0000000
--- a/src/lib/stores/version.js
+++ /dev/null
@@ -1,3 +0,0 @@
-export const version = '2023.7.1';
-export const versionTag = 'beta.6';
-export const showWelcome = true;
diff --git a/src/lib/stores/version.ts b/src/lib/stores/version.ts
new file mode 100644
index 0000000..f96f532
--- /dev/null
+++ b/src/lib/stores/version.ts
@@ -0,0 +1,3 @@
+export const version: string = '2023.7.1';
+export const versionTag: string = 'beta.6';
+export const showWelcome: boolean = true;
diff --git a/src/lib/stores/welcome.js b/src/lib/stores/welcome.ts
similarity index 63%
rename from src/lib/stores/welcome.js
rename to src/lib/stores/welcome.ts
index cb09281..415a4e5 100644
--- a/src/lib/stores/welcome.js
+++ b/src/lib/stores/welcome.ts
@@ -1,10 +1,10 @@
-import { writable } from 'svelte/store';
+import { writable, type Writable } from 'svelte/store';
 import { browser } from '$app/environment';
 
 export const welcome = writable(fromLocalStorage('welcome', '0'));
 toLocalStorage(welcome, 'welcome');
 
-function fromLocalStorage(storageKey, fallback) {
+function fromLocalStorage(storageKey: string, fallback: string) {
   if (browser) {
     const storedValue = localStorage.getItem(storageKey);
     if (storedValue !== 'undefined') {
@@ -14,9 +14,9 @@ function fromLocalStorage(storageKey, fallback) {
   return fallback;
 }
 
-function toLocalStorage(store, storageKey) {
+function toLocalStorage(store: Writable<any>, storageKey: string) {
   if (browser) {
-    store.subscribe((value) => {
+    store.subscribe((value: string) => {
       localStorage.setItem(storageKey, value);
     });
   }