Use (string, T) instead of ZLogger.Param

Cysharp · Oct 20, 2023 · b8de8d1 · b8de8d1
1 parent a77f06b
commit b8de8d1
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 37 deletions.
diff --git a/src/ZLogger/ZLoggerInterpolatedStringHandler.LogLevel.cs b/src/ZLogger/ZLoggerInterpolatedStringHandler.LogLevel.cs
@@ -29,9 +29,9 @@ public void AppendFormatted<T>(Nullable<T> value, int alignment = 0, string? for
         this.innerHandler.AppendFormatted<T>(value, alignment, format, argumentName);
     }
 
-    public void AppendFormatted<T>(ZLoggerNamedParam<T> value, int alignment = 0, string? format = null, string? _ = null)
+    public void AppendFormatted<T>((string, T) namedValue, int alignment = 0, string? format = null, string? _ = null)
     {
-        this.innerHandler.AppendFormatted(value, alignment, format);
+        this.innerHandler.AppendFormatted(namedValue, alignment, format);
     }
 }
 
@@ -60,9 +60,9 @@ public void AppendFormatted<T>(Nullable<T> value, int alignment = 0, string? for
         this.innerHandler.AppendFormatted<T>(value, alignment, format, argumentName);
     }
 
-    public void AppendFormatted<T>(ZLoggerNamedParam<T> value, int alignment = 0, string? format = null, string? _ = null)
+    public void AppendFormatted<T>((string, T) namedValue, int alignment = 0, string? format = null, string? _ = null)
     {
-        this.innerHandler.AppendFormatted(value, alignment, format);
+        this.innerHandler.AppendFormatted(namedValue, alignment, format);
     }
 }
 
@@ -91,9 +91,9 @@ public void AppendFormatted<T>(Nullable<T> value, int alignment = 0, string? for
         this.innerHandler.AppendFormatted<T>(value, alignment, format, argumentName);
     }
 
-    public void AppendFormatted<T>(ZLoggerNamedParam<T> value, int alignment = 0, string? format = null, string? _ = null)
+    public void AppendFormatted<T>((string, T) namedValue, int alignment = 0, string? format = null, string? _ = null)
     {
-        this.innerHandler.AppendFormatted(value, alignment, format);
+        this.innerHandler.AppendFormatted(namedValue, alignment, format);
     }
 }
 
@@ -122,9 +122,9 @@ public void AppendFormatted<T>(Nullable<T> value, int alignment = 0, string? for
         this.innerHandler.AppendFormatted<T>(value, alignment, format, argumentName);
     }
 
-    public void AppendFormatted<T>(ZLoggerNamedParam<T> value, int alignment = 0, string? format = null, string? _ = null)
+    public void AppendFormatted<T>((string, T) namedValue, int alignment = 0, string? format = null, string? _ = null)
     {
-        this.innerHandler.AppendFormatted(value, alignment, format);
+        this.innerHandler.AppendFormatted(namedValue, alignment, format);
     }
 }
 
@@ -153,9 +153,9 @@ public void AppendFormatted<T>(Nullable<T> value, int alignment = 0, string? for
         this.innerHandler.AppendFormatted<T>(value, alignment, format, argumentName);
     }
 
-    public void AppendFormatted<T>(ZLoggerNamedParam<T> value, int alignment = 0, string? format = null, string? _ = null)
+    public void AppendFormatted<T>((string, T) namedValue, int alignment = 0, string? format = null, string? _ = null)
     {
-        this.innerHandler.AppendFormatted(value, alignment, format);
+        this.innerHandler.AppendFormatted(namedValue, alignment, format);
     }
 }
 
@@ -184,9 +184,9 @@ public void AppendFormatted<T>(Nullable<T> value, int alignment = 0, string? for
         this.innerHandler.AppendFormatted<T>(value, alignment, format, argumentName);
     }
 
-    public void AppendFormatted<T>(ZLoggerNamedParam<T> value, int alignment = 0, string? format = null, string? _ = null)
+    public void AppendFormatted<T>((string, T) namedValue, int alignment = 0, string? format = null, string? _ = null)
     {
-        this.innerHandler.AppendFormatted(value, alignment, format);
+        this.innerHandler.AppendFormatted(namedValue, alignment, format);
     }
 }
 
diff --git a/src/ZLogger/ZLoggerInterpolatedStringHandler.LogLevel.tt b/src/ZLogger/ZLoggerInterpolatedStringHandler.LogLevel.tt
@@ -39,9 +39,9 @@ public ref struct ZLogger<#= logLevel #>InterpolatedStringHandler
         this.innerHandler.AppendFormatted<T>(value, alignment, format, argumentName);
     }
 
-    public void AppendFormatted<T>(ZLoggerNamedParam<T> value, int alignment = 0, string? format = null, string? _ = null)
+    public void AppendFormatted<T>((string, T) namedValue, int alignment = 0, string? format = null, string? _ = null)
     {
-        this.innerHandler.AppendFormatted(value, alignment, format);
+        this.innerHandler.AppendFormatted(namedValue, alignment, format);
     }
 }
 

diff --git a/src/ZLogger/ZLoggerInterpolatedStringHandler.cs b/src/ZLogger/ZLoggerInterpolatedStringHandler.cs
@@ -109,9 +109,9 @@ public void AppendFormatted<T>(Nullable<T> value, int alignment = 0, string? for
             }
         }
 
-        public void AppendFormatted<T>(ZLoggerNamedParam<T> value, int alignment = 0, string? format = null, string? _ = null)
+        public void AppendFormatted<T>((string, T) namedValue, int alignment = 0, string? format = null, string? _ = null)
         {
-            AppendFormatted(value.Value, alignment, format, value.Name);
+            AppendFormatted(namedValue.Item2, alignment, format, namedValue.Item1);
         }
 
         internal InterpolatedStringLogState GetStateAndClear()

diff --git a/src/ZLogger/ZLoggerParam.cs b/src/ZLogger/ZLoggerParam.cs
diff --git a/tests/ZLogger.Tests/NamedParamTest.cs b/tests/ZLogger.Tests/NamedParamTest.cs
@@ -22,7 +22,7 @@ public void StructuredLoggingOptions()
             });
             var logger = loggerFactory.CreateLogger("test");
 
-            logger.ZLogInformation($"{ZLogger.Param("TAKO", 100)} {ZLogger.Param("YAKI", 200):D5} {ZLogger.Param("T", new DateTime(2023, 12, 31)),15:yyyy-MM-dd}");
+            logger.ZLogInformation($"{("TAKO", 100)} {("YAKI", 200):D5} {("T", new DateTime(2023, 12, 31)),15:yyyy-MM-dd}");
 
             var json = processor.EntryMessages.Dequeue();
             var doc = JsonDocument.Parse(json).RootElement;