fix(llc): Add type to Filter in QueryConfiguration (#22)

renefloor · web-flow · commit 9f559161c0d0 · 2025-09-09T11:42:37.000+02:00
* Add type to Filter in QueryConfiguration

* rename T to F
diff --git a/packages/stream_feeds/lib/src/models/get_or_create_feed_data.dart b/packages/stream_feeds/lib/src/models/get_or_create_feed_data.dart
@@ -44,7 +44,8 @@ class GetOrCreateFeedData with _$GetOrCreateFeedData {
 
   /// The configuration used to query activities.
   @override
-  final QueryConfiguration<ActivitiesSort> activitiesQueryConfig;
+  final QueryConfiguration<ActivitiesSort, ActivitiesFilterField>
+      activitiesQueryConfig;
 
   /// The feed data associated with the feed.
   @override
diff --git a/packages/stream_feeds/lib/src/models/get_or_create_feed_data.freezed.dart b/packages/stream_feeds/lib/src/models/get_or_create_feed_data.freezed.dart
diff --git a/packages/stream_feeds/lib/src/models/query_configuration.dart b/packages/stream_feeds/lib/src/models/query_configuration.dart
@@ -9,7 +9,8 @@ part 'query_configuration.freezed.dart';
 /// database queries in the Stream Feeds system.
 @freezed
 @internal
-class QueryConfiguration<S extends Sort> with _$QueryConfiguration {
+class QueryConfiguration<S extends Sort, F extends FilterField>
+    with _$QueryConfiguration {
   /// Creates a new [QueryConfiguration] instance.
   const QueryConfiguration({
     this.filter,
@@ -18,7 +19,7 @@ class QueryConfiguration<S extends Sort> with _$QueryConfiguration {
 
   /// The filter for the query.
   @override
-  final Filter? filter;
+  final Filter<F>? filter;
 
   /// The list of sorting operations for the query.
   @override
diff --git a/packages/stream_feeds/lib/src/models/query_configuration.freezed.dart b/packages/stream_feeds/lib/src/models/query_configuration.freezed.dart
diff --git a/packages/stream_feeds/lib/src/state/activity_list_state.dart b/packages/stream_feeds/lib/src/state/activity_list_state.dart
@@ -24,15 +24,15 @@ class ActivityListStateNotifier extends StateNotifier<ActivityListState> {
 
   final String currentUserId;
 
-  QueryConfiguration<ActivitiesSort>? _queryConfig;
+  QueryConfiguration<ActivitiesSort, ActivitiesFilterField>? _queryConfig;
   List<ActivitiesSort> get activitiesSort {
     return _queryConfig?.sort ?? ActivitiesSort.defaultSort;
   }
 
   /// Handles the result of a query for more activities.
   void onQueryMoreActivities(
     PaginationResult<ActivityData> result,
-    QueryConfiguration<ActivitiesSort> queryConfig,
+    QueryConfiguration<ActivitiesSort, ActivitiesFilterField> queryConfig,
   ) {
     _queryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/activity_reaction_list_state.dart b/packages/stream_feeds/lib/src/state/activity_reaction_list_state.dart
@@ -19,15 +19,17 @@ class ActivityReactionListStateNotifier
     required ActivityReactionListState initialState,
   }) : super(initialState);
 
-  QueryConfiguration<ActivityReactionsSort>? _queryConfig;
+  QueryConfiguration<ActivityReactionsSort, ActivityReactionsFilterField>?
+      _queryConfig;
   List<ActivityReactionsSort> get reactionsSort {
     return _queryConfig?.sort ?? ActivityReactionsSort.defaultSort;
   }
 
   /// Handles the result of a query for more activity reactions.
   void onQueryMoreActivityReactions(
     PaginationResult<FeedsReactionData> result,
-    QueryConfiguration<ActivityReactionsSort> queryConfig,
+    QueryConfiguration<ActivityReactionsSort, ActivityReactionsFilterField>
+        queryConfig,
   ) {
     _queryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/bookmark_folder_list_state.dart b/packages/stream_feeds/lib/src/state/bookmark_folder_list_state.dart
@@ -19,15 +19,17 @@ class BookmarkFolderListStateNotifier
     required BookmarkFolderListState initialState,
   }) : super(initialState);
 
-  QueryConfiguration<BookmarkFoldersSort>? _queryConfig;
+  QueryConfiguration<BookmarkFoldersSort, BookmarkFoldersFilterField>?
+      _queryConfig;
   List<BookmarkFoldersSort> get foldersSort {
     return _queryConfig?.sort ?? BookmarkFoldersSort.defaultSort;
   }
 
   /// Handles the result of a query for more bookmark folders.
   void onQueryMoreBookmarkFolders(
     PaginationResult<BookmarkFolderData> result,
-    QueryConfiguration<BookmarkFoldersSort> queryConfig,
+    QueryConfiguration<BookmarkFoldersSort, BookmarkFoldersFilterField>
+        queryConfig,
   ) {
     _queryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/bookmark_list.dart b/packages/stream_feeds/lib/src/state/bookmark_list.dart
@@ -40,7 +40,7 @@ class BookmarkList with Disposable {
   final BookmarksRepository bookmarksRepository;
 
   late final BookmarkListStateNotifier _stateNotifier;
-  
+
   BookmarkListState get state => _stateNotifier.value;
   StateNotifier<BookmarkListState> get notifier => _stateNotifier;
   Stream<BookmarkListState> get stream => _stateNotifier.stream;
diff --git a/packages/stream_feeds/lib/src/state/bookmark_list_state.dart b/packages/stream_feeds/lib/src/state/bookmark_list_state.dart
@@ -19,15 +19,15 @@ class BookmarkListStateNotifier extends StateNotifier<BookmarkListState> {
     required BookmarkListState initialState,
   }) : super(initialState);
 
-  QueryConfiguration<BookmarksSort>? _queryConfig;
+  QueryConfiguration<BookmarksSort, BookmarksFilterField>? _queryConfig;
   List<BookmarksSort> get bookmarkSort {
     return _queryConfig?.sort ?? BookmarksSort.defaultSort;
   }
 
   /// Handles the result of a query for more bookmarks.
   void onQueryMoreBookmarks(
     PaginationResult<BookmarkData> result,
-    QueryConfiguration<BookmarksSort> queryConfig,
+    QueryConfiguration<BookmarksSort, BookmarksFilterField> queryConfig,
   ) {
     _queryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/comment_reaction_list.dart b/packages/stream_feeds/lib/src/state/comment_reaction_list.dart
@@ -40,7 +40,7 @@ class CommentReactionList with Disposable {
   final CommentsRepository commentsRepository;
 
   late final CommentReactionListStateNotifier _stateNotifier;
-  
+
   CommentReactionListState get state => _stateNotifier.value;
   StateNotifier<CommentReactionListState> get notifier => _stateNotifier;
   Stream<CommentReactionListState> get stream => _stateNotifier.stream;
diff --git a/packages/stream_feeds/lib/src/state/comment_reaction_list_state.dart b/packages/stream_feeds/lib/src/state/comment_reaction_list_state.dart
@@ -19,15 +19,17 @@ class CommentReactionListStateNotifier
     required CommentReactionListState initialState,
   }) : super(initialState);
 
-  QueryConfiguration<CommentReactionsSort>? _queryConfig;
+  QueryConfiguration<CommentReactionsSort, CommentReactionsFilterField>?
+      _queryConfig;
   List<CommentReactionsSort> get reactionSort {
     return _queryConfig?.sort ?? CommentReactionsSort.defaultSort;
   }
 
   /// Handles the result of a query for more reactions.
   void onQueryMoreReactions(
     PaginationResult<FeedsReactionData> result,
-    QueryConfiguration<CommentReactionsSort> queryConfig,
+    QueryConfiguration<CommentReactionsSort, CommentReactionsFilterField>
+        queryConfig,
   ) {
     _queryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/comment_reply_list.dart b/packages/stream_feeds/lib/src/state/comment_reply_list.dart
@@ -42,7 +42,7 @@ class CommentReplyList with Disposable {
   final CommentsRepository commentsRepository;
 
   late final CommentReplyListStateNotifier _stateNotifier;
-  
+
   CommentReplyListState get state => _stateNotifier.value;
   StateNotifier<CommentReplyListState> get notifier => _stateNotifier;
   Stream<CommentReplyListState> get stream => _stateNotifier.stream;
diff --git a/packages/stream_feeds/lib/src/state/feed_list_state.dart b/packages/stream_feeds/lib/src/state/feed_list_state.dart
@@ -18,13 +18,13 @@ class FeedListStateNotifier extends StateNotifier<FeedListState> {
     required FeedListState initialState,
   }) : super(initialState);
 
-  QueryConfiguration<FeedsSort>? _queryConfig;
+  QueryConfiguration<FeedsSort, FeedsFilterField>? _queryConfig;
   List<FeedsSort> get feedsSort => _queryConfig?.sort ?? FeedsSort.defaultSort;
 
   /// Handles the result of a query for more feeds.
   void onQueryMoreFeeds(
     PaginationResult<FeedData> result,
-    QueryConfiguration<FeedsSort> queryConfig,
+    QueryConfiguration<FeedsSort, FeedsFilterField> queryConfig,
   ) {
     _queryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/feed_state.dart b/packages/stream_feeds/lib/src/state/feed_state.dart
@@ -49,7 +49,8 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
     });
   }
 
-  QueryConfiguration<ActivitiesSort>? _activitiesQueryConfig;
+  QueryConfiguration<ActivitiesSort, ActivitiesFilterField>?
+      _activitiesQueryConfig;
   List<ActivitiesSort> get activitiesSort {
     return _activitiesQueryConfig?.sort ?? ActivitiesSort.defaultSort;
   }
@@ -83,7 +84,7 @@ class FeedStateNotifier extends StateNotifier<FeedState> {
   /// Handles the result of a query for more activities.
   void onQueryMoreActivities(
     PaginationResult<ActivityData> result,
-    QueryConfiguration<ActivitiesSort> queryConfig,
+    QueryConfiguration<ActivitiesSort, ActivitiesFilterField> queryConfig,
   ) {
     _activitiesQueryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/follow_list_state.dart b/packages/stream_feeds/lib/src/state/follow_list_state.dart
@@ -18,15 +18,15 @@ class FollowListStateNotifier extends StateNotifier<FollowListState> {
     required FollowListState initialState,
   }) : super(initialState);
 
-  QueryConfiguration<FollowsSort>? queryConfig;
+  QueryConfiguration<FollowsSort, FollowsFilterField>? queryConfig;
   List<FollowsSort> get followsSort {
     return queryConfig?.sort ?? FollowsSort.defaultSort;
   }
 
   /// Handles the result of a query for more follows.
   void onQueryMoreFollows(
     PaginationResult<FollowData> result,
-    QueryConfiguration<FollowsSort> queryConfig,
+    QueryConfiguration<FollowsSort, FollowsFilterField> queryConfig,
   ) {
     this.queryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/member_list_state.dart b/packages/stream_feeds/lib/src/state/member_list_state.dart
@@ -20,15 +20,15 @@ class MemberListStateNotifier extends StateNotifier<MemberListState> {
     required MemberListState initialState,
   }) : super(initialState);
 
-  QueryConfiguration<MembersSort>? _queryConfig;
+  QueryConfiguration<MembersSort, MembersFilterField>? _queryConfig;
   List<MembersSort> get membersSort {
     return _queryConfig?.sort ?? MembersSort.defaultSort;
   }
 
   /// Handles the result of a query for more members.
   void onQueryMoreMembers(
     PaginationResult<FeedMemberData> result,
-    QueryConfiguration<MembersSort> queryConfig,
+    QueryConfiguration<MembersSort, MembersFilterField> queryConfig,
   ) {
     _queryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/moderation_config_list_state.dart b/packages/stream_feeds/lib/src/state/moderation_config_list_state.dart
@@ -19,15 +19,17 @@ class ModerationConfigListStateNotifier
     required ModerationConfigListState initialState,
   }) : super(initialState);
 
-  QueryConfiguration<ModerationConfigsSort>? _queryConfig;
+  QueryConfiguration<ModerationConfigsSort, ModerationConfigsFilterField>?
+      _queryConfig;
   List<ModerationConfigsSort> get configsSort {
     return _queryConfig?.sort ?? ModerationConfigsSort.defaultSort;
   }
 
   /// Handles the result of a query for more moderation configs.
   void onQueryMoreConfigs(
     PaginationResult<ModerationConfigData> result,
-    QueryConfiguration<ModerationConfigsSort> queryConfig,
+    QueryConfiguration<ModerationConfigsSort, ModerationConfigsFilterField>
+        queryConfig,
   ) {
     _queryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/poll_list_state.dart b/packages/stream_feeds/lib/src/state/poll_list_state.dart
@@ -18,13 +18,13 @@ class PollListStateNotifier extends StateNotifier<PollListState> {
     required PollListState initialState,
   }) : super(initialState);
 
-  QueryConfiguration<PollsSort>? queryConfig;
+  QueryConfiguration<PollsSort, PollsFilterField>? queryConfig;
   List<PollsSort> get pollsSort => queryConfig?.sort ?? PollsSort.defaultSort;
 
   /// Handles the result of a query for more polls.
   void onQueryMorePolls(
     PaginationResult<PollData> result,
-    QueryConfiguration<PollsSort> queryConfig,
+    QueryConfiguration<PollsSort, PollsFilterField> queryConfig,
   ) {
     this.queryConfig = queryConfig;
 
diff --git a/packages/stream_feeds/lib/src/state/poll_vote_list_state.dart b/packages/stream_feeds/lib/src/state/poll_vote_list_state.dart
@@ -18,15 +18,15 @@ class PollVoteListStateNotifier extends StateNotifier<PollVoteListState> {
     required PollVoteListState initialState,
   }) : super(initialState);
 
-  QueryConfiguration<PollVotesSort>? queryConfig;
+  QueryConfiguration<PollVotesSort, PollVotesFilterField>? queryConfig;
   List<PollVotesSort> get votesSort {
     return queryConfig?.sort ?? PollVotesSort.defaultSort;
   }
 
   /// Handles the result of a query for more poll votes.
   void onQueryMorePollVotes(
     PaginationResult<PollVoteData> result,
-    QueryConfiguration<PollVotesSort> queryConfig,
+    QueryConfiguration<PollVotesSort, PollVotesFilterField> queryConfig,
   ) {
     this.queryConfig = queryConfig;
 
diff --git a/pubspec.yaml b/pubspec.yaml
@@ -7,6 +7,11 @@ dependencies:
   flutter_state_notifier: ^1.0.0
   stream_feeds:
     path: ./packages/stream_feeds
+  stream_core:
+    git:
+      url: https://github.com/GetStream/stream-core-flutter.git
+      ref: 280b1045e39388668fd060439259831611b51b5a
+      path: packages/stream_core
 
 dev_dependencies:
   melos: ^6.2.0
diff --git a/sample_app/lib/navigation/app_router.gr.dart b/sample_app/lib/navigation/app_router.gr.dart
