From 63690dcd2a18594274e3a5d7036d9a23935c668e Mon Sep 17 00:00:00 2001
From: April Hall <ari@arithefirst.com>
Date: Thu, 6 Feb 2025 23:40:51 -0500
Subject: [PATCH] style: Better organization in `/src/lib/`

---
 src/lib/components/message.svelte                 | 2 +-
 src/lib/{ => functions}/clientWebsocket.svelte.ts | 2 +-
 src/lib/{ => functions}/websocketConfig.ts        | 2 +-
 src/lib/hooks.server.ts                           | 2 +-
 src/lib/{ => types}/index.ts                      | 2 --
 src/routes/channel/[channel]/+page.server.ts      | 2 +-
 src/routes/channel/[channel]/+page.svelte         | 4 ++--
 vite.config.ts                                    | 2 +-
 8 files changed, 8 insertions(+), 10 deletions(-)
 rename src/lib/{ => functions}/clientWebsocket.svelte.ts (94%)
 rename src/lib/{ => functions}/websocketConfig.ts (97%)
 rename src/lib/{ => types}/index.ts (72%)

diff --git a/src/lib/components/message.svelte b/src/lib/components/message.svelte
index bea4824..18a20f1 100644
--- a/src/lib/components/message.svelte
+++ b/src/lib/components/message.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { type TypeMessage } from '$lib';
+  import { type TypeMessage } from '$lib/types';
   const { message, imageSrc, user }: TypeMessage = $props();
 </script>
 
diff --git a/src/lib/clientWebsocket.svelte.ts b/src/lib/functions/clientWebsocket.svelte.ts
similarity index 94%
rename from src/lib/clientWebsocket.svelte.ts
rename to src/lib/functions/clientWebsocket.svelte.ts
index 805ec9b..5c08ce6 100644
--- a/src/lib/clientWebsocket.svelte.ts
+++ b/src/lib/functions/clientWebsocket.svelte.ts
@@ -1,4 +1,4 @@
-import type { TypeMessage, TypeFullMessage } from '$lib';
+import type { TypeMessage, TypeFullMessage } from '$lib/types';
 import type { Socket } from 'socket.io-client';
 
 class Websocket {
diff --git a/src/lib/websocketConfig.ts b/src/lib/functions/websocketConfig.ts
similarity index 97%
rename from src/lib/websocketConfig.ts
rename to src/lib/functions/websocketConfig.ts
index 4e932a9..ab2f4bf 100644
--- a/src/lib/websocketConfig.ts
+++ b/src/lib/functions/websocketConfig.ts
@@ -2,7 +2,7 @@ import { Server as SocketIOServer } from 'socket.io';
 import type { HttpServer } from 'vite';
 // Don't try to replace with $lib alias. Since this
 // file gets loaded as a vite plugin, it will crash
-import { db } from './server/db/';
+import { db } from '$lib/server/db';
 import { v4 as uuidv4 } from 'uuid';
 
 let io: SocketIOServer | undefined;
diff --git a/src/lib/hooks.server.ts b/src/lib/hooks.server.ts
index 9a29ede..f4207cf 100644
--- a/src/lib/hooks.server.ts
+++ b/src/lib/hooks.server.ts
@@ -1,7 +1,7 @@
 import { building } from '$app/environment';
 import type { Handle } from '@sveltejs/kit';
 import { Server as SocketIOServer } from 'socket.io';
-import { startupSocketIOServer } from '$lib/websocketConfig';
+import { startupSocketIOServer } from '$lib/functions/websocketConfig';
 
 let io: SocketIOServer | undefined;
 export const handle = (async ({ event, resolve }) => {
diff --git a/src/lib/index.ts b/src/lib/types/index.ts
similarity index 72%
rename from src/lib/index.ts
rename to src/lib/types/index.ts
index 4aa3c77..e5ef4af 100644
--- a/src/lib/index.ts
+++ b/src/lib/types/index.ts
@@ -1,5 +1,3 @@
-// place files you want to import through the `$lib` alias in this folder.
-
 export interface TypeMessage {
   message: string;
   imageSrc: string;
diff --git a/src/routes/channel/[channel]/+page.server.ts b/src/routes/channel/[channel]/+page.server.ts
index 67bcbca..f3708c5 100644
--- a/src/routes/channel/[channel]/+page.server.ts
+++ b/src/routes/channel/[channel]/+page.server.ts
@@ -1,4 +1,4 @@
-import type { TypeMessage } from '$lib';
+import type { TypeMessage } from '$lib/types';
 import { error } from '@sveltejs/kit';
 import { db } from '$lib/server/db';
 
diff --git a/src/routes/channel/[channel]/+page.svelte b/src/routes/channel/[channel]/+page.svelte
index 05c7387..4cf129b 100644
--- a/src/routes/channel/[channel]/+page.svelte
+++ b/src/routes/channel/[channel]/+page.svelte
@@ -2,14 +2,14 @@
   import { io } from 'socket.io-client';
   import { onMount } from 'svelte';
   import { v4 as uuidv4 } from 'uuid';
-  import type { TypeMessage, TypeFullMessage } from '$lib';
+  import type { TypeMessage } from '$lib/types';
   import type { PageData } from './$types';
   import { Input } from '$lib/components/ui/input/index';
   import { Button } from '$lib/components/ui/button/index';
   import Send from 'lucide-svelte/icons/send';
   import Message from '$lib/components/message.svelte';
   import { page } from '$app/state';
-  import Websocket from '$lib/clientWebsocket.svelte';
+  import Websocket from '$lib/functions/clientWebsocket.svelte';
 
   const { data }: { data: PageData } = $props();
 
diff --git a/vite.config.ts b/vite.config.ts
index 869bb7f..5f91bb8 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -1,6 +1,6 @@
 import { sveltekit } from '@sveltejs/kit/vite';
 import { defineConfig } from 'vite';
-import { startupSocketIOServer } from './src/lib/websocketConfig';
+import { startupSocketIOServer } from './src/lib/functions/websocketConfig';
 
 export default defineConfig({
   plugins: [