dfx 0.50.1 → 0.51.1

package/src/webhooks.ts

@@ -1,50 +1,77 @@
+import type { HttpRequestExecutor } from "@effect-http/client"
 import { LiveFetchRequestExecutor } from "@effect-http/client"
-import { LiveDiscordREST } from "./DiscordREST.js"
-import { MakeConfigOpts, makeConfigLayer } from "./Interactions/webhook.js"
-import { LiveMemoryRateLimitStore, LiveRateLimiter } from "./RateLimit.js"
+import * as Config from "@effect/io/Config"
+import type * as ConfigError from "@effect/io/Config/Error"
+import * as Effect from "@effect/io/Effect"
+import * as Layer from "@effect/io/Layer"
 import * as DiscordConfig from "dfx/DiscordConfig"
-import * as Log from "./Log.js"
+import type { DiscordREST } from "dfx/DiscordREST"
+import { LiveDiscordREST } from "dfx/DiscordREST"
+import type { MakeConfigOpts, WebhookConfig } from "dfx/Interactions/webhook"
+import { makeConfigLayer } from "dfx/Interactions/webhook"
+import * as Log from "dfx/Log"
+import type { RateLimiter } from "dfx/RateLimit"
+import { LiveMemoryRateLimitStore, LiveRateLimiter } from "dfx/RateLimit"
 
 export {
   BadWebhookSignature,
+  WebhookConfig,
+  WebhookParseError,
   makeConfigLayer,
   makeHandler,
   makeSimpleHandler,
-  WebhookConfig,
-  WebhookParseError,
-} from "./Interactions/webhook.js"
+} from "dfx/Interactions/webhook"
 
-export const MemoryRateLimit = LiveMemoryRateLimitStore >> LiveRateLimiter
+export const MemoryRateLimit = Layer.provide(
+  LiveMemoryRateLimitStore,
+  LiveRateLimiter,
+)
 
-export const MemoryREST = LiveMemoryRateLimitStore >> LiveDiscordREST
+export const MemoryREST = Layer.provide(
+  LiveMemoryRateLimitStore,
+  LiveDiscordREST,
+)
 
 export const makeLiveWithoutFetch = (
-  options: Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
-) =>
+  options: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
+): Layer.Layer<
+  HttpRequestExecutor,
+  ConfigError.ConfigError,
+  RateLimiter | DiscordREST | WebhookConfig
+> =>
   Layer.unwrapEffect(
-    Config.unwrap(options).config.map(options => {
+    Effect.map(Effect.config(Config.unwrap(options)), options => {
       const config = DiscordConfig.make(options)
       const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config)
       const LiveWebhook = makeConfigLayer(options)
       const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog
-      const LiveEnv =
-        (LiveLog + LiveConfig) >> (MemoryREST + LiveWebhook + MemoryRateLimit)
+      const LiveEnv = Layer.provide(
+        Layer.merge(LiveLog, LiveConfig),
+        Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit),
+      )
+
       return LiveEnv
     }),
   )
 
 export const makeLive = (
-  config: Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
-) => LiveFetchRequestExecutor >> makeLiveWithoutFetch(config)
+  config: Config.Config.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>,
+): Layer.Layer<
+  never,
+  ConfigError.ConfigError,
+  RateLimiter | DiscordREST | WebhookConfig
+> => Layer.provide(LiveFetchRequestExecutor, makeLiveWithoutFetch(config))
 
 export const makeLiveWithoutConfig = (
   options: DiscordConfig.MakeOpts & MakeConfigOpts,
-) => {
+): Layer.Layer<never, never, RateLimiter | DiscordREST | WebhookConfig> => {
   const config = DiscordConfig.make(options)
   const LiveConfig = Layer.succeed(DiscordConfig.DiscordConfig, config)
   const LiveWebhook = makeConfigLayer(options)
   const LiveLog = config.debug ? Log.LiveLogDebug : Log.LiveLog
-  const LiveEnv =
-    (LiveLog + LiveConfig) >> (MemoryREST + LiveWebhook + MemoryRateLimit)
-  return LiveFetchRequestExecutor >> LiveEnv
+  const LiveEnv = Layer.provide(
+    Layer.merge(LiveLog, LiveConfig),
+    Layer.mergeAll(MemoryREST, LiveWebhook, MemoryRateLimit),
+  )
+  return Layer.provide(LiveFetchRequestExecutor, LiveEnv)
 }

package/tsconfig.base.json

@@ -0,0 +1,48 @@
+{
+  "compilerOptions": {
+    "moduleDetection": "force",
+    "composite": true,
+    "downlevelIteration": true,
+    "resolveJsonModule": true,
+    "esModuleInterop": true,
+    "declaration": true,
+    "skipLibCheck": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "preserveSymlinks": true,
+    "moduleResolution": "node",
+    "noEmit": false,
+    "lib": ["ES2021", "DOM"],
+    "sourceMap": true,
+    "declarationMap": true,
+    "strict": true,
+    "noImplicitReturns": false,
+    "noUnusedLocals": true,
+    "noUnusedParameters": false,
+    "noFallthroughCasesInSwitch": true,
+    "noEmitOnError": false,
+    "noErrorTruncation": false,
+    "allowJs": false,
+    "checkJs": false,
+    "forceConsistentCasingInFileNames": true,
+    "stripInternal": true,
+    "noImplicitAny": true,
+    "noImplicitThis": true,
+    "noUncheckedIndexedAccess": false,
+    "strictNullChecks": true,
+    "baseUrl": ".",
+    "target": "ESNext",
+    "module": "ES2022",
+    "incremental": true,
+    "removeComments": false,
+    "paths": {
+      "dfx": ["./src/index.ts"],
+      "dfx/test/*": ["./test/*"],
+      "dfx/examples/*": ["./examples/*"],
+      "dfx/*": ["./src/*"]
+    },
+    "plugins": [{ "name": "@effect/language-service" }]
+  },
+  "include": [],
+  "exclude": ["node_modules", "build", "lib"]
+}

package/tsconfig.build.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "build/esm",
+    "declarationDir": "build/dts",
+    "tsBuildInfoFile": "build/tsbuildinfo/esm.tsbuildinfo",
+    "rootDir": "src"
+  },
+  "include": ["src/**/*"]
+}

package/tsconfig.examples.json

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "build/tsbuildinfo/examples.tsbuildinfo",
+    "rootDir": "examples",
+    "module": "CommonJS",
+    "outDir": "build/examples"
+  },
+  "include": ["examples/**/*.ts"],
+  "references": [{ "path": "./tsconfig.build.json" }]
+}

package/tsconfig.json

@@ -1,10 +1,14 @@
 {
-  "extends": "../tsconfig.json",
-  "compilerOptions": {
-    "baseUrl": ".",
-    "outDir": ".",
-    "rootDir": "./src"
-  },
-  "include": ["src/**/*"],
-  "exclude": []
+  "extends": "./tsconfig.base.json",
+  "references": [
+    {
+      "path": "./tsconfig.build.json"
+    },
+    {
+      "path": "./tsconfig.test.json"
+    },
+    {
+      "path": "./tsconfig.examples.json"
+    }
+  ]
 }

package/tsconfig.madge.json

@@ -0,0 +1,12 @@
+{
+  "compilerOptions": {
+    "noEmit": true,
+    "allowJs": true,
+    "baseUrl": ".",
+    "paths": {
+      "dfx": ["./build/esm/index.js"],
+      "dfx/*": ["./build/esm/*"]
+    }
+  },
+  "include": ["./build/esm/**/*"]
+}

package/tsconfig.test.json

@@ -0,0 +1,10 @@
+{
+  "extends": "./tsconfig.base.json",
+  "compilerOptions": {
+    "tsBuildInfoFile": "build/tsbuildinfo/test.tsbuildinfo",
+    "rootDir": "./",
+    "noEmit": true,
+    "types": ["vitest/globals"]
+  },
+  "include": ["test/**/*", "src/**/*"]
+}