Merge branches 'develop' and 'ref/segregate-api-layer' of https://github.com/GetStream/stream-chat-flutter into ref/segregate-api-layer

Conflicts: packages/stream_chat/lib/src/api/channel.dart packages/stream_chat/lib/src/client.dart packages/stream_chat_persistence/lib/src/db/moor_chat_database.g.dart
2021-05-27 20:07:11 +05:30
parent 839ced618b 2f51726db8
commit 5cada0ce49
44 changed files with 753 additions and 188 deletions
@@ -1,3 +1,9 @@
+## 2.0.0-nullsafety.2
+
+* Update llc dependency
+* Minor fixes and improvements
+* Fixed bug not saving message.mentioned_users
+
 ## 2.0.0-nullsafety.1

 * Migrate this package to null safety
@@ -0,0 +1,150 @@
+analyzer:
+  enable-experiment:
+    - extension-methods
+  exclude:
+    - lib/**/*.g.dart
+    - example/**
+    - lib/src/emoji
+    - lib/**/*.freezed.dart
+    - test/**
+
+linter:
+  rules:
+    # these rules are documented on and in the same order as
+    # the Dart Lint rules page to make maintenance easier
+    # https://github.com/dart-lang/linter/blob/master/example/all.yaml
+    - always_use_package_imports
+    - avoid_empty_else
+    - avoid_relative_lib_imports
+    - avoid_slow_async_io
+    - avoid_types_as_parameter_names
+    - cancel_subscriptions
+    - close_sinks
+    - control_flow_in_finally
+    - empty_statements
+    - hash_and_equals
+    - invariant_booleans
+    - iterable_contains_unrelated_type
+    - list_remove_unrelated_type
+    - literal_only_boolean_expressions
+    - no_adjacent_strings_in_list
+    - no_duplicate_case_values
+    - no_logic_in_create_state
+    - prefer_void_to_null
+    - test_types_in_equals
+    - throw_in_finally
+    - unnecessary_statements
+    - unrelated_type_equality_checks
+    - omit_local_variable_types
+    - use_key_in_widget_constructors
+    - valid_regexps
+    - always_declare_return_types
+    - always_require_non_null_named_parameters
+    - annotate_overrides
+    - avoid_bool_literals_in_conditional_expressions
+    - avoid_catching_errors
+    - avoid_init_to_null
+    - avoid_null_checks_in_equality_operators
+    - avoid_positional_boolean_parameters
+    - avoid_private_typedef_functions
+    - avoid_redundant_argument_values
+    - avoid_return_types_on_setters
+    - avoid_returning_null_for_void
+    - avoid_shadowing_type_parameters
+    - avoid_single_cascade_in_expression_statements
+    - avoid_unnecessary_containers
+    - avoid_unused_constructor_parameters
+    - await_only_futures
+    - camel_case_extensions
+    - camel_case_types
+    - cascade_invocations
+
+    - constant_identifier_names
+    - curly_braces_in_flow_control_structures
+    - directives_ordering
+    - empty_catches
+    - empty_constructor_bodies
+    - exhaustive_cases
+    - file_names
+    - implementation_imports
+    - join_return_with_assignment
+    - leading_newlines_in_multiline_strings
+    - library_names
+    - library_prefixes
+    - lines_longer_than_80_chars
+    - missing_whitespace_between_adjacent_strings
+    - non_constant_identifier_names
+    - null_closures
+    - one_member_abstracts
+    - only_throw_errors
+    - package_api_docs
+    - package_prefixed_library_names
+    - parameter_assignments
+    - prefer_adjacent_string_concatenation
+    - prefer_asserts_in_initializer_lists
+    - prefer_asserts_with_message
+    - prefer_collection_literals
+    - prefer_conditional_assignment
+    - prefer_const_constructors
+    - prefer_const_constructors_in_immutables
+    - prefer_const_declarations
+    - prefer_const_literals_to_create_immutables
+    - prefer_constructors_over_static_methods
+    - prefer_contains
+    - prefer_equal_for_default_values
+    - prefer_expression_function_bodies
+    - prefer_final_fields
+    - prefer_final_in_for_each
+    - prefer_final_locals
+    - prefer_function_declarations_over_variables
+    - prefer_generic_function_type_aliases
+    - prefer_if_elements_to_conditional_expressions
+    - prefer_if_null_operators
+    - prefer_initializing_formals
+    - prefer_inlined_adds
+    - prefer_int_literals
+    - prefer_interpolation_to_compose_strings
+    - prefer_is_empty
+    - prefer_is_not_empty
+    - prefer_is_not_operator
+    - prefer_null_aware_operators
+    - prefer_single_quotes
+    - prefer_spread_collections
+    - prefer_typing_uninitialized_variables
+    - provide_deprecation_message
+    - public_member_api_docs
+    - recursive_getters
+    - sized_box_for_whitespace
+    - slash_for_doc_comments
+    - sort_child_properties_last
+    - sort_constructors_first
+    - sort_unnamed_constructors_first
+
+    - type_annotate_public_apis
+    - type_init_formals
+    - unnecessary_await_in_return
+    - unnecessary_brace_in_string_interps
+    - unnecessary_const
+    - unnecessary_getters_setters
+    - unnecessary_lambdas
+    - unnecessary_new
+    - unnecessary_null_aware_assignments
+    - unnecessary_null_in_if_null_operators
+    - unnecessary_nullable_for_final_variable_declarations
+    - unnecessary_parenthesis
+    - unnecessary_raw_strings
+    - unnecessary_string_escapes
+    - unnecessary_string_interpolations
+    - unnecessary_this
+    - use_is_even_rather_than_modulo
+    - use_late_for_private_fields_and_variables
+    - use_rethrow_when_possible
+    - use_setters_to_change_properties
+    - use_to_and_as_if_applicable
+    - package_names
+    - sort_pub_dependencies
+
+    - cast_nullable_to_non_nullable
+    - unnecessary_null_checks
+    - tighten_type_of_initializing_formals
+    - null_check_on_nullable_type_parameter
@@ -1,5 +1,3 @@
-import 'package:meta/meta.dart';
-import 'package:moor/ffi.dart';
 import 'package:moor/moor.dart';
 import 'package:stream_chat/stream_chat.dart';

@@ -46,10 +44,6 @@ class MoorChatDatabase extends _$MoorChatDatabase {
    DatabaseConnection connection,
  ) : super.connect(connection);

-  /// Custom constructor used only for testing
-  @visibleForTesting
-  MoorChatDatabase.testable(this._userId) : super(VmDatabase.memory());
-
  final String _userId;

  /// User id to which the database is connected
@@ -1,7 +1,7 @@
 name: stream_chat_persistence
 homepage: https://github.com/GetStream/stream-chat-flutter
 description: Official Stream Chat Persistence library. Build your own chat experience using Dart and Flutter.
-version: 2.0.0-nullsafety.1
+version: 2.0.0-nullsafety.2
 repository: https://github.com/GetStream/stream-chat-flutter
 issue_tracker: https://github.com/GetStream/stream-chat-flutter/issues

@@ -17,8 +17,8 @@ dependencies:
  mutex: ^3.0.0
  path: ^1.8.0
  path_provider: ^2.0.1
-  sqlite3_flutter_libs: ^0.4.1
-  stream_chat: ^2.0.0-nullsafety.0
+  sqlite3_flutter_libs: ^0.4.2
+  stream_chat: ^2.0.0-nullsafety.2

 dependency_overrides:
  stream_chat:
@@ -3,12 +3,14 @@ import 'package:stream_chat_persistence/src/dao/channel_dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:test/test.dart';

+import '../../stream_chat_persistence_client_test.dart';
+
 void main() {
  late ChannelDao channelDao;
  late MoorChatDatabase database;

  setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
    channelDao = database.channelDao;
  });

@@ -5,6 +5,7 @@ import 'package:stream_chat_persistence/src/dao/channel_query_dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:test/test.dart';

+import '../../stream_chat_persistence_client_test.dart';
 import '../utils/date_matcher.dart';

 void main() {
@@ -12,7 +13,7 @@ void main() {
  late ChannelQueryDao channelQueryDao;

  setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
    channelQueryDao = database.channelQueryDao;
  });

@@ -3,6 +3,7 @@ import 'package:stream_chat_persistence/src/dao/connection_event_dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:test/test.dart';

+import '../../stream_chat_persistence_client_test.dart';
 import '../utils/date_matcher.dart';

 void main() {
@@ -10,7 +11,7 @@ void main() {
  late MoorChatDatabase database;

  setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
    eventDao = database.connectionEventDao;
  });

@@ -5,6 +5,7 @@ import 'package:stream_chat_persistence/src/dao/dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:test/test.dart';

+import '../../stream_chat_persistence_client_test.dart';
 import '../utils/date_matcher.dart';

 void main() {
@@ -12,7 +13,7 @@ void main() {
  late MoorChatDatabase database;

  setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
    memberDao = database.memberDao;
  });

@@ -5,12 +5,14 @@ import 'package:stream_chat_persistence/src/dao/dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:test/test.dart';

+import '../../stream_chat_persistence_client_test.dart';
+
 void main() {
  late MessageDao messageDao;
  late MoorChatDatabase database;

  setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
    messageDao = database.messageDao;
  });

@@ -5,12 +5,14 @@ import 'package:stream_chat_persistence/src/dao/dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:test/test.dart';

+import '../../stream_chat_persistence_client_test.dart';
+
 void main() {
  late PinnedMessageDao pinnedMessageDao;
  late MoorChatDatabase database;

  setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
    pinnedMessageDao = database.pinnedMessageDao;
  });

@@ -5,12 +5,14 @@ import 'package:stream_chat_persistence/src/dao/reaction_dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:test/test.dart';

+import '../../stream_chat_persistence_client_test.dart';
+
 void main() {
  late ReactionDao reactionDao;
  late MoorChatDatabase database;

  setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
    reactionDao = database.reactionDao;
  });

@@ -3,6 +3,7 @@ import 'package:stream_chat_persistence/src/dao/dao.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:test/test.dart';

+import '../../stream_chat_persistence_client_test.dart';
 import '../utils/date_matcher.dart';

 void main() {
@@ -10,7 +11,7 @@ void main() {
  late MoorChatDatabase database;

  setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
    readDao = database.readDao;
  });

@@ -5,12 +5,14 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:test/test.dart';
 import 'package:stream_chat/stream_chat.dart';

+import '../../stream_chat_persistence_client_test.dart';
+
 void main() {
  late UserDao userDao;
  late MoorChatDatabase database;

  setUp(() {
-    database = MoorChatDatabase.testable('testUserId');
+    database = testDatabaseProvider('testUserId');
    userDao = database.userDao;
  });

@@ -1,4 +1,5 @@
 import 'package:mocktail/mocktail.dart';
+import 'package:moor/ffi.dart';
 import 'package:stream_chat/stream_chat.dart';
 import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
 import 'package:stream_chat_persistence/src/stream_chat_persistence_client.dart';
@@ -6,8 +7,8 @@ import 'package:test/test.dart';
 import 'mock_chat_database.dart';
 import 'src/utils/date_matcher.dart';

-MoorChatDatabase _testDatabaseProvider(String userId, ConnectionMode mode) =>
-    MoorChatDatabase.testable(userId);
+MoorChatDatabase testDatabaseProvider(String userId, [ConnectionMode? mode]) =>
+    MoorChatDatabase(userId, VmDatabase.memory());

 void main() {
  group('connect', () {
@@ -15,7 +16,7 @@ void main() {
    test('successfully connects with the Database', () async {
      final client = StreamChatPersistenceClient(logLevel: Level.ALL);
      expect(client.db, isNull);
-      await client.connect(userId, databaseProvider: _testDatabaseProvider);
+      await client.connect(userId, databaseProvider: testDatabaseProvider);
      expect(client.db, isNotNull);
      expect(client.db, isA<MoorChatDatabase>());
      expect(client.db!.userId, userId);
@@ -28,13 +29,13 @@ void main() {
    test('throws if already connected', () async {
      final client = StreamChatPersistenceClient(logLevel: Level.ALL);
      expect(client.db, isNull);
-      await client.connect(userId, databaseProvider: _testDatabaseProvider);
+      await client.connect(userId, databaseProvider: testDatabaseProvider);
      expect(client.db, isNotNull);
      expect(client.db, isNotNull);
      expect(client.db, isA<MoorChatDatabase>());
      expect(client.db!.userId, userId);
      expect(
-        () => client.connect(userId, databaseProvider: _testDatabaseProvider),
+        () => client.connect(userId, databaseProvider: testDatabaseProvider),
        throwsException,
      );

@@ -47,7 +48,7 @@ void main() {
  test('disconnect', () async {
    const userId = 'testUserId';
    final client = StreamChatPersistenceClient(logLevel: Level.ALL);
-    await client.connect(userId, databaseProvider: _testDatabaseProvider);
+    await client.connect(userId, databaseProvider: testDatabaseProvider);
    expect(client.db, isNotNull);
    await client.disconnect(flush: true);
    expect(client.db, isNull);