From cf6cd6f0b138ce010485f1d472159af6e8693013 Mon Sep 17 00:00:00 2001
From: moonlitgrace <moonlitgrace.gaia@gmail.com>
Date: Thu, 12 Dec 2024 16:19:40 +0530
Subject: [PATCH] refactor: export encapsulated function from store

export a function to create store object with methods and better logics
---
 frontend/src/lib/components/header.svelte     | 11 ++++---
 .../modals/auth/forms/profile_select.svelte   |  6 ++--
 .../lib/components/modals/auth/index.svelte   |  8 +++--
 frontend/src/lib/stores/auth.svelte.ts        | 25 ++++++++++------
 frontend/src/lib/stores/modals.svelte.ts      | 29 ++++++++++---------
 frontend/src/routes/+layout.svelte            |  6 ++--
 6 files changed, 51 insertions(+), 34 deletions(-)

diff --git a/frontend/src/lib/components/header.svelte b/frontend/src/lib/components/header.svelte
index 968ef4d..5ae8a59 100644
--- a/frontend/src/lib/components/header.svelte
+++ b/frontend/src/lib/components/header.svelte
@@ -4,8 +4,11 @@
   import QuibbleTextLogo from '$lib/components/icons/logos/quibble_text.svelte';
   import NotificationIcon from '$lib/components/icons/notification.svelte';
   import Avatar from '$lib/components/ui/avatar.svelte';
-  import { open_modal } from '$lib/stores/modals.svelte';
-  import { get_auth_state } from '$lib/stores/auth.svelte';
+  import { createModalsStore } from '$lib/stores/modals.svelte';
+  import { createAuthStore } from '$lib/stores/auth.svelte';
+
+  const modalsStore = createModalsStore(),
+    authStore = createAuthStore();
 </script>
 
 <header
@@ -40,7 +43,7 @@
     </label>
   </div>
   <div class="flex items-center gap-2">
-    {#if get_auth_state().is_authenticated}
+    {#if authStore.state.is_authenticated}
       <button aria-label="Create Quibble" class="btn btn-primary h-10 px-3">
         <coreicons-shape-plus variant="no-border" class="size-5"></coreicons-shape-plus>
         <span class="text-sm font-semibold">Create</span>
@@ -57,7 +60,7 @@
     {:else}
       <button
         class="btn btn-primary h-10 px-3 text-sm font-bold"
-        onclick={() => open_modal('auth')}
+        onclick={() => modalsStore.open('auth')}
       >
         Join In!
         <coreicons-shape-log-in class="size-4"></coreicons-shape-log-in>
diff --git a/frontend/src/lib/components/modals/auth/forms/profile_select.svelte b/frontend/src/lib/components/modals/auth/forms/profile_select.svelte
index 5f86287..e252419 100644
--- a/frontend/src/lib/components/modals/auth/forms/profile_select.svelte
+++ b/frontend/src/lib/components/modals/auth/forms/profile_select.svelte
@@ -6,7 +6,7 @@
   import { onMount } from 'svelte';
   import { enhance } from '$app/forms';
   import type { SubmitFunction } from '@sveltejs/kit';
-  import { close_modal } from '$lib/stores/modals.svelte';
+  import { createModalsStore } from '$lib/stores/modals.svelte';
   import { invalidateAll } from '$app/navigation';
   // @ts-expect-error: too lazy to copy paste it
   import daisyuiColorNames from 'daisyui/src/theming/colorNames';
@@ -22,6 +22,8 @@
 
   let profiles = $state<Profile[]>([]);
 
+  const modalsStore = createModalsStore();
+
   const handle_submit: SubmitFunction = async () => {
     pending = true;
     status_text = 'Setting up profile...';
@@ -29,7 +31,7 @@
     return async () => {
       // re-run load functions and close this modal
       await invalidateAll();
-      close_modal('auth');
+      modalsStore.close('auth');
 
       pending = false;
       status_text = null;
diff --git a/frontend/src/lib/components/modals/auth/index.svelte b/frontend/src/lib/components/modals/auth/index.svelte
index 78951d7..303fedf 100644
--- a/frontend/src/lib/components/modals/auth/index.svelte
+++ b/frontend/src/lib/components/modals/auth/index.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { close_modal, get_modals_state } from '$lib/stores/modals.svelte';
+  import { createModalsStore } from '$lib/stores/modals.svelte';
   import type { FormsState, FormSubmitData, Forms } from './types';
   import forms from './forms';
 
@@ -23,8 +23,10 @@
 
   let dialog_element: HTMLDialogElement | undefined = undefined;
 
+  const modalsStore = createModalsStore();
+
   $effect(() => {
-    if (get_modals_state().get('auth')) {
+    if (modalsStore.state.get('auth')) {
       dialog_element?.showModal();
     } else {
       dialog_element?.close();
@@ -35,7 +37,7 @@
 <dialog
   class="modal modal-bottom sm:modal-middle"
   bind:this={dialog_element}
-  onclose={() => close_modal('auth')}
+  onclose={() => modalsStore.close('auth')}
 >
   <div class="modal-box !w-[25rem]">
     {#await current_form then Form}
diff --git a/frontend/src/lib/stores/auth.svelte.ts b/frontend/src/lib/stores/auth.svelte.ts
index b233566..2ccbbfd 100644
--- a/frontend/src/lib/stores/auth.svelte.ts
+++ b/frontend/src/lib/stores/auth.svelte.ts
@@ -3,19 +3,26 @@ import type { Nullable } from '$lib/types/shared';
 
 type Profile = components['schemas']['Profile'];
 
-const auth_state = $state<{
+type AuthState = {
   is_authenticated: boolean;
   profile: Nullable<Profile>;
-}>({
+};
+
+let auth_state = $state<AuthState>({
   is_authenticated: false,
   profile: null
 });
 
-export function get_auth_state() {
-  return auth_state;
-}
-
-export function set_auth_state(new_state: Partial<typeof auth_state>) {
-  // auth_state = { ...auth_state, ...new_state }
-  Object.assign(auth_state, new_state);
+export function createAuthStore() {
+  return {
+    get state() {
+      return auth_state;
+    },
+    update(new_state: Partial<AuthState>) {
+      // spreading doesnt work because it creates a new reference
+      // which leads to infinite loop of effects
+      // auth_state = { ...auth_state, ...new_state }
+      Object.assign(auth_state, new_state);
+    }
+  };
 }
diff --git a/frontend/src/lib/stores/modals.svelte.ts b/frontend/src/lib/stores/modals.svelte.ts
index 31b2cea..10af4e1 100644
--- a/frontend/src/lib/stores/modals.svelte.ts
+++ b/frontend/src/lib/stores/modals.svelte.ts
@@ -7,18 +7,19 @@ const modals_state = $state(
   new SvelteMap<IModals, boolean>(modals.map((item) => [item, false]))
 );
 
-export function get_modals_state() {
-  return modals_state;
-}
-
-export function open_modal(modal: IModals) {
-  // close all modals first
-  modals_state.keys().forEach((key) => {
-    modals_state.set(key, false);
-  });
-  modals_state.set(modal, true);
-}
-
-export function close_modal(modal: IModals) {
-  modals_state.set(modal, false);
+export function createModalsStore() {
+  return {
+    get state() {
+      return modals_state;
+    },
+    open(modal: IModals) {
+      modals_state.keys().forEach((key) => {
+        modals_state.set(key, false);
+      });
+      modals_state.set(modal, true);
+    },
+    close(modal: IModals) {
+      modals_state.set(modal, false);
+    }
+  };
 }
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 313f2f7..962c7a8 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -5,15 +5,17 @@
   import Header from '$lib/components/header.svelte';
   import Sidebar from '$lib/components/sidebar.svelte';
   import Modals from '$lib/components/modals/index.svelte';
-  import { set_auth_state } from '$lib/stores/auth.svelte';
+  import { createAuthStore } from '$lib/stores/auth.svelte';
   import type { components } from '$lib/clients/v1';
 
   type Profile = components['schemas']['Profile'];
 
   let { children, data }: { children: Snippet; data: { profile: Profile } } = $props();
 
+  const authStore = createAuthStore();
+
   $effect.pre(() => {
-    set_auth_state({
+    authStore.update({
       profile: data.profile,
       is_authenticated: !!data.profile
     });