@amityco/ts-sdk-react-native 6.13.0 → 6.13.2

package/dist/index.esm.js

@@ -83,8 +83,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.13.0-esm'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.13.0-esm';
+        // the string ''v6.13.2-esm'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v6.13.2-esm';
     }
     catch (error) {
         return '__dev__';
@@ -24590,13 +24590,13 @@ const queryChannels = async (query) => {
     const client = getActiveClient();
     client.log('channel/queryChannels', query);
     // safe decapsulation
-    const _a = query !== null && query !== void 0 ? query : {}, { page = { limit: 10 }, displayName, membership } = _a, params = __rest(_a, ["page", "displayName", "membership"]);
+    const _a = query !== null && query !== void 0 ? query : {}, { page = undefined, limit = 10, displayName, membership } = _a, params = __rest(_a, ["page", "limit", "displayName", "membership"]);
     // API-FIX: parameters should be querystring.
     // API-FIX: backend doesn't answer Amity.Response
     // const { data } = await client.http.get<Amity.Response<Amity.Paged<ChannelPayload>>>(
     const { data: queryPayload } = await client.http.get(`/api/v3/channels`, {
         params: Object.assign(Object.assign({}, params), { keyword: displayName, filter: membership, options: {
-                token: toToken(page, 'skiplimit'),
+                token: page,
             } }),
     });
     const { paging } = queryPayload, payload = __rest(queryPayload, ["paging"]);
@@ -24605,16 +24605,10 @@ const queryChannels = async (query) => {
     const cachedAt = client.cache && Date.now();
     if (client.cache) {
         ingestInCache(data, { cachedAt });
-        const cacheKey = [
-            'channel',
-            'query',
-            Object.assign(Object.assign({}, params), { options: Object.assign({}, page) }),
-        ];
+        const cacheKey = ['channel', 'query', Object.assign(Object.assign({}, params), { options: { limit } })];
         pushToCache(cacheKey, { channels: channels.map(getResolver('channel')), paging });
     }
-    const nextPage = toPage(paging.next);
-    const prevPage = toPage(paging.previous);
-    return { data: channels, cachedAt, prevPage, nextPage };
+    return { data: channels, cachedAt, paging };
 };
 
 /* begin_public_function
@@ -24682,7 +24676,7 @@ const getChannels = (params, callback, config) => {
             case 'displayName':
                 /*
                  * The server returns channels with empty | null displayName's first before
-                 * returning sorted list of channels with displayNames
+                 * returning a sorted list of channels with displayNames
                  *
                  * This section needs to be updated as displayNames can be null as well
                  */
@@ -24714,21 +24708,23 @@ const getChannels = (params, callback, config) => {
         responder(collection);
     };
     const onFetch = (initial = false) => {
-        var _a, _b, _c;
+        var _a, _b;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const channels = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
         if (!initial && channels.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        const query = createQuery(queryChannels, Object.assign(Object.assign({}, queryParams), { page: (_c = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _c !== void 0 ? _c : { limit } }));
-        runQuery(query, ({ data: result, error, loading, nextPage: page }) => {
+        const query = createQuery(queryChannels, Object.assign(Object.assign({}, queryParams), { page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined, limit }));
+        runQuery(query, ({ data: result, error, loading, paging }) => {
             const data = {
                 loading,
                 error,
-                params: { page },
+                params: { page: paging === null || paging === void 0 ? void 0 : paging.next },
                 data: channels,
             };
             if (result) {
-                data.data = [...new Set([...channels, ...result.map(getResolver('channel'))])];
+                data.data = initial
+                    ? result.map(getResolver('channel')) // Replace all collection from BE when initial fetch
+                    : [...new Set([...channels, ...result.map(getResolver('channel'))])];
             }
             pushToCache(cacheKey, data);
             responder(data);
@@ -27400,11 +27396,12 @@ const getUser = (userId, callback) => {
 const queryUsers = async (query = {}) => {
     const client = getActiveClient();
     client.log('user/queryUsers', query);
-    const { page = { limit: 10 }, displayName, filter = 'all', sortBy = 'displayName' } = query, params = __rest(query, ["page", "displayName", "filter", "sortBy"]);
+    const { page, limit = 10, displayName, filter = 'all', sortBy = 'displayName' } = query, params = __rest(query, ["page", "limit", "displayName", "filter", "sortBy"]);
     const { data } = await client.http.get(`/api/v3/users`, {
         params: Object.assign(Object.assign({}, params), { keyword: displayName, filter,
             sortBy, options: {
-                token: toToken(page, 'skiplimit'),
+                token: page,
+                limit,
             } }),
     });
     // unpacking
@@ -27414,16 +27411,22 @@ const queryUsers = async (query = {}) => {
     if (client.cache) {
         ingestInCache(payload, { cachedAt });
         /*
-         * using query as cache key over params because if the keyword, filter, sort
+         * using a query as a cache key over params because if the keyword, filter, sort
          * change the API will NOT cache results, when it should
          */
-        const cacheKey = ['user', 'query', Object.assign(Object.assign({}, query), { options: Object.assign({}, page) })];
+        const cacheKey = [
+            'user',
+            'query',
+            Object.assign(Object.assign({}, query), { options: { limit, token: page } }),
+        ];
         pushToCache(cacheKey, { users: users.map(getResolver('user')), paging });
     }
     fireEvent('user.fetched', data);
-    const prevPage = toPage(paging.previous);
-    const nextPage = toPage(paging.next);
-    return { data: users.map(user => LinkedObject.user(user)), cachedAt, prevPage, nextPage };
+    return {
+        data: users.map(user => LinkedObject.user(user)),
+        cachedAt,
+        paging,
+    };
 };
 /**
  * ```js
@@ -27445,18 +27448,23 @@ queryUsers.locally = (query = {}) => {
     client.log('user/queryUsers.locally', query);
     if (!client.cache)
         return;
-    const { page = { limit: 10 } } = query !== null && query !== void 0 ? query : {};
+    const { limit = 10, page } = query !== null && query !== void 0 ? query : {};
     const cacheKey = [
         'user',
         'query',
-        Object.assign(Object.assign({}, query), { options: Object.assign({}, page) }),
+        Object.assign(Object.assign({}, query), { options: {
+                limit,
+                token: page,
+            } }),
     ];
     const { data, cachedAt } = (_a = pullFromCache(cacheKey)) !== null && _a !== void 0 ? _a : {};
     const users = (_b = data === null || data === void 0 ? void 0 : data.users.map(userId => pullFromCache(['user', 'get', userId])).filter(Boolean).map(({ data }) => data)) !== null && _b !== void 0 ? _b : [];
-    const prevPage = toPage(data === null || data === void 0 ? void 0 : data.paging.previous);
-    const nextPage = toPage(data === null || data === void 0 ? void 0 : data.paging.next);
     return users.length > 0 && users.length === ((_c = data === null || data === void 0 ? void 0 : data.users) === null || _c === void 0 ? void 0 : _c.length)
-        ? { data: users, cachedAt, prevPage, nextPage }
+        ? {
+            data: users.map(LinkedObject.user),
+            cachedAt,
+            paging: data === null || data === void 0 ? void 0 : data.paging,
+        }
         : undefined;
 };
 
@@ -27541,21 +27549,23 @@ const getUsers = (params, callback, config) => {
         responder(collection, true);
     };
     const onFetch = (initial = false) => {
-        var _a, _b, _c;
+        var _a, _b;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const users = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
         if (!initial && users.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        const query = createQuery(queryUsers, Object.assign(Object.assign({}, queryParams), { page: (_c = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _c !== void 0 ? _c : { limit } }));
-        runQuery(query, ({ data: result, error, loading, nextPage: page }) => {
+        const query = createQuery(queryUsers, Object.assign(Object.assign({}, queryParams), { limit, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
+        runQuery(query, ({ data: result, error, loading, paging }) => {
             const data = {
                 loading,
                 error,
-                params: { page },
+                params: { page: paging === null || paging === void 0 ? void 0 : paging.next },
                 data: users,
             };
             if (result) {
-                data.data = [...new Set([...users, ...result.map(getResolver('user'))])];
+                data.data = initial
+                    ? result.map(getResolver('user'))
+                    : [...new Set([...users, ...result.map(getResolver('user'))])];
             }
             pushToCache(cacheKey, data);
             responder(data);
@@ -32020,10 +32030,10 @@ const queryCommunities = async (query) => {
     const client = getActiveClient();
     client.log('channel/queryCommunities', query);
     // safe decapsulation
-    const _a = query !== null && query !== void 0 ? query : {}, { page } = _a, params = __rest(_a, ["page"]);
+    const _a = query !== null && query !== void 0 ? query : {}, { page = { limit: 10 } } = _a, params = __rest(_a, ["page"]);
     const _b = params !== null && params !== void 0 ? params : {}, { displayName, membership, includeDeleted } = _b, restParams = __rest(_b, ["displayName", "membership", "includeDeleted"]);
     // API-FIX: parameters should be querystring.
-    // API-FIX: backend doesnt answer Amity.Response
+    // API-FIX: backend doesn't answer Amity.Response
     // const { data } = await client.http.get<Amity.Response<Amity.PagedResponse<CommunityPayload>>>(
     const { data } = await client.http.get(`/api/v3/communities`, {
         params: Object.assign(Object.assign({}, restParams), { isDeleted: inferIsDeleted(includeDeleted), keyword: displayName, filter: membership, options: {
@@ -32138,12 +32148,12 @@ const getCommunities = (params, callback, config) => {
         responder(collection);
     };
     const onFetch = (initial = false) => {
-        var _a, _b, _c;
+        var _a, _b;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const communities = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
         if (!initial && communities.length > 0 && !(collection === null || collection === void 0 ? void 0 : collection.params.page))
             return;
-        const query = createQuery(queryCommunities, Object.assign(Object.assign({}, queryParams), { page: (_c = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _c !== void 0 ? _c : { limit } }));
+        const query = createQuery(queryCommunities, Object.assign(Object.assign({}, queryParams), { page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : { limit } }));
         runQuery(query, ({ data: result, error, loading, nextPage: page }) => {
             const data = {
                 loading,
@@ -34603,13 +34613,13 @@ const getComment = (commentId, callback) => {
  * @async
  */
 const queryComments = async (query) => {
-    var _a;
     const client = getActiveClient();
     client.log('comment/queryComments', query);
-    const { page = { limit: 10 }, includeDeleted } = query, params = __rest(query, ["page", "includeDeleted"]);
+    const { limit = 10, includeDeleted } = query, params = __rest(query, ["limit", "includeDeleted"]);
     const options = {
-        type: params.sortBy || ((_a = query.page) === null || _a === void 0 ? void 0 : _a.limit) ? 'pagination' : undefined,
-        token: toToken(page, params.sortBy ? 'skiplimit' : 'afterbefore'),
+        type: params.sortBy || query.limit ? 'pagination' : undefined,
+        limit: query.limit,
+        token: query.page,
     };
     // const filterByParentId = query.parentId !== undefined
     // API-FIX: parameters should be querystring. (1)
@@ -34627,16 +34637,10 @@ const queryComments = async (query) => {
     const cachedAt = client.cache && Date.now();
     if (client.cache) {
         ingestInCache(payload, { cachedAt });
-        const cacheKey = [
-            'comment',
-            'query',
-            Object.assign(Object.assign({}, params), { options: Object.assign({}, page) }),
-        ];
+        const cacheKey = ['comment', 'query', Object.assign(Object.assign({}, params), { options: { limit } })];
         pushToCache(cacheKey, { comments: comments.map(getResolver('comment')), paging });
     }
-    const nextPage = toPage(paging.next);
-    const prevPage = toPage(paging.previous);
-    return { data: comments, cachedAt, prevPage, nextPage };
+    return { data: comments, cachedAt, paging };
 };
 
 /* begin_public_function
@@ -34670,7 +34674,6 @@ const getComments = (params, callback, config) => {
     const timestamp = Date.now();
     log(`getComments(tmpid: ${timestamp}) > listen`);
     const { limit: queryLimit } = params, queryParams = __rest(params, ["limit"]);
-    const limit = queryLimit !== null && queryLimit !== void 0 ? queryLimit : COLLECTION_DEFAULT_PAGINATION_LIMIT;
     const { policy = COLLECTION_DEFAULT_CACHING_POLICY } = config !== null && config !== void 0 ? config : {};
     const disposers = [];
     const cacheKey = [
@@ -34720,15 +34723,16 @@ const getComments = (params, callback, config) => {
         responder(collection);
     };
     const onFetch = (initial = false) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const collection = (_a = pullFromCache(cacheKey)) === null || _a === void 0 ? void 0 : _a.data;
         const comments = (_b = collection === null || collection === void 0 ? void 0 : collection.data) !== null && _b !== void 0 ? _b : [];
         if (!initial && comments.length > 0 && !((_c = collection === null || collection === void 0 ? void 0 : collection.params) === null || _c === void 0 ? void 0 : _c.page))
             return;
-        const query = createQuery(queryComments, Object.assign(Object.assign({}, queryParams), { page: (_d = (!initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined)) !== null && _d !== void 0 ? _d : { limit } }));
-        runQuery(query, ({ data: result, error, loading, prevPage, nextPage }) => {
-            // depend on sortBy value we have two different pagination type
-            const page = queryParams.sortBy || (params === null || params === void 0 ? void 0 : params.limit) ? nextPage : prevPage;
+        const query = createQuery(queryComments, Object.assign(Object.assign({}, queryParams), { limit: queryLimit, page: !initial ? collection === null || collection === void 0 ? void 0 : collection.params.page : undefined }));
+        runQuery(query, ({ data: result, error, loading, paging }) => {
+            // depend on sortBy value we have two different pagination types
+            const sorting = queryParams.sortBy || 'lastCreated';
+            const page = sorting === 'lastCreated' ? paging === null || paging === void 0 ? void 0 : paging.next : paging === null || paging === void 0 ? void 0 : paging.previous;
             const data = {
                 loading,
                 error,
@@ -34736,7 +34740,9 @@ const getComments = (params, callback, config) => {
                 data: comments,
             };
             if (result) {
-                data.data = [...new Set([...comments, ...result.map(getResolver('comment'))])];
+                data.data = initial
+                    ? result.map(getResolver('comment')) // Replace a collection list with new data from BE
+                    : [...new Set([...comments, ...result.map(getResolver('comment'))])];
             }
             pushToCache(cacheKey, data);
             responder(data);
@@ -35138,6 +35144,7 @@ getStreamById.locally = (streamId) => {
  *
  * @param params for querying streams
  * @param callback the function to call when new data are available
+ * @param config
  * @returns An {@link Amity.Unsubscriber} function to run when willing to stop observing the streams
  *
  * @category Stream Live Collection