Rename package to StrucTId, TValue > TId

This plays with the `<TId>` icon.

Author: kzu

readme.md

@@ -1,4 +1,4 @@
-![Icon](img/icon-32.png) StructId
+![Icon](assets/img/icon-32.png) StrucTId
 ============
 
 [![Version](https://img.shields.io/nuget/vpre/StructId.svg?color=royalblue)](https://www.nuget.org/packages/StructId)
@@ -24,15 +24,15 @@ Unlike other such libraries for .NET, StructId introduces several unique feature
 1. Leverages newest language and runtime features for cleaner and more efficient code, 
    such as:
    1. IParsable<T> for parsing from strings.
-   1. Static interface members, for consistent `TSelf.New(TValue value)` factory 
-      method and proper type constraint (via a provided `INewable<TSelf, TValue>` interface).
+   1. Static interface members, for consistent `TSelf.New(TId value)` factory 
+      method and proper type constraint (via a provided `INewable<TSelf, TId>` interface).
 
 
 ## Usage
 
 After installing the [StructId package](https://nuget.org/packages/StructId), the project 
 (with a direct reference to the `StructId` package) will contain the main interfaces 
-`IStruct` (for string-typed IDs) and `IStructId<TValue>`. 
+`IStruct` (for string-typed IDs) and `IStructId<TId>`. 
 
 > NOTE: the package only needs to be installed in the top-level project in your solution, 
 > since analyzers/generators will [automatically propagate to referencing projects]((https://github.com/dotnet/sdk/issues/1212)).
@@ -44,7 +44,7 @@ you publish one).
 The default target namespace for the included types will match the `RootNamespace` of the 
 project, but can be customized by setting the `StructIdNamespace` property.
 
-You can simply declare a new ID type by implementing `IStructId<TValue>`:
+You can simply declare a new ID type by implementing `IStructId<TId>`:
 
 ```csharp
 public readonly partial record struct UserId : IStructId<Guid>;

src/StructId.Analyzer/EntityFrameworkGenerator.cs

@@ -30,9 +30,9 @@ void GenerateValueSelector(SourceProductionContext context, ImmutableArray<Templ
         context.AddSource($"ValueConverterSelector.cs", output);
     }
 
-    record StructIdModel(string TSelf, string TValueType)
+    record StructIdModel(string TSelf, string TIdType)
     {
-        public string TValue => TValueType switch
+        public string TId => TIdType switch
         {
             "System.String" => "string",
             "System.Int32" => "int",
@@ -53,7 +53,7 @@ record StructIdModel(string TSelf, string TValueType)
             "System.UInt16" => "ushort",
             "System.Int16" => "short",
             "System.Object" => "object",
-            _ => TValueType
+            _ => TIdType
         };
     }
 

src/StructId.Analyzer/EntityFrameworkSelector.sbn

@@ -39,7 +39,7 @@ public static class StructIdDbContextOptionsBuilderExtensions
             {{~ for id in Ids ~}}
             if (modelClrType == typeof({{ id.TSelf }}))
                 yield return converters.GetOrAdd((modelClrType, providerClrType), key => new ValueConverterInfo(
-                    key.ModelClrType, key.ProviderClrType ?? typeof({{ id.TValue }}),
+                    key.ModelClrType, key.ProviderClrType ?? typeof({{ id.TId }}),
                     info => new {{ id.TSelf }}.EntityFrameworkValueConverter(info.MappingHints)));
 
             {{~ end ~}}

src/StructId.Analyzer/TemplateGenerator.cs

@@ -83,7 +83,7 @@ void GenerateCode(SourceProductionContext context, TemplateArgs args)
             // Simple names suffices since we emit a partial in the same namespace
             .Replace("TSelf", args.StructId.Name)
             .Replace("Self", args.StructId.Name)
-            .Replace("TValue", args.ValueType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
+            .Replace("TId", args.ValueType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat));
 
         // parse template into a C# compilation unit
         var parseable = CSharpSyntaxTree.ParseText(template).GetCompilationUnitRoot();

src/StructId.Package/StructId.Package.msbuildproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.Build.NoTargets/3.7.0">
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
-    <PackageId>StructId</PackageId>
+    <PackageId>StrucTId</PackageId>
     <DevelopmentDependency>true</DevelopmentDependency>
     <Description>Stronly typed ids using readonly record structs.s</Description>
     <PackageTags>dotnet record struct typed id</PackageTags>

src/StructId.Tests/TestExtensions.cs

@@ -72,6 +72,6 @@ public static string Replace(this string template, Regex regex, string value)
     [GeneratedRegex(@"\bTSelf\b")]
     private static partial Regex TSelfExpr();
 
-    [GeneratedRegex(@"\bTValue\b")]
+    [GeneratedRegex(@"\bTId\b")]
     private static partial Regex TValueExpr();
 }

src/StructId/INewableT.cs

@@ -6,10 +6,10 @@ namespace StructId;
 /// Interface implemented by <see cref="IStructId{T}"/> 
 /// that support creating new instances of the identifier.
 /// </summary>
-public interface INewable<TSelf, TValue>
+public interface INewable<TSelf, TId>
 {
     /// <summary>
     /// Creates a new identifier from the given identifier value.
     /// </summary>
-    public abstract static TSelf New(TValue value);
+    public abstract static TSelf New(TId value);
 }

src/StructId/IStructIdT.cs

@@ -5,11 +5,11 @@ namespace StructId;
 /// <summary>
 /// Interface for struct-based identifiers.
 /// </summary>
-/// <typeparam name="T">The struct type for the inner <see cref="Value"/> of the identifier.</typeparam>
-public partial interface IStructId<T> where T : struct
+/// <typeparam name="TId">The struct type for the inner <see cref="Value"/> of the identifier.</typeparam>
+public partial interface IStructId<TId> where TId : struct
 {
     /// <summary>
     /// Gets the underlying value of the identifier.
     /// </summary>
-    T Value { get; }
+    TId Value { get; }
 }

src/StructId/StructIdConverters.JsonConverter.cs

@@ -9,13 +9,12 @@ namespace StructId;
 
 public static partial class StructIdConverters
 {
-#if NET7_0_OR_GREATER
-    public class SystemTextJsonConverter<TSelf, TValue> : JsonConverter<TSelf>
-        where TSelf : IStructId<TValue>, INewable<TSelf, TValue>
-        where TValue: struct, IParsable<TValue>
+    public class SystemTextJsonConverter<TSelf, TId> : JsonConverter<TSelf>
+        where TSelf : IStructId<TId>, INewable<TSelf, TId>
+        where TId: struct, IParsable<TId>
     {
         public override TSelf Read(ref Utf8JsonReader reader, Type typeToConvert, JsonSerializerOptions options)
-            => TSelf.New(TValue.Parse(reader.GetString() ?? throw new FormatException("Unsupported null value for struct id."), CultureInfo.InvariantCulture));
+            => TSelf.New(TId.Parse(reader.GetString() ?? throw new FormatException("Unsupported null value for struct id."), CultureInfo.InvariantCulture));
 
         public override void Write(Utf8JsonWriter writer, TSelf value, JsonSerializerOptions options)
         {
@@ -24,7 +23,7 @@ public override void Write(Utf8JsonWriter writer, TSelf value, JsonSerializerOpt
                 case Guid guid:
                     writer.WriteStringValue(guid);
                     break;
-                case TValue inner:
+                case TId inner:
                     writer.WriteRawValue(inner.ToString());
                     break;
                 default:
@@ -33,7 +32,7 @@ public override void Write(Utf8JsonWriter writer, TSelf value, JsonSerializerOpt
         }
 
         public override TSelf ReadAsPropertyName(ref global::System.Text.Json.Utf8JsonReader reader, global::System.Type typeToConvert, global::System.Text.Json.JsonSerializerOptions options)
-            => TSelf.New(TValue.Parse(reader.GetString() ?? throw new FormatException("Unsupported null value for struct id."), CultureInfo.InvariantCulture));
+            => TSelf.New(TId.Parse(reader.GetString() ?? throw new FormatException("Unsupported null value for struct id."), CultureInfo.InvariantCulture));
 
         public override void WriteAsPropertyName(global::System.Text.Json.Utf8JsonWriter writer, TSelf value, global::System.Text.Json.JsonSerializerOptions options)
             => writer.WritePropertyName(value.Value.ToString());
@@ -54,5 +53,4 @@ public override TSelf ReadAsPropertyName(ref global::System.Text.Json.Utf8JsonRe
         public override void WriteAsPropertyName(global::System.Text.Json.Utf8JsonWriter writer, TSelf value, global::System.Text.Json.JsonSerializerOptions options)
             => writer.WritePropertyName(value.Value);
     }
-#endif
 }

src/StructId/Templates/EntityFramework.cs

@@ -4,12 +4,12 @@
 using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
 using StructId;
 
-readonly partial record struct TSelf : INewable<TSelf, TValue>
+readonly partial record struct TSelf : INewable<TSelf, TId>
 {
     /// <summary>
     /// Provides value conversion for Entity Framework Core
     /// </summary>
-    public partial class EntityFrameworkValueConverter : ValueConverter<TSelf, TValue>
+    public partial class EntityFrameworkValueConverter : ValueConverter<TSelf, TId>
     {
         public EntityFrameworkValueConverter() : this(null) { }