refactor(core): modernize rule registration and number normalization

Author: Agash

TTSTextNormalization/Core/TextNormalizationPipeline.cs

@@ -138,4 +138,4 @@ public string Normalize(string? inputText)
         _logger?.LogDebug("Normalization complete. Final text: \"{FinalText}\"", currentText);
         return currentText;
     }
-}
+}

TTSTextNormalization/DependencyInjection/RuleRegistration.cs

@@ -1,12 +1,13 @@
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
+using System.Diagnostics.CodeAnalysis;
 using TTSTextNormalization.Abstractions;
 
 namespace TTSTextNormalization.DependencyInjection;
 
 /// <summary>
 /// Internal record holding registration details for a normalization rule.
 /// </summary>
-public sealed class RuleRegistration
+public sealed record RuleRegistration
 {
     /// <summary>
     /// The concrete type of the rule implementation (<see cref="ITextNormalizationRule"/>).
@@ -23,4 +24,18 @@ public sealed class RuleRegistration
     /// If null, the rule's default order is used.
     /// </summary>
     public int? OrderOverride { get; init; }
-}
+
+    /// <summary>
+    /// Initializes a new instance of the <see cref="RuleRegistration"/> record.
+    /// </summary>
+    /// <param name="ruleType">The concrete rule implementation type.</param>
+    /// <param name="lifetime">The service lifetime for the rule.</param>
+    /// <param name="orderOverride">Optional order override for the rule.</param>
+    [SetsRequiredMembers]
+    public RuleRegistration(Type ruleType, ServiceLifetime lifetime, int? orderOverride = null)
+    {
+        RuleType = ruleType;
+        Lifetime = lifetime;
+        OrderOverride = orderOverride;
+    }
+}

TTSTextNormalization/DependencyInjection/TextNormalizationBuilder.cs

@@ -7,25 +7,15 @@ namespace TTSTextNormalization.DependencyInjection;
 /// <summary>
 /// Default implementation of <see cref="ITextNormalizationBuilder"/>.
 /// </summary>
-internal sealed class TextNormalizationBuilder : ITextNormalizationBuilder
+internal sealed class TextNormalizationBuilder(IServiceCollection services) : ITextNormalizationBuilder
 {
     /// <inheritdoc/>
-    public IServiceCollection Services { get; }
+    public IServiceCollection Services { get; } =
+        services ?? throw new ArgumentNullException(nameof(services));
 
     // Store registration details internally
     internal List<RuleRegistration> Registrations { get; } = [];
 
-    /// <summary>
-    /// Initializes a new instance of the <see cref="TextNormalizationBuilder"/> class.
-    /// </summary>
-    /// <param name="services">The service collection to configure.</param>
-    /// <exception cref="ArgumentNullException">Thrown if services is null.</exception>
-    public TextNormalizationBuilder(IServiceCollection services)
-    {
-        ArgumentNullException.ThrowIfNull(services);
-        Services = services;
-    }
-
     /// <inheritdoc/>
     public ITextNormalizationBuilder AddRule<T>(
         ServiceLifetime lifetime = ServiceLifetime.Singleton,
@@ -39,13 +29,8 @@ public ITextNormalizationBuilder AddRule<T>(
         // 2. Record the registration details (including the override) for the pipeline.
         //    We allow multiple registrations if needed, although the pipeline
         //    will likely resolve only one instance per type unless configured differently.
-        Registrations.Add(new RuleRegistration
-        {
-            RuleType = typeof(T),
-            Lifetime = lifetime,
-            OrderOverride = orderOverride
-        });
+        Registrations.Add(new RuleRegistration(typeof(T), lifetime, orderOverride));
 
         return this;
     }
-}
+}

TTSTextNormalization/Rules/AbbreviationNormalizationRule.cs

@@ -122,7 +122,7 @@ public AbbreviationNormalizationRule(IOptions<AbbreviationRuleOptions> optionsAc
     public string Apply(string inputText)
     {
         ArgumentNullException.ThrowIfNull(inputText);
-        if (string.IsNullOrEmpty(inputText) || _effectiveAbbreviations.Count == 0)
+        if (inputText.Length == 0 || _effectiveAbbreviations.Count == 0)
             return inputText;
 
         string currentText = inputText;

TTSTextNormalization/Rules/EmojiNormalizationRule.cs

@@ -99,4 +99,4 @@ private string EmojiMatchEvaluator(Match match)
             return match.Value;
         }
     }
-}
+}

TTSTextNormalization/Rules/NumberNormalizationRule.cs

@@ -18,7 +18,8 @@ public sealed partial class NumberNormalizationRule : ITextNormalizationRule
     private const int RegexTimeoutMilliseconds = 150;
 
     // Keep DigitWords for the new multi-dot logic
-    private static readonly string[] DigitWords = ["zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"];
+    private static readonly string[] DigitWords =
+        ["zero", "one", "two", "three", "four", "five", "six", "seven", "eight", "nine"];
 
     /// <summary>
     /// Initializes a new instance of the <see cref="NumberNormalizationRule"/> class.
@@ -29,7 +30,7 @@ public NumberNormalizationRule() { }
     public string Apply(string inputText)
     {
         ArgumentNullException.ThrowIfNull(inputText);
-        if (string.IsNullOrEmpty(inputText))
+        if (inputText.Length == 0)
             return inputText;
 
         string currentText = inputText;
@@ -121,10 +122,12 @@ private static string CardinalDecimalMatchEvaluator(Match match)
                     builder.Append(integerWords).Append(" point");
                     foreach (char digitChar in fractionPartStr)
                     {
-                        if (int.TryParse(digitChar.ToString(), out int digitValue) && digitValue >= 0 && digitValue <= 9)
-                        { builder.Append(' ').Append(DigitWords[digitValue]); }
-                        else
-                        { return match.Value; }
+                        if (digitChar is < '0' or > '9')
+                        {
+                            return match.Value;
+                        }
+
+                        builder.Append(' ').Append(DigitWords[digitChar - '0']);
                     }
 
                     return $" {builder} ";
@@ -154,4 +157,4 @@ private static string CardinalDecimalMatchEvaluator(Match match)
     // simpler integers or single-dot decimals.
     [GeneratedRegex(@"(?<![\p{L}\p{N}-])(?<integer>\d+)(?:\.(?<fraction>\d+))?(?![\p{L}\p{N}-])", RegexOptions.Compiled | RegexOptions.IgnoreCase | RegexOptions.CultureInvariant, RegexTimeoutMilliseconds)]
     private static partial Regex CardinalDecimalNumberRegex();
-}
+}