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

package/dist/category/api/queryCategories.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryCategories.d.ts","sourceRoot":"","sources":["../../../src/category/api/queryCategories.ts"],"names":[],"mappings":"AAWA;;;;;;;;;;;;;KAaK;AACL,eAAO,MAAM,eAAe;aAClB,MAAM,eAAe,GAC5B,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;IAyCjE;;;;;;;;;;;;OAYG;mBAEM,WAAW,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAC3C,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,SAAS;CAjBnE,CAAC"}
+{"version":3,"file":"queryCategories.d.ts","sourceRoot":"","sources":["../../../src/category/api/queryCategories.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;KAaK;AACL,eAAO,MAAM,eAAe;aAClB,MAAM,eAAe,GAC5B,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC,CAAC;IAyCjE;;;;;;;;;;;;OAYG;mBAEM,WAAW,sBAAsB,CAAC,CAAC,CAAC,CAAC,GAC3C,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,QAAQ,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,SAAS;CAjBnE,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"queryComments.d.ts","sourceRoot":"","sources":["../../../src/comment/api/queryComments.ts"],"names":[],"mappings":"AAUA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa;YACjB,MAAM,aAAa,GACzB,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;IAoDpD;;;;;;;;;;;;OAYG;mBAEM,WAAW,oBAAoB,CAAC,CAAC,CAAC,CAAC,GACzC,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,aAAa,CAAC,CAAC,GAAG,SAAS;CAlBtD,CAAC"}
+{"version":3,"file":"queryComments.d.ts","sourceRoot":"","sources":["../../../src/comment/api/queryComments.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;GAaG;AACH,eAAO,MAAM,aAAa;YACjB,MAAM,aAAa,GACzB,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC;IAoDpD;;;;;;;;;;;;OAYG;mBAEM,WAAW,oBAAoB,CAAC,CAAC,CAAC,CAAC,GACzC,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,aAAa,CAAC,CAAC,GAAG,SAAS;CAlBtD,CAAC"}

package/dist/community/api/queryCommunities.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queryCommunities.d.ts","sourceRoot":"","sources":["../../../src/community/api/queryCommunities.ts"],"names":[],"mappings":"AAYA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,gBAAgB;aACnB,MAAM,gBAAgB,GAC7B,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC;IAkDtD;;;;;;;;;;;;OAYG;mBACgC,WAAW,uBAAuB,CAAC,CAAC,CAAC,CAAC;CAhBxE,CAAC"}
+{"version":3,"file":"queryCommunities.d.ts","sourceRoot":"","sources":["../../../src/community/api/queryCommunities.ts"],"names":[],"mappings":"AAaA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,gBAAgB;aACnB,MAAM,gBAAgB,GAC7B,QAAQ,MAAM,MAAM,CAAC,MAAM,KAAK,CAAC,MAAM,SAAS,CAAC,CAAC,CAAC;IAkDtD;;;;;;;;;;;;OAYG;mBACgC,WAAW,uBAAuB,CAAC,CAAC,CAAC,CAAC;CAhBxE,CAAC"}

package/dist/core/query/filtering.d.ts

@@ -42,4 +42,14 @@ export declare const filterByFeedType: <T extends Amity.Post<any>>(collection: T
  * @hidden
  */
 export declare const filterByCommunityMembership: <T extends Amity.Community>(collection: T[], membership: Amity.CommunityLiveCollection['membership'], userId: Amity.Membership<'community'>['userId']) => T[];
+/**
+ * Filter a post collection by dataType
+ *
+ * @param collection the post to filter
+ * @param dataTypes of the post to be filtered by
+ * @returns a filtered collection with items only matching the criteria
+ *
+ * @hidden
+ */
+export declare const filterByPostDataTypes: <T extends Amity.Post<any>>(collection: T[], dataTypes: Amity.PostLiveCollection['dataTypes']) => T[];
 //# sourceMappingURL=filtering.d.ts.map

package/dist/core/query/filtering.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"filtering.d.ts","sourceRoot":"","sources":["../../../src/core/query/filtering.ts"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AACH,eAAO,MAAM,oBAAoB,sEAGxB,GAAG,QAC4E,CAAC;AAEzF,eAAO,MAAM,qBAAqB,sEAGzB,GAAG,EAAE,GAAG,SAAS,QACoE,CAAC;AAE/F;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,eACxB,MAAM,OAAO,EAAE,cACf,MAAM,qBAAqB,CAAC,YAAY,CAAC,UAC7C,MAAM,UAAU,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,KAC5C,MAAM,OAAO,EAyBf,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,yDAEjB,MAAM,IAAI,CAAC,UAAU,CAAC,QAgBjC,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,2DAE1B,MAAM,uBAAuB,CAAC,YAAY,CAAC,UAC/C,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,QA0BhD,CAAC"}
+{"version":3,"file":"filtering.d.ts","sourceRoot":"","sources":["../../../src/core/query/filtering.ts"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AACH,eAAO,MAAM,oBAAoB,sEAGxB,GAAG,QAC4E,CAAC;AAEzF,eAAO,MAAM,qBAAqB,sEAGzB,GAAG,EAAE,GAAG,SAAS,QACoE,CAAC;AAE/F;;;;;;;;;GASG;AACH,eAAO,MAAM,yBAAyB,eACxB,MAAM,OAAO,EAAE,cACf,MAAM,qBAAqB,CAAC,YAAY,CAAC,UAC7C,MAAM,UAAU,CAAC,SAAS,CAAC,CAAC,QAAQ,CAAC,KAC5C,MAAM,OAAO,EAyBf,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,gBAAgB,yDAEjB,MAAM,IAAI,CAAC,UAAU,CAAC,QAgBjC,CAAC;AAEF;;;;;;;;;GASG;AACH,eAAO,MAAM,2BAA2B,2DAE1B,MAAM,uBAAuB,CAAC,YAAY,CAAC,UAC/C,MAAM,UAAU,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,QA0BhD,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,0DAErB,MAAM,kBAAkB,CAAC,WAAW,CAAC,QAyBjD,CAAC"}

package/dist/index.cjs.js

@@ -95,8 +95,8 @@ const PostContentType = Object.freeze({
 
 function getVersion() {
     try {
-        // the string ''v0.0.1-beta.43.1-cjs'' should be replaced by actual value by @rollup/plugin-replace
-        return 'v0.0.1-beta.43.1-cjs';
+        // the string ''v0.0.1-beta.44.0-cjs'' should be replaced by actual value by @rollup/plugin-replace
+        return 'v0.0.1-beta.44.0-cjs';
     }
     catch (error) {
         return '__dev__';
@@ -1174,6 +1174,37 @@ const filterByCommunityMembership = (collection, membership, userId) => {
         // only membership value remainging is 'notMember'
         return !communityUser || communityUser.communityMembership !== 'none';
     });
+};
+/**
+ * Filter a post collection by dataType
+ *
+ * @param collection the post to filter
+ * @param dataTypes of the post to be filtered by
+ * @returns a filtered collection with items only matching the criteria
+ *
+ * @hidden
+ */
+const filterByPostDataTypes = (collection, dataTypes) => {
+    const filteredPosts = [];
+    collection.forEach(c => {
+        var _a;
+        /*
+         * A text post with no children is just a text post
+         */
+        if (c.dataType === 'text' && !c.children.length)
+            return;
+        if (c.children.length) {
+            const childPost = (_a = pullFromCache(['post', 'get', c.children[0]])) === null || _a === void 0 ? void 0 : _a.data;
+            if (childPost && (dataTypes === null || dataTypes === void 0 ? void 0 : dataTypes.includes(childPost === null || childPost === void 0 ? void 0 : childPost.dataType))) {
+                // @ts-ignore
+                filteredPosts.push(childPost);
+            }
+            return;
+        }
+        if (dataTypes === null || dataTypes === void 0 ? void 0 : dataTypes.includes(c.dataType))
+            filteredPosts.push(c);
+    });
+    return filteredPosts;
 };
 
 // Note:
@@ -20884,7 +20915,7 @@ const connectClient = async (params, sessionHandler, config) => {
          * Cannot push to subscriptions as watcher needs to continue working even if
          * token expires
          */
-        unsubWatcher = client.accessTokenExpiryWatcher((_b = client.token) === null || _b === void 0 ? void 0 : _b.issuedAt, (_c = client.token) === null || _c === void 0 ? void 0 : _c.expiresAt, sessionHandler);
+        unsubWatcher = client.accessTokenExpiryWatcher((_b = client.token) === null || _b === void 0 ? void 0 : _b.expiresAt, (_c = client.token) === null || _c === void 0 ? void 0 : _c.issuedAt, sessionHandler);
         setActiveUser(users[0]);
     }
     catch (error) {
@@ -21595,6 +21626,22 @@ const prepareMessagePayloadForCache = (payload) => {
     }
 };
 
+/*
+ * This is a simple utility that infers the value of isDeleted based on the
+ * value of includeDeleted
+ *
+ * There are two important things to note here:
+ *  1. `includeDeleted` is purely client side query param and not recognized by
+ *  the server
+ *  2. The only values we wish to expose with regards to `isDeleted` (the server
+ *  param for queries) is false | undefined and want to disallow users to query
+ *  for deleted entities
+ *
+ *  Although this is a very simple utility, it's only purpose is to keep things
+ *  DRY
+ */
+const inferIsDeleted = (includeDeleted) => includeDeleted === true ? undefined : false;
+
 const getCachedMarker$1 = (message) => {
     var _a, _b;
     const key = {
@@ -21673,7 +21720,7 @@ function convertParams(_a) {
 }
 function convertQueryParams$1(_a) {
     var { page, sortBy, subChannelId, tags, includeDeleted } = _a, rest = __rest(_a, ["page", "sortBy", "subChannelId", "tags", "includeDeleted"]);
-    const out = Object.assign(Object.assign({}, rest), { messageFeedId: subChannelId, isDeleted: includeDeleted === false ? false : undefined, options: { token: toToken(page || { limit: 10 }, 'afterbeforeraw') } });
+    const out = Object.assign(Object.assign({}, rest), { messageFeedId: subChannelId, isDeleted: inferIsDeleted(includeDeleted), options: { token: toToken(page || { limit: 10 }, 'afterbeforeraw') } });
     if (sortBy !== undefined) {
         out.options.sortBy = sortBy;
     }
@@ -23515,52 +23562,23 @@ const queryMessages = async (query) => {
     const data = await prepareMessagePayload(payload);
     const { messages } = data;
     const cachedAt = client.cache && Date.now();
-    // if (client.cache) {
-    //   ingestInCache(data, { cachedAt });
-    //
-    //   const cacheKey = ['message', 'query', params as Amity.Serializable];
-    //   pushToCache(cacheKey, { messages: messages.map(getResolver('message')), paging });
-    // }
+    if (client.cache) {
+        /*
+         * queryMessages.locally is unsupported for messages as message list updates
+         * frequently and leads to bugs when user switches between channels, i.e. when
+         * the public function (live messages) calls unmount. The list fetched on
+         * after from the cache is stale.
+         */
+        ingestInCache(data, { cachedAt });
+        const cacheKey = ['message', 'query', params];
+        pushToCache(cacheKey, { messages: messages.map(getResolver('message')), paging });
+    }
     fireEvent('local.message.fetched', { messages });
     const nextPage = toPageRaw(paging.next);
     const prevPage = toPageRaw(paging.previous);
     return { data: messages, cachedAt, prevPage, nextPage };
 };
-/* end_public_function */
-/**
- * ```js
- * import { queryMessages } from '@amityco/ts-sdk'
- * const messages = queryMessages.locally!({ channelId })
- * ```
- *
- * Queries a paginable list of {@link Amity.Message} objects from cache
- *
- * @param query The query parameters
- * @returns A page of {@link Amity.Message} objects
- *
- * @category Message API
- */
-queryMessages.locally = (query) => {
-    var _a, _b;
-    const client = getActiveClient();
-    client.log('message/queryMessages.locally', query);
-    if (!client.cache)
-        return;
-    const params = convertQueryParams$1(query);
-    const queryKey = ['message', 'query', params];
-    const { data, cachedAt } = (_a = pullFromCache(queryKey)) !== null && _a !== void 0 ? _a : {};
-    if (!(data === null || data === void 0 ? void 0 : data.messages.length))
-        return;
-    const messages = data.messages
-        .map(messageId => pullFromCache(['message', 'get', messageId]))
-        .filter(Boolean)
-        .map(({ data }) => data);
-    const prevPage = toPageRaw(data === null || data === void 0 ? void 0 : data.paging.previous);
-    const nextPage = toPageRaw(data === null || data === void 0 ? void 0 : data.paging.next);
-    return messages.length === ((_b = data === null || data === void 0 ? void 0 : data.messages) === null || _b === void 0 ? void 0 : _b.length)
-        ? { data: messages, cachedAt, prevPage, nextPage }
-        : undefined;
-};
+/* end_public_function */
 
 const uuid = () => nativeIdGenerator__default["default"].v4().toString();
 
@@ -23904,7 +23922,7 @@ const queryPosts = async (query) => {
     // API-FIX: backend should answer Amity.Response (2)
     // const { data } = await client.http.get<Amity.Response<Amity.PagedResponse<Amity.PostPayload>>>(
     const { data } = await client.http.get(`/api/v4/posts`, {
-        params: Object.assign(Object.assign({}, params), { isDeleted: includeDeleted === false ? false : undefined, 
+        params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), 
             /*
              * when creating post like image, file, video BE will create 2 posts
              * 1. parent post to store text with dataType=text
@@ -24249,7 +24267,7 @@ const queryCommunities = async (query) => {
     // API-FIX: backend doesnt 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: includeDeleted === false ? false : undefined, keyword: displayName, filter: membership, options: {
+        params: Object.assign(Object.assign({}, restParams), { isDeleted: inferIsDeleted(includeDeleted), keyword: displayName, filter: membership, options: {
                 token: toToken(page, 'skiplimit'),
             } }),
     });
@@ -25100,7 +25118,7 @@ const queryComments = async (query) => {
     // API-FIX: backend should answer Amity.Response (2)
     // const { data } = await client.http.get<Amity.Response<Amity.PagedResponse<Amity.CommentPayload>>>(
     const { data } = await client.http.get(`/api/v3/comments`, {
-        params: Object.assign(Object.assign({}, params), { isDeleted: includeDeleted === false ? false : undefined, 
+        params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), 
             //      filterByParentId, API-FIX: backend does not support this boolean LOL. what the hell seriously.
             options }),
     });
@@ -27939,7 +27957,7 @@ const querySubChannels = async (query) => {
     client.log('channel/querySubChannels', query);
     const _a = convertQueryParams(query), { page = { limit: 10 }, channelId, includeDeleted } = _a, params = __rest(_a, ["page", "channelId", "includeDeleted"]);
     const response = await client.http.get(`/api/v5/message-feeds/channel/${channelId}`, {
-        params: Object.assign(Object.assign({}, params), { isDeleted: includeDeleted === false ? false : undefined, options: {
+        params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), options: {
                 token: toToken(page, 'skiplimit'),
             } }),
     });
@@ -28322,7 +28340,7 @@ const liveSubChannels = (params, callback, config) => {
     const responder = (data) => {
         var _a;
         let subChannels = data.data;
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             subChannels = filterByPropEquality(subChannels, 'isDeleted', false);
         }
         subChannels.sort(sortByLastActivity);
@@ -28446,7 +28464,7 @@ const liveMessages = (params, callback, config) => {
          * for cases when message is deleted via RTE, this flag is used to get
          * items from cache that are !deleted
          */
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             messages = filterByPropEquality(messages, 'isDeleted', false);
         }
         callback({
@@ -28464,6 +28482,7 @@ const liveMessages = (params, callback, config) => {
             return;
         collection.data = [...new Set([message.messageId, ...collection.data])];
         pushToCache(cacheKey, collection);
+        disposers.push(() => dropFromCache(cacheKey));
         responder(collection);
     };
     const onFetch = () => {
@@ -28492,7 +28511,6 @@ const liveMessages = (params, callback, config) => {
     return () => {
         log(`liveMessages(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
-        dropFromCache(cacheKey);
     };
 };
 
@@ -28969,7 +28987,7 @@ const liveCommunities = (params, callback, config) => {
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         communities = filterByPropEquality(communities, 'displayName', params.displayName);
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             communities = filterByPropEquality(communities, 'isDeleted', false);
         }
         if (params.categoryId) {
@@ -29213,7 +29231,7 @@ const queryCategories = async (query) => {
     client.log('category/queryCategories', query);
     const _a = query !== null && query !== void 0 ? query : {}, { page = { limit: 10 }, includeDeleted } = _a, params = __rest(_a, ["page", "includeDeleted"]);
     const { data } = await client.http.get(`/api/v3/community-categories`, {
-        params: Object.assign(Object.assign({}, params), { isDeleted: includeDeleted === false ? false : undefined, options: {
+        params: Object.assign(Object.assign({}, params), { isDeleted: inferIsDeleted(includeDeleted), options: {
                 token: toToken(page, 'skiplimit'),
             } }),
     });
@@ -29356,7 +29374,7 @@ const liveCategories = (params, callback, config) => {
             .map(categoryId => pullFromCache(['category', 'get', categoryId]))
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             categories = filterByPropEquality(categories, 'isDeleted', false);
         }
         switch (params.sortBy) {
@@ -30460,14 +30478,14 @@ const livePosts = (params, callback, config) => {
         { targetId: params.targetId, targetType: params.targetType },
     ];
     const responder = (data) => {
-        var _a, _b;
+        var _a, _b, _c;
         let posts = (_a = data.data
             .map(postId => pullFromCache(['post', 'get', postId]))
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
         const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
         posts = posts.sort(sortBy === 'lastCreated' ? sortByLastCreated : sortByFirstCreated);
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             posts = filterByPropEquality(posts, 'isDeleted', false);
         }
         if (params.tags) {
@@ -30476,10 +30494,13 @@ const livePosts = (params, callback, config) => {
         if (params.targetType === 'community' && params.feedType) {
             posts = filterByFeedType(posts, params.feedType);
         }
+        if ((_b = params.dataTypes) === null || _b === void 0 ? void 0 : _b.length) {
+            posts = filterByPostDataTypes(posts, params.dataTypes);
+        }
         callback({
             onNextPage: onFetch,
             data: posts,
-            hasNextPage: !!((_b = data.params) === null || _b === void 0 ? void 0 : _b.page),
+            hasNextPage: !!((_c = data.params) === null || _c === void 0 ? void 0 : _c.page),
             loading: data.loading,
             error: data.error,
         });
@@ -30500,6 +30521,7 @@ const livePosts = (params, callback, config) => {
             collection.data = [...new Set([post.postId, ...collection.data])];
         }
         pushToCache(cacheKey, collection);
+        disposers.push(() => dropFromCache(cacheKey));
         responder(collection);
     };
     const onFetch = () => {
@@ -30528,7 +30550,6 @@ const livePosts = (params, callback, config) => {
     return () => {
         log(`livePosts(tmpid: ${timestamp}) > dispose`);
         disposers.forEach(fn => fn());
-        dropFromCache(cacheKey);
     };
 };
 
@@ -30685,7 +30706,7 @@ const liveComments = (params, callback, config) => {
             .map(commentId => pullFromCache(['comment', 'get', commentId]))
             .filter(Boolean)
             .map(({ data }) => data)) !== null && _a !== void 0 ? _a : [];
-        if (params.includeDeleted === false) {
+        if (!params.includeDeleted) {
             comments = filterByPropEquality(comments, 'isDeleted', false);
         }
         const sortBy = params.sortBy ? params.sortBy : 'lastCreated';
@@ -31430,6 +31451,7 @@ exports.fileUrlWithSize = fileUrlWithSize;
 exports.filterByChannelMembership = filterByChannelMembership;
 exports.filterByCommunityMembership = filterByCommunityMembership;
 exports.filterByFeedType = filterByFeedType;
+exports.filterByPostDataTypes = filterByPostDataTypes;
 exports.filterByPropEquality = filterByPropEquality;
 exports.filterByPropInclusion = filterByPropInclusion;
 exports.follow = follow;