@amityco/ts-sdk-react-native 6.32.4-a4e315c.0 → 6.32.5-2629e79.0

package/src/channelRepository/observers/observeChannel.ts

@@ -16,6 +16,7 @@ import {
   onChannelMemberRemoved,
 } from '../events';
 import { LinkedObject } from '~/utils/linkedObject';
+import { constructChannelDynamicValue } from '../utils/constructChannelDynamicValue';
 
 /**
  * ```js
@@ -43,25 +44,25 @@ export const observeChannel = <Events extends [Exclude<Amity.ChannelActionType,
   log(`observeChannel(tmpid: ${timestamp}) > listen`);
 
   // wrapper function to make sure
-  const router = (result: Amity.Snapshot<Amity.InternalChannel>, action: Events[number]) => {
+  const router = (result: Amity.Snapshot<Amity.StaticInternalChannel>, action: Events[number]) => {
     // filter function
     if (result.data?.channelId !== channelId) return;
 
     if (callback instanceof Function)
       return callback({
         ...result,
-        data: LinkedObject.channel(result.data),
+        data: LinkedObject.channel(constructChannelDynamicValue(result.data)),
       });
 
     if (action !== 'onFetch')
       callback.onEvent?.(action, {
         ...result,
-        data: LinkedObject.channel(result.data),
+        data: LinkedObject.channel(constructChannelDynamicValue(result.data)),
       });
 
     callback[action]?.({
       ...result,
-      data: LinkedObject.channel(result.data),
+      data: LinkedObject.channel(constructChannelDynamicValue(result.data)),
     });
   };
 

package/src/channelRepository/observers/observeChannels.ts

@@ -13,6 +13,7 @@ import {
   onChannelMemberRemoved,
 } from '../events';
 import { LinkedObject } from '~/utils/linkedObject';
+import { constructChannelDynamicValue } from '../utils/constructChannelDynamicValue';
 
 /**
  * ```js
@@ -40,13 +41,14 @@ export const observeChannels = (
   const disposers: Amity.Unsubscriber[] = [];
 
   const router = (
-    channel: Amity.InternalChannel,
+    channel: Amity.StaticInternalChannel,
     action: Exclude<Amity.ChannelActionType, 'onFetch'>,
   ) => {
-    if (callback instanceof Function) return callback(LinkedObject.channel(channel));
+    if (callback instanceof Function)
+      return callback(LinkedObject.channel(constructChannelDynamicValue(channel)));
 
-    callback.onEvent?.(action, LinkedObject.channel(channel));
-    callback[action]?.(LinkedObject.channel(channel));
+    callback.onEvent?.(action, LinkedObject.channel(constructChannelDynamicValue(channel)));
+    callback[action]?.(LinkedObject.channel(constructChannelDynamicValue(channel)));
   };
 
   disposers.push(

package/src/channelRepository/utils/constructChannelDynamicValue.ts

@@ -0,0 +1,22 @@
+import { shallowClone } from '~/utils/shallowClone';
+import { getChannelIsMentioned } from './getChannelIsMentioned';
+import { getSubChannelsUnreadCount } from './getSubChannelsUnreadCount';
+
+export const constructChannelDynamicValue = (
+  channel: Amity.StaticInternalChannel,
+): Amity.InternalChannel => {
+  return shallowClone(channel, {
+    get unreadCount() {
+      return getSubChannelsUnreadCount(channel);
+    },
+    get hasMentioned() {
+      return getChannelIsMentioned(channel);
+    },
+    get isMentioned() {
+      return getChannelIsMentioned(channel);
+    },
+    get subChannelsUnreadCount() {
+      return getSubChannelsUnreadCount(channel);
+    },
+  });
+};

package/src/channelRepository/utils/prepareChannelPayload.ts

@@ -16,7 +16,7 @@ export const isUnreadCountSupport = ({ type }: Pick<Amity.RawChannel, 'type'>) =
 export function convertFromRaw(
   channel: Amity.RawChannel,
   options: { isMessagePreviewUpdated?: boolean } = { isMessagePreviewUpdated: true },
-): Amity.InternalChannel {
+): Amity.StaticInternalChannel {
   let { messagePreviewId } = channel;
 
   const messagePreviewChannelCache = pullFromCache<Amity.InternalMessagePreview>([
@@ -30,18 +30,6 @@ export function convertFromRaw(
   }
 
   return {
-    get unreadCount() {
-      return getSubChannelsUnreadCount(channel);
-    },
-    get hasMentioned() {
-      return getChannelIsMentioned(channel);
-    },
-    get isMentioned() {
-      return getChannelIsMentioned(channel);
-    },
-    get subChannelsUnreadCount() {
-      return getSubChannelsUnreadCount(channel);
-    },
     ...channel,
     defaultSubChannelId: channel.channelInternalId,
     isUnreadCountSupport: isUnreadCountSupport(channel),

package/src/channelRepository/utils/resolveUnreadInfoOnChannelEvent.ts

@@ -2,8 +2,8 @@ import { getActiveClient } from '~/client/api/activeClient';
 import ObjectResolverEngine from '~/client/utils/ObjectResolver/objectResolverEngine';
 
 export const resolveUnreadInfoOnChannelEvent = (
-  channel: Amity.InternalChannel,
-  callback: Amity.Listener<Amity.InternalChannel>,
+  channel: Amity.StaticInternalChannel,
+  callback: Amity.Listener<Amity.StaticInternalChannel>,
 ) => {
   const client = getActiveClient();
 

package/src/channelRepository/utils/updateChannelCache.ts

@@ -5,6 +5,6 @@ export function updateChannelCache(channel: Amity.Channel, params: Partial<Amity
   pushToCache(
     ['channel', 'get', channel.channelId],
     // eslint-disable-next-line prefer-object-spread
-    Object.assign(shallowClone(channel), params),
+    shallowClone(channel, params),
   );
 }

package/src/client/utils/removeChannelMarkerCache.ts

@@ -3,7 +3,7 @@ import { getResolver } from '~/core/model';
 
 import { getActiveUser } from '../api/activeUser';
 
-export const removeChannelMarkerCache = (channel: Amity.InternalChannel) => {
+export const removeChannelMarkerCache = (channel: Amity.StaticInternalChannel) => {
   const id = getResolver('channelMarker')({
     userId: getActiveUser()._id,
     entityId: channel.channelId,

package/src/marker/events/onMessageMarked.ts

@@ -4,8 +4,6 @@ import { ingestInCache } from '~/cache/api/ingestInCache';
 import { getActiveClient } from '~/client/api/activeClient';
 import { createEventSubscriber } from '~/core/events';
 import { getResolver } from '~/core/model';
-import { isObject } from '~/utils/object';
-import { shallowClone } from '~/utils/shallowClone';
 
 /**
  * ```js

package/src/subChannelRepository/utils/updateSubChannelCache.ts

@@ -9,6 +9,6 @@ export function updateSubChannelCache(
   pushToCache(
     ['subChannel', 'get', subChannelId],
     // eslint-disable-next-line prefer-object-spread
-    Object.assign(shallowClone(subChannel), params),
+    shallowClone(subChannel, params),
   );
 }

package/src/utils/linkedObject/channelLinkedObject.ts

@@ -1,8 +1,8 @@
 import { markAsRead } from '~/channelRepository/api/markAsRead';
+import { shallowClone } from '../shallowClone';
 
 export const channelLinkedObject = (channel: Amity.InternalChannel): Amity.Channel => {
-  return {
-    ...channel,
+  return shallowClone(channel, {
     markAsRead: () => markAsRead(channel.channelInternalId),
-  };
+  });
 };

package/src/utils/shallowClone.ts

@@ -12,9 +12,12 @@
  * @category utility
  * @private
  */
-export function shallowClone(obj: any) {
-  const clone = Object.create(Object.getPrototypeOf(obj));
-  const descriptors = Object.getOwnPropertyDescriptors(obj);
-  Object.defineProperties(clone, descriptors);
-  return clone;
+export function shallowClone(source: object, target: object) {
+  return Object.create(
+    Object.getPrototypeOf(source), // Use the prototype of the source object
+    {
+      ...Object.getOwnPropertyDescriptors(source), // Copy all descriptors (methods, properties) from the source
+      ...Object.getOwnPropertyDescriptors(target), // Merge/override with descriptors (getters, properties) from the target
+    },
+  );
 }