dfx 0.18.2 → 0.20.0

package/Cache/index.d.ts

@@ -1,5 +1,5 @@
-import { Effect } from "@effect/io/Effect";
 import { EffectSource } from "callbag-effect-ts/Source";
+import { Effect } from "@effect/io/Effect";
 import { CacheDriver, ParentCacheDriver } from "./driver.js";
 export * from "./driver.js";
 export { create as memoryDriver, createWithParent as memoryParentDriver, } from "./memory.js";
@@ -34,14 +34,14 @@ export type CacheOp<T> = {
     op: "delete";
     resourceId: string;
 };
-export declare const makeParent: <RMakeDriver, RPMiss, EOps, EMakeDriver, EDriver, EMiss, EPMiss, A>({ driver: makeDriver, ops, onMiss, onParentMiss, }: {
-    driver: import("../global.js").Effect<RMakeDriver, EMakeDriver, ParentCacheDriver<EDriver, A>>;
+export declare const makeWithParent: <EOps, EDriver, EMiss, EPMiss, A>({ driver, ops, onMiss, onParentMiss, }: {
+    driver: ParentCacheDriver<EDriver, A>;
     ops?: import("callbag-effect-ts/Source").EffectSource<never, EOps, ParentCacheOp<A>> | undefined;
     onMiss: (parentId: string, id: string) => import("../global.js").Effect<never, EMiss, A>;
-    onParentMiss: (parentId: string) => import("../global.js").Effect<RPMiss, EPMiss, [id: string, resource: A][]>;
-}) => import("../global.js").Effect<RMakeDriver, EMakeDriver, {
+    onParentMiss: (parentId: string) => import("../global.js").Effect<never, EPMiss, [id: string, resource: A][]>;
+}) => {
     get: (parentId: string, id: string) => import("../global.js").Effect<never, EDriver | EMiss, A>;
-    getForParent: (parentId: string) => import("../global.js").Effect<RPMiss, EDriver | EPMiss, ReadonlyMap<string, A>>;
+    getForParent: (parentId: string) => import("../global.js").Effect<never, EDriver | EPMiss, ReadonlyMap<string, A>>;
     run: import("../global.js").Effect<never, EOps | EDriver, void>;
     size: import("../global.js").Effect<never, EDriver, number>;
     sizeForParent: (parentId: string) => import("../global.js").Effect<never, EDriver, number>;
@@ -49,19 +49,19 @@ export declare const makeParent: <RMakeDriver, RPMiss, EOps, EMakeDriver, EDrive
     delete: (parentId: string, resourceId: string) => import("../global.js").Effect<never, EDriver, void>;
     parentDelete: (parentId: string) => import("../global.js").Effect<never, EDriver, void>;
     refreshTTL: (parentId: string, resourceId: string) => import("../global.js").Effect<never, EDriver, void>;
-}>;
-export declare const make: <RMakeDriver, EOps, EMakeDriver, EDriver, EMiss, A>({ driver: makeDriver, ops, onMiss, }: {
-    driver: import("../global.js").Effect<RMakeDriver, EMakeDriver, CacheDriver<EDriver, A>>;
+};
+export declare const make: <EOps, EDriver, EMiss, A>({ driver, ops, onMiss, }: {
+    driver: CacheDriver<EDriver, A>;
     ops?: import("callbag-effect-ts/Source").EffectSource<never, EOps, CacheOp<A>> | undefined;
     onMiss: (id: string) => import("../global.js").Effect<never, EMiss, A>;
-}) => import("../global.js").Effect<RMakeDriver, EMakeDriver, {
+}) => {
     get: (id: string) => import("../global.js").Effect<never, EDriver | EMiss, A>;
     run: import("../global.js").Effect<never, EOps | EDriver, void>;
     size: import("../global.js").Effect<never, EDriver, number>;
     set: (resourceId: string, resource: A) => import("../global.js").Effect<never, EDriver, void>;
     delete: (resourceId: string) => import("../global.js").Effect<never, EDriver, void>;
     refreshTTL: (resourceId: string) => import("../global.js").Effect<never, EDriver, void>;
-}>;
+};
 export declare class CacheMissError {
     readonly cacheName: string;
     readonly id: string;

package/Cache/index.js

@@ -1,12 +1,12 @@
 import * as tsplus_module_1 from "callbag-effect-ts/Source/empty";
-import * as tsplus_module_2 from "@effect/io/Effect";
-import * as tsplus_module_3 from "callbag-effect-ts/Source/tap";
-import * as tsplus_module_4 from "callbag-effect-ts/Source/run";
+import * as tsplus_module_2 from "callbag-effect-ts/Source/tap";
+import * as tsplus_module_3 from "callbag-effect-ts/Source/run";
+import * as tsplus_module_4 from "@effect/io/Effect";
 export * from "./driver.js";
 export { create as memoryDriver, createWithParent as memoryParentDriver, } from "./memory.js";
 export { create as memoryTTLDriver, createWithParent as memoryTTLParentDriver, } from "./memoryTTL.js";
-export const makeParent = ({ driver: makeDriver, ops = tsplus_module_1.empty, onMiss, onParentMiss, }) => tsplus_module_2.map(driver => {
-    const sync = tsplus_module_4.runDrain(tsplus_module_3.tap((op) => {
+export const makeWithParent = ({ driver, ops = tsplus_module_1.empty, onMiss, onParentMiss, }) => {
+    const sync = tsplus_module_3.runDrain(tsplus_module_2.tap((op) => {
         switch (op.op) {
             case "create":
             case "update":
@@ -19,14 +19,14 @@ export const makeParent = ({ driver: makeDriver, ops = tsplus_module_1.empty, on
     })(ops));
     return {
         ...driver,
-        get: (parentId, id) => tsplus_module_2.someOrElseEffect(() => tsplus_module_2.tap((a) => driver.set(parentId, id, a))(onMiss(parentId, id)))(driver
+        get: (parentId, id) => tsplus_module_4.someOrElseEffect(() => tsplus_module_4.tap((a) => driver.set(parentId, id, a))(onMiss(parentId, id)))(driver
             .get(parentId, id)),
-        getForParent: (parentId) => tsplus_module_2.someOrElseEffect(() => tsplus_module_2.map((entries) => new Map(entries))(tsplus_module_2.tap((entries) => tsplus_module_2.collectAllPar(entries.map(([id, a]) => driver.set(parentId, id, a))))(onParentMiss(parentId))))(driver.getForParent(parentId)),
-        run: tsplus_module_2.asUnit(tsplus_module_2.zipPar(driver.run)(sync)),
+        getForParent: (parentId) => tsplus_module_4.someOrElseEffect(() => tsplus_module_4.map((entries) => new Map(entries))(tsplus_module_4.tap((entries) => tsplus_module_4.collectAllPar(entries.map(([id, a]) => driver.set(parentId, id, a))))(onParentMiss(parentId))))(driver.getForParent(parentId)),
+        run: tsplus_module_4.asUnit(tsplus_module_4.zipPar(driver.run)(sync)),
     };
-})(makeDriver);
-export const make = ({ driver: makeDriver, ops = tsplus_module_1.empty, onMiss, }) => tsplus_module_2.map(driver => {
-    const sync = tsplus_module_4.runDrain(tsplus_module_3.tap((op) => {
+};
+export const make = ({ driver, ops = tsplus_module_1.empty, onMiss, }) => {
+    const sync = tsplus_module_3.runDrain(tsplus_module_2.tap((op) => {
         switch (op.op) {
             case "create":
             case "update":
@@ -37,11 +37,11 @@ export const make = ({ driver: makeDriver, ops = tsplus_module_1.empty, onMiss,
     })(ops));
     return {
         ...driver,
-        get: (id) => tsplus_module_2.someOrElseEffect(() => tsplus_module_2.tap((a) => driver.set(id, a))(onMiss(id)))(driver
+        get: (id) => tsplus_module_4.someOrElseEffect(() => tsplus_module_4.tap((a) => driver.set(id, a))(onMiss(id)))(driver
             .get(id)),
-        run: tsplus_module_2.asUnit(tsplus_module_2.zipPar(driver.run)(sync)),
+        run: tsplus_module_4.asUnit(tsplus_module_4.zipPar(driver.run)(sync)),
     };
-})(makeDriver);
+};
 export class CacheMissError {
     cacheName;
     id;

package/Cache/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Cache/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Cache/index.ts"],"names":[],"mappings":"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"}

package/Cache/prelude.d.ts

@@ -1,17 +1,34 @@
+import { EffectSource } from "callbag-effect-ts/Source";
 import { Discord } from "dfx";
 import { Effect } from "@effect/io/Effect";
-import { Cache } from "dfx";
-export declare const guilds: <RM, EM, E>(driver: Effect<RM, EM, Cache.CacheDriver<E, import("../types.js").Guild>>) => Effect<import("dfx").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway, never, Effect<RM, EM, {
-    get: (id: string) => Effect<never, import("../Http/index.js").FetchError | import("../Http/index.js").StatusCodeError | import("../Http/index.js").JsonParseError | E, import("../types.js").Guild>;
+import { ParentCacheOp, CacheOp, CacheDriver, ParentCacheDriver, CacheMissError } from "./index.js";
+export interface OptsWithParentOptions<E, A> {
+    id: (a: A) => string;
+    fromParent: EffectSource<never, E, [parentId: string, resources: A[]]>;
+    create: EffectSource<never, E, [parentId: string, resource: A]>;
+    update: EffectSource<never, E, [parentId: string, resource: A]>;
+    remove: EffectSource<never, E, [parentId: string, id: string]>;
+    parentRemove: EffectSource<never, E, string>;
+}
+export declare const opsWithParent: <E, T>({ id, fromParent, create, update, remove, parentRemove, }: OptsWithParentOptions<E, T>) => import("callbag-effect-ts/Source").EffectSource<never, E, ParentCacheOp<T>>;
+export interface OpsOptions<E, A> {
+    id: (a: A) => string;
+    create: EffectSource<never, E, A>;
+    update: EffectSource<never, E, A>;
+    remove: EffectSource<never, E, string>;
+}
+export declare const ops: <E, T>({ id, create, update, remove }: OpsOptions<E, T>) => import("callbag-effect-ts/Source").EffectSource<never, E, CacheOp<T>>;
+export declare const guilds: <RM, EM, E>(makeDriver: Effect<RM, EM, CacheDriver<E, import("../types.js").Guild>>) => Effect<import("../index.js").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway | RM, EM, {
+    get: (id: string) => Effect<never, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError | E, import("../types.js").Guild>;
     run: Effect<never, E, void>;
     size: Effect<never, E, number>;
     set: (resourceId: string, resource: import("../types.js").Guild) => Effect<never, E, void>;
     delete: (resourceId: string) => Effect<never, E, void>;
     refreshTTL: (resourceId: string) => Effect<never, E, void>;
-}>>;
-export declare const channels: <RM, EM, E>(driver: Effect<RM, EM, Cache.ParentCacheDriver<E, import("../types.js").Channel>>) => Effect<import("dfx").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway, never, Effect<RM, EM, {
-    get: (parentId: string, id: string) => Effect<never, import("../Http/index.js").FetchError | import("../Http/index.js").StatusCodeError | import("../Http/index.js").JsonParseError | E, import("../types.js").Channel>;
-    getForParent: (parentId: string) => Effect<never, import("../Http/index.js").FetchError | import("../Http/index.js").StatusCodeError | import("../Http/index.js").JsonParseError | E, ReadonlyMap<string, import("../types.js").Channel>>;
+}>;
+export declare const channels: <RM, EM, E>(makeDriver: Effect<RM, EM, ParentCacheDriver<E, import("../types.js").Channel>>) => Effect<import("../index.js").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway | RM, EM, {
+    get: (parentId: string, id: string) => Effect<never, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError | E, import("../types.js").Channel>;
+    getForParent: (parentId: string) => Effect<never, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError | E, ReadonlyMap<string, import("../types.js").Channel>>;
     run: Effect<never, E, void>;
     size: Effect<never, E, number>;
     sizeForParent: (parentId: string) => Effect<never, E, number>;
@@ -19,10 +36,10 @@ export declare const channels: <RM, EM, E>(driver: Effect<RM, EM, Cache.ParentCa
     delete: (parentId: string, resourceId: string) => Effect<never, E, void>;
     parentDelete: (parentId: string) => Effect<never, E, void>;
     refreshTTL: (parentId: string, resourceId: string) => Effect<never, E, void>;
-}>>;
-export declare const roles: <RM, EM, E>(driver: Effect<RM, EM, Cache.ParentCacheDriver<E, import("../types.js").Role>>) => Effect<import("dfx").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway, never, Effect<RM, EM, {
-    get: (parentId: string, id: string) => Effect<never, Cache.CacheMissError | E, import("../types.js").Role>;
-    getForParent: (parentId: string) => Effect<never, import("../Http/index.js").FetchError | import("../Http/index.js").StatusCodeError | import("../Http/index.js").JsonParseError | E, ReadonlyMap<string, import("../types.js").Role>>;
+}>;
+export declare const roles: <RM, EM, E>(makeDriver: Effect<RM, EM, ParentCacheDriver<E, import("../types.js").Role>>) => Effect<import("../index.js").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway | RM, EM, {
+    get: (parentId: string, id: string) => Effect<never, CacheMissError | E, import("../types.js").Role>;
+    getForParent: (parentId: string) => Effect<never, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError | E, ReadonlyMap<string, import("../types.js").Role>>;
     run: Effect<never, E, void>;
     size: Effect<never, E, number>;
     sizeForParent: (parentId: string) => Effect<never, E, number>;
@@ -30,4 +47,4 @@ export declare const roles: <RM, EM, E>(driver: Effect<RM, EM, Cache.ParentCache
     delete: (parentId: string, resourceId: string) => Effect<never, E, void>;
     parentDelete: (parentId: string) => Effect<never, E, void>;
     refreshTTL: (parentId: string, resourceId: string) => Effect<never, E, void>;
-}>>;
+}>;

package/Cache/prelude.js

@@ -1,24 +1,108 @@
-import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "dfx";
-import { Cache } from "dfx";
-import { CacheOps } from "dfx/gateway";
-export const guilds = (driver) => tsplus_module_1.flatMap(ops => tsplus_module_1.map(rest => Cache.make({
+import * as tsplus_module_1 from "callbag-effect-ts/Source/fromIterable";
+import * as tsplus_module_2 from "callbag-effect-ts/Source/chain";
+import * as tsplus_module_3 from "callbag-effect-ts/Source/map";
+import * as tsplus_module_4 from "callbag-effect-ts/Source/merge";
+import * as tsplus_module_5 from "@effect/io/Effect";
+import * as tsplus_module_6 from "dfx";
+import * as tsplus_module_7 from "dfx/gateway";
+import { make, makeWithParent, CacheMissError, } from "./index.js";
+export const opsWithParent = ({ id, fromParent, create, update, remove, parentRemove, }) => {
+    const fromParentOps = tsplus_module_2.chain(([parentId, a]) => tsplus_module_1.fromIterable(a.map((resource) => ({
+        op: "create",
+        parentId,
+        resourceId: id(resource),
+        resource,
+    }))))(fromParent);
+    const createOps = tsplus_module_3.map(([parentId, resource]) => ({
+        op: "create",
+        parentId,
+        resourceId: id(resource),
+        resource,
+    }))(create);
+    const updateOps = tsplus_module_3.map(([parentId, resource]) => ({
+        op: "update",
+        parentId,
+        resourceId: id(resource),
+        resource,
+    }))(update);
+    const removeOps = tsplus_module_3.map(([parentId, resourceId]) => ({
+        op: "delete",
+        parentId,
+        resourceId,
+    }))(remove);
+    const parentRemoveOps = tsplus_module_3.map((parentId) => ({
+        op: "parentDelete",
+        parentId,
+    }))(parentRemove);
+    return tsplus_module_4.merge(parentRemoveOps)(tsplus_module_4.merge(removeOps)(tsplus_module_4.merge(updateOps)(tsplus_module_4.merge(createOps)(fromParentOps))));
+};
+export const ops = ({ id, create, update, remove }) => {
+    const createOps = tsplus_module_3.map((resource) => ({
+        op: "create",
+        resourceId: id(resource),
+        resource,
+    }))(create);
+    const updateOps = tsplus_module_3.map((resource) => ({
+        op: "update",
+        resourceId: id(resource),
+        resource,
+    }))(update);
+    const removeOps = tsplus_module_3.map((resourceId) => ({
+        op: "delete",
+        resourceId,
+    }))(remove);
+    return tsplus_module_4.merge(removeOps)(tsplus_module_4.merge(updateOps)(createOps));
+};
+export const guilds = (makeDriver) => tsplus_module_5.flatMap(driver => tsplus_module_5.flatMap(gateway => tsplus_module_5.map(rest => make({
     driver,
-    ops,
-    onMiss: (id) => tsplus_module_1.flatMap((r) => r.json)(rest.routes.getGuild(id)),
-}))(tsplus_module_1.service(tsplus_module_2.DiscordREST)))(CacheOps.guilds);
-export const channels = (driver) => tsplus_module_1.flatMap(ops => tsplus_module_1.map(({ routes: rest }) => Cache.makeParent({
+    ops: ops({
+        id: (g) => g.id,
+        create: tsplus_module_3.map((g) => ({
+            ...g,
+            channels: [],
+            roles: [],
+            emojis: [],
+            members: [],
+        }))(gateway.fromDispatch("GUILD_CREATE")),
+        update: gateway.fromDispatch("GUILD_UPDATE"),
+        remove: tsplus_module_3.map((a) => a.id)(gateway.fromDispatch("GUILD_DELETE")),
+    }),
+    onMiss: (id) => tsplus_module_5.flatMap((r) => r.json)(rest.getGuild(id)),
+}))(tsplus_module_5.service(tsplus_module_6.DiscordREST)))(tsplus_module_5.service(tsplus_module_7.Gateway.DiscordGateway)))(makeDriver);
+export const channels = (makeDriver) => tsplus_module_5.flatMap(driver => tsplus_module_5.flatMap(gateway => tsplus_module_5.map(rest => makeWithParent({
     driver,
-    ops,
-    onMiss: (id) => tsplus_module_1.flatMap((r) => r.json)(rest.getChannel(id)),
-    onParentMiss: (guildId) => tsplus_module_1.map((a) => a.map((a) => [a.id, a]))(tsplus_module_1.flatMap((r) => r.json)(rest
+    ops: opsWithParent({
+        id: (a) => a.id,
+        fromParent: tsplus_module_3.map((g) => [g.id, g.channels])(gateway
+            .fromDispatch("GUILD_CREATE")),
+        create: tsplus_module_3.map((c) => [c.guild_id, c])(gateway
+            .fromDispatch("CHANNEL_CREATE")),
+        update: tsplus_module_3.map((c) => [c.guild_id, c])(gateway
+            .fromDispatch("CHANNEL_UPDATE")),
+        remove: tsplus_module_3.map((a) => [a.guild_id, a.id])(gateway
+            .fromDispatch("CHANNEL_DELETE")),
+        parentRemove: tsplus_module_3.map((g) => g.id)(gateway.fromDispatch("GUILD_DELETE")),
+    }),
+    onMiss: (id) => tsplus_module_5.flatMap((r) => r.json)(rest.getChannel(id)),
+    onParentMiss: (guildId) => tsplus_module_5.map((a) => a.map((a) => [a.id, a]))(tsplus_module_5.flatMap((r) => r.json)(rest
         .getGuildChannels(guildId))),
-}))(tsplus_module_1.service(tsplus_module_2.DiscordREST)))(CacheOps.channels);
-export const roles = (driver) => tsplus_module_1.flatMap(ops => tsplus_module_1.map(({ routes: rest }) => Cache.makeParent({
+}))(tsplus_module_5.service(tsplus_module_6.DiscordREST)))(tsplus_module_5.service(tsplus_module_7.Gateway.DiscordGateway)))(makeDriver);
+export const roles = (makeDriver) => tsplus_module_5.flatMap(driver => tsplus_module_5.flatMap(gateway => tsplus_module_5.map(rest => makeWithParent({
     driver,
-    ops,
-    onMiss: (id) => tsplus_module_1.fail(new Cache.CacheMissError("RolesCache", id)),
-    onParentMiss: (guildId) => tsplus_module_1.map((a) => a.map((a) => [a.id, a]))(tsplus_module_1.flatMap((r) => r.json)(rest
+    ops: opsWithParent({
+        id: (a) => a.id,
+        fromParent: tsplus_module_3.map((g) => [g.id, g.roles])(gateway
+            .fromDispatch("GUILD_CREATE")),
+        create: tsplus_module_3.map((r) => [r.guild_id, r.role])(gateway
+            .fromDispatch("GUILD_ROLE_CREATE")),
+        update: tsplus_module_3.map((r) => [r.guild_id, r.role])(gateway
+            .fromDispatch("GUILD_ROLE_UPDATE")),
+        remove: tsplus_module_3.map((a) => [a.guild_id, a.role_id])(gateway
+            .fromDispatch("GUILD_ROLE_DELETE")),
+        parentRemove: tsplus_module_3.map((g) => g.id)(gateway.fromDispatch("GUILD_DELETE")),
+    }),
+    onMiss: (id) => tsplus_module_5.fail(new CacheMissError("RolesCache", id)),
+    onParentMiss: (guildId) => tsplus_module_5.map((a) => a.map((a) => [a.id, a]))(tsplus_module_5.flatMap((r) => r.json)(rest
         .getGuildRoles(guildId))),
-}))(tsplus_module_1.service(tsplus_module_2.DiscordREST)))(CacheOps.roles);
+}))(tsplus_module_5.service(tsplus_module_6.DiscordREST)))(tsplus_module_5.service(tsplus_module_7.Gateway.DiscordGateway)))(makeDriver);
 //# sourceMappingURL=prelude.js.map

package/Cache/prelude.js.map

@@ -1 +1 @@
-{"version":3,"file":"prelude.js","sourceRoot":"","sources":["../../src/Cache/prelude.ts"],"names":[],"mappings":";;AACA,OAAO,EAAE,KAAK,EAAE,MAAM,KAAK,CAAA;AAC3B,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAEtC,MAAM,CAAC,MAAM,MAAM,GAAG,CACpB,MAA2D,EAC3D,EAAE,yBAEM,GAAG,wBACH,IAAI,IAEH,KAAK,CAAC,IAAI,CAAC;IAChB,MAAM;IACN,GAAG;IACH,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,wBAAiC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAA9C,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAuB;CAChE,CAAC,EANa,wCAAe,WAAW,CAAC,GAD5B,QAAQ,CAAC,MAAM,CAQ7B,CAAA;AAEJ,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,MAAmE,EACnE,EAAE,yBAEM,GAAG,yBACH,EAAE,MAAM,EAAE,IAAI,EAAE,KAEf,KAAK,CAAC,UAAU,CAAC;IACtB,MAAM;IACN,GAAG;IACH,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,wBAA4B,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAzC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAuB;IAC1D,YAAY,EAAE,CAAC,OAAO,EAAE,EAAE,CACxB,oBAGO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAHrC,wBAEW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAFxB,IAAI;SACD,gBAAgB,CAAC,OAAO,CAAC,CACH,CACa;CACzC,CAAC,EAXyB,wCAAe,WAAW,CAAC,GADxC,QAAQ,CAAC,QAAQ,CAa/B,CAAA;AAEJ,MAAM,CAAC,MAAM,KAAK,GAAG,CACnB,MAAgE,EAChE,EAAE,yBAEM,GAAG,yBACH,EAAE,MAAM,EAAE,IAAI,EAAE,KAEf,KAAK,CAAC,UAAU,CAAC;IACtB,MAAM;IACN,GAAG;IACH,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,qBAAY,IAAI,KAAK,CAAC,cAAc,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;IACvE,YAAY,EAAE,CAAC,OAAO,EAAE,EAAE,CACxB,oBAGO,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAHrC,wBAEW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAFxB,IAAI;SACD,aAAa,CAAC,OAAO,CAAC,CACA,CACa;CACzC,CAAC,EAXyB,wCAAe,WAAW,CAAC,GADxC,QAAQ,CAAC,KAAK,CAa5B,CAAA"}
+{"version":3,"file":"prelude.js","sourceRoot":"","sources":["../../src/Cache/prelude.ts"],"names":[],"mappings":"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"}

package/DiscordGateway/Shard/index.d.ts

@@ -1,6 +1,6 @@
 import { DiscordWS } from "dfx/gateway";
 import { Discord } from "dfx";
-export declare const make: (shard: [id: number, count: number]) => import("../../global.js").Effect<import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | import("../../DiscordConfig/index.js").DiscordConfig | import("../../RateLimit/index.js").RateLimiter, never, {
+export declare const make: (shard: [id: number, count: number]) => import("../../global.js").Effect<import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").RateLimiter, never, {
     run: import("../../global.js").Effect<never, never, void>;
     raw: import("callbag-effect-ts/Source").EffectSource<never, never, import("../../types.js").GatewayPayload<any>>;
     dispatch: import("callbag-effect-ts/Source").EffectSource<never, never, import("../../types.js").GatewayPayload<import("../../types.js").ReceiveEvent>>;

package/DiscordGateway/Shard/index.js

@@ -42,5 +42,5 @@ export const make = (shard) => tsplus_module_1.flatMap(({ token, gateway }) => t
             reconnect: send(tsplus_module_2.WS.Reconnect),
         };
     })(Utils.latest((p) => tsplus_module_8.fromNullable(p.s))))(Utils.latest((p) => tsplus_module_8.map((p) => p.d)(tsplus_module_8.filter((p) => p.op === tsplus_module_4.Discord.GatewayOpcode.DISPATCH && p.t === "READY")(tsplus_module_8.some(p))))))(tsplus_module_9.share(socket.source)))(tsplus_module_2.DiscordWS.make({ outbound }));
-})(tsplus_module_11.unbounded()))(tsplus_module_1.service(tsplus_module_4.RateLimit.RateLimiter)))(tsplus_module_1.service(tsplus_module_4.Config.DiscordConfig));
+})(tsplus_module_11.unbounded()))(tsplus_module_1.service(tsplus_module_4.RateLimiter)))(tsplus_module_1.service(tsplus_module_4.Config.DiscordConfig));
 //# sourceMappingURL=index.js.map

package/DiscordGateway/Shard/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/index.ts"],"names":[],"mappings":"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"}

package/DiscordGateway/Sharder/index.d.ts

@@ -3,7 +3,7 @@ import { Maybe, Discord } from "dfx";
 import { EffectSource } from "callbag-effect-ts/Source";
 import { Success } from "dfx/utils/effect";
 import { ShardStore } from "../ShardStore/index.js";
-declare const make: import("../../global.js").Effect<import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | ShardStore | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").DiscordREST | import("../../RateLimit/index.js").RateLimiter, never, {
+declare const make: import("../../global.js").Effect<import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | ShardStore | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").DiscordREST | import("../../index.js").RateLimiter, never, {
     shards: import("callbag-effect-ts/Source").EffectSource<never, never, {
         run: import("../../global.js").Effect<never, never, void>;
         raw: import("callbag-effect-ts/Source").EffectSource<never, never, import("../../types.js").GatewayPayload<any>>;
@@ -15,5 +15,5 @@ declare const make: import("../../global.js").Effect<import("../DiscordWS/index.
 export interface Sharder extends Success<typeof make> {
 }
 export declare const Sharder: import("../../global.js").Tag<Sharder>;
-export declare const LiveSharder: import("../../global.js").Layer<import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | ShardStore | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").DiscordREST | import("../../RateLimit/index.js").RateLimiter, never, Sharder>;
+export declare const LiveSharder: import("../../global.js").Layer<import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | ShardStore | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").DiscordREST | import("../../index.js").RateLimiter, never, Sharder>;
 export {};

package/DiscordGateway/Sharder/index.js

@@ -19,7 +19,7 @@ import * as tsplus_module_18 from "@fp-ts/data/Context";
 import { millis } from "@fp-ts/data/Duration";
 import { overridePull } from "callbag-effect-ts/Source";
 import { ShardStore } from "../ShardStore/index.js";
-const make = tsplus_module_5.flatMap(store => tsplus_module_5.flatMap(({ routes: rest }) => tsplus_module_5.flatMap(({ gateway: config }) => tsplus_module_5.flatMap(limiter => {
+const make = tsplus_module_5.flatMap(store => tsplus_module_5.flatMap(rest => tsplus_module_5.flatMap(({ gateway: config }) => tsplus_module_5.flatMap(limiter => {
     const configs = (totalCount) => {
         const claimId = (sharderCount) => tsplus_module_5.flatMap((a) => tsplus_module_14.match(() => tsplus_module_5.delay(tsplus_module_13.minutes(3))(tsplus_module_5.succeed([
             tsplus_module_14.some(sharderCount),
@@ -55,7 +55,7 @@ const make = tsplus_module_5.flatMap(store => tsplus_module_5.flatMap(({ routes:
         },
     }))(tsplus_module_5.flatMap((r) => r.json)(rest
         .getGatewayBot())));
-})(tsplus_module_5.service(tsplus_module_17.RateLimit.RateLimiter)))(tsplus_module_5.service(tsplus_module_17.Config.DiscordConfig)))(tsplus_module_5.service(tsplus_module_17.DiscordREST)))(tsplus_module_5.service(ShardStore));
+})(tsplus_module_5.service(tsplus_module_17.RateLimiter)))(tsplus_module_5.service(tsplus_module_17.Config.DiscordConfig)))(tsplus_module_5.service(tsplus_module_17.DiscordREST)))(tsplus_module_5.service(ShardStore));
 export const Sharder = tsplus_module_18.Tag();
 export const LiveSharder = tsplus_module_5.toLayer(Sharder)(make);
 //# sourceMappingURL=index.js.map

package/DiscordGateway/Sharder/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Sharder/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Sharder/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AACvD,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAEnD,MAAM,IAAI,2BACF,KAAK,4BACL,IAAI,6BACJ,EAAE,OAAO,EAAE,MAAM,EAAE,6BACnB,OAAO;IAEb,MAAM,OAAO,GAAG,CAAC,UAAkB,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,CAAC,YAAoB,EAAE,EAAE,CACvC,wBAMI,CACE,CAAC,EAKD,EAAE,CACF,uBACE,GAAG,EAAE,CACH,sBAGkB,yBAAiB,CAAC,CAAC,EAHrC,wBAAe;YACb,sBAAW,YAAY,CAAC;;SAEhB,CAAC,CAA2B,EACxC,CAAC,EAAE,EAAE,EAAE,CACL,wBAAe;YACb,sBAAW,YAAY,GAAG,CAAC,CAAC;YAC5B,mBAAgB,EAAE,CAAC;SACpB,CAAC,EAVN,CAAC,CAWA,EAxBP,KAAK;aACF,OAAO,CAAC;YACP,UAAU;YACV,YAAY;SACb,CAAC,CAqBD,CAAA;QAEL,OAAO,oBAED,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;YACb,EAAE;YACF,UAAU;SACX,CAAC,EALK,0BAAsB,CAAC,EAAE,CAAC,YAAY,EAAE,EAAE,CAC/C,2BAAwB,OAAO,CAAC,YAAY,CAAC,CAAC,CAC/C,CAGE,CAAA;IACL,CAAC,CAAA;mCAEK,OAAO;QAkBb,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,GAAG,YAAY,CACjC,OAAO,CAAC,MAAM,CAAC,UAAU,IAAI,OAAO,CAAC,MAAM,CAAC,EAC5C,OAAO,CAAC,mBAAmB,CAAC,eAAe,CAC5C,CAAA;mCAEK,MAAM,IAyBL,CAAA,EAAE,MAAM,EAAE,CAAA,yBAxBf,0BAmBY,CAAC,KAAK,EAAE,EAAE,CAClB,4CAA6B,2BAAwB,KAAK,CAAC,GAAG,CAAC,GAA/D,mBAAgB,KAAK,CAAC,CAAgD,EApB1E,oBAkBO,GAAG,EAAE,CAAC,qBAAY,IAAI,CAAC,EAlB9B,0BAOY,CAAC,CAAC,WAAW,EAAE,GAAG,CAAC,EAAE,EAAE,CAC/B,0BAQa,CAAC,CAAC,EAAE,EAAE,CAAC,gBAAA,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,CAAC,EARpD,oBACO,GAAG,EAAE,CACR,OAAO,CAAC,SAAS,CACf,eAAe,GAAG,EAAE,EACpB,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,EACnC,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAC5B,EANL,WAAW,CAOR,CACkD,EAhBzD,yBAMW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,WAAW,EANtC,oBACO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;YAChB,GAAG,MAAM;YACT,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,WAAW,EAAE,OAAO,CAAC,mBAAmB,CAAC,eAAe;SACzD,CAAC,EALJ,MAAM,CAKD,CACkC,CAWpC,CAC4B,CAG5B;OA5CH,yBAGY,GAAG,EAAE,CACb,wBAA8C;QAC5C,GAAG,EAAE,2BAA2B;QAChC,MAAM,EAAE,CAAC;QACT,mBAAmB,EAAE;YACnB,KAAK,EAAE,CAAC;YACR,SAAS,EAAE,CAAC;YACZ,WAAW,EAAE,CAAC;YACd,eAAe,EAAE,CAAC;SACnB;KACF,CAAC,EAbN,wBAEW,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAFxB,IAAI;SACD,aAAa,EAAE,CACO,CAYtB;GAtDa,yCAAe,WAAW,CAAC,GADf,wBAAe,iBAAA,MAAM,CAAC,aAAa,CAAC,GADnD,yCAAe,WAAW,CAAC,GAD1B,wBAAe,UAAU,CAAC,CA2F1C,CAAA;AAGF,MAAM,CAAC,MAAM,OAAO,GAAG,iBAAA,GAAG,EAAW,CAAA;AACrC,MAAM,CAAC,MAAM,WAAW,GAAG,wBAAa,OAAO,EAApB,IAAI,CAAiB,CAAA"}