@amityco/ts-sdk 6.4.1 → 6.4.2-045209e.0

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

@@ -8,6 +8,11 @@ declare global {
             origin?: 'local' | 'server' | 'event';
         };
         type LiveObjectCallback<T extends any> = Amity.Listener<LiveObject<T>>;
+        type LiveObjectOptions<T extends Amity.Models[Amity.Domain], CallbackData extends any = any> = {
+            forceDispatch?: boolean;
+            callbackDataSelector?: (data: T) => CallbackData;
+            callbackFilter?: (currentModel: T, previousModel: T) => boolean;
+        };
         type LiveCollection<T extends any> = LiveObject<T[]> & {
             onNextPage: () => void;
             hasNextPage: boolean;

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

@@ -1 +1 @@
-{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../../../src/@types/core/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC;AAEV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK,CAAC;QACd,KAAK,UAAU,CAAC,CAAC,SAAS,GAAG,IAAI;YAC/B,IAAI,EAAE,CAAC,CAAC;YACR,KAAK,CAAC,EAAE,GAAG,CAAC;YACZ,OAAO,EAAE,OAAO,CAAC;YACjB,MAAM,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;SACvC,CAAC;QAEF,KAAK,kBAAkB,CAAC,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAEvE,KAAK,cAAc,CAAC,CAAC,SAAS,GAAG,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG;YACrD,UAAU,EAAE,MAAM,IAAI,CAAC;YACvB,WAAW,EAAE,OAAO,CAAC;SACtB,CAAC;QAEF,KAAK,sBAAsB,CAAC,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAE/E,KAAK,oBAAoB,GAAG;YAC1B,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;SACjD,CAAC;QAEF,KAAK,oBAAoB,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG;YAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;SAChB,CAAC;QAEF,KAAK,mBAAmB,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,IAAI,IAAI,CAC3D,cAAc,CAAC,CAAC,CAAC,EACjB,MAAM,GAAG,OAAO,GAAG,SAAS,CAC7B,GAAG;YAAE,MAAM,EAAE,CAAC,CAAA;SAAE,CAAC;KACnB;CACF"}
+{"version":3,"file":"live.d.ts","sourceRoot":"","sources":["../../../src/@types/core/live.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC;AAEV,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,KAAK,CAAC;QACd,KAAK,UAAU,CAAC,CAAC,SAAS,GAAG,IAAI;YAC/B,IAAI,EAAE,CAAC,CAAC;YACR,KAAK,CAAC,EAAE,GAAG,CAAC;YACZ,OAAO,EAAE,OAAO,CAAC;YACjB,MAAM,CAAC,EAAE,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAC;SACvC,CAAC;QAEF,KAAK,kBAAkB,CAAC,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;QAEvE,KAAK,iBAAiB,CAAC,CAAC,SAAS,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,YAAY,SAAS,GAAG,GAAG,GAAG,IAAI;YAC7F,aAAa,CAAC,EAAE,OAAO,CAAC;YACxB,oBAAoB,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,YAAY,CAAC;YACjD,cAAc,CAAC,EAAE,CAAC,YAAY,EAAE,CAAC,EAAE,aAAa,EAAE,CAAC,KAAK,OAAO,CAAC;SACjE,CAAC;QAEF,KAAK,cAAc,CAAC,CAAC,SAAS,GAAG,IAAI,UAAU,CAAC,CAAC,EAAE,CAAC,GAAG;YACrD,UAAU,EAAE,MAAM,IAAI,CAAC;YACvB,WAAW,EAAE,OAAO,CAAC;SACtB,CAAC;QAEF,KAAK,sBAAsB,CAAC,CAAC,SAAS,GAAG,IAAI,KAAK,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;QAE/E,KAAK,oBAAoB,GAAG;YAC1B,MAAM,CAAC,EAAE,OAAO,CAAC,KAAK,CAAC,WAAW,EAAE,UAAU,CAAC,CAAC;SACjD,CAAC;QAEF,KAAK,oBAAoB,CAAC,CAAC,SAAS,GAAG,IAAI,CAAC,GAAG;YAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;SAChB,CAAC;QAEF,KAAK,mBAAmB,CAAC,CAAC,SAAS,GAAG,EAAE,CAAC,SAAS,GAAG,IAAI,IAAI,CAC3D,cAAc,CAAC,CAAC,CAAC,EACjB,MAAM,GAAG,OAAO,GAAG,SAAS,CAC7B,GAAG;YAAE,MAAM,EAAE,CAAC,CAAA;SAAE,CAAC;KACnB;CACF"}

package/dist/cache/api/mergeInCache.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mergeInCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/mergeInCache.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,YAAY,gHAGb,MAAM,YAAY,KAC3B,OAeF,CAAC"}
+{"version":3,"file":"mergeInCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/mergeInCache.ts"],"names":[],"mappings":"AAMA;;;;;;;;;;;;;;;;;GAiBG;AACH,eAAO,MAAM,YAAY,gHAGb,MAAM,YAAY,KAC3B,OAmBF,CAAC"}

package/dist/client/observers/getTotalUnreadCount.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"getTotalUnreadCount.d.ts","sourceRoot":"","sources":["../../../src/client/observers/getTotalUnreadCount.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,mBAAmB,aACpB,MAAM,kBAAkB,CAAC,MAAM,CAAC,KACzC,MAAM,YA0BR,CAAC"}
+{"version":3,"file":"getTotalUnreadCount.d.ts","sourceRoot":"","sources":["../../../src/client/observers/getTotalUnreadCount.ts"],"names":[],"mappings":"AAOA;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,mBAAmB,aACpB,MAAM,kBAAkB,CAAC,MAAM,CAAC,KACzC,MAAM,YAqBR,CAAC"}

package/dist/core/model/index.d.ts

@@ -6,7 +6,7 @@ export * from './identifyModel';
  */
 export declare const PAYLOAD2MODEL: Record<string, Amity.Domain>;
 /** hidden */
-export declare const hasUpdates: <T extends Amity.UpdatedAt>(prevData: T, nextData: T) => boolean;
+export declare const isOutdated: <T extends Amity.UpdatedAt>(prevData: T, nextData: T) => boolean;
 /** hidden */
 export declare function getFutureDate(date?: string | undefined): string;
 /** hidden */

package/dist/core/model/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAEhC;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CA+BtD,CAAC;AAEF,aAAa;AACb,eAAO,MAAM,UAAU,2DAA0D,OAEhF,CAAC;AAEF,aAAa;AACb,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAM,GAAG,SAAoC,GAAG,MAAM,CAEzF;AAED,aAAa;AACb,wBAAgB,WAAW,CAAC,IAAI,GAAE,MAAM,GAAG,SAAoC,GAAG,MAAM,CAEvF"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/core/model/index.ts"],"names":[],"mappings":"AAAA,cAAc,eAAe,CAAC;AAC9B,cAAc,iBAAiB,CAAC;AAEhC;;;GAGG;AACH,eAAO,MAAM,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,MAAM,CA+BtD,CAAC;AAEF,aAAa;AACb,eAAO,MAAM,UAAU,2DAA0D,OAMhF,CAAC;AAEF,aAAa;AACb,wBAAgB,aAAa,CAAC,IAAI,GAAE,MAAM,GAAG,SAAoC,GAAG,MAAM,CAEzF;AAED,aAAa;AACb,wBAAgB,WAAW,CAAC,IAAI,GAAE,MAAM,GAAG,SAAoC,GAAG,MAAM,CAEvF"}

package/dist/index.cjs.js

@@ -637,8 +637,11 @@ const PAYLOAD2MODEL = {
     feeds: 'feed',
 };
 /** hidden */
-const hasUpdates = (prevData, nextData) => {
-    return new Date(prevData.updatedAt) < new Date(nextData.updatedAt);
+const isOutdated = (prevData, nextData) => {
+    if ('updatedAt' in nextData && 'updatedAt' in nextData) {
+        return new Date(nextData.updatedAt) < new Date(prevData.updatedAt);
+    }
+    return false;
 };
 /** hidden */
 function getFutureDate(date = new Date().toISOString()) {
@@ -995,6 +998,9 @@ const mergeInCache = (key, mutation, options) => {
     if (!oldVal)
         return false;
     const newVal = typeof mutation === 'function' ? mutation(oldVal.data) : Object.assign(Object.assign({}, oldVal.data), mutation);
+    if (isOutdated(oldVal.data, newVal)) {
+        return false;
+    }
     pushToCache(key, newVal, options);
     return true;
 };
@@ -22399,7 +22405,8 @@ function isEqual(x, y) {
         }));
 }
 
-const liveObject = (id, callback, key, fetcher, eventHandlers, callbackDataSelector = data => data, callbackFilter) => {
+const liveObject = (id, callback, key, fetcher, eventHandlers, options) => {
+    const { forceDispatch, callbackDataSelector, callbackFilter } = Object.assign({ forceDispatch: false, callbackDataSelector: (data) => data }, options);
     const { cache } = getActiveClient();
     if (!cache) {
         console.log(LIVE_OBJECT_ENABLE_CACHE_MESSAGE);
@@ -22414,28 +22421,13 @@ const liveObject = (id, callback, key, fetcher, eventHandlers, callbackDataSelec
         }
         model = newModel;
     };
-    const realtimeRouter = (eventModel) => {
+    const realtimeRouter = (eventModel, forceDispatch = false) => {
         if (id !== eventModel[key]) {
             return;
         }
         if (model) {
-            /*
-             * This test is required as follow does not extend Amity.Timestamps
-             * Also, follow can have an event where the paylod is not updated i.e.
-             * when a request is declined
-             */
-            if ('updatedAt' in model && 'updatedAt' in eventModel) {
-                /*
-                 * NOTE: the isEqual is added as a fail safe as the server does not update
-                 * the updatedAt when the model updates rather when the data in the data of
-                 * the model (if any) updates.
-                 *
-                 * Ex: post.addReaction | post.removeReaction does not update the updatedAt
-                 * of the post
-                 */
-                if (!hasUpdates(model, eventModel) || isEqual(model, eventModel)) {
-                    return;
-                }
+            if (!forceDispatch && isEqual(model, eventModel)) {
+                return;
             }
         }
         dispatcher({ loading: false, data: eventModel, origin: 'event' });
@@ -22464,7 +22456,7 @@ const liveObject = (id, callback, key, fetcher, eventHandlers, callbackDataSelec
             }
         });
     };
-    disposers.push(...eventHandlers.map(fn => fn(realtimeRouter)));
+    disposers.push(...eventHandlers.map(fn => fn(eventModel => realtimeRouter(eventModel, forceDispatch))));
     onFetch();
     return () => {
         disposers.forEach(fn => fn());
@@ -22491,11 +22483,14 @@ const getTotalUnreadCount = (callback) => {
     const { _id: userId } = getActiveUser();
     if (!userId)
         throw new ASCError('The _id has not been defined in ActiveUser', 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
-    const callbackPayloadSelector = (data) => { var _a; return (_a = data === null || data === void 0 ? void 0 : data.unreadCount) !== null && _a !== void 0 ? _a : 0; };
+    const callbackDataSelector = (data) => { var _a; return (_a = data === null || data === void 0 ? void 0 : data.unreadCount) !== null && _a !== void 0 ? _a : 0; };
     // based on the mobile specs, unreadCount will not trigger observer when userMarker
     // is re-fetched, so apply this filter to ensure the behavior is the same.
     const callbackFilter = (newModel, oldModel) => (newModel === null || newModel === void 0 ? void 0 : newModel.unreadCount) !== (oldModel === null || oldModel === void 0 ? void 0 : oldModel.unreadCount);
-    return liveObject(userId, callback, 'userId', getUserMarker, [onUserMarkerFetched], callbackPayloadSelector, callbackFilter);
+    return liveObject(userId, callback, 'userId', getUserMarker, [onUserMarkerFetched], {
+        callbackDataSelector,
+        callbackFilter,
+    });
 };
 
 /**
@@ -25478,7 +25473,9 @@ const getFollowings = (params, callback, config) => {
  * @category FollowInfo Live Object
  */
 const getFollowInfo = (userId, callback) => {
-    return liveObject(userId, callback, 'userId', getFollowInfo$1, [onFollowInfoUpdated]);
+    return liveObject(userId, callback, 'userId', getFollowInfo$1, [onFollowInfoUpdated], {
+        forceDispatch: true,
+    });
 };
 /* end_public_function */
 
@@ -29218,12 +29215,12 @@ const getSubChannel = (subChannelId, callback) => {
 };
 /* end_public_function */
 
-function isCollectionOutdated(collection, newItem, action) {
+function shouldDispatchCollection(collection, newItem, action) {
     const key = identifyModelKey(newItem);
     // @ts-ignore
     const item = collection.find(x => x[key] === newItem[key]);
     if (item) {
-        return hasUpdates(item, newItem);
+        return !isEqual(item, newItem);
     }
     return action === 'onCreate';
 }
@@ -29370,7 +29367,7 @@ const getSubChannels = (params, callback, config) => {
     const realtimeRouter = (action) => (subChannel) => {
         if (params.channelId !== subChannel.channelId ||
             !snapshot ||
-            !isCollectionOutdated(snapshot.data, subChannel, action)) {
+            !shouldDispatchCollection(snapshot.data, subChannel, action)) {
             return;
         }
         if (action === 'onCreate') {

package/dist/index.esm.js

@@ -623,8 +623,11 @@ const PAYLOAD2MODEL = {
     feeds: 'feed',
 };
 /** hidden */
-const hasUpdates = (prevData, nextData) => {
-    return new Date(prevData.updatedAt) < new Date(nextData.updatedAt);
+const isOutdated = (prevData, nextData) => {
+    if ('updatedAt' in nextData && 'updatedAt' in nextData) {
+        return new Date(nextData.updatedAt) < new Date(prevData.updatedAt);
+    }
+    return false;
 };
 /** hidden */
 function getFutureDate(date = new Date().toISOString()) {
@@ -981,6 +984,9 @@ const mergeInCache = (key, mutation, options) => {
     if (!oldVal)
         return false;
     const newVal = typeof mutation === 'function' ? mutation(oldVal.data) : Object.assign(Object.assign({}, oldVal.data), mutation);
+    if (isOutdated(oldVal.data, newVal)) {
+        return false;
+    }
     pushToCache(key, newVal, options);
     return true;
 };
@@ -22385,7 +22391,8 @@ function isEqual(x, y) {
         }));
 }
 
-const liveObject = (id, callback, key, fetcher, eventHandlers, callbackDataSelector = data => data, callbackFilter) => {
+const liveObject = (id, callback, key, fetcher, eventHandlers, options) => {
+    const { forceDispatch, callbackDataSelector, callbackFilter } = Object.assign({ forceDispatch: false, callbackDataSelector: (data) => data }, options);
     const { cache } = getActiveClient();
     if (!cache) {
         console.log(LIVE_OBJECT_ENABLE_CACHE_MESSAGE);
@@ -22400,28 +22407,13 @@ const liveObject = (id, callback, key, fetcher, eventHandlers, callbackDataSelec
         }
         model = newModel;
     };
-    const realtimeRouter = (eventModel) => {
+    const realtimeRouter = (eventModel, forceDispatch = false) => {
         if (id !== eventModel[key]) {
             return;
         }
         if (model) {
-            /*
-             * This test is required as follow does not extend Amity.Timestamps
-             * Also, follow can have an event where the paylod is not updated i.e.
-             * when a request is declined
-             */
-            if ('updatedAt' in model && 'updatedAt' in eventModel) {
-                /*
-                 * NOTE: the isEqual is added as a fail safe as the server does not update
-                 * the updatedAt when the model updates rather when the data in the data of
-                 * the model (if any) updates.
-                 *
-                 * Ex: post.addReaction | post.removeReaction does not update the updatedAt
-                 * of the post
-                 */
-                if (!hasUpdates(model, eventModel) || isEqual(model, eventModel)) {
-                    return;
-                }
+            if (!forceDispatch && isEqual(model, eventModel)) {
+                return;
             }
         }
         dispatcher({ loading: false, data: eventModel, origin: 'event' });
@@ -22450,7 +22442,7 @@ const liveObject = (id, callback, key, fetcher, eventHandlers, callbackDataSelec
             }
         });
     };
-    disposers.push(...eventHandlers.map(fn => fn(realtimeRouter)));
+    disposers.push(...eventHandlers.map(fn => fn(eventModel => realtimeRouter(eventModel, forceDispatch))));
     onFetch();
     return () => {
         disposers.forEach(fn => fn());
@@ -22477,11 +22469,14 @@ const getTotalUnreadCount = (callback) => {
     const { _id: userId } = getActiveUser();
     if (!userId)
         throw new ASCError('The _id has not been defined in ActiveUser', 800000 /* Amity.ClientError.UNKNOWN_ERROR */, "error" /* Amity.ErrorLevel.ERROR */);
-    const callbackPayloadSelector = (data) => { var _a; return (_a = data === null || data === void 0 ? void 0 : data.unreadCount) !== null && _a !== void 0 ? _a : 0; };
+    const callbackDataSelector = (data) => { var _a; return (_a = data === null || data === void 0 ? void 0 : data.unreadCount) !== null && _a !== void 0 ? _a : 0; };
     // based on the mobile specs, unreadCount will not trigger observer when userMarker
     // is re-fetched, so apply this filter to ensure the behavior is the same.
     const callbackFilter = (newModel, oldModel) => (newModel === null || newModel === void 0 ? void 0 : newModel.unreadCount) !== (oldModel === null || oldModel === void 0 ? void 0 : oldModel.unreadCount);
-    return liveObject(userId, callback, 'userId', getUserMarker, [onUserMarkerFetched], callbackPayloadSelector, callbackFilter);
+    return liveObject(userId, callback, 'userId', getUserMarker, [onUserMarkerFetched], {
+        callbackDataSelector,
+        callbackFilter,
+    });
 };
 
 /**
@@ -25464,7 +25459,9 @@ const getFollowings = (params, callback, config) => {
  * @category FollowInfo Live Object
  */
 const getFollowInfo = (userId, callback) => {
-    return liveObject(userId, callback, 'userId', getFollowInfo$1, [onFollowInfoUpdated]);
+    return liveObject(userId, callback, 'userId', getFollowInfo$1, [onFollowInfoUpdated], {
+        forceDispatch: true,
+    });
 };
 /* end_public_function */
 
@@ -29204,12 +29201,12 @@ const getSubChannel = (subChannelId, callback) => {
 };
 /* end_public_function */
 
-function isCollectionOutdated(collection, newItem, action) {
+function shouldDispatchCollection(collection, newItem, action) {
     const key = identifyModelKey(newItem);
     // @ts-ignore
     const item = collection.find(x => x[key] === newItem[key]);
     if (item) {
-        return hasUpdates(item, newItem);
+        return !isEqual(item, newItem);
     }
     return action === 'onCreate';
 }
@@ -29356,7 +29353,7 @@ const getSubChannels = (params, callback, config) => {
     const realtimeRouter = (action) => (subChannel) => {
         if (params.channelId !== subChannel.channelId ||
             !snapshot ||
-            !isCollectionOutdated(snapshot.data, subChannel, action)) {
+            !shouldDispatchCollection(snapshot.data, subChannel, action)) {
             return;
         }
         if (action === 'onCreate') {