@amityco/ts-sdk 0.0.1-beta.44.0 → 0.0.1-beta.45.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@amityco/ts-sdk",
-  "version": "0.0.1-beta.44.0",
+  "version": "0.0.1-beta.45.0",
   "license": "CC-BY-ND-4.0",
   "author": "amity.co <developers@amity.co> (https://amity.co)",
   "description": "Amity Social Cloud Typescript SDK",

package/src/category/observers/liveCategories.ts

@@ -96,16 +96,16 @@ export const liveCategories = (
    *};
    */
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.CategoryLiveCollectionCache>(cacheKey)?.data;
 
     const categories = collection?.data ?? [];
 
-    if (categories.length > 0 && !collection?.params.page) return;
+    if (!initial && categories.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryCategories, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -134,7 +134,7 @@ export const liveCategories = (
     // @TODO -> update once observers added
   });
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveCategories(tmpid: ${timestamp}) > dispose`);

package/src/channel/observers/liveChannelMembers.ts

@@ -137,16 +137,16 @@ export const liveChannelMembers = (
       responder(collection);
     };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.ChannelMembersLiveCollectionCache>(cacheKey)?.data;
 
     const channelMembers = collection?.data ?? [];
 
-    if (channelMembers.length > 0 && !collection?.params.page) return;
+    if (!initial && channelMembers.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryChannelMembers, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -180,7 +180,7 @@ export const liveChannelMembers = (
     onChannelMemberUnbanned(realtimeRouter('onChannelMemberUnbanned')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveChannelMembers(tmpid: ${timestamp}) > dispose`);

package/src/channel/observers/liveChannels.ts

@@ -146,16 +146,16 @@ export const liveChannels = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.ChannelLiveCollectionCache>(cacheKey)?.data;
 
     const channels = collection?.data ?? [];
 
-    if (channels.length > 0 && !collection?.params.page) return;
+    if (!initial && channels.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryChannels, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -192,7 +192,7 @@ export const liveChannels = (
     onMessageCreated(() => null), // watch unread count
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveChannels(tmpid: ${timestamp}) > dispose`);

package/src/channel/observers/tests/liveChannels.test.ts

@@ -75,17 +75,11 @@ describe('liveChannels', () => {
     liveChannels({}, callback);
     await pause();
 
-    expect(callback).toHaveBeenCalledTimes(2);
+    // The second `getChannels` call fetches data from the cache,
+    // so there is no loading state and the callback only fires once.
+    expect(callback).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenNthCalledWith(
       1,
-      expect.objectContaining(
-        getSnapshot({
-          data: convertRawChannelPayload(channelQueryResponse.data).channels,
-        }),
-      ),
-    );
-    expect(callback).toHaveBeenNthCalledWith(
-      2,
       expect.objectContaining(
         getSnapshot({
           data: convertRawChannelPayload(channelQueryResponse.data).channels,

package/src/comment/observers/liveComments.ts

@@ -120,16 +120,16 @@ export const liveComments = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.CommentLiveCollectionCache>(cacheKey)?.data;
 
     const comments = collection?.data ?? [];
 
-    if (comments.length > 0 && !collection?.params?.page) return;
+    if (!initial && comments.length > 0 && !collection?.params?.page) return;
 
     const query = createQuery(queryComments, {
       ...queryParams,
-      page: collection?.params?.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -167,7 +167,7 @@ export const liveComments = (
     onCommentReactionRemoved(realtimeRouter('onReactionRemoved')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveComments(tmpid: ${timestamp}) > dispose`);

package/src/community/observers/liveCommunities.ts

@@ -138,16 +138,16 @@ export const liveCommunities = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.CommunityLiveCollectionCache>(cacheKey)?.data;
 
     const communities = collection?.data ?? [];
 
-    if (communities.length > 0 && !collection?.params.page) return;
+    if (!initial && communities.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryCommunities, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -181,7 +181,7 @@ export const liveCommunities = (
     onCommunityUserChanged(realtimeRouter('onMemberCountChanged')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveCommunities(tmpid: ${timestamp}) > dispose`);

package/src/community/observers/liveCommunityMembers.ts

@@ -132,16 +132,16 @@ export const liveCommunityMembers = (
       responder(collection);
     };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.CommunityMemberLiveCollectionCache>(cacheKey)?.data;
 
     const communityMembers = collection?.data ?? [];
 
-    if (communityMembers.length > 0 && !collection?.params.page) return;
+    if (!initial && communityMembers.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryCommunityMembers, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -178,7 +178,7 @@ export const liveCommunityMembers = (
     onCommunityUserRoleRemoved(realtimeRouter('onMemberCountChanged')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveCommunityMembers(tmpid: ${timestamp}) > dispose`);

package/src/follow/observers/liveFollowers.ts

@@ -96,16 +96,16 @@ export const liveFollowers = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.FollowerLiveCollectionCache>(cacheKey)?.data;
 
     const followers = collection?.data ?? [];
 
-    if (followers.length > 0 && !collection?.params?.page) return;
+    if (!initial && followers.length > 0 && !collection?.params?.page) return;
 
     const query = createQuery(queryFollowers, {
       ...queryParams,
-      page: collection?.params?.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -140,7 +140,7 @@ export const liveFollowers = (
     onFollowerDeleted(realtimeRouter('onDeleted')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveFollowers(tmpid: ${timestamp}) > dispose`);

package/src/follow/observers/liveFollowings.ts

@@ -96,16 +96,16 @@ export const liveFollowings = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.FollowingLiveCollectionCache>(cacheKey)?.data;
 
     const followings = collection?.data ?? [];
 
-    if (followings.length > 0 && !collection?.params?.page) return;
+    if (!initial && followings.length > 0 && !collection?.params?.page) return;
 
     const query = createQuery(queryFollowings, {
       ...queryParams,
-      page: collection?.params?.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -140,7 +140,7 @@ export const liveFollowings = (
     onFollowerDeleted(realtimeRouter('onDeleted')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveFollowings(tmpid: ${timestamp}) > dispose`);

package/src/message/observers/liveMessages.ts

@@ -22,7 +22,7 @@ import {
   onMessageUpdated,
 } from '../events';
 import { onMessageFetched } from '../events/onMessageFetched';
-import { queryMessages } from '../api';
+import { queryMessages } from '../api/queryMessages';
 
 /**
  * ```js
@@ -97,21 +97,20 @@ export const liveMessages = (
     collection.data = [...new Set([message.messageId, ...collection.data])];
 
     pushToCache(cacheKey, collection);
-    disposers.push(() => dropFromCache(cacheKey));
 
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.MessageLiveCollectionCache>(cacheKey)?.data;
 
     const messages = collection?.data ?? [];
 
-    if (messages.length > 0 && !collection?.params?.page) return;
+    if (!initial && messages.length > 0 && !collection?.params?.page) return;
 
     const query = createQuery(queryMessages, {
       ...queryParams,
-      page: collection?.params?.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -148,7 +147,8 @@ export const liveMessages = (
     onMessageReactionRemoved(realtimeRouter('onReactionRemoved')),
   );
 
-  onFetch();
+  onFetch(true);
+  disposers.push(() => dropFromCache(cacheKey));
 
   return () => {
     log(`liveMessages(tmpid: ${timestamp}) > dispose`);

package/src/post/observers/livePosts.ts

@@ -137,16 +137,16 @@ export const livePosts = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.PostLiveCollectionCache>(cacheKey)?.data;
 
     const posts = collection?.data ?? [];
 
-    if (posts.length > 0 && !collection?.params?.page) return;
+    if (!initial && posts.length > 0 && !collection?.params?.page) return;
 
     const query = createQuery(queryPosts, {
       ...queryParams,
-      page: collection?.params?.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -184,7 +184,7 @@ export const livePosts = (
     onPostReactionRemoved(realtimeRouter('onReactionRemoved')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`livePosts(tmpid: ${timestamp}) > dispose`);

package/src/reaction/observers/liveReactions.ts

@@ -88,16 +88,16 @@ export const liveReactions = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.ReactionLiveCollectionCache>(cacheKey)?.data;
 
     const reactions = collection?.data ?? [];
 
-    if (reactions.length > 0 && !collection?.params?.page) return;
+    if (!initial && reactions.length > 0 && !collection?.params?.page) return;
 
     const query = createQuery(queryReactions, {
       ...queryParams,
-      page: collection?.params?.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -133,7 +133,7 @@ export const liveReactions = (
     ),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveReactions(tmpid: ${timestamp}) > dispose`);

package/src/user/observers/liveUsers.ts

@@ -111,16 +111,16 @@ export const liveUsers = (
     responder(collection);
   };
 
-  const onFetch = () => {
+  const onFetch = (initial = false) => {
     const collection = pullFromCache<Amity.UserLiveCollectionCache>(cacheKey)?.data;
 
     const users = collection?.data ?? [];
 
-    if (users.length > 0 && !collection?.params.page) return;
+    if (!initial && users.length > 0 && !collection?.params.page) return;
 
     const query = createQuery(queryUsers, {
       ...queryParams,
-      page: collection?.params.page ?? { limit },
+      page: (!initial ? collection?.params.page : undefined) ?? { limit },
     });
 
     runQuery(
@@ -153,7 +153,7 @@ export const liveUsers = (
     onUserFlagCleared(realtimeRouter('onFlagCleared')),
   );
 
-  onFetch();
+  onFetch(true);
 
   return () => {
     log(`liveUsers(tmpid: ${timestamp}) > dispose`);

package/src/user/observers/tests/liveUsers.test.ts

@@ -65,17 +65,11 @@ describe('liveUsers', () => {
     liveUsers(params, callback);
     await pause();
 
-    expect(callback).toHaveBeenCalledTimes(2);
+    // The second `getUsers` call fetches data from the cache,
+    // so there is no loading state and the callback only fires once.
+    expect(callback).toHaveBeenCalledTimes(1);
     expect(callback).toHaveBeenNthCalledWith(
       1,
-      expect.objectContaining(
-        getSnapshot({
-          data: payload.users,
-        }),
-      ),
-    );
-    expect(callback).toHaveBeenNthCalledWith(
-      2,
       expect.objectContaining(
         getSnapshot({
           data: payload.users,