diff --git a/json_annotation/lib/src/json_value.dart b/json_annotation/lib/src/json_value.dart index e9fdb129c..9ada231e5 100644 --- a/json_annotation/lib/src/json_value.dart +++ b/json_annotation/lib/src/json_value.dart @@ -12,7 +12,7 @@ class JsonValue { /// Optional values that can be used when deserializing. /// /// The elements of [aliases] must be either [String] or [int]. - final List aliases; + final Set aliases; - const JsonValue(this.value, {this.aliases = const []}); + const JsonValue(this.value, {this.aliases = const {}}); } diff --git a/json_serializable/lib/src/enum_utils.dart b/json_serializable/lib/src/enum_utils.dart index 1e7d962e5..833124ee8 100644 --- a/json_serializable/lib/src/enum_utils.dart +++ b/json_serializable/lib/src/enum_utils.dart @@ -121,7 +121,7 @@ Map? _enumAliases( jsonEnum: jsonEnum, targetType: targetType, ): field, - for (final alias in _generateAlias(field: field, targetType: targetType)) + for (final alias in _generateAliases(field: field, targetType: targetType)) alias: field, }, }; @@ -192,7 +192,7 @@ Object? _generateEntry({ } } -List _generateAlias({ +List _generateAliases({ required FieldElement field, required DartType targetType, }) { @@ -208,7 +208,7 @@ List _generateAlias({ if (valueReader.validAliasesType) { return [ - for (final value in valueReader.listValue) + for (final value in valueReader.setValue) ConstantReader(value).literalValue, ]; } else {