Skip to content

Commit a40ef47

Browse files
simolus3simolus3
authored
Support analyzer 10.x (#338)
1 parent 77bc017 commit a40ef47

4 files changed

Lines changed: 68 additions & 43 deletions

File tree

‎packages/dart_mappable_builder/CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## 4.6.5
2+
3+
- Allow `analyzer` 10.0.0.
4+
15
# 4.6.4
26

37
- Fix nested `copyWith` on a inherited class with the superclass and field type in another library.

‎packages/dart_mappable_builder/lib/src/elements/class/class_mapper_element.dart‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -139,6 +139,7 @@ abstract class ClassMapperElement extends InterfaceMapperElement<ClassElement>
139139
yield* extendsElement?._allFields ?? [];
140140

141141
for (var getter in element.getters) {
142+
// ignore: deprecated_member_use
142143
if (getter.isStatic || getter.isSynthetic) continue;
143144

144145
if (fieldChecker.hasAnnotationOf(getter)) {
@@ -147,6 +148,7 @@ abstract class ClassMapperElement extends InterfaceMapperElement<ClassElement>
147148
}
148149

149150
for (var field in element.fields) {
151+
// ignore: deprecated_member_use
150152
if (field.isStatic || field.isSynthetic) continue;
151153

152154
if (field.isPublic || fieldChecker.hasAnnotationOf(field)) {

‎packages/dart_mappable_builder/pubspec.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name: dart_mappable_builder
22
description: Improved json serialization and data classes with full support for generics, inheritance, customization and more.
3-
version: 4.6.4
3+
version: 4.6.5
44
repository: https://github.com/schultek/dart_mappable
55
issue_tracker: https://github.com/schultek/dart_mappable/issues
66
funding:
@@ -12,7 +12,7 @@ environment:
1212
resolution: workspace
1313

1414
dependencies:
15-
analyzer: '>=8.1.0 <10.0.0'
15+
analyzer: '>=8.1.0 <11.0.0'
1616
ansicolor: ^2.0.1
1717
build: ^4.0.0
1818
collection: ^1.15.0
@@ -27,4 +27,3 @@ dev_dependencies:
2727
build_test: ^3.3.0
2828
lints: '>=1.0.0 <6.0.0'
2929
test: ^1.25.10
30-

‎packages/dart_mappable_builder/test/simple_model_test.dart‎

Lines changed: 60 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ void main() {
2727
'model':
2828
'// coverage:ignore-file\n'
2929
'// GENERATED CODE - DO NOT MODIFY BY HAND\n'
30+
'// dart format off\n'
3031
'// ignore_for_file: type=lint\n'
32+
'// ignore_for_file: invalid_use_of_protected_member\n'
3133
'// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member\n'
3234
'// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter\n'
3335
'\n'
@@ -65,8 +67,12 @@ void main() {
6567
' };\n'
6668
'\n'
6769
' static Model _instantiate(DecodingData data) {\n'
68-
' return Model(data.dec(_f\$a),\n'
69-
' b: data.dec(_f\$b), c: data.dec(_f\$c), d: data.dec(_f\$d));\n'
70+
' return Model(\n'
71+
' data.dec(_f\$a),\n'
72+
' b: data.dec(_f\$b),\n'
73+
' c: data.dec(_f\$c),\n'
74+
' d: data.dec(_f\$d),\n'
75+
' );\n'
7076
' }\n'
7177
'\n'
7278
' @override\n'
@@ -126,24 +132,27 @@ void main() {
126132
' @override\n'
127133
' late final ClassMapperBase<Model> \$mapper = ModelMapper.ensureInitialized();\n'
128134
' @override\n'
129-
' \$R call({String? a, int? b, Object? c = \$none, bool? d}) =>\n'
130-
' \$apply(FieldCopyWithData({\n'
131-
' if (a != null) #a: a,\n'
132-
' if (b != null) #b: b,\n'
133-
' if (c != \$none) #c: c,\n'
134-
' if (d != null) #d: d\n'
135-
' }));\n'
135+
' \$R call({String? a, int? b, Object? c = \$none, bool? d}) => \$apply(\n'
136+
' FieldCopyWithData({\n'
137+
' if (a != null) #a: a,\n'
138+
' if (b != null) #b: b,\n'
139+
' if (c != \$none) #c: c,\n'
140+
' if (d != null) #d: d,\n'
141+
' }),\n'
142+
' );\n'
136143
' @override\n'
137-
' Model \$make(CopyWithData data) => Model(data.get(#a, or: \$value.a),\n'
138-
' b: data.get(#b, or: \$value.b),\n'
139-
' c: data.get(#c, or: \$value.c),\n'
140-
' d: data.get(#d, or: \$value.d));\n'
144+
' Model \$make(CopyWithData data) => Model(\n'
145+
' data.get(#a, or: \$value.a),\n'
146+
' b: data.get(#b, or: \$value.b),\n'
147+
' c: data.get(#c, or: \$value.c),\n'
148+
' d: data.get(#d, or: \$value.d),\n'
149+
' );\n'
141150
'\n'
142151
' @override\n'
143152
' ModelCopyWith<\$R2, Model, \$Out2> \$chain<\$R2, \$Out2>(Then<\$Out2, \$R2> t) =>\n'
144153
' _ModelCopyWithImpl<\$R2, \$Out2>(\$value, \$cast, t);\n'
145154
'}\n'
146-
'',
155+
'\n',
147156
},
148157
);
149158
});
@@ -175,7 +184,9 @@ void main() {
175184
'model':
176185
'// coverage:ignore-file\n'
177186
'// GENERATED CODE - DO NOT MODIFY BY HAND\n'
187+
'// dart format off\n'
178188
'// ignore_for_file: type=lint\n'
189+
'// ignore_for_file: invalid_use_of_protected_member\n'
179190
'// ignore_for_file: unused_element, unnecessary_cast, override_on_non_overriding_member\n'
180191
'// ignore_for_file: strict_raw_type, inference_failure_on_untyped_parameter\n'
181192
'\n'
@@ -202,10 +213,7 @@ void main() {
202213
' static const Field<Rawkeymodel, FullName> _f\$b = Field(\'b\', _\$b, opt: true);\n'
203214
'\n'
204215
' @override\n'
205-
' final MappableFields<Rawkeymodel> fields = const {\n'
206-
' #a: _f\$a,\n'
207-
' #b: _f\$b,\n'
208-
' };\n'
216+
' final MappableFields<Rawkeymodel> fields = const {#a: _f\$a, #b: _f\$b};\n'
209217
'\n'
210218
' static Rawkeymodel _instantiate(DecodingData data) {\n'
211219
' return Rawkeymodel(a: data.dec(_f\$a), b: data.dec(_f\$b));\n'
@@ -225,28 +233,36 @@ void main() {
225233
'\n'
226234
'mixin RawkeymodelMappable {\n'
227235
' String toJson() {\n'
228-
' return RawkeymodelMapper.ensureInitialized()\n'
229-
' .encodeJson<Rawkeymodel>(this as Rawkeymodel);\n'
236+
' return RawkeymodelMapper.ensureInitialized().encodeJson<Rawkeymodel>(\n'
237+
' this as Rawkeymodel,\n'
238+
' );\n'
230239
' }\n'
231240
'\n'
232241
' Map<String, dynamic> toMap() {\n'
233-
' return RawkeymodelMapper.ensureInitialized()\n'
234-
' .encodeMap<Rawkeymodel>(this as Rawkeymodel);\n'
242+
' return RawkeymodelMapper.ensureInitialized().encodeMap<Rawkeymodel>(\n'
243+
' this as Rawkeymodel,\n'
244+
' );\n'
235245
' }\n'
236246
'\n'
237247
' RawkeymodelCopyWith<Rawkeymodel, Rawkeymodel, Rawkeymodel> get copyWith =>\n'
238248
' _RawkeymodelCopyWithImpl<Rawkeymodel, Rawkeymodel>(\n'
239-
' this as Rawkeymodel, \$identity, \$identity);\n'
249+
' this as Rawkeymodel,\n'
250+
' \$identity,\n'
251+
' \$identity,\n'
252+
' );\n'
240253
' @override\n'
241254
' String toString() {\n'
242-
' return RawkeymodelMapper.ensureInitialized()\n'
243-
' .stringifyValue(this as Rawkeymodel);\n'
255+
' return RawkeymodelMapper.ensureInitialized().stringifyValue(\n'
256+
' this as Rawkeymodel,\n'
257+
' );\n'
244258
' }\n'
245259
'\n'
246260
' @override\n'
247261
' bool operator ==(Object other) {\n'
248-
' return RawkeymodelMapper.ensureInitialized()\n'
249-
' .equalsValue(this as Rawkeymodel, other);\n'
262+
' return RawkeymodelMapper.ensureInitialized().equalsValue(\n'
263+
' this as Rawkeymodel,\n'
264+
' other,\n'
265+
' );\n'
250266
' }\n'
251267
'\n'
252268
' @override\n'
@@ -279,13 +295,15 @@ void main() {
279295
' \$R call({String? a, Object? b = \$none}) =>\n'
280296
' \$apply(FieldCopyWithData({if (a != null) #a: a, if (b != \$none) #b: b}));\n'
281297
' @override\n'
282-
' Rawkeymodel \$make(CopyWithData data) =>\n'
283-
' Rawkeymodel(a: data.get(#a, or: \$value.a), b: data.get(#b, or: \$value.b));\n'
298+
' Rawkeymodel \$make(CopyWithData data) => Rawkeymodel(\n'
299+
' a: data.get(#a, or: \$value.a),\n'
300+
' b: data.get(#b, or: \$value.b),\n'
301+
' );\n'
284302
'\n'
285303
' @override\n'
286304
' RawkeymodelCopyWith<\$R2, Rawkeymodel, \$Out2> \$chain<\$R2, \$Out2>(\n'
287-
' Then<\$Out2, \$R2> t) =>\n'
288-
' _RawkeymodelCopyWithImpl<\$R2, \$Out2>(\$value, \$cast, t);\n'
305+
' Then<\$Out2, \$R2> t,\n'
306+
' ) => _RawkeymodelCopyWithImpl<\$R2, \$Out2>(\$value, \$cast, t);\n'
289307
'}\n'
290308
'\n'
291309
'class FullNameMapper extends RecordMapperBase<FullName> {\n'
@@ -301,19 +319,20 @@ void main() {
301319
' }\n'
302320
'\n'
303321
' static String _\$\$1(FullName v) => v.\$1;\n'
304-
' static const Field<FullName, String> _f\$\$1 =\n'
305-
' Field(\'\\\$1\', _\$\$1, key: r\'\$firstName\');\n'
322+
' static const Field<FullName, String> _f\$\$1 = Field(\n'
323+
' \'\\\$1\',\n'
324+
' _\$\$1,\n'
325+
' key: r\'\$firstName\',\n'
326+
' );\n'
306327
' static String _\$\$2(FullName v) => v.\$2;\n'
307328
' static const Field<FullName, String> _f\$\$2 = Field(\'\\\$2\', _\$\$2);\n'
308329
'\n'
309330
' @override\n'
310-
' final MappableFields<FullName> fields = const {\n'
311-
' #\$1: _f\$\$1,\n'
312-
' #\$2: _f\$\$2,\n'
313-
' };\n'
331+
' final MappableFields<FullName> fields = const {#\$1: _f\$\$1, #\$2: _f\$\$2};\n'
314332
'\n'
315333
' @override\n'
316-
' Function get typeFactory => (f) => f<FullName>();\n'
334+
' Function get typeFactory =>\n'
335+
' (f) => f<FullName>();\n'
317336
'\n'
318337
' @override\n'
319338
' List<Type> apply(MappingContext context) {\n'
@@ -368,7 +387,8 @@ void main() {
368387
' FullNameMapper.ensureInitialized();\n'
369388
' @override\n'
370389
' \$R call({String? \$1, String? \$2}) => \$apply(\n'
371-
' FieldCopyWithData({if (\$1 != null) #\$1: \$1, if (\$2 != null) #\$2: \$2}));\n'
390+
' FieldCopyWithData({if (\$1 != null) #\$1: \$1, if (\$2 != null) #\$2: \$2}),\n'
391+
' );\n'
372392
' @override\n'
373393
' FullName \$make(CopyWithData data) =>\n'
374394
' (data.get(#\$1, or: \$value.\$1), data.get(#\$2, or: \$value.\$2));\n'
@@ -377,7 +397,7 @@ void main() {
377397
' FullNameCopyWith<\$R2> \$chain<\$R2>(Then<FullName, \$R2> t) =>\n'
378398
' _FullNameCopyWithImpl(\$value, \$cast, t);\n'
379399
'}\n'
380-
'',
400+
'\n',
381401
},
382402
);
383403
});

0 commit comments

Comments
 (0)