feat: Add DI container framework + core test infrastructure#1631
Open
bthebladeprimer wants to merge 3 commits into
Open
feat: Add DI container framework + core test infrastructure#1631bthebladeprimer wants to merge 3 commits into
bthebladeprimer wants to merge 3 commits into
Conversation
Contributor
Generated by 🚫 Danger Swift against 01baa63 |
5 tasks
NQuinn27
reviewed
Apr 8, 2026
| /// | ||
| /// - Warning: The semaphore-based fallback blocks the calling thread while | ||
| /// waiting for actor-isolated async work. If called from the Swift | ||
| /// cooperative thread pool (e.g. inside a `Task`) this can deadlock |
Contributor
There was a problem hiding this comment.
Can we do any better here, is there a way to not have this deadlock risk, or add a runtime assertion so it is unreachable from async contexts?
NQuinn27
reviewed
Apr 8, 2026
| if let stored = await container.getInstance(forKey: key) { | ||
| return stored | ||
| } | ||
| await container.setInstance(new, forKey: key) |
Contributor
There was a problem hiding this comment.
We fetch stored twice here, but it is not clear from the code flow where or how stored is used. Is this relying on a side-effect?
NQuinn27
reviewed
Apr 8, 2026
Contributor
There was a problem hiding this comment.
These PR review findings should not ship with the PR
NQuinn27
reviewed
Apr 8, 2026
| // MARK: - Diagnostics | ||
|
|
||
| /// Get diagnostic information about the container state | ||
| public func getDiagnostics() -> ContainerDiagnostics { |
Contributor
There was a problem hiding this comment.
Does this need to be public? Not sure how useful this information would be to a merchant.
NQuinn27
reviewed
Apr 8, 2026
| // Copyright © 2026 Primer API Ltd. All rights reserved. | ||
| // Licensed under the MIT License. See LICENSE file in the project root for full license information. | ||
|
|
||
| // TODO: Rename file to DIContainer+SwiftUI.swift |
Contributor
There was a problem hiding this comment.
Should we rename this file now?
NQuinn27
reviewed
Apr 8, 2026
| name: String? = nil | ||
| ) async throws -> Self { | ||
| let builder = register(F.self) | ||
| let namedBuilder = name != nil ? builder.named(name!) : builder |
Contributor
There was a problem hiding this comment.
if let name instead of name!?
Contributor
There was a problem hiding this comment.
I think you could also do name.map(builder.named) ?? builder
Add custom actor-based dependency injection framework with support for transient, singleton, and weak retention policies. Includes async/await resolution, SwiftUI environment integration, container diagnostics, and health checks. Ships with core test utilities (XCTestCase+Async, ContainerTestHelpers, TestData) and comprehensive DI test suite.
bthebladeprimer
force-pushed
the
bn/feature/cc-02-di-container
branch
from
637b7c4 to
01baa63
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
XCTestCase+Async(async stream helpers),ContainerTestHelpers,TestDatabaseContext
This is PR 2 of 15 in the CheckoutComponents PR split. The DI framework is the foundation — all CheckoutComponents code resolves dependencies through this container.
Depends on: PR 1 (Build Config) — #1630
Tracking: Notion PR Review Tracker
Key files
Internal/DI/Framework/Container.swift— Core container implementation (actor-based)Internal/DI/Framework/DIContainer.swift— Singleton managing container lifecycleInternal/DI/Framework/Factory.swift— Factory pattern for parameterized creationInternal/DI/Framework/RetentionStrategy.swift— Memory management policiesTestSupport/XCTestCase+Async.swift— Async stream testing utilitiesTest plan
xcodebuild test -only-testing:"Tests/DIContainerTests"