Expose building typeinspector since it's used in other areas

aaubry · Jul 14, 2024 · 30cced2 · 30cced2
1 parent c428589
commit 30cced2
Show file tree

Hide file tree

Showing 4 changed files with 61 additions and 14 deletions.
diff --git a/YamlDotNet/Serialization/DeserializerBuilder.cs b/YamlDotNet/Serialization/DeserializerBuilder.cs
@@ -130,7 +130,11 @@ public DeserializerBuilder()
 
         protected override DeserializerBuilder Self { get { return this; } }
 
-        internal ITypeInspector BuildTypeInspector()
+        /// <summary>
+        /// Builds the type inspector used by various classes to get information about types and their members.
+        /// </summary>
+        /// <returns></returns>
+        public ITypeInspector BuildTypeInspector()
         {
             ITypeInspector innerInspector = new WritablePropertiesTypeInspector(typeResolver, includeNonPublicProperties);
 

diff --git a/YamlDotNet/Serialization/SerializerBuilder.cs b/YamlDotNet/Serialization/SerializerBuilder.cs
@@ -158,10 +158,14 @@ public SerializerBuilder WithMaximumRecursion(int maximumRecursion)
         /// </summary>
         /// <param name="eventEmitterFactory">A function that instantiates the event emitter.</param>
         public SerializerBuilder WithEventEmitter<TEventEmitter>(Func<IEventEmitter, TEventEmitter> eventEmitterFactory)
-            where TEventEmitter : IEventEmitter
-        {
-            return WithEventEmitter(eventEmitterFactory, w => w.OnTop());
-        }
+            where TEventEmitter : IEventEmitter => WithEventEmitter(eventEmitterFactory, w => w.OnTop());
+
+        /// <summary>
+        /// Registers an additional <see cref="IEventEmitter" /> to be used by the serializer.
+        /// </summary>
+        /// <param name="eventEmitterFactory">A function that instantiates the event emitter.</param>
+        public SerializerBuilder WithEventEmitter<TEventEmitter>(Func<IEventEmitter, ITypeInspector, TEventEmitter> eventEmitterFactory)
+            where TEventEmitter : IEventEmitter => WithEventEmitter(eventEmitterFactory, w => w.OnTop());
 
         /// <summary>
         /// Registers an additional <see cref="IEventEmitter" /> to be used by the serializer.
@@ -171,6 +175,16 @@ public SerializerBuilder WithEventEmitter<TEventEmitter>(Func<IEventEmitter, TEv
         public SerializerBuilder WithEventEmitter<TEventEmitter>(
             Func<IEventEmitter, TEventEmitter> eventEmitterFactory,
             Action<IRegistrationLocationSelectionSyntax<IEventEmitter>> where
+        ) where TEventEmitter : IEventEmitter => WithEventEmitter((IEventEmitter e, ITypeInspector _) => eventEmitterFactory(e), where);
+
+        /// <summary>
+        /// Registers an additional <see cref="IEventEmitter" /> to be used by the serializer.
+        /// </summary>
+        /// <param name="eventEmitterFactory">A function that instantiates the event emitter.</param>
+        /// <param name="where">Configures the location where to insert the <see cref="IEventEmitter" /></param>
+        public SerializerBuilder WithEventEmitter<TEventEmitter>(
+            Func<IEventEmitter, ITypeInspector, TEventEmitter> eventEmitterFactory,
+            Action<IRegistrationLocationSelectionSyntax<IEventEmitter>> where
         )
             where TEventEmitter : IEventEmitter
         {
@@ -184,10 +198,11 @@ Action<IRegistrationLocationSelectionSyntax<IEventEmitter>> where
                 throw new ArgumentNullException(nameof(where));
             }
 
-            where(eventEmitterFactories.CreateRegistrationLocationSelector(typeof(TEventEmitter), inner => eventEmitterFactory(inner)));
+            where(eventEmitterFactories.CreateRegistrationLocationSelector(typeof(TEventEmitter), inner => eventEmitterFactory(inner, BuildTypeInspector())));
             return Self;
         }
 
+
         /// <summary>
         /// Registers an additional <see cref="IEventEmitter" /> to be used by the serializer.
         /// </summary>
@@ -695,7 +710,11 @@ public IValueSerializer BuildValueSerializer()
             );
         }
 
-        internal ITypeInspector BuildTypeInspector()
+        /// <summary>
+        /// Builds the type inspector used by various classes to get information about types and their members.
+        /// </summary>
+        /// <returns></returns>
+        public ITypeInspector BuildTypeInspector()
         {
             ITypeInspector innerInspector = new ReadablePropertiesTypeInspector(typeResolver, includeNonPublicProperties);
 

diff --git a/YamlDotNet/Serialization/StaticDeserializerBuilder.cs b/YamlDotNet/Serialization/StaticDeserializerBuilder.cs
@@ -123,7 +123,11 @@ public StaticDeserializerBuilder(StaticContext context)
 
         protected override StaticDeserializerBuilder Self { get { return this; } }
 
-        internal ITypeInspector BuildTypeInspector()
+        /// <summary>
+        /// Builds the type inspector used by various classes to get information about types and their members.
+        /// </summary>
+        /// <returns></returns>
+        public ITypeInspector BuildTypeInspector()
         {
             ITypeInspector innerInspector = context.GetTypeInspector();
 

diff --git a/YamlDotNet/Serialization/StaticSerializerBuilder.cs b/YamlDotNet/Serialization/StaticSerializerBuilder.cs
@@ -164,10 +164,14 @@ public StaticSerializerBuilder WithMaximumRecursion(int maximumRecursion)
         /// </summary>
         /// <param name="eventEmitterFactory">A function that instantiates the event emitter.</param>
         public StaticSerializerBuilder WithEventEmitter<TEventEmitter>(Func<IEventEmitter, TEventEmitter> eventEmitterFactory)
-            where TEventEmitter : IEventEmitter
-        {
-            return WithEventEmitter(eventEmitterFactory, w => w.OnTop());
-        }
+            where TEventEmitter : IEventEmitter => WithEventEmitter(eventEmitterFactory, w => w.OnTop());
+
+        /// <summary>
+        /// Registers an additional <see cref="IEventEmitter" /> to be used by the serializer.
+        /// </summary>
+        /// <param name="eventEmitterFactory">A function that instantiates the event emitter.</param>
+        public StaticSerializerBuilder WithEventEmitter<TEventEmitter>(Func<IEventEmitter, ITypeInspector, TEventEmitter> eventEmitterFactory)
+            where TEventEmitter : IEventEmitter => WithEventEmitter(eventEmitterFactory, w => w.OnTop());
 
         /// <summary>
         /// Registers an additional <see cref="IEventEmitter" /> to be used by the serializer.
@@ -177,6 +181,16 @@ public StaticSerializerBuilder WithEventEmitter<TEventEmitter>(Func<IEventEmitte
         public StaticSerializerBuilder WithEventEmitter<TEventEmitter>(
             Func<IEventEmitter, TEventEmitter> eventEmitterFactory,
             Action<IRegistrationLocationSelectionSyntax<IEventEmitter>> where
+        ) where TEventEmitter : IEventEmitter => WithEventEmitter((IEventEmitter e, ITypeInspector _) => eventEmitterFactory(e), where);
+
+        /// <summary>
+        /// Registers an additional <see cref="IEventEmitter" /> to be used by the serializer.
+        /// </summary>
+        /// <param name="eventEmitterFactory">A function that instantiates the event emitter.</param>
+        /// <param name="where">Configures the location where to insert the <see cref="IEventEmitter" /></param>
+        public StaticSerializerBuilder WithEventEmitter<TEventEmitter>(
+            Func<IEventEmitter, ITypeInspector, TEventEmitter> eventEmitterFactory,
+            Action<IRegistrationLocationSelectionSyntax<IEventEmitter>> where
         )
             where TEventEmitter : IEventEmitter
         {
@@ -190,10 +204,11 @@ Action<IRegistrationLocationSelectionSyntax<IEventEmitter>> where
                 throw new ArgumentNullException(nameof(where));
             }
 
-            where(eventEmitterFactories.CreateRegistrationLocationSelector(typeof(TEventEmitter), inner => eventEmitterFactory(inner)));
+            where(eventEmitterFactories.CreateRegistrationLocationSelector(typeof(TEventEmitter), inner => eventEmitterFactory(inner, BuildTypeInspector())));
             return Self;
         }
 
+
         /// <summary>
         /// Registers an additional <see cref="IEventEmitter" /> to be used by the serializer.
         /// </summary>
@@ -219,6 +234,7 @@ Action<ITrackingRegistrationLocationSelectionSyntax<IEventEmitter>> where
             return Self;
         }
 
+
         /// <summary>
         /// Unregisters an existing <see cref="IEventEmitter" /> of type <typeparam name="TEventEmitter" />.
         /// </summary>
@@ -698,7 +714,11 @@ public IValueSerializer BuildValueSerializer()
             );
         }
 
-        internal ITypeInspector BuildTypeInspector()
+        /// <summary>
+        /// Builds the type inspector used by various classes to get information about types and their members.
+        /// </summary>
+        /// <returns></returns>
+        public ITypeInspector BuildTypeInspector()
         {
             var typeInspector = context.GetTypeInspector();