Changes to the FluentMapping folder structure

michelebastione · michelebastione · commit 452d85ef3eaa · 2025-10-14T21:01:26.000+02:00
- Renamed namespace Mapping to FluentMapping
- Moved mapping importer, exporter and templater to new Api folder
- Moved methods GetMappingImporter, GetMappingExporter and GetMappingTemplater from MiniExcelProviders to a ProviderExtensions class as extension methods
diff --git a/benchmarks/MiniExcel.Benchmarks/BenchmarkSections/CreateExcelBenchmark.cs b/benchmarks/MiniExcel.Benchmarks/BenchmarkSections/CreateExcelBenchmark.cs
@@ -6,7 +6,7 @@
 using DocumentFormat.OpenXml.Spreadsheet;
 using MiniExcelLib.Benchmarks.Utils;
 using MiniExcelLib.Core;
-using MiniExcelLib.Core.Mapping;
+using MiniExcelLib.Core.FluentMapping;
 using NPOI.XSSF.UserModel;
 using OfficeOpenXml;
 
diff --git a/benchmarks/MiniExcel.Benchmarks/BenchmarkSections/QueryExcelBenchmark.cs b/benchmarks/MiniExcel.Benchmarks/BenchmarkSections/QueryExcelBenchmark.cs
@@ -5,7 +5,7 @@
 using DocumentFormat.OpenXml.Spreadsheet;
 using ExcelDataReader;
 using MiniExcelLib.Core;
-using MiniExcelLib.Core.Mapping;
+using MiniExcelLib.Core.FluentMapping;
 using NPOI.XSSF.UserModel;
 using OfficeOpenXml;
 
diff --git a/benchmarks/MiniExcel.Benchmarks/BenchmarkSections/TemplateExcelBenchmark.cs b/benchmarks/MiniExcel.Benchmarks/BenchmarkSections/TemplateExcelBenchmark.cs
@@ -2,7 +2,7 @@
 using ClosedXML.Report;
 using MiniExcelLib.Benchmarks.Utils;
 using MiniExcelLib.Core;
-using MiniExcelLib.Core.Mapping;
+using MiniExcelLib.Core.FluentMapping;
 
 namespace MiniExcelLib.Benchmarks.BenchmarkSections;
 
diff --git a/src/MiniExcel.Core/FluentMapping/Api/MappingExporter.cs b/src/MiniExcel.Core/FluentMapping/Api/MappingExporter.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 public sealed partial class MappingExporter
 {
diff --git a/src/MiniExcel.Core/FluentMapping/Api/MappingImporter.cs b/src/MiniExcel.Core/FluentMapping/Api/MappingImporter.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 public sealed partial class MappingImporter()
 {
diff --git a/src/MiniExcel.Core/FluentMapping/Api/MappingTemplater.cs b/src/MiniExcel.Core/FluentMapping/Api/MappingTemplater.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 public sealed partial class MappingTemplater()
 {
diff --git a/src/MiniExcel.Core/FluentMapping/Api/ProviderExtensions.cs b/src/MiniExcel.Core/FluentMapping/Api/ProviderExtensions.cs
@@ -0,0 +1,13 @@
+namespace MiniExcelLib.Core.FluentMapping;
+
+public static class ProviderExtensions
+{
+    public static MappingExporter GetMappingExporter(this MiniExcelExporterProvider exporterProvider) => new();
+    public static MappingExporter GetMappingExporter(this MiniExcelExporterProvider exporterProvider, MappingRegistry registry) => new(registry);
+
+    public static MappingImporter GetMappingImporter(this MiniExcelImporterProvider importerProvider) => new();
+    public static MappingImporter GetMappingImporter(this MiniExcelImporterProvider importerProvider, MappingRegistry registry) => new(registry);
+    
+    public static MappingTemplater GetMappingTemplater(this MiniExcelTemplaterProvider templaterProvider) =>  new();
+    public static MappingTemplater GetMappingTemplater(this MiniExcelTemplaterProvider templaterProvider, MappingRegistry registry) =>  new(registry);
+}
diff --git a/src/MiniExcel.Core/FluentMapping/CompiledMapping.cs b/src/MiniExcel.Core/FluentMapping/CompiledMapping.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 internal class CompiledMapping<T>
 {
diff --git a/src/MiniExcel.Core/FluentMapping/Configuration/CollectionMappingBuilder.cs b/src/MiniExcel.Core/FluentMapping/Configuration/CollectionMappingBuilder.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping.Configuration;
+namespace MiniExcelLib.Core.FluentMapping.Configuration;
 
 internal partial class CollectionMappingBuilder<T, TCollection> : ICollectionMappingBuilder<T, TCollection> where TCollection : IEnumerable
 {
diff --git a/src/MiniExcel.Core/FluentMapping/Configuration/ICollectionMappingBuilder.cs b/src/MiniExcel.Core/FluentMapping/Configuration/ICollectionMappingBuilder.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping.Configuration;
+namespace MiniExcelLib.Core.FluentMapping.Configuration;
 
 public interface ICollectionMappingBuilder<T, TCollection> where TCollection : IEnumerable
 {
diff --git a/src/MiniExcel.Core/FluentMapping/Configuration/IMappingConfiguration.cs b/src/MiniExcel.Core/FluentMapping/Configuration/IMappingConfiguration.cs
@@ -1,6 +1,6 @@
 using System.Linq.Expressions;
 
-namespace MiniExcelLib.Core.Mapping.Configuration;
+namespace MiniExcelLib.Core.FluentMapping.Configuration;
 
 public interface IMappingConfiguration<T>
 {
diff --git a/src/MiniExcel.Core/FluentMapping/Configuration/IPropertyMappingBuilder.cs b/src/MiniExcel.Core/FluentMapping/Configuration/IPropertyMappingBuilder.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping.Configuration;
+namespace MiniExcelLib.Core.FluentMapping.Configuration;
 
 public interface IPropertyMappingBuilder<T, TProperty>
 {
diff --git a/src/MiniExcel.Core/FluentMapping/Configuration/MappingConfiguration.cs b/src/MiniExcel.Core/FluentMapping/Configuration/MappingConfiguration.cs
@@ -1,6 +1,6 @@
 using System.Linq.Expressions;
 
-namespace MiniExcelLib.Core.Mapping.Configuration;
+namespace MiniExcelLib.Core.FluentMapping.Configuration;
 
 internal class MappingConfiguration<T> : IMappingConfiguration<T>
 {
diff --git a/src/MiniExcel.Core/FluentMapping/Configuration/PropertyMappingBuilder.cs b/src/MiniExcel.Core/FluentMapping/Configuration/PropertyMappingBuilder.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping.Configuration;
+namespace MiniExcelLib.Core.FluentMapping.Configuration;
 
 internal partial class PropertyMappingBuilder<T, TProperty> : IPropertyMappingBuilder<T, TProperty>
 {
diff --git a/src/MiniExcel.Core/FluentMapping/MappingCellStream.cs b/src/MiniExcel.Core/FluentMapping/MappingCellStream.cs
@@ -1,6 +1,11 @@
 using MiniExcelLib.Core.WriteAdapters;
 
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
+
+internal interface IMappingCellStream
+{
+    IMiniExcelWriteAdapter CreateAdapter();
+}
 
 internal readonly struct MappingCellStream<T>(IEnumerable<T> items, CompiledMapping<T> mapping, string[] columnLetters) : IMappingCellStream
     where T : class
diff --git a/src/MiniExcel.Core/FluentMapping/MappingCompiler.cs b/src/MiniExcel.Core/FluentMapping/MappingCompiler.cs
@@ -1,7 +1,7 @@
 using System.Linq.Expressions;
-using MiniExcelLib.Core.Mapping.Configuration;
+using MiniExcelLib.Core.FluentMapping.Configuration;
 
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 /// <summary>
 /// Compiles mapping configurations into optimized runtime representations for efficient Excel read/write operations.
diff --git a/src/MiniExcel.Core/FluentMapping/MappingReader.cs b/src/MiniExcel.Core/FluentMapping/MappingReader.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 internal static partial class MappingReader<T> where T : class, new()
 {
diff --git a/src/MiniExcel.Core/FluentMapping/MappingRegistry.cs b/src/MiniExcel.Core/FluentMapping/MappingRegistry.cs
@@ -1,6 +1,6 @@
-using MiniExcelLib.Core.Mapping.Configuration;
+using MiniExcelLib.Core.FluentMapping.Configuration;
 
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 public sealed class MappingRegistry
 {
diff --git a/src/MiniExcel.Core/FluentMapping/MappingTemplateApplicator.cs b/src/MiniExcel.Core/FluentMapping/MappingTemplateApplicator.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 internal static partial class MappingTemplateApplicator<T> where T : class
 {
diff --git a/src/MiniExcel.Core/FluentMapping/MappingTemplateProcessor.cs b/src/MiniExcel.Core/FluentMapping/MappingTemplateProcessor.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 internal partial struct MappingTemplateProcessor<T>(CompiledMapping<T> mapping) where T : class
 {
diff --git a/src/MiniExcel.Core/FluentMapping/MappingWriter.cs b/src/MiniExcel.Core/FluentMapping/MappingWriter.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 internal static partial class MappingWriter<T>
     where T : class
diff --git a/src/MiniExcel.Core/FluentMapping/NestedMappingInfo.cs b/src/MiniExcel.Core/FluentMapping/NestedMappingInfo.cs
@@ -1,4 +1,4 @@
-namespace MiniExcelLib.Core.Mapping;
+namespace MiniExcelLib.Core.FluentMapping;
 
 /// <summary>
 /// Stores pre-compiled information about nested properties in collection mappings.
diff --git a/src/MiniExcel.Core/GlobalUsings.cs b/src/MiniExcel.Core/GlobalUsings.cs
@@ -11,7 +11,6 @@
 global using System.Xml;
 global using MiniExcelLib.Core.Abstractions;
 global using MiniExcelLib.Core.Helpers;
-global using MiniExcelLib.Core.Mapping;
 global using MiniExcelLib.Core.OpenXml;
 global using MiniExcelLib.Core.OpenXml.Utils;
 global using MiniExcelLib.Core.Reflection;
diff --git a/src/MiniExcel.Core/Helpers/MappingMetadataExtractor.cs b/src/MiniExcel.Core/Helpers/MappingMetadataExtractor.cs
@@ -1,3 +1,5 @@
+using MiniExcelLib.Core.FluentMapping;
+
 namespace MiniExcelLib.Core.Helpers;
 
 /// <summary>
diff --git a/src/MiniExcel.Core/Mapping/IMappingCellStream.cs b/src/MiniExcel.Core/Mapping/IMappingCellStream.cs
diff --git a/src/MiniExcel.Core/MiniExcelProviders.cs b/src/MiniExcel.Core/MiniExcelProviders.cs
@@ -1,27 +1,27 @@
+using MiniExcelLib.Core.FluentMapping;
+using MappingExporter = MiniExcelLib.Core.FluentMapping.MappingExporter;
+using MappingImporter = MiniExcelLib.Core.FluentMapping.MappingImporter;
+using MappingTemplater = MiniExcelLib.Core.FluentMapping.MappingTemplater;
+
 namespace MiniExcelLib.Core;
 
 public sealed class MiniExcelImporterProvider
 {
     internal MiniExcelImporterProvider() { }
     
     public OpenXmlImporter GetOpenXmlImporter() => new();
-    public MappingImporter GetMappingImporter() => new();
-    public MappingImporter GetMappingImporter(MappingRegistry registry) => new(registry);
 }
 
 public sealed class MiniExcelExporterProvider
 {
     internal MiniExcelExporterProvider() { }
 
     public OpenXmlExporter GetOpenXmlExporter() => new();
-    public MappingExporter GetMappingExporter() => new();
-    public MappingExporter GetMappingExporter(MappingRegistry registry) => new(registry);
 }
 
 public sealed class MiniExcelTemplaterProvider
 {
     internal MiniExcelTemplaterProvider() { }
 
     public OpenXmlTemplater GetOpenXmlTemplater() => new();
-    public MappingTemplater GetMappingTemplater(MappingRegistry registry) =>  new(registry);
 }
diff --git a/src/MiniExcel.Core/WriteAdapters/MappingCellStreamAdapter.cs b/src/MiniExcel.Core/WriteAdapters/MappingCellStreamAdapter.cs
@@ -1,3 +1,5 @@
+using MiniExcelLib.Core.FluentMapping;
+
 namespace MiniExcelLib.Core.WriteAdapters;
 
 internal class MappingCellStreamAdapter<T> : IMiniExcelWriteAdapter
diff --git a/src/MiniExcel.Core/WriteAdapters/MiniExcelWriteAdapterFactory.cs b/src/MiniExcel.Core/WriteAdapters/MiniExcelWriteAdapterFactory.cs
@@ -1,4 +1,6 @@
-﻿namespace MiniExcelLib.Core.WriteAdapters;
+﻿using MiniExcelLib.Core.FluentMapping;
+
+namespace MiniExcelLib.Core.WriteAdapters;
 
 public static class MiniExcelWriteAdapterFactory
 {
diff --git a/tests/MiniExcel.Core.Tests/FluentMapping/MiniExcelMappingCompilerTests.cs b/tests/MiniExcel.Core.Tests/FluentMapping/MiniExcelMappingCompilerTests.cs
@@ -1,4 +1,4 @@
-using MiniExcelLib.Core.Mapping;
+using MiniExcelLib.Core.FluentMapping;
 
 namespace MiniExcelLib.Tests.FluentMapping
 {
diff --git a/tests/MiniExcel.Core.Tests/FluentMapping/MiniExcelMappingTemplateTests.cs b/tests/MiniExcel.Core.Tests/FluentMapping/MiniExcelMappingTemplateTests.cs
@@ -1,4 +1,4 @@
-using MiniExcelLib.Core.Mapping;
+using MiniExcelLib.Core.FluentMapping;
 using MiniExcelLib.Tests.Common.Utils;
 
 namespace MiniExcelLib.Tests.FluentMapping;
diff --git a/tests/MiniExcel.Core.Tests/FluentMapping/MiniExcelMappingTests.cs b/tests/MiniExcel.Core.Tests/FluentMapping/MiniExcelMappingTests.cs
@@ -1,5 +1,5 @@
 using System.Reflection;
-using MiniExcelLib.Core.Mapping;
+using MiniExcelLib.Core.FluentMapping;
 
 namespace MiniExcelLib.Tests.FluentMapping
 {
@@ -455,7 +455,7 @@ public async Task Collection_WithItemMappingOnly_ShouldWriteAndReadCorrectly()
             var gridProp = departmentMapping.GetType().GetProperty("OptimizedCellGrid", BindingFlags.Instance | BindingFlags.Public);
             var grid = gridProp?.GetValue(departmentMapping) as Array;
             Assert.NotNull(grid);
-            var handlerType = typeof(MappingRegistry).Assembly.GetType("MiniExcelLib.Core.Mapping.OptimizedCellHandler");
+            var handlerType = typeof(MappingRegistry).Assembly.GetType("MiniExcelLib.Core.FluentMapping.OptimizedCellHandler");
             Assert.NotNull(handlerType);
             var valueSetterProperty = handlerType!.GetProperty("ValueSetter", BindingFlags.Instance | BindingFlags.Public);
             var propertyNameProperty = handlerType.GetProperty("PropertyName", BindingFlags.Instance | BindingFlags.Public);
diff --git a/tests/MiniExcel.Csv.Tests/IssueTests.cs b/tests/MiniExcel.Csv.Tests/IssueTests.cs
@@ -1008,5 +1008,4 @@ public void Issue507_3_MismatchedQuoteCsv()
         var getRowsInfo = _csvImporter.Query(stream, configuration: config).ToArray();
         Assert.Equal(2, getRowsInfo.Length);
     }
-
 }

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace MiniExcelLib.Core.Mapping;`
	`1`	`+namespace MiniExcelLib.Core.FluentMapping;`
`2`	`2`
`3`	`3`	`public sealed partial class MappingExporter`
`4`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace MiniExcelLib.Core.Mapping.Configuration;`
	`1`	`+namespace MiniExcelLib.Core.FluentMapping.Configuration;`
`2`	`2`
`3`	`3`	`internal partial class CollectionMappingBuilder<T, TCollection> : ICollectionMappingBuilder<T, TCollection> where TCollection : IEnumerable`
`4`	`4`	`{`