Improved support for nullable Map types

Author: walsha2

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.7.23
+
+* Improved support for nullable `Map` types
+
 ## 0.7.22
 
 * Ignore null values in client query parameters

lib/src/open_api/spec.dart

@@ -650,9 +650,10 @@ Map<String, dynamic> _formatSpecFromJson({
         m['type'] = 'map';
       }
     } else if (m.containsKey('anyOf')) {
-      final anyOf = m['anyOf'];
+      dynamic anyOf = m['anyOf'];
       if (anyOf is List) {
-        final typeSet = anyOf.map((e) {
+        final anyOfList = List<dynamic>.from(anyOf);
+        final typeSet = anyOfList.map((e) {
           if (e is Map && e.containsKey('type')) {
             return e['type'];
           } else if (e is Map && e.containsKey('\$ref')) {
@@ -661,15 +662,25 @@ Map<String, dynamic> _formatSpecFromJson({
           return null;
         }).toSet();
         if (typeSet.length == 1) {
-          m['type'] = anyOf.first['type'];
+          m['type'] = anyOfList.first['type'];
         } else if (typeSet.length == 2 && typeSet.contains('null')) {
           // Starting in OpenAPI 3.1, anyOf is used to define unions for nullable properties
           // We do not want to create a union schema for these properties
           final propType = typeSet.firstWhere((e) => e != 'null');
           if (propType.toString().contains('#')) {
             m['\$ref'] = propType;
           } else {
-            m['type'] = propType;
+            // One final check to see if this is a map type
+            for (final a in anyOfList) {
+              if (a['type'] == propType &&
+                  propType == 'object' &&
+                  a['additionalProperties'] != null) {
+                m['type'] = 'map';
+              }
+            }
+            if (!m.containsKey('type')) {
+              m['type'] = propType;
+            }
           }
           m['nullable'] = true;
           if (propType == 'array') {

lib/src/version.dart

@@ -1,6 +1,6 @@
 name: openapi_spec
 description: OpenAPI Specification generator using native Dart code, as well as an all-in-one parser of existing specifications.
-version: 0.7.22
+version: 0.7.23
 maintainer: Taza Technology LLC
 repository: https://github.com/tazatechnology/openapi_spec
 issue_tracker: https://github.com/tazatechnology/openapi_spec/issues