seyfert 4.4.1 → 5.0.0

package/lib/cache/adapters/limited.js

@@ -3,6 +3,17 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LimitedMemoryAdapter = void 0;
 const __1 = require("../..");
 const common_1 = require("../../common");
+const namespaceIndexedResources = new Set([
+    'channel',
+    'emoji',
+    'presence',
+    'role',
+    'stage_instance',
+    'sticker',
+    'overwrite',
+    'message',
+]);
+const scopeDerivedResources = new Set(['ban', 'member', 'voice_state']);
 class LimitedMemoryAdapter {
     isAsync = false;
     storage = new Map();
@@ -30,7 +41,7 @@ class LimitedMemoryAdapter {
         const sq = query.split('.');
         const values = [];
         for (const storageEntry of this.storage.values()) {
-            for (const [key, entry] of storageEntry.entries()) {
+            for (const [key, entry] of storageEntry.rawEntries()) {
                 const keySplit = key.split('.');
                 if (keySplit.length === sq.length &&
                     keySplit.every((segment, i) => (sq[i] === '*' ? !!segment : sq[i] === segment))) {
@@ -63,19 +74,7 @@ class LimitedMemoryAdapter {
         return scopeEnd === -1 ? key.slice(scopeStart) : key.slice(scopeStart, scopeEnd);
     }
     _supportsNamespaceIndex(resource) {
-        switch (resource) {
-            case 'channel':
-            case 'emoji':
-            case 'presence':
-            case 'role':
-            case 'stage_instance':
-            case 'sticker':
-            case 'overwrite':
-            case 'message':
-                return true;
-            default:
-                return false;
-        }
+        return namespaceIndexedResources.has(resource);
     }
     _setIndexedStorage(resource, key, storageEntry) {
         if (!this._supportsNamespaceIndex(resource)) {
@@ -96,14 +95,7 @@ class LimitedMemoryAdapter {
         return this.keyToStorage.get(key);
     }
     _getDerivedNamespace(resource, scope) {
-        switch (resource) {
-            case 'ban':
-            case 'member':
-            case 'voice_state':
-                return scope ? `${resource}.${scope}` : resource;
-            default:
-                return resource;
-        }
+        return scope && scopeDerivedResources.has(resource) ? `${resource}.${scope}` : resource;
     }
     _isResourceNamespace(resource, namespace) {
         return namespace === resource || namespace.startsWith(`${resource}.`);
@@ -266,14 +258,18 @@ class LimitedMemoryAdapter {
         return array;
     }
     keys(to) {
+        const relationship = this._getRelationshipSet(to);
+        if (!relationship) {
+            return [];
+        }
         const result = [];
-        for (const id of this._getRelationshipSet(to)) {
+        for (const id of relationship) {
             result.push(`${to}.${id}`);
         }
         return result;
     }
     count(to) {
-        return this._getRelationshipSet(to).size;
+        return this._getRelationshipSet(to)?.size ?? 0;
     }
     bulkRemove(keys) {
         for (const i of keys) {
@@ -300,7 +296,7 @@ class LimitedMemoryAdapter {
         this.keyToStorage.clear();
     }
     contains(to, keys) {
-        return this._getRelationshipSet(to).has(keys);
+        return this._getRelationshipSet(to)?.has(keys) ?? false;
     }
     _getRelationshipData(to) {
         const [key, subrelationKey = '*'] = to.split('.');
@@ -308,16 +304,24 @@ class LimitedMemoryAdapter {
     }
     _getRelationshipSet(to) {
         const { key, subrelationKey } = this._getRelationshipData(to);
-        if (!this.relationships.has(key))
-            this.relationships.set(key, new Map());
-        const relation = this.relationships.get(key);
-        if (!relation.has(subrelationKey)) {
-            relation.set(subrelationKey, new Set());
+        return this.relationships.get(key)?.get(subrelationKey);
+    }
+    _ensureRelationshipSet(to) {
+        const { key, subrelationKey } = this._getRelationshipData(to);
+        let relation = this.relationships.get(key);
+        if (!relation) {
+            relation = new Map();
+            this.relationships.set(key, relation);
+        }
+        let values = relation.get(subrelationKey);
+        if (!values) {
+            values = new Set();
+            relation.set(subrelationKey, values);
         }
-        return relation.get(subrelationKey);
+        return values;
     }
     getToRelationship(to) {
-        return [...this._getRelationshipSet(to)];
+        return [...(this._getRelationshipSet(to) ?? [])];
     }
     bulkAddToRelationShip(data) {
         for (const i in data) {
@@ -325,16 +329,26 @@ class LimitedMemoryAdapter {
         }
     }
     addToRelationship(to, keys) {
-        const data = this._getRelationshipSet(to);
+        const data = this._ensureRelationshipSet(to);
         for (const key of Array.isArray(keys) ? keys : [keys]) {
             data.add(key);
         }
     }
     removeToRelationship(to, keys) {
         const data = this._getRelationshipSet(to);
+        if (!data) {
+            return;
+        }
         for (const key of Array.isArray(keys) ? keys : [keys]) {
             data.delete(key);
         }
+        if (!data.size) {
+            const { key, subrelationKey } = this._getRelationshipData(to);
+            const relation = this.relationships.get(key);
+            relation?.delete(subrelationKey);
+            if (relation && !relation.size)
+                this.relationships.delete(key);
+        }
     }
     removeRelationship(to) {
         for (const i of Array.isArray(to) ? to : [to]) {

package/lib/cache/index.d.ts

@@ -22,13 +22,24 @@ export type InferAsyncCache = InternalOptions extends {
     asyncCache: infer P;
 } ? P : false;
 export type ReturnCache<T> = If<InferAsyncCache, Promise<T>, T>;
-export type GuildBased = 'members' | 'voiceStates';
-export type GuildRelated = 'emojis' | 'roles' | 'channels' | 'stickers' | 'presences' | 'stageInstances' | 'overwrites' | 'messages' | 'bans';
+export type GuildBased = 'members' | 'voiceStates' | 'bans';
+export type GuildRelated = 'emojis' | 'roles' | 'channels' | 'stickers' | 'presences' | 'stageInstances' | 'overwrites' | 'messages';
 export type NonGuildBased = 'users' | 'guilds';
 export type SeyfertBased = 'onPacket';
 type ReturnManagers = {
     [K in NonGuildBased | GuildBased | GuildRelated]: NonNullable<Awaited<ReturnType<NonNullable<Cache[K]>['get']>>>;
 };
+export type BulkGetKey = readonly [
+    NonGuildBased | GuildRelated,
+    string
+] | readonly [
+    GuildBased,
+    string,
+    string
+];
+type BulkGetResult<K extends BulkGetKey[0] = BulkGetKey[0]> = Partial<{
+    [P in K]: ReturnManagers[P][];
+}>;
 export * from './adapters/index';
 export type CachedEvents = 'READY' | 'GUILD_CREATE' | 'GUILD_UPDATE' | 'GUILD_DELETE' | 'CHANNEL_CREATE' | 'CHANNEL_UPDATE' | 'CHANNEL_DELETE' | 'GUILD_ROLE_CREATE' | 'GUILD_ROLE_UPDATE' | 'GUILD_ROLE_DELETE' | 'GUILD_BAN_ADD' | 'GUILD_BAN_REMOVE' | 'GUILD_EMOJIS_UPDATE' | 'GUILD_STICKERS_UPDATE' | 'GUILD_MEMBER_ADD' | 'GUILD_MEMBER_UPDATE' | 'GUILD_MEMBER_REMOVE' | 'MESSAGE_CREATE' | 'PRESENCE_UPDATE' | 'THREAD_DELETE' | 'THREAD_CREATE' | 'THREAD_UPDATE' | 'USER_UPDATE' | 'VOICE_CHANNEL_STATUS_UPDATE' | 'VOICE_STATE_UPDATE' | 'STAGE_INSTANCE_CREATE' | 'STAGE_INSTANCE_UPDATE' | 'STAGE_INSTANCE_DELETE' | 'GUILD_MEMBERS_CHUNK';
 export type DisabledCache = {
@@ -51,6 +62,9 @@ export declare class Cache {
     messages?: Messages;
     bans?: Bans;
     __logger__?: Logger;
+    private pluginResourceNames;
+    private pluginResourcePacketHandlers;
+    private pluginResourcePacketErrorLogger?;
     constructor(intents: number, adapter: Adapter, disabledCache: DisabledCache, client: UsingClient);
     buildCache(disabledCache: DisabledCache, client: UsingClient): void;
     flush(): ReturnCache<void>;
@@ -61,31 +75,10 @@ export declare class Cache {
     get hasGuildMembersIntent(): boolean;
     get hasGuildExpressionsIntent(): boolean;
     get hasVoiceStatesIntent(): boolean;
-    get hasPrenseceUpdates(): boolean;
+    get hasPresenceUpdates(): boolean;
     get hasDirectMessages(): boolean;
     get hasModerationIntent(): boolean;
-    bulkGet(keys: (readonly [
-        NonGuildBased | GuildRelated,
-        string
-    ] | readonly [
-        GuildBased,
-        string,
-        string
-    ])[]): Promise<Partial<{
-        messages: ReturnManagers['messages'][];
-        users: ReturnManagers['users'][];
-        guilds: ReturnManagers['guilds'][];
-        members: ReturnManagers['members'][];
-        voiceStates: ReturnManagers['voiceStates'][];
-        emojis: ReturnManagers['emojis'][];
-        roles: ReturnManagers['roles'][];
-        channels: ReturnManagers['channels'][];
-        stickers: ReturnManagers['stickers'][];
-        presences: ReturnManagers['presences'][];
-        stageInstances: ReturnManagers['stageInstances'][];
-        overwrites: ReturnManagers['overwrites'][];
-        bans: ReturnManagers['bans'][];
-    }>>;
+    bulkGet<const Keys extends readonly BulkGetKey[]>(keys: Keys): Promise<BulkGetResult<Keys[number][0]>>;
     bulkPatch(keys: (readonly [
         CacheFrom,
         NonGuildBased,
@@ -111,6 +104,7 @@ export declare class Cache {
         string
     ])[]): Promise<void>;
     onPacket(event: GatewayDispatchPayload): Promise<void>;
+    private onPacketWithPluginResources;
     protected onPacketDefault(event: GatewayDispatchPayload): Promise<void>;
     testAdapter(): Promise<void>;
     private testUsersAndMembers;

package/lib/cache/index.js

@@ -57,12 +57,23 @@ class Cache {
     messages;
     bans;
     __logger__;
+    pluginResourceNames = new Set();
+    pluginResourcePacketHandlers = [];
+    pluginResourcePacketErrorLogger;
     constructor(intents, adapter, disabledCache, client) {
         this.intents = intents;
         this.adapter = adapter;
         this.buildCache(disabledCache, client);
     }
     buildCache(disabledCache, client) {
+        for (const name of this.pluginResourceNames) {
+            delete this[name];
+        }
+        this.pluginResourceNames.clear();
+        this.pluginResourcePacketHandlers = [];
+        this.pluginResourcePacketErrorLogger = client.logger
+            ? (plugin, error) => client.logger.error(`[plugin:${plugin}] cache.resource.onPacket failed`, error)
+            : undefined;
         // non-guild based
         this.users = disabledCache.users ? undefined : new users_1.Users(this, client);
         this.guilds = disabledCache.guilds ? undefined : new guilds_1.Guilds(this, client);
@@ -83,7 +94,21 @@ class Cache {
             ? (() => {
                 //
             })
-            : this.onPacketDefault.bind(this);
+            : this.onPacketWithPluginResources.bind(this);
+        const pluginResources = [
+            ...(client.pluginRegistry
+                ?.cacheResources ?? []),
+        ].sort((left, right) => left.sequence - right.sequence);
+        for (const contribution of pluginResources) {
+            this[contribution.name] = new contribution.resource(this, client);
+            this.pluginResourceNames.add(contribution.name);
+            if (contribution.onPacket) {
+                this.pluginResourcePacketHandlers.push({
+                    handler: contribution.onPacket,
+                    plugin: contribution.record?.identity ?? contribution.name,
+                });
+            }
+        }
     }
     flush() {
         return this.adapter.flush();
@@ -110,7 +135,7 @@ class Cache {
     get hasVoiceStatesIntent() {
         return this.hasIntent('GuildVoiceStates');
     }
-    get hasPrenseceUpdates() {
+    get hasPresenceUpdates() {
         return this.hasIntent('GuildPresences');
     }
     get hasDirectMessages() {
@@ -123,6 +148,8 @@ class Cache {
         const allData = {};
         for (const [type, id, guildId] of keys) {
             switch (type) {
+                case 'messages':
+                case 'bans':
                 case 'voiceStates':
                 case 'members':
                     {
@@ -141,8 +168,6 @@ class Cache {
                 case 'users':
                 case 'guilds':
                 case 'overwrites':
-                case 'bans':
-                case 'messages':
                     {
                         if (!allData[type]) {
                             allData[type] = [];
@@ -181,7 +206,6 @@ class Cache {
                 case 'stageInstances':
                 case 'emojis':
                 case 'overwrites':
-                case 'bans':
                 case 'messages':
                     {
                         if (!this[type]?.filter(data, id, guildId, from))
@@ -197,9 +221,18 @@ class Cache {
                         if (type !== 'overwrites' && type !== 'messages') {
                             data.guild_id = guildId;
                         }
+                        if (type === 'messages' && data?.author?.id && this.users?.filter(data.author, data.author.id, from)) {
+                            const userHashId = this.users.namespace;
+                            if (!(userHashId in relationshipsData)) {
+                                relationshipsData[userHashId] = [];
+                            }
+                            relationshipsData[userHashId].push(data.author.id);
+                            allData.push([this.users.hashId(data.author.id), data.author]);
+                        }
                         allData.push([this[type].hashId(id), this[type].parse(data, id, guildId)]);
                     }
                     break;
+                case 'bans':
                 case 'voiceStates':
                 case 'members':
                     {
@@ -267,6 +300,14 @@ class Cache {
                         if (type !== 'overwrites' && type !== 'messages') {
                             data.guild_id = guildId;
                         }
+                        if (type === 'messages' && data?.author?.id && this.users?.filter(data.author, data.author.id, from)) {
+                            const userHashId = this.users.namespace;
+                            if (!(userHashId in relationshipsData)) {
+                                relationshipsData[userHashId] = [];
+                            }
+                            relationshipsData[userHashId].push(data.author.id);
+                            allData.push([this.users.hashId(data.author.id), data.author]);
+                        }
                         allData.push([this[type].hashId(id), this[type].parse(data, id, guildId)]);
                     }
                     break;
@@ -312,7 +353,18 @@ class Cache {
         await this.adapter.bulkSet(allData);
     }
     onPacket(event) {
-        return this.onPacketDefault(event);
+        return this.onPacketWithPluginResources(event);
+    }
+    async onPacketWithPluginResources(event) {
+        await this.onPacketDefault(event);
+        for (const contribution of this.pluginResourcePacketHandlers) {
+            try {
+                await contribution.handler(event, this);
+            }
+            catch (error) {
+                this.pluginResourcePacketErrorLogger?.(contribution.plugin, error);
+            }
+        }
     }
     async onPacketDefault(event) {
         switch (event.t) {

package/lib/cache/resources/bans.d.ts

@@ -10,6 +10,6 @@ export declare class Bans extends GuildBasedResource<any, GatewayGuildBanModifyD
     raw(id: string, guild: string): ReturnCache<Omit<GatewayGuildBanModifyDispatchData | APIBan, 'user'> | undefined>;
     bulk(ids: string[], guild: string): ReturnCache<GuildBanStructure[]>;
     bulkRaw(ids: string[], guild: string): ReturnCache<Omit<GatewayGuildBanModifyDispatchData | APIBan, 'user'>[]>;
-    values(guild: string): ReturnCache<GuildBanStructure[]>;
+    values(guild: '*' | (string & {})): ReturnCache<GuildBanStructure[]>;
     valuesRaw(guild: string): ReturnCache<Omit<GatewayGuildBanModifyDispatchData | APIBan, 'user'>[]>;
 }

package/lib/cache/resources/bans.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Bans = void 0;
 const transformers_1 = require("../../client/transformers");
-const common_1 = require("../../common");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const guild_based_1 = require("./default/guild-based");
 class Bans extends guild_based_1.GuildBasedResource {
     namespace = 'ban';
@@ -15,13 +15,13 @@ class Bans extends guild_based_1.GuildBasedResource {
         return rest;
     }
     get(id, guild) {
-        return (0, common_1.fakePromise)(super.get(id, guild)).then(rawBan => rawBan ? transformers_1.Transformers.GuildBan(this.client, rawBan, guild) : undefined);
+        return (0, fake_promise_1.fakePromise)(super.get(id, guild)).then(rawBan => rawBan ? transformers_1.Transformers.GuildBan(this.client, rawBan, guild) : undefined);
     }
     raw(id, guild) {
         return super.get(id, guild);
     }
     bulk(ids, guild) {
-        return (0, common_1.fakePromise)(super.bulk(ids, guild)).then(bans => bans
+        return (0, fake_promise_1.fakePromise)(super.bulk(ids, guild)).then(bans => bans
             .map(rawBan => {
             return rawBan ? transformers_1.Transformers.GuildBan(this.client, rawBan, guild) : undefined;
         })
@@ -31,7 +31,7 @@ class Bans extends guild_based_1.GuildBasedResource {
         return super.bulk(ids, guild);
     }
     values(guild) {
-        return (0, common_1.fakePromise)(super.values(guild)).then(bans => bans
+        return (0, fake_promise_1.fakePromise)(super.values(guild)).then(bans => bans
             .map(rawBan => {
             return rawBan ? transformers_1.Transformers.GuildBan(this.client, rawBan, guild) : undefined;
         })

package/lib/cache/resources/channels.d.ts

@@ -10,6 +10,6 @@ export declare class Channels extends GuildRelatedResource<any, APIChannel> {
     raw(id: string): ReturnCache<Omit<APIChannel, 'permission_overwrites'> | undefined>;
     bulk(ids: string[]): ReturnCache<ReturnType<typeof channelFrom>[]>;
     bulkRaw(ids: string[]): ReturnCache<Omit<APIChannel, 'permission_overwrites'>[]>;
-    values(guild: string): ReturnCache<ReturnType<typeof channelFrom>[]>;
+    values(guild: '*' | (string & {})): ReturnCache<ReturnType<typeof channelFrom>[]>;
     valuesRaw(guild: string): ReturnCache<Omit<APIChannel, 'permission_overwrites'>[]>;
 }

package/lib/cache/resources/channels.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Channels = void 0;
-const common_1 = require("../../common");
+const fake_promise_1 = require("../../common/it/fake-promise");
 const structures_1 = require("../../structures");
 const guild_related_1 = require("./default/guild-related");
 class Channels extends guild_related_1.GuildRelatedResource {
@@ -15,19 +15,19 @@ class Channels extends guild_related_1.GuildRelatedResource {
         return rest;
     }
     get(id) {
-        return (0, common_1.fakePromise)(super.get(id)).then(rawChannel => rawChannel ? (0, structures_1.channelFrom)(rawChannel, this.client) : undefined);
+        return (0, fake_promise_1.fakePromise)(super.get(id)).then(rawChannel => rawChannel ? (0, structures_1.channelFrom)(rawChannel, this.client) : undefined);
     }
     raw(id) {
         return super.get(id);
     }
     bulk(ids) {
-        return (0, common_1.fakePromise)(super.bulk(ids)).then(channels => channels.map(rawChannel => (0, structures_1.channelFrom)(rawChannel, this.client)));
+        return (0, fake_promise_1.fakePromise)(super.bulk(ids)).then(channels => channels.map(rawChannel => (0, structures_1.channelFrom)(rawChannel, this.client)));
     }
     bulkRaw(ids) {
         return super.bulk(ids);
     }
     values(guild) {
-        return (0, common_1.fakePromise)(super.values(guild)).then(channels => channels.map(rawChannel => (0, structures_1.channelFrom)(rawChannel, this.client)));
+        return (0, fake_promise_1.fakePromise)(super.values(guild)).then(channels => channels.map(rawChannel => (0, structures_1.channelFrom)(rawChannel, this.client)));
     }
     valuesRaw(guild) {
         return super.values(guild);

package/lib/cache/resources/default/base.d.ts

@@ -7,7 +7,7 @@ export declare class BaseResource<T = any, S = any> {
     namespace: string;
     constructor(cache: Cache, client: UsingClient);
     filter(data: any, id: string, from: CacheFrom): boolean;
-    get adapter(): import("../../index").Adapter;
+    get adapter(): import("../../..").Adapter;
     removeIfNI(intent: keyof typeof GatewayIntentBits, id: string): import("../../../common").Awaitable<void>;
     setIfNI(from: CacheFrom, intent: keyof typeof GatewayIntentBits, id: string, data: S): import("../../../common").Awaitable<void>;
     get(id: string): ReturnCache<T | undefined>;

package/lib/cache/resources/default/base.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseResource = void 0;
-const common_1 = require("../../../common");
+const fake_promise_1 = require("../../../common/it/fake-promise");
 class BaseResource {
     cache;
     client;
@@ -29,23 +29,23 @@ class BaseResource {
         }
     }
     get(id) {
-        return this.adapter.get(this.hashId(id));
+        return (0, fake_promise_1.fakePromise)(this.adapter.get(this.hashId(id))).then(data => data ?? undefined);
     }
     bulk(ids) {
-        return (0, common_1.fakePromise)(this.adapter.bulkGet(ids.map(id => this.hashId(id)))).then(x => x.filter(y => y));
+        return (0, fake_promise_1.fakePromise)(this.adapter.bulkGet(ids.map(id => this.hashId(id)))).then(x => x.filter(y => y));
     }
     set(from, id, data) {
         if (!this.filter(data, id, from))
             return;
-        return (0, common_1.fakePromise)(this.addToRelationship(id)).then(() => this.adapter.set(this.hashId(id), data));
+        return (0, fake_promise_1.fakePromise)(this.addToRelationship(id)).then(() => this.adapter.set(this.hashId(id), data));
     }
     patch(from, id, data) {
         if (!this.filter(data, id, from))
             return;
-        return (0, common_1.fakePromise)(this.addToRelationship(id)).then(() => this.adapter.patch(this.hashId(id), data));
+        return (0, fake_promise_1.fakePromise)(this.addToRelationship(id)).then(() => this.adapter.patch(this.hashId(id), data));
     }
     remove(id) {
-        return (0, common_1.fakePromise)(this.removeToRelationship(id)).then(() => this.adapter.remove(this.hashId(id)));
+        return (0, fake_promise_1.fakePromise)(this.removeToRelationship(id)).then(() => this.adapter.remove(this.hashId(id)));
     }
     keys() {
         return this.adapter.keys(this.namespace);
@@ -69,8 +69,8 @@ class BaseResource {
         return this.adapter.removeToRelationship(this.namespace, id);
     }
     flush() {
-        return (0, common_1.fakePromise)(this.adapter.keys(this.namespace)).then(keys => {
-            return (0, common_1.fakePromise)(this.adapter.bulkRemove(keys)).then(() => {
+        return (0, fake_promise_1.fakePromise)(this.adapter.keys(this.namespace)).then(keys => {
+            return (0, fake_promise_1.fakePromise)(this.adapter.bulkRemove(keys)).then(() => {
                 return this.adapter.removeRelationship(this.namespace);
             });
         });

package/lib/cache/resources/default/guild-based.d.ts

@@ -8,7 +8,7 @@ export declare class GuildBasedResource<T = any, S = any> {
     constructor(cache: Cache, client: UsingClient);
     filter(data: any, id: string, guild_id: string, from: CacheFrom): boolean;
     parse(data: any, id: string, guild_id: string): any;
-    get adapter(): import("../../index").Adapter;
+    get adapter(): import("../../..").Adapter;
     removeIfNI(intent: keyof typeof GatewayIntentBits, id: string | string[], guildId: string): import("../../../common").Awaitable<void>;
     setIfNI(from: CacheFrom, intent: keyof typeof GatewayIntentBits, id: string, guildId: string, data: S): void;
     get(id: string, guild: string): ReturnCache<(T & {
@@ -22,11 +22,11 @@ export declare class GuildBasedResource<T = any, S = any> {
     patch(from: CacheFrom, __keys: string, guild: string, data: S): ReturnCache<void>;
     patch(from: CacheFrom, __keys: [string, any][], guild: string): ReturnCache<void>;
     remove(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
-    keys(guild: string): ReturnCache<string[]>;
-    values(guild: string): ReturnCache<(T & {
+    keys(guild: '*' | (string & {})): ReturnCache<string[]>;
+    values(guild: '*' | (string & {})): ReturnCache<(T & {
         guild_id: string;
     })[]>;
-    count(guild: string): ReturnCache<number>;
+    count(guild: '*' | (string & {})): ReturnCache<number>;
     contains(id: string, guild: string): ReturnCache<boolean>;
     getToRelationship(guild: string): import("../../../common").Awaitable<string[]>;
     addToRelationship(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
@@ -34,5 +34,5 @@ export declare class GuildBasedResource<T = any, S = any> {
     removeRelationship(id: string | string[]): import("../../../common").Awaitable<void>;
     hashId(id: string): string;
     hashGuildId(guild: string, id: string): string;
-    flush(guild?: '*' | (string & {})): unknown[] | Promise<unknown[]>;
+    flush(guild: '*' | (string & {})): unknown[] | Promise<unknown[]>;
 }

package/lib/cache/resources/default/guild-based.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GuildBasedResource = void 0;
-const common_1 = require("../../../common");
+const fake_promise_1 = require("../../../common/it/fake-promise");
 class GuildBasedResource {
     cache;
     client;
@@ -38,37 +38,50 @@ class GuildBasedResource {
         return this.adapter.get(this.hashGuildId(guild, id));
     }
     bulk(ids, guild) {
-        return (0, common_1.fakePromise)(this.adapter.bulkGet(ids.map(id => this.hashGuildId(guild, id)))).then(x => x.filter(y => y));
+        return (0, fake_promise_1.fakePromise)(this.adapter.bulkGet(ids.map(id => this.hashGuildId(guild, id)))).then(x => x.filter(y => y));
     }
     set(from, __keys, guild, data) {
         const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild, from));
         if (!keys.length)
-            return (0, common_1.fakePromise)(undefined).then(() => { });
-        return (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkSet(keys.map(([key, value]) => {
+            return (0, fake_promise_1.fakePromise)(undefined).then(() => { });
+        return (0, fake_promise_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkSet(keys.map(([key, value]) => {
             return [this.hashGuildId(guild, key), this.parse(value, key, guild)];
         })));
     }
     patch(from, __keys, guild, data) {
         const keys = (Array.isArray(__keys) ? __keys : [[__keys, data]]).filter(x => this.filter(x[1], x[0], guild, from));
         if (!keys.length)
-            return (0, common_1.fakePromise)(undefined).then(() => { });
-        return (0, common_1.fakePromise)(this.adapter.bulkGet(keys.map(([key]) => this.hashGuildId(guild, key)))).then(oldDatas => (0, common_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkSet(keys.map(([key, value]) => {
-            const oldData = oldDatas.find(x => x.id === key) ?? {};
-            return [this.hashGuildId(guild, key), this.parse({ ...oldData, ...value }, key, guild)];
-        }))));
+            return (0, fake_promise_1.fakePromise)(undefined).then(() => { });
+        return (0, fake_promise_1.fakePromise)(this.adapter.bulkGet(keys.map(([key]) => this.hashGuildId(guild, key)))).then(oldDatas => {
+            const oldDataMap = new Map();
+            for (const item of oldDatas) {
+                if (item?.id)
+                    oldDataMap.set(item.id, item);
+            }
+            return (0, fake_promise_1.fakePromise)(this.addToRelationship(keys.map(x => x[0]), guild)).then(() => this.adapter.bulkSet(keys.map(([key, value]) => {
+                const oldData = oldDataMap.get(key) ?? {};
+                return [this.hashGuildId(guild, key), this.parse({ ...oldData, ...value }, key, guild)];
+            })));
+        });
     }
     remove(id, guild) {
         const ids = Array.isArray(id) ? id : [id];
-        return (0, common_1.fakePromise)(this.removeToRelationship(ids, guild)).then(() => this.adapter.bulkRemove(ids.map(x => this.hashGuildId(guild, x))));
+        return (0, fake_promise_1.fakePromise)(this.removeToRelationship(ids, guild)).then(() => this.adapter.bulkRemove(ids.map(x => this.hashGuildId(guild, x))));
     }
     keys(guild) {
-        return this.adapter.scan(this.hashGuildId(guild, '*'), true);
+        if (guild === '*')
+            return this.adapter.scan(this.hashGuildId(guild, '*'), true);
+        return (0, fake_promise_1.fakePromise)(this.adapter.getToRelationship(this.hashId(guild))).then(keys => keys.map(x => this.hashGuildId(guild, x)));
     }
     values(guild) {
-        return this.adapter.scan(this.hashGuildId(guild, '*'));
+        if (guild === '*')
+            return this.adapter.scan(this.hashGuildId(guild, '*'));
+        return (0, fake_promise_1.fakePromise)(this.adapter.getToRelationship(this.hashId(guild))).then(keys => this.adapter.bulkGet(keys.map(x => this.hashGuildId(guild, x))));
     }
     count(guild) {
-        return (0, common_1.fakePromise)(this.adapter.scan(this.hashGuildId(guild, '*'), true)).then(data => data.length);
+        if (guild === '*')
+            return (0, fake_promise_1.fakePromise)(this.adapter.scan(this.hashGuildId(guild, '*'), true)).then(data => data.length);
+        return this.adapter.count(this.hashId(guild));
     }
     contains(id, guild) {
         return this.adapter.contains(this.hashId(guild), id);
@@ -91,9 +104,9 @@ class GuildBasedResource {
     hashGuildId(guild, id) {
         return id.startsWith(this.namespace) ? id : `${this.namespace}.${guild}.${id}`;
     }
-    flush(guild = '*') {
-        return (0, common_1.fakePromise)(this.keys(guild)).then(keys => {
-            return (0, common_1.fakePromise)(this.adapter.bulkRemove(keys)).then(() => {
+    flush(guild) {
+        return (0, fake_promise_1.fakePromise)(this.keys(guild)).then(keys => {
+            return (0, fake_promise_1.fakePromise)(this.adapter.bulkRemove(keys)).then(() => {
                 const maybePromises = [];
                 for (const i of keys) {
                     const guildId = i.split('.').at(-2);

package/lib/cache/resources/default/guild-related.d.ts

@@ -8,7 +8,7 @@ export declare class GuildRelatedResource<T = any, S = any> {
     constructor(cache: Cache, client: UsingClient);
     filter(data: any, id: string, guild_id: string, from: CacheFrom): boolean;
     parse(data: any, id: string, guild_id: string): any;
-    get adapter(): import("../../index").Adapter;
+    get adapter(): import("../../..").Adapter;
     removeIfNI(intent: keyof typeof GatewayIntentBits, id: string | string[], guildId: string): import("../../../common").Awaitable<void>;
     setIfNI(from: CacheFrom, intent: keyof typeof GatewayIntentBits, id: string, guildId: string, data: S): void;
     get(id: string): ReturnCache<(T & {
@@ -22,16 +22,16 @@ export declare class GuildRelatedResource<T = any, S = any> {
     patch(from: CacheFrom, __keys: string, guild: string, data?: any): ReturnCache<void>;
     patch(from: CacheFrom, __keys: [string, any][], guild: string): ReturnCache<void>;
     remove(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
-    keys(guild: string): ReturnCache<string[]>;
-    values(guild: string): ReturnCache<(T & {
+    keys(guild: '*' | (string & {})): ReturnCache<string[]>;
+    values(guild: '*' | (string & {})): ReturnCache<(T & {
         guild_id: string;
     })[]>;
-    count(to: string): ReturnCache<number>;
+    count(to: '*' | (string & {})): ReturnCache<number>;
     contains(id: string, guild: string): ReturnCache<boolean>;
     getToRelationship(guild: string): import("../../../common").Awaitable<string[]>;
     addToRelationship(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
     removeToRelationship(id: string | string[], guild: string): import("../../../common").Awaitable<void>;
     removeRelationship(id: string | string[]): import("../../../common").Awaitable<void>;
     hashId(id: string): string;
-    flush(guild: string): import("../../../common").Awaitable<void>;
+    flush(guild?: '*' | (string & {})): import("../../../common").Awaitable<void>;
 }