Refactor dependency injection and code style improvements

docs/ARCHITECTURE_GUIDE.md

@@ -529,8 +529,10 @@ The project adopts an explicit, manual Dependency Injection (DI) pattern for all
 
 ### How It Works
 - **Dependencies are always passed as arguments** to orchestration functions (e.g., logic, use cases), never imported or instantiated directly inside them.
-- **Repositories and fetchers** are created at the application layer and injected into logic functions.
-- **No direct infrastructure imports** in logic modules: all dependencies must be provided from the outside.
+- **Concrete repositories and repository-backed local/localStorage adapters** are created only in the app container or in tests.
+- **Application factories accept ready collaborators** such as repositories, CRUD services, or resource fetchers; they do not construct infrastructure defaults internally.
+- **UI components consume container-owned modules** through `useContainer()` instead of creating use-cases at module scope.
+- **No direct infrastructure imports** in logic modules: all infrastructure-facing dependencies must be provided from the outside.
 
 ### Example: Search Module
 
@@ -593,4 +595,4 @@ export const templates = createResource(
 - **Decoupling:** Application logic is not tied to infrastructure details.
 - **Clarity:** Function signatures make dependencies explicit.
 
----
+---

src/di/container.tsx

@@ -25,8 +25,15 @@ import {
   createCopyDayOperations,
 } from '~/modules/diet/day-diet/application/usecases/useCopyDayOperations'
 import { createDayDietRepository } from '~/modules/diet/day-diet/infrastructure/dayDietRepository'
-import { createFoodCrud } from '~/modules/diet/food/application/usecases/foodCrud'
+import {
+  createFoodCrud,
+  type FoodCrud,
+} from '~/modules/diet/food/application/usecases/foodCrud'
 import { createSupabaseFoodRepository } from '~/modules/diet/food/infrastructure/api/infrastructure/supabase/supabaseFoodRepository'
+import {
+  createRecipeItemUseCases,
+  type RecipeItemUseCases,
+} from '~/modules/diet/item/application/recipeItemUseCases'
 import { createMacroProfileCrudService } from '~/modules/diet/macro-profile/application/service/macroProfileCrudService'
 import { createMacroProfileCacheStore } from '~/modules/diet/macro-profile/application/store/macroProfileCacheStore'
 import {
@@ -46,6 +53,10 @@ import {
   createMealUseCases,
   type MealUseCases,
 } from '~/modules/diet/meal/application/meal'
+import {
+  createRecentFoodUseCases,
+  type RecentFoodUseCases,
+} from '~/modules/diet/recent-food/application/usecases/recentFoodUseCases'
 import {
   createRecipeCrud,
   type RecipeCrud,
@@ -61,6 +72,7 @@ import {
   type MeasureState,
 } from '~/modules/measure/application/usecases/measureState'
 import { type BodyMeasure } from '~/modules/measure/domain/measure'
+import { createMeasureRepository } from '~/modules/measure/infrastructure/measureRepository'
 import {
   createTelemetry,
   type TelemetryModule,
@@ -71,6 +83,12 @@ import {
   type ProfileModule,
 } from '~/modules/profile/application/profile'
 import { createRecentFoodCrud } from '~/modules/recent-food/application/usecases/recentFoodCrud'
+import { createRecentFoodRepository } from '~/modules/recent-food/infrastructure/recentFoodRepository'
+import {
+  type CachedSearchCrud,
+  createCachedSearchCrud,
+} from '~/modules/search/application/usecases/cachedSearchCrud'
+import { createCachedSearchRepository } from '~/modules/search/infrastructure/cachedSearchRepository'
 import {
   createTemplateSearchState,
   type TemplateSearchState,
@@ -83,6 +101,10 @@ import { type NewUser } from '~/modules/user/domain/user'
 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 {
+  createWeightChartSettings,
+  type WeightChartSettings,
+} from '~/modules/weight/application/chart/weightChartSettings'
 import {
   createWeightChartUseCases,
   type WeightChartUseCases,
@@ -91,6 +113,9 @@ import {
   createWeightUseCases,
   type WeightUseCases,
 } from '~/modules/weight/application/weight/usecases/weightUseCases'
+import { createLocalStorageWeightChartPreferenceRepository } from '~/modules/weight/infrastructure/chart/localStorage/localStorageWeightChartPreferenceRepository'
+import { createLocalStorageWeightCacheRepository } from '~/modules/weight/infrastructure/weight/localStorage/localStorageWeightCacheRepository'
+import { createWeightRepository } from '~/modules/weight/infrastructure/weight/supabase/supabaseWeightRepository'
 import { GUEST_USER_ID } from '~/shared/guest/guestConstants'
 import {
   createGuestUseCases,
@@ -102,6 +127,7 @@ type ContainerInstances = {
   clipboardUseCases: ClipboardUseCases
   copyDayOperations: CopyDayOperations
   dayUseCases: DayUseCases
+  foodCrud: FoodCrud
   guestUseCases: GuestUseCases
   macroProfileState: MacroProfileState
   macroProfileUseCases: MacroProfileUseCases
@@ -110,10 +136,13 @@ type ContainerInstances = {
   measureCrud: MeasureCrud
   measureState: MeasureState
   profileUseCases: ProfileModule
+  recentFoodUseCases: RecentFoodUseCases
   recipeCrud: RecipeCrud
+  recipeItemUseCases: RecipeItemUseCases
   templateSearchState: TemplateSearchState
   telemetryUseCases: TelemetryModule
   userUseCases: UserUseCases
+  weightChartSettings: WeightChartSettings
   weightChartUseCases: WeightChartUseCases
   weightUseCases: WeightUseCases
 }
@@ -123,6 +152,7 @@ export type Container = {
   clipboardUseCases: () => ClipboardUseCases
   copyDayOperations: () => CopyDayOperations
   dayUseCases: () => DayUseCases
+  foodCrud: () => FoodCrud
   guestUseCases: () => GuestUseCases
   macroProfileState: () => MacroProfileState
   macroProfileUseCases: () => MacroProfileUseCases
@@ -131,10 +161,13 @@ export type Container = {
   measureCrud: () => MeasureCrud
   measureState: () => MeasureState
   profileUseCases: () => ProfileModule
+  recentFoodUseCases: () => RecentFoodUseCases
   recipeCrud: () => RecipeCrud
+  recipeItemUseCases: () => RecipeItemUseCases
   templateSearchState: () => TemplateSearchState
   telemetryUseCases: () => TelemetryModule
   userUseCases: () => UserUseCases
+  weightChartSettings: () => WeightChartSettings
   weightChartUseCases: () => WeightChartUseCases
   weightUseCases: () => WeightUseCases
   initialize: () => void
@@ -203,23 +236,35 @@ export function createContainer(
       })
     guestUseCasesRef = guestUseCases
 
+    const recipeRepository = createRecipeRepository()
+    const cachedSearchRepository = createCachedSearchRepository()
+    const foodRepository = createSupabaseFoodRepository()
+    const recentFoodRepository = createRecentFoodRepository()
+    const measureRepository = createMeasureRepository()
+    const weightCacheRepository = createLocalStorageWeightCacheRepository()
+    const weightRepository = createWeightRepository({
+      isGuestMode: () => guestUseCases.isGuestMode(),
+    })
+    const weightChartPreferenceRepository =
+      createLocalStorageWeightChartPreferenceRepository()
+
     const recipeCrud =
       overrides.recipeCrud ??
       createRecipeCrud({
-        repository: () => createRecipeRepository(),
+        repository: () => recipeRepository,
       })
 
     const macroProfileCache = createMacroProfileCacheStore()
     const macroProfileRepository = createMacroProfileRepository({
       isGuestMode: () => guestUseCases.isGuestMode(),
     })
     const macroProfileCrudService = createMacroProfileCrudService({
-      repository: () => macroProfileRepository,
+      repository: macroProfileRepository,
     })
     const macroProfileUseCases =
       overrides.macroProfileUseCases ??
       createMacroProfileUseCases({
-        crudService: () => macroProfileCrudService,
+        crudService: macroProfileCrudService,
         cache: macroProfileCache,
       })
     const macroProfileState =
@@ -257,6 +302,14 @@ export function createContainer(
             authUseCases.currentUserIdOrGuestId(),
           isGuestMode: () => guestUseCases.isGuestMode(),
         },
+        weightCacheRepository,
+        weightRepository,
+      })
+
+    const weightChartSettings =
+      overrides.weightChartSettings ??
+      createWeightChartSettings({
+        repository: weightChartPreferenceRepository,
       })
 
     const weightChartUseCases =
@@ -286,7 +339,11 @@ export function createContainer(
         dayUseCases: () => dayUseCases,
       })
 
-    const measureCrud = overrides.measureCrud ?? createMeasureCrud()
+    const measureCrud =
+      overrides.measureCrud ??
+      createMeasureCrud({
+        measureRepository,
+      })
     const measureState =
       overrides.measureState ??
       createMeasureState({
@@ -295,10 +352,29 @@ export function createContainer(
           measureCrud.fetchUserBodyMeasures(userId),
       })
 
-    const recentFoodCrud = createRecentFoodCrud()
-    const foodCrud = createFoodCrud({
-      repository: () => createSupabaseFoodRepository(),
+    const recentFoodCrud = createRecentFoodCrud({
+      recentFoodRepository,
     })
+    const recentFoodUseCases =
+      overrides.recentFoodUseCases ??
+      createRecentFoodUseCases({
+        getCurrentUserIdOrGuestId: () => authUseCases.currentUserIdOrGuestId(),
+        recentFoodCrud,
+      })
+    const cachedSearchCrud: CachedSearchCrud = createCachedSearchCrud({
+      repository: cachedSearchRepository,
+    })
+    const foodCrud =
+      overrides.foodCrud ??
+      createFoodCrud({
+        repository: foodRepository,
+        cachedSearchCrud,
+      })
+    const recipeItemUseCases =
+      overrides.recipeItemUseCases ??
+      createRecipeItemUseCases({
+        fetchRecipeById: (recipeId) => recipeCrud.fetchRecipeById(recipeId),
+      })
     const templateSearchState =
       overrides.templateSearchState ??
       createTemplateSearchState({
@@ -316,11 +392,14 @@ export function createContainer(
       userUseCases: () => userUseCases,
       guestUseCases: () => guestUseCases,
       dayUseCases: () => dayUseCases,
+      foodCrud: () => foodCrud,
       clipboardUseCases: () => clipboardUseCases,
       profileUseCases: () => profileUseCases,
       weightUseCases: () => weightUseCases,
+      weightChartSettings: () => weightChartSettings,
       weightChartUseCases: () => weightChartUseCases,
       recipeCrud: () => recipeCrud,
+      recipeItemUseCases: () => recipeItemUseCases,
       macroProfileUseCases: () => macroProfileUseCases,
       macroProfileState: () => macroProfileState,
       macroTargetUseCases: () => macroTargetUseCases,
@@ -329,6 +408,7 @@ export function createContainer(
       templateSearchState: () => templateSearchState,
       measureCrud: () => measureCrud,
       measureState: () => measureState,
+      recentFoodUseCases: () => recentFoodUseCases,
       initialize: () => {
         guestUseCases.initializeGuestMode()
         authUseCases.initializeAuth()
@@ -447,6 +527,13 @@ export function createTestContainer(
     refetchBodyMeasures: () => undefined,
   }
 
+  const weightChartSettings: WeightChartSettings = {
+    weightChartType: () => 'all',
+    setWeightChartType: () => {
+      /* no-op */
+    },
+  }
+
   const templateSearchState: TemplateSearchState = {
     templateSearch: () => '',
     setTemplateSearch: () => {
@@ -467,6 +554,7 @@ export function createTestContainer(
     guestUseCases,
     measureState,
     templateSearchState,
+    weightChartSettings,
     ...overrides,
   })
 }