task: updated source gen templates

examples/02-aspnetcore-mvc-api-with-mongo-db/Catalog.Abstractions/Catalog.Abstractions.csproj

@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Primitively" Version="1.4.15-rc.1" PrivateAssets="all" />
+    <PackageReference Include="Primitively" Version="1.4.15-rc.2" PrivateAssets="all" />
   </ItemGroup>
 
 </Project>

examples/02-aspnetcore-mvc-api-with-mongo-db/Catalog.Api/Catalog.Api.csproj

@@ -13,9 +13,9 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
     <PackageReference Include="MongoDB.Driver" Version="2.23.1" />
-    <PackageReference Include="Primitively.AspNetCore.Mvc" Version="1.4.15-rc.1" />
-    <PackageReference Include="Primitively.AspNetCore.SwaggerGen" Version="1.4.15-rc.1" />
-    <PackageReference Include="Primitively.MongoDB.Bson" Version="1.4.15-rc.1" />
+    <PackageReference Include="Primitively.AspNetCore.Mvc" Version="1.4.15-rc.2" />
+    <PackageReference Include="Primitively.AspNetCore.SwaggerGen" Version="1.4.15-rc.2" />
+    <PackageReference Include="Primitively.MongoDB.Bson" Version="1.4.15-rc.2" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
   </ItemGroup>
 

src/Directory.Build.props

@@ -25,7 +25,7 @@
 
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <PackageOutputPath>$(MSBuildThisFileDirectory)..\artifacts</PackageOutputPath>
-    <version>1.4.15-rc.1</version>
+    <version>1.4.15-rc.2</version>
   </PropertyGroup>
 
   <ItemGroup>

src/Primitively.Abstractions/ByteAttribute.cs

@@ -1,13 +1,10 @@
-using System.Diagnostics;
-
-namespace Primitively;
+namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates a Unsigned 8-bit integer primitive value
 /// with a default range of: 0 to 255
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class ByteAttribute : Attribute, IIntegerAttribute<byte>
 {
     /// <inheritdoc/>

src/Primitively.Abstractions/DateOnlyAttribute.cs

@@ -1,13 +1,10 @@
-using System.Diagnostics;
-
-namespace Primitively;
+namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates a DateOnly primitive value
 /// with default Iso8601 format of yyyy-MM-dd
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class DateOnlyAttribute : Attribute, IPimitivelyAttribute
 {
     /// <inheritdoc/>

src/Primitively.Abstractions/GuidAttribute.cs

@@ -1,12 +1,9 @@
-using System.Diagnostics;
-
-namespace Primitively;
+namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates a GUID primitive value
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class GuidAttribute : Attribute, IPimitivelyAttribute
 {
     public GuidAttribute()

src/Primitively.Abstractions/IntAttribute.cs

@@ -1,19 +1,22 @@
-using System.Diagnostics;
-
-namespace Primitively;
+namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates a Signed 32-bit integer primitive value
 /// with a default range of: -2,147,483,648 to 2,147,483,647
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class IntAttribute : Attribute, IIntegerAttribute<int>
 {
     /// <inheritdoc/>
     public bool ImplementIValidatableObject { get; set; }
+
+    /// <inheritdoc/>
     public int Minimum { get; set; } = int.MinValue;
+
+    /// <inheritdoc/>
     public int Maximum { get; set; } = int.MaxValue;
+
     object IIntegerAttribute.Minimum { get => Minimum; }
+
     object IIntegerAttribute.Maximum { get => Maximum; }
 }

src/Primitively.Abstractions/LongAttribute.cs

@@ -1,13 +1,10 @@
-using System.Diagnostics;
-
-namespace Primitively;
+namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates a Signed 64-bit integer primitive value
 /// with a default range of: -9,223,372,036,854,775,807 to 9,223,372,036,854,775,807
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class LongAttribute : Attribute, IIntegerAttribute<long>
 {
     /// <inheritdoc/>

src/Primitively.Abstractions/SByteAttribute.cs

@@ -1,13 +1,10 @@
-using System.Diagnostics;
-
-namespace Primitively;
+namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates a Signed 8-bit integer primitive value
 /// with a default range of: -128 to 127
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class SByteAttribute : Attribute, IIntegerAttribute<sbyte>
 {
     /// <inheritdoc/>

src/Primitively.Abstractions/ShortAttribute.cs

@@ -1,13 +1,10 @@
-using System.Diagnostics;
-
-namespace Primitively;
+namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates a Signed 16-bit integer primitive value
 /// with a default range of: -32,768 to 32,767
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class ShortAttribute : Attribute, IIntegerAttribute<short>
 {
     /// <inheritdoc/>

src/Primitively.Abstractions/StringAttribute.cs

@@ -1,14 +1,11 @@
-using System.Diagnostics;
-
-#nullable enable
+#nullable enable
 
 namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates a String primitive value
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class StringAttribute : Attribute, IPimitivelyAttribute
 {
     /// <summary>

src/Primitively.Abstractions/UIntAttribute.cs

@@ -1,13 +1,10 @@
-using System.Diagnostics;
-
-namespace Primitively;
+namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates an Unsigned 32-bit integer primitive value
 /// with a default range of: 0 to 4,294,967,295
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class UIntAttribute : Attribute, IIntegerAttribute<uint>
 {
     /// <inheritdoc/>

src/Primitively.Abstractions/ULongAttribute.cs

@@ -1,13 +1,10 @@
-using System.Diagnostics;
-
-namespace Primitively;
+namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates an Unsigned 64-bit integer primitive value
 /// with a default range of: 0 to 18,446,744,073,709,551,615
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class ULongAttribute : Attribute, IIntegerAttribute<ulong>
 {
     /// <inheritdoc/>

src/Primitively.Abstractions/UShortAttribute.cs

@@ -1,13 +1,10 @@
-using System.Diagnostics;
-
-namespace Primitively;
+namespace Primitively;
 
 /// <summary>
 /// Make a readonly record struct that encapsulates an Unsigned 16-bit integer primitive value
 /// with a default range of: 0 to 65,535
 /// </summary>
 [AttributeUsage(AttributeTargets.Struct, Inherited = false, AllowMultiple = false)]
-[Conditional(Constants.ConditionalCompilationSymbol)]
 public sealed class UShortAttribute : Attribute, IIntegerAttribute<ushort>
 {
     /// <inheritdoc/>

src/Primitively/EmbeddedResources/PrimitiveFactory.cs

@@ -1,4 +1,6 @@
-public partial class PrimitiveFactory : Primitively.IPrimitiveFactory
+namespace PRIMITIVE_NAMESPACE;
+
+public partial class PrimitiveFactory : Primitively.IPrimitiveFactory
 {
 #nullable enable
     public Primitively.IPrimitive? Create(System.Type type, string? value)

src/Primitively/EmbeddedResources/PrimitiveLibrary.cs

@@ -1,10 +1,8 @@
-using Primitively;
-
-namespace PRIMITIVE_NAMESPACE;
+namespace PRIMITIVE_NAMESPACE;
 
 public readonly record struct PrimitiveLibrary
 {
-    public static IPrimitiveRepository Respository { get; } = new PrimitiveRepository();
-    public static IPrimitiveFactory Factory { get; } = new PrimitiveFactory();
+    public static Primitively.IPrimitiveRepository Respository { get; } = new PrimitiveRepository();
+    public static Primitively.IPrimitiveFactory Factory { get; } = new PrimitiveFactory();
     public static bool HasTypes => PRIMITIVE_LIBRARY_HAS_TYPES;
 }

src/Primitively/EmbeddedResources/PrimitiveRepository.cs

@@ -1,30 +1,24 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading;
-using Primitively;
+namespace PRIMITIVE_NAMESPACE;
 
-namespace PRIMITIVE_NAMESPACE;
-
-public partial class PrimitiveRepository : IPrimitiveRepository
+public partial class PrimitiveRepository : Primitively.IPrimitiveRepository
 {
-    private static readonly Lazy<IEnumerable<PrimitiveInfo>> _types = new(GetAll, LazyThreadSafetyMode.ExecutionAndPublication);
+    private static readonly System.Lazy<System.Collections.Generic.IEnumerable<Primitively.PrimitiveInfo>> _types = new(GetAll, System.Threading.LazyThreadSafetyMode.ExecutionAndPublication);
 
-    public PrimitiveInfo GetType(Type type) => _types.Value.Single(t => t.Type.Equals(type));
+    public Primitively.PrimitiveInfo GetType(System.Type type) => _types.Value.Single(t => t.Type.Equals(type));
 #nullable enable
-    public bool TryGetType(Type type, out PrimitiveInfo? result)
+    public bool TryGetType(System.Type type, out Primitively.PrimitiveInfo? result)
 #nullable disable
     {
         result = _types.Value.SingleOrDefault(t => t.Type.Equals(type));
 
         return result is not null;
     }
 
-    public IReadOnlyCollection<PrimitiveInfo> GetTypes() => _types.Value.ToList();
+    public System.Collections.Generic.IReadOnlyCollection<Primitively.PrimitiveInfo> GetTypes() => _types.Value.ToList();
 
-    public IReadOnlyCollection<T> GetTypes<T>() where T : PrimitiveInfo => _types.Value.OfType<T>().ToList();
+    public System.Collections.Generic.IReadOnlyCollection<T> GetTypes<T>() where T : Primitively.PrimitiveInfo => _types.Value.OfType<T>().ToList();
 
-    private static IEnumerable<PrimitiveInfo> GetAll()
+    private static System.Collections.Generic.IEnumerable<Primitively.PrimitiveInfo> GetAll()
     {
 PRIMITIVE_REPOSITORY_YIELD_STATEMENTS
     }

src/Primitively/MetaData.cs

@@ -2,8 +2,6 @@
 
 internal readonly struct MetaData
 {
-    public const string ConditionalCompilationSymbol = "PRIMITIVELY_USAGES";
-
     public readonly struct DateOnly
     {
         public static readonly string Interface = typeof(IDateOnly).FullName;

src/Primitively/Structs.cs

@@ -159,11 +159,10 @@ private static void GenerateFactoryFile(SourceProductionContext context, List<Re
         var sb = new StringBuilder();
         sb.Append(EmbeddedResources.AutoGeneratedHeader);
         sb.AppendLine();
-        sb.AppendLine($"namespace {compilation.AssemblyName};"); // TODO: Get Root Namespace from the Compilation class
-        sb.AppendLine();
         sb.Append(EmbeddedResources.PrimitiveFactory);
 
         // Replace variable names with values
+        sb.Replace("PRIMITIVE_NAMESPACE", compilation.AssemblyName); // TODO: Get Root Namespace from the Compilation class
         sb.Replace("PRIMITIVE_FACTORY_CASE_STATEMENTS", string.Join("\r\n", caseStatements));
 
         // Construct source file text from string
@@ -179,7 +178,7 @@ private static void GenerateRepositoryFile(SourceProductionContext context, List
 
         if (!dataTypes.Any())
         {
-            yieldStatements.Add($"{Padding}return Enumerable.Empty<PrimitiveInfo>();");
+            yieldStatements.Add($"{Padding}return System.Linq.Enumerable.Empty<Primitively.IPrimitiveInfo>();");
         }
         else
         {
@@ -191,17 +190,17 @@ private static void GenerateRepositoryFile(SourceProductionContext context, List
                     .OrderBy(rs => rs.Name)
                     .Select(rs => rs.DataType switch
                     {
-                        DataType.DateOnly => $"{Padding}yield return new DateOnlyInfo(typeof({rs.NameSpace}.{rs.Name}), typeof(DateOnly), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, \"{rs.Format}\", {rs.Length});",
-                        DataType.Guid => $"{Padding}yield return new GuidInfo(typeof({rs.NameSpace}.{rs.Name}), typeof(Guid), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {nameof(rs.Specifier)}.{rs.Specifier}, {rs.Length});",
-                        DataType.Byte => $"{Padding}yield return new IntegerInfo({nameof(DataType)}.{nameof(DataType.Byte)}, typeof({rs.NameSpace}.{rs.Name}), typeof(byte), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
-                        DataType.SByte => $"{Padding}yield return new IntegerInfo({nameof(DataType)}.{nameof(DataType.SByte)}, typeof({rs.NameSpace}.{rs.Name}), typeof(sbyte), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
-                        DataType.Short => $"{Padding}yield return new IntegerInfo({nameof(DataType)}.{nameof(DataType.Short)}, typeof({rs.NameSpace}.{rs.Name}), typeof(short), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
-                        DataType.UShort => $"{Padding}yield return new IntegerInfo({nameof(DataType)}.{nameof(DataType.UShort)}, typeof({rs.NameSpace}.{rs.Name}), typeof(ushort), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
-                        DataType.Int => $"{Padding}yield return new IntegerInfo({nameof(DataType)}.{nameof(DataType.Int)}, typeof({rs.NameSpace}.{rs.Name}), typeof(int), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
-                        DataType.UInt => $"{Padding}yield return new IntegerInfo({nameof(DataType)}.{nameof(DataType.UInt)}, typeof({rs.NameSpace}.{rs.Name}), typeof(uint), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
-                        DataType.Long => $"{Padding}yield return new IntegerInfo({nameof(DataType)}.{nameof(DataType.Long)}, typeof({rs.NameSpace}.{rs.Name}), typeof(long), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
-                        DataType.ULong => $"{Padding}yield return new IntegerInfo({nameof(DataType)}.{nameof(DataType.ULong)}, typeof({rs.NameSpace}.{rs.Name}), typeof(ulong), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
-                        DataType.String => $"{Padding}yield return new StringInfo(typeof({rs.NameSpace}.{rs.Name}), typeof(string), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, \"{rs.Format}\", \"{rs.Pattern}\", {rs.MinLength}, {rs.MaxLength});",
+                        DataType.DateOnly => $"{Padding}yield return new Primitively.DateOnlyInfo(typeof({rs.NameSpace}.{rs.Name}), typeof(System.DateOnly), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, \"{rs.Format}\", {rs.Length});",
+                        DataType.Guid => $"{Padding}yield return new Primitively.GuidInfo(typeof({rs.NameSpace}.{rs.Name}), typeof(System.Guid), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {nameof(rs.Specifier)}.{rs.Specifier}, {rs.Length});",
+                        DataType.Byte => $"{Padding}yield return new Primitively.IntegerInfo({nameof(DataType)}.{nameof(DataType.Byte)}, typeof({rs.NameSpace}.{rs.Name}), typeof(byte), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
+                        DataType.SByte => $"{Padding}yield return new Primitively.IntegerInfo({nameof(DataType)}.{nameof(DataType.SByte)}, typeof({rs.NameSpace}.{rs.Name}), typeof(sbyte), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
+                        DataType.Short => $"{Padding}yield return new Primitively.IntegerInfo({nameof(DataType)}.{nameof(DataType.Short)}, typeof({rs.NameSpace}.{rs.Name}), typeof(short), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
+                        DataType.UShort => $"{Padding}yield return new Primitively.IntegerInfo({nameof(DataType)}.{nameof(DataType.UShort)}, typeof({rs.NameSpace}.{rs.Name}), typeof(ushort), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
+                        DataType.Int => $"{Padding}yield return new Primitively.IntegerInfo({nameof(DataType)}.{nameof(DataType.Int)}, typeof({rs.NameSpace}.{rs.Name}), typeof(int), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
+                        DataType.UInt => $"{Padding}yield return new Primitively.IntegerInfo({nameof(DataType)}.{nameof(DataType.UInt)}, typeof({rs.NameSpace}.{rs.Name}), typeof(uint), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
+                        DataType.Long => $"{Padding}yield return new Primitively.IntegerInfo({nameof(DataType)}.{nameof(DataType.Long)}, typeof({rs.NameSpace}.{rs.Name}), typeof(long), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
+                        DataType.ULong => $"{Padding}yield return new Primitively.IntegerInfo({nameof(DataType)}.{nameof(DataType.ULong)}, typeof({rs.NameSpace}.{rs.Name}), typeof(ulong), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, {rs.Minimum ?? 0}, {rs.Maximum ?? 0});",
+                        DataType.String => $"{Padding}yield return new Primitively.StringInfo(typeof({rs.NameSpace}.{rs.Name}), typeof(string), \"{rs.Example}\", (value) => ({rs.NameSpace}.{rs.Name})value, \"{rs.Format}\", \"{rs.Pattern}\", {rs.MinLength}, {rs.MaxLength});",
                         _ => throw new NotImplementedException()
                     });