fix(build_value_generator): Escape enum wire keys

google · Dec 8, 2023 · 3f9d11f · 3f9d11f
1 parent 693f69d
commit 3f9d11f
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/built_value_generator/lib/src/serializer_source_class.dart b/built_value_generator/lib/src/serializer_source_class.dart
@@ -397,11 +397,11 @@ class $serializerImplName implements PrimitiveSerializer<$genericName> {
         // Generate maps between enum names and wire names.
         final toWire = '''
          static const Map<String, Object> _toWire = const <String, Object>{
-           ${wireNameMapping.keys.map((key) => "'$key': ${_toCode(wireNameMapping[key])},").join('\n')}
+           ${wireNameMapping.keys.map((key) => "'${escapeString(key)}': ${_toCode(wireNameMapping[key])},").join('\n')}
          };''';
         final fromWire = '''
          static const Map<Object, String> _fromWire = const <Object, String>{
-           ${wireNameMapping.keys.map((key) => "${_toCode(wireNameMapping[key])}: '$key',").join('\n')}
+           ${wireNameMapping.keys.map((key) => "${_toCode(wireNameMapping[key])}: '${escapeString(key)}',").join('\n')}
          };''';
 
         return '''

diff --git a/end_to_end_test/lib/enums.dart b/end_to_end_test/lib/enums.dart
@@ -81,6 +81,9 @@ class DollarValueEnum extends EnumClass {
 
   static const DollarValueEnum value$ = _$value$;
 
+  @BuiltValueEnumConst(wireName: 'value')
+  static const DollarValueEnum $value = _$value;
+
   const DollarValueEnum._(String name) : super(name);
 
   static BuiltSet<DollarValueEnum> get values => _$dollarValues;

diff --git a/end_to_end_test/lib/enums.g.dart b/end_to_end_test/lib/enums.g.dart