From 2186f216c5dd255b2aadef5990999cfd33aae342 Mon Sep 17 00:00:00 2001 From: Nikolay Pianikov Date: Mon, 13 May 2024 18:00:41 +0300 Subject: [PATCH] Improved class diagram --- readme/a-few-partial-classes.md | 4 ++-- readme/accumulators.md | 4 ++-- readme/advanced-interception.md | 4 ++-- readme/arguments.md | 4 ++-- readme/array.md | 4 ++-- readme/async-disposable-scope.md | 6 +++--- readme/async-disposable-singleton.md | 6 +++--- readme/async-enumerable.md | 4 ++-- readme/auto-scoped.md | 2 +- readme/check-for-a-root.md | 2 +- readme/complex-generics.md | 4 ++-- readme/composition-root-kinds.md | 4 ++-- readme/composition-roots.md | 4 ++-- readme/constructor-ordinal-attribute.md | 2 +- readme/custom-attributes.md | 2 +- readme/decorator.md | 2 +- readme/default-lifetime.md | 4 ++-- readme/default-values.md | 4 ++-- readme/dependent-compositions.md | 4 ++-- readme/disposable-singleton.md | 4 ++-- readme/enumerable-generics.md | 8 ++++---- readme/enumerable.md | 4 ++-- readme/factory.md | 2 +- readme/field-injection.md | 4 ++-- readme/func-with-arguments.md | 4 ++-- readme/func-with-tag.md | 2 +- readme/func.md | 4 ++-- readme/generic-composition-roots-with-constraints.md | 4 ++-- readme/generic-composition-roots.md | 4 ++-- readme/generics.md | 6 +++--- readme/injections-of-abstractions.md | 4 ++-- readme/interception.md | 2 +- readme/lazy.md | 4 ++-- readme/manually-started-tasks.md | 4 ++-- readme/member-ordinal-attribute.md | 2 +- readme/method-injection.md | 4 ++-- readme/oncannotresolve-hint.md | 4 ++-- readme/ondependencyinjection-hint.md | 4 ++-- readme/onnewinstance-hint.md | 4 ++-- readme/overriding-the-bcl-binding.md | 2 +- readme/partial-class.md | 2 +- readme/perblock.md | 2 +- readme/perresolve.md | 2 +- readme/property-injection.md | 4 ++-- readme/required-properties-or-fields.md | 4 ++-- readme/resolve-hint.md | 4 ++-- readme/resolve-methods.md | 4 ++-- readme/root-arguments.md | 4 ++-- readme/root-binding.md | 2 +- readme/scope.md | 4 ++-- readme/service-collection.md | 2 +- readme/service-provider-with-scope.md | 4 ++-- readme/service-provider.md | 4 ++-- readme/simplified-binding.md | 4 ++-- readme/singleton.md | 4 ++-- readme/span-and-readonlyspan.md | 2 +- readme/tag-attribute.md | 2 +- readme/tag-type.md | 4 ++-- readme/tag-unique.md | 2 +- readme/tags.md | 4 ++-- readme/task.md | 4 ++-- readme/threadsafe-hint.md | 4 ++-- readme/tostring-hint.md | 4 ++-- .../tracking-async-disposable-instances-in-delegates.md | 6 +++--- ...g-async-disposable-instances-per-a-composition-root.md | 6 +++--- readme/tracking-disposable-instances-in-delegates.md | 4 ++-- ...racking-disposable-instances-per-a-composition-root.md | 4 ++-- readme/transient.md | 4 ++-- readme/tuple.md | 4 ++-- readme/type-attribute.md | 2 +- readme/valuetask.md | 4 ++-- readme/weak-reference.md | 4 ++-- src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs | 3 ++- 73 files changed, 134 insertions(+), 133 deletions(-) diff --git a/readme/a-few-partial-classes.md b/readme/a-few-partial-classes.md index f0efb56c2..608221aa6 100644 --- a/readme/a-few-partial-classes.md +++ b/readme/a-few-partial-classes.md @@ -196,11 +196,11 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/accumulators.md b/readme/accumulators.md index b6ebc74e0..4327f740c 100644 --- a/readme/accumulators.md +++ b/readme/accumulators.md @@ -238,7 +238,7 @@ classDiagram class ValueTupleᐸIServiceˏMyAccumulatorᐳ { +ValueTuple(IService item1, MyAccumulator item2) } - AbcDependency --|> IDependency : + AbcDependency --|> IDependency class AbcDependency { +AbcDependency() } @@ -246,7 +246,7 @@ classDiagram class XyzDependency { +XyzDependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency1, IDependency dependency2, IDependency dependency3) } diff --git a/readme/advanced-interception.md b/readme/advanced-interception.md index c0ce84cef..44940ce0a 100644 --- a/readme/advanced-interception.md +++ b/readme/advanced-interception.md @@ -149,11 +149,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/arguments.md b/readme/arguments.md index 6aa584a15..1ff28e1df 100644 --- a/readme/arguments.md +++ b/readme/arguments.md @@ -100,11 +100,11 @@ classDiagram } class Int32 class String - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency(Int32 id) } - Service --|> IService : + Service --|> IService class Service { +Service(String name, IDependency dependency) } diff --git a/readme/array.md b/readme/array.md index 6a9e4415e..64c8f27a1 100644 --- a/readme/array.md +++ b/readme/array.md @@ -217,7 +217,7 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - AbcDependency --|> IDependency : + AbcDependency --|> IDependency class AbcDependency { +AbcDependency() } @@ -225,7 +225,7 @@ classDiagram class XyzDependency { +XyzDependency() } - Service --|> IService : + Service --|> IService class Service { +Service(ArrayᐸIDependencyᐳ dependencies) } diff --git a/readme/async-disposable-scope.md b/readme/async-disposable-scope.md index aeb010d94..1ddcf51fa 100644 --- a/readme/async-disposable-scope.md +++ b/readme/async-disposable-scope.md @@ -234,12 +234,12 @@ classDiagram class Program { +Program(FuncᐸSessionᐳ sessionFactory) } - Dependency --|> IDependency : - Dependency --|> IAsyncDisposable : + Dependency --|> IDependency + Dependency --|> IAsyncDisposable class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/async-disposable-singleton.md b/readme/async-disposable-singleton.md index 1fa42cb53..4304cf4a1 100644 --- a/readme/async-disposable-singleton.md +++ b/readme/async-disposable-singleton.md @@ -175,12 +175,12 @@ classDiagram } Composition --|> IDisposable Composition --|> IAsyncDisposable - Dependency --|> IDependency : - Dependency --|> IAsyncDisposable : + Dependency --|> IDependency + Dependency --|> IAsyncDisposable class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/async-enumerable.md b/readme/async-enumerable.md index 143e8101e..ebe653c90 100644 --- a/readme/async-enumerable.md +++ b/readme/async-enumerable.md @@ -208,7 +208,7 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - AbcDependency --|> IDependency : + AbcDependency --|> IDependency class AbcDependency { +AbcDependency() } @@ -216,7 +216,7 @@ classDiagram class XyzDependency { +XyzDependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IAsyncEnumerableᐸIDependencyᐳ dependencies) } diff --git a/readme/auto-scoped.md b/readme/auto-scoped.md index 663a164e4..c99f053b7 100644 --- a/readme/auto-scoped.md +++ b/readme/auto-scoped.md @@ -147,7 +147,7 @@ classDiagram +Service(IDependency dependency) } class IService - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } diff --git a/readme/check-for-a-root.md b/readme/check-for-a-root.md index 0d9f4cce9..2c8e970cd 100644 --- a/readme/check-for-a-root.md +++ b/readme/check-for-a-root.md @@ -257,7 +257,7 @@ classDiagram class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service() +IDependency Dependency diff --git a/readme/complex-generics.md b/readme/complex-generics.md index 57fd6d552..09be502bf 100644 --- a/readme/complex-generics.md +++ b/readme/complex-generics.md @@ -102,11 +102,11 @@ classDiagram class ProgramᐸStringᐳ { +Program(IServiceᐸStringˏInt32ˏListᐸStringᐳˏDictionaryᐸStringˏInt32ᐳᐳ service) } - ServiceᐸStringˏInt32ˏListᐸStringᐳˏDictionaryᐸStringˏInt32ᐳᐳ --|> IServiceᐸStringˏInt32ˏListᐸStringᐳˏDictionaryᐸStringˏInt32ᐳᐳ : + ServiceᐸStringˏInt32ˏListᐸStringᐳˏDictionaryᐸStringˏInt32ᐳᐳ --|> IServiceᐸStringˏInt32ˏListᐸStringᐳˏDictionaryᐸStringˏInt32ᐳᐳ class ServiceᐸStringˏInt32ˏListᐸStringᐳˏDictionaryᐸStringˏInt32ᐳᐳ { +Service(IDependencyᐸStringᐳ dependency1, IDependencyᐸInt32ᐳ dependency2) } - DependencyᐸStringᐳ --|> IDependencyᐸStringᐳ : + DependencyᐸStringᐳ --|> IDependencyᐸStringᐳ class DependencyᐸStringᐳ { +Dependency() } diff --git a/readme/composition-root-kinds.md b/readme/composition-root-kinds.md index 792105807..4eaedf211 100644 --- a/readme/composition-root-kinds.md +++ b/readme/composition-root-kinds.md @@ -239,7 +239,7 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } @@ -247,7 +247,7 @@ classDiagram class OtherService { +OtherService() } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } diff --git a/readme/composition-roots.md b/readme/composition-roots.md index 0949dceea..48f87158b 100644 --- a/readme/composition-roots.md +++ b/readme/composition-roots.md @@ -266,7 +266,7 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } @@ -274,7 +274,7 @@ classDiagram class OtherService { +OtherService() } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } diff --git a/readme/constructor-ordinal-attribute.md b/readme/constructor-ordinal-attribute.md index 6ab365737..c8b70be18 100644 --- a/readme/constructor-ordinal-attribute.md +++ b/readme/constructor-ordinal-attribute.md @@ -204,7 +204,7 @@ classDiagram + object Resolve(Type type, object? tag) } class String - Service --|> IService : + Service --|> IService class Service { ~Service(String name) } diff --git a/readme/custom-attributes.md b/readme/custom-attributes.md index 17cc45134..f8d3421c1 100644 --- a/readme/custom-attributes.md +++ b/readme/custom-attributes.md @@ -219,7 +219,7 @@ classDiagram } class String class Int32 - Person --|> IPerson : + Person --|> IPerson class Person { +Person(String name) ~Object Id diff --git a/readme/decorator.md b/readme/decorator.md index c502e5166..7573519bd 100644 --- a/readme/decorator.md +++ b/readme/decorator.md @@ -70,7 +70,7 @@ classDiagram class Service { +Service() } - GreetingService --|> IService : + GreetingService --|> IService class GreetingService { +GreetingService(IService baseService) } diff --git a/readme/default-lifetime.md b/readme/default-lifetime.md index 59ce93d7f..3640f2e7b 100644 --- a/readme/default-lifetime.md +++ b/readme/default-lifetime.md @@ -100,11 +100,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency1, IDependency dependency2) } diff --git a/readme/default-values.md b/readme/default-values.md index 4df653325..e6cc93bba 100644 --- a/readme/default-values.md +++ b/readme/default-values.md @@ -76,11 +76,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(String name) +IDependency Dependency diff --git a/readme/dependent-compositions.md b/readme/dependent-compositions.md index b52a989b0..b6a3c8ec9 100644 --- a/readme/dependent-compositions.md +++ b/readme/dependent-compositions.md @@ -378,11 +378,11 @@ classDiagram class Program { +Program(IService service) } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } diff --git a/readme/disposable-singleton.md b/readme/disposable-singleton.md index 3d4bbef08..3e014e129 100644 --- a/readme/disposable-singleton.md +++ b/readme/disposable-singleton.md @@ -135,11 +135,11 @@ classDiagram +IService Root } Composition --|> IDisposable - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/enumerable-generics.md b/readme/enumerable-generics.md index 93238f996..2a7e8c2e0 100644 --- a/readme/enumerable-generics.md +++ b/readme/enumerable-generics.md @@ -244,17 +244,17 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - ServiceᐸInt32ᐳ --|> IServiceᐸInt32ᐳ : + ServiceᐸInt32ᐳ --|> IServiceᐸInt32ᐳ class ServiceᐸInt32ᐳ { +Service(IEnumerableᐸIDependencyᐸInt32ᐳᐳ dependencies) } - ServiceᐸStringᐳ --|> IServiceᐸStringᐳ : + ServiceᐸStringᐳ --|> IServiceᐸStringᐳ class ServiceᐸStringᐳ { +Service(IEnumerableᐸIDependencyᐸStringᐳᐳ dependencies) } class IEnumerableᐸIDependencyᐸInt32ᐳᐳ class IEnumerableᐸIDependencyᐸStringᐳᐳ - AbcDependencyᐸInt32ᐳ --|> IDependencyᐸInt32ᐳ : + AbcDependencyᐸInt32ᐳ --|> IDependencyᐸInt32ᐳ class AbcDependencyᐸInt32ᐳ { +AbcDependency() } @@ -262,7 +262,7 @@ classDiagram class XyzDependencyᐸInt32ᐳ { +XyzDependency() } - AbcDependencyᐸStringᐳ --|> IDependencyᐸStringᐳ : + AbcDependencyᐸStringᐳ --|> IDependencyᐸStringᐳ class AbcDependencyᐸStringᐳ { +AbcDependency() } diff --git a/readme/enumerable.md b/readme/enumerable.md index d2edc3a95..da876cd27 100644 --- a/readme/enumerable.md +++ b/readme/enumerable.md @@ -199,7 +199,7 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - AbcDependency --|> IDependency : + AbcDependency --|> IDependency class AbcDependency { +AbcDependency() } @@ -207,7 +207,7 @@ classDiagram class XyzDependency { +XyzDependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IEnumerableᐸIDependencyᐳ dependencies) } diff --git a/readme/factory.md b/readme/factory.md index 89fdc55ea..3af3de728 100644 --- a/readme/factory.md +++ b/readme/factory.md @@ -104,7 +104,7 @@ classDiagram +Dependency(DateTimeOffset time) } class DateTimeOffset - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/field-injection.md b/readme/field-injection.md index 4eb5a653f..330dbc128 100644 --- a/readme/field-injection.md +++ b/readme/field-injection.md @@ -76,11 +76,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service() ~IDependency DependencyVal diff --git a/readme/func-with-arguments.md b/readme/func-with-arguments.md index 466d4c849..e071ea8ea 100644 --- a/readme/func-with-arguments.md +++ b/readme/func-with-arguments.md @@ -245,11 +245,11 @@ classDiagram } class Int32 class FuncᐸInt32ˏIDependencyᐳ - Clock --|> IClock : + Clock --|> IClock class Clock { +Clock() } - Service --|> IService : + Service --|> IService class Service { +Service(FuncᐸInt32ˏIDependencyᐳ dependencyFactory) } diff --git a/readme/func-with-tag.md b/readme/func-with-tag.md index 045eb0d18..2a03eeeb3 100644 --- a/readme/func-with-tag.md +++ b/readme/func-with-tag.md @@ -205,7 +205,7 @@ classDiagram class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(FuncᐸIDependencyᐳ dependencyFactory) } diff --git a/readme/func.md b/readme/func.md index e8f523bad..604b7f8ee 100644 --- a/readme/func.md +++ b/readme/func.md @@ -204,11 +204,11 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(FuncᐸIDependencyᐳ dependencyFactory) } diff --git a/readme/generic-composition-roots-with-constraints.md b/readme/generic-composition-roots-with-constraints.md index 58b272cc2..b2274818c 100644 --- a/readme/generic-composition-roots-with-constraints.md +++ b/readme/generic-composition-roots-with-constraints.md @@ -102,13 +102,13 @@ classDiagram +IServiceᐸTˏT4ᐳ GetMyRootᐸTˏT4ᐳ() +IServiceᐸTˏBooleanᐳ GetOtherServiceᐸTᐳ() } - ServiceᐸTˏT4ᐳ --|> IServiceᐸTˏT4ᐳ : + ServiceᐸTˏT4ᐳ --|> IServiceᐸTˏT4ᐳ class ServiceᐸTˏT4ᐳ { +Service(IDependencyᐸTᐳ dependency) } OtherServiceᐸTᐳ --|> IServiceᐸTˏBooleanᐳ : "Other" class OtherServiceᐸTᐳ - DependencyᐸTᐳ --|> IDependencyᐸTᐳ : + DependencyᐸTᐳ --|> IDependencyᐸTᐳ class DependencyᐸTᐳ { +Dependency() } diff --git a/readme/generic-composition-roots.md b/readme/generic-composition-roots.md index 6f117c394..54e7f5c93 100644 --- a/readme/generic-composition-roots.md +++ b/readme/generic-composition-roots.md @@ -96,13 +96,13 @@ classDiagram +IServiceᐸT54ᐳ GetMyRootᐸT54ᐳ() +IServiceᐸT54ᐳ GetOtherServiceᐸT54ᐳ() } - ServiceᐸT54ᐳ --|> IServiceᐸT54ᐳ : + ServiceᐸT54ᐳ --|> IServiceᐸT54ᐳ class ServiceᐸT54ᐳ { +Service(IDependencyᐸT54ᐳ dependency) } OtherServiceᐸT54ᐳ --|> IServiceᐸT54ᐳ : "Other" class OtherServiceᐸT54ᐳ - DependencyᐸT54ᐳ --|> IDependencyᐸT54ᐳ : + DependencyᐸT54ᐳ --|> IDependencyᐸT54ᐳ class DependencyᐸT54ᐳ { +Dependency() } diff --git a/readme/generics.md b/readme/generics.md index db80bdd90..e731763e9 100644 --- a/readme/generics.md +++ b/readme/generics.md @@ -89,15 +89,15 @@ classDiagram <> +IService Root } - Service --|> IService : + Service --|> IService class Service { +Service(IDependencyᐸInt32ᐳ intDependency, IDependencyᐸStringᐳ stringDependency) } - DependencyᐸInt32ᐳ --|> IDependencyᐸInt32ᐳ : + DependencyᐸInt32ᐳ --|> IDependencyᐸInt32ᐳ class DependencyᐸInt32ᐳ { +Dependency() } - DependencyᐸStringᐳ --|> IDependencyᐸStringᐳ : + DependencyᐸStringᐳ --|> IDependencyᐸStringᐳ class DependencyᐸStringᐳ { +Dependency() } diff --git a/readme/injections-of-abstractions.md b/readme/injections-of-abstractions.md index 392f78402..6027d2a59 100644 --- a/readme/injections-of-abstractions.md +++ b/readme/injections-of-abstractions.md @@ -81,11 +81,11 @@ classDiagram class Program { +Program(IService service) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/interception.md b/readme/interception.md index 9a068391a..cf0509dbc 100644 --- a/readme/interception.md +++ b/readme/interception.md @@ -93,7 +93,7 @@ classDiagram <> +IService Root } - Service --|> IService : + Service --|> IService class Service { +Service() } diff --git a/readme/lazy.md b/readme/lazy.md index a0a88f7b7..6b8a5c15e 100644 --- a/readme/lazy.md +++ b/readme/lazy.md @@ -200,11 +200,11 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(LazyᐸIDependencyᐳ dependency) } diff --git a/readme/manually-started-tasks.md b/readme/manually-started-tasks.md index acbd8a321..7ca1d5641 100644 --- a/readme/manually-started-tasks.md +++ b/readme/manually-started-tasks.md @@ -119,11 +119,11 @@ classDiagram } class TaskFactory class CancellationToken - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(TaskᐸIDependencyᐳ dependencyTask) } diff --git a/readme/member-ordinal-attribute.md b/readme/member-ordinal-attribute.md index b65a5327b..ccb2ea296 100644 --- a/readme/member-ordinal-attribute.md +++ b/readme/member-ordinal-attribute.md @@ -236,7 +236,7 @@ classDiagram class Int32 class String class DateTime - Person --|> IPerson : + Person --|> IPerson class Person { +Person() +Int32 Id diff --git a/readme/method-injection.md b/readme/method-injection.md index 82dabebde..4f3a29ffa 100644 --- a/readme/method-injection.md +++ b/readme/method-injection.md @@ -77,11 +77,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service() +SetDependency(IDependency dependency) : Void diff --git a/readme/oncannotresolve-hint.md b/readme/oncannotresolve-hint.md index 54eed3b12..f30c65df5 100644 --- a/readme/oncannotresolve-hint.md +++ b/readme/oncannotresolve-hint.md @@ -98,11 +98,11 @@ classDiagram +IService Root } class String - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency(String name) } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/ondependencyinjection-hint.md b/readme/ondependencyinjection-hint.md index d64ac1bf5..f07ba80b2 100644 --- a/readme/ondependencyinjection-hint.md +++ b/readme/ondependencyinjection-hint.md @@ -95,11 +95,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/onnewinstance-hint.md b/readme/onnewinstance-hint.md index 65669d867..3c580cd1a 100644 --- a/readme/onnewinstance-hint.md +++ b/readme/onnewinstance-hint.md @@ -117,11 +117,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/overriding-the-bcl-binding.md b/readme/overriding-the-bcl-binding.md index 3a94ce645..b6b58f520 100644 --- a/readme/overriding-the-bcl-binding.md +++ b/readme/overriding-the-bcl-binding.md @@ -203,7 +203,7 @@ classDiagram + object Resolve(Type type, object? tag) } class ArrayᐸIDependencyᐳ - Service --|> IService : + Service --|> IService class Service { +Service(ArrayᐸIDependencyᐳ dependencies) } diff --git a/readme/partial-class.md b/readme/partial-class.md index 07a3653b6..4d277568f 100644 --- a/readme/partial-class.md +++ b/readme/partial-class.md @@ -228,7 +228,7 @@ classDiagram } class Int64 class String - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency(Int64 id) } diff --git a/readme/perblock.md b/readme/perblock.md index 3e441235b..2d57a3785 100644 --- a/readme/perblock.md +++ b/readme/perblock.md @@ -103,7 +103,7 @@ classDiagram class Service { +Service(IDependency dep1, IDependency dep2, LazyᐸValueTupleᐸIDependencyˏIDependencyᐳᐳ deps) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } diff --git a/readme/perresolve.md b/readme/perresolve.md index 1c7ca55d8..806b2993b 100644 --- a/readme/perresolve.md +++ b/readme/perresolve.md @@ -122,7 +122,7 @@ classDiagram class Service { +Service(IDependency dep1, IDependency dep2, LazyᐸValueTupleᐸIDependencyˏIDependencyᐳᐳ deps) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } diff --git a/readme/property-injection.md b/readme/property-injection.md index 3de5d26be..28428acf2 100644 --- a/readme/property-injection.md +++ b/readme/property-injection.md @@ -74,11 +74,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service() +IDependency Dependency diff --git a/readme/required-properties-or-fields.md b/readme/required-properties-or-fields.md index 1803ceea0..d8543d79b 100644 --- a/readme/required-properties-or-fields.md +++ b/readme/required-properties-or-fields.md @@ -87,11 +87,11 @@ classDiagram +IService Root } class String - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service() +String ServiceNameField diff --git a/readme/resolve-hint.md b/readme/resolve-hint.md index 4f1576f8a..eada4552a 100644 --- a/readme/resolve-hint.md +++ b/readme/resolve-hint.md @@ -75,11 +75,11 @@ classDiagram +IDependency DependencyRoot +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/resolve-methods.md b/readme/resolve-methods.md index 115c22217..4226bc6b1 100644 --- a/readme/resolve-methods.md +++ b/readme/resolve-methods.md @@ -243,11 +243,11 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/root-arguments.md b/readme/root-arguments.md index 8e111bae8..9d91154c6 100644 --- a/readme/root-arguments.md +++ b/readme/root-arguments.md @@ -101,11 +101,11 @@ classDiagram } class Int32 class String - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency(Int32 id, String dependencyName) } - Service --|> IService : + Service --|> IService class Service { +Service(String name, IDependency dependency) } diff --git a/readme/root-binding.md b/readme/root-binding.md index 22f0edfdd..f4d6b739c 100644 --- a/readme/root-binding.md +++ b/readme/root-binding.md @@ -53,7 +53,7 @@ classDiagram <> +IService Root } - Service --|> IService : + Service --|> IService class Service { +Service() } diff --git a/readme/scope.md b/readme/scope.md index c5a25d1b1..fb586a853 100644 --- a/readme/scope.md +++ b/readme/scope.md @@ -194,11 +194,11 @@ classDiagram class Program { +Program(FuncᐸSessionᐳ sessionFactory) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/service-collection.md b/readme/service-collection.md index edb7c6daf..ef81998c5 100644 --- a/readme/service-collection.md +++ b/readme/service-collection.md @@ -259,7 +259,7 @@ classDiagram class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/service-provider-with-scope.md b/readme/service-provider-with-scope.md index cad9ace7d..8ccc11f7e 100644 --- a/readme/service-provider-with-scope.md +++ b/readme/service-provider-with-scope.md @@ -326,11 +326,11 @@ classDiagram + object GetRequiredKeyedService(Type type, object? tag) } Composition --|> IDisposable - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/service-provider.md b/readme/service-provider.md index e327a8d21..0c97afb2f 100644 --- a/readme/service-provider.md +++ b/readme/service-provider.md @@ -251,11 +251,11 @@ classDiagram + object GetService(Type type) + object Resolve(Type type, object? tag) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/simplified-binding.md b/readme/simplified-binding.md index 0bba08a47..9c9d1394d 100644 --- a/readme/simplified-binding.md +++ b/readme/simplified-binding.md @@ -93,8 +93,8 @@ classDiagram class Service { +Service(Dependency dependencyImpl, IDependency dependency, IOtherDependency otherDependency) } - Dependency --|> IDependency : - Dependency --|> IOtherDependency : + Dependency --|> IDependency + Dependency --|> IOtherDependency class Dependency { +Dependency() } diff --git a/readme/singleton.md b/readme/singleton.md index 0e8d62108..4611301c5 100644 --- a/readme/singleton.md +++ b/readme/singleton.md @@ -90,11 +90,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency1, IDependency dependency2) } diff --git a/readme/span-and-readonlyspan.md b/readme/span-and-readonlyspan.md index 17e7a7404..82e9bc8ea 100644 --- a/readme/span-and-readonlyspan.md +++ b/readme/span-and-readonlyspan.md @@ -207,7 +207,7 @@ classDiagram class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(ReadOnlySpanᐸDependencyᐳ dependencies) } diff --git a/readme/tag-attribute.md b/readme/tag-attribute.md index 262a2c3fe..817ac1bcb 100644 --- a/readme/tag-attribute.md +++ b/readme/tag-attribute.md @@ -209,7 +209,7 @@ classDiagram class XyzDependency { +XyzDependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency1, IDependency dependency2) } diff --git a/readme/tag-type.md b/readme/tag-type.md index 362ab477e..7644dae4b 100644 --- a/readme/tag-type.md +++ b/readme/tag-type.md @@ -266,7 +266,7 @@ classDiagram + object Resolve(Type type, object? tag) } AbcDependency --|> IDependency : typeof(Pure.DI.UsageTests.Advanced.TagTypeScenario.AbcDependency) - AbcDependency --|> IDependency : + AbcDependency --|> IDependency class AbcDependency { +AbcDependency() } @@ -274,7 +274,7 @@ classDiagram class XyzDependency { +XyzDependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency1, IDependency dependency2, IDependency dependency3) } diff --git a/readme/tag-unique.md b/readme/tag-unique.md index 5b995b95c..0c3a414ce 100644 --- a/readme/tag-unique.md +++ b/readme/tag-unique.md @@ -197,7 +197,7 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - ServiceᐸStringᐳ --|> IServiceᐸStringᐳ : + ServiceᐸStringᐳ --|> IServiceᐸStringᐳ class ServiceᐸStringᐳ { +Service(IEnumerableᐸIDependencyᐸStringᐳᐳ dependencies) } diff --git a/readme/tags.md b/readme/tags.md index 123a221c3..c41567ade 100644 --- a/readme/tags.md +++ b/readme/tags.md @@ -130,7 +130,7 @@ classDiagram +IDependency XyzRoot } AbcDependency --|> IDependency : "Abc" - AbcDependency --|> IDependency : + AbcDependency --|> IDependency class AbcDependency { +AbcDependency() } @@ -138,7 +138,7 @@ classDiagram class XyzDependency { +XyzDependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency1, IDependency dependency2, IDependency dependency3) } diff --git a/readme/task.md b/readme/task.md index 0d29d1fde..6068f7800 100644 --- a/readme/task.md +++ b/readme/task.md @@ -124,11 +124,11 @@ classDiagram class TaskFactory class TaskScheduler class CancellationToken - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(TaskᐸIDependencyᐳ dependencyTask) } diff --git a/readme/threadsafe-hint.md b/readme/threadsafe-hint.md index 7cc5be3ac..cfdc29c61 100644 --- a/readme/threadsafe-hint.md +++ b/readme/threadsafe-hint.md @@ -64,11 +64,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/tostring-hint.md b/readme/tostring-hint.md index 7218ee889..b764238ae 100644 --- a/readme/tostring-hint.md +++ b/readme/tostring-hint.md @@ -62,11 +62,11 @@ classDiagram <> +IService MyService } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/tracking-async-disposable-instances-in-delegates.md b/readme/tracking-async-disposable-instances-in-delegates.md index edf07c1fa..41bd2fcf0 100644 --- a/readme/tracking-async-disposable-instances-in-delegates.md +++ b/readme/tracking-async-disposable-instances-in-delegates.md @@ -252,12 +252,12 @@ classDiagram + object Resolve(Type type, object? tag) } class Owned - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : - Service --|> IAsyncDisposable : + Service --|> IService + Service --|> IAsyncDisposable class Service { +Service(FuncᐸOwnedᐸIDependencyᐳᐳ dependencyFactory) } diff --git a/readme/tracking-async-disposable-instances-per-a-composition-root.md b/readme/tracking-async-disposable-instances-per-a-composition-root.md index 4e488c34e..142901fea 100644 --- a/readme/tracking-async-disposable-instances-per-a-composition-root.md +++ b/readme/tracking-async-disposable-instances-per-a-composition-root.md @@ -165,12 +165,12 @@ classDiagram + object Resolve(Type type, object? tag) } class Owned - Dependency --|> IDependency : - Dependency --|> IAsyncDisposable : + Dependency --|> IDependency + Dependency --|> IAsyncDisposable class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/tracking-disposable-instances-in-delegates.md b/readme/tracking-disposable-instances-in-delegates.md index 37b0ba59d..2f96b9af9 100644 --- a/readme/tracking-disposable-instances-in-delegates.md +++ b/readme/tracking-disposable-instances-in-delegates.md @@ -245,11 +245,11 @@ classDiagram + object Resolve(Type type, object? tag) } class Owned - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(FuncᐸOwnedᐸIDependencyᐳᐳ dependencyFactory) } diff --git a/readme/tracking-disposable-instances-per-a-composition-root.md b/readme/tracking-disposable-instances-per-a-composition-root.md index ea849f7a1..19ddfb322 100644 --- a/readme/tracking-disposable-instances-per-a-composition-root.md +++ b/readme/tracking-disposable-instances-per-a-composition-root.md @@ -161,11 +161,11 @@ classDiagram + object Resolve(Type type, object? tag) } class Owned - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency) } diff --git a/readme/transient.md b/readme/transient.md index ca8931cf3..62bb9f2f5 100644 --- a/readme/transient.md +++ b/readme/transient.md @@ -76,11 +76,11 @@ classDiagram <> +IService Root } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency1, IDependency dependency2) } diff --git a/readme/tuple.md b/readme/tuple.md index 657ec8575..f9224a089 100644 --- a/readme/tuple.md +++ b/readme/tuple.md @@ -193,11 +193,11 @@ classDiagram +ValueTuple(Point item1, IDependency item2) } class Point - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(ValueTupleᐸPointˏIDependencyᐳ tuple) } diff --git a/readme/type-attribute.md b/readme/type-attribute.md index 9df0e1ff8..ba9caf8a6 100644 --- a/readme/type-attribute.md +++ b/readme/type-attribute.md @@ -203,7 +203,7 @@ classDiagram class AbcDependency { +AbcDependency() } - Service --|> IService : + Service --|> IService class Service { +Service(IDependency dependency1, IDependency dependency2) } diff --git a/readme/valuetask.md b/readme/valuetask.md index aca9aed45..cbd83765f 100644 --- a/readme/valuetask.md +++ b/readme/valuetask.md @@ -199,11 +199,11 @@ classDiagram + object Resolve(Type type) + object Resolve(Type type, object? tag) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(ValueTaskᐸIDependencyᐳ dependencyTask) } diff --git a/readme/weak-reference.md b/readme/weak-reference.md index 016c4e15c..bdcb2b57f 100644 --- a/readme/weak-reference.md +++ b/readme/weak-reference.md @@ -186,11 +186,11 @@ classDiagram class WeakReferenceᐸIDependencyᐳ { +WeakReference(IDependency target) } - Dependency --|> IDependency : + Dependency --|> IDependency class Dependency { +Dependency() } - Service --|> IService : + Service --|> IService class Service { +Service(WeakReferenceᐸIDependencyᐳ dependency) } diff --git a/src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs b/src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs index 2a4f9e422..c4720f086 100644 --- a/src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs +++ b/src/Pure.DI.Core/Core/Code/ClassDiagramBuilder.cs @@ -79,7 +79,8 @@ public LinesBuilder Build(CompositionCode composition) } types.Add(contract.Type); - lines.AppendLine($"{FormatType(node.Type, DefaultFormatOptions)} --|> {FormatType(contract.Type, DefaultFormatOptions)} : {FormatTag(contract.Tag)}"); + var tag = FormatTag(contract.Tag); + lines.AppendLine($"{FormatType(node.Type, DefaultFormatOptions)} --|> {FormatType(contract.Type, DefaultFormatOptions)}{(string.IsNullOrWhiteSpace(tag) ? "" : $" : {tag}")}"); } var classDiagramWalker = new ClassDiagramWalker(this, lines, DefaultFormatOptions);