add support for dictionary models

Dojo.OpenApiGenerator.TestWebApi/OpenApiSchemas/hello-source-generators-api.json

@@ -66,9 +66,6 @@
         }
       ]
     },
-    "": {
-      "parameters": []
-    },
     "/hello-generated2": {
       "get": {
         "summary": "HelloGenerated2",
@@ -171,6 +168,12 @@
           },
           "type": {
             "$ref": "#/components/schemas/HelloType"
+          },
+          "stringsDictionary": {
+            "$ref": "#/components/schemas/StringsDictionary"
+          },
+          "objectsDictionary": {
+            "$ref": "#/components/schemas/ObjectsDictionary"
           }
         },
         "required": [
@@ -195,6 +198,21 @@
         "items": {
           "$ref": "#/components/schemas/HelloFromSource"
         }
+      },
+      "StringsDictionary": {
+        "type": "object",
+        "title": "Dictionary",
+        "description": "",
+        "additionalProperties": {
+          "type": "string"
+        }
+      },
+      "ObjectsDictionary": {
+        "type": "object",
+        "title": "Dictionary",
+        "additionalProperties": {
+          "$ref": "#/components/schemas/HelloFromSource"
+        }
       }
     },
     "responses": {}

Dojo.OpenApiGenerator/AutoApiGenerator.cs

@@ -37,6 +37,7 @@ public class AutoApiGenerator : ISourceGenerator
         private AutoApiGeneratorSettings _autoApiGeneratorSettings;
         private string _apiConfiguratorTemplateString;
         private string _apiVersionsTemplateString;
+        private string _dictionaryModelTemplate;
 
         public AutoApiGenerator()
         {
@@ -284,6 +285,10 @@ private void GenerateApiModelsSources(
                 {
                     GenerateEnum(context, apiModel, name);
                 }
+                else if (apiModel.IsDictionary)
+                {
+                    GenerateDictionaryModel(context, apiModel, name);
+                }
                 else
                 {
                     GenerateApiModel(context, apiModel, name);
@@ -311,6 +316,16 @@ private void GenerateEnum(GeneratorExecutionContext context, ApiModel apiModel,
             context.AddSource(fileName, SourceText.From(enumSource, Encoding.UTF8));
         }
 
+        private void GenerateDictionaryModel(GeneratorExecutionContext context, ApiModel apiModel, string name)
+        {
+            _dictionaryModelTemplate ??= Templates.ReadTemplate(Templates.DictionaryModelTemplate);
+
+            var fileName = $"{name}.g.cs";
+            var dictionarySource = _stubbleBuilder.Render(_dictionaryModelTemplate, apiModel);
+
+            context.AddSource(fileName, SourceText.From(dictionarySource, Encoding.UTF8));
+        }
+
         private void GenerateController(GeneratorExecutionContext context, ApiControllerDefinition data, string apiFileName)
         {
             _controllerTemplateString ??= Templates.ReadTemplate(Templates.AbstractController);

Dojo.OpenApiGenerator/CodeTemplates/DictionaryModelTemplate.mustache

@@ -0,0 +1,12 @@
+using System;
+using System.CodeDom.Compiler;
+using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
+
+namespace {{Namespace}}
+{
+    [GeneratedCode("Dojo.OpenApiGenerator", "{{AssemblyVersion}}")]
+    public class {{TypeName}} : Dictionary<string, {{#DictionaryValueType}}{{&TypeFullName}}{{/DictionaryValueType}}>
+    {        
+    }
+}

Dojo.OpenApiGenerator/CodeTemplates/Templates.cs

@@ -12,6 +12,7 @@ internal static class Templates
         public static string ApiVersionsTemplate => "ApiVersionsTemplate.mustache";
         public static string InheritedApiVersionAttribute => "InheritedApiVersionAttribute.mustache";
         public static string ApiConfiguratorTemplate => "ApiConfiguratorTemplate.mustache";
+        public static string DictionaryModelTemplate => "DictionaryModelTemplate.mustache";
 
         public static string ReadTemplate(string templateName)
         {

Dojo.OpenApiGenerator/Dojo.OpenApiGenerator.csproj

@@ -17,6 +17,7 @@
 	  <None Remove="CodeTemplates\ApiConfiguratorTemplate.mustache" />
 	  <None Remove="CodeTemplates\ApiConstantsTemplate.mustache" />
 	  <None Remove="CodeTemplates\ApiVersionsTemplate.mustache" />
+	  <None Remove="CodeTemplates\DictionaryModelTemplate.mustache" />
 	  <None Remove="CodeTemplates\EnumTemplate.mustache" />
 	  <None Remove="CodeTemplates\InheritedApiVersionAttribute.mustache" />
 	  <None Remove="CodeTemplates\ModelTemplate.mustache" />
@@ -30,6 +31,7 @@
 	  <EmbeddedResource Include="CodeTemplates\InheritedApiVersionAttribute.mustache" />
 	  <EmbeddedResource Include="CodeTemplates\EnumTemplate.mustache" />
 	  <EmbeddedResource Include="CodeTemplates\ApiConstantsTemplate.mustache" />
+	  <EmbeddedResource Include="CodeTemplates\DictionaryModelTemplate.mustache" />
 	  <EmbeddedResource Include="CodeTemplates\ServiceInterfaceTemplate.mustache" />
 	  <EmbeddedResource Include="CodeTemplates\ModelTemplate.mustache" />
 	</ItemGroup>

Dojo.OpenApiGenerator/Models/ApiModel.cs

@@ -11,6 +11,9 @@ internal class ApiModel : ApiModelBase
         public IEnumerable<ApiModelProperty> Properties { get; set; }
         public bool IsCustomModel { get; set; }
 
+        public bool IsDictionary { get; set; }
+
+        public ApiModel DictionaryValueType { get; set; }
 
         public ApiModel(
             string name, 
@@ -36,7 +39,16 @@ public ApiModel(
             else
             {
                 IsCustomModel = true;
-                Properties = openApiSchema.Properties.Select(x => new ApiModelProperty(x.Key, x.Value, openApiSchema.Required, apiModels, apiFileName, ProjectNamespace));
+                IsDictionary = IsDictionaryType(openApiSchema);
+
+                if (!IsDictionary)
+                {
+                    Properties = openApiSchema.Properties.Select(x => new ApiModelProperty(x.Key, x.Value, openApiSchema.Required, apiModels, apiFileName, ProjectNamespace));
+                }
+                else
+                {
+                    DictionaryValueType = new ApiModel(openApiSchema.AdditionalProperties, apiModels, apiFileName);
+                }
             }
         }
 
@@ -59,6 +71,13 @@ protected override string GetTypeFullName()
             return !IsCustomModel ? base.GetTypeFullName() : $"{Namespace}.{TypeName}";
         }
 
+        private static bool IsDictionaryType(OpenApiSchema openApiSchema)
+        {
+            return openApiSchema.AdditionalPropertiesAllowed &&
+                   openApiSchema.AdditionalProperties != null &&
+                   (openApiSchema.Properties == null || openApiSchema.Properties.Count == 0);
+        }
+
         //private static void SetRequiredProperties(ApiModel apiModel, ISet<string> requiredProperties)
         //{
         //    if (requiredProperties == null || !requiredProperties.Any())