Development

lib/src/code_generators/enum_model.dart

@@ -20,6 +20,10 @@ class EnumModel {
   @override
   String toString() => _getEnumContent();
 
+  static String _normalizeJsonKeyString(String jsonKey) {
+    return jsonKey.replaceAll("\$", "\\\$").replaceAll('\'', '\\\'');
+  }
+
   String _getEnumContent() {
     final resultStrings = <String>[];
 
@@ -42,10 +46,10 @@ class EnumModel {
 
       if (isInteger) {
         resultStrings.add(
-            "\t@JsonValue(${value.replaceAll("\$", "\\\$")})\n\t$validatedValue");
+            "\t@JsonValue(${_normalizeJsonKeyString(value)})\n\t$validatedValue");
       } else {
         resultStrings.add(
-            "\t@JsonValue('${value.replaceAll("\$", "\\\$")}')\n\t$validatedValue");
+            "\t@JsonValue('${_normalizeJsonKeyString(value)}')\n\t$validatedValue");
       }
     }
 
@@ -97,7 +101,7 @@ const $name(this.value);
       result = '\$$result';
     }
 
-    return '$result(${isInteger ? fieldValue : '\'$fieldValue\''})';
+    return '$result(${isInteger ? fieldValue : '\'${_normalizeJsonKeyString(fieldValue)}\''})';
   }
 
   String generateFromJsonToJson([bool caseSensitive = true]) {

lib/src/code_generators/swagger_models_generator.dart

@@ -1646,7 +1646,8 @@ $allHashComponents;
 
     final newModelMap = allOf.firstWhereOrNull((m) => m.properties.isNotEmpty);
 
-    final currentProperties = schema.properties;
+    final currentProperties =
+        Map<String, SwaggerSchema>.from(schema.properties);
 
     currentProperties.addAll(newModelMap?.properties ?? {});
 

lib/src/code_generators/swagger_requests_generator.dart

@@ -636,7 +636,7 @@ class SwaggerRequestsGenerator extends SwaggerGeneratorBase {
         return getValidatedClassName(neededKey).asEnum();
       }
 
-      if (parameter.type == kArray) {
+      if (parameter.type == kArray || parameter.schema?.type == kArray) {
         final result = _getEnumParameterTypeName(
             parameterName: parameter.name,
             path: path,

pubspec.yaml

@@ -1,6 +1,6 @@
 name: swagger_dart_code_generator
 
-version: 2.14.2
+version: 2.15.0
 
 homepage: https://github.com/epam-cross-platform-lab/swagger-dart-code-generator
 repository: https://github.com/epam-cross-platform-lab/swagger-dart-code-generator