Added support for Uri mapping (#726)

mini-software · Feb 19, 2025 · b7f7816 · b7f7816
1 parent 9b37e22
commit b7f7816
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 0 deletions.
diff --git a/samples/xlsx/TestUriMapping.xlsx b/samples/xlsx/TestUriMapping.xlsx
diff --git a/src/MiniExcel/Utils/TypeHelper.cs b/src/MiniExcel/Utils/TypeHelper.cs
@@ -151,6 +151,13 @@ public static bool IsNumericType(Type type, bool isNullableUnderlyingType = fals
                 else
                     newValue = Enum.Parse(pInfo.ExcludeNullableType, itemValue?.ToString(), true);
             }
+            else if (pInfo.ExcludeNullableType == typeof(Uri))
+            {
+                var rawValue = itemValue?.ToString();
+                if (!Uri.TryCreate(rawValue, UriKind.RelativeOrAbsolute, out var uri))
+                    throw new InvalidCastException($"Value \"{rawValue}\" cannot be converted to Uri");
+                newValue = uri;
+            }
             else
             {
                 // Use pInfo.ExcludeNullableType to resolve : https://github.com/shps951023/MiniExcel/issues/138

diff --git a/tests/MiniExcelTests/MiniExcelOpenXmlTests.cs b/tests/MiniExcelTests/MiniExcelOpenXmlTests.cs
@@ -381,6 +381,27 @@ public void AutoCheckTypeTest()
             }
         }
 
+        public class ExcelUriDemo
+        {
+            public string Name { get; set; }
+            public int Age { get; set; }
+            public Uri Url { get; set; }
+        }
+
+        [Fact]
+        public void UriMappingTest()
+        {
+            var path = "../../../../../samples/xlsx/TestUriMapping.xlsx";
+            using (var stream = File.OpenRead(path))
+            {
+                var rows = stream.Query<ExcelUriDemo>().ToList();
+
+                Assert.Equal("Felix", rows[1].Name);
+                Assert.Equal(44, rows[1].Age);
+                Assert.Equal(new Uri("https://friendly-utilization.net"), rows[1].Url);
+            }
+        }
+
         [Fact()]
         public void TestDatetimeSpanFormat_ClosedXml()
         {