@amityco/ts-sdk 6.4.2 → 6.4.3-0dfdabe.0

package/dist/postRepository/events/onPostReactionAdded.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onPostReactionAdded.d.ts","sourceRoot":"","sources":["../../../src/postRepository/events/onPostReactionAdded.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,mBAAmB,aAAc,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAG,MAAM,YAoBhF,CAAC"}
+{"version":3,"file":"onPostReactionAdded.d.ts","sourceRoot":"","sources":["../../../src/postRepository/events/onPostReactionAdded.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,mBAAmB,aAAc,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAG,MAAM,YAmBhF,CAAC"}

package/dist/postRepository/events/onPostReactionRemoved.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"onPostReactionRemoved.d.ts","sourceRoot":"","sources":["../../../src/postRepository/events/onPostReactionRemoved.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,aAAc,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAG,MAAM,YAoBlF,CAAC"}
+{"version":3,"file":"onPostReactionRemoved.d.ts","sourceRoot":"","sources":["../../../src/postRepository/events/onPostReactionRemoved.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,qBAAqB,aAAc,MAAM,QAAQ,CAAC,MAAM,IAAI,CAAC,KAAG,MAAM,YAmBlF,CAAC"}

package/dist/reactionRepository/utils/index.d.ts

@@ -1,5 +1,5 @@
 export * from './dispatchReactable';
 export * from './fetchReference';
-export * from './preparePayloadForCache';
+export * from './prepareReactionPayloadFormEvent';
 export * from './prepareMessagePayloadForCache';
 //# sourceMappingURL=index.d.ts.map

package/dist/reactionRepository/utils/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/reactionRepository/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,0BAA0B,CAAC;AACzC,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/reactionRepository/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,qBAAqB,CAAC;AACpC,cAAc,kBAAkB,CAAC;AACjC,cAAc,mCAAmC,CAAC;AAClD,cAAc,iCAAiC,CAAC"}

package/dist/reactionRepository/utils/prepareReactionPayloadFormEvent.d.ts

@@ -0,0 +1,3 @@
+/** @hidden */
+export declare const prepareReactionPayloadFormEvent: <T extends "post.addReaction" | "post.removeReaction" | "comment.addReaction" | "comment.removeReaction", P extends Amity.Events[T]>(event: T, payload: P) => P;
+//# sourceMappingURL=prepareReactionPayloadFormEvent.d.ts.map

package/dist/reactionRepository/utils/prepareReactionPayloadFormEvent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"prepareReactionPayloadFormEvent.d.ts","sourceRoot":"","sources":["../../../src/reactionRepository/utils/prepareReactionPayloadFormEvent.ts"],"names":[],"mappings":"AA8BA,cAAc;AACd,eAAO,MAAM,+BAA+B,iKA8B3C,CAAC"}

package/dist/utils/tests/dummy/post.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/post.ts"],"names":[],"mappings":"AAIA,wBAAgB,YAAY,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CAyBrE;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAAqB,CAAC;AAEjD,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAO1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAQ1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAI1B,CAAC;AAEF,eAAO,MAAM,KAAK;;;;;;CAMjB,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;;;CAU5B,CAAC;AAIF,eAAO,MAAM,iBAAiB;;;;;CAS7B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;CASlC,CAAC"}
+{"version":3,"file":"post.d.ts","sourceRoot":"","sources":["../../../../src/utils/tests/dummy/post.ts"],"names":[],"mappings":"AAIA,wBAAgB,YAAY,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC,IAAI,CA0BrE;AAED,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAAqB,CAAC;AAEjD,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAG1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAO1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAQ1B,CAAC;AAEF,eAAO,MAAM,MAAM,EAAE,KAAK,CAAC,IAI1B,CAAC;AAEF,eAAO,MAAM,KAAK;;;;;;CAMjB,CAAC;AAEF,eAAO,MAAM,gBAAgB;;;;;;;;;;CAU5B,CAAC;AAIF,eAAO,MAAM,iBAAiB;;;;;CAS7B,CAAC;AAEF,eAAO,MAAM,sBAAsB;;;;;CASlC,CAAC"}

package/package.json

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

package/src/cache/api/ingestInCache.ts

@@ -1,5 +1,6 @@
 import { PAYLOAD2MODEL, getResolver } from '~/core/model';
 
+import { pushToCache } from './pushToCache';
 import { upsertInCache } from './upsertInCache';
 
 /**
@@ -7,6 +8,7 @@ import { upsertInCache } from './upsertInCache';
  *
  * @param payload a "backend v3" payload object
  * @param options caching options like cachedAt or offline
+ * @param replace If TRUE it will overwrite the current cache with payload, if FALSE it will merge the payload into cache.
  *
  * @category Cache
  * @hidden
@@ -14,6 +16,7 @@ import { upsertInCache } from './upsertInCache';
 export const ingestInCache = (
   payload: Record<keyof typeof PAYLOAD2MODEL, Amity.Model[]> = {},
   options?: Amity.CacheOptions,
+  replace = true,
 ) => {
   Object.entries(payload).forEach(([key, models]) => {
     const type = PAYLOAD2MODEL[key];
@@ -23,7 +26,7 @@ export const ingestInCache = (
     if (!resolver) return;
 
     models.forEach(model => {
-      upsertInCache([type, 'get', resolver(model)], model, options);
+      (replace ? pushToCache : upsertInCache)([type, 'get', resolver(model)], model, options);
     });
   });
 };

package/src/channelRepsitory/channelMembership/observers/tests/getMembers.test.ts

@@ -98,7 +98,13 @@ describe('getMembers', () => {
 
   test.each(events)('%s', async (test, event, channelUser, user, expected) => {
     const callback = jest.fn();
-    client.http.get = jest.fn().mockResolvedValue(channelUserQueryResponse);
+
+    client.http.get = jest.fn().mockImplementation(url => {
+      if (url === `/api/v4/channels/${encodeURIComponent(channelId)}/users`)
+        return Promise.resolve(channelUserQueryResponse);
+
+      return undefined;
+    });
 
     getMembers({ channelId }, callback);
     await pause();

package/src/channelRepsitory/channelMembership/observers/tests/searchMembers.test.ts

@@ -129,7 +129,13 @@ describe('searchMembers', () => {
 
   test.each(events)('%s', async (test, event, channelUser, user, expected) => {
     const callback = jest.fn();
-    client.http.get = jest.fn().mockResolvedValue(channelUserQueryResponse);
+
+    client.http.get = jest.fn().mockImplementation(url => {
+      if (url === `/api/v4/channels/${encodeURIComponent(channelId)}/users`)
+        return Promise.resolve(channelUserQueryResponse);
+
+      return undefined;
+    });
 
     searchMembers({ channelId }, callback);
     await pause();

package/src/commentRepository/events/onCommentReactionAdded.ts

@@ -2,7 +2,7 @@ import { getActiveClient } from '~/client/api';
 import { pullFromCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { createEventSubscriber } from '~/core/events';
-import { preparePayloadForCache } from '~/reactionRepository/utils';
+import { prepareReactionPayloadFormEvent } from '~/reactionRepository/utils';
 
 /**
  * ```js
@@ -28,9 +28,8 @@ export const onCommentReactionAdded = (
     if (!client.cache) {
       callback(payload.comments[0]);
     } else {
-      preparePayloadForCache('comment.addReaction', payload);
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { reactor, ...commentPayload } = payload;
+      const processed = prepareReactionPayloadFormEvent('comment.addReaction', payload);
+      const { reactor, ...commentPayload } = processed;
 
       ingestInCache(commentPayload as Amity.CommentPayload);
 

package/src/commentRepository/events/onCommentReactionRemoved.ts

@@ -2,7 +2,7 @@ import { getActiveClient } from '~/client/api';
 import { pullFromCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { createEventSubscriber } from '~/core/events';
-import { preparePayloadForCache } from '~/reactionRepository/utils';
+import { prepareReactionPayloadFormEvent } from '~/reactionRepository/utils';
 
 /**
  * ```js
@@ -28,9 +28,8 @@ export const onCommentReactionRemoved = (
     if (!client.cache) {
       callback(payload.comments[0]);
     } else {
-      preparePayloadForCache('comment.removeReaction', payload);
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { reactor, ...commentPayload } = payload;
+      const processed = prepareReactionPayloadFormEvent('comment.removeReaction', payload);
+      const { reactor, ...commentPayload } = processed;
 
       ingestInCache(commentPayload as Amity.CommentPayload);
 

package/src/postRepository/events/onPostReactionAdded.ts

@@ -2,7 +2,7 @@ import { getActiveClient } from '~/client/api';
 import { pullFromCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { createEventSubscriber } from '~/core/events';
-import { preparePayloadForCache } from '~/reactionRepository/utils';
+import { prepareReactionPayloadFormEvent } from '~/reactionRepository/utils';
 
 /**
  * ```js
@@ -26,9 +26,8 @@ export const onPostReactionAdded = (callback: Amity.Listener<Amity.Post>): Amity
     if (!client.cache) {
       callback(payload.posts[0]);
     } else {
-      preparePayloadForCache('post.addReaction', payload);
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { reactor, ...postPayload } = payload;
+      const processed = prepareReactionPayloadFormEvent('post.addReaction', payload);
+      const { reactor, ...postPayload } = processed;
 
       ingestInCache(postPayload as Amity.ProcessedPostPayload);
 

package/src/postRepository/events/onPostReactionRemoved.ts

@@ -2,7 +2,7 @@ import { getActiveClient } from '~/client/api';
 import { pullFromCache } from '~/cache/api';
 import { ingestInCache } from '~/cache/api/ingestInCache';
 import { createEventSubscriber } from '~/core/events';
-import { preparePayloadForCache } from '~/reactionRepository/utils';
+import { prepareReactionPayloadFormEvent } from '~/reactionRepository/utils';
 
 /**
  * ```js
@@ -26,9 +26,8 @@ export const onPostReactionRemoved = (callback: Amity.Listener<Amity.Post>): Ami
     if (!client.cache) {
       callback(payload.posts[0]);
     } else {
-      preparePayloadForCache('post.removeReaction', payload);
-      // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      const { reactor, ...postPayload } = payload;
+      const processed = prepareReactionPayloadFormEvent('post.removeReaction', payload);
+      const { reactor, ...postPayload } = processed;
 
       ingestInCache(postPayload as Amity.ProcessedPostPayload);
 

package/src/postRepository/events/tests/onPostReactionAdded.test.ts

@@ -25,7 +25,7 @@ describe('onPostReactionAdded', () => {
     unsub();
 
     expect(callback).toHaveBeenCalled();
-    expect(callback).toHaveBeenCalledWith(post11);
+    expect(callback).toHaveBeenCalledWith({ ...post11, myReactions: [reaction11.reactionName] });
   });
 
   test('it should got nothing if we did unsubscribe before got event', () => {

package/src/reactionRepository/utils/index.ts

@@ -1,4 +1,4 @@
 export * from './dispatchReactable';
 export * from './fetchReference';
-export * from './preparePayloadForCache';
+export * from './prepareReactionPayloadFormEvent';
 export * from './prepareMessagePayloadForCache';

package/src/reactionRepository/utils/prepareReactionPayloadFormEvent.ts

@@ -0,0 +1,62 @@
+import { pullFromCache } from '~/cache/api';
+import { getActiveClient } from '~/client/api';
+
+const getMyReactionsInCache = <T extends Amity.PostPayload | Amity.CommentPayload>(
+  payload: T,
+  eventPrefix: string,
+) => {
+  let id: string;
+
+  if (eventPrefix === 'post') {
+    id = (<Amity.PostPayload>payload).posts[0].postId;
+  } else if (eventPrefix === 'comment') {
+    id = (<Amity.PostPayload>payload).comments[0].commentId;
+  } else {
+    throw new Error(`Unknown event type`);
+  }
+
+  return pullFromCache<Amity.Comment>(['comment', 'get', id])?.data?.myReactions || [];
+};
+
+const rebuildPayload = <T extends Amity.PostPayload | Amity.CommentPayload, K extends keyof T>(
+  payload: T,
+  payloadKey: K,
+  myReactions: Amity.Reactable['myReactions'],
+) => {
+  const [model]: any = payload[payloadKey];
+
+  return { ...payload, [payloadKey]: [{ ...model, myReactions }] };
+};
+
+/** @hidden */
+export const prepareReactionPayloadFormEvent = <
+  T extends
+    | 'post.addReaction'
+    | 'post.removeReaction'
+    | 'comment.addReaction'
+    | 'comment.removeReaction',
+  P extends Amity.Events[T],
+>(
+  event: T,
+  payload: P,
+): P => {
+  if (getActiveClient().userId !== payload.reactor.userId) {
+    return payload;
+  }
+
+  const eventPrefix = event.split('.')[0]; // 'post' | 'comment'
+  const eventSuffix = event.split('.')[1]; // 'addReaction' | 'removeReaction'
+
+  let myReactions: Amity.Reactable['myReactions'];
+  const cachedMyReactions = getMyReactionsInCache(payload, eventPrefix);
+
+  if (eventSuffix === 'addReaction') {
+    myReactions = [...cachedMyReactions, payload.reactor.reactionName];
+  } else if (eventSuffix === 'removeReaction') {
+    myReactions = cachedMyReactions.filter(reaction => reaction !== payload.reactor.reactionName);
+  } else {
+    throw new Error(`Unknown event type`);
+  }
+
+  return rebuildPayload(payload, <keyof P>`${eventPrefix}s`, myReactions);
+};

package/src/utils/tests/dummy/post.ts

@@ -22,6 +22,7 @@ export function generatePost(params?: Partial<Amity.Post>): Amity.Post {
     isDeleted: false,
     reactions: {},
     reactionsCount: 0,
+    myReactions: [],
     targetId: user11.userId,
     targetType: 'user',
     updatedAt: date,

package/dist/reactionRepository/utils/preparePayloadForCache.d.ts

@@ -1,3 +0,0 @@
-/** @hidden */
-export declare const preparePayloadForCache: <T extends "post.addReaction" | "post.removeReaction" | "comment.addReaction" | "comment.removeReaction">(event: T, payload: Amity.Events[T]) => void;
-//# sourceMappingURL=preparePayloadForCache.d.ts.map

package/dist/reactionRepository/utils/preparePayloadForCache.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"preparePayloadForCache.d.ts","sourceRoot":"","sources":["../../../src/reactionRepository/utils/preparePayloadForCache.ts"],"names":[],"mappings":"AAGA,cAAc;AACd,eAAO,MAAM,sBAAsB,uJAgDlC,CAAC"}

package/src/reactionRepository/utils/preparePayloadForCache.ts

@@ -1,53 +0,0 @@
-import { pullFromCache } from '~/cache/api';
-import { getActiveClient } from '~/client/api';
-
-/** @hidden */
-export const preparePayloadForCache = <
-  T extends
-    | 'post.addReaction'
-    | 'post.removeReaction'
-    | 'comment.addReaction'
-    | 'comment.removeReaction',
->(
-  event: T,
-  payload: Amity.Events[T],
-) => {
-  const client = getActiveClient();
-
-  if (client.userId !== payload.reactor.userId) {
-    return;
-  }
-
-  let model: Amity.Reactable;
-  let cached: Amity.Reactable | undefined;
-
-  if (event === 'post.addReaction' || event === 'post.removeReaction') {
-    const post = (payload as Amity.Events['post.addReaction']).posts[0];
-    cached = pullFromCache<Amity.Post>(['post', 'get', post.postId])?.data;
-    model = post;
-  } else {
-    const comment = (payload as Amity.Events['comment.addReaction']).comments[0];
-    cached = pullFromCache<Amity.Comment>(['comment', 'get', comment.commentId])?.data;
-    model = comment;
-  }
-
-  if (!cached || !cached.myReactions) {
-    return;
-  }
-
-  if (event === 'post.addReaction' || event === 'comment.addReaction') {
-    if (cached.myReactions.includes(payload.reactor.reactionName)) {
-      return;
-    }
-
-    Object.assign(model, { myReactions: [...cached.myReactions, payload.reactor.reactionName] });
-  } else {
-    if (!cached.myReactions.includes(payload.reactor.reactionName)) {
-      return;
-    }
-
-    Object.assign(model, {
-      myReactions: cached.myReactions.filter(x => x !== payload.reactor.reactionName),
-    });
-  }
-};