dfx 0.20.1 → 0.20.3

package/Cache/driver.d.ts

@@ -1,5 +1,4 @@
-import { Effect } from "@effect/io/Effect";
-import { Maybe } from "dfx";
+import { Effect, Maybe } from "dfx/utils/common";
 export interface ParentCacheDriver<E, T> {
     readonly size: Effect<never, E, number>;
     sizeForParent: (parentId: string) => Effect<never, E, number>;

package/Cache/index.d.ts

@@ -1,5 +1,4 @@
-import { EffectSource } from "callbag-effect-ts/Source";
-import { Effect } from "@effect/io/Effect";
+import { EffectSource, Effect } from "dfx/utils/common";
 import { CacheDriver, ParentCacheDriver } from "./driver.js";
 export * from "./driver.js";
 export { create as memoryDriver, createWithParent as memoryParentDriver, } from "./memory.js";
@@ -37,30 +36,30 @@ export type CacheOp<T> = {
 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<never, EPMiss, [id: string, resource: A][]>;
+    onMiss: (parentId: string, id: string) => import("../utils/common.js").Effect<never, EMiss, A>;
+    onParentMiss: (parentId: string) => import("../utils/common.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<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>;
-    set: (parentId: string, resourceId: string, resource: A) => import("../global.js").Effect<never, EDriver, void>;
-    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>;
+    get: (parentId: string, id: string) => import("../utils/common.js").Effect<never, EDriver | EMiss, A>;
+    getForParent: (parentId: string) => import("../utils/common.js").Effect<never, EDriver | EPMiss, ReadonlyMap<string, A>>;
+    run: import("../utils/common.js").Effect<never, EOps | EDriver, void>;
+    size: import("../utils/common.js").Effect<never, EDriver, number>;
+    sizeForParent: (parentId: string) => import("../utils/common.js").Effect<never, EDriver, number>;
+    set: (parentId: string, resourceId: string, resource: A) => import("../utils/common.js").Effect<never, EDriver, void>;
+    delete: (parentId: string, resourceId: string) => import("../utils/common.js").Effect<never, EDriver, void>;
+    parentDelete: (parentId: string) => import("../utils/common.js").Effect<never, EDriver, void>;
+    refreshTTL: (parentId: string, resourceId: string) => import("../utils/common.js").Effect<never, EDriver, void>;
 };
 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>;
+    onMiss: (id: string) => import("../utils/common.js").Effect<never, EMiss, A>;
 }) => {
-    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>;
+    get: (id: string) => import("../utils/common.js").Effect<never, EDriver | EMiss, A>;
+    run: import("../utils/common.js").Effect<never, EOps | EDriver, void>;
+    size: import("../utils/common.js").Effect<never, EDriver, number>;
+    set: (resourceId: string, resource: A) => import("../utils/common.js").Effect<never, EDriver, void>;
+    delete: (resourceId: string) => import("../utils/common.js").Effect<never, EDriver, void>;
+    refreshTTL: (resourceId: string) => import("../utils/common.js").Effect<never, EDriver, void>;
 };
 export declare class CacheMissError {
     readonly cacheName: string;

package/Cache/memory.d.ts

@@ -1,3 +1,3 @@
-import { Maybe } from "dfx";
-export declare const createWithParent: <T>() => import("../global.js").Effect<never, never, import("./driver.js").ParentCacheDriver<never, T>>;
-export declare const create: <T>() => import("../global.js").Effect<never, never, import("./driver.js").CacheDriver<never, T>>;
+import { Maybe } from "dfx/utils/common";
+export declare const createWithParent: <T>() => import("../utils/common.js").Effect<never, never, import("./driver.js").ParentCacheDriver<never, T>>;
+export declare const create: <T>() => import("../utils/common.js").Effect<never, never, import("./driver.js").CacheDriver<never, T>>;

package/Cache/memoryTTL.d.ts

@@ -1,6 +1,4 @@
-import { Duration } from "@fp-ts/data/Duration";
-import { Maybe } from "dfx";
-import { Effect } from "@effect/io/Effect";
+import { Duration, Maybe, Effect } from "dfx/utils/common";
 export interface MemoryTTLOpts {
     /** The approx. number of milliseconds to keep items */
     ttl: Duration;
@@ -18,5 +16,5 @@ export interface MemoryTTLOpts {
      */
     strategy?: "activity" | "usage" | "expiry";
 }
-export declare const create: <T>(opts: MemoryTTLOpts) => import("../global.js").Effect<never, never, import("./driver.js").CacheDriver<never, T>>;
-export declare const createWithParent: <T>(opts: MemoryTTLOpts) => import("../global.js").Effect<never, never, import("./driver.js").ParentCacheDriver<never, T>>;
+export declare const create: <T>(opts: MemoryTTLOpts) => import("../utils/common.js").Effect<never, never, import("./driver.js").CacheDriver<never, T>>;
+export declare const createWithParent: <T>(opts: MemoryTTLOpts) => import("../utils/common.js").Effect<never, never, import("./driver.js").ParentCacheDriver<never, T>>;

package/Cache/prelude.d.ts

@@ -1,4 +1,4 @@
-import { EffectSource } from "callbag-effect-ts/Source";
+import { EffectSource } from "dfx/utils/common";
 import { Discord } from "dfx";
 import { Effect } from "@effect/io/Effect";
 import { ParentCacheOp, CacheOp, CacheDriver, ParentCacheDriver, CacheMissError } from "./index.js";

package/DiscordConfig/index.d.ts

@@ -1,4 +1,4 @@
-import { Duration } from "@fp-ts/data/Duration";
+import { Duration } from "dfx/utils/common";
 import { Discord } from "dfx";
 export interface DiscordConfig {
     token: string;
@@ -16,23 +16,23 @@ export interface DiscordConfig {
         identifyRateLimit: readonly [window: number, limit: number];
     };
 }
-export declare const DiscordConfig: import("../global.js").Tag<DiscordConfig>;
+export declare const DiscordConfig: import("../utils/common.js").Tag<DiscordConfig>;
 export interface MakeOpts {
     token: string;
     rest?: Partial<DiscordConfig["rest"]>;
     gateway?: Partial<DiscordConfig["gateway"]>;
 }
 export declare const make: ({ token, rest, gateway }: MakeOpts) => DiscordConfig;
-export declare const makeLayer: (a_0: MakeOpts) => import("../global.js").Layer<never, never, DiscordConfig>;
-export declare const token: import("../global.js").Effect<DiscordConfig, never, string>;
-export declare const rest: import("../global.js").Effect<DiscordConfig, never, {
+export declare const makeLayer: (a_0: MakeOpts) => import("../utils/common.js").Layer<never, never, DiscordConfig>;
+export declare const token: import("../utils/common.js").Effect<DiscordConfig, never, string>;
+export declare const rest: import("../utils/common.js").Effect<DiscordConfig, never, {
     baseUrl: string;
     globalRateLimit: {
         limit: number;
         window: Duration;
     };
 }>;
-export declare const gateway: import("../global.js").Effect<DiscordConfig, never, {
+export declare const gateway: import("../utils/common.js").Effect<DiscordConfig, never, {
     intents: number;
     presence?: import("../types.js").UpdatePresence | undefined;
     shardCount?: number | undefined;

package/DiscordConfig/index.js

@@ -1,9 +1,8 @@
-import * as tsplus_module_1 from "@fp-ts/data/Context";
+import * as tsplus_module_1 from "dfx/utils/common";
 import * as tsplus_module_2 from "@fp-ts/data/Duration";
 import * as tsplus_module_3 from "dfx";
 import * as tsplus_module_4 from "@effect/io/Layer";
-import * as tsplus_module_5 from "@fp-ts/data/Function";
-import * as tsplus_module_6 from "@effect/io/Effect";
+import * as tsplus_module_5 from "@effect/io/Effect";
 const VERSION = 9;
 export const DiscordConfig = tsplus_module_1.Tag();
 export const make = ({ token, rest, gateway }) => ({
@@ -23,8 +22,8 @@ export const make = ({ token, rest, gateway }) => ({
         ...(gateway ?? {}),
     },
 });
-export const makeLayer = tsplus_module_5.flow(make, tsplus_module_4.succeed(DiscordConfig));
-export const token = tsplus_module_6.serviceWith(DiscordConfig)(({ token }) => token);
-export const rest = tsplus_module_6.serviceWith(DiscordConfig)(({ rest }) => rest);
-export const gateway = tsplus_module_6.serviceWith(DiscordConfig)(({ gateway }) => gateway);
+export const makeLayer = tsplus_module_1.flow(make, tsplus_module_4.succeed(DiscordConfig));
+export const token = tsplus_module_5.serviceWith(DiscordConfig)(({ token }) => token);
+export const rest = tsplus_module_5.serviceWith(DiscordConfig)(({ rest }) => rest);
+export const gateway = tsplus_module_5.serviceWith(DiscordConfig)(({ gateway }) => gateway);
 //# 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,CAAC,CAAA;AAmBjB,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,wBAAc,aAAa,CAAC,CAAC,CAAA;AAEjE,MAAM,CAAC,MAAM,KAAK,GAAG,4BAAmB,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;AAC5E,MAAM,CAAC,MAAM,IAAI,GAAG,4BAAmB,aAAa,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;AACzE,MAAM,CAAC,MAAM,OAAO,GAAG,4BAAmB,aAAa,CAAC,CACtD,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CACzB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/DiscordConfig/index.ts"],"names":[],"mappings":";;;;;AAAA,MAAM,OAAO,GAAG,CAAC,CAAA;AAmBjB,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,wBAAc,aAAa,CAAC,CAAC,CAAA;AAEjE,MAAM,CAAC,MAAM,KAAK,GAAG,4BAAmB,aAAa,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,CAAA;AAC5E,MAAM,CAAC,MAAM,IAAI,GAAG,4BAAmB,aAAa,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAA;AACzE,MAAM,CAAC,MAAM,OAAO,GAAG,4BAAmB,aAAa,CAAC,CACtD,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CACzB,CAAA"}

package/DiscordGateway/DiscordWS/index.d.ts

@@ -1,8 +1,7 @@
 /// <reference types="ws" />
 import { Discord } from "dfx";
 import { WS } from "dfx/gateway";
-import { Effect } from "@effect/io/Effect";
-import { EffectSource } from "callbag-effect-ts/Source";
+import { Effect, EffectSource } from "dfx/utils/common";
 import WebSocket from "isomorphic-ws";
 export type Message = Discord.GatewayPayload | WS.Reconnect;
 export interface OpenOpts {
@@ -16,9 +15,9 @@ export interface DiscordWSCodec {
     encode: (p: Discord.GatewayPayload) => string;
     decode: (p: WebSocket.Data) => Discord.GatewayPayload;
 }
-export declare const DiscordWSCodec: import("../../global.js").Tag<DiscordWSCodec>;
-export declare const LiveJsonDiscordWSCodec: import("../../global.js").Layer<never, never, DiscordWSCodec>;
-export declare const make: ({ url, version, outbound, }: OpenOpts) => import("../../global.js").Effect<DiscordWSCodec | import("../../Log/index.js").Log, never, {
+export declare const DiscordWSCodec: import("../../utils/common.js").Tag<DiscordWSCodec>;
+export declare const LiveJsonDiscordWSCodec: import("../../utils/common.js").Layer<never, never, DiscordWSCodec>;
+export declare const make: ({ url, version, outbound, }: OpenOpts) => import("../../utils/common.js").Effect<DiscordWSCodec | import("../../Log/index.js").Log, never, {
     source: import("callbag-effect-ts/Source").EffectSource<never, never, import("../../types.js").GatewayPayload<any>>;
-    setUrl: (url: string) => import("../../global.js").Effect<never, never, void>;
+    setUrl: (url: string) => import("../../utils/common.js").Effect<never, never, void>;
 }>;

package/DiscordGateway/DiscordWS/index.js

@@ -1,4 +1,4 @@
-import * as tsplus_module_1 from "@fp-ts/data/Context";
+import * as tsplus_module_1 from "dfx/utils/common";
 import * as tsplus_module_2 from "@effect/io/Layer";
 import * as tsplus_module_3 from "@fp-ts/data/Duration";
 import * as tsplus_module_4 from "@effect/io/Schedule";

package/DiscordGateway/Shard/heartbeats.d.ts

@@ -1,6 +1,4 @@
-import { Ref } from "@effect/io/Ref";
-import { Maybe, Discord } from "dfx";
-import { Effect } from "@effect/io/Effect";
+import { Ref, Maybe, Effect, EffectSource } from "dfx/utils/common";
 import { DiscordWS } from "dfx/gateway";
-import { EffectSource } from "callbag-effect-ts/Source";
+import { Discord } from "dfx";
 export declare const fromRaw: <R, E>(source: import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<any>>, seqRef: Ref<Maybe<number>>) => import("callbag-effect-ts/Source").EffectSource<R, E, import("../DiscordWS/index.js").Message>;

package/DiscordGateway/Shard/identify.d.ts

@@ -1,6 +1,5 @@
-import { Discord, Maybe } from "dfx";
-import { Ref } from "@effect/io/Ref";
-import { EffectSource } from "callbag-effect-ts/Source";
+import { Discord } from "dfx";
+import { Ref, Maybe, EffectSource } from "dfx/utils/common";
 export interface Options {
     token: string;
     intents: number;

package/DiscordGateway/Shard/index.d.ts

@@ -1,9 +1,9 @@
 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("../../index.js").RateLimiter, never, {
-    run: import("../../global.js").Effect<never, never, void>;
+export declare const make: (shard: [id: number, count: number]) => import("../../utils/common.js").Effect<import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").RateLimiter, never, {
+    run: import("../../utils/common.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>>;
-    send: (p: Discord.GatewayPayload) => import("../../global.js").Effect<never, never, boolean>;
-    reconnect: import("../../global.js").Effect<never, never, boolean>;
+    send: (p: Discord.GatewayPayload) => import("../../utils/common.js").Effect<never, never, boolean>;
+    reconnect: import("../../utils/common.js").Effect<never, never, boolean>;
 }>;

package/DiscordGateway/Shard/invalidSession.d.ts

@@ -1,5 +1,4 @@
-import { EffectSource } from "callbag-effect-ts/Source";
-import { Discord, Maybe } from "dfx";
-import { Ref } from "@effect/io/Ref";
+import { EffectSource, Ref, Maybe } from "dfx/utils/common";
+import { Discord } from "dfx";
 import { DiscordWS } from "dfx/gateway";
 export declare const fromRaw: <R, E>(raw: import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<any>>, latestReady: Ref<Maybe<Discord.ReadyEvent>>) => import("callbag-effect-ts/Source").EffectSource<R, E, import("../DiscordWS/index.js").Message>;

package/DiscordGateway/Shard/utils.d.ts

@@ -1,5 +1,4 @@
-import { EffectSource } from "callbag-effect-ts/Source";
-import { Discord, Maybe } from "dfx";
-import { Ref } from "@effect/io/Ref";
+import { EffectSource, Maybe, Ref } from "dfx/utils/common";
+import { Discord } from "dfx";
 export declare const opCode: <R, E>(source: import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<any>>) => <T = any>(code: Discord.GatewayOpcode) => import("callbag-effect-ts/Source").EffectSource<R, E, import("../../types.js").GatewayPayload<T>>;
-export declare const latest: <T>(f: (p: Discord.GatewayPayload) => import("../../index.js").Maybe<T>) => import("../../global.js").Effect<never, never, readonly [import("../../global.js").Ref<import("../../index.js").Maybe<T>>, (p: import("../../types.js").GatewayPayload<any>) => import("../../global.js").Effect<never, never, void>]>;
+export declare const latest: <T>(f: (p: Discord.GatewayPayload) => import("../../index.js").Maybe<T>) => import("../../utils/common.js").Effect<never, never, readonly [import("../../utils/common.js").Ref<import("../../index.js").Maybe<T>>, (p: import("../../types.js").GatewayPayload<any>) => import("../../utils/common.js").Effect<never, never, void>]>;

package/DiscordGateway/Shard/utils.js

@@ -2,7 +2,7 @@ import * as tsplus_module_1 from "callbag-effect-ts/Source/filter";
 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 "@effect/io/Ref";
-import * as tsplus_module_5 from "@fp-ts/data/Function";
+import * as tsplus_module_5 from "dfx/utils/common";
 export const opCode = (source) => (code) => tsplus_module_1.filter((p) => p.op === code)(source);
 const maybeUpdateRef = (f, ref) => tsplus_module_5.flow(f, (o) => tsplus_module_3.match(tsplus_module_2.unit, (a) => tsplus_module_4.set(tsplus_module_3.some(a))(ref))(o));
 export const latest = (f) => tsplus_module_2.map((ref) => [ref, maybeUpdateRef(f, ref)])(tsplus_module_4.make(tsplus_module_3.none));

package/DiscordGateway/ShardStore/index.d.ts

@@ -1,5 +1,4 @@
-import { Effect } from "@effect/io/Effect";
-import { Maybe } from "dfx";
+import { Effect, Maybe } from "dfx/utils/common";
 export interface ClaimIdContext {
     sharderCount: number;
     totalCount: number;
@@ -9,5 +8,5 @@ export interface ShardStore {
     allClaimed: (totalCount: number) => Effect<never, never, boolean>;
     heartbeat?: (shardId: number) => Effect<never, never, void>;
 }
-export declare const ShardStore: import("../../global.js").Tag<ShardStore>;
-export declare const LiveMemoryShardStore: import("../../global.js").Layer<never, never, ShardStore>;
+export declare const ShardStore: import("../../utils/common.js").Tag<ShardStore>;
+export declare const LiveMemoryShardStore: import("../../utils/common.js").Layer<never, never, ShardStore>;

package/DiscordGateway/ShardStore/index.js

@@ -1,4 +1,4 @@
-import * as tsplus_module_1 from "@fp-ts/data/Context";
+import * as tsplus_module_1 from "dfx/utils/common";
 import * as tsplus_module_2 from "@fp-ts/data/Option";
 import * as tsplus_module_3 from "@effect/io/Effect";
 import * as tsplus_module_4 from "@effect/io/Layer";

package/DiscordGateway/Sharder/index.d.ts

@@ -1,19 +1,18 @@
-import { Effect } from "@effect/io/Effect";
-import { Maybe, Discord } from "dfx";
-import { EffectSource } from "callbag-effect-ts/Source";
+import { Effect, Maybe, EffectSource } from "dfx/utils/common";
+import { Discord } from "dfx";
 import { Success } from "dfx/utils/effect";
 import { ShardStore } from "../ShardStore/index.js";
-declare const make: import("../../global.js").Effect<import("../../index.js").DiscordREST | import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | ShardStore | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").RateLimiter, never, {
+declare const make: import("../../utils/common.js").Effect<import("../../index.js").DiscordREST | import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | ShardStore | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").RateLimiter, never, {
     shards: import("callbag-effect-ts/Source").EffectSource<never, never, {
-        run: import("../../global.js").Effect<never, never, void>;
+        run: import("../../utils/common.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>>;
-        send: (p: import("../../types.js").GatewayPayload<any>) => import("../../global.js").Effect<never, never, boolean>;
-        reconnect: import("../../global.js").Effect<never, never, boolean>;
+        send: (p: import("../../types.js").GatewayPayload<any>) => import("../../utils/common.js").Effect<never, never, boolean>;
+        reconnect: import("../../utils/common.js").Effect<never, never, boolean>;
     }>;
 }>;
 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("../../index.js").DiscordREST | import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | ShardStore | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").RateLimiter, never, Sharder>;
+export declare const Sharder: import("../../utils/common.js").Tag<Sharder>;
+export declare const LiveSharder: import("../../utils/common.js").Layer<import("../../index.js").DiscordREST | import("../DiscordWS/index.js").DiscordWSCodec | import("../../Log/index.js").Log | ShardStore | import("../../DiscordConfig/index.js").DiscordConfig | import("../../index.js").RateLimiter, never, Sharder>;
 export {};

package/DiscordGateway/Sharder/index.js

@@ -15,7 +15,7 @@ import * as tsplus_module_14 from "@fp-ts/data/Option";
 import * as tsplus_module_15 from "callbag-effect-ts/Source/empty";
 import * as tsplus_module_16 from "callbag-effect-ts/Source/resource";
 import * as tsplus_module_17 from "dfx";
-import * as tsplus_module_18 from "@fp-ts/data/Context";
+import * as tsplus_module_18 from "dfx/utils/common";
 import { millis } from "@fp-ts/data/Duration";
 import { overridePull } from "callbag-effect-ts/Source";
 import { ShardStore } from "../ShardStore/index.js";

package/DiscordGateway/WS/index.d.ts

@@ -1,8 +1,6 @@
 /// <reference types="node" resolution-mode="require"/>
 /// <reference types="ws" />
-import { Ref } from "@effect/io/Ref";
-import { Effect } from "@effect/io/Effect";
-import { EffectSource } from "callbag-effect-ts/Source";
+import { Ref, Effect, EffectSource } from "dfx/utils/common";
 import WebSocket from "isomorphic-ws";
 export declare const Reconnect: unique symbol;
 export type Reconnect = typeof Reconnect;
@@ -18,4 +16,4 @@ export declare class WebSocketCloseError {
     readonly _tag = "WebSocketCloseError";
     constructor(code: number, reason: string);
 }
-export declare const make: (url: Ref<string>, takeOutbound: Effect<never, never, Message>) => import("../../global.js").Effect<import("../../Log/index.js").Log, never, import("callbag-effect-ts/Source").EffectSource<never, WebSocketError | WebSocketCloseError, WebSocket.Data>>;
+export declare const make: (url: Ref<string>, takeOutbound: Effect<never, never, Message>) => import("../../utils/common.js").Effect<import("../../Log/index.js").Log, never, import("callbag-effect-ts/Source").EffectSource<never, WebSocketError | WebSocketCloseError, WebSocket.Data>>;

package/DiscordGateway/index.d.ts

@@ -1,15 +1,14 @@
-import { EffectSource } from "callbag-effect-ts/Source";
+import { EffectSource, Effect } from "dfx/utils/common";
 import { Discord } from "dfx";
-import { Effect } from "@effect/io/Effect";
 import { Success } from "dfx/utils/effect";
 import { Sharder } from "./Sharder/index.js";
-export declare const make: import("../global.js").Effect<Sharder, never, {
+export declare const make: import("../utils/common.js").Effect<Sharder, never, {
     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>>;
     fromDispatch: <K extends keyof import("../types.js").ReceiveEvents>(event: K) => import("callbag-effect-ts/Source").EffectSource<never, never, import("../types.js").ReceiveEvents[K]>;
-    handleDispatch: <K_1 extends keyof import("../types.js").ReceiveEvents, R1, E1, A>(event: K_1, handle: (event: import("../types.js").ReceiveEvents[K_1]) => import("../global.js").Effect<R1, E1, A>) => import("../global.js").Effect<R1, E1, void>;
+    handleDispatch: <K_1 extends keyof import("../types.js").ReceiveEvents, R1, E1, A>(event: K_1, handle: (event: import("../types.js").ReceiveEvents[K_1]) => import("../utils/common.js").Effect<R1, E1, A>) => import("../utils/common.js").Effect<R1, E1, void>;
 }>;
 export interface DiscordGateway extends Success<typeof make> {
 }
-export declare const DiscordGateway: import("../global.js").Tag<DiscordGateway>;
-export declare const LiveDiscordGateway: import("../global.js").Layer<Sharder, never, DiscordGateway>;
+export declare const DiscordGateway: import("../utils/common.js").Tag<DiscordGateway>;
+export declare const LiveDiscordGateway: import("../utils/common.js").Layer<Sharder, never, DiscordGateway>;

package/DiscordGateway/index.js

@@ -5,7 +5,7 @@ import * as tsplus_module_4 from "callbag-effect-ts/Source/chainPar";
 import * as tsplus_module_5 from "callbag-effect-ts/Source/run";
 import * as tsplus_module_6 from "callbag-effect-ts/Source/share";
 import * as tsplus_module_7 from "@effect/io/Effect";
-import * as tsplus_module_8 from "@fp-ts/data/Context";
+import * as tsplus_module_8 from "dfx/utils/common";
 import * as tsplus_module_9 from "@effect/io/Layer";
 import { Sharder } from "./Sharder/index.js";
 const fromDispatchFactory = (source) => (event) => tsplus_module_2.map((p) => p.d)(tsplus_module_1.filter((p) => p.t === event)(source));

package/DiscordREST/index.d.ts

@@ -1,8 +1,8 @@
 import { BucketDetails, FetchError, StatusCodeError, JsonParseError, Discord } from "dfx";
-import { Effect } from "@effect/io/Effect";
+import { Effect } from "dfx/utils/common";
 import { Success } from "dfx/utils/effect";
 import { ResponseWithData, RestResponse } from "./types.js";
-declare const make: import("../global.js").Effect<import("../Log/index.js").Log | import("../DiscordConfig/index.js").DiscordConfig | import("../index.js").Http | import("../index.js").RateLimitStore | import("../index.js").RateLimiter, never, {
+declare const make: import("../utils/common.js").Effect<import("../Log/index.js").Log | import("../DiscordConfig/index.js").DiscordConfig | import("../index.js").Http | import("../index.js").RateLimitStore | import("../index.js").RateLimiter, never, {
     addGuildMember: (guildId: string, userId: string, params?: Partial<import("../types.js").AddGuildMemberParams> | undefined, options?: RequestInit | undefined) => RestResponse<import("../types.js").GuildMember>;
     addGuildMemberRole: (guildId: string, userId: string, roleId: string, options?: RequestInit | undefined) => RestResponse<any>;
     addThreadMember: (channelId: string, userId: string, options?: RequestInit | undefined) => RestResponse<any>;
@@ -176,10 +176,10 @@ declare const make: import("../global.js").Effect<import("../Log/index.js").Log
     syncGuildTemplate: (guildId: string, templateCode: string, options?: RequestInit | undefined) => RestResponse<import("../types.js").GuildTemplate>;
     triggerTypingIndicator: (channelId: string, options?: RequestInit | undefined) => RestResponse<any>;
     unpinMessage: (channelId: string, messageId: string, options?: RequestInit | undefined) => RestResponse<any>;
-    request: <A = unknown>(path: string, init?: RequestInit) => import("../global.js").Effect<never, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, ResponseWithData<A>>;
+    request: <A = unknown>(path: string, init?: RequestInit) => import("../utils/common.js").Effect<never, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, ResponseWithData<A>>;
 }>;
 export interface DiscordREST extends Success<typeof make> {
 }
-export declare const DiscordREST: import("../global.js").Tag<DiscordREST>;
-export declare const LiveDiscordREST: import("../global.js").Layer<import("../Log/index.js").Log | import("../DiscordConfig/index.js").DiscordConfig | import("../index.js").Http | import("../index.js").RateLimitStore | import("../index.js").RateLimiter, never, DiscordREST>;
+export declare const DiscordREST: import("../utils/common.js").Tag<DiscordREST>;
+export declare const LiveDiscordREST: import("../utils/common.js").Layer<import("../Log/index.js").Log | import("../DiscordConfig/index.js").DiscordConfig | import("../index.js").Http | import("../index.js").RateLimitStore | import("../index.js").RateLimiter, never, DiscordREST>;
 export {};

package/DiscordREST/index.js

@@ -4,7 +4,7 @@ import * as tsplus_module_3 from "@fp-ts/data/Duration";
 import * as tsplus_module_4 from "@fp-ts/data/Option";
 import * as tsplus_module_5 from "@fp-ts/data/HashSet";
 import * as tsplus_module_6 from "@effect/io/Ref";
-import * as tsplus_module_7 from "@fp-ts/data/Context";
+import * as tsplus_module_7 from "dfx/utils/common";
 import * as tsplus_module_8 from "@effect/io/Layer";
 import { millis } from "@fp-ts/data/Duration";
 import { rateLimitFromHeaders, routeFromConfig, retryAfter } from "./utils.js";

package/DiscordREST/types.d.ts

@@ -1,4 +1,4 @@
-import { Effect } from "@effect/io/Effect";
+import { Effect } from "dfx/utils/common";
 import { JsonParseError, BlobError, FetchError, StatusCodeError } from "dfx";
 export interface ResponseWithData<A> {
     response: Response;

package/DiscordREST/utils.d.ts

@@ -1,9 +1,9 @@
 export declare const routeFromConfig: (path: string, init: RequestInit) => string;
 export declare const numberHeader: (headers: Headers) => (key: string) => import("../index.js").Maybe<number>;
-export declare const retryAfter: (headers: Headers) => import("../index.js").Maybe<import("../global.js").Duration>;
+export declare const retryAfter: (headers: Headers) => import("../index.js").Maybe<import("../utils/common.js").Duration>;
 export declare const rateLimitFromHeaders: (headers: Headers) => import("../index.js").Maybe<{
     readonly bucket: string;
-    readonly retryAfter: import("../global.js").Duration;
+    readonly retryAfter: import("../utils/common.js").Duration;
     readonly limit: number;
     readonly remaining: number;
 }>;

package/Helpers/interactions.d.ts

@@ -1,4 +1,5 @@
-import { Discord, Maybe } from "dfx";
+import { Discord } from "dfx";
+import { Maybe } from "dfx/utils/common";
 /**
  * Maybe find a sub-command within the interaction options.
  */
@@ -22,11 +23,11 @@ export declare const optionsWithNested: (data: Pick<Discord.ApplicationCommandDa
 /**
  * Return the interaction options as a name / value map.
  */
-export declare const transformOptions: (options: Discord.ApplicationCommandInteractionDataOption[]) => import("../global.js").HashMap<string, string | undefined>;
+export declare const transformOptions: (options: Discord.ApplicationCommandInteractionDataOption[]) => import("../utils/common.js").HashMap<string, string | undefined>;
 /**
  * Return the interaction options as a name / value map.
  */
-export declare const optionsMap: (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../global.js").HashMap<string, string | undefined>;
+export declare const optionsMap: (data: Pick<import("../types.js").ApplicationCommandDatum, "options">) => import("../utils/common.js").HashMap<string, string | undefined>;
 /**
  * Try find a matching option from the interaction.
  */
@@ -62,11 +63,11 @@ export declare const componentsWithValue: (a: import("../types.js").ModalSubmitD
 /**
  * Return the interaction components as an id / value map.
  */
-export declare const transformComponents: (options: Discord.Component[]) => import("../global.js").HashMap<string, string | undefined>;
+export declare const transformComponents: (options: Discord.Component[]) => import("../utils/common.js").HashMap<string, string | undefined>;
 /**
  * Return the interaction components as an id / value map.
  */
-export declare const componentsMap: (a: import("../types.js").ModalSubmitDatum) => import("../global.js").HashMap<string, string | undefined>;
+export declare const componentsMap: (a: import("../types.js").ModalSubmitDatum) => import("../utils/common.js").HashMap<string, string | undefined>;
 /**
  * Try find a matching component from the interaction.
  */

package/Helpers/interactions.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "dfx";
-import * as tsplus_module_2 from "@fp-ts/data/Function";
+import * as tsplus_module_2 from "dfx/utils/common";
 import * as tsplus_module_3 from "@fp-ts/data/Option";
 import * as tsplus_module_4 from "@fp-ts/data/HashMap";
 import * as Arr from "@fp-ts/data/ReadonlyArray";

package/Helpers/permissions.d.ts

@@ -1,5 +1,5 @@
 import { Discord } from "dfx";
-import { Effect } from "@effect/io/Effect";
+import { Effect } from "dfx/utils/common";
 /**
  * A constant of all the permissions
  */
@@ -36,6 +36,6 @@ export declare const applyOverwrites: (permissions: bigint) => (overwrites: Disc
 interface RolesCache<E> {
     getForParent: (parentId: string) => Effect<never, E, ReadonlyMap<string, Discord.Role>>;
 }
-export declare const hasInChannel: <E>(rolesCache: RolesCache<E>, permission: bigint) => (channel: Discord.Channel, memberOrRole: Discord.GuildMember | Discord.Role) => import("../global.js").Effect<never, E, boolean>;
-export declare const hasInGuild: <E>(rolesCache: RolesCache<E>, permission: bigint) => (guildId: Discord.Snowflake, member: Discord.GuildMember) => import("../global.js").Effect<never, E, boolean>;
+export declare const hasInChannel: <E>(rolesCache: RolesCache<E>, permission: bigint) => (channel: Discord.Channel, memberOrRole: Discord.GuildMember | Discord.Role) => import("../utils/common.js").Effect<never, E, boolean>;
+export declare const hasInGuild: <E>(rolesCache: RolesCache<E>, permission: bigint) => (guildId: Discord.Snowflake, member: Discord.GuildMember) => import("../utils/common.js").Effect<never, E, boolean>;
 export {};

package/Helpers/permissions.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "dfx";
-import * as tsplus_module_2 from "@fp-ts/data/Function";
+import * as tsplus_module_2 from "dfx/utils/common";
 import * as tsplus_module_3 from "@effect/io/Effect";
 /**
  * A constant of all the permissions

package/Http/index.d.ts

@@ -1,16 +1,16 @@
 declare const make: () => {
-    request: (url: URL | string, init?: RequestInit) => import("../global.js").Effect<never, FetchError | StatusCodeError, Response>;
-    requestWithJson: <A = unknown>(url: URL | string, init?: RequestInit) => import("../global.js").Effect<never, FetchError | StatusCodeError, {
+    request: (url: URL | string, init?: RequestInit) => import("../utils/common.js").Effect<never, FetchError | StatusCodeError, Response>;
+    requestWithJson: <A = unknown>(url: URL | string, init?: RequestInit) => import("../utils/common.js").Effect<never, FetchError | StatusCodeError, {
         response: Response;
-        json: import("../global.js").Effect<never, JsonParseError, A>;
-        blob: import("../global.js").Effect<never, BlobError, Blob>;
-        text: import("../global.js").Effect<never, never, string>;
+        json: import("../utils/common.js").Effect<never, JsonParseError, A>;
+        blob: import("../utils/common.js").Effect<never, BlobError, Blob>;
+        text: import("../utils/common.js").Effect<never, never, string>;
     }>;
 };
 export interface Http extends ReturnType<typeof make> {
 }
-export declare const Http: import("../global.js").Tag<Http>;
-export declare const LiveHttp: import("../global.js").Layer<never, never, Http>;
+export declare const Http: import("../utils/common.js").Tag<Http>;
+export declare const LiveHttp: import("../utils/common.js").Layer<never, never, Http>;
 export declare class FetchError {
     readonly reason: unknown;
     readonly _tag = "FetchError";
@@ -27,11 +27,11 @@ export declare class JsonParseError {
     readonly _tag = "JsonParseError";
     constructor(reason: unknown);
 }
-export declare const json: <A = unknown>(r: Response) => import("../global.js").Effect<never, JsonParseError, A>;
+export declare const json: <A = unknown>(r: Response) => import("../utils/common.js").Effect<never, JsonParseError, A>;
 export declare class BlobError {
     readonly reason: unknown;
     readonly _tag = "BlobError";
     constructor(reason: unknown);
 }
-export declare const blob: (r: Response) => import("../global.js").Effect<never, BlobError, Blob>;
+export declare const blob: (r: Response) => import("../utils/common.js").Effect<never, BlobError, Blob>;
 export {};

package/Http/index.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@fp-ts/data/Context";
+import * as tsplus_module_2 from "dfx/utils/common";
 import * as tsplus_module_3 from "@effect/io/Layer";
 const make = () => {
     const request = (url, init = {}) => tsplus_module_1.filterOrElseWith((r) => r.status < 300, (r) => tsplus_module_1.fail(new StatusCodeError(r)))(tsplus_module_1.tryCatchPromiseAbort((signal) => fetch(url, {

package/Interactions/context.d.ts

@@ -1,17 +1,17 @@
 import { Discord } from "dfx";
 import { Effect, EffectTypeId } from "@effect/io/Effect";
-export declare const InteractionContext: import("../global.js").Tag<import("../types.js").Interaction>;
-export declare const ApplicationCommandContext: import("../global.js").Tag<import("../types.js").ApplicationCommandDatum>;
-export declare const MessageComponentContext: import("../global.js").Tag<import("../types.js").MessageComponentDatum>;
-export declare const ModalSubmitContext: import("../global.js").Tag<import("../types.js").ModalSubmitDatum>;
+export declare const InteractionContext: import("../utils/common.js").Tag<import("../types.js").Interaction>;
+export declare const ApplicationCommandContext: import("../utils/common.js").Tag<import("../types.js").ApplicationCommandDatum>;
+export declare const MessageComponentContext: import("../utils/common.js").Tag<import("../types.js").MessageComponentDatum>;
+export declare const ModalSubmitContext: import("../utils/common.js").Tag<import("../types.js").ModalSubmitDatum>;
 export interface FocusedOptionContext {
     readonly focusedOption: Discord.ApplicationCommandInteractionDataOption;
 }
-export declare const FocusedOptionContext: import("../global.js").Tag<FocusedOptionContext>;
+export declare const FocusedOptionContext: import("../utils/common.js").Tag<FocusedOptionContext>;
 export interface SubCommandContext {
     readonly command: Discord.ApplicationCommandInteractionDataOption;
 }
-export declare const SubCommandContext: import("../global.js").Tag<SubCommandContext>;
+export declare const SubCommandContext: import("../utils/common.js").Tag<SubCommandContext>;
 export declare const interaction: Effect<import("../types.js").Interaction, never, import("../types.js").Interaction>;
 export declare const command: Effect<import("../types.js").ApplicationCommandDatum, never, import("../types.js").ApplicationCommandDatum>;
 export declare class ResolvedDataNotFound {
@@ -38,7 +38,7 @@ export declare const handleSubCommands: <NER extends Record<string, Effect<any,
     };
 }] ? E : never), import("../types.js").InteractionResponse>;
 export declare const currentSubCommand: Effect<SubCommandContext, never, import("../types.js").ApplicationCommandInteractionDataOption>;
-export declare const optionsMap: Effect<import("../types.js").ApplicationCommandDatum, never, import("../global.js").HashMap<string, string | undefined>>;
+export declare const optionsMap: Effect<import("../types.js").ApplicationCommandDatum, never, import("../utils/common.js").HashMap<string, string | undefined>>;
 export declare class RequiredOptionNotFound {
     readonly data: Discord.ApplicationCommandDatum | Discord.ApplicationCommandInteractionDataOption;
     readonly name: string;
@@ -48,4 +48,4 @@ export declare class RequiredOptionNotFound {
 export declare const option: (name: string) => Effect<import("../types.js").ApplicationCommandDatum, never, import("../index.js").Maybe<import("../types.js").ApplicationCommandInteractionDataOption>>;
 export declare const optionValue: (name: string) => Effect<import("../types.js").ApplicationCommandDatum, RequiredOptionNotFound, string>;
 export declare const optionValueOptional: (name: string) => Effect<import("../types.js").ApplicationCommandDatum, never, import("../index.js").Maybe<string>>;
-export declare const modalValues: Effect<import("../types.js").ModalSubmitDatum, never, import("../global.js").HashMap<string, string | undefined>>;
+export declare const modalValues: Effect<import("../types.js").ModalSubmitDatum, never, import("../utils/common.js").HashMap<string, string | undefined>>;

package/Interactions/context.js

@@ -1,7 +1,6 @@
-import * as tsplus_module_1 from "@fp-ts/data/Context";
+import * as tsplus_module_1 from "dfx/utils/common";
 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/Function";
 import { EffectTypeId } from "@effect/io/Effect";
 import * as Arr from "@fp-ts/data/ReadonlyArray";
 import * as IxHelpers from "../Helpers/interactions.js";
@@ -32,7 +31,7 @@ export class SubCommandNotFound {
         this.data = data;
     }
 }
-export const handleSubCommands = (commands) => tsplus_module_2.flatMap((data) => tsplus_module_4.pipe(IxHelpers.allSubCommands(data), Arr.findFirst((a) => !!commands[a.name]), (o) => tsplus_module_3.toEither(() => new SubCommandNotFound(data))(o), tsplus_module_2.fromEither, (a) => tsplus_module_2.flatMap((command) => tsplus_module_4.pipe(commands[command.name], tsplus_module_2.provideService(SubCommandContext)({ command })))(a)))(tsplus_module_2.service(ApplicationCommandContext));
+export const handleSubCommands = (commands) => tsplus_module_2.flatMap((data) => tsplus_module_1.pipe(IxHelpers.allSubCommands(data), Arr.findFirst((a) => !!commands[a.name]), (o) => tsplus_module_3.toEither(() => new SubCommandNotFound(data))(o), tsplus_module_2.fromEither, (a) => tsplus_module_2.flatMap((command) => tsplus_module_1.pipe(commands[command.name], tsplus_module_2.provideService(SubCommandContext)({ command })))(a)))(tsplus_module_2.service(ApplicationCommandContext));
 export const currentSubCommand = tsplus_module_2.serviceWith(SubCommandContext)((a) => a.command);
 export const optionsMap = tsplus_module_2.serviceWith(ApplicationCommandContext)(IxHelpers.optionsMap);
 export class RequiredOptionNotFound {

package/Interactions/context.js.map

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

package/Interactions/definitions.d.ts

@@ -1,4 +1,5 @@
-import { Discord, Maybe } from "dfx";
+import { Discord } from "dfx";
+import { Maybe } from "dfx/utils/common";
 import { Effect, EffectTypeId } from "@effect/io/Effect";
 import { FocusedOptionContext, ResolvedDataNotFound, SubCommandContext } from "./context.js";
 import type { F } from "ts-toolbelt";

package/Interactions/gateway.d.ts

@@ -1,4 +1,4 @@
-import { Effect } from "@effect/io/Effect";
+import { Effect } from "dfx/utils/common";
 import { DiscordREST, Discord, FetchError, StatusCodeError, JsonParseError } from "dfx";
 import { DefinitionNotFound } from "./handlers.js";
 import { InteractionBuilder } from "./index.js";
@@ -9,4 +9,4 @@ export interface RunOpts {
  * @tsplus pipeable dfx/InteractionBuilder runGateway
  * @tsplus location "dfx/Interactions/gateway"
  */
-export declare const run: <R, R2, E, E2>(postHandler: (effect: import("../global.js").Effect<R | import("../index.js").DiscordREST | import("../types.js").Interaction, E | import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError | DefinitionNotFound, void>) => import("../global.js").Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E>) => import("../global.js").Effect<import("../index.js").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway | Exclude<R2, import("../types.js").Interaction>, E2 | import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, void>;
+export declare const run: <R, R2, E, E2>(postHandler: (effect: import("../utils/common.js").Effect<R | import("../index.js").DiscordREST | import("../types.js").Interaction, E | import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError | DefinitionNotFound, void>) => import("../utils/common.js").Effect<R2, E2, void>, { sync }?: RunOpts) => (ix: InteractionBuilder<R, E>) => import("../utils/common.js").Effect<import("../index.js").DiscordREST | import("../DiscordGateway/index.js").DiscordGateway | Exclude<R2, import("../types.js").Interaction>, E2 | import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, void>;

package/Interactions/gateway.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@fp-ts/data/Function";
+import * as tsplus_module_2 from "dfx/utils/common";
 import * as tsplus_module_3 from "dfx";
 import * as tsplus_module_4 from "dfx/gateway";
 import { handlers } from "./handlers.js";

package/Interactions/handlers.d.ts

@@ -1,5 +1,5 @@
 import { Discord } from "dfx";
-import { Effect } from "@effect/io/Effect";
+import { Effect } from "dfx/utils/common";
 import * as D from "./definitions.js";
 export declare class DefinitionNotFound {
     readonly interaction: Discord.Interaction;

package/Interactions/handlers.js

@@ -1,7 +1,7 @@
 import * as tsplus_module_1 from "dfx";
 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/Function";
+import * as tsplus_module_4 from "dfx/utils/common";
 import * as tsplus_module_5 from "@fp-ts/data/Chunk";
 import * as Ctx from "./context.js";
 import * as Arr from "@fp-ts/data/ReadonlyArray";

package/Interactions/index.d.ts

@@ -1,4 +1,4 @@
-import { Effect } from "@effect/io/Effect";
+import { Effect } from "dfx/utils/common";
 import { DiscordREST, Discord } from "dfx";
 import * as D from "./definitions.js";
 export * from "./context.js";
@@ -12,12 +12,12 @@ export declare class InteractionBuilder<R, E> {
     constructor(definitions: D.InteractionDefinition<R, E>[]);
     add<R1, E1>(definition: D.InteractionDefinition<R1, E1>): InteractionBuilder<R | R1, E | E1>;
     concat<R1, E1>(builder: InteractionBuilder<R1, E1>): InteractionBuilder<R | R1, E | E1>;
-    get syncGlobal(): import("../global.js").Effect<import("../index.js").DiscordREST, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, import("../DiscordREST/types.js").ResponseWithData<import("../types.js").ApplicationCommand[]>>;
-    syncGuild(appId: Discord.Snowflake, guildId: Discord.Snowflake): import("../global.js").Effect<import("../index.js").DiscordREST, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, import("../DiscordREST/types.js").ResponseWithData<import("../types.js").ApplicationCommand[]>>;
+    get syncGlobal(): import("../utils/common.js").Effect<import("../index.js").DiscordREST, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, import("../DiscordREST/types.js").ResponseWithData<import("../types.js").ApplicationCommand[]>>;
+    syncGuild(appId: Discord.Snowflake, guildId: Discord.Snowflake): import("../utils/common.js").Effect<import("../index.js").DiscordREST, import("../index.js").FetchError | import("../index.js").StatusCodeError | import("../index.js").JsonParseError, import("../DiscordREST/types.js").ResponseWithData<import("../types.js").ApplicationCommand[]>>;
 }
 export declare const builder: InteractionBuilder<never, never>;
-export declare const id: (query: string) => (customId: string) => import("../global.js").Effect<never, never, boolean>;
-export declare const idStartsWith: (query: string) => (customId: string) => import("../global.js").Effect<never, never, boolean>;
-export declare const idRegex: (query: RegExp) => (customId: string) => import("../global.js").Effect<never, never, boolean>;
-export declare const option: (command: string, optionName: string) => (data: Pick<Discord.ApplicationCommandDatum, "name">, focusedOption: Pick<Discord.ApplicationCommandInteractionDataOption, "name">) => import("../global.js").Effect<never, never, boolean>;
-export declare const optionOnly: (optionName: string) => (_: unknown, focusedOption: Pick<Discord.ApplicationCommandInteractionDataOption, "name">) => import("../global.js").Effect<never, never, boolean>;
+export declare const id: (query: string) => (customId: string) => import("../utils/common.js").Effect<never, never, boolean>;
+export declare const idStartsWith: (query: string) => (customId: string) => import("../utils/common.js").Effect<never, never, boolean>;
+export declare const idRegex: (query: RegExp) => (customId: string) => import("../utils/common.js").Effect<never, never, boolean>;
+export declare const option: (command: string, optionName: string) => (data: Pick<Discord.ApplicationCommandDatum, "name">, focusedOption: Pick<Discord.ApplicationCommandInteractionDataOption, "name">) => import("../utils/common.js").Effect<never, never, boolean>;
+export declare const optionOnly: (optionName: string) => (_: unknown, focusedOption: Pick<Discord.ApplicationCommandInteractionDataOption, "name">) => import("../utils/common.js").Effect<never, never, boolean>;

package/Interactions/webhook.d.ts

@@ -1,6 +1,5 @@
 import { Discord } from "dfx";
-import { Effect } from "@effect/io/Effect";
-import { Cause } from "@effect/io/Cause";
+import { Effect, Cause } from "dfx/utils/common";
 import { DefinitionNotFound } from "./handlers.js";
 import { InteractionBuilder } from "./index.js";
 export declare class BadWebhookSignature {
@@ -17,8 +16,8 @@ declare const makeConfig: ({ applicationId, publicKey }: MakeConfigOpts) => {
 };
 export interface WebhookConfig extends ReturnType<typeof makeConfig> {
 }
-export declare const WebhookConfig: import("../global.js").Tag<WebhookConfig>;
-export declare const makeConfigLayer: (a_0: MakeConfigOpts) => import("../global.js").Layer<never, never, WebhookConfig>;
+export declare const WebhookConfig: import("../utils/common.js").Tag<WebhookConfig>;
+export declare const makeConfigLayer: (a_0: MakeConfigOpts) => import("../utils/common.js").Layer<never, never, WebhookConfig>;
 export declare class WebhookParseError {
     readonly reason: unknown;
     readonly _tag = "WebhookParseError";
@@ -34,7 +33,7 @@ export interface HandleWebhookOpts<E> {
  * @tsplus getter dfx/InteractionBuilder webhookHandler
  * @tsplus location "dfx/Interactions/webhook"
  */
-export declare const makeHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ headers, body, success, error, }: HandleWebhookOpts<DefinitionNotFound | BadWebhookSignature | WebhookParseError | E>) => import("../global.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, never, void>;
+export declare const makeHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ headers, body, success, error, }: HandleWebhookOpts<DefinitionNotFound | BadWebhookSignature | WebhookParseError | E>) => import("../utils/common.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, never, void>;
 /**
  * @tsplus getter dfx/InteractionBuilder simpleWebhookHandler
  * @tsplus location "dfx/Interactions/webhook"
@@ -42,5 +41,5 @@ export declare const makeHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ hea
 export declare const makeSimpleHandler: <R, E>(ix: InteractionBuilder<R, E>) => ({ headers, body }: {
     headers: Headers;
     body: string;
-}) => import("../global.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, DefinitionNotFound | BadWebhookSignature | WebhookParseError | E, import("../types.js").InteractionResponse>;
+}) => import("../utils/common.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, DefinitionNotFound | BadWebhookSignature | WebhookParseError | E, import("../types.js").InteractionResponse>;
 export {};

package/Interactions/webhook.js

@@ -1,9 +1,8 @@
 import * as tsplus_module_1 from "@fp-ts/data/Option";
 import * as tsplus_module_2 from "@fp-ts/data/Either";
-import * as tsplus_module_3 from "@fp-ts/data/Context";
+import * as tsplus_module_3 from "dfx/utils/common";
 import * as tsplus_module_4 from "@effect/io/Layer";
-import * as tsplus_module_5 from "@fp-ts/data/Function";
-import * as tsplus_module_6 from "@effect/io/Effect";
+import * as tsplus_module_5 from "@effect/io/Effect";
 import Nacl from "tweetnacl";
 import { handlers } from "./handlers.js";
 import { InteractionContext } from "./index.js";
@@ -23,7 +22,7 @@ const makeConfig = ({ applicationId, publicKey }) => ({
     publicKey: fromHex(publicKey),
 });
 export const WebhookConfig = tsplus_module_3.Tag();
-export const makeConfigLayer = tsplus_module_5.flow(makeConfig, tsplus_module_4.succeed(WebhookConfig));
+export const makeConfigLayer = tsplus_module_3.flow(makeConfig, tsplus_module_4.succeed(WebhookConfig));
 export class WebhookParseError {
     reason;
     _tag = "WebhookParseError";
@@ -31,11 +30,11 @@ export class WebhookParseError {
         this.reason = reason;
     }
 }
-const fromHeadersAndBody = (headers, body) => tsplus_module_6.flatMap(({ publicKey }) => tsplus_module_6.flatMap(() => tsplus_module_6.tryCatch(() => JSON.parse(body), (reason) => new WebhookParseError(reason)))(tsplus_module_6.fromEither(checkSignature(publicKey, headers, body))))(tsplus_module_6.service(WebhookConfig));
+const fromHeadersAndBody = (headers, body) => tsplus_module_5.flatMap(({ publicKey }) => tsplus_module_5.flatMap(() => tsplus_module_5.tryCatch(() => JSON.parse(body), (reason) => new WebhookParseError(reason)))(tsplus_module_5.fromEither(checkSignature(publicKey, headers, body))))(tsplus_module_5.service(WebhookConfig));
 const run = (definitions) => {
     const handler = handlers(definitions);
-    return (headers, body) => tsplus_module_6.flatMap(interaction => {
-        const provide = tsplus_module_6.provideService(InteractionContext)(interaction);
+    return (headers, body) => tsplus_module_5.flatMap(interaction => {
+        const provide = tsplus_module_5.provideService(InteractionContext)(interaction);
         return provide(handler[interaction.type](interaction));
     })(fromHeadersAndBody(headers, body));
 };
@@ -44,7 +43,7 @@ const run = (definitions) => {
  */
 export const makeHandler = (ix) => {
     const handle = run(ix.definitions);
-    return ({ headers, body, success, error, }) => tsplus_module_6.catchAllCause(error)(tsplus_module_6.flatMap(success)(handle(headers, body)));
+    return ({ headers, body, success, error, }) => tsplus_module_5.catchAllCause(error)(tsplus_module_5.flatMap(success)(handle(headers, body)));
 };
 /**
  * @tsplus getter dfx/InteractionBuilder simpleWebhookHandler

package/Interactions/webhook.js.map

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

package/Log/index.d.ts

@@ -1,12 +1,12 @@
 declare const make: (debug?: boolean) => {
-    info: (...args: any[]) => import("../global.js").Effect<never, never, void>;
-    debug: (...args: any[]) => import("../global.js").Effect<never, never, void>;
+    info: (...args: any[]) => import("../utils/common.js").Effect<never, never, void>;
+    debug: (...args: any[]) => import("../utils/common.js").Effect<never, never, void>;
 };
 export interface Log extends ReturnType<typeof make> {
 }
-export declare const Log: import("../global.js").Tag<Log>;
-export declare const LiveLog: import("../global.js").Layer<never, never, Log>;
-export declare const LiveLogDebug: import("../global.js").Layer<never, never, Log>;
-export declare const info: (...args: any[]) => import("../global.js").Effect<Log, never, void>;
-export declare const debug: (...args: any[]) => import("../global.js").Effect<Log, never, void>;
+export declare const Log: import("../utils/common.js").Tag<Log>;
+export declare const LiveLog: import("../utils/common.js").Layer<never, never, Log>;
+export declare const LiveLogDebug: import("../utils/common.js").Layer<never, never, Log>;
+export declare const info: (...args: any[]) => import("../utils/common.js").Effect<Log, never, void>;
+export declare const debug: (...args: any[]) => import("../utils/common.js").Effect<Log, never, void>;
 export {};

package/Log/index.js

@@ -1,5 +1,5 @@
 import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "@fp-ts/data/Context";
+import * as tsplus_module_2 from "dfx/utils/common";
 import * as tsplus_module_3 from "@effect/io/Layer";
 const make = (debug = false) => ({
     info: (...args) => tsplus_module_1.sync(() => {

package/RateLimit/index.d.ts

@@ -1,6 +1,4 @@
-import { Effect } from "@effect/io/Effect";
-import { Maybe } from "dfx";
-import { Duration } from "@fp-ts/data/Duration";
+import { Effect, Maybe, Duration } from "dfx/utils/common";
 import { Success } from "dfx/utils/effect";
 export type BucketDetails = {
     key: "global" | string;
@@ -14,13 +12,13 @@ export interface RateLimitStore {
     putBucketRoute: (route: string, bucketKey: string) => Effect<never, never, void>;
     incrementCounter: (key: string, window: number, limit: number) => Effect<never, never, readonly [count: number, ttl: number]>;
 }
-export declare const RateLimitStore: import("../global.js").Tag<RateLimitStore>;
-export declare const LiveMemoryRateLimitStore: import("../global.js").Layer<never, never, RateLimitStore>;
-declare const makeLimiter: import("../global.js").Effect<import("../Log/index.js").Log | RateLimitStore, never, {
-    maybeWait: (key: string, window: Duration, limit: number, multiplier?: number) => import("../global.js").Effect<never, never, void>;
+export declare const RateLimitStore: import("../utils/common.js").Tag<RateLimitStore>;
+export declare const LiveMemoryRateLimitStore: import("../utils/common.js").Layer<never, never, RateLimitStore>;
+declare const makeLimiter: import("../utils/common.js").Effect<import("../Log/index.js").Log | RateLimitStore, never, {
+    maybeWait: (key: string, window: Duration, limit: number, multiplier?: number) => import("../utils/common.js").Effect<never, never, void>;
 }>;
 export interface RateLimiter extends Success<typeof makeLimiter> {
 }
-export declare const RateLimiter: import("../global.js").Tag<RateLimiter>;
-export declare const LiveRateLimiter: import("../global.js").Layer<import("../Log/index.js").Log | RateLimitStore, never, RateLimiter>;
+export declare const RateLimiter: import("../utils/common.js").Tag<RateLimiter>;
+export declare const LiveRateLimiter: import("../utils/common.js").Layer<import("../Log/index.js").Log | RateLimitStore, never, RateLimiter>;
 export {};

package/RateLimit/index.js

@@ -1,4 +1,4 @@
-import * as tsplus_module_1 from "@fp-ts/data/Context";
+import * as tsplus_module_1 from "dfx/utils/common";
 import * as tsplus_module_2 from "@effect/io/Layer";
 import * as tsplus_module_3 from "@effect/io/Effect";
 import * as tsplus_module_4 from "dfx";

package/RateLimit/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/RateLimit/index.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AA6BrC,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAW,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AAE/E,MAAM,WAAW,2BACT,KAAK,wBACL,GAAG;IAET,MAAM,SAAS,GAAG,CAChB,GAAW,EACX,MAAgB,EAChB,KAAa,EACb,UAAU,GAAG,IAAI,EACjB,EAAE;QACF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,UAAU,CAAA;QAC3C,8BAAO,2CAAA,oBAGA,CAAC,CAAC,EAAE,EAAE,CACT,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACpC,GAAG;YACH,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ;YACR,KAAK;YACL,KAAK,EAAE,CAAC,CAAC,MAAM;SAChB,CAAC,EAVC,oBAEA,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAFxD,KAAK;aACT,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CACuB,CAS7D,CACiB,EAAO;IAC7B,CAAC,CAAA;IAED,OAAO,EAAE,SAAS,EAAE,CAAA;GAxBN,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,GADrB,wBAAe,cAAc,CAAC,CA0B9C,CAAA;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAA,GAAG,EAAe,CAAA;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,2BAAiB,WAAW,CAAC,CAAC,WAAW,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/RateLimit/index.ts"],"names":[],"mappings":";;;;AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,KAAK,MAAM,MAAM,aAAa,CAAA;AA6BrC,MAAM,CAAC,MAAM,cAAc,GAAG,gBAAA,GAAG,EAAkB,CAAA;AACnD,MAAM,CAAC,MAAM,wBAAwB,GAAG,qBAAW,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AAE/E,MAAM,WAAW,2BACT,KAAK,wBACL,GAAG;IAET,MAAM,SAAS,GAAG,CAChB,GAAW,EACX,MAAgB,EAChB,KAAa,EACb,UAAU,GAAG,IAAI,EACjB,EAAE;QACF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,UAAU,CAAA;QAE3C,8BAAO,2CAAA,oBAGA,CAAC,CAAC,EAAE,EAAE,CACT,GAAG,CAAC,KAAK,CAAC,0BAA0B,EAAE;YACpC,GAAG;YACH,MAAM,EAAE,MAAM,CAAC,MAAM;YACrB,QAAQ;YACR,KAAK;YACL,KAAK,EAAE,CAAC,CAAC,MAAM;SAChB,CAAC,EAVC,oBAEA,CAAC,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,EAFxD,KAAK;aACT,gBAAgB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CACuB,CAS7D,CACiB,EAAO;IAC7B,CAAC,CAAA;IAED,OAAO,EAAE,SAAS,EAAE,CAAA;GAzBN,wBAAe,gBAAA,GAAG,CAAC,GAAG,CAAC,GADrB,wBAAe,cAAc,CAAC,CA2B9C,CAAA;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,gBAAA,GAAG,EAAe,CAAA;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,2BAAiB,WAAW,CAAC,CAAC,WAAW,CAAC,CAAA"}

package/RateLimit/utils.d.ts

@@ -1,2 +1,2 @@
-import { Duration } from "@fp-ts/data/Duration";
+import { Duration } from "dfx/utils/common";
 export declare const delayFrom: (window: number, limit: number, count: number, ttl: number) => Duration;

package/gateway.d.ts

@@ -6,9 +6,9 @@ export * as ShardStore from "./DiscordGateway/ShardStore/index.js";
 export * as Gateway from "./DiscordGateway/index.js";
 export * as CachePrelude from "./Cache/prelude.js";
 export { run as runIx } from "./Interactions/gateway.js";
-export declare const MemoryRateLimit: import("./global.js").Layer<import("./Log/index.js").Log, never, import("./index.js").RateLimitStore | import("./index.js").RateLimiter>;
-export declare const MemoryREST: import("./global.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST>;
-export declare const MemorySharder: import("./global.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./DiscordGateway/Sharder/index.js").Sharder>;
-export declare const MemoryGateway: import("./global.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./DiscordGateway/index.js").DiscordGateway>;
-export declare const MemoryBot: import("./global.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
-export declare const make: (config: Config.MakeOpts, debug?: boolean) => import("./global.js").Layer<never, never, import("./index.js").DiscordREST | import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
+export declare const MemoryRateLimit: import("./utils/common.js").Layer<import("./Log/index.js").Log, never, import("./index.js").RateLimitStore | import("./index.js").RateLimiter>;
+export declare const MemoryREST: import("./utils/common.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST>;
+export declare const MemorySharder: import("./utils/common.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./DiscordGateway/Sharder/index.js").Sharder>;
+export declare const MemoryGateway: import("./utils/common.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./DiscordGateway/index.js").DiscordGateway>;
+export declare const MemoryBot: import("./utils/common.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
+export declare const make: (config: Config.MakeOpts, debug?: boolean) => import("./utils/common.js").Layer<never, never, import("./index.js").DiscordREST | import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;

package/global.d.ts

@@ -1,71 +1,7 @@
 /**
  * @tsplus global
  */
-import type { Effect } from "@effect/io/Effect";
-/**
- * @tsplus global
- */
-import type { Layer } from "@effect/io/Layer";
-/**
- * @tsplus global
- */
-import type { Dequeue, Queue } from "@effect/io/Queue";
-/**
- * @tsplus global
- */
-import type { Schedule } from "@effect/io/Schedule";
-/**
- * @tsplus global
- */
-import type { Cause } from "@effect/io/Cause";
-/**
- * @tsplus global
- */
-import type { Chunk } from "@fp-ts/data/Chunk";
-/**
- * @tsplus global
- */
-import { Context, Tag } from "@fp-ts/data/Context";
-/**
- * @tsplus global
- */
-import type { Duration } from "@fp-ts/data/Duration";
-/**
- * @tsplus global
- */
-import type { Equal } from "@fp-ts/data/Equal";
-/**
- * @tsplus global
- */
-import type { Maybe } from "dfx";
-/**
- * @tsplus global
- */
-import type { Either } from "@fp-ts/data/Either";
-/**
- * @tsplus global
- */
-import type { Exit } from "@effect/io/Exit";
-/**
- * @tsplus global
- */
-import type { EffectSource } from "callbag-effect-ts/Source";
-/**
- * @tsplus global
- */
-import type { EffectSink } from "callbag-effect-ts/Sink";
-/**
- * @tsplus global
- */
-import type { HashMap } from "@fp-ts/data/HashMap";
-/**
- * @tsplus global
- */
-import type { Ref } from "@effect/io/Ref";
-/**
- * @tsplus global
- */
-import type { HashSet } from "@fp-ts/data/HashSet";
+import { Cause, Duration, Effect, EffectSource, HashMap, HashSet, Layer, Maybe, Queue, Ref, Schedule, Tag, flow, identity, pipe, } from "dfx/utils/common";
 /**
  * @tsplus global
  */
@@ -82,14 +18,4 @@ import {} from "dfx/webhooks";
  * @tsplus global
  */
 import type { Success } from "dfx/utils/effect";
-/**
- * @tsplus global
- */
-import { pipe, flow, identity } from "@fp-ts/data/Function";
-export type { Effect } from "@effect/io/Effect";
-export type { Layer } from "@effect/io/Layer";
-export type {} from "@effect/io/Queue";
-export { Context, Tag } from "@fp-ts/data/Context";
-export type { Duration } from "@fp-ts/data/Duration";
-export type { HashMap } from "@fp-ts/data/HashMap";
-export type { Ref } from "@effect/io/Ref";
+export {};

package/global.js

@@ -1,2 +1,2 @@
-export { Tag } from "@fp-ts/data/Context";
+export {};
 //# sourceMappingURL=global.js.map

package/global.js.map

@@ -1 +1 @@
-{"version":3,"file":"global.js","sourceRoot":"","sources":["../src/global.ts"],"names":[],"mappings":"AAqCA,OAAO,EAAW,GAAG,EAAE,MAAM,qBAAqB,CAAA"}
+{"version":3,"file":"global.js","sourceRoot":"","sources":["../src/global.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.20.1",
+  "version": "0.20.3",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -28,7 +28,7 @@
     "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer/compiler/typescript.tgz"
   },
   "dependencies": {
-    "callbag-effect-ts": "1.0.0-alpha.20",
+    "callbag-effect-ts": "1.0.0-alpha.22",
     "ts-toolbelt": "^9.6.0",
     "tweetnacl": "^1.0.3"
   },
@@ -49,5 +49,5 @@
       "@fp-ts/data": "^0.0.25"
     }
   },
-  "gitHead": "b723492f760de9df2f325e1c0684ce245b8e093e"
+  "gitHead": "437870424ec234e17f2841439fd321200db374ca"
 }

package/utils/common.d.ts

@@ -0,0 +1,18 @@
+export type { Cause } from "@effect/io/Cause";
+export type { Effect } from "@effect/io/Effect";
+export type { Exit } from "@effect/io/Exit";
+export type { Layer } from "@effect/io/Layer";
+export type { Dequeue, Queue } from "@effect/io/Queue";
+export type { Schedule } from "@effect/io/Schedule";
+export type { Chunk } from "@fp-ts/data/Chunk";
+export { Context, Tag } from "@fp-ts/data/Context";
+export type { Duration } from "@fp-ts/data/Duration";
+export type { Equal } from "@fp-ts/data/Equal";
+export type { Either } from "@fp-ts/data/Either";
+export type { HashMap } from "@fp-ts/data/HashMap";
+export type { Option as Maybe } from "@fp-ts/data/Option";
+export type { Ref } from "@effect/io/Ref";
+export type { HashSet } from "@fp-ts/data/HashSet";
+export { pipe, flow, identity } from "@fp-ts/data/Function";
+export type { EffectSource } from "callbag-effect-ts/Source";
+export type { EffectSink } from "callbag-effect-ts/Sink";

package/utils/common.js

@@ -0,0 +1,3 @@
+export { Tag } from "@fp-ts/data/Context";
+export { pipe, flow, identity } from "@fp-ts/data/Function";
+//# sourceMappingURL=common.js.map

package/utils/common.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/utils/common.ts"],"names":[],"mappings":"AAQA,OAAO,EAAW,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAQlD,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA"}

package/utils/effect.d.ts

@@ -1,5 +1,4 @@
-import { Effect } from "@effect/io/Effect";
-import { Tag } from "@fp-ts/data/Context";
+import { Effect, Tag } from "dfx/utils/common";
 export type Success<A extends Effect<any, any, any>> = A extends Effect<any, any, infer R> ? R : never;
 export type ShapeFn<T> = Pick<T, {
     [k in keyof T]: T[k] extends (...args: infer ARGS) => Effect<infer R, infer E, infer A> ? ((...args: ARGS) => Effect<R, E, A>) extends T[k] ? k : never : never;

package/webhooks.d.ts

@@ -1,6 +1,6 @@
 import { Config } from "dfx";
 import { MakeConfigOpts } from "./Interactions/webhook.js";
 export { makeConfigLayer, makeHandler, makeSimpleHandler, WebhookConfig, WebhookParseError, BadWebhookSignature, } from "./Interactions/webhook.js";
-export declare const MemoryRateLimit: import("./global.js").Layer<import("./Log/index.js").Log, never, import("./index.js").RateLimitStore | import("./index.js").RateLimiter>;
-export declare const MemoryREST: import("./global.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST>;
-export declare const make: (config: Config.MakeOpts & MakeConfigOpts, debug?: boolean) => import("./global.js").Layer<never, never, import("./index.js").DiscordREST | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./Interactions/webhook.js").WebhookConfig>;
+export declare const MemoryRateLimit: import("./utils/common.js").Layer<import("./Log/index.js").Log, never, import("./index.js").RateLimitStore | import("./index.js").RateLimiter>;
+export declare const MemoryREST: import("./utils/common.js").Layer<import("./Log/index.js").Log | import("./DiscordConfig/index.js").DiscordConfig, never, import("./index.js").DiscordREST>;
+export declare const make: (config: Config.MakeOpts & MakeConfigOpts, debug?: boolean) => import("./utils/common.js").Layer<never, never, import("./index.js").DiscordREST | import("./index.js").RateLimitStore | import("./index.js").RateLimiter | import("./Interactions/webhook.js").WebhookConfig>;