Add ClientStorage mixin

src/index.ts

@@ -16,7 +16,9 @@ export { RateLimit } from './lib/command/RateLimit';
 export { StorageProvider } from './lib/storage/StorageProvider';
 export { JSONProvider } from './lib/storage/JSONProvider';
 export { GuildSettings } from './lib/storage/GuildSettings';
-export { guildStorageMixin } from './lib/storage/GuildStorageMixin';
+export { createGuildStorageMixin } from './lib/storage/mixin/GuildStorageMixin';
+export { applyClientStorageMixin } from './lib/storage/mixin/ClientStorageMixin';
+export { ClientStorage } from './lib/types/ClientStorage';
 
 import * as CommandDecorators from './lib/command/CommandDecorators';
 export { CommandDecorators }

src/lib/storage/mixin/ClientStorageMixin.ts

@@ -0,0 +1,9 @@
+import { Collection } from 'discord.js';
+import { StorageProvider } from '../StorageProvider';
+import { ClientStorage } from '../../types/ClientStorage';
+import { GuildStorage } from '../../types/GuildStorage';
+
+export function applyClientStorageMixin(storage: StorageProvider): void
+{
+	(<ClientStorage> storage).guilds = new Collection<string, GuildStorage>();
+}

src/lib/storage/mixin/GuildStorageMixin.ts

@@ -0,0 +1,14 @@
+import { Guild } from 'discord.js';
+import { GuildSettings } from '../GuildSettings';
+import { GuildStorage } from '../../types/GuildStorage';
+import { StorageProvider } from '../StorageProvider';
+import { Bot } from '../../bot/Bot';
+
+export async function createGuildStorageMixin(storage: StorageProvider, settings: StorageProvider, guild: Guild, client: Bot): Promise<GuildStorage>
+{
+	const newStorage: GuildSettings = new GuildSettings(storage, guild, client);
+	(<GuildStorage> newStorage).settings = new GuildSettings(settings, guild, client);
+	await newStorage.init();
+	await (<GuildStorage> newStorage).settings.init();
+	return <GuildStorage> newStorage;
+}

src/lib/types/ClientStorage.ts

@@ -0,0 +1,5 @@
+import { Collection } from 'discord.js';
+import { StorageProvider } from '../storage/StorageProvider';
+import { GuildStorage } from './GuildStorage';
+
+export type ClientStorage = StorageProvider & { guilds: Collection<string, GuildStorage>; };