diff --git a/lib/src/code_generators/enum_model.dart b/lib/src/code_generators/enum_model.dart index 03f4689e..d0a5da03 100644 --- a/lib/src/code_generators/enum_model.dart +++ b/lib/src/code_generators/enum_model.dart @@ -89,7 +89,7 @@ const $name(this.value); result = result.lower; - if (exceptionWords.contains(result)) { + if (exceptionWordsInEnum.contains(result)) { result = '\$$result'; } diff --git a/lib/src/exception_words.dart b/lib/src/exception_words.dart index bca978c6..12606ea1 100644 --- a/lib/src/exception_words.dart +++ b/lib/src/exception_words.dart @@ -55,6 +55,7 @@ List exceptionWords = [ 'try', 'client', 'hashCode', - 'value', 'override', ]; + +List exceptionWordsInEnum = [...exceptionWords, 'value']; diff --git a/test/generator_tests/enums_generator_test.dart b/test/generator_tests/enums_generator_test.dart index 071be261..216f475c 100644 --- a/test/generator_tests/enums_generator_test.dart +++ b/test/generator_tests/enums_generator_test.dart @@ -38,6 +38,19 @@ void main() { expect(result, contains(output)); }); + + test('Should return \$value if name is value', () { + const name = 'value'; + const output = '\$value'; + final result = EnumModel.getValidatedEnumFieldName( + name, + name, + false, + [], + ); + expect(result, contains(output)); + }); + }); group('getOriginalOrOverriddenRequestParameter', () { diff --git a/test/generator_tests/models_generator_test.dart b/test/generator_tests/models_generator_test.dart index ec0fe8f0..e60fef28 100644 --- a/test/generator_tests/models_generator_test.dart +++ b/test/generator_tests/models_generator_test.dart @@ -134,10 +134,10 @@ void main() { inputFolder: '', outputFolder: '', importPaths: [ - 'package:uuid/uuid.dart', + 'package:uuid/uuid.dart', ], scalars: { - 'uuid': CustomScalar(type: 'Uuid', deserialize: 'parse') + 'uuid': CustomScalar(type: 'Uuid', deserialize: 'parse') } ), ); @@ -184,6 +184,13 @@ void main() { expect(result, contains(expectedResult)); }); + + test('Should NOT return \$value', () { + const name = 'value'; + const output = 'value'; + final result = generator.generateFieldName(name); + expect(result, contains(output)); + }); }); group('generatePropertyContentByDefault', () {