Simplified implementation by not having deeper namespaces. They are now always [your_dll_name_without_extension].Json.[json_filename_csharp_friendly]. Fixes #4

Author: IqualityRobin

Directory.Build.props

@@ -3,6 +3,6 @@
     <LangVersion>9.0</LangVersion>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <Nullable>enable</Nullable>
-    <Version>0.8.2</Version>
+    <Version>0.8.3</Version>
   </PropertyGroup>
 </Project>

JsonByExampleGenerator.Generator/JsonGenerator.cs

@@ -72,7 +72,32 @@ public void Execute(GeneratorExecutionContext context)
                     SourceText.From(onlyOnceGeneratedCode, Encoding.UTF8));
 
                 // Resolve all json files that are added to the AdditionalFiles in the compilation
-                var allJsonFiles = context.AdditionalFiles.Where(f => f.Path.EndsWith(".json", StringComparison.InvariantCultureIgnoreCase));
+                var allJsonFiles = context
+                    .AdditionalFiles
+                    .Where(f => f.Path.EndsWith(".json", StringComparison.InvariantCultureIgnoreCase))
+                    .ToList();
+
+                // If there are multiple files with the same name, report an error
+                var duplicates = allJsonFiles
+                    .Select(f => Path.GetFileNameWithoutExtension(f.Path))
+                    .GroupBy(f => f)
+                    .Where(f => f.Count() > 1)
+                    .Select(f => f.Key);
+                if(duplicates.Any())
+                {
+                    string message = $"Multiple json files found with the same name; JsonByExampleGenerator cannot generate code for this, because it would cause errors. File names: {string.Join(", ", duplicates)}";
+                    context.ReportDiagnostic(Diagnostic.Create(
+                        new DiagnosticDescriptor(
+                            "SI0001",
+                            message,
+                            message,
+                            "JsonByExampleGenerator",
+                            DiagnosticSeverity.Error,
+                            isEnabledByDefault: true),
+                        Location.None));
+                    return;
+                }
+
                 foreach (var jsonFile in allJsonFiles)
                 {
                     var jsonFileText = jsonFile.GetText(context.CancellationToken);
@@ -83,8 +108,8 @@ public void Execute(GeneratorExecutionContext context)
 
                     var json = JsonDocument.Parse(jsonFileText.ToString());
 
-                    // Determine the deeper namespace based on the path within the project and the file name
-                    string deeperNamespaceName = GetDeeperNamespaceName(namespaceName, jsonFile);
+                    // Determine the namespace based on the file name
+                    string jsonFileNameBasedNamespace = GetDeeperNamespaceName(namespaceName, jsonFile);
 
                     // Read the json and build a list of models that can be used to generate classes
                     var classModels = new List<ClassModel>();
@@ -130,14 +155,14 @@ public void Execute(GeneratorExecutionContext context)
 
                     if (context.Compilation != null)
                     {
-                        FilterAndChangeBasedOnExistingCode(classModels, deeperNamespaceName, context.Compilation);
+                        FilterAndChangeBasedOnExistingCode(classModels, jsonFileNameBasedNamespace, context.Compilation);
                     }
 
                     // Use Scriban to render the code using the model that was built
                     string generatedCode = template.Render(new
                     {
                         OptionalDependencies = optionalDependencies,
-                        NamespaceName = deeperNamespaceName,
+                        NamespaceName = jsonFileNameBasedNamespace,
                         ConfigEnabled = configEnabled,
                         ClassModels = classModels,
                         RuntimeVersion = RuntimeVersion,
@@ -146,8 +171,8 @@ public void Execute(GeneratorExecutionContext context)
                     }, member => member.Name);
 
                     // Add the generated code to the compilation
-                    context.AddSource(GetSourceFileName(jsonFile.Path),
-                        SourceText.From(generatedCode, Encoding.UTF8));
+                    var hintName = GetSourceFileName(jsonFile.Path);
+                    context.AddSource(hintName, SourceText.From(generatedCode, Encoding.UTF8));
                 }
             }
             catch (Exception ex)
@@ -174,23 +199,9 @@ public void Execute(GeneratorExecutionContext context)
         /// <returns></returns>
         private static string GetDeeperNamespaceName(string namespaceName, AdditionalText jsonFile)
         {
-            string compilationPath = Path.GetFullPath(".");
-            string relativePath = Path.GetFullPath(jsonFile.Path);
-            if (relativePath.StartsWith(compilationPath))
-            {
-                relativePath = relativePath.Substring(compilationPath.Length);
-            }
-
-            if (relativePath.EndsWith(".json", StringComparison.InvariantCultureIgnoreCase))
-            {
-                relativePath = relativePath.Substring(0, relativePath.Length - 5);
-            }
-
-            var deeperNamespaceParts = relativePath
-                .Split(new[] { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar }, StringSplitOptions.RemoveEmptyEntries)
-                .Select(r => GetValidName(r));
+            string fileName = Path.GetFileNameWithoutExtension(jsonFile.Path);
 
-            return $"{namespaceName}.Json.{string.Join(".", deeperNamespaceParts)}";
+            return $"{namespaceName}.Json.{GetValidName(fileName)}";
         }
 
         /// <summary>
@@ -200,14 +211,13 @@ private static string GetDeeperNamespaceName(string namespaceName, AdditionalTex
         /// <returns></returns>
         private string GetSourceFileName(string path)
         {
-            var fullPath = Path.GetFullPath(path)
-                .Replace(Path.GetFullPath("."), string.Empty)
+            var fileName = Path.GetFileNameWithoutExtension(path)
                 .Replace("/", "_")
                 .Replace("\\", "_")
                 .Replace(".", "_")
                 .Replace(":", "_");
 
-            return $"{fullPath.Trim('_')}.gen.cs";
+            return $"{fileName.Trim('_')}.gen.cs";
         }
 
         /// <summary>

JsonByExampleGenerator.Tests/ConflictingNamesTests.cs

@@ -1,4 +1,5 @@
-using System;
+using Microsoft.CodeAnalysis;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -70,5 +71,42 @@ public static string RunTest()
 
             Assert.Equal("propval", RunTest(compilation));
         }
+
+        [Fact]
+        public void ShouldNotGenerateDuplicateJsonFileName()
+        {
+            string source = @"using System;
+
+namespace Example
+{
+    class Test
+    {
+        public static string RunTest()
+        {
+            var json = new TestImplementation.Json.Ex.Ex()
+                {
+                    Prop = ""propval""
+                };
+            return $""{json.Prop}"";
+        }
+    }
+}";
+            var diagnostics = new List<Diagnostic>();
+
+            var compilation = GetGeneratedOutput(
+                source,
+                new Dictionary<string, string>()
+                {
+                    { "folder1/ex.json", "{ \"prop\" : \"val\" }" },
+                    { "folder2/ex.json", "{ \"propsy\" : \"val\" }" }
+                },
+                diagnostics);
+
+            Assert.Collection(
+                diagnostics,
+                d => Assert.Equal(
+                    "Multiple json files found with the same name; JsonByExampleGenerator cannot generate code for this, because it would cause errors. File names: ex",
+                    d.GetMessage()));
+        }
     }
 }

JsonByExampleGenerator.Tests/SerializationTests.cs

@@ -95,8 +95,8 @@ public static string RunTest()
             streamWriter.Write(@""{jsonAsString.Replace("\"", "\"\"")}"");
             streamWriter.Flush();
             readStream.Position = 0;
-            var ser = new DataContractJsonSerializer(typeof(TestImplementation.Json.{prefixPath}{rootTypeName}.{rootTypeName}));
-            var rootType = (TestImplementation.Json.{prefixPath}{rootTypeName}.{rootTypeName}) ser.ReadObject(readStream);
+            var ser = new DataContractJsonSerializer(typeof(TestImplementation.Json.{rootTypeName}.{rootTypeName}));
+            var rootType = (TestImplementation.Json.{rootTypeName}.{rootTypeName}) ser.ReadObject(readStream);
             
             var writeStream = new MemoryStream();
             ser.WriteObject(writeStream, rootType);

README.md

@@ -21,12 +21,12 @@ dotnet add package JsonByExampleGenerator
   <AdditionalFiles Include="products.json" />
 </ItemGroup>
 ```
-3. You can now use the generated classes in your code. Add a using statement for `[your_dll_name_without_extension].Json.[path_to_json_csharp_friendly]`. E.g.:
+3. You can now use the generated classes in your code. Add a using statement for `[your_dll_name_without_extension].Json.[json_filename_csharp_friendly]`. E.g.:
 ```csharp
 // For /mock_files/products.json
-using MyCompany.MyProject.Json.MockFiles.Products;
+using MyCompany.MyProject.Json.Products;
 ```
-Intellisense should help you out when adding a using statement for this. The complicated namespace is needed to ensure separation between different files.
+Intellisense should help you out when adding a using statement for this.
 
 # Example usage