dfx 0.20.5 → 0.21.0

package/Interactions/webhook.d.ts

@@ -1,5 +1,4 @@
-import { Discord } from "dfx";
-import { Effect, Cause } from "dfx/utils/common";
+import { Cause, Context, Discord, Effect, Layer } from "dfx/_common";
 import { DefinitionNotFound } from "./handlers.js";
 import { InteractionBuilder } from "./index.js";
 export declare class BadWebhookSignature {
@@ -16,8 +15,8 @@ declare const makeConfig: ({ applicationId, publicKey }: MakeConfigOpts) => {
 };
 export interface WebhookConfig extends ReturnType<typeof makeConfig> {
 }
-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 const WebhookConfig: Context.Tag<WebhookConfig>;
+export declare const makeConfigLayer: (a_0: MakeConfigOpts) => Layer.Layer<never, never, WebhookConfig>;
 export declare class WebhookParseError {
     readonly reason: unknown;
     readonly _tag = "WebhookParseError";
@@ -26,14 +25,14 @@ export declare class WebhookParseError {
 export interface HandleWebhookOpts<E> {
     headers: Headers;
     body: string;
-    success: (a: Discord.InteractionResponse) => Effect<never, never, void>;
-    error: (e: Cause<E>) => Effect<never, never, void>;
+    success: (a: Discord.InteractionResponse) => Effect.Effect<never, never, void>;
+    error: (e: Cause.Cause<E>) => Effect.Effect<never, never, void>;
 }
 /**
  * @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("../utils/common.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>) => Effect.Effect<WebhookConfig | Exclude<R, Discord.Interaction>, never, void>;
 /**
  * @tsplus getter dfx/InteractionBuilder simpleWebhookHandler
  * @tsplus location "dfx/Interactions/webhook"
@@ -41,5 +40,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("../utils/common.js").Effect<WebhookConfig | Exclude<R, import("../types.js").Interaction>, DefinitionNotFound | BadWebhookSignature | WebhookParseError | E, import("../types.js").InteractionResponse>;
+}) => Effect.Effect<WebhookConfig | Exclude<R, Discord.Interaction>, DefinitionNotFound | BadWebhookSignature | WebhookParseError | E, Discord.InteractionResponse>;
 export {};

package/Interactions/webhook.js

@@ -1,8 +1,7 @@
 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 "dfx/utils/common";
-import * as tsplus_module_4 from "@effect/io/Layer";
-import * as tsplus_module_5 from "@effect/io/Effect";
+import * as tsplus_module_3 from "@effect/io/Effect";
+import { Context, Effect, flow, Layer, Option, } from "dfx/_common";
 import Nacl from "tweetnacl";
 import { handlers } from "./handlers.js";
 import { InteractionContext } from "./index.js";
@@ -13,16 +12,16 @@ export class BadWebhookSignature {
 const checkSignature = (publicKey, headers, body) => tsplus_module_2.asUnit(tsplus_module_1.toEither(() => new BadWebhookSignature())(tsplus_module_1.filter((a) => {
     const enc = new TextEncoder();
     return Nacl.sign.detached.verify(enc.encode(a.timestamp + body), fromHex(`${a.signature}`), publicKey);
-})(tsplus_module_1.struct({
-    signature: tsplus_module_1.fromNullable(headers["x-signature-ed25519"]),
-    timestamp: tsplus_module_1.fromNullable(headers["x-signature-timestamp"]),
+})(Option.struct({
+    signature: Option.fromNullable(headers["x-signature-ed25519"]),
+    timestamp: Option.fromNullable(headers["x-signature-timestamp"]),
 }))));
 const makeConfig = ({ applicationId, publicKey }) => ({
     applicationId,
     publicKey: fromHex(publicKey),
 });
-export const WebhookConfig = tsplus_module_3.Tag();
-export const makeConfigLayer = tsplus_module_3.flow(makeConfig, tsplus_module_4.succeed(WebhookConfig));
+export const WebhookConfig = Context.Tag();
+export const makeConfigLayer = flow(makeConfig, Layer.succeed(WebhookConfig));
 export class WebhookParseError {
     reason;
     _tag = "WebhookParseError";
@@ -30,11 +29,11 @@ export class WebhookParseError {
         this.reason = reason;
     }
 }
-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 fromHeadersAndBody = (headers, body) => tsplus_module_3.flatMap(({ publicKey }) => tsplus_module_3.flatMap(() => Effect.tryCatch(() => JSON.parse(body), (reason) => new WebhookParseError(reason)))(Effect.fromEither(checkSignature(publicKey, headers, body))))(Effect.service(WebhookConfig));
 const run = (definitions) => {
     const handler = handlers(definitions);
-    return (headers, body) => tsplus_module_5.flatMap(interaction => {
-        const provide = tsplus_module_5.provideService(InteractionContext)(interaction);
+    return (headers, body) => tsplus_module_3.flatMap(interaction => {
+        const provide = Effect.provideService(InteractionContext)(interaction);
         return provide(handler[interaction.type](interaction));
     })(fromHeadersAndBody(headers, body));
 };
@@ -43,7 +42,7 @@ const run = (definitions) => {
  */
 export const makeHandler = (ix) => {
     const handle = run(ix.definitions);
-    return ({ headers, body, success, error, }) => tsplus_module_5.catchAllCause(error)(tsplus_module_5.flatMap(success)(handle(headers, body)));
+    return ({ headers, body, success, error, }) => tsplus_module_3.catchAllCause(error)(tsplus_module_3.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,13 @@
+import { Context, Effect, Layer } from "dfx/_common";
 declare const make: (debug?: boolean) => {
-    info: (...args: any[]) => import("../utils/common.js").Effect<never, never, void>;
-    debug: (...args: any[]) => import("../utils/common.js").Effect<never, never, void>;
+    info: (...args: any[]) => Effect.Effect<never, never, void>;
+    debug: (...args: any[]) => Effect.Effect<never, never, void>;
 };
 export interface Log extends ReturnType<typeof make> {
 }
-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 declare const Log: Context.Tag<Log>;
+export declare const LiveLog: Layer.Layer<never, never, Log>;
+export declare const LiveLogDebug: Layer.Layer<never, never, Log>;
+export declare const info: (...args: any[]) => Effect.Effect<Log, never, void>;
+export declare const debug: (...args: any[]) => Effect.Effect<Log, never, void>;
 export {};

package/Log/index.js

@@ -1,19 +1,17 @@
-import * as tsplus_module_1 from "@effect/io/Effect";
-import * as tsplus_module_2 from "dfx/utils/common";
-import * as tsplus_module_3 from "@effect/io/Layer";
+import { Context, Effect, Layer } from "dfx/_common";
 const make = (debug = false) => ({
-    info: (...args) => tsplus_module_1.sync(() => {
+    info: (...args) => Effect.sync(() => {
         console.error("INFO", ...args);
     }),
     debug: (...args) => debug
-        ? tsplus_module_1.sync(() => {
+        ? Effect.sync(() => {
             console.error("DEBUG", ...args);
         })
-        : tsplus_module_1.unit(),
+        : Effect.unit(),
 });
-export const Log = tsplus_module_2.Tag();
-export const LiveLog = tsplus_module_3.succeed(Log)(make(false));
-export const LiveLogDebug = tsplus_module_3.succeed(Log)(make(true));
-export const info = (...args) => tsplus_module_1.serviceWithEffect(Log)(({ info: log }) => log(...args));
-export const debug = (...args) => tsplus_module_1.serviceWithEffect(Log)(({ debug }) => debug(...args));
+export const Log = Context.Tag();
+export const LiveLog = Layer.succeed(Log)(make(false));
+export const LiveLogDebug = Layer.succeed(Log)(make(true));
+export const info = (...args) => Effect.serviceWithEffect(Log)(({ info: log }) => log(...args));
+export const debug = (...args) => Effect.serviceWithEffect(Log)(({ debug }) => debug(...args));
 //# sourceMappingURL=index.js.map

package/Log/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Log/index.ts"],"names":[],"mappings":";;;AAAA,MAAM,IAAI,GAAG,CAAC,KAAK,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/B,IAAI,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACvB,qBAAY,GAAG,EAAE;QACf,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAA;IAChC,CAAC,CAAC;IACJ,KAAK,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACxB,KAAK;QACH,CAAC,CAAC,qBAAY,GAAG,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;QACjC,CAAC,CAAC;QACJ,CAAC,CAAC,sBAAa;CACpB,CAAC,CAAA;AAGF,MAAM,CAAC,MAAM,GAAG,GAAG,gBAAA,GAAG,EAAO,CAAA;AAC7B,MAAM,CAAC,MAAM,OAAO,GAAG,wBAAc,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;AACtD,MAAM,CAAC,MAAM,YAAY,GAAG,wBAAc,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;AAE1D,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CACrC,kCAAyB,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;AAEhE,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CACtC,kCAAyB,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/Log/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,aAAa,CAAA;AAEpD,MAAM,IAAI,GAAG,CAAC,KAAK,GAAG,KAAK,EAAE,EAAE,CAAC,CAAC;IAC/B,IAAI,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACvB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;QACf,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,GAAG,IAAI,CAAC,CAAA;IAChC,CAAC,CAAC;IACJ,KAAK,EAAE,CAAC,GAAG,IAAW,EAAE,EAAE,CACxB,KAAK;QACH,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,IAAI,CAAC,CAAA;QACjC,CAAC,CAAC;QACJ,CAAC,CAAC,MAAM,CAAC,IAAI,EAAE;CACpB,CAAC,CAAA;AAGF,MAAM,CAAC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAO,CAAA;AACrC,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAA;AACtD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAA;AAE1D,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CACrC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;AAEhE,MAAM,CAAC,MAAM,KAAK,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CACtC,MAAM,CAAC,iBAAiB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA"}

package/RateLimit/index.d.ts

@@ -1,4 +1,5 @@
-import { Effect, Maybe, Duration } from "dfx/utils/common";
+import { Context, Duration, Effect, Layer, Option } from "dfx/_common";
+import { Log } from "dfx";
 import { Success } from "dfx/utils/effect";
 export type BucketDetails = {
     key: "global" | string;
@@ -6,19 +7,19 @@ export type BucketDetails = {
     limit: number;
 };
 export interface RateLimitStore {
-    hasBucket: (bucketKey: string) => Effect<never, never, boolean>;
-    putBucket: (bucket: BucketDetails) => Effect<never, never, void>;
-    getBucketForRoute: (route: string) => Effect<never, never, Maybe<BucketDetails>>;
-    putBucketRoute: (route: string, bucketKey: string) => Effect<never, never, void>;
-    incrementCounter: (key: string, window: number, limit: number) => Effect<never, never, readonly [count: number, ttl: number]>;
+    hasBucket: (bucketKey: string) => Effect.Effect<never, never, boolean>;
+    putBucket: (bucket: BucketDetails) => Effect.Effect<never, never, void>;
+    getBucketForRoute: (route: string) => Effect.Effect<never, never, Option.Option<BucketDetails>>;
+    putBucketRoute: (route: string, bucketKey: string) => Effect.Effect<never, never, void>;
+    incrementCounter: (key: string, window: number, limit: number) => Effect.Effect<never, never, readonly [count: number, ttl: number]>;
 }
-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 declare const RateLimitStore: Context.Tag<RateLimitStore>;
+export declare const LiveMemoryRateLimitStore: Layer.Layer<never, never, RateLimitStore>;
+declare const makeLimiter: Effect.Effect<Log.Log | RateLimitStore, never, {
+    maybeWait: (key: string, window: Duration.Duration, limit: number, multiplier?: number) => Effect.Effect<never, never, void>;
 }>;
 export interface RateLimiter extends Success<typeof makeLimiter> {
 }
-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 declare const RateLimiter: Context.Tag<RateLimiter>;
+export declare const LiveRateLimiter: Layer.Layer<Log.Log | RateLimitStore, never, RateLimiter>;
 export {};

package/RateLimit/index.js

@@ -1,25 +1,24 @@
-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";
+import * as tsplus_module_1 from "@effect/io/Effect";
 import { delayFrom } from "./utils.js";
 import * as Memory from "./memory.js";
-export const RateLimitStore = tsplus_module_1.Tag();
-export const LiveMemoryRateLimitStore = tsplus_module_2.sync(RateLimitStore)(Memory.make);
-const makeLimiter = tsplus_module_3.flatMap(store => tsplus_module_3.map(log => {
+import { Context, Effect, Layer } from "dfx/_common";
+import { Log } from "dfx";
+export const RateLimitStore = Context.Tag();
+export const LiveMemoryRateLimitStore = Layer.sync(RateLimitStore)(Memory.make);
+const makeLimiter = tsplus_module_1.flatMap(store => tsplus_module_1.map(log => {
     const maybeWait = (key, window, limit, multiplier = 1.05) => {
         const windowMs = window.millis * multiplier;
-        return tsplus_module_3.asUnit(tsplus_module_3.tap(tsplus_module_3.sleep)(tsplus_module_3.tap((d) => log.debug("RateLimitStore maybeWait", {
+        return tsplus_module_1.asUnit(tsplus_module_1.tap(Effect.sleep)(tsplus_module_1.tap((d) => log.debug("RateLimitStore maybeWait", {
             key,
             window: window.millis,
             windowMs,
             limit,
             delay: d.millis,
-        }))(tsplus_module_3.map(([count, ttl]) => delayFrom(windowMs, limit, count, ttl))(store
+        }))(tsplus_module_1.map(([count, ttl]) => delayFrom(windowMs, limit, count, ttl))(store
             .incrementCounter(key, windowMs, limit)))));
     };
     return { maybeWait };
-})(tsplus_module_3.service(tsplus_module_4.Log.Log)))(tsplus_module_3.service(RateLimitStore));
-export const RateLimiter = tsplus_module_1.Tag();
-export const LiveRateLimiter = tsplus_module_2.fromEffect(RateLimiter)(makeLimiter);
+})(Effect.service(Log.Log)))(Effect.service(RateLimitStore));
+export const RateLimiter = Context.Tag();
+export const LiveRateLimiter = Layer.fromEffect(RateLimiter)(makeLimiter);
 //# sourceMappingURL=index.js.map

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;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"}
+{"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;AACrC,OAAO,EAAE,OAAO,EAAY,MAAM,EAAE,KAAK,EAAU,MAAM,aAAa,CAAA;AACtE,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AA8BzB,MAAM,CAAC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAkB,CAAA;AAC3D,MAAM,CAAC,MAAM,wBAAwB,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;AAE/E,MAAM,WAAW,2BACT,KAAK,wBACL,GAAG;IAET,MAAM,SAAS,GAAG,CAChB,GAAW,EACX,MAAyB,EACzB,KAAa,EACb,UAAU,GAAG,IAAI,EACjB,EAAE;QACF,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,GAAG,UAAU,CAAA;QAE3C,8BAAO,oBAYA,MAAM,CAAC,KAAK,EAZZ,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,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,GADrB,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,CA2B9C,CAAA;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAe,CAAA;AACrD,MAAM,CAAC,MAAM,eAAe,GAAG,KAAK,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC,WAAW,CAAC,CAAA"}

package/RateLimit/memory.d.ts

@@ -1,2 +1,2 @@
-import { RateLimitStore, BucketDetails } from "dfx";
+import { RateLimitStore } from "./index.js";
 export declare const make: () => RateLimitStore;

package/RateLimit/memory.js

@@ -1,20 +1,20 @@
 import * as tsplus_module_1 from "@fp-ts/data/Option";
-import * as tsplus_module_2 from "@effect/io/Effect";
+import { Effect, Option } from "dfx/_common";
 export const make = () => {
     const buckets = new Map();
     const routes = new Map();
     const counters = new Map();
-    const getCounter = (key) => tsplus_module_1.filter((c) => c.expires > Date.now())(tsplus_module_1.fromNullable(counters.get(key)));
+    const getCounter = (key) => tsplus_module_1.filter((c) => c.expires > Date.now())(Option.fromNullable(counters.get(key)));
     return {
-        hasBucket: (key) => tsplus_module_2.sync(() => buckets.has(key)),
-        putBucket: (bucket) => tsplus_module_2.sync(() => {
+        hasBucket: (key) => Effect.sync(() => buckets.has(key)),
+        putBucket: (bucket) => Effect.sync(() => {
             buckets.set(bucket.key, bucket);
         }),
-        getBucketForRoute: (route) => tsplus_module_2.sync(() => tsplus_module_1.fromNullable(buckets.get(routes.get(route)))),
-        putBucketRoute: (route, bucket) => tsplus_module_2.sync(() => {
+        getBucketForRoute: (route) => Effect.sync(() => Option.fromNullable(buckets.get(routes.get(route)))),
+        putBucketRoute: (route, bucket) => Effect.sync(() => {
             routes.set(route, bucket);
         }),
-        incrementCounter: (key, window, limit) => tsplus_module_2.sync(() => {
+        incrementCounter: (key, window, limit) => Effect.sync(() => {
             const now = Date.now();
             const perRequest = Math.ceil(window / limit);
             const counter = tsplus_module_1.getOrElse(() => ({

package/RateLimit/memory.js.map

@@ -1 +1 @@
-{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/RateLimit/memory.ts"],"names":[],"mappings":";;AAKA,MAAM,CAAC,MAAM,IAAI,GAAG,GAAmB,EAAE;IACvC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAA;IAChD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAA;IACxC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAA;IAE3C,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CACjC,uBAA6C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,EAA1E,6BAAmB,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAsC,CAAA;IAE7E,OAAO;QACL,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,qBAAY,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEvD,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CACpB,qBAAY,GAAG,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QACjC,CAAC,CAAC;QAEJ,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC3B,qBAAY,GAAG,EAAE,CAAC,6BAAmB,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC;QAExE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAChC,qBAAY,GAAG,EAAE;YACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC3B,CAAC,CAAC;QAEJ,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CACvC,qBAAY,GAAG,EAAE;YACf,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACtB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,CAAA;YAC5C,MAAM,OAAO,GAAG,0BACd,GAAY,EAAE,CAAC,CAAC;gBACd,OAAO,EAAE,GAAG;gBACZ,KAAK,EAAE,CAAC;aACT,CAAC,EAJY,UAAU,CAAC,GAAG,CAAC,CAK9B,CAAA;YAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAA;YAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,UAAU,CAAA;YAC5C,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA;YAEjD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC,CAAA;QAC/B,CAAC,CAAC;KACL,CAAA;AACH,CAAC,CAAA"}
+{"version":3,"file":"memory.js","sourceRoot":"","sources":["../../src/RateLimit/memory.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,aAAa,CAAA;AAQ5C,MAAM,CAAC,MAAM,IAAI,GAAG,GAAmB,EAAE;IACvC,MAAM,OAAO,GAAG,IAAI,GAAG,EAAyB,CAAA;IAChD,MAAM,MAAM,GAAG,IAAI,GAAG,EAAkB,CAAA;IACxC,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAmB,CAAA;IAE3C,MAAM,UAAU,GAAG,CAAC,GAAW,EAAE,EAAE,CACjC,uBAA8C,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,GAAG,EAAE,EAA3E,MAAM,CAAC,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAsC,CAAA;IAE9E,OAAO;QACL,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QAEvD,SAAS,EAAE,CAAC,MAAM,EAAE,EAAE,CACpB,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAA;QACjC,CAAC,CAAC;QAEJ,iBAAiB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC3B,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAE,CAAC,CAAC,CAAC;QAEzE,cAAc,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,CAChC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,MAAM,CAAC,GAAG,CAAC,KAAK,EAAE,MAAM,CAAC,CAAA;QAC3B,CAAC,CAAC;QAEJ,gBAAgB,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,EAAE,CACvC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACf,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,CAAA;YACtB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,CAAA;YAC5C,MAAM,OAAO,GAAG,0BACd,GAAY,EAAE,CAAC,CAAC;gBACd,OAAO,EAAE,GAAG;gBACZ,KAAK,EAAE,CAAC;aACT,CAAC,EAJY,UAAU,CAAC,GAAG,CAAC,CAK9B,CAAA;YAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,GAAG,CAAC,CAAA;YAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,OAAO,GAAG,UAAU,CAAA;YAC5C,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,GAAG,OAAO,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAA;YAEjD,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,GAAG,CAAC,CAAA;QAC/B,CAAC,CAAC;KACL,CAAA;AACH,CAAC,CAAA"}

package/RateLimit/utils.d.ts

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

package/RateLimit/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/RateLimit/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAEnD,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,MAAc,EACd,KAAa,EACb,KAAa,EACb,GAAW,EACD,EAAE;IACZ,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,CAAA;IAE5C,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,CAAA;IACpC,MAAM,WAAW,GAAG,SAAS,GAAG,GAAG,CAAA;IACnC,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,CAAA;IACvD,MAAM,iBAAiB,GAAG,cAAc,GAAG,KAAK,CAAA;IAChD,MAAM,iBAAiB,GAAG,KAAK,GAAG,iBAAiB,CAAA;IACnD,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAA;IACpE,MAAM,cAAc,GAAG,WAAW,GAAG,MAAM,CAAA;IAE3C,MAAM,gBAAgB,GAAG,KAAK,GAAG,KAAK,CAAA;IACtC,MAAM,YAAY,GAAG,gBAAgB,GAAG,EAAE,CAAA;IAE1C,IAAI,gBAAgB,KAAK,CAAC,EAAE;QAC1B,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,MAAM,CAAC,gBAAgB,GAAG,MAAM,GAAG,cAAc,GAAG,YAAY,CAAC,CAAA;AAC1E,CAAC,CAAA"}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/RateLimit/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,sBAAsB,CAAA;AAGnD,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,MAAc,EACd,KAAa,EACb,KAAa,EACb,GAAW,EACQ,EAAE;IACrB,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,KAAK,CAAC,CAAA;IAE5C,MAAM,SAAS,GAAG,KAAK,GAAG,UAAU,CAAA;IACpC,MAAM,WAAW,GAAG,SAAS,GAAG,GAAG,CAAA;IACnC,MAAM,cAAc,GAAG,IAAI,CAAC,KAAK,CAAC,WAAW,GAAG,MAAM,CAAC,CAAA;IACvD,MAAM,iBAAiB,GAAG,cAAc,GAAG,KAAK,CAAA;IAChD,MAAM,iBAAiB,GAAG,KAAK,GAAG,iBAAiB,CAAA;IACnD,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,iBAAiB,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC,CAAA;IACpE,MAAM,cAAc,GAAG,WAAW,GAAG,MAAM,CAAA;IAE3C,MAAM,gBAAgB,GAAG,KAAK,GAAG,KAAK,CAAA;IACtC,MAAM,YAAY,GAAG,gBAAgB,GAAG,EAAE,CAAA;IAE1C,IAAI,gBAAgB,KAAK,CAAC,EAAE;QAC1B,OAAO,IAAI,CAAA;KACZ;IAED,OAAO,MAAM,CAAC,gBAAgB,GAAG,MAAM,GAAG,cAAc,GAAG,YAAY,CAAC,CAAA;AAC1E,CAAC,CAAA"}

package/_common.d.ts

@@ -0,0 +1,19 @@
+export * as Cause from "@effect/io/Cause";
+export * as Effect from "@effect/io/Effect";
+export * as Exit from "@effect/io/Exit";
+export * as Layer from "@effect/io/Layer";
+export * as Queue from "@effect/io/Queue";
+export * as Schedule from "@effect/io/Schedule";
+export * as Scope from "@effect/io/Scope";
+export * as Stream from "@effect/stream/Stream";
+export * as Chunk from "@fp-ts/data/Chunk";
+export * as Context from "@fp-ts/data/Context";
+export * as Duration from "@fp-ts/data/Duration";
+export * as Equal from "@fp-ts/data/Equal";
+export * as Either from "@fp-ts/data/Either";
+export * as HashMap from "@fp-ts/data/HashMap";
+export * as Option from "@fp-ts/data/Option";
+export * as Ref from "@effect/io/Ref";
+export * as HashSet from "@fp-ts/data/HashSet";
+export { pipe, flow, identity } from "@fp-ts/data/Function";
+export * as Discord from "./types.js";

package/_common.js

@@ -0,0 +1,20 @@
+export * as Cause from "@effect/io/Cause";
+export * as Effect from "@effect/io/Effect";
+export * as Exit from "@effect/io/Exit";
+export * as Layer from "@effect/io/Layer";
+export * as Queue from "@effect/io/Queue";
+export * as Schedule from "@effect/io/Schedule";
+export * as Scope from "@effect/io/Scope";
+export * as Stream from "@effect/stream/Stream";
+export * as Chunk from "@fp-ts/data/Chunk";
+export * as Context from "@fp-ts/data/Context";
+export * as Duration from "@fp-ts/data/Duration";
+export * as Equal from "@fp-ts/data/Equal";
+export * as Either from "@fp-ts/data/Either";
+export * as HashMap from "@fp-ts/data/HashMap";
+export * as Option from "@fp-ts/data/Option";
+export * as Ref from "@effect/io/Ref";
+export * as HashSet from "@fp-ts/data/HashSet";
+export { pipe, flow, identity } from "@fp-ts/data/Function";
+export * as Discord from "./types.js";
+//# sourceMappingURL=_common.js.map

package/_common.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"_common.js","sourceRoot":"","sources":["../src/_common.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,IAAI,MAAM,iBAAiB,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,QAAQ,MAAM,qBAAqB,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AAEzC,OAAO,KAAK,MAAM,MAAM,uBAAuB,CAAA;AAE/C,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,QAAQ,MAAM,sBAAsB,CAAA;AAChD,OAAO,KAAK,KAAK,MAAM,mBAAmB,CAAA;AAC1C,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,KAAK,MAAM,MAAM,oBAAoB,CAAA;AAC5C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AACrC,OAAO,KAAK,OAAO,MAAM,qBAAqB,CAAA;AAC9C,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAE3D,OAAO,KAAK,OAAO,MAAM,YAAY,CAAA"}

package/gateway.d.ts

@@ -1,14 +1,15 @@
-import { Config } from "dfx";
-export * as WS from "./DiscordGateway/WS/index.js";
+import { Config, Log } from "dfx";
+import { Layer } from "./_common.js";
+export * as CachePrelude from "./Cache/prelude.js";
 export * as DiscordWS from "./DiscordGateway/DiscordWS/index.js";
+export * as Gateway from "./DiscordGateway/index.js";
 export * as Shard from "./DiscordGateway/Shard/index.js";
 export * as ShardStore from "./DiscordGateway/ShardStore/index.js";
-export * as Gateway from "./DiscordGateway/index.js";
-export * as CachePrelude from "./Cache/prelude.js";
+export * as WS from "./DiscordGateway/WS/index.js";
 export { run as runIx } from "./Interactions/gateway.js";
-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>;
+export declare const MemoryRateLimit: Layer.Layer<Log.Log, never, import("dfx").RateLimitStore | import("dfx").RateLimiter>;
+export declare const MemoryREST: Layer.Layer<Config.DiscordConfig | Log.Log, never, import("dfx").DiscordREST>;
+export declare const MemorySharder: Layer.Layer<Config.DiscordConfig | Log.Log, never, import("./DiscordGateway/Sharder/index.js").Sharder>;
+export declare const MemoryGateway: Layer.Layer<Config.DiscordConfig | Log.Log, never, import("./DiscordGateway/index.js").DiscordGateway>;
+export declare const MemoryBot: Layer.Layer<Config.DiscordConfig | Log.Log, never, import("dfx").DiscordREST | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
+export declare const make: (config: Config.MakeOpts, debug?: boolean) => Layer.Layer<never, never, import("dfx").DiscordREST | Config.DiscordConfig | Log.Log | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;

package/gateway.js

@@ -1,26 +1,29 @@
-import * as tsplus_module_1 from "dfx";
-import * as tsplus_module_2 from "@effect/io/Layer";
-import * as tsplus_module_3 from "dfx/gateway";
+import * as tsplus_module_1 from "@effect/io/Layer";
+import { Config, LiveDiscordREST, Log } from "dfx";
 import { LiveJsonDiscordWSCodec } from "./DiscordGateway/DiscordWS/index.js";
+import { LiveDiscordGateway } from "./DiscordGateway/index.js";
 import { LiveSharder } from "./DiscordGateway/Sharder/index.js";
 import { LiveMemoryShardStore } from "./DiscordGateway/ShardStore/index.js";
 import { LiveHttp } from "./Http/index.js";
-export * as WS from "./DiscordGateway/WS/index.js";
+import { LiveMemoryRateLimitStore, LiveRateLimiter } from "./RateLimit/index.js";
+import { Layer } from "./_common.js";
+export * as CachePrelude from "./Cache/prelude.js";
 export * as DiscordWS from "./DiscordGateway/DiscordWS/index.js";
+export * as Gateway from "./DiscordGateway/index.js";
 export * as Shard from "./DiscordGateway/Shard/index.js";
 export * as ShardStore from "./DiscordGateway/ShardStore/index.js";
-export * as Gateway from "./DiscordGateway/index.js";
-export * as CachePrelude from "./Cache/prelude.js";
+export * as WS from "./DiscordGateway/WS/index.js";
 export { run as runIx } from "./Interactions/gateway.js";
-export const MemoryRateLimit = tsplus_module_2.provideToAndMerge(tsplus_module_1.LiveRateLimiter)(tsplus_module_1.LiveMemoryRateLimitStore);
-export const MemoryREST = tsplus_module_2.provideTo(tsplus_module_1.LiveDiscordREST)((tsplus_module_2.merge(MemoryRateLimit)(LiveHttp)));
-export const MemorySharder = tsplus_module_2.provideTo(LiveSharder)((tsplus_module_2.merge(LiveJsonDiscordWSCodec)(tsplus_module_2.merge(MemoryRateLimit)(tsplus_module_2.merge(LiveMemoryShardStore)(MemoryREST)))));
-export const MemoryGateway = tsplus_module_2.provideTo(tsplus_module_3.Gateway.LiveDiscordGateway)(MemorySharder);
-export const MemoryBot = tsplus_module_2.provideToAndMerge(tsplus_module_2.merge(MemoryRateLimit)(MemoryGateway))(MemoryREST);
+const _layer = Layer.LayerTypeId;
+export const MemoryRateLimit = tsplus_module_1.provideToAndMerge(LiveRateLimiter)(LiveMemoryRateLimitStore);
+export const MemoryREST = tsplus_module_1.provideTo(LiveDiscordREST)((tsplus_module_1.merge(MemoryRateLimit)(LiveHttp)));
+export const MemorySharder = tsplus_module_1.provideTo(LiveSharder)((tsplus_module_1.merge(LiveJsonDiscordWSCodec)(tsplus_module_1.merge(MemoryRateLimit)(tsplus_module_1.merge(LiveMemoryShardStore)(MemoryREST)))));
+export const MemoryGateway = tsplus_module_1.provideTo(LiveDiscordGateway)(MemorySharder);
+export const MemoryBot = tsplus_module_1.provideToAndMerge(tsplus_module_1.merge(MemoryRateLimit)(MemoryGateway))(MemoryREST);
 export const make = (config, debug = false) => {
-    const LiveLog = debug ? tsplus_module_1.Log.LiveLogDebug : tsplus_module_1.Log.LiveLog;
-    const LiveConfig = tsplus_module_1.Config.makeLayer(config);
-    const LiveEnv = tsplus_module_2.provideToAndMerge(MemoryBot)(tsplus_module_2.merge(LiveConfig)(LiveLog));
+    const LiveLog = debug ? Log.LiveLogDebug : Log.LiveLog;
+    const LiveConfig = Config.makeLayer(config);
+    const LiveEnv = tsplus_module_1.provideToAndMerge(MemoryBot)(tsplus_module_1.merge(LiveConfig)(LiveLog));
     return LiveEnv;
 };
 //# sourceMappingURL=gateway.js.map

package/gateway.js.map

@@ -1 +1 @@
-{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../src/gateway.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAA;AAC5E,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAA;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAE1C,OAAO,KAAK,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,KAAK,SAAS,MAAM,qCAAqC,CAAA;AAChE,OAAO,KAAK,KAAK,MAAM,iCAAiC,CAAA;AACxD,OAAO,KAAK,UAAU,MAAM,sCAAsC,CAAA;AAClE,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAA;AACpD,OAAO,KAAK,YAAY,MAAM,oBAAoB,CAAA;AAClD,OAAO,EAAE,GAAG,IAAI,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAExD,MAAM,CAAC,MAAM,eAAe,qDAA8B,eAAe,kBAA1C,wBAAwB,CAAkB,CAAA;AAEzE,MAAM,CAAC,MAAM,UAAU,6CAAmC,eAAe,EAA/C,uBAAY,eAAe,EAA1B,QAAQ,EAAmB,CAAmB,CAAA;AAEzE,MAAM,CAAC,MAAM,aAAa,6BAKxB,WAAW,EAJX,uBAGE,sBAAsB,wBADtB,eAAe,wBADf,oBAAoB,EADrB,UAAU,IAGc,CACd,CAAA;AAEb,MAAM,CAAC,MAAM,aAAa,6BAAoB,gBAAA,OAAO,CAAC,kBAAkB,EAA3C,aAAa,CAA8B,CAAA;AAExE,MAAM,CAAC,MAAM,SAAS,2DAAgC,eAAe,EAA/B,aAAa,GAA1B,UAAU,CAAkC,CAAA;AAErE,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,MAAuB,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,gBAAA,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAA,GAAG,CAAC,OAAO,CAAA;IACtD,MAAM,UAAU,GAAG,gBAAA,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC3C,MAAM,OAAO,qCAA0B,SAAS,wBAAtB,UAAU,EAApB,OAAO,EAAyB,CAAA;IAEhD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
+{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../src/gateway.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAA;AAC5E,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,MAAM,mCAAmC,CAAA;AAC/D,OAAO,EAAE,oBAAoB,EAAE,MAAM,sCAAsC,CAAA;AAC3E,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAChF,OAAO,EAAE,KAAK,EAAS,MAAM,cAAc,CAAA;AAE3C,OAAO,KAAK,YAAY,MAAM,oBAAoB,CAAA;AAClD,OAAO,KAAK,SAAS,MAAM,qCAAqC,CAAA;AAChE,OAAO,KAAK,OAAO,MAAM,2BAA2B,CAAA;AACpD,OAAO,KAAK,KAAK,MAAM,iCAAiC,CAAA;AACxD,OAAO,KAAK,UAAU,MAAM,sCAAsC,CAAA;AAClE,OAAO,KAAK,EAAE,MAAM,8BAA8B,CAAA;AAClD,OAAO,EAAE,GAAG,IAAI,KAAK,EAAE,MAAM,2BAA2B,CAAA;AAExD,MAAM,MAAM,GAAG,KAAK,CAAC,WAAW,CAAA;AAEhC,MAAM,CAAC,MAAM,eAAe,qCAA8B,eAAe,EAA1C,wBAAwB,CAAkB,CAAA;AAEzE,MAAM,CAAC,MAAM,UAAU,6BAAmC,eAAe,EAA/C,uBAAY,eAAe,EAA1B,QAAQ,EAAmB,CAAmB,CAAA;AAEzE,MAAM,CAAC,MAAM,aAAa,6BAKxB,WAAW,EAJX,uBAGE,sBAAsB,wBADtB,eAAe,wBADf,oBAAoB,EADrB,UAAU,IAGc,CACd,CAAA;AAEb,MAAM,CAAC,MAAM,aAAa,6BAAoB,kBAAkB,EAAnC,aAAa,CAAsB,CAAA;AAEhE,MAAM,CAAC,MAAM,SAAS,2DAAgC,eAAe,EAA/B,aAAa,GAA1B,UAAU,CAAkC,CAAA;AAErE,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,MAAuB,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;IAC7D,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;IACtD,MAAM,UAAU,GAAG,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAC3C,MAAM,OAAO,qCAA0B,SAAS,wBAAtB,UAAU,EAApB,OAAO,EAAyB,CAAA;IAEhD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.20.5",
+  "version": "0.21.0",
   "type": "module",
   "publishConfig": {
     "access": "public",
@@ -24,22 +24,18 @@
     "./*": "./*.js"
   },
   "devDependencies": {
-    "@effect/io": "^0.0.33",
-    "@fp-ts/data": "^0.0.25",
     "@tim-smart/discord-api-docs-parser": "^0.4.1",
     "@types/ws": "^8.5.3",
     "lerna": "^6.1.0",
     "typescript": "https://cdn.jsdelivr.net/npm/@tsplus/installer/compiler/typescript.tgz"
   },
   "dependencies": {
-    "callbag-effect-ts": "1.0.0-alpha.22",
+    "@effect/io": "~0.0.41",
+    "@effect/stream": "~0.0.3",
+    "@fp-ts/data": "~0.0.30",
     "ts-toolbelt": "^9.6.0",
     "tweetnacl": "^1.0.3"
   },
-  "peerDependencies": {
-    "@effect/io": "*",
-    "@fp-ts/data": "*"
-  },
   "optionalDependencies": {
     "bufferutil": "^4.0.7",
     "isomorphic-ws": "^5.0.0",
@@ -47,11 +43,5 @@
     "ws": "^8.11.0"
   },
   "sideEffects": false,
-  "pnpm": {
-    "overrides": {
-      "@effect/io": "^0.0.33",
-      "@fp-ts/data": "^0.0.25"
-    }
-  },
-  "gitHead": "3e828b3e5d97ed8c543783969468e0cda3a7270f"
+  "gitHead": "7ee1a7233c14362dc49ec46e30abafe7cb74a90b"
 }

package/utils/effect.d.ts

@@ -1,20 +1,20 @@
-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;
+import { Context, Effect } from "dfx/_common";
+export type Success<A extends Effect.Effect<any, any, any>> = A extends Effect.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;
+    [k in keyof T]: T[k] extends (...args: infer ARGS) => Effect.Effect<infer R, infer E, infer A> ? ((...args: ARGS) => Effect.Effect<R, E, A>) extends T[k] ? k : never : never;
 }[keyof T]>;
 export type ShapeCn<T> = Pick<T, {
-    [k in keyof T]: T[k] extends Effect<any, any, any> ? k : never;
+    [k in keyof T]: T[k] extends Effect.Effect<any, any, any> ? k : never;
 }[keyof T]>;
 export type DerivedLifted<T, Fns extends keyof ShapeFn<T>, Cns extends keyof ShapeCn<T>, Values extends keyof T> = {
-    [k in Fns]: T[k] extends (...args: infer ARGS) => Effect<infer R, infer E, infer A> ? (...args: ARGS) => Effect<R | T, E, A> : never;
+    [k in Fns]: T[k] extends (...args: infer ARGS) => Effect.Effect<infer R, infer E, infer A> ? (...args: ARGS) => Effect.Effect<R | T, E, A> : never;
 } & {
-    [k in Cns]: T[k] extends Effect<infer R, infer E, infer A> ? Effect<R | T, E, A> : never;
+    [k in Cns]: T[k] extends Effect.Effect<infer R, infer E, infer A> ? Effect.Effect<R | T, E, A> : never;
 } & {
-    [k in Values]: Effect<T, never, T[k]>;
+    [k in Values]: Effect.Effect<T, never, T[k]>;
 };
 /**
  * @tsplus static effect/io/Effect.Ops deriveLifted
  * @tsplus location "dfx/utils/effect"
  */
-export declare function deriveLifted<T>(S: Tag<T>): <Fns extends keyof ShapeFn<T> = never, Cns extends keyof ShapeCn<T> = never, Values extends keyof T = never>(functions: Fns[], effects: Cns[], values: Values[]) => DerivedLifted<T, Fns, Cns, Values>;
+export declare function deriveLifted<T>(S: Context.Tag<T>): <Fns extends keyof ShapeFn<T> = never, Cns extends keyof ShapeCn<T> = never, Values extends keyof T = never>(functions: Fns[], effects: Cns[], values: Values[]) => DerivedLifted<T, Fns, Cns, Values>;

package/utils/effect.js

@@ -1,4 +1,4 @@
-import * as tsplus_module_1 from "@effect/io/Effect";
+import { Effect } from "dfx/_common";
 /**
  * @tsplus static effect/io/Effect.Ops deriveLifted
  */
@@ -6,13 +6,13 @@ export function deriveLifted(S) {
     return (functions, constants, values) => {
         const ret = {};
         for (const k of functions) {
-            ret[k] = (...args) => tsplus_module_1.serviceWithEffect(S)((h) => h[k](...args));
+            ret[k] = (...args) => Effect.serviceWithEffect(S)((h) => h[k](...args));
         }
         for (const k of constants) {
-            ret[k] = tsplus_module_1.serviceWithEffect(S)((h) => h[k]);
+            ret[k] = Effect.serviceWithEffect(S)((h) => h[k]);
         }
         for (const k of values) {
-            ret[k] = tsplus_module_1.serviceWith(S)((h) => h[k]);
+            ret[k] = Effect.serviceWith(S)((h) => h[k]);
         }
         return ret;
     };

package/utils/effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"effect.js","sourceRoot":"","sources":["../../src/utils/effect.ts"],"names":[],"mappings":";AA+CA;;GAEG;AACH,MAAM,UAAU,YAAY,CAC1B,CAAS;IAUT,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,GAAG,GAAG,EAAS,CAAA;QAErB,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;YACzB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAC1B,kCAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,CAAC,CAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;SAC7D;QAED,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;YACzB,GAAG,CAAC,CAAC,CAAC,GAAG,kCAAyB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAQ,CAAC,CAAA;SACzD;QAED,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;YACtB,GAAG,CAAC,CAAC,CAAC,GAAG,4BAAmB,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;SAC5C;QAED,OAAO,GAAU,CAAA;IACnB,CAAC,CAAA;AACH,CAAC"}
+{"version":3,"file":"effect.js","sourceRoot":"","sources":["../../src/utils/effect.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,MAAM,EAAE,MAAM,aAAa,CAAA;AA4C7C;;GAEG;AACH,MAAM,UAAU,YAAY,CAC1B,CAAiB;IAUjB,OAAO,CAAC,SAAS,EAAE,SAAS,EAAE,MAAM,EAAE,EAAE;QACtC,MAAM,GAAG,GAAG,EAAS,CAAA;QAErB,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;YACzB,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,IAAW,EAAE,EAAE,CAC1B,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,CAAC,CAAS,CAAC,GAAG,IAAI,CAAC,CAAC,CAAA;SAC7D;QAED,KAAK,MAAM,CAAC,IAAI,SAAS,EAAE;YACzB,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAQ,CAAC,CAAA;SACzD;QAED,KAAK,MAAM,CAAC,IAAI,MAAM,EAAE;YACtB,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;SAC5C;QAED,OAAO,GAAU,CAAA;IACnB,CAAC,CAAA;AACH,CAAC"}

package/webhooks.d.ts

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