dfx 0.21.19 → 0.21.21

package/Cache/index.js

@@ -4,7 +4,7 @@ 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 makeWithParent = ({ driver, ops = tsplus_module_1.empty, onMiss, onParentMiss, }) => {
-    const sync = tsplus_module_1.runDrain(tsplus_module_1.tap((op) => {
+    const sync = tsplus_module_1.runDrain(tsplus_module_1.tap(ops, (op) => {
         switch (op.op) {
             case "create":
             case "update":
@@ -14,17 +14,17 @@ export const makeWithParent = ({ driver, ops = tsplus_module_1.empty, onMiss, on
             case "parentDelete":
                 return driver.parentDelete(op.parentId);
         }
-    })(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)),
-        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)),
+        get: (parentId, id) => tsplus_module_2.someOrElseEffect(driver
+            .get(parentId, id), () => tsplus_module_2.tap(onMiss(parentId, id), a => driver.set(parentId, id, a))),
+        getForParent: (parentId) => tsplus_module_2.someOrElseEffect(driver.getForParent(parentId), () => tsplus_module_2.map(tsplus_module_2.tap(onParentMiss(parentId), entries => tsplus_module_2.collectAllPar(entries.map(([id, a]) => driver.set(parentId, id, a)))), entries => new Map(entries))),
+        run: tsplus_module_2.asUnit(tsplus_module_2.zipPar(sync, driver.run)),
     };
 };
 export const make = ({ driver, ops = tsplus_module_1.empty, onMiss, }) => {
-    const sync = tsplus_module_1.runDrain(tsplus_module_1.tap((op) => {
+    const sync = tsplus_module_1.runDrain(tsplus_module_1.tap(ops, (op) => {
         switch (op.op) {
             case "create":
             case "update":
@@ -32,12 +32,12 @@ export const make = ({ driver, ops = tsplus_module_1.empty, onMiss, }) => {
             case "delete":
                 return driver.delete(op.resourceId);
         }
-    })(ops));
+    }));
     return {
         ...driver,
-        get: (id) => tsplus_module_2.someOrElseEffect(() => tsplus_module_2.tap((a) => driver.set(id, a))(onMiss(id)))(driver
-            .get(id)),
-        run: tsplus_module_2.asUnit(tsplus_module_2.zipPar(driver.run)(sync)),
+        get: (id) => tsplus_module_2.someOrElseEffect(driver
+            .get(id), () => tsplus_module_2.tap(onMiss(id), a => driver.set(id, a))),
+        run: tsplus_module_2.asUnit(tsplus_module_2.zipPar(sync, driver.run)),
     };
 };
 export class CacheMissError {

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/memory.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@fp-ts/data/Option";
+import * as tsplus_module_2 from "@fp-ts/core/Option";
 import { createDriver, createParentDriver } from "./driver.js";
 export const createWithParent = () => tsplus_module_1.sync(() => {
     const map = new Map();
@@ -11,9 +11,9 @@ export const createWithParent = () => tsplus_module_1.sync(() => {
             }
             return count;
         }),
-        sizeForParent: (parentId) => tsplus_module_1.sync(() => map.get(parentId)?.size ?? 0),
+        sizeForParent: parentId => tsplus_module_1.sync(() => map.get(parentId)?.size ?? 0),
         get: (parentId, resourceId) => tsplus_module_1.sync(() => tsplus_module_2.fromNullable(map.get(parentId)?.get(resourceId))),
-        getForParent: (parentId) => tsplus_module_1.sync(() => tsplus_module_2.fromNullable(map.get(parentId))),
+        getForParent: parentId => tsplus_module_1.sync(() => tsplus_module_2.fromNullable(map.get(parentId))),
         set: (parentId, resourceId, resource) => tsplus_module_1.sync(() => {
             if (!map.has(parentId)) {
                 map.set(parentId, new Map());
@@ -23,7 +23,7 @@ export const createWithParent = () => tsplus_module_1.sync(() => {
         delete: (parentId, resourceId) => tsplus_module_1.sync(() => {
             map.get(parentId)?.delete(resourceId);
         }),
-        parentDelete: (parentId) => tsplus_module_1.sync(() => {
+        parentDelete: parentId => tsplus_module_1.sync(() => {
             map.delete(parentId);
         }),
         refreshTTL: () => tsplus_module_1.unit(),
@@ -34,11 +34,11 @@ export const create = () => tsplus_module_1.sync(() => {
     const map = new Map();
     return createDriver({
         size: tsplus_module_1.sync(() => map.size),
-        get: (resourceId) => tsplus_module_1.sync(() => tsplus_module_2.fromNullable(map.get(resourceId))),
+        get: resourceId => tsplus_module_1.sync(() => tsplus_module_2.fromNullable(map.get(resourceId))),
         set: (resourceId, resource) => tsplus_module_1.sync(() => {
             map.set(resourceId, resource);
         }),
-        delete: (resourceId) => tsplus_module_1.sync(() => {
+        delete: resourceId => tsplus_module_1.sync(() => {
             map.delete(resourceId);
         }),
         refreshTTL: () => tsplus_module_1.unit(),

package/Cache/memory.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/Cache/memory.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/Cache/memory.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAE9D,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAM,EAAE,CACtC,qBAAY,GAAG,EAAE;IACf,MAAM,GAAG,GAAG,IAAI,GAAG,EAA0B,CAAA;IAE7C,OAAO,kBAAkB,CAAC;QACxB,IAAI,EAAE,qBAAY,GAAG,EAAE;YACrB,IAAI,KAAK,GAAG,CAAC,CAAA;YACb,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,EAAE;gBAC5B,KAAK,IAAI,CAAC,CAAC,IAAI,CAAA;aAChB;YACD,OAAO,KAAK,CAAA;QACd,CAAC,CAAC;QAEF,aAAa,EAAE,QAAQ,CAAC,EAAE,CACxB,qBAAY,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,IAAI,IAAI,CAAC,CAAC;QAEjD,GAAG,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,CAC5B,qBACE,GAAa,EAAE,CACb,6BAAmB,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,GAAG,CAAC,UAAU,CAAC,CAAC,CACzD;QAEH,YAAY,EAAE,QAAQ,CAAC,EAAE,CACvB,qBAAY,GAAG,EAAE,CAAC,6BAAmB,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;QAE1D,GAAG,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,QAAQ,EAAE,EAAE,CACtC,qBAAY,GAAG,EAAE;YACf,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE;gBACtB,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;aAC7B;YACD,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAE,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAC9C,CAAC,CAAC;QAEJ,MAAM,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,EAAE,CAC/B,qBAAY,GAAG,EAAE;YACf,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAA;QACvC,CAAC,CAAC;QAEJ,YAAY,EAAE,QAAQ,CAAC,EAAE,CACvB,qBAAY,GAAG,EAAE;YACf,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAA;QACtB,CAAC,CAAC;QAEJ,UAAU,EAAE,GAAG,EAAE,CAAC,sBAAa;QAE/B,GAAG,EAAE,sBAAa;KACnB,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA;AAEJ,MAAM,CAAC,MAAM,MAAM,GAAG,GAAM,EAAE,CAC5B,qBAAY,GAAG,EAAE;IACf,MAAM,GAAG,GAAG,IAAI,GAAG,EAAa,CAAA;IAEhC,OAAO,YAAY,CAAC;QAClB,IAAI,EAAE,qBAAY,GAAG,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC;QAEjC,GAAG,EAAE,UAAU,CAAC,EAAE,CAChB,qBAAY,GAAa,EAAE,CAAC,6BAAmB,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC;QAEtE,GAAG,EAAE,CAAC,UAAU,EAAE,QAAQ,EAAE,EAAE,CAC5B,qBAAY,GAAG,EAAE;YACf,GAAG,CAAC,GAAG,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAA;QAC/B,CAAC,CAAC;QAEJ,MAAM,EAAE,UAAU,CAAC,EAAE,CACnB,qBAAY,GAAG,EAAE;YACf,GAAG,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QACxB,CAAC,CAAC;QAEJ,UAAU,EAAE,GAAG,EAAE,CAAC,sBAAa;QAE/B,GAAG,EAAE,sBAAa;KACnB,CAAC,CAAA;AACJ,CAAC,CAAC,CAAA"}

package/Cache/memoryTTL.js

@@ -1,7 +1,7 @@
-import * as tsplus_module_1 from "@fp-ts/data/Duration";
+import * as tsplus_module_1 from "@effect/data/Duration";
 import * as tsplus_module_2 from "@effect/io/Effect";
-import * as tsplus_module_3 from "@fp-ts/data/Option";
-import * as tsplus_module_4 from "@fp-ts/data/Chunk";
+import * as tsplus_module_3 from "@fp-ts/core/Option";
+import * as tsplus_module_4 from "@effect/data/Chunk";
 import { createDriver, createParentDriver } from "./driver.js";
 const make = ({ ttl, resolution = tsplus_module_1.minutes(1), strategy = "usage", }) => {
     const additionalMilliseconds = (Math.floor(ttl.millis / resolution.millis) + 1) * resolution.millis;
@@ -48,8 +48,8 @@ const make = ({ ttl, resolution = tsplus_module_1.minutes(1), strategy = "usage"
     };
     return createDriver({
         size: tsplus_module_2.sync(() => items.size),
-        get: (resourceId) => tsplus_module_2.sync(() => tsplus_module_3.fromNullable(getSync(resourceId))),
-        refreshTTL: (id) => tsplus_module_2.sync(() => {
+        get: resourceId => tsplus_module_2.sync(() => tsplus_module_3.fromNullable(getSync(resourceId))),
+        refreshTTL: id => tsplus_module_2.sync(() => {
             getSync(id);
         }),
         set: (resourceId, resource) => tsplus_module_2.sync(() => {
@@ -63,10 +63,10 @@ const make = ({ ttl, resolution = tsplus_module_1.minutes(1), strategy = "usage"
                 items.set(resourceId, new WeakRef(newItem));
             }
         }),
-        delete: (resourceId) => tsplus_module_2.sync(() => {
+        delete: resourceId => tsplus_module_2.sync(() => {
             items.delete(resourceId);
         }),
-        run: tsplus_module_2.forever(tsplus_module_2.delay(tsplus_module_1.times(0.5)(resolution))(tsplus_module_2.sync(sweep))),
+        run: tsplus_module_2.forever(tsplus_module_2.delay(tsplus_module_2.sync(sweep), tsplus_module_1.times(0.5)(resolution))),
     });
 };
 export const create = (opts) => tsplus_module_2.sync(() => make(opts));
@@ -75,46 +75,46 @@ export const createWithParent = (opts) => tsplus_module_2.sync(() => {
     const parentIds = new Map();
     return createParentDriver({
         size: store.size,
-        sizeForParent: (parentId) => tsplus_module_2.sync(() => parentIds.get(parentId)?.size ?? 0),
+        sizeForParent: parentId => tsplus_module_2.sync(() => parentIds.get(parentId)?.size ?? 0),
         refreshTTL: (_, id) => store.refreshTTL(id),
         get: (_, id) => store.get(id),
-        getForParent: (parentId) => (() => {
+        getForParent: parentId => (() => {
             const ids = parentIds.get(parentId);
             if (!ids)
-                return tsplus_module_3.none;
+                return tsplus_module_3.none();
             const toGet = [];
-            ids.forEach((id) => {
-                toGet.push(tsplus_module_2.map(item => {
+            ids.forEach(id => {
+                toGet.push(tsplus_module_2.map(store.get(id), item => {
                     if (item._tag === "None") {
                         parentIds.delete(id);
                     }
                     return [id, item];
-                })(store.get(id)));
+                }));
             });
-            return tsplus_module_2.map(results => {
-                const map = tsplus_module_4.reduce(new Map(), (map, [id, a]) => a._tag === "Some" ? map.set(id, a.value) : map)(results);
+            return tsplus_module_2.map(tsplus_module_2.collectAllPar(toGet), results => {
+                const map = tsplus_module_4.reduce(results, new Map(), (map, [id, a]) => a._tag === "Some" ? map.set(id, a.value) : map);
                 return tsplus_module_3.some(map);
-            })(tsplus_module_2.collectAllPar(toGet));
+            });
         })(),
-        set: (parentId, resourceId, resource) => tsplus_module_2.map(() => {
+        set: (parentId, resourceId, resource) => tsplus_module_2.map(store.set(resourceId, resource), () => {
             if (!parentIds.has(parentId)) {
                 parentIds.set(parentId, new Set());
             }
             parentIds.get(parentId).add(resourceId);
-        })(store.set(resourceId, resource)),
-        delete: (parentId, resourceId) => tsplus_module_2.map(() => {
+        }),
+        delete: (parentId, resourceId) => tsplus_module_2.map(store.delete(resourceId), () => {
             parentIds.get(parentId)?.delete(resourceId);
-        })(store.delete(resourceId)),
-        parentDelete: (parentId) => (() => {
+        }),
+        parentDelete: parentId => (() => {
             const ids = parentIds.get(parentId);
             parentIds.delete(parentId);
             const effects = [];
             if (ids) {
-                ids.forEach((id) => {
+                ids.forEach(id => {
                     effects.push(store.delete(id));
                 });
             }
-            return tsplus_module_2.map(() => void 0)(tsplus_module_2.collectAllParDiscard(effects));
+            return tsplus_module_2.map(tsplus_module_2.collectAllParDiscard(effects), () => void 0);
         })(),
         run: store.run,
     });

package/Cache/memoryTTL.js.map

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

package/Cache/prelude.js

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

package/Cache/prelude.js.map

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

package/DiscordConfig/index.d.ts

@@ -23,4 +23,4 @@ export interface MakeOpts {
 }
 export declare const make: ({ token, rest, gateway }: MakeOpts) => DiscordConfig;
 export declare const makeLayer: (a_0: MakeOpts) => import("../_common.js").Layer<never, never, DiscordConfig>;
-export declare const makeFromConfig: (a: Config<MakeOpts>) => import("../_common.js").Layer<never, import("../_common.js").ConfigError, DiscordConfig>;
+export declare const makeFromConfig: (_: Config.Wrap<MakeOpts>) => import("../_common.js").Layer<never, import("../_common.js").ConfigError, DiscordConfig>;

package/DiscordConfig/index.js

@@ -1,8 +1,9 @@
 import * as tsplus_module_1 from "dfx/_common";
-import * as tsplus_module_2 from "@fp-ts/data/Duration";
+import * as tsplus_module_2 from "@effect/data/Duration";
 import * as tsplus_module_3 from "@effect/io/Layer";
-import * as tsplus_module_4 from "@fp-ts/data/Function";
-import * as tsplus_module_5 from "@effect/io/Effect";
+import * as tsplus_module_4 from "@fp-ts/core/Function";
+import * as tsplus_module_5 from "@effect/io/Config";
+import * as tsplus_module_6 from "@effect/io/Effect";
 const VERSION = 10;
 export const DiscordConfig = tsplus_module_1.Tag();
 export const make = ({ token, rest, gateway }) => ({
@@ -22,6 +23,6 @@ export const make = ({ token, rest, gateway }) => ({
         ...(gateway ?? {}),
     },
 });
-export const makeLayer = tsplus_module_4.flow(make, (_) => tsplus_module_3.succeed(DiscordConfig, _));
-export const makeFromConfig = (a) => tsplus_module_5.toLayer(DiscordConfig)(tsplus_module_5.map(make)(tsplus_module_5.config(a)));
+export const makeLayer = tsplus_module_4.flow(make, _ => tsplus_module_3.succeed(DiscordConfig, _));
+export const makeFromConfig = (_) => tsplus_module_6.toLayer(tsplus_module_6.map(tsplus_module_6.config(tsplus_module_5.unwrap(_)), make), DiscordConfig);
 //# sourceMappingURL=index.js.map

package/DiscordConfig/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/DiscordConfig/index.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,OAAO,GAAG,EAAE,CAAA;AAmBlB,MAAM,CAAC,MAAM,aAAa,GAAG,gBAAA,GAAG,EAAiB,CAAA;AAQjD,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAY,EAAiB,EAAE,CAAC,CAAC;IAC1E,KAAK;IACL,IAAI,EAAE;QACJ,OAAO,EAAE,4BAA4B,OAAO,EAAE;QAC9C,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QACf,eAAe,EAAE;YACf,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,wBAAiB,CAAC,CAAC;YAC3B,GAAG,CAAC,IAAI,EAAE,eAAe,IAAI,EAAE,CAAC;SACjC;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE,gBAAA,OAAO,CAAC,cAAc,CAAC,MAAM;QACtC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5B,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACnB;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,gBAAA,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,wBAAc,aAAa,EAAE,CAAC,CAAC,CAAC,CAAA;AAC3E,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAmB,EAAE,EAAE,CACpD,wBAA2B,aAAa,EAAxC,oBAAa,IAAI,yBAAjB,CAAC,EAAiB,CAAuB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/DiscordConfig/index.ts"],"names":[],"mappings":";;;;;;AAAA,MAAM,OAAO,GAAG,EAAE,CAAA;AAmBlB,MAAM,CAAC,MAAM,aAAa,GAAG,gBAAA,GAAG,EAAiB,CAAA;AAQjD,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAY,EAAiB,EAAE,CAAC,CAAC;IAC1E,KAAK;IACL,IAAI,EAAE;QACJ,OAAO,EAAE,4BAA4B,OAAO,EAAE;QAC9C,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC;QACf,eAAe,EAAE;YACf,KAAK,EAAE,EAAE;YACT,MAAM,EAAE,wBAAiB,CAAC,CAAC;YAC3B,GAAG,CAAC,IAAI,EAAE,eAAe,IAAI,EAAE,CAAC;SACjC;KACF;IACD,OAAO,EAAE;QACP,OAAO,EAAE,gBAAA,OAAO,CAAC,cAAc,CAAC,MAAM;QACtC,iBAAiB,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC5B,GAAG,CAAC,OAAO,IAAI,EAAE,CAAC;KACnB;CACF,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,SAAS,GAAG,gBAAA,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,wBAAc,aAAa,EAAE,CAAC,CAAC,CAAC,CAAA;AACzE,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,CAAwB,EAAE,EAAE,CACzD,wBAAA,2CAAA,uBAAc,CAAC,CAAC,GAAY,IAAI,CAAC,EAAS,aAAa,CAAC,CAAA"}

package/DiscordGateway/DiscordWS/index.js

@@ -1,25 +1,25 @@
 import * as tsplus_module_1 from "dfx/_common";
 import * as tsplus_module_2 from "@effect/io/Layer";
-import * as tsplus_module_3 from "@fp-ts/data/Duration";
+import * as tsplus_module_3 from "@effect/data/Duration";
 import * as tsplus_module_4 from "@effect/io/Schedule";
 import * as tsplus_module_5 from "@effect/stream/Stream";
-import * as tsplus_module_6 from "dfx/gateway";
-import * as tsplus_module_7 from "dfx";
+import * as tsplus_module_6 from "dfx";
+import * as tsplus_module_7 from "dfx/gateway";
 import * as tsplus_module_8 from "@effect/io/Effect";
 import * as tsplus_module_9 from "@effect/io/Ref";
 export const DiscordWSCodec = tsplus_module_1.Tag();
 export const LiveJsonDiscordWSCodec = tsplus_module_2.succeed(DiscordWSCodec, {
     type: "json",
-    encode: (p) => JSON.stringify(p),
-    decode: (p) => JSON.parse(p.toString("utf8")),
+    encode: p => JSON.stringify(p),
+    decode: p => JSON.parse(p.toString("utf8")),
 });
-export const make = ({ url = "wss://gateway.discord.gg/", version = 10, outbound, }) => tsplus_module_8.flatMap(encoding => tsplus_module_8.flatMap(urlRef => {
+export const make = ({ url = "wss://gateway.discord.gg/", version = 10, outbound, }) => tsplus_module_8.flatMap(tsplus_module_8.service(DiscordWSCodec), encoding => tsplus_module_8.flatMap(tsplus_module_9.make(`${url}?v=${version}&encoding=${encoding.type}`), urlRef => {
     const setUrl = (url) => tsplus_module_9.set(urlRef, `${url}?v=${version}&encoding=${encoding.type}`);
-    const take = tsplus_module_8.map((a) => a === tsplus_module_6.WS.Reconnect ? a : encoding.encode(a))(outbound);
-    return tsplus_module_8.map(log => {
-        const ws = tsplus_module_5.provideService(tsplus_module_7.Log.Log)(log)(tsplus_module_6.WS.make(urlRef, take));
-        const source = tsplus_module_5.map(encoding.decode)(tsplus_module_5.retry(tsplus_module_4.exponential(tsplus_module_3.seconds(0.5)))(tsplus_module_5.tapError((e) => log.info("DiscordWS", "ERROR", e))(ws)));
+    const take = tsplus_module_8.map(outbound, a => a === tsplus_module_7.WS.Reconnect ? a : encoding.encode(a));
+    return tsplus_module_8.map(tsplus_module_8.service(tsplus_module_6.Log.Log), log => {
+        const ws = tsplus_module_5.provideService(tsplus_module_7.WS.make(urlRef, take), tsplus_module_6.Log.Log, log);
+        const source = tsplus_module_5.map(tsplus_module_5.retry(tsplus_module_5.tapError(ws, e => log.info("DiscordWS", "ERROR", e)), tsplus_module_4.exponential(tsplus_module_3.seconds(0.5))), encoding.decode);
         return { source, setUrl };
-    })(tsplus_module_8.service(tsplus_module_7.Log.Log));
-})(tsplus_module_9.make(`${url}?v=${version}&encoding=${encoding.type}`)))(tsplus_module_8.service(DiscordWSCodec));
+    });
+}));
 //# sourceMappingURL=index.js.map

package/DiscordGateway/DiscordWS/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/DiscordWS/index.ts"],"names":[],"mappings":";;;;;;;;;AAgBA,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,wBAAc,cAAc,EAAE;IAClE,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAChC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC9C,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EACnB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,EAAE,EACZ,QAAQ,GACC,EAAE,EAAE,yBAEL,QAAQ,4BACR,MAAM;IACZ,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAC7B,oBAAA,MAAM,EAAK,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IAC7D,MAAM,IAAI,GAAG,oBAAa,CAAC,CAAC,EAAE,EAAE,CAC9B,CAAC,KAAK,gBAAA,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,EADhC,QAAQ,CAEpB,CAAA;+BACK,GAAG;QACT,MAAM,EAAE,GAAG,+BAAsB,gBAAA,GAAG,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,gBAAA,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC,CAAA;QACrE,MAAM,MAAM,GAAG,oBAGR,QAAQ,CAAC,MAAM,EAHP,sBAEN,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,EAFrC,yBACH,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,EADrC,EAAE,CACoC,CACA,CACkB,CAAA;QAEvE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;OAPX,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC;GANpB,qBAAS,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,GADvD,wBAAe,cAAc,CAAC,CAejD,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/DiscordGateway/DiscordWS/index.ts"],"names":[],"mappings":";;;;;;;;;AAgBA,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,sBAAsB,GAAG,wBAAc,cAAc,EAAE;IAClE,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC9B,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC5C,CAAC,CAAA;AAEF,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,EACnB,GAAG,GAAG,2BAA2B,EACjC,OAAO,GAAG,EAAE,EACZ,QAAQ,GACC,EAAE,EAAE,yBAEQ,wBAAe,cAAc,CAAC,EAA3C,QAAQ,4BACG,qBAAS,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,EAApE,MAAM;IACZ,MAAM,MAAM,GAAG,CAAC,GAAW,EAAE,EAAE,CAC7B,oBAAA,MAAM,EAAK,GAAG,GAAG,MAAM,OAAO,aAAa,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAA;IAC7D,MAAM,IAAI,GAAG,oBAAA,QAAQ,EAAK,CAAC,CAAC,EAAE,CAC5B,CAAC,KAAK,gBAAA,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAC5C,CAAA;+BACa,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,EAA/B,GAAG;QACT,MAAM,EAAE,GAAG,+BAAA,gBAAA,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,EAAgB,gBAAA,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAC7D,MAAM,MAAM,GAAG,oBAAA,sBAAA,yBAAA,EAAE,EACL,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAC1C,4BAAqB,wBAAiB,GAAG,CAAC,CAAC,CAAC,EAC9C,QAAQ,CAAC,MAAM,CAAiD,CAAA;QAEvE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;;GACzB,CAAA"}

package/DiscordGateway/Shard/heartbeats.js

@@ -1,19 +1,18 @@
 import * as tsplus_module_1 from "@effect/io/Ref";
-import * as tsplus_module_2 from "@fp-ts/data/Option";
+import * as tsplus_module_2 from "@fp-ts/core/Option";
 import * as tsplus_module_3 from "@effect/io/Effect";
 import * as tsplus_module_4 from "dfx/gateway";
-import * as tsplus_module_5 from "dfx/_common";
+import * as tsplus_module_5 from "@effect/io/Schedule";
 import * as tsplus_module_6 from "@effect/stream/Stream";
-import * as tsplus_module_7 from "@effect/io/Schedule";
-import * as tsplus_module_8 from "@fp-ts/data/Function";
+import * as tsplus_module_7 from "dfx/_common";
+import { millis } from "@effect/data/Duration";
 import * as SendEvents from "./sendEvents.js";
 import * as Utils from "./utils.js";
-import { millis } from "@fp-ts/data/Duration";
-const send = (ref, seqRef) => tsplus_module_3.tap(() => tsplus_module_1.set(ref, false))(tsplus_module_3.map((a) => SendEvents.heartbeat(tsplus_module_2.getOrNull(a)))(tsplus_module_1.get(seqRef)));
-const maybeSend = (ref, seqRef) => tsplus_module_3.flatMap((acked) => acked ? send(ref, seqRef) : tsplus_module_3.succeed(tsplus_module_4.WS.Reconnect))(tsplus_module_1.get(ref));
-export const fromRaw = (source, seqRef) => tsplus_module_8.pipe(tsplus_module_3.map((ackedRef) => {
-    const heartbeats = tsplus_module_6.mapEffect(() => maybeSend(ackedRef, seqRef))(tsplus_module_8.pipe(tsplus_module_6.tap(() => tsplus_module_1.set(ackedRef, true))(Utils.opCode(source)(10 /* Discord.GatewayOpcode.HELLO */)), tsplus_module_6.flatMapParSwitch(1)((p) => tsplus_module_6.fromSchedule(tsplus_module_7.andThen(tsplus_module_7.spaced(millis(p.d.heartbeat_interval)))(tsplus_module_7.duration(millis(p.d.heartbeat_interval * Math.random())))))));
-    const acks = tsplus_module_6.drain(tsplus_module_6.tap(() => tsplus_module_1.set(ackedRef, true))(Utils.opCode(source)(11 /* Discord.GatewayOpcode.HEARTBEAT_ACK */)));
-    return tsplus_module_6.merge(acks)(heartbeats);
-})(tsplus_module_1.make(true)), tsplus_module_6.unwrap);
+const send = (ref, seqRef) => tsplus_module_3.tap(tsplus_module_3.map(tsplus_module_1.get(seqRef), a => SendEvents.heartbeat(tsplus_module_2.getOrNull(a))), () => tsplus_module_1.set(ref, false));
+const maybeSend = (ref, seqRef) => tsplus_module_3.flatMap(tsplus_module_1.get(ref), (acked) => acked ? send(ref, seqRef) : tsplus_module_3.succeed(tsplus_module_4.WS.Reconnect));
+export const fromRaw = (source, seqRef) => tsplus_module_6.unwrap(tsplus_module_3.map(tsplus_module_1.make(true), ackedRef => {
+    const heartbeats = tsplus_module_6.mapEffect(tsplus_module_6.flatMapParSwitch(tsplus_module_6.tap(Utils.opCode(source)(10 /* Discord.GatewayOpcode.HELLO */), () => tsplus_module_1.set(ackedRef, true)), p => tsplus_module_6.fromSchedule(tsplus_module_5.andThen(tsplus_module_5.duration(millis(p.d.heartbeat_interval * Math.random())), tsplus_module_5.spaced(millis(p.d.heartbeat_interval)))), 1), () => maybeSend(ackedRef, seqRef));
+    const acks = tsplus_module_6.drain(tsplus_module_6.tap(Utils.opCode(source)(11 /* Discord.GatewayOpcode.HEARTBEAT_ACK */), () => tsplus_module_1.set(ackedRef, true)));
+    return tsplus_module_6.merge(heartbeats, acks);
+}));
 //# sourceMappingURL=heartbeats.js.map

package/DiscordGateway/Shard/heartbeats.js.map

@@ -1 +1 @@
-{"version":3,"file":"heartbeats.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":";;;;;;;;AAAA,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AACnC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAE7C,MAAM,IAAI,GAAG,CAAC,GAAiB,EAAE,MAA0B,EAAE,EAAE,CAC7D,oBAEO,GAAG,EAAE,CAAC,oBAAA,GAAG,EAAK,KAAK,CAAC,EAF3B,oBACO,CAAC,CAAC,EAAE,EAAE,CAAC,UAAU,CAAC,SAAS,2BAAC,CAAC,EAAW,sBAD/C,MAAM,EAC0C,CACpB,CAAA;AAE9B,MAAM,SAAS,GAAG,CAAC,GAAiB,EAAE,MAA0B,EAAE,EAAE,CAClE,wBACE,CAAC,KAAK,EAA2C,EAAE,CACjD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,wBAAe,gBAAA,EAAE,CAAC,SAAS,CAAC,sBAF5D,GAAG,EAGF,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAA4C,EAC5C,MAA0B,EAC1B,EAAE,CACF,gBAAA,IAAI,CACF,oBAAmB,CAAC,QAAQ,EAAE,EAAE;IAC9B,MAAM,UAAU,GAAG,0BAWP,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,EAX1B,gBAAA,IAAI,CACrB,oBAEM,GAAG,EAAE,CAAC,oBAAA,QAAQ,EAAK,IAAI,CAAC,EAF9B,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,sCAEnB,CAA8B,EAC/B,iCAAwB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAC/B,6BACE,wBAEU,uBAAgB,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,CAAC,CAAC,EAF1D,yBACE,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAChD,CAA0D,CAC5D,CACF,CACF,CAA6C,CAAA;IAE9C,MAAM,IAAI,yBAAG,oBAEP,GAAG,EAAE,CAAC,oBAAA,QAAQ,EAAK,IAAI,CAAC,EAFjB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,8CAEhC,CAA8B,CAAM,CAAA;IAErC,OAAO,sBAAiB,IAAI,EAArB,UAAU,CAAY,CAAA;AAC/B,CAAC,EAnBD,qBAAS,IAAI,CAAC,CAmBZ,yBAEH,CAAA"}
+{"version":3,"file":"heartbeats.js","sourceRoot":"","sources":["../../../src/DiscordGateway/Shard/heartbeats.ts"],"names":[],"mappings":";;;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAC9C,OAAO,KAAK,UAAU,MAAM,iBAAiB,CAAA;AAC7C,OAAO,KAAK,KAAK,MAAM,YAAY,CAAA;AAEnC,MAAM,IAAI,GAAG,CAAC,GAAiB,EAAE,MAA0B,EAAE,EAAE,CAC7D,oBAAA,wCAAA,MAAM,GACC,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,SAAS,2BAAC,CAAC,EAAW,CAAC,EACvC,GAAG,EAAE,CAAC,oBAAA,GAAG,EAAK,KAAK,CAAC,CAAC,CAAA;AAE9B,MAAM,SAAS,GAAG,CAAC,GAAiB,EAAE,MAA0B,EAAE,EAAE,CAClE,4CAAA,GAAG,GACD,CAAC,KAAK,EAA2C,EAAE,CACjD,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,wBAAe,gBAAA,EAAE,CAAC,SAAS,CAAC,CAC3D,CAAA;AAEH,MAAM,CAAC,MAAM,OAAO,GAAG,CACrB,MAA4C,EAC5C,MAA0B,EAC1B,EAAE,CACF,uBACE,oBAAA,qBAAS,IAAI,CAAC,EAAK,QAAQ,CAAC,EAAE;IAC5B,MAAM,UAAU,GAAG,0BAAA,iCAAA,oBAAA,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,sCAEtC,EACM,GAAG,EAAE,CAAC,oBAAA,QAAQ,EAAK,IAAI,CAAC,CAAC,EAE5B,CAAC,CAAC,EAAE,CACF,6BACE,wBAAA,yBACE,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAChD,EAAS,uBAAgB,MAAM,CAAC,CAAC,CAAC,CAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAC5D,EACH,CAAC,CACF,EACU,GAAG,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAA;IAE/C,MAAM,IAAI,yBAAG,oBAAA,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,8CAEhC,EAAK,GAAG,EAAE,CAAC,oBAAA,QAAQ,EAAK,IAAI,CAAC,CAAC,CAAM,CAAA;IAErC,OAAO,sBAAA,UAAU,EAAO,IAAI,CAAC,CAAA;AAC/B,CAAC,CAAC,CACH,CAAA"}

package/DiscordGateway/Shard/identify.js

@@ -1,4 +1,4 @@
-import * as tsplus_module_1 from "@fp-ts/data/Option";
+import * as tsplus_module_1 from "@fp-ts/core/Option";
 import * as tsplus_module_2 from "@effect/io/Ref";
 import * as tsplus_module_3 from "@effect/io/Effect";
 import * as tsplus_module_4 from "dfx/_common";
@@ -22,9 +22,9 @@ const resume = (token, ready, seq) => SendEvents.resume({
     session_id: ready.session_id,
     seq,
 });
-const identifyOrResume = (opts, ready, seq) => tsplus_module_3.flatMap(readyEvent => tsplus_module_3.map(seqNumber => tsplus_module_1.match(() => identify(opts), ({ readyEvent, seqNumber }) => resume(opts.token, readyEvent, seqNumber))(tsplus_module_1.struct({
+const identifyOrResume = (opts, ready, seq) => tsplus_module_3.flatMap(tsplus_module_2.get(ready), readyEvent => tsplus_module_3.map(tsplus_module_2.get(seq), seqNumber => tsplus_module_1.match(() => identify(opts), ({ readyEvent, seqNumber }) => resume(opts.token, readyEvent, seqNumber))(tsplus_module_1.struct({
     readyEvent,
     seqNumber,
-})))(tsplus_module_2.get(seq)))(tsplus_module_2.get(ready));
-export const fromRaw = (source, { latestReady, latestSequence, ...opts }) => tsplus_module_5.mapEffect(() => identifyOrResume(opts, latestReady, latestSequence))(opCode(source)(10 /* Discord.GatewayOpcode.HELLO */));
+}))));
+export const fromRaw = (source, { latestReady, latestSequence, ...opts }) => tsplus_module_5.mapEffect(opCode(source)(10 /* Discord.GatewayOpcode.HELLO */), () => identifyOrResume(opts, latestReady, latestSequence));
 //# sourceMappingURL=identify.js.map