From 03a053bba6370c2d80c632b6365973e27415f85f Mon Sep 17 00:00:00 2001
From: Kingkor Roy Tirtho <krtirtho@gmail.com>
Date: Fri, 23 Sep 2022 09:50:22 +0600
Subject: [PATCH] fix(fl_query_hooks): newest query/mutation/infinite-query
 instance not getting returned

---
 packages/fl_query/lib/src/base_query.dart               | 7 -------
 packages/fl_query/lib/src/infinite_query.dart           | 1 -
 packages/fl_query/lib/src/query_cache.dart              | 7 +++----
 packages/fl_query_hooks/lib/src/use_infinite_query.dart | 2 +-
 packages/fl_query_hooks/lib/src/use_mutation.dart       | 2 +-
 packages/fl_query_hooks/lib/src/use_query.dart          | 2 +-
 6 files changed, 6 insertions(+), 15 deletions(-)

diff --git a/packages/fl_query/lib/src/base_query.dart b/packages/fl_query/lib/src/base_query.dart
index 8b0058e..f20328a 100644
--- a/packages/fl_query/lib/src/base_query.dart
+++ b/packages/fl_query/lib/src/base_query.dart
@@ -179,13 +179,6 @@ abstract class BaseQuery<T extends Object, Outside, Error>
   /// the current available [data] instead of running the task to prevent
   /// race conditions
   Future<T?> refetch() async {
-    if (queryKey == "category-playlists#user-featured-playlists") {
-      print(
-        "Refetch Count of ${queryKey}-> ${refetchCount}",
-      );
-      print(StackTrace.current);
-    }
-
     /// if isLoading/isRefetching is true that means its already fetching/
     /// refetching. So [_execute] again can create a race condition
     if (isRefetching || isLoading) return data;
diff --git a/packages/fl_query/lib/src/infinite_query.dart b/packages/fl_query/lib/src/infinite_query.dart
index 60f31bf..342c057 100644
--- a/packages/fl_query/lib/src/infinite_query.dart
+++ b/packages/fl_query/lib/src/infinite_query.dart
@@ -211,7 +211,6 @@ class InfiniteQuery<T extends Object, Outside, PageParam extends Object>
   }
 
   @override
-  // TODO: implement debugLabel
   String get debugLabel => "InfiniteQuery($queryKey)";
 
   @override
diff --git a/packages/fl_query/lib/src/query_cache.dart b/packages/fl_query/lib/src/query_cache.dart
index 9454476..1d3154a 100644
--- a/packages/fl_query/lib/src/query_cache.dart
+++ b/packages/fl_query/lib/src/query_cache.dart
@@ -26,10 +26,9 @@ class QueryCache {
 
   final Set<CacheUpdateListener<BaseOperation>> _listeners = {};
 
-  ReadonlySet<Query> get queries => UnmodifiableSetView(_queries);
-  ReadonlySet<InfiniteQuery> get infiniteQueries =>
-      UnmodifiableSetView(_infiniteQueries);
-  ReadonlySet<Mutation> get mutations => UnmodifiableSetView(_mutations);
+  Set<Query> get queries => _queries;
+  Set<InfiniteQuery> get infiniteQueries => _infiniteQueries;
+  Set<Mutation> get mutations => _mutations;
 
   ReadonlySet<CacheUpdateListener<BaseOperation>> get listeners =>
       UnmodifiableSetView(_listeners);
diff --git a/packages/fl_query_hooks/lib/src/use_infinite_query.dart b/packages/fl_query_hooks/lib/src/use_infinite_query.dart
index 267321c..7e5ad61 100644
--- a/packages/fl_query_hooks/lib/src/use_infinite_query.dart
+++ b/packages/fl_query_hooks/lib/src/use_infinite_query.dart
@@ -129,5 +129,5 @@ InfiniteQuery<T, Outside, PageParam>
     return null;
   });
 
-  return infiniteQuery.value;
+  return queryBowl.getInfiniteQuery(job.queryKey) ?? infiniteQuery.value;
 }
diff --git a/packages/fl_query_hooks/lib/src/use_mutation.dart b/packages/fl_query_hooks/lib/src/use_mutation.dart
index 8eb6262..4ab6dc9 100644
--- a/packages/fl_query_hooks/lib/src/use_mutation.dart
+++ b/packages/fl_query_hooks/lib/src/use_mutation.dart
@@ -85,5 +85,5 @@ Mutation<T, V> useMutation<T extends Object, V>({
     return null;
   });
 
-  return mutation.value;
+  return queryBowl.getMutation(job.mutationKey) ?? mutation.value;
 }
diff --git a/packages/fl_query_hooks/lib/src/use_query.dart b/packages/fl_query_hooks/lib/src/use_query.dart
index 94aa236..d3d08ae 100644
--- a/packages/fl_query_hooks/lib/src/use_query.dart
+++ b/packages/fl_query_hooks/lib/src/use_query.dart
@@ -125,5 +125,5 @@ Query<T, Outside> useQuery<T extends Object, Outside>({
     return null;
   });
 
-  return query.value;
+  return queryBowl.getQuery(job.queryKey) ?? query.value;
 }