Minor refactor of extensions, some useful random extension methods for internal use

Atulin · Atulin · commit f7d38112a60f · 2026-06-22T08:47:11.000+02:00
diff --git a/Forged.Core/Core/RandomExtensions.cs b/Forged.Core/Core/RandomExtensions.cs
@@ -0,0 +1,17 @@
+﻿namespace Forged.Core.Core;
+
+internal static class RandomExtensions
+{
+	extension(Random rng)
+	{
+		internal bool Chance(float chance)
+		{
+			return rng.NextSingle() < chance;
+		}
+
+		internal T GetItem<T>(params T[] items)
+		{
+			return items[rng.Next(items.Length)];
+		}
+	}
+}
diff --git a/Forged.Core/Extensions/CollectionGeneratorExtensions.cs b/Forged.Core/Extensions/CollectionGeneratorExtensions.cs
@@ -1,6 +1,7 @@
+using Forged.Core.Generators;
 using Forged.Core.Generators.Utility;
 
-namespace Forged.Core.Generators.Extensions;
+namespace Forged.Core.Extensions;
 
 /// <summary>
 /// Extension methods for ICollection generators.
diff --git a/Forged.Core/Extensions/DateTimeGeneratorExtensions.cs b/Forged.Core/Extensions/DateTimeGeneratorExtensions.cs
@@ -1,6 +1,7 @@
+using Forged.Core.Generators;
 using Forged.Core.Generators.Utility.Temporal;
 
-namespace Forged.Core.Generators.Extensions;
+namespace Forged.Core.Extensions;
 
 /// <summary>
 /// Extension methods for DateTime generators.
diff --git a/Forged.Core/Extensions/EnumerableGeneratorExtensions.cs b/Forged.Core/Extensions/EnumerableGeneratorExtensions.cs
@@ -1,7 +1,8 @@
+using Forged.Core.Generators;
 using Forged.Core.Generators.Utility;
 using Forged.Core.Generators.Utility.Collections;
 
-namespace Forged.Core.Generators.Extensions;
+namespace Forged.Core.Extensions;
 
 /// <summary>
 /// Extension methods for IEnumerable generators.
diff --git a/Forged.Core/Extensions/GeneratorExtensions.cs b/Forged.Core/Extensions/GeneratorExtensions.cs
@@ -1,7 +1,8 @@
 using System.Globalization;
+using Forged.Core.Generators;
 using Forged.Core.Generators.Utility.Text;
 
-namespace Forged.Core.Generators.Extensions;
+namespace Forged.Core.Extensions;
 
 /// <summary>
 /// Provides general extension methods for the <see cref="Generator{T}"/> class.
diff --git a/Forged.Core/Extensions/StringGeneratorExtensions.cs b/Forged.Core/Extensions/StringGeneratorExtensions.cs
@@ -1,8 +1,9 @@
 using System.Globalization;
 using System.Text.RegularExpressions;
+using Forged.Core.Generators;
 using Forged.Core.Generators.Utility.Text;
 
-namespace Forged.Core.Generators.Extensions;
+namespace Forged.Core.Extensions;
 
 /// <summary>
 /// Extension methods for string generators.
diff --git a/Forged.Core/Extensions/StructGeneratorExtensions.cs b/Forged.Core/Extensions/StructGeneratorExtensions.cs
@@ -1,6 +1,7 @@
+using Forged.Core.Generators;
 using Forged.Core.Generators.Utility;
 
-namespace Forged.Core.Generators.Extensions;
+namespace Forged.Core.Extensions;
 
 /// <summary>
 /// Extension methods for struct generators.
diff --git a/Forged.Core/Generators/Internet/DomainGenerator.cs b/Forged.Core/Generators/Internet/DomainGenerator.cs
@@ -1,5 +1,6 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Forged.Core.Core;
 using JetBrains.Annotations;
 
 namespace Forged.Core.Generators.Internet;
@@ -31,14 +32,14 @@ public override string Generate()
 	{
 		var data = _cache.Value;
 
-		var domain = Rng.GetItems(data.Tld, 1)[0];
-		if (_ccSldChance <= float.Epsilon || Rng.NextDouble() <= _ccSldChance)
+		var domain = Rng.GetItem(data.Tld);
+		if (_ccSldChance  <= 0 || Rng.Chance(_ccSldChance))
 		{
 			return domain;
 		}
 
 		var slds = data.CcSld.Except([domain]).ToArray();
-		var sld = Rng.GetItems(slds, 1)[0];
+		var sld = Rng.GetItem(slds);
 
 		return $"{sld}.{domain}";
 	}
diff --git a/Forged.Core/Generators/Internet/EmailGenerator.cs b/Forged.Core/Generators/Internet/EmailGenerator.cs
@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Forged.Core.Core;
 using JetBrains.Annotations;
 using NetEscapades.EnumGenerators;
 
@@ -25,8 +26,8 @@ public override string Generate()
 
 		var domain = kind switch
 		{
-			EmailKind.Known => Rng.GetItems(_providers.ToArray(), 1)[0],
-			EmailKind.Example => Rng.GetItems(["example.com", "example.org", "example.net"], 1)[0],
+			EmailKind.Known => Rng.GetItem(_providers.ToArray()),
+			EmailKind.Example => Rng.GetItem(["example.com", "example.org", "example.net"]),
 			EmailKind.Random => $"{Forge.Text.Pronounceable(1, 3)}.{Forge.Internet.Domain()}",
 			_ => throw new ArgumentOutOfRangeException(nameof(kind), kind, null)
 		};
diff --git a/Forged.Core/Generators/Internet/UsernameGenerator.cs b/Forged.Core/Generators/Internet/UsernameGenerator.cs
@@ -1,6 +1,7 @@
 using System.Collections.Frozen;
 using System.Text.Json;
 using System.Text.Json.Serialization;
+using Forged.Core.Core;
 using JetBrains.Annotations;
 
 namespace Forged.Core.Generators.Internet;
@@ -52,8 +53,8 @@ public override string Generate()
 	{
 		var data = FileLoader.LoadData(Locale.Name, "internet/username", UserDataContext.Default.UserData);
 
-		var usePrefix = Rng.NextSingle() < prefixChance;
-		var useSuffix = Rng.NextSingle() < suffixChance;
+		var usePrefix = Rng.Chance(prefixChance);
+		var useSuffix = Rng.Chance(suffixChance);
 
 		var prefix = usePrefix ? data.Prefixes[Rng.Next(data.Prefixes.Length)] : string.Empty;
 		var suffix = useSuffix ? data.Suffixes[Rng.Next(data.Suffixes.Length)] : string.Empty;
@@ -67,11 +68,11 @@ public override string Generate()
 		var newCore = new List<char>(core.Length);
 		foreach (var ch in core)
 		{
-			if (Rng.NextSingle() < leetChance)
+			if (Rng.Chance(leetChance))
 			{
 				if (_leetReplacements.TryGetValue(ch, out var replacement))
 				{
-					newCore.AddRange(Rng.GetItems(replacement, 1)[0]);
+					newCore.AddRange(Rng.GetItem(replacement));
 				}
 				
 				newCore.Add(ch);
diff --git a/Forged.Core/Generators/Random/PickOneGenerator.cs b/Forged.Core/Generators/Random/PickOneGenerator.cs
@@ -1,3 +1,5 @@
+using Forged.Core.Core;
+
 namespace Forged.Core.Generators.Random;
 
 /// <summary>
@@ -10,5 +12,5 @@ public sealed class PickOneGenerator<T>(T[] items, Forge forge) : Generator<T>(f
 	/// Generates a random item from the collection.
 	/// </summary>
 	/// <returns>A randomly selected item from the collection.</returns>
-	public override T Generate() => items[Rng.Next(items.Length)];
+	public override T Generate() => Rng.GetItem(items);
 }
diff --git a/Forged.Core/Generators/Text/PronounceableStringGenerator.cs b/Forged.Core/Generators/Text/PronounceableStringGenerator.cs
@@ -1,4 +1,5 @@
 using System.Text;
+using Forged.Core.Core;
 
 namespace Forged.Core.Generators.Text;
 
@@ -41,9 +42,9 @@ public override string Generate()
 
 		for (var i = 0; i < length; i++)
 		{
-			var onset = Onsets[Rng.Next(Onsets.Length)];
-			var nucleus = Nuclei[Rng.Next(Nuclei.Length)];
-			var coda = Codas[Rng.Next(Codas.Length)];
+			var onset = Rng.GetItem(Onsets);
+			var nucleus = Rng.GetItem(Nuclei);
+			var coda = Rng.GetItem(Codas);
 
 			// Don't start a syllable with a heavy onset if it's in the middle
 			if (i > 0 && onset.Length > 1 && Rng.Next(2) == 0)
diff --git a/Forged.Core/Generators/Utility/NullableOrGenerator.cs b/Forged.Core/Generators/Utility/NullableOrGenerator.cs
@@ -1,3 +1,5 @@
+using Forged.Core.Core;
+
 namespace Forged.Core.Generators.Utility;
 
 /// <summary>
@@ -14,5 +16,5 @@ public sealed class NullableOrGenerator<T>(Generator<T> innerGenerator, T? fallb
 	/// Generates a value from the inner generator or returns the fallback.
 	/// </summary>
 	/// <returns>Either the fallback value or a value from the inner generator.</returns>
-	public override T? Generate() => Rng.NextDouble() < probability ? fallback : innerGenerator.Generate();
+	public override T? Generate() => Rng.Chance(probability) ? fallback : innerGenerator.Generate();
 }
diff --git a/Forged.Core/Generators/Utility/NullableOrValueGenerator.cs b/Forged.Core/Generators/Utility/NullableOrValueGenerator.cs
@@ -1,3 +1,5 @@
+using Forged.Core.Core;
+
 namespace Forged.Core.Generators.Utility;
 
 /// <summary>
@@ -13,5 +15,5 @@ public sealed class NullableOrValueGenerator<T>(Generator<T> innerGenerator, flo
 	/// Generates a value from the inner generator or returns null.
 	/// </summary>
 	/// <returns>Either null or a value from the inner generator.</returns>
-	public override T? Generate() => Rng.NextDouble() < probability ? null : innerGenerator.Generate();
+	public override T? Generate() => Rng.Chance(probability) ? null : innerGenerator.Generate();
 }
diff --git a/Forged.Core/Generators/Utility/OrGenerator.cs b/Forged.Core/Generators/Utility/OrGenerator.cs
@@ -1,3 +1,5 @@
+using Forged.Core.Core;
+
 namespace Forged.Core.Generators.Utility;
 
 /// <summary>
@@ -14,5 +16,5 @@ public sealed class OrGenerator<T>(Generator<T> innerGenerator, T fallback, floa
 	/// Generates a value from the inner generator or returns the fallback.
 	/// </summary>
 	/// <returns>Either the fallback value or a value from the inner generator.</returns>
-	public override T Generate() => Rng.NextDouble() < probability ? fallback : innerGenerator.Generate();
+	public override T Generate() => Rng.Chance(probability) ? fallback : innerGenerator.Generate();
 }
diff --git a/Forged.Core/Generators/Utility/Text/SentencifyGenerator.cs b/Forged.Core/Generators/Utility/Text/SentencifyGenerator.cs
@@ -1,5 +1,6 @@
 using System.Globalization;
 using System.Text;
+using Forged.Core.Core;
 
 namespace Forged.Core.Generators.Utility.Text;
 
@@ -44,7 +45,7 @@ public override string Generate()
 				continue;
 			}
 			
-			if (length >= minSentenceLength && (length >= maxSentenceLength || Rng.NextDouble() < 0.15))
+			if (length >= minSentenceLength && (length >= maxSentenceLength || Rng.Chance(0.15f)))
 			{
 				builder.Append(word);
 				builder.Append('.');
diff --git a/Forged.Demo/Program.cs b/Forged.Demo/Program.cs
@@ -1,6 +1,6 @@
 using System.Text.Json;
 using System.Text.RegularExpressions;
-using Forged.Core.Generators.Extensions;
+using Forged.Core.Extensions;
 using Forged.Core.Generators.Internet;
 using Forged.Core.Generators.Text;
 using Forged.Core.Generators.Utility;

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System.Text.Json;`
`2`	`2`	`using System.Text.Json.Serialization;`
	`3`	`+using Forged.Core.Core;`
`3`	`4`	`using JetBrains.Annotations;`
`4`	`5`
`5`	`6`	`namespace Forged.Core.Generators.Internet;`
`@@ -31,14 +32,14 @@ public override string Generate()`
`31`	`32`	`{`
`32`	`33`	`var data = _cache.Value;`
`33`	`34`
`34`		`- var domain = Rng.GetItems(data.Tld, 1)[0];`
`35`		`- if (_ccSldChance <= float.Epsilon \|\| Rng.NextDouble() <= _ccSldChance)`
	`35`	`+ var domain = Rng.GetItem(data.Tld);`
	`36`	`+ if (_ccSldChance <= 0 \|\| Rng.Chance(_ccSldChance))`
`36`	`37`	`{`
`37`	`38`	`return domain;`
`38`	`39`	`}`
`39`	`40`
`40`	`41`	`var slds = data.CcSld.Except([domain]).ToArray();`
`41`		`- var sld = Rng.GetItems(slds, 1)[0];`
	`42`	`+ var sld = Rng.GetItem(slds);`
`42`	`43`
`43`	`44`	`return $"{sld}.{domain}";`
`44`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Collections.Frozen;`
`2`	`2`	`using System.Text.Json;`
`3`	`3`	`using System.Text.Json.Serialization;`
	`4`	`+using Forged.Core.Core;`
`4`	`5`	`using JetBrains.Annotations;`
`5`	`6`
`6`	`7`	`namespace Forged.Core.Generators.Internet;`
`@@ -52,8 +53,8 @@ public override string Generate()`
`52`	`53`	`{`
`53`	`54`	`var data = FileLoader.LoadData(Locale.Name, "internet/username", UserDataContext.Default.UserData);`
`54`	`55`
`55`		`- var usePrefix = Rng.NextSingle() < prefixChance;`
`56`		`- var useSuffix = Rng.NextSingle() < suffixChance;`
	`56`	`+ var usePrefix = Rng.Chance(prefixChance);`
	`57`	`+ var useSuffix = Rng.Chance(suffixChance);`
`57`	`58`
`58`	`59`	`var prefix = usePrefix ? data.Prefixes[Rng.Next(data.Prefixes.Length)] : string.Empty;`
`59`	`60`	`var suffix = useSuffix ? data.Suffixes[Rng.Next(data.Suffixes.Length)] : string.Empty;`
`@@ -67,11 +68,11 @@ public override string Generate()`
`67`	`68`	`var newCore = new List<char>(core.Length);`
`68`	`69`	`foreach (var ch in core)`
`69`	`70`	`{`
`70`		`- if (Rng.NextSingle() < leetChance)`
	`71`	`+ if (Rng.Chance(leetChance))`
`71`	`72`	`{`
`72`	`73`	`if (_leetReplacements.TryGetValue(ch, out var replacement))`
`73`	`74`	`{`
`74`		`- newCore.AddRange(Rng.GetItems(replacement, 1)[0]);`
	`75`	`+ newCore.AddRange(Rng.GetItem(replacement));`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`newCore.Add(ch);`