dfx 1.0.10 → 1.0.12

package/src/DiscordREST/utils.ts

@@ -21,7 +21,6 @@ export const routeFromConfig = (path: string, method: string) => {
 export const numberHeader = (headers: Headers.Headers) => (key: string) =>
   pipe(
     Headers.get(headers, key),
-    Option.fromUndefinedOr,
     Option.map(parseFloat),
     Option.filter(n => !isNaN(n)),
   )
@@ -34,7 +33,7 @@ export const retryAfter = (headers: Headers.Headers) =>
 
 export const rateLimitFromHeaders = (headers: Headers.Headers) =>
   Option.all({
-    bucket: Option.fromUndefinedOr(Headers.get(headers, "x-ratelimit-bucket")),
+    bucket: Headers.get(headers, "x-ratelimit-bucket"),
     retryAfter: retryAfter(headers),
     limit: numberHeader(headers)("x-ratelimit-limit"),
     remaining: numberHeader(headers)("x-ratelimit-remaining"),

package/src/DiscordREST.ts

@@ -15,7 +15,7 @@ import { flow } from "effect/Function"
 import * as Layer from "effect/Layer"
 import * as Option from "effect/Option"
 import * as Redacted from "effect/Redacted"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Context from "effect/Context"
 import * as HttpBody from "effect/unstable/http/HttpBody"
 import * as HttpClient from "effect/unstable/http/HttpClient"
 import type { HttpClientError } from "effect/unstable/http/HttpClientError"
@@ -185,7 +185,7 @@ const make = Effect.gen(function* () {
           "User-Agent": `DiscordBot (https://github.com/tim-smart/dfx, ${LIB_VERSION})`,
         }),
       )
-      const formData = ServiceMap.getOption(fiber.services, DiscordFormData)
+      const formData = Context.getOption(fiber.context, DiscordFormData)
       if (Option.isSome(formData)) {
         if (request.body._tag === "Uint8Array") {
           formData.value.set(
@@ -230,7 +230,7 @@ export type DiscordRESTError =
   | Discord.DiscordRestError<"RatelimitedResponse", Discord.RatelimitedResponse>
   | Discord.DiscordRestError<"ErrorResponse", Discord.ErrorResponse>
 
-export class DiscordFormData extends ServiceMap.Service<
+export class DiscordFormData extends Context.Service<
   DiscordFormData,
   FormData
 >()("dfx/DiscordREST/DiscordFormData") {}
@@ -244,7 +244,7 @@ export interface DiscordRestService extends Discord.DiscordRest {
   ): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E, R>
 }
 
-export class DiscordREST extends ServiceMap.Service<
+export class DiscordREST extends Context.Service<
   DiscordREST,
   DiscordRestService
 >()("dfx/DiscordREST") {}

package/src/Interactions/context.ts

@@ -3,33 +3,33 @@ import type * as Discord from "../types.ts"
 import type { NoSuchElementError } from "effect/Cause"
 import * as Data from "effect/Data"
 import * as Effect from "effect/Effect"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Context from "effect/Context"
 
-export class Interaction extends ServiceMap.Service<
+export class Interaction extends Context.Service<
   Interaction,
   Discord.APIInteraction
 >()("dfx/Interactions/Interaction") {}
 export type DiscordInteraction = Interaction
 
-export class ApplicationCommand extends ServiceMap.Service<
+export class ApplicationCommand extends Context.Service<
   ApplicationCommand,
   Discord.APIApplicationCommandInteraction["data"]
 >()("dfx/Interactions/ApplicationCommand") {}
 export type DiscordApplicationCommand = ApplicationCommand
 
-export class MessageComponentData extends ServiceMap.Service<
+export class MessageComponentData extends Context.Service<
   MessageComponentData,
   Discord.APIMessageComponentInteractionData
 >()("dfx/Interactions/MessageComponentData") {}
 export type DiscordMessageComponent = MessageComponentData
 
-export class ModalSubmitData extends ServiceMap.Service<
+export class ModalSubmitData extends Context.Service<
   ModalSubmitData,
   Discord.APIModalSubmission
 >()("dfx/Interactions/ModalSubmitData") {}
 export type DiscordModalSubmit = ModalSubmitData
 
-export class FocusedOptionContext extends ServiceMap.Service<
+export class FocusedOptionContext extends Context.Service<
   FocusedOptionContext,
   Discord.APIApplicationCommandInteractionDataOption
 >()("dfx/Interactions/FocusedOptionContext") {}
@@ -38,7 +38,7 @@ export type DiscordFocusedOption = FocusedOptionContext
 export interface SubCommandContextData {
   readonly command: Discord.APIApplicationCommandInteractionDataSubcommandOption
 }
-export class SubCommandContext extends ServiceMap.Service<
+export class SubCommandContext extends Context.Service<
   SubCommandContext,
   SubCommandContextData
 >()("dfx/Interactions/SubCommandContext") {}

package/src/Interactions/gateway.ts

@@ -7,7 +7,7 @@ import * as Layer from "effect/Layer"
 import * as Queue from "effect/Queue"
 import * as Ref from "effect/Ref"
 import * as Schedule from "effect/Schedule"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Context from "effect/Context"
 import { DiscordGateway } from "../DiscordGateway.ts"
 import type { DiscordRESTError } from "../DiscordREST.ts"
 import { DiscordREST } from "../DiscordREST.ts"
@@ -22,7 +22,7 @@ import type { DiscordInteraction, InteractionBuilder } from "./index.ts"
 import { builder, Interaction } from "./index.ts"
 import * as EffectUtils from "../utils/Effect.ts"
 
-export const interactionsSync = ServiceMap.Reference("dfx/Interactions/sync", {
+export const interactionsSync = Context.Reference("dfx/Interactions/sync", {
   defaultValue: () => true,
 })
 
@@ -181,7 +181,7 @@ export interface InteractionsRegistryService {
   ) => Effect.Effect<void>
 }
 
-export class InteractionsRegistry extends ServiceMap.Service<
+export class InteractionsRegistry extends Context.Service<
   InteractionsRegistry,
   InteractionsRegistryService
 >()("dfx/Interactions/InteractionsRegistry") {}

package/src/Interactions/webhook.ts

@@ -6,7 +6,7 @@ import type * as Config from "effect/Config"
 import * as Redacted from "effect/Redacted"
 import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Context from "effect/Context"
 import type * as D from "./definitions.ts"
 import type { DefinitionNotFound } from "./handlers.ts"
 import { handlers } from "./handlers.ts"
@@ -70,7 +70,7 @@ const makeConfig = ({
   algorithm: Verify.PlatformAlgorithm[algorithm],
 })
 
-export class WebhookConfig extends ServiceMap.Service<
+export class WebhookConfig extends Context.Service<
   WebhookConfig,
   ReturnType<typeof makeConfig>
 >()("dfx/Interactions/WebhookConfig") {}

package/src/RateLimit.ts

@@ -4,7 +4,7 @@ import * as Effect from "effect/Effect"
 import * as Layer from "effect/Layer"
 import * as Memory from "./RateLimit/memory.ts"
 import { delayFrom } from "./RateLimit/utils.ts"
-import * as ServiceMap from "effect/ServiceMap"
+import * as Context from "effect/Context"
 
 export type BucketDetails = {
   key: "global" | string
@@ -35,7 +35,7 @@ export interface RateLimitStoreService {
   readonly removeCounter: (key: string) => Effect.Effect<void>
 }
 
-export class RateLimitStore extends ServiceMap.Service<
+export class RateLimitStore extends Context.Service<
   RateLimitStore,
   RateLimitStoreService
 >()("dfx/RateLimit/RateLimitStore") {}
@@ -75,7 +75,7 @@ const makeLimiter = Effect.gen(function* () {
   return { maybeWait }
 })
 
-export class RateLimiter extends ServiceMap.Service<
+export class RateLimiter extends Context.Service<
   RateLimiter,
   {
     maybeWait: (

package/src/utils/Effect.ts

@@ -14,7 +14,7 @@ export const subscribeForEachPar = <R, E, A, X>(
     Effect.fnUntraced(function* (scope) {
       const deferred = yield* Deferred.make<never, E>()
       const sub = yield* PubSub.subscribe(self).pipe(Scope.provide(scope))
-      const services = yield* Effect.services<R>()
+      const services = yield* Effect.context<R>()
       const runFork = Effect.runForkWith(services)
       const track = Fiber.runIn(scope)
       function onExit(exit: Exit.Exit<X, E>) {

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.0.10";
+export const LIB_VERSION = "1.0.12";