Merge pull request #1439 from marcuscastelo/fix/use-before-initialization

Refactor Copilot instructions and enhance dependency injection

Author: marcuscastelo

.github/copilot-instructions.md

@@ -8,8 +8,8 @@
       "type": "chrome",
       "request": "launch",
       "name": "Launch Chrome against localhost",
-      "url": "http://localhost:8080",
+      "url": "http://localhost:3000",
       "webRoot": "${workspaceFolder}"
     }
   ]
-}
+}

.vscode/launch.json

@@ -73,4 +73,4 @@
       "file": ".github/copilot-commit-message-instructions.md"
     }
   ],
-}
+}

.vscode/settings.json

@@ -0,0 +1,5 @@
+// Project-local debug tasks
+//
+// For more documentation on how to configure debug tasks,
+// see: https://zed.dev/docs/debugger
+[]

.zed/debug.json

@@ -3,6 +3,7 @@
 // For a full list of overridable settings, and general information on folder-specific settings,
 // see the documentation: https://zed.dev/docs/configuring-zed#settings-files
 {
+  "tab_size": 2,
   "languages": {
     "TypeScript": {
       "formatter": {
@@ -14,5 +15,16 @@
         "code_action": "source.fixAll.eslint"
       }
     }
+  },
+  "lsp": {
+    "vtsls": {
+      "settings": {
+        "typescript": {
+          "preferences": {
+            "importModuleSpecifier": "non-relative"
+          }
+        }
+      }
+    }
   }
 }

.zed/settings.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "https://biomejs.dev/schemas/2.3.8/schema.json",
+  "linter": {
+    "rules": {
+      "style": {
+        "useImportType": "off"
+      }
+    }
+  }
+}

biome.jsonc

@@ -32,6 +32,7 @@ const BottomNavigation = lazy(async () => ({
 
 function useAspectWidth() {
   const [width, setWidth] = createSignal(getWidth())
+
   function getWidth() {
     return Math.min((window.innerHeight * 14) / 16, window.innerWidth)
   }

src/app.tsx

@@ -0,0 +1,62 @@
+import { createEffect, createMemo, createRoot, createSignal } from 'solid-js'
+
+import { createAuthUseCases } from '~/modules/auth/application/usecases/authUseCases'
+import { createUserUseCases } from '~/modules/user/application/usecases/userUseCases'
+import { type UserRepository } from '~/modules/user/domain/userRepository'
+import { createGuestUserRepository } from '~/modules/user/infrastructure/guest/guestUserRepository'
+import { createSupabaseUserRepository } from '~/modules/user/infrastructure/supabase/supabaseUserRepository'
+import { GUEST_USER_ID } from '~/shared/guest/guestConstants'
+import { createGuestUseCases } from '~/shared/guest/guestUseCases'
+
+export type AppMode = 'guest' | 'normal'
+
+const container = createRoot(() => {
+  // TODO: Refactor global DI so that guestMode signal is not in the global DI container
+  const [mode, setMode] = createSignal<AppMode>('normal')
+
+  const userUseCases = createMemo(() =>
+    createUserUseCases({
+      repository: () => getUserRepository(mode()),
+    }),
+  )
+
+  const authUseCases = createMemo(() =>
+    createAuthUseCases({
+      userUseCases: () => userUseCases(),
+    }),
+  )
+
+  const guestUseCases = createMemo(() =>
+    createGuestUseCases({
+      authUseCases: () => authUseCases(),
+    }),
+  )
+
+  createEffect(() => {
+    const isGuest =
+      authUseCases().currentUserIdOrGuestId() === GUEST_USER_ID &&
+      guestUseCases().hasAcceptedGuestTerms()
+    setMode(isGuest ? 'guest' : 'normal')
+  })
+
+  function container() {
+    return {
+      userUseCases,
+      guestUseCases,
+      authUseCases,
+    }
+  }
+
+  return container()
+})
+
+// TODO: Refactor global DI so that we don't need to switch repositories like this
+function getUserRepository(mode: AppMode): UserRepository {
+  return mode === 'guest'
+    ? createGuestUserRepository()
+    : createSupabaseUserRepository()
+}
+
+export const useCases = {
+  ...container,
+}

src/di/useCases.ts

@@ -0,0 +1,40 @@
+import { createEffect, createRoot } from 'solid-js'
+
+import { createAuthService } from '~/modules/auth/application/services/authService'
+import { createAuthStore } from '~/modules/auth/application/store/authStore'
+import { createSupabaseAuthGateway } from '~/modules/auth/infrastructure/supabase/supabaseAuthGateway'
+import { showPromise } from '~/modules/toast/application/toastManager'
+import type { createUserUseCases } from '~/modules/user/application/usecases/userUseCases'
+
+export type AuthDI = {
+  userUseCases: () => ReturnType<typeof createUserUseCases>
+}
+
+export function createAuthDI(di: AuthDI) {
+  return createRoot(() => {
+    const userUseCases = di.userUseCases()
+    const authStore = createAuthStore()
+    const authGateway = createSupabaseAuthGateway()
+    const authService = createAuthService(authStore, authGateway, {
+      fetchUser: userUseCases.fetchUser,
+      insertUserSilently: userUseCases.insertUserSilently,
+      forceSwitchToUser_unsafe: userUseCases.forceSwitchToUser_unsafe,
+    })
+
+    createEffect(() => {
+      const state = authStore.authState()
+      showPromise(
+        userUseCases
+          .fetchUser(state.user?.id ?? '')
+          .then(userUseCases.forceSwitchToUser_unsafe),
+        {
+          loading: 'Carregando dados do usuário...',
+          error: 'Falha ao carregar dados do usuário',
+        },
+        { context: 'background' },
+      ).catch(() => {})
+    })
+
+    return { authStore, authService }
+  })
+}

src/modules/auth/application/authDI.ts

@@ -5,10 +5,12 @@ import {
   type SignOutOptions,
 } from '~/modules/auth/domain/auth'
 import { type AuthGateway } from '~/modules/auth/domain/authGateway'
-import { createSupabaseAuthGateway } from '~/modules/auth/infrastructure/supabase/supabaseAuthGateway'
 import { showError } from '~/modules/toast/application/toastManager'
-import { userUseCases } from '~/modules/user/application/usecases/userUseCases'
-import { createNewUser, type NewUser } from '~/modules/user/domain/user'
+import {
+  createNewUser,
+  type NewUser,
+  type User,
+} from '~/modules/user/domain/user'
 import { logging } from '~/shared/utils/logging'
 
 /**
@@ -41,7 +43,12 @@ function generateDefaultUserFromSession(session: AuthSession): NewUser {
 
 export function createAuthService(
   authStore: AuthStore,
-  authGateway: AuthGateway = createSupabaseAuthGateway(),
+  authGateway: AuthGateway,
+  useCases: {
+    fetchUser: (userId: User['uuid']) => Promise<User | null>
+    insertUserSilently: (newUser: NewUser) => Promise<User | null>
+    forceSwitchToUser_unsafe: (user: User) => void
+  },
 ) {
   async function signIn(options: SignInOptions): Promise<void> {
     try {
@@ -119,7 +126,7 @@ export function createAuthService(
         }))
 
         if (session?.user.id !== undefined) {
-          userUseCases
+          useCases
             .fetchUser(session.user.id)
             .then(async (user) => {
               logging.debug('User: ', { user })
@@ -128,10 +135,9 @@ export function createAuthService(
                   'User profile not found, creating default profile for OAuth user',
                 )
                 const newUser = generateDefaultUserFromSession(session)
-                const createdUser =
-                  await userUseCases.insertUserSilently(newUser)
+                const createdUser = await useCases.insertUserSilently(newUser)
                 if (createdUser !== null) {
-                  userUseCases.forceSwitchToUser_unsafe(createdUser)
+                  useCases.forceSwitchToUser_unsafe(createdUser)
                   logging.info('User profile created successfully')
                 } else {
                   showError(