From 86669978327cc439b29169fd5afe7ecd545de919 Mon Sep 17 00:00:00 2001 From: thomashii Date: Sun, 2 Jan 2022 18:12:51 +0800 Subject: [PATCH] Fixed null-safety error --- .../lib/src/orm_generator.dart | 2 +- .../lib/src/edge_case_test.dart | 2 +- .../lib/src/models/email_indexed.g.dart | 18 +++++-------- .../angel_orm_test/lib/src/models/tree.g.dart | 9 +++---- .../lib/src/models/unorthodox.g.dart | 27 +++++++++---------- .../angel_orm_test/lib/src/models/user.g.dart | 18 +++++-------- 6 files changed, 29 insertions(+), 47 deletions(-) diff --git a/packages/orm/angel_orm_generator/lib/src/orm_generator.dart b/packages/orm/angel_orm_generator/lib/src/orm_generator.dart index 4d35bf13..a0ca7d20 100644 --- a/packages/orm/angel_orm_generator/lib/src/orm_generator.dart +++ b/packages/orm/angel_orm_generator/lib/src/orm_generator.dart @@ -575,7 +575,7 @@ class OrmGenerator extends GeneratorForAnnotation { .toString() .replaceAll('?', ''); merge.add(''' - $name: $typeLiteral.from(l.$name ?? [])..addAll(model.$name ?? []) + $name: $typeLiteral.from(l.$name)..addAll(model.$name) '''); } }); diff --git a/packages/orm/angel_orm_test/lib/src/edge_case_test.dart b/packages/orm/angel_orm_test/lib/src/edge_case_test.dart index 357f9c3e..11ab1b2f 100644 --- a/packages/orm/angel_orm_test/lib/src/edge_case_test.dart +++ b/packages/orm/angel_orm_test/lib/src/edge_case_test.dart @@ -118,7 +118,7 @@ void edgeCaseTests(FutureOr Function() createExecutor, fooOpt.ifPresent((foo) { //print(foo.toJson()); //print(weirdJoin!.toJson()); - expect(foo.weirdJoins![0].id, weirdJoin!.id); + expect(foo.weirdJoins[0].id, weirdJoin!.id); }); }); }); diff --git a/packages/orm/angel_orm_test/lib/src/models/email_indexed.g.dart b/packages/orm/angel_orm_test/lib/src/models/email_indexed.g.dart index 85236a5e..7c7d4465 100644 --- a/packages/orm/angel_orm_test/lib/src/models/email_indexed.g.dart +++ b/packages/orm/angel_orm_test/lib/src/models/email_indexed.g.dart @@ -139,8 +139,7 @@ class RoleQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - users: List<_User>.from(l.users ?? []) - ..addAll(model.users ?? [])); + users: List<_User>.from(l.users)..addAll(model.users)); } }); }); @@ -158,8 +157,7 @@ class RoleQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - users: List<_User>.from(l.users ?? []) - ..addAll(model.users ?? [])); + users: List<_User>.from(l.users)..addAll(model.users)); } }); }); @@ -177,8 +175,7 @@ class RoleQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - users: List<_User>.from(l.users ?? []) - ..addAll(model.users ?? [])); + users: List<_User>.from(l.users)..addAll(model.users)); } }); }); @@ -420,8 +417,7 @@ class UserQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - roles: List<_Role>.from(l.roles ?? []) - ..addAll(model.roles ?? [])); + roles: List<_Role>.from(l.roles)..addAll(model.roles)); } }); }); @@ -439,8 +435,7 @@ class UserQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - roles: List<_Role>.from(l.roles ?? []) - ..addAll(model.roles ?? [])); + roles: List<_Role>.from(l.roles)..addAll(model.roles)); } }); }); @@ -458,8 +453,7 @@ class UserQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - roles: List<_Role>.from(l.roles ?? []) - ..addAll(model.roles ?? [])); + roles: List<_Role>.from(l.roles)..addAll(model.roles)); } }); }); diff --git a/packages/orm/angel_orm_test/lib/src/models/tree.g.dart b/packages/orm/angel_orm_test/lib/src/models/tree.g.dart index 6d9a6a55..f3a9df1e 100644 --- a/packages/orm/angel_orm_test/lib/src/models/tree.g.dart +++ b/packages/orm/angel_orm_test/lib/src/models/tree.g.dart @@ -133,8 +133,7 @@ class TreeQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - fruits: List<_Fruit>.from(l.fruits ?? []) - ..addAll(model.fruits ?? [])); + fruits: List<_Fruit>.from(l.fruits)..addAll(model.fruits)); } }); }); @@ -152,8 +151,7 @@ class TreeQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - fruits: List<_Fruit>.from(l.fruits ?? []) - ..addAll(model.fruits ?? [])); + fruits: List<_Fruit>.from(l.fruits)..addAll(model.fruits)); } }); }); @@ -171,8 +169,7 @@ class TreeQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - fruits: List<_Fruit>.from(l.fruits ?? []) - ..addAll(model.fruits ?? [])); + fruits: List<_Fruit>.from(l.fruits)..addAll(model.fruits)); } }); }); diff --git a/packages/orm/angel_orm_test/lib/src/models/unorthodox.g.dart b/packages/orm/angel_orm_test/lib/src/models/unorthodox.g.dart index 4aadaf7a..8c00498c 100644 --- a/packages/orm/angel_orm_test/lib/src/models/unorthodox.g.dart +++ b/packages/orm/angel_orm_test/lib/src/models/unorthodox.g.dart @@ -321,9 +321,8 @@ class WeirdJoinQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - numbas: List<_Numba>.from(l.numbas ?? []) - ..addAll(model.numbas ?? []), - foos: List<_Foo>.from(l.foos ?? [])..addAll(model.foos ?? [])); + numbas: List<_Numba>.from(l.numbas)..addAll(model.numbas), + foos: List<_Foo>.from(l.foos)..addAll(model.foos)); } }); }); @@ -341,9 +340,8 @@ class WeirdJoinQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - numbas: List<_Numba>.from(l.numbas ?? []) - ..addAll(model.numbas ?? []), - foos: List<_Foo>.from(l.foos ?? [])..addAll(model.foos ?? [])); + numbas: List<_Numba>.from(l.numbas)..addAll(model.numbas), + foos: List<_Foo>.from(l.foos)..addAll(model.foos)); } }); }); @@ -361,9 +359,8 @@ class WeirdJoinQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - numbas: List<_Numba>.from(l.numbas ?? []) - ..addAll(model.numbas ?? []), - foos: List<_Foo>.from(l.foos ?? [])..addAll(model.foos ?? [])); + numbas: List<_Numba>.from(l.numbas)..addAll(model.numbas), + foos: List<_Foo>.from(l.foos)..addAll(model.foos)); } }); }); @@ -696,8 +693,8 @@ class FooQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - weirdJoins: List<_WeirdJoin>.from(l.weirdJoins ?? []) - ..addAll(model.weirdJoins ?? [])); + weirdJoins: List<_WeirdJoin>.from(l.weirdJoins) + ..addAll(model.weirdJoins)); } }); }); @@ -715,8 +712,8 @@ class FooQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - weirdJoins: List<_WeirdJoin>.from(l.weirdJoins ?? []) - ..addAll(model.weirdJoins ?? [])); + weirdJoins: List<_WeirdJoin>.from(l.weirdJoins) + ..addAll(model.weirdJoins)); } }); }); @@ -734,8 +731,8 @@ class FooQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - weirdJoins: List<_WeirdJoin>.from(l.weirdJoins ?? []) - ..addAll(model.weirdJoins ?? [])); + weirdJoins: List<_WeirdJoin>.from(l.weirdJoins) + ..addAll(model.weirdJoins)); } }); }); diff --git a/packages/orm/angel_orm_test/lib/src/models/user.g.dart b/packages/orm/angel_orm_test/lib/src/models/user.g.dart index 869f5b06..63ba4437 100644 --- a/packages/orm/angel_orm_test/lib/src/models/user.g.dart +++ b/packages/orm/angel_orm_test/lib/src/models/user.g.dart @@ -154,8 +154,7 @@ class UserQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - roles: List<_Role>.from(l.roles ?? []) - ..addAll(model.roles ?? [])); + roles: List<_Role>.from(l.roles)..addAll(model.roles)); } }); }); @@ -173,8 +172,7 @@ class UserQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - roles: List<_Role>.from(l.roles ?? []) - ..addAll(model.roles ?? [])); + roles: List<_Role>.from(l.roles)..addAll(model.roles)); } }); }); @@ -192,8 +190,7 @@ class UserQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - roles: List<_Role>.from(l.roles ?? []) - ..addAll(model.roles ?? [])); + roles: List<_Role>.from(l.roles)..addAll(model.roles)); } }); }); @@ -495,8 +492,7 @@ class RoleQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - users: List<_User>.from(l.users ?? []) - ..addAll(model.users ?? [])); + users: List<_User>.from(l.users)..addAll(model.users)); } }); }); @@ -514,8 +510,7 @@ class RoleQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - users: List<_User>.from(l.users ?? []) - ..addAll(model.users ?? [])); + users: List<_User>.from(l.users)..addAll(model.users)); } }); }); @@ -533,8 +528,7 @@ class RoleQuery extends Query { var l = out[idx]; return out ..[idx] = l.copyWith( - users: List<_User>.from(l.users ?? []) - ..addAll(model.users ?? [])); + users: List<_User>.from(l.users)..addAll(model.users)); } }); });