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

package/dist/@types/core/paging.d.ts

@@ -35,6 +35,9 @@ declare global {
         type Paged<T, K extends Page | PageRaw = Page> = {
             data: T[];
         } & Pages<K>;
+        type PageToken<T> = {
+            data: T[];
+        } & Amity.Pagination;
     }
 }
 //# sourceMappingURL=paging.d.ts.map

package/dist/@types/core/paging.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"paging.d.ts","sourceRoot":"","sources":["../../../src/@types/core/paging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC;AAEV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK,CAAC;QACd,KAAK,gBAAgB,GAAG,WAAW,GAAG,aAAa,GAAG,gBAAgB,CAAC;QAEvE,KAAK,SAAS,GAAG;YACf,KAAK,EAAE,MAAM,CAAC;SACf,CAAC;QAEF,KAAK,QAAQ,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,SAAS,GAAG;YACrD,KAAK,CAAC,EAAE,KAAK,CAAC;YACd,MAAM,CAAC,EAAE,CAAC,CAAC;SACZ,CAAC;QAEF,KAAK,QAAQ,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,SAAS,GAAG;YACrD,KAAK,CAAC,EAAE,CAAC,CAAC;YACV,MAAM,CAAC,EAAE,KAAK,CAAC;SAChB,CAAC;QAEF,KAAK,IAAI,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAM1E,KAAK,OAAO,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG;YACrD,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;QAEF,KAAK,mBAAmB,GAAG;YACzB,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,KAAK,CAAC,EAAE,MAAM,CAAC;SAChB,CAAC;QAUF,KAAK,qBAAqB,GAAG;YAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;QAEF,KAAK,wBAAwB,GAAG,OAAO,CAAC;QAExC,KAAK,KAAK,CAAC,CAAC,SAAS,IAAI,GAAG,OAAO,IAAI;YACrC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACb,QAAQ,CAAC,EAAE,CAAC,CAAC;SACd,CAAC;QAEF,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,IAAI,GAAG,OAAO,GAAG,IAAI,IAAI;YAAE,IAAI,EAAE,CAAC,EAAE,CAAA;SAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;KAC3E;CACF"}
+{"version":3,"file":"paging.d.ts","sourceRoot":"","sources":["../../../src/@types/core/paging.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC;AAEV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK,CAAC;QACd,KAAK,gBAAgB,GAAG,WAAW,GAAG,aAAa,GAAG,gBAAgB,CAAC;QAEvE,KAAK,SAAS,GAAG;YACf,KAAK,EAAE,MAAM,CAAC;SACf,CAAC;QAEF,KAAK,QAAQ,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,SAAS,GAAG;YACrD,KAAK,CAAC,EAAE,KAAK,CAAC;YACd,MAAM,CAAC,EAAE,CAAC,CAAC;SACZ,CAAC;QAEF,KAAK,QAAQ,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,IAAI,SAAS,GAAG;YACrD,KAAK,CAAC,EAAE,CAAC,CAAC;YACV,MAAM,CAAC,EAAE,KAAK,CAAC;SAChB,CAAC;QAEF,KAAK,IAAI,CAAC,CAAC,SAAS,MAAM,GAAG,MAAM,GAAG,MAAM,IAAI,QAAQ,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAM1E,KAAK,OAAO,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,GAAG;YACrD,SAAS,CAAC,EAAE,MAAM,CAAC;SACpB,CAAC;QAEF,KAAK,mBAAmB,GAAG;YACzB,IAAI,CAAC,EAAE,MAAM,CAAC;YACd,KAAK,CAAC,EAAE,MAAM,CAAC;SAChB,CAAC;QAUF,KAAK,qBAAqB,GAAG;YAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;YAChB,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;QAEF,KAAK,wBAAwB,GAAG,OAAO,CAAC;QAExC,KAAK,KAAK,CAAC,CAAC,SAAS,IAAI,GAAG,OAAO,IAAI;YACrC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACb,QAAQ,CAAC,EAAE,CAAC,CAAC;SACd,CAAC;QAEF,KAAK,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,IAAI,GAAG,OAAO,GAAG,IAAI,IAAI;YAAE,IAAI,EAAE,CAAC,EAAE,CAAA;SAAE,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAE1E,KAAK,SAAS,CAAC,CAAC,IAAI;YAAE,IAAI,EAAE,CAAC,EAAE,CAAA;SAAE,GAAG,KAAK,CAAC,UAAU,CAAC;KACtD;CACF"}

package/dist/@types/domains/channel.d.ts

@@ -50,7 +50,8 @@ declare global {
             isDeleted?: Amity.Channel['isDeleted'];
             tags?: Amity.Taggable['tags'];
             excludeTags?: Amity.Taggable['tags'];
-            page?: Amity.Page;
+            limit?: number;
+            page?: string;
         };
         type ChannelLiveCollection = Amity.LiveCollectionParams<Omit<QueryChannels, 'page'>>;
         type ChannelLiveCollectionCache = Amity.LiveCollectionCache<Amity.Channel['channelId'], Pick<QueryChannels, 'page'>>;

package/dist/@types/domains/channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/channel.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/channel.ts"],"names":[],"mappings":"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"}

package/dist/@types/domains/comment.d.ts

@@ -35,7 +35,8 @@ declare global {
             parentId?: Amity.InternalComment['commentId'] | null;
             hasFlag?: boolean;
             includeDeleted?: boolean;
-            page?: Amity.Page;
+            limit?: number;
+            page?: Amity.Token;
             dataTypes?: {
                 values: ('image' | 'text')[];
                 matchType: 'any' | 'exact';
@@ -44,7 +45,10 @@ declare global {
         type CommentLiveCollection = Amity.LiveCollectionParams<Omit<QueryComments, 'sortBy' | 'page'> & {
             sortBy?: 'lastCreated' | 'firstCreated';
         }>;
-        type CommentLiveCollectionCache = Amity.LiveCollectionCache<Amity.InternalComment['commentId'], Pick<QueryComments, 'page'>>;
+        type CommentLiveCollectionCache = Amity.LiveCollectionCache<Amity.InternalComment['commentId'], {
+            page?: Amity.Token | undefined;
+            limit?: number;
+        }>;
     }
 }
 //# sourceMappingURL=comment.d.ts.map

package/dist/@types/domains/comment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"comment.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/comment.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"comment.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/comment.ts"],"names":[],"mappings":"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"}

package/dist/@types/domains/user.d.ts

@@ -18,7 +18,8 @@ declare global {
             displayName?: Amity.InternalUser['displayName'];
             filter?: 'all' | 'flagged';
             sortBy?: 'displayName' | 'firstCreated' | 'lastCreated';
-            page?: Amity.Page;
+            limit?: number;
+            page?: string;
         };
         type UserLiveCollection = Amity.LiveCollectionParams<Omit<QueryUsers, 'page'>>;
         type UserSearchLiveCollection = Amity.LiveCollectionParams<Omit<QueryUsers, 'sortBy'>>;

package/dist/@types/domains/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC;AAEV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK,CAAC;QACd,KAAK,cAAc,GACf,SAAS,GACT,UAAU,GACV,UAAU,GACV,WAAW,GACX,aAAa,GACb,eAAe,CAAC;QAEpB,KAAK,YAAY,GAAG;YAClB,GAAG,EAAE,MAAM,CAAC;YACZ,MAAM,EAAE,MAAM,CAAC;YACf,cAAc,EAAE,OAAO,CAAC;YACxB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,YAAY,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC7C,eAAe,CAAC,EAAE,MAAM,CAAC;YACzB,WAAW,CAAC,EAAE,MAAM,CAAC;SACtB,GAAG,KAAK,CAAC,QAAQ,GAChB,KAAK,CAAC,QAAQ,GACd,KAAK,CAAC,SAAS,GACf,KAAK,CAAC,UAAU,GAChB,KAAK,CAAC,UAAU,GAChB,KAAK,CAAC,UAAU,GAChB,KAAK,CAAC,YAAY,CAAC;QAErB,KAAK,IAAI,GAAG,KAAK,CAAC,YAAY,GAAG;YAC/B,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;SACrC,CAAC;QAEF,KAAK,UAAU,GAAG;YAChB,WAAW,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YAChD,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;YAC3B,MAAM,CAAC,EAAE,aAAa,GAAG,cAAc,GAAG,aAAa,CAAC;YACxD,IAAI,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC;SACnB,CAAC;QAEF,KAAK,kBAAkB,GAAG,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;QAE/E,KAAK,wBAAwB,GAAG,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEvF,KAAK,uBAAuB,GAAG,KAAK,CAAC,mBAAmB,CACtD,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,EAC5B,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CACzB,CAAC;KACH;CACF"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../src/@types/domains/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC;AAEV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK,CAAC;QACd,KAAK,cAAc,GACf,SAAS,GACT,UAAU,GACV,UAAU,GACV,WAAW,GACX,aAAa,GACb,eAAe,CAAC;QAEpB,KAAK,YAAY,GAAG;YAClB,GAAG,EAAE,MAAM,CAAC;YACZ,MAAM,EAAE,MAAM,CAAC;YACf,cAAc,EAAE,OAAO,CAAC;YACxB,WAAW,CAAC,EAAE,MAAM,CAAC;YACrB,YAAY,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,CAAC,CAAC;YAC7C,eAAe,CAAC,EAAE,MAAM,CAAC;YACzB,WAAW,CAAC,EAAE,MAAM,CAAC;SACtB,GAAG,KAAK,CAAC,QAAQ,GAChB,KAAK,CAAC,QAAQ,GACd,KAAK,CAAC,SAAS,GACf,KAAK,CAAC,UAAU,GAChB,KAAK,CAAC,UAAU,GAChB,KAAK,CAAC,UAAU,GAChB,KAAK,CAAC,YAAY,CAAC;QAErB,KAAK,IAAI,GAAG,KAAK,CAAC,YAAY,GAAG;YAC/B,MAAM,CAAC,EAAE,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC;SACrC,CAAC;QAEF,KAAK,UAAU,GAAG;YAChB,WAAW,CAAC,EAAE,KAAK,CAAC,YAAY,CAAC,aAAa,CAAC,CAAC;YAChD,MAAM,CAAC,EAAE,KAAK,GAAG,SAAS,CAAC;YAC3B,MAAM,CAAC,EAAE,aAAa,GAAG,cAAc,GAAG,aAAa,CAAC;YACxD,KAAK,CAAC,EAAE,MAAM,CAAC;YACf,IAAI,CAAC,EAAE,MAAM,CAAC;SACf,CAAC;QAEF,KAAK,kBAAkB,GAAG,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;QAE/E,KAAK,wBAAwB,GAAG,KAAK,CAAC,oBAAoB,CAAC,IAAI,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC,CAAC;QAEvF,KAAK,uBAAuB,GAAG,KAAK,CAAC,mBAAmB,CACtD,KAAK,CAAC,YAAY,CAAC,QAAQ,CAAC,EAC5B,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CACzB,CAAC;KACH;CACF"}

package/dist/channelRepsitory/api/queryChannels.d.ts

@@ -13,5 +13,5 @@
  * @category Channel API
  * @async
  */
-export declare const queryChannels: (query?: Amity.QueryChannels) => Promise<Amity.Cached<Amity.Paged<Amity.InternalChannel>>>;
+export declare const queryChannels: (query?: Amity.QueryChannels) => Promise<Amity.Cached<Amity.PageToken<Amity.InternalChannel>>>;
 //# sourceMappingURL=queryChannels.d.ts.map

package/dist/channelRepsitory/api/queryChannels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryChannels.d.ts","sourceRoot":"","sources":["../../../src/channelRepsitory/api/queryChannels.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,aAAa,WAChB,MAAM,aAAa,KAC1B,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,eAAe,CAAC,CAAC,CA+C1D,CAAC"}
+{"version":3,"file":"queryChannels.d.ts","sourceRoot":"","sources":["../../../src/channelRepsitory/api/queryChannels.ts"],"names":[],"mappings":"AAQA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,aAAa,WAChB,MAAM,aAAa,KAC1B,QAAQ,MAAM,MAAM,CAAC,MAAM,SAAS,CAAC,MAAM,eAAe,CAAC,CAAC,CAwC9D,CAAC"}

package/dist/channelRepsitory/observers/getChannels.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getChannels.d.ts","sourceRoot":"","sources":["../../../src/channelRepsitory/observers/getChannels.ts"],"names":[],"mappings":"AAsDA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,qBAAqB,YACzB,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,eAwRpC,CAAC"}
+{"version":3,"file":"getChannels.d.ts","sourceRoot":"","sources":["../../../src/channelRepsitory/observers/getChannels.ts"],"names":[],"mappings":"AAsDA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,qBAAqB,YACzB,MAAM,sBAAsB,CAAC,MAAM,OAAO,CAAC,WAC5C,MAAM,oBAAoB,eA2RpC,CAAC"}

package/dist/commentRepository/api/queryComments.d.ts

@@ -12,5 +12,5 @@
  * @category Comment API
  * @async
  */
-export declare const queryComments: (query: Amity.QueryComments) => Promise<Amity.Cached<Amity.Paged<Amity.InternalComment>>>;
+export declare const queryComments: (query: Amity.QueryComments) => Promise<Amity.Cached<Amity.PageToken<Amity.InternalComment>>>;
 //# sourceMappingURL=queryComments.d.ts.map

package/dist/commentRepository/api/queryComments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryComments.d.ts","sourceRoot":"","sources":["../../../src/commentRepository/api/queryComments.ts"],"names":[],"mappings":"AASA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa,UACjB,MAAM,aAAa,KACzB,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,eAAe,CAAC,CAAC,CAiD1D,CAAC"}
+{"version":3,"file":"queryComments.d.ts","sourceRoot":"","sources":["../../../src/commentRepository/api/queryComments.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa,UACjB,MAAM,aAAa,KACzB,QAAQ,MAAM,MAAM,CAAC,MAAM,SAAS,CAAC,MAAM,eAAe,CAAC,CAAC,CA2C9D,CAAC"}

package/dist/commentRepository/observers/getComments.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getComments.d.ts","sourceRoot":"","sources":["../../../src/commentRepository/observers/getComments.ts"],"names":[],"mappings":"AAmCA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,qBAAqB,YACzB,MAAM,sBAAsB,CAAC,MAAM,eAAe,CAAC,WACpD,MAAM,oBAAoB,KAClC,MAAM,YA+HR,CAAC"}
+{"version":3,"file":"getComments.d.ts","sourceRoot":"","sources":["../../../src/commentRepository/observers/getComments.ts"],"names":[],"mappings":"AAmCA;;;;;;;;;;;;;;;;;;;GAmBG;AACH,eAAO,MAAM,WAAW,WACd,MAAM,qBAAqB,YACzB,MAAM,sBAAsB,CAAC,MAAM,eAAe,CAAC,WACpD,MAAM,oBAAoB,KAClC,MAAM,YAmIR,CAAC"}

package/dist/index.cjs.js

@@ -116,8 +116,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v6.13.0-cjs'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v6.13.0-cjs';
+        // the string ''v6.13.2-cjs'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v6.13.2-cjs';
     }
     catch (error) {
         return '__dev__';
@@ -8518,13 +8518,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"]);
@@ -8533,16 +8533,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
@@ -8610,7 +8604,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
                  */
@@ -8642,21 +8636,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);
@@ -11328,11 +11324,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
@@ -11342,16 +11339,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
@@ -11373,18 +11376,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;
 };
 
@@ -11469,21 +11477,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);
@@ -15948,10 +15958,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: {
@@ -16066,12 +16076,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,
@@ -18531,13 +18541,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)
@@ -18555,16 +18565,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
@@ -18598,7 +18602,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 = [
@@ -18648,15 +18651,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,
@@ -18664,7 +18668,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);
@@ -19066,6 +19072,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