dfx 0.61.0 → 0.61.2

package/utils/Effect.d.ts

@@ -1,8 +1,5 @@
 import * as Effect from "@effect/io/Effect";
 import * as Hub from "@effect/io/Hub";
 export declare const subscribeForEachPar: <R, E, A, X>(self: Hub.Hub<A>, effect: (_: A) => Effect.Effect<R, E, X>) => Effect.Effect<R, E, never>;
-/**
- * @tsplus fluent effect/io/Effect foreverSwitch
- */
 export declare const foreverSwitch: <R, E, A, R1, E1, X>(self: Effect.Effect<R, E, A>, f: (_: A) => Effect.Effect<R1, E1, X>) => Effect.Effect<R | R1, E | E1, never>;
 //# sourceMappingURL=Effect.d.ts.map

package/utils/Effect.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Effect.d.ts","sourceRoot":"","sources":["../src/utils/Effect.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAIrC,eAAO,MAAM,mBAAmB,wGAwB5B,CAAA;AAEJ;;GAEG;AACH,eAAO,MAAM,aAAa,mIA8BvB,CAAA"}
+{"version":3,"file":"Effect.d.ts","sourceRoot":"","sources":["../src/utils/Effect.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAE3C,OAAO,KAAK,GAAG,MAAM,gBAAgB,CAAA;AAIrC,eAAO,MAAM,mBAAmB,wGAwB5B,CAAA;AAEJ,eAAO,MAAM,aAAa,mIAgCvB,CAAA"}

package/utils/Effect.js

@@ -4,35 +4,27 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.subscribeForEachPar = exports.foreverSwitch = void 0;
-var Option = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/data/Option"));
 var Deferred = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Deferred"));
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
-var Fiber = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Fiber"));
 var Hub = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Hub"));
 var Queue = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Queue"));
-var Ref = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Ref"));
+var ScopedRef = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/ScopedRef"));
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 const subscribeForEachPar = (self, effect) => Effect.flatMap(Deferred.make(), deferred => {
-  const run = Hub.subscribe(self).pipe(Effect.flatMap(queue => Queue.take(queue).pipe(Effect.flatMap(_ => effect(_).pipe(Effect.catchAllCause(_ => Deferred.failCause(deferred, _)), Effect.fork)), Effect.forever)), Effect.scoped);
+  const run = Hub.subscribe(self).pipe(Effect.flatMap(queue => Queue.take(queue).pipe(Effect.flatMap(_ => effect(_).pipe(Effect.catchAllCause(_ => Deferred.failCause(deferred, _)), Effect.forkScoped)), Effect.forever)), Effect.scoped);
   return Effect.all([run, Deferred.await(deferred)], {
     concurrency: "unbounded",
     discard: true
-  }).pipe(Effect.forever);
+  });
 });
-/**
- * @tsplus fluent effect/io/Effect foreverSwitch
- */
 exports.subscribeForEachPar = subscribeForEachPar;
-const foreverSwitch = (self, f) => Effect.flatMap(Effect.all([Deferred.make(), Ref.make(Option.none())]), ([causeDeferred, fiberRef]) => {
-  const run = Effect.flatMap(self, _ => f(_).pipe(Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)), Effect.fork)).pipe(Effect.flatMap(fiber => Ref.getAndSet(fiberRef, Option.some(fiber))), Effect.tap(_ => Option.match(_, {
-    onNone: () => Effect.unit,
-    onSome: fiber => Fiber.interrupt(fiber)
-  })), Effect.forever);
+const foreverSwitch = (self, f) => Effect.all([Deferred.make(), ScopedRef.fromAcquire(Effect.fork(Effect.unit))]).pipe(Effect.flatMap(([causeDeferred, fiberRef]) => {
+  const run = self.pipe(Effect.flatMap(_ => ScopedRef.set(fiberRef, f(_).pipe(Effect.tapErrorCause(_ => Deferred.failCause(causeDeferred, _)), Effect.forkScoped))), Effect.forever);
   return Effect.all([run, Deferred.await(causeDeferred)], {
     concurrency: "unbounded",
     discard: true
-  }).pipe(Effect.forever);
-});
+  });
+}), Effect.scoped);
 exports.foreverSwitch = foreverSwitch;
 //# sourceMappingURL=Effect.js.map

package/utils/Effect.js.map

@@ -1 +1 @@
-{"version":3,"file":"Effect.js","names":["Option","_interopRequireWildcard","require","Deferred","Effect","Fiber","Hub","Queue","Ref","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","subscribeForEachPar","self","effect","flatMap","make","deferred","run","subscribe","pipe","queue","take","_","catchAllCause","failCause","fork","forever","scoped","all","await","concurrency","discard","exports","foreverSwitch","f","none","causeDeferred","fiberRef","tapErrorCause","fiber","getAndSet","some","tap","match","onNone","unit","onSome","interrupt"],"sources":["../src/utils/Effect.ts"],"sourcesContent":[null],"mappings":";;;;;;AAAA,IAAAA,MAAA,gBAAAC,uBAAA,eAAAC,OAAA;AACA,IAAAC,QAAA,gBAAAF,uBAAA,eAAAC,OAAA;AACA,IAAAE,MAAA,gBAAAH,uBAAA,eAAAC,OAAA;AACA,IAAAG,KAAA,gBAAAJ,uBAAA,eAAAC,OAAA;AACA,IAAAI,GAAA,gBAAAL,uBAAA,eAAAC,OAAA;AACA,IAAAK,KAAA,gBAAAN,uBAAA,eAAAC,OAAA;AACA,IAAAM,GAAA,gBAAAP,uBAAA,eAAAC,OAAA;AAAqC,SAAAO,yBAAAC,WAAA,eAAAC,OAAA,kCAAAC,iBAAA,OAAAD,OAAA,QAAAE,gBAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,WAAA,WAAAA,WAAA,GAAAG,gBAAA,GAAAD,iBAAA,KAAAF,WAAA;AAAA,SAAAT,wBAAAa,GAAA,EAAAJ,WAAA,SAAAA,WAAA,IAAAI,GAAA,IAAAA,GAAA,CAAAC,UAAA,WAAAD,GAAA,QAAAA,GAAA,oBAAAA,GAAA,wBAAAA,GAAA,4BAAAE,OAAA,EAAAF,GAAA,UAAAG,KAAA,GAAAR,wBAAA,CAAAC,WAAA,OAAAO,KAAA,IAAAA,KAAA,CAAAC,GAAA,CAAAJ,GAAA,YAAAG,KAAA,CAAAE,GAAA,CAAAL,GAAA,SAAAM,MAAA,WAAAC,qBAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,GAAA,IAAAX,GAAA,QAAAW,GAAA,kBAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAd,GAAA,EAAAW,GAAA,SAAAI,IAAA,GAAAR,qBAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAV,GAAA,EAAAW,GAAA,cAAAI,IAAA,KAAAA,IAAA,CAAAV,GAAA,IAAAU,IAAA,CAAAC,GAAA,KAAAR,MAAA,CAAAC,cAAA,CAAAH,MAAA,EAAAK,GAAA,EAAAI,IAAA,YAAAT,MAAA,CAAAK,GAAA,IAAAX,GAAA,CAAAW,GAAA,SAAAL,MAAA,CAAAJ,OAAA,GAAAF,GAAA,MAAAG,KAAA,IAAAA,KAAA,CAAAa,GAAA,CAAAhB,GAAA,EAAAM,MAAA,YAAAA,MAAA;AAE9B,MAAMW,mBAAmB,GAAGA,CACjCC,IAAgB,EAChBC,MAAwC,KAExC7B,MAAM,CAAC8B,OAAO,CAAC/B,QAAQ,CAACgC,IAAI,EAAY,EAAEC,QAAQ,IAAG;EACnD,MAAMC,GAAG,GAAG/B,GAAG,CAACgC,SAAS,CAACN,IAAI,CAAC,CAACO,IAAI,CAClCnC,MAAM,CAAC8B,OAAO,CAACM,KAAK,IAClBjC,KAAK,CAACkC,IAAI,CAACD,KAAK,CAAC,CAACD,IAAI,CACpBnC,MAAM,CAAC8B,OAAO,CAACQ,CAAC,IACdT,MAAM,CAACS,CAAC,CAAC,CAACH,IAAI,CACZnC,MAAM,CAACuC,aAAa,CAACD,CAAC,IAAIvC,QAAQ,CAACyC,SAAS,CAACR,QAAQ,EAAEM,CAAC,CAAC,CAAC,EAC1DtC,MAAM,CAACyC,IAAI,CACZ,CACF,EACDzC,MAAM,CAAC0C,OAAO,CACf,CACF,EACD1C,MAAM,CAAC2C,MAAM,CACd;EAED,OAAO3C,MAAM,CAAC4C,GAAG,CAAC,CAACX,GAAG,EAAElC,QAAQ,CAAC8C,KAAK,CAACb,QAAQ,CAAC,CAAC,EAAE;IACjDc,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAC,CAACZ,IAAI,CAACnC,MAAM,CAAC0C,OAAO,CAAC;AACzB,CAAC,CAAC;AAEJ;;;AAAAM,OAAA,CAAArB,mBAAA,GAAAA,mBAAA;AAGO,MAAMsB,aAAa,GAAGA,CAC3BrB,IAA4B,EAC5BsB,CAAqC,KAErClD,MAAM,CAAC8B,OAAO,CACZ9B,MAAM,CAAC4C,GAAG,CAAC,CACT7C,QAAQ,CAACgC,IAAI,EAAa,EAC1B3B,GAAG,CAAC2B,IAAI,CAA2CnC,MAAM,CAACuD,IAAI,EAAE,CAAC,CAClE,CAAC,EACF,CAAC,CAACC,aAAa,EAAEC,QAAQ,CAAC,KAAI;EAC5B,MAAMpB,GAAG,GAAGjC,MAAM,CAAC8B,OAAO,CAACF,IAAI,EAAEU,CAAC,IAChCY,CAAC,CAACZ,CAAC,CAAC,CAACH,IAAI,CACPnC,MAAM,CAACsD,aAAa,CAAChB,CAAC,IAAIvC,QAAQ,CAACyC,SAAS,CAACY,aAAa,EAAEd,CAAC,CAAC,CAAC,EAC/DtC,MAAM,CAACyC,IAAI,CACZ,CAAC,CAACN,IAAI,CACLnC,MAAM,CAAC8B,OAAO,CAACyB,KAAK,IAAInD,GAAG,CAACoD,SAAS,CAACH,QAAQ,EAAEzD,MAAM,CAAC6D,IAAI,CAACF,KAAK,CAAC,CAAC,CAAC,EACpEvD,MAAM,CAAC0D,GAAG,CAACpB,CAAC,IACV1C,MAAM,CAAC+D,KAAK,CAACrB,CAAC,EAAE;IACdsB,MAAM,EAAEA,CAAA,KAAM5D,MAAM,CAAC6D,IAAI;IACzBC,MAAM,EAAEP,KAAK,IAAItD,KAAK,CAAC8D,SAAS,CAACR,KAAK;GACvC,CAAC,CACH,EACDvD,MAAM,CAAC0C,OAAO,CACf;EAEH,OAAO1C,MAAM,CAAC4C,GAAG,CAAC,CAACX,GAAG,EAAElC,QAAQ,CAAC8C,KAAK,CAACO,aAAa,CAAC,CAAC,EAAE;IACtDN,WAAW,EAAE,WAAW;IACxBC,OAAO,EAAE;GACV,CAAC,CAACZ,IAAI,CAACnC,MAAM,CAAC0C,OAAO,CAAC;AACzB,CAAC,CACF;AAAAM,OAAA,CAAAC,aAAA,GAAAA,aAAA"}
+{"version":3,"file":"Effect.js","names":["Deferred","_interopRequireWildcard","require","Effect","Hub","Queue","ScopedRef","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","subscribeForEachPar","self","effect","flatMap","make","deferred","run","subscribe","pipe","queue","take","_","catchAllCause","failCause","forkScoped","forever","scoped","all","await","concurrency","discard","exports","foreverSwitch","f","fromAcquire","fork","unit","causeDeferred","fiberRef","tapErrorCause"],"sources":["../src/utils/Effect.ts"],"sourcesContent":[null],"mappings":"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"}

package/version.d.ts

@@ -1,2 +1,2 @@
-export declare const LIB_VERSION = "0.61.0";
+export declare const LIB_VERSION = "0.61.2";
 //# sourceMappingURL=version.d.ts.map

package/version.js

@@ -4,6 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LIB_VERSION = void 0;
-const LIB_VERSION = "0.61.0";
+const LIB_VERSION = "0.61.2";
 exports.LIB_VERSION = LIB_VERSION;
 //# sourceMappingURL=version.js.map

package/webhooks.d.ts

@@ -1,4 +1,3 @@
-import type { HttpRequestExecutor } from "@effect-http/client";
 import * as Config from "@effect/io/Config";
 import type * as ConfigError from "@effect/io/Config/Error";
 import * as Layer from "@effect/io/Layer";
@@ -9,8 +8,7 @@ import * as Log from "dfx/Log";
 import type { RateLimiter } from "dfx/RateLimit";
 export { BadWebhookSignature, makeConfigLayer, makeHandler, makeSimpleHandler, WebhookConfig, WebhookParseError, } from "dfx/Interactions/webhook";
 export declare const MemoryRateLimit: Layer.Layer<Log.Log, never, RateLimiter>;
-export declare const MemoryREST: Layer.Layer<DiscordConfig.DiscordConfig | HttpRequestExecutor | Log.Log, never, DiscordREST>;
-export declare const webhookLayerWithoutHttp: (options: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => Layer.Layer<HttpRequestExecutor, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
+export declare const MemoryREST: Layer.Layer<DiscordConfig.DiscordConfig | Log.Log, never, DiscordREST>;
+export declare const webhookLayer: (options: DiscordConfig.MakeOpts & MakeConfigOpts) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
 export declare const webhookLayerConfig: (config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>) => Layer.Layer<never, ConfigError.ConfigError, RateLimiter | DiscordREST | WebhookConfig>;
-export declare const webhookLayer: (options: DiscordConfig.MakeOpts & MakeConfigOpts) => Layer.Layer<never, never, RateLimiter | DiscordREST | WebhookConfig>;
 //# sourceMappingURL=webhooks.d.ts.map

package/webhooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAA;AAE9D,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,aAAa,EACb,iBAAiB,GAClB,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,eAAe,0CAG3B,CAAA;AAED,eAAO,MAAM,UAAU,8FAGtB,CAAA;AAED,eAAO,MAAM,uBAAuB,YACzB,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,GAAG,cAAc,CAAC,KACnE,WAAW,CACZ,mBAAmB,EACnB,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CAexC,CAAA;AAEH,eAAO,MAAM,kBAAkB,WACrB,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,GAAG,cAAc,CAAC,KAClE,WAAW,CACZ,KAAK,EACL,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CACkC,CAAA;AAE7E,eAAO,MAAM,YAAY,YACd,cAAc,QAAQ,GAAG,cAAc,KAC/C,WAAW,CAAC,KAAK,EAAE,KAAK,EAAE,WAAW,GAAG,WAAW,GAAG,aAAa,CAUrE,CAAA"}
+{"version":3,"file":"webhooks.d.ts","sourceRoot":"","sources":["./src/webhooks.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,MAAM,mBAAmB,CAAA;AAC3C,OAAO,KAAK,KAAK,WAAW,MAAM,yBAAyB,CAAA;AAE3D,OAAO,KAAK,KAAK,MAAM,kBAAkB,CAAA;AACzC,OAAO,KAAK,aAAa,MAAM,mBAAmB,CAAA;AAClD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAElD,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAE7E,OAAO,KAAK,GAAG,MAAM,SAAS,CAAA;AAC9B,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAGhD,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,aAAa,EACb,iBAAiB,GAClB,MAAM,0BAA0B,CAAA;AAEjC,eAAO,MAAM,eAAe,0CAG3B,CAAA;AAED,eAAO,MAAM,UAAU,wEAGtB,CAAA;AAED,eAAO,MAAM,YAAY,YACd,cAAc,QAAQ,GAAG,cAAc,KAC/C,WAAW,CACZ,KAAK,EACL,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CAY1C,CAAA;AAED,eAAO,MAAM,kBAAkB,WACrB,aAAa,CAAC,IAAI,CAAC,cAAc,QAAQ,GAAG,cAAc,CAAC,KAClE,WAAW,CACZ,KAAK,EACL,uBAAuB,EACvB,WAAW,GAAG,WAAW,GAAG,aAAa,CAOxC,CAAA"}

package/webhooks.js

@@ -40,8 +40,7 @@ Object.defineProperty(exports, "makeSimpleHandler", {
     return _webhook.makeSimpleHandler;
   }
 });
-exports.webhookLayerWithoutHttp = exports.webhookLayerConfig = exports.webhookLayer = void 0;
-var _client = /*#__PURE__*/require("@effect-http/client");
+exports.webhookLayerConfig = exports.webhookLayer = void 0;
 var Config = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Config"));
 var Effect = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Effect"));
 var Layer = /*#__PURE__*/_interopRequireWildcard( /*#__PURE__*/require("@effect/io/Layer"));
@@ -56,24 +55,15 @@ const MemoryRateLimit = /*#__PURE__*/Layer.provide(_RateLimit.LiveMemoryRateLimi
 exports.MemoryRateLimit = MemoryRateLimit;
 const MemoryREST = /*#__PURE__*/Layer.provide(_RateLimit.LiveMemoryRateLimitStore, _DiscordREST.LiveDiscordREST);
 exports.MemoryREST = MemoryREST;
-const webhookLayerWithoutHttp = options => Layer.unwrapEffect(Effect.map(Effect.config(Config.unwrap(options)), options => {
-  const config = DiscordConfig.make(options);
-  const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
-  const LiveWebhook = (0, _webhook.makeConfigLayer)(options);
-  const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog;
-  const LiveEnv = Layer.provide(Layer.merge(LiveLog, LiveConfig), Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit));
-  return LiveEnv;
-}));
-exports.webhookLayerWithoutHttp = webhookLayerWithoutHttp;
-const webhookLayerConfig = config => Layer.provide(_client.LiveFetchRequestExecutor, webhookLayerWithoutHttp(config));
-exports.webhookLayerConfig = webhookLayerConfig;
 const webhookLayer = options => {
   const config = DiscordConfig.make(options);
   const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config);
   const LiveWebhook = (0, _webhook.makeConfigLayer)(options);
   const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog;
   const LiveEnv = Layer.provide(Layer.merge(LiveLog, LiveConfig), Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit));
-  return Layer.provide(_client.LiveFetchRequestExecutor, LiveEnv);
+  return LiveEnv;
 };
 exports.webhookLayer = webhookLayer;
+const webhookLayerConfig = config => Layer.unwrapEffect(Effect.map(Effect.config(Config.unwrap(config)), webhookLayer));
+exports.webhookLayerConfig = webhookLayerConfig;
 //# sourceMappingURL=webhooks.js.map

package/webhooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"webhooks.js","names":["_client","require","Config","_interopRequireWildcard","Effect","Layer","DiscordConfig","_DiscordREST","_webhook","Log","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","exports","MemoryREST","LiveDiscordREST","webhookLayerWithoutHttp","options","unwrapEffect","map","config","unwrap","make","LiveConfig","succeed","LiveWebhook","makeConfigLayer","LiveLog","debug","LiveLogDebug","LiveEnv","merge","mergeAll","webhookLayerConfig","LiveFetchRequestExecutor","webhookLayer"],"sources":["./src/webhooks.ts"],"sourcesContent":[null],"mappings":"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"}
+{"version":3,"file":"webhooks.js","names":["Config","_interopRequireWildcard","require","Effect","Layer","DiscordConfig","_DiscordREST","_webhook","Log","_RateLimit","_getRequireWildcardCache","nodeInterop","WeakMap","cacheBabelInterop","cacheNodeInterop","obj","__esModule","default","cache","has","get","newObj","hasPropertyDescriptor","Object","defineProperty","getOwnPropertyDescriptor","key","prototype","hasOwnProperty","call","desc","set","MemoryRateLimit","provide","LiveMemoryRateLimitStore","LiveRateLimiter","exports","MemoryREST","LiveDiscordREST","webhookLayer","options","config","make","LiveConfig","succeed","LiveWebhook","makeConfigLayer","LiveLog","debug","LiveLogDebug","LiveEnv","merge","mergeAll","webhookLayerConfig","unwrapEffect","map","unwrap"],"sources":["./src/webhooks.ts"],"sourcesContent":[null],"mappings":"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"}