From 29ee8f1763c12b09dde6d627bcc3c2957d54b66d Mon Sep 17 00:00:00 2001
From: Ollie Taylor <13766232+OllieJT@users.noreply.github.com>
Date: Fri, 24 Feb 2023 13:15:34 +0000
Subject: [PATCH] restructure $lib

---
 .prettierignore                                            | 3 ++-
 .../components/{audio/audio.svelte => audio-loader.svelte} | 7 +++----
 src/lib/components/{audio => }/audio-progress.svelte       | 0
 src/lib/components/audio/index.ts                          | 2 --
 src/lib/{components/audio/store.ts => context/audio.ts}    | 4 ++--
 src/lib/index.ts                                           | 4 ++--
 src/lib/{helper/check.ts => types/type-guards.ts}          | 0
 src/lib/{components/audio => types}/types.ts               | 0
 src/lib/{helper => utility}/seconds-to-timestamp.ts        | 0
 src/routes/+layout.svelte                                  | 4 ++--
 src/routes/+page.svelte                                    | 2 +-
 src/routes/another-page/+page.svelte                       | 7 +------
 12 files changed, 13 insertions(+), 20 deletions(-)
 rename src/lib/components/{audio/audio.svelte => audio-loader.svelte} (91%)
 rename src/lib/components/{audio => }/audio-progress.svelte (100%)
 delete mode 100644 src/lib/components/audio/index.ts
 rename src/lib/{components/audio/store.ts => context/audio.ts} (95%)
 rename src/lib/{helper/check.ts => types/type-guards.ts} (100%)
 rename src/lib/{components/audio => types}/types.ts (100%)
 rename src/lib/{helper => utility}/seconds-to-timestamp.ts (100%)

diff --git a/.prettierignore b/.prettierignore
index 3897265..9813cfa 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -3,6 +3,7 @@ node_modules
 /build
 /.svelte-kit
 /package
+/dist
 .env
 .env.*
 !.env.example
@@ -10,4 +11,4 @@ node_modules
 # Ignore files for PNPM, NPM and YARN
 pnpm-lock.yaml
 package-lock.json
-yarn.lock
+yarn.lock
\ No newline at end of file
diff --git a/src/lib/components/audio/audio.svelte b/src/lib/components/audio-loader.svelte
similarity index 91%
rename from src/lib/components/audio/audio.svelte
rename to src/lib/components/audio-loader.svelte
index 663061e..9736ee9 100644
--- a/src/lib/components/audio/audio.svelte
+++ b/src/lib/components/audio-loader.svelte
@@ -4,9 +4,9 @@
 		__internal_audio_element,
 		__internal_audio_metadata,
 		__internal_audio_src,
-	} from '$lib/components/audio/store';
-	import type { PlayerElement } from '$lib/components/audio/types';
-	import { isBoolean, isNumber } from '$lib/helper/check';
+	} from '$lib/context/audio';
+	import { isBoolean, isNumber } from '$lib/types/type-guards';
+	import type { PlayerElement } from '$lib/types/types';
 
 	let element: PlayerElement;
 	let currentTime = 0;
@@ -72,5 +72,4 @@
 			__internal_audio_metadata.update((m) => ({ ...m, duration }));
 		}}
 	/>
-	<!-- <AudioA11yProgress {currentTime} {paused} {duration} /> -->
 {/key}
diff --git a/src/lib/components/audio/audio-progress.svelte b/src/lib/components/audio-progress.svelte
similarity index 100%
rename from src/lib/components/audio/audio-progress.svelte
rename to src/lib/components/audio-progress.svelte
diff --git a/src/lib/components/audio/index.ts b/src/lib/components/audio/index.ts
deleted file mode 100644
index d4a0c36..0000000
--- a/src/lib/components/audio/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export { default as AudioManager } from './audio.svelte';
-export { audio } from './store';
diff --git a/src/lib/components/audio/store.ts b/src/lib/context/audio.ts
similarity index 95%
rename from src/lib/components/audio/store.ts
rename to src/lib/context/audio.ts
index 70f6c6d..a3f691f 100644
--- a/src/lib/components/audio/store.ts
+++ b/src/lib/context/audio.ts
@@ -1,6 +1,6 @@
 import { dev } from '$app/environment';
-import type { PlayerElement, PlayerMetadata } from '$lib/components/audio/types';
-import { secondsToTimestamp } from '$lib/helper/seconds-to-timestamp';
+import type { PlayerElement, PlayerMetadata } from '$lib/types/types';
+import { secondsToTimestamp } from '$lib/utility/seconds-to-timestamp';
 import clamp from 'just-clamp';
 import { derived, writable } from 'svelte/store';
 
diff --git a/src/lib/index.ts b/src/lib/index.ts
index 5457dac..a927e69 100644
--- a/src/lib/index.ts
+++ b/src/lib/index.ts
@@ -1,2 +1,2 @@
-// Reexport your entry components here
-export * from '$lib/components/audio';
+export { default as AudioLoader } from '$lib/components/audio-loader.svelte';
+export { audio } from '$lib/context/audio';
diff --git a/src/lib/helper/check.ts b/src/lib/types/type-guards.ts
similarity index 100%
rename from src/lib/helper/check.ts
rename to src/lib/types/type-guards.ts
diff --git a/src/lib/components/audio/types.ts b/src/lib/types/types.ts
similarity index 100%
rename from src/lib/components/audio/types.ts
rename to src/lib/types/types.ts
diff --git a/src/lib/helper/seconds-to-timestamp.ts b/src/lib/utility/seconds-to-timestamp.ts
similarity index 100%
rename from src/lib/helper/seconds-to-timestamp.ts
rename to src/lib/utility/seconds-to-timestamp.ts
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 83ffe02..eeacb62 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,7 +1,7 @@
 <script lang="ts">
-	import { AudioManager } from '$lib/components/audio';
+	import { AudioLoader } from '$lib';
 </script>
 
-<AudioManager />
+<AudioLoader />
 
 <slot />
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 12786bf..734dd87 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { audio } from '$lib/components/audio';
+	import { audio } from '$lib';
 
 	const sources = {
 		syntax: '/example-syntax.mp3',
diff --git a/src/routes/another-page/+page.svelte b/src/routes/another-page/+page.svelte
index f0d9805..1cad0d5 100644
--- a/src/routes/another-page/+page.svelte
+++ b/src/routes/another-page/+page.svelte
@@ -1,10 +1,5 @@
 <script lang="ts">
-	import { audio } from '$lib/components/audio';
-
-	const sources = {
-		syntax: '/example-syntax.mp3',
-		knomii: '/example-knomii.mp3',
-	} as const;
+	import { audio } from '$lib';
 
 	let current_time = 0;
 	$: current_time = $audio.current_time;