protevus/platform
protevus/platform
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update: updating service_container 40 pass 8 fail

Browse source
This commit is contained in:
Patrick Stewart 2024-12-23 09:03:08 -07:00
parent 2e3a9cbc7c
commit c64b707ea5
1 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
packages/service_container/lib/src/container.dart
View file

@ -249,9 +249,15 @@ class Container implements ContainerContract, Map<String, dynamic> {
dynamic resolve(String abstract, [List<dynamic>? parameters]) { dynamic resolve(String abstract, [List<dynamic>? parameters]) {
abstract = _getAlias(abstract); abstract = _getAlias(abstract);
// if (_buildStack.any((stack) => stack.contains(abstract))) {
// // Instead of throwing an exception, return the abstract itself
// return abstract;
// }
if (_buildStack.any((stack) => stack.contains(abstract))) { if (_buildStack.any((stack) => stack.contains(abstract))) {
// Instead of throwing an exception, return the abstract itself // Create a path that includes the current abstract and the existing build stack
return abstract; List<String> path = [..._buildStack.last, abstract];
throw CircularDependencyException(path);
} }
_buildStack.add([abstract]); _buildStack.add([abstract]);
@ -451,10 +457,24 @@ class Container implements ContainerContract, Map<String, dynamic> {
}); });
} }
// @override
// T make<T>(String abstract, [List<dynamic>? parameters]) {
// var result = resolve(abstract, parameters);
// return _applyExtenders(abstract, result, this) as T;
// }
@override @override
T make<T>(String abstract, [List<dynamic>? parameters]) { T make<T>(String abstract, [List<dynamic>? parameters]) {
var result = resolve(abstract, parameters); try {
return _applyExtenders(abstract, result, this) as T; var result = resolve(abstract, parameters);
return _applyExtenders(abstract, result, this) as T;
} catch (e) {
if (e is CircularDependencyException) {
rethrow;
}
throw BindingResolutionException(
'Error resolving $abstract: ${e.toString()}');
}
} }
dynamic _applyExtenders(String abstract, dynamic result, Container c) { dynamic _applyExtenders(String abstract, dynamic result, Container c) {