@amityco/ts-sdk 7.32.1-23b143a2.0 → 7.32.1-6d2e2c1e.0

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

@@ -1 +1 @@
-{"version":3,"file":"dropFromCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/dropFromCache.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,aAAa,4CAAyC,OAqBlE,CAAC"}
+{"version":3,"file":"dropFromCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/dropFromCache.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,aAAa,4CAAyC,OAsBlE,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"pushToCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/pushToCache.ts"],"names":[],"mappings":"AAKA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,8BAEhB,OAAO,YACJ,MAAM,YAAY,KAC1B,OAmBF,CAAC"}
+{"version":3,"file":"pushToCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/pushToCache.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW,8BAEhB,OAAO,YACJ,MAAM,YAAY,KAC1B,OAkBF,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"queryCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/queryCache.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,UAAU,+EAWtB,CAAC"}
+{"version":3,"file":"queryCache.d.ts","sourceRoot":"","sources":["../../../src/cache/api/queryCache.ts"],"names":[],"mappings":"AAoBA;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,UAAU,+EAatB,CAAC"}

package/dist/index.cjs.js

@@ -1184,116 +1184,17 @@ const wipeCache = async (storageKey = 'amitySdk') => {
     return true;
 };
 
-// Indexes never enter persisted cache data. Replacing data (restore/wipe/enable) starts a new index.
-const indexes = new WeakMap();
-const prefixesFor = (key) => {
-    if (typeof key[0] !== 'string')
-        return [];
-    const prefixes = [JSON.stringify([key[0]])];
-    if (typeof key[1] === 'string')
-        prefixes.push(JSON.stringify([key[0], key[1]]));
-    return prefixes;
-};
-const removePropertyValue = (property, indexed) => {
-    const previous = property.previousValues.get(indexed.encodedKey);
-    if (previous === undefined)
-        return;
-    const matches = property.values.get(previous);
-    matches.delete(indexed);
-    if (!matches.size)
-        property.values.delete(previous);
-    property.previousValues.delete(indexed.encodedKey);
-};
-const addPropertyValue = (data, property, indexed) => {
-    var _a;
-    if (!partialMatch(property.prefix, indexed.key))
-        return;
-    const value = (_a = data[indexed.encodedKey].data) === null || _a === void 0 ? void 0 : _a[property.property];
-    if (typeof value !== 'string')
-        return;
-    let matches = property.values.get(value);
-    if (!matches) {
-        matches = new Set();
-        property.values.set(value, matches);
-    }
-    matches.add(indexed);
-    property.previousValues.set(indexed.encodedKey, value);
-};
-const addKey = (index, encodedKey) => {
-    const indexed = { encodedKey, key: decodeKey(encodedKey), order: index.nextOrder };
-    index.nextOrder += 1; // eslint-disable-line no-param-reassign
-    index.keys.set(encodedKey, indexed);
-    prefixesFor(indexed.key).forEach(prefix => {
-        let keys = index.prefixes.get(prefix);
-        if (!keys) {
-            keys = new Map();
-            index.prefixes.set(prefix, keys);
-        }
-        keys.set(encodedKey, indexed);
-    });
-    return indexed;
-};
-const getIndex = (data) => {
-    let index = indexes.get(data);
-    if (!index) {
-        index = { keys: new Map(), prefixes: new Map(), properties: new Map(), nextOrder: 0 };
-        Object.keys(data).forEach(encodedKey => addKey(index, encodedKey));
-        indexes.set(data, index);
-    }
-    return index;
-};
-const candidatesFor = (index, key) => {
-    var _a, _b;
-    const prefixes = prefixesFor(key);
-    if (!prefixes.length)
-        return index.keys.values();
-    return (_b = (_a = index.prefixes.get(prefixes[prefixes.length - 1])) === null || _a === void 0 ? void 0 : _a.values()) !== null && _b !== void 0 ? _b : [];
-};
-/** @hidden */
-const getMatchingCacheKeys = (data, key) => Array.from(candidatesFor(getIndex(data), key)).filter(indexed => partialMatch(key, indexed.key));
-/** Update only an index that has already been used; writes alone need no index build. @hidden */
-const updateCacheIndex = (data, encodedKey) => {
-    var _a;
-    const index = indexes.get(data);
-    if (!index)
-        return;
-    const indexed = (_a = index.keys.get(encodedKey)) !== null && _a !== void 0 ? _a : addKey(index, encodedKey);
-    index.properties.forEach(property => {
-        removePropertyValue(property, indexed);
-        addPropertyValue(data, property, indexed);
-    });
-};
-/** @hidden */
-const removeFromCacheIndex = (data, encodedKey) => {
-    const index = indexes.get(data);
-    const indexed = index === null || index === void 0 ? void 0 : index.keys.get(encodedKey);
-    if (!index || !indexed)
-        return;
-    index.properties.forEach(property => removePropertyValue(property, indexed));
-    prefixesFor(indexed.key).forEach(prefix => {
-        const keys = index.prefixes.get(prefix);
-        keys.delete(encodedKey);
-        if (!keys.size)
-            index.prefixes.delete(prefix);
-    });
-    index.keys.delete(encodedKey);
-};
-/** Index a string model property within one domain/operation, retaining cache insertion order. @hidden */
-const getCacheEntriesByProperty = (data, prefix, property, value) => {
-    var _a;
-    const index = getIndex(data);
-    const identity = JSON.stringify([prefix, property]);
-    let propertyIndex = index.properties.get(identity);
-    if (!propertyIndex) {
-        propertyIndex = { prefix, property, values: new Map(), previousValues: new Map() };
-        index.properties.set(identity, propertyIndex);
-        Array.from(candidatesFor(index, prefix)).forEach(indexed => addPropertyValue(data, propertyIndex, indexed));
+const isPrimitiveKey = (key) => Array.isArray(key) &&
+    key.length > 0 &&
+    key.every(segment => typeof segment === 'string' || typeof segment === 'number');
+const createMatcher = (key) => {
+    if (isPrimitiveKey(key)) {
+        const encoded = encodeKey(key);
+        const prefix = `${encoded.slice(0, -1)},`;
+        return encodedKey => encodedKey === encoded || encodedKey.startsWith(prefix);
     }
-    return Array.from((_a = propertyIndex.values.get(value)) !== null && _a !== void 0 ? _a : [])
-        .sort((a, b) => a.order - b.order)
-        .map(({ encodedKey }) => data[encodedKey]);
+    return encodedKey => partialMatch(key, decodeKey(encodedKey));
 };
-
 /**
  * ```js
  * import { queryCache } from '@amityco/ts-sdk'
@@ -1314,7 +1215,10 @@ const queryCache = (key) => {
     if (!cache)
         return;
     log('cache/api/queryCache', { key });
-    return getMatchingCacheKeys(cache.data, key).map(({ encodedKey }) => cache.data[encodedKey]);
+    const matches = createMatcher(key);
+    return Object.keys(cache.data)
+        .filter(matches)
+        .map(stringKey => cache.data[stringKey]);
 };
 
 /**
@@ -1370,7 +1274,6 @@ const pushToCache = (key, data, options = { cachedAt: Date.now() }) => {
     }
     const encodedKey = encodeKey(key);
     cache.data[encodedKey] = Object.assign({ key, data }, options);
-    updateCacheIndex(cache.data, encodedKey);
     return true;
 };
 
@@ -1455,14 +1358,15 @@ const dropFromCache = (key, exact = false) => {
         return false;
     log('cache/api/dropFromCache', { key, exact });
     if (!exact) {
-        return getMatchingCacheKeys(cache.data, key)
-            .map(({ key: filteredKey }) => dropFromCache(filteredKey, true))
+        return Object.keys(cache.data)
+            .map(stringKey => decodeKey(stringKey))
+            .filter(candidate => partialMatch(key, candidate))
+            .map(filteredKey => dropFromCache(filteredKey, true))
             .every(returned => returned);
     }
     const encodedKey = encodeKey(key);
     if (encodedKey in cache.data) {
         delete cache.data[encodedKey];
-        removeFromCacheIndex(cache.data, encodedKey);
         return true;
     }
     return false;
@@ -3851,20 +3755,13 @@ const getUserMarker = async () => {
     return { data: latestUserMarker, cachedAt };
 };
 
-/** Internal model lookup; deliberately excluded from the public Cache API. @hidden */
-const queryCacheByProperty = (prefix, property, value) => {
-    const { cache } = getActiveClient();
-    if (!cache)
-        return;
-    return getCacheEntriesByProperty(cache.data, prefix, property, value);
-};
-
 const getMessageFromMainDB = (messageId) => {
-    var _a, _b, _c;
+    var _a, _b;
     const message = (_a = pullFromCache(['message', 'get', messageId])) === null || _a === void 0 ? void 0 : _a.data;
     if (message)
         return message;
-    return (_c = (_b = queryCacheByProperty(['message', 'get'], 'messageId', messageId)) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.data;
+    const messages = queryCache(['message', 'get']);
+    return (_b = messages === null || messages === void 0 ? void 0 : messages.find(({ data }) => data.messageId === messageId)) === null || _b === void 0 ? void 0 : _b.data;
 };
 
 /** @hidden */
@@ -4006,8 +3903,7 @@ function convertFromRaw$2(_a) {
 
 const mergePayloadWithLocal = (payload) => {
     var _a, _b, _c;
-    // Cache keys may be local referenceIds even after a server messageId is assigned.
-    const localMessage = (_b = (_a = queryCacheByProperty(['message', 'get'], 'messageId', payload.messageId)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.data;
+    const localMessage = (_b = (_a = queryCache(['message', 'get'])) === null || _a === void 0 ? void 0 : _a.find(({ data }) => data.messageId === payload.messageId)) === null || _b === void 0 ? void 0 : _b.data;
     if (localMessage) {
         return Object.assign(Object.assign(Object.assign({}, localMessage), payload), { 
             // NOTE: referenceId is missing in the some payload event. If we have local message data with referenceId, use it instead.
@@ -5574,9 +5470,9 @@ const channelLinkedObject = (channel) => {
     var _a;
     let previewMembers = [];
     if (['conversation', 'community'].includes(channel.type)) {
-        const channelUsers = queryCacheByProperty(['channelUsers', 'get'], 'channelId', channel.channelId);
+        const channelUsers = queryCache(['channelUsers', 'get']);
         if (channelUsers && (channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.length) > 0) {
-            previewMembers = ((_a = channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.filter(({ data }) => data.membership !== 'none')) !== null && _a !== void 0 ? _a : [])
+            previewMembers = ((_a = channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.filter(({ data }) => data.channelId === channel.channelId && data.membership !== 'none')) !== null && _a !== void 0 ? _a : [])
                 // sort in ascending order by userInternalId
                 .sort((a, b) => a.data.userInternalId.localeCompare(b.data.userInternalId))
                 // Select only first 4 members

package/dist/index.esm.js

@@ -1168,116 +1168,17 @@ const wipeCache = async (storageKey = 'amitySdk') => {
     return true;
 };
 
-// Indexes never enter persisted cache data. Replacing data (restore/wipe/enable) starts a new index.
-const indexes = new WeakMap();
-const prefixesFor = (key) => {
-    if (typeof key[0] !== 'string')
-        return [];
-    const prefixes = [JSON.stringify([key[0]])];
-    if (typeof key[1] === 'string')
-        prefixes.push(JSON.stringify([key[0], key[1]]));
-    return prefixes;
-};
-const removePropertyValue = (property, indexed) => {
-    const previous = property.previousValues.get(indexed.encodedKey);
-    if (previous === undefined)
-        return;
-    const matches = property.values.get(previous);
-    matches.delete(indexed);
-    if (!matches.size)
-        property.values.delete(previous);
-    property.previousValues.delete(indexed.encodedKey);
-};
-const addPropertyValue = (data, property, indexed) => {
-    var _a;
-    if (!partialMatch(property.prefix, indexed.key))
-        return;
-    const value = (_a = data[indexed.encodedKey].data) === null || _a === void 0 ? void 0 : _a[property.property];
-    if (typeof value !== 'string')
-        return;
-    let matches = property.values.get(value);
-    if (!matches) {
-        matches = new Set();
-        property.values.set(value, matches);
-    }
-    matches.add(indexed);
-    property.previousValues.set(indexed.encodedKey, value);
-};
-const addKey = (index, encodedKey) => {
-    const indexed = { encodedKey, key: decodeKey(encodedKey), order: index.nextOrder };
-    index.nextOrder += 1; // eslint-disable-line no-param-reassign
-    index.keys.set(encodedKey, indexed);
-    prefixesFor(indexed.key).forEach(prefix => {
-        let keys = index.prefixes.get(prefix);
-        if (!keys) {
-            keys = new Map();
-            index.prefixes.set(prefix, keys);
-        }
-        keys.set(encodedKey, indexed);
-    });
-    return indexed;
-};
-const getIndex = (data) => {
-    let index = indexes.get(data);
-    if (!index) {
-        index = { keys: new Map(), prefixes: new Map(), properties: new Map(), nextOrder: 0 };
-        Object.keys(data).forEach(encodedKey => addKey(index, encodedKey));
-        indexes.set(data, index);
-    }
-    return index;
-};
-const candidatesFor = (index, key) => {
-    var _a, _b;
-    const prefixes = prefixesFor(key);
-    if (!prefixes.length)
-        return index.keys.values();
-    return (_b = (_a = index.prefixes.get(prefixes[prefixes.length - 1])) === null || _a === void 0 ? void 0 : _a.values()) !== null && _b !== void 0 ? _b : [];
-};
-/** @hidden */
-const getMatchingCacheKeys = (data, key) => Array.from(candidatesFor(getIndex(data), key)).filter(indexed => partialMatch(key, indexed.key));
-/** Update only an index that has already been used; writes alone need no index build. @hidden */
-const updateCacheIndex = (data, encodedKey) => {
-    var _a;
-    const index = indexes.get(data);
-    if (!index)
-        return;
-    const indexed = (_a = index.keys.get(encodedKey)) !== null && _a !== void 0 ? _a : addKey(index, encodedKey);
-    index.properties.forEach(property => {
-        removePropertyValue(property, indexed);
-        addPropertyValue(data, property, indexed);
-    });
-};
-/** @hidden */
-const removeFromCacheIndex = (data, encodedKey) => {
-    const index = indexes.get(data);
-    const indexed = index === null || index === void 0 ? void 0 : index.keys.get(encodedKey);
-    if (!index || !indexed)
-        return;
-    index.properties.forEach(property => removePropertyValue(property, indexed));
-    prefixesFor(indexed.key).forEach(prefix => {
-        const keys = index.prefixes.get(prefix);
-        keys.delete(encodedKey);
-        if (!keys.size)
-            index.prefixes.delete(prefix);
-    });
-    index.keys.delete(encodedKey);
-};
-/** Index a string model property within one domain/operation, retaining cache insertion order. @hidden */
-const getCacheEntriesByProperty = (data, prefix, property, value) => {
-    var _a;
-    const index = getIndex(data);
-    const identity = JSON.stringify([prefix, property]);
-    let propertyIndex = index.properties.get(identity);
-    if (!propertyIndex) {
-        propertyIndex = { prefix, property, values: new Map(), previousValues: new Map() };
-        index.properties.set(identity, propertyIndex);
-        Array.from(candidatesFor(index, prefix)).forEach(indexed => addPropertyValue(data, propertyIndex, indexed));
+const isPrimitiveKey = (key) => Array.isArray(key) &&
+    key.length > 0 &&
+    key.every(segment => typeof segment === 'string' || typeof segment === 'number');
+const createMatcher = (key) => {
+    if (isPrimitiveKey(key)) {
+        const encoded = encodeKey(key);
+        const prefix = `${encoded.slice(0, -1)},`;
+        return encodedKey => encodedKey === encoded || encodedKey.startsWith(prefix);
     }
-    return Array.from((_a = propertyIndex.values.get(value)) !== null && _a !== void 0 ? _a : [])
-        .sort((a, b) => a.order - b.order)
-        .map(({ encodedKey }) => data[encodedKey]);
+    return encodedKey => partialMatch(key, decodeKey(encodedKey));
 };
-
 /**
  * ```js
  * import { queryCache } from '@amityco/ts-sdk'
@@ -1298,7 +1199,10 @@ const queryCache = (key) => {
     if (!cache)
         return;
     log('cache/api/queryCache', { key });
-    return getMatchingCacheKeys(cache.data, key).map(({ encodedKey }) => cache.data[encodedKey]);
+    const matches = createMatcher(key);
+    return Object.keys(cache.data)
+        .filter(matches)
+        .map(stringKey => cache.data[stringKey]);
 };
 
 /**
@@ -1354,7 +1258,6 @@ const pushToCache = (key, data, options = { cachedAt: Date.now() }) => {
     }
     const encodedKey = encodeKey(key);
     cache.data[encodedKey] = Object.assign({ key, data }, options);
-    updateCacheIndex(cache.data, encodedKey);
     return true;
 };
 
@@ -1439,14 +1342,15 @@ const dropFromCache = (key, exact = false) => {
         return false;
     log('cache/api/dropFromCache', { key, exact });
     if (!exact) {
-        return getMatchingCacheKeys(cache.data, key)
-            .map(({ key: filteredKey }) => dropFromCache(filteredKey, true))
+        return Object.keys(cache.data)
+            .map(stringKey => decodeKey(stringKey))
+            .filter(candidate => partialMatch(key, candidate))
+            .map(filteredKey => dropFromCache(filteredKey, true))
             .every(returned => returned);
     }
     const encodedKey = encodeKey(key);
     if (encodedKey in cache.data) {
         delete cache.data[encodedKey];
-        removeFromCacheIndex(cache.data, encodedKey);
         return true;
     }
     return false;
@@ -3851,20 +3755,13 @@ const getUserMarker = async () => {
     return { data: latestUserMarker, cachedAt };
 };
 
-/** Internal model lookup; deliberately excluded from the public Cache API. @hidden */
-const queryCacheByProperty = (prefix, property, value) => {
-    const { cache } = getActiveClient();
-    if (!cache)
-        return;
-    return getCacheEntriesByProperty(cache.data, prefix, property, value);
-};
-
 const getMessageFromMainDB = (messageId) => {
-    var _a, _b, _c;
+    var _a, _b;
     const message = (_a = pullFromCache(['message', 'get', messageId])) === null || _a === void 0 ? void 0 : _a.data;
     if (message)
         return message;
-    return (_c = (_b = queryCacheByProperty(['message', 'get'], 'messageId', messageId)) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c.data;
+    const messages = queryCache(['message', 'get']);
+    return (_b = messages === null || messages === void 0 ? void 0 : messages.find(({ data }) => data.messageId === messageId)) === null || _b === void 0 ? void 0 : _b.data;
 };
 
 /** @hidden */
@@ -4006,8 +3903,7 @@ function convertFromRaw$2(_a) {
 
 const mergePayloadWithLocal = (payload) => {
     var _a, _b, _c;
-    // Cache keys may be local referenceIds even after a server messageId is assigned.
-    const localMessage = (_b = (_a = queryCacheByProperty(['message', 'get'], 'messageId', payload.messageId)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.data;
+    const localMessage = (_b = (_a = queryCache(['message', 'get'])) === null || _a === void 0 ? void 0 : _a.find(({ data }) => data.messageId === payload.messageId)) === null || _b === void 0 ? void 0 : _b.data;
     if (localMessage) {
         return Object.assign(Object.assign(Object.assign({}, localMessage), payload), { 
             // NOTE: referenceId is missing in the some payload event. If we have local message data with referenceId, use it instead.
@@ -5574,9 +5470,9 @@ const channelLinkedObject = (channel) => {
     var _a;
     let previewMembers = [];
     if (['conversation', 'community'].includes(channel.type)) {
-        const channelUsers = queryCacheByProperty(['channelUsers', 'get'], 'channelId', channel.channelId);
+        const channelUsers = queryCache(['channelUsers', 'get']);
         if (channelUsers && (channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.length) > 0) {
-            previewMembers = ((_a = channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.filter(({ data }) => data.membership !== 'none')) !== null && _a !== void 0 ? _a : [])
+            previewMembers = ((_a = channelUsers === null || channelUsers === void 0 ? void 0 : channelUsers.filter(({ data }) => data.channelId === channel.channelId && data.membership !== 'none')) !== null && _a !== void 0 ? _a : [])
                 // sort in ascending order by userInternalId
                 .sort((a, b) => a.data.userInternalId.localeCompare(b.data.userInternalId))
                 // Select only first 4 members