Centralize weight use cases in DI container #1453

marcuscastelo · 2025-12-06T15:03:04Z

Refactor weight use cases to be centralized in the DI container, removing backward-compatible shims and breaking circular dependencies. Migrate all consumers to utilize the new structure, ensuring type safety and preparing for future enhancements. Document progress and remaining tasks in the migration plan.

- Refactor createWeightUseCases to accept granular authDeps instead of whole useCases object, breaking circular dependency - Add WeightUseCases to useCases.ts container - Add WeightUseCases type to container.tsx - Keep backward-compatible shim in weightUseCases.ts for legacy consumers - Next: migrate consumers to use container instead of direct imports

…iner Migrate all consumers of weightUseCases to use the centralized DI container instead of direct imports from the module: - weightChartUseCases.ts - now uses useCases.weightUseCases() - macroTargetUseCases.ts - now uses useCases.weightUseCases() - WeightView.tsx - now uses useCases.weightUseCases() - WeightEvolution.tsx - now uses useCases.weightUseCases() - MacroEvolution.tsx - now uses useCases.weightUseCases() - MacroProfile.tsx - now uses useCases.weightUseCases() - BodyMeasureChart.tsx - now uses useCases.weightUseCases() - RestoreProfileModal.tsx - now uses useCases.weightUseCases() This prepares for removal of the backward-compatible shim in weightUseCases.ts

All consumers now use the centralized DI container (useCases.weightUseCases()), so the shim export is no longer needed. Removed: - export const weightUseCases = createWeightUseCases() - export function refetchUserWeights() The factory createWeightUseCases() and type WeightUseCases remain exported for DI wiring and type safety.

… circular import - Remove useCases import from weightUseCases.ts to break circular dependency - Make authDeps a required parameter for createWeightUseCases - Update container.tsx to provide authDeps when creating default weight use-cases This breaks the circular dependency that was causing test failures when modules imported from useCases.ts at module initialization time.

- Document weightUseCases shim removal as complete - Document clipboardUseCases circular dependency blocking centralization - List remaining shims to evaluate - Add commit references for Batch 7

- Refactor createWeightChartUseCases to accept granular WeightChartDeps instead of typeof useCases to avoid circular dependency - Remove weightChartUseCases shim (all consumers now use container) - Update consumers (WeightChartTooltip, WeightEvolution) to use useCases.weightChartUseCases() - Add weightChartUseCases to useCases.ts with proper dependency wiring

vercel · 2025-12-06T15:03:08Z

The latest updates on your projects. Learn more about Vercel for GitHub.

Project	Deployment	Preview	Comments	Updated (UTC)
macroflows	Ready	Preview	Comment	Dec 10, 2025 11:50pm

Copilot

Pull request overview

This PR centralizes weight and weight-chart use-cases in the DI container to eliminate circular dependencies and remove backward-compatible shims. The refactoring introduces granular dependency interfaces (WeightUseCasesDeps, WeightChartDeps) that accept only the minimal required dependencies instead of the full useCases object, breaking circular import chains. All consumers (8 files) are migrated to access these use-cases through useCases.weightUseCases() and useCases.weightChartUseCases().

Key changes:

Removed circular useCases import from weightUseCases.ts by making authDeps a required parameter
Centralized both weightUseCases and weightChartUseCases in the DI container
Removed backward-compatible shims from both factories

Reviewed changes

Copilot reviewed 13 out of 13 changed files in this pull request and generated 5 comments.

Show a summary per file

File	Description
`src/di/useCases.ts`	Added `weightUseCases` and `weightChartUseCases` to centralized container, wired with granular dependencies to avoid circular imports
`src/di/container.tsx`	Extended `Container` type with `WeightUseCases`, created default weight use-cases with auth dependencies
`src/modules/weight/application/weight/usecases/weightUseCases.ts`	Made `authDeps` required parameter, removed circular `useCases` import, removed backward-compatible shim
`src/modules/weight/application/chart/weightChartUseCases.ts`	Introduced `WeightChartDeps` interface, made dependencies required, removed shim
`src/sections/weight/components/WeightView.tsx`	Migrated to use `useCases.weightUseCases()` for update/delete operations
`src/sections/weight/components/WeightEvolution.tsx`	Migrated to use `useCases.weightUseCases()` and `useCases.weightChartUseCases()` - has critical accessor wrapping bug
`src/sections/weight/components/WeightChartTooltip.tsx`	Migrated to use `useCases.weightChartUseCases()` for progress calculation
`src/sections/profile/measure/components/BodyMeasureChart.tsx`	Migrated to use `useCases.weightUseCases().weights()` in measure processing
`src/sections/profile/components/MacroProfile.tsx`	Migrated to use `useCases.weightUseCases().latest()` for weight check
`src/sections/profile/components/MacroEvolution.tsx`	Migrated all chart components to use `useCases.weightUseCases()` - has critical accessor wrapping bug
`src/modules/diet/macro-profile/ui/RestoreProfileModal.tsx`	Migrated to use `useCases.weightUseCases()` for weight lookups
`src/modules/diet/macro-target/application/macroTargetUseCases.ts`	Updated default to use centralized `useCases.weightUseCases()`, but maintains shim pattern that may cause circular dependency
`DI-migration-plan.md`	Updated with Batch 7 progress, documents completed migrations and remaining work

Copilot · 2025-12-06T15:08:06Z

src/sections/weight/components/WeightEvolution.tsx

            <WeightChart
-              weights={weightUseCases.weights}
-              desiredWeight={weightChartUseCases.desiredWeight()}
+              weights={() => useCases.weightUseCases().weights()}


The weights prop is being wrapped in an arrow function () => useCases.weightUseCases().weights(), but WeightChart expects weights to be an Accessor<readonly Weight[]>. Since useCases.weightUseCases().weights is already an accessor (a signal getter function), wrapping it in another arrow function creates a double-wrapped function.

This should be: weights={useCases.weightUseCases().weights} without the extra arrow function wrapper.

Suggested change

weights={() => useCases.weightUseCases().weights()}

weights={useCases.weightUseCases().weights}

src/sections/profile/components/MacroEvolution.tsx

Copilot · 2025-12-06T15:08:07Z

src/modules/weight/application/chart/weightChartUseCases.ts

+// Note: Shim removed - all consumers should use the centralized DI container.
+// Import via `useCases.weightChartUseCases()` from '~/di/useCases'.



The comment says "Shim removed" and instructs users to import via useCases.weightChartUseCases(), but the instructions should clarify that consumers access this by calling useCases.weightChartUseCases() to get the instance. Consider rephrasing to: "Note: Shim removed - all consumers should access via useCases.weightChartUseCases() from '~/di/useCases'." for clarity.

Suggested change

// Note: Shim removed - all consumers should use the centralized DI container.

// Import via `useCases.weightChartUseCases()` from '~/di/useCases'.

// Note: Shim removed - all consumers should access via useCases.weightChartUseCases() from '~/di/useCases'.

Copilot · 2025-12-06T15:08:07Z

DI-migration-plan.md

+- `recipeItemUseCases`
+- `macroOverflowUseCases`, `macroTargetUseCases`
+- `mealUseCases`
+- `weightChartUseCases`


The line listing weightChartUseCases should be removed from the "Remaining shims to evaluate" section since it was already completed and documented in the "Completed" section above (lines 118-120).

Suggested change

- `weightChartUseCases`

Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

…pletion) Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

…ompatibility-shims refactor(di): Remove 4 backward-compatible shims (Batch 7 partial)

…rt factories Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

…se cases directly

…ories Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

…Repository Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

…patibility shim

…ction patterns

…ule-exports refactor(food): add explicit return types to repository helpers

….com/marcuscastelo/macroflows into marcuscastelo/issue1447-remove-shims

…ood-infra-exports refactor(recent-food): Encapsulate infrastructure — export only factories

….com/marcuscastelo/macroflows into marcuscastelo/issue1447-remove-shims

…ipe-infra refactor(diet/recipe): Encapsulate infrastructure exports — export only factories

…ile modules Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

….com/marcuscastelo/macroflows into marcuscastelo/issue1447-remove-shims

…d-compatibility-shims refactor(di): Remove backward-compatibility shims from telemetry, search, profile, and recentFood modules

….com/marcuscastelo/macroflows into marcuscastelo/issue1447-remove-shims

refactor(supabase): implement no-op storage for SSR environments

…ization

marcuscastelo and others added 8 commits December 6, 2025 11:35

docs(di): update migration plan with Batch 7 progress

5f66ea6

- Document weightUseCases shim removal as complete - Document clipboardUseCases circular dependency blocking centralization - List remaining shims to evaluate - Add commit references for Batch 7

docs(di): update migration plan with weightChartUseCases completion

8da6954

Initial plan

202c7eb

Copilot AI review requested due to automatic review settings December 6, 2025 15:03

marcuscastelo self-assigned this Dec 6, 2025

Copilot started reviewing on behalf of marcuscastelo December 6, 2025 15:03 View session

vercel bot deployed to Preview December 6, 2025 15:03 View deployment

Copilot AI reviewed Dec 6, 2025

View reviewed changes

Copilot AI and others added 5 commits December 6, 2025 15:12

refactor(di): Remove macroProfileCrudService and dayUseCases shims

ad458e2

Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

refactor(di): Remove macroOverflowUseCases shim

7f26850

Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

refactor(di): Remove foodCrud shims

69a8491

Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

docs(di): Update DI migration plan with Batch 7 progress (partial com…

31bfb1e

…pletion) Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

Merge pull request #1452 from marcuscastelo/copilot/remove-backward-c…

d8eae72

…ompatibility-shims refactor(di): Remove 4 backward-compatible shims (Batch 7 partial)

vercel bot deployed to Preview December 6, 2025 17:58 View deployment

marcuscastelo and others added 10 commits December 6, 2025 14:58

feat(item): add id to item name input for accessibility

8d4ad44

refactor(di): remove backward compatibility shims for use cases

1dea7fb

Initial plan

19368ea

Initial plan

961c1ed

refactor(diet/recipe): Encapsulate infrastructure exports - only expo…

a8f9024

…rt factories Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

refactor(di): decouple macro-profile state from DI; export day-diet u…

c88f90c

…se cases directly

refactor(food): encapsulate infrastructure exports - only export fact…

eeb9f0b

…ories Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

refactor(recent-food): Remove helper function exports from recentFood…

5d0a1b1

…Repository Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

feat(day-diet): initialize day-diet use-cases and remove backward com…

c5f277f

…patibility shim

refactor(copilot): enhance import guidelines and avoid runtime indire…

dd5ad3b

…ction patterns

marcuscastelo added 2 commits December 6, 2025 16:00

Merge pull request #1456 from marcuscastelo/copilot/refactor-food-mod…

6b5c7b8

…ule-exports refactor(food): add explicit return types to repository helpers

Merge branch 'marcuscastelo/issue1447-remove-shims' of https://github…

b9bda31

….com/marcuscastelo/macroflows into marcuscastelo/issue1447-remove-shims

vercel bot deployed to Preview December 6, 2025 19:02 View deployment

marcuscastelo added 2 commits December 6, 2025 16:03

Merge pull request #1458 from marcuscastelo/copilot/refactor-recent-f…

3376451

…ood-infra-exports refactor(recent-food): Encapsulate infrastructure — export only factories

Merge branch 'marcuscastelo/issue1447-remove-shims' of https://github…

206ca8e

….com/marcuscastelo/macroflows into marcuscastelo/issue1447-remove-shims

vercel bot deployed to Preview December 6, 2025 19:05 View deployment

Merge pull request #1457 from marcuscastelo/copilot/refactor-diet-rec…

36a839f

…ipe-infra refactor(diet/recipe): Encapsulate infrastructure exports — export only factories

vercel bot deployed to Preview December 6, 2025 19:06 View deployment

marcuscastelo and others added 9 commits December 6, 2025 16:12

refactor(di): mark DI shims for removal

b74f743

refactor(di): centralize day use cases initialization

1bc5189

Initial plan

1afb180

refactor(di): Phase 1 - Remove shims from telemetry, search, and prof…

79881c1

…ile modules Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

refactor(di): Phase 2a - Remove shim from recentFoodCrud module

101843f

Co-authored-by: marcuscastelo <27441558+marcuscastelo@users.noreply.github.com>

Merge branch 'marcuscastelo/issue1447-remove-shims' of https://github…

57a2105

….com/marcuscastelo/macroflows into marcuscastelo/issue1447-remove-shims

refactor(di): integrate telemetry module into DI container

ab1d1ab

refactor(di): integrate profile module into DI container

6dc5819

Merge pull request #1461 from marcuscastelo/copilot/remove-di-backwar…

305c96f

…d-compatibility-shims refactor(di): Remove backward-compatibility shims from telemetry, search, profile, and recentFood modules

vercel bot had a problem deploying to Preview December 10, 2025 21:56 Failure

Merge branch 'marcuscastelo/issue1447-remove-shims' of https://github…

590f194

….com/marcuscastelo/macroflows into marcuscastelo/issue1447-remove-shims

vercel bot had a problem deploying to Preview December 10, 2025 21:59 Failure

chore(pnpm): update dependencies

1afef72

vercel bot had a problem deploying to Preview December 10, 2025 22:09 Failure

marcuscastelo added 2 commits December 10, 2025 20:48

refactor(app): restructure Sentry integration and configuration

30df220

refactor(supabase): implement no-op storage for SSR environments

refactor(item,search): replace macro overflow instance with lazy memo…

48117b1

…ization

vercel bot deployed to Preview December 10, 2025 23:50 View deployment

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Centralize weight use cases in DI container #1453

Centralize weight use cases in DI container #1453

Uh oh!

marcuscastelo commented Dec 6, 2025

Uh oh!

vercel bot commented Dec 6, 2025 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Dec 6, 2025

Uh oh!

Uh oh!

Copilot AI Dec 6, 2025

Uh oh!

Copilot AI Dec 6, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	weights={() => useCases.weightUseCases().weights()}
	weights={useCases.weightUseCases().weights}

		// Note: Shim removed - all consumers should use the centralized DI container.
		// Import via `useCases.weightChartUseCases()` from '~/di/useCases'.

Centralize weight use cases in DI container #1453

Are you sure you want to change the base?

Centralize weight use cases in DI container #1453

Uh oh!

Conversation

marcuscastelo commented Dec 6, 2025

Uh oh!

vercel bot commented Dec 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Dec 6, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Copilot AI Dec 6, 2025

Choose a reason for hiding this comment

Uh oh!

Copilot AI Dec 6, 2025

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

vercel bot commented Dec 6, 2025 •

edited

Loading