dfx 0.21.18 → 0.21.19
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/_common.d.ts +1 -0
- package/_common.js +1 -0
- package/_common.js.map +1 -1
- package/gateway.d.ts +2 -2
- package/gateway.js +2 -1
- package/gateway.js.map +1 -1
- package/global.d.ts +1 -1
- package/package.json +2 -2
- package/utils/ConfigWrap.d.ts +19 -0
- package/utils/ConfigWrap.js +17 -0
- package/utils/ConfigWrap.js.map +1 -0
- package/webhooks.d.ts +2 -2
- package/webhooks.js +3 -1
- package/webhooks.js.map +1 -1
package/_common.d.ts
CHANGED
|
@@ -19,6 +19,7 @@ export type { Option as Maybe } from "@fp-ts/data/Option";
|
|
|
19
19
|
export type { Ref } from "@effect/io/Ref";
|
|
20
20
|
export type { HashSet } from "@fp-ts/data/HashSet";
|
|
21
21
|
export * as Discord from "./types.js";
|
|
22
|
+
export * as ConfigWrap from "./utils/ConfigWrap.js";
|
|
22
23
|
/**
|
|
23
24
|
* @tsplus type effect/io/Schedule
|
|
24
25
|
* @tsplus companion effect/io/Schedule.Ops
|
package/_common.js
CHANGED
package/_common.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"_common.js","sourceRoot":"","sources":["../src/_common.ts"],"names":[],"mappings":"AAeA,OAAO,EAAW,GAAG,EAAE,MAAM,qBAAqB,CAAA;AASlD,OAAO,KAAK,OAAO,MAAM,YAAY,CAAA"}
|
|
1
|
+
{"version":3,"file":"_common.js","sourceRoot":"","sources":["../src/_common.ts"],"names":[],"mappings":"AAeA,OAAO,EAAW,GAAG,EAAE,MAAM,qBAAqB,CAAA;AASlD,OAAO,KAAK,OAAO,MAAM,YAAY,CAAA;AAErC,OAAO,KAAK,UAAU,MAAM,uBAAuB,CAAA"}
|
package/gateway.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { ConfigWrap } from "dfx/_common";
|
|
2
2
|
import { DiscordConfig, Log } from "dfx";
|
|
3
3
|
export * as CachePrelude from "./Cache/prelude.js";
|
|
4
4
|
export * as DiscordWS from "./DiscordGateway/DiscordWS/index.js";
|
|
@@ -13,4 +13,4 @@ export declare const MemorySharder: import("./_common.js").Layer<DiscordConfig.D
|
|
|
13
13
|
export declare const MemoryGateway: import("./_common.js").Layer<DiscordConfig.DiscordConfig | Log.Log, never, import("./DiscordGateway/index.js").DiscordGateway>;
|
|
14
14
|
export declare const MemoryBot: import("./_common.js").Layer<DiscordConfig.DiscordConfig | Log.Log, never, import("dfx").DiscordREST | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
|
|
15
15
|
export declare const make: (config: DiscordConfig.MakeOpts, debug?: boolean) => import("./_common.js").Layer<never, never, import("dfx").DiscordREST | DiscordConfig.DiscordConfig | Log.Log | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
|
|
16
|
-
export declare const makeFromConfig: (config:
|
|
16
|
+
export declare const makeFromConfig: (config: ConfigWrap.Wrap<DiscordConfig.MakeOpts>, debug?: boolean) => import("./_common.js").Layer<never, import("./_common.js").ConfigError, import("dfx").DiscordREST | DiscordConfig.DiscordConfig | Log.Log | import("dfx").RateLimitStore | import("dfx").RateLimiter | import("./DiscordGateway/index.js").DiscordGateway>;
|
package/gateway.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import * as tsplus_module_1 from "@effect/io/Layer";
|
|
2
|
+
import * as tsplus_module_2 from "dfx/_common";
|
|
2
3
|
import { DiscordConfig, LiveDiscordREST, Log } from "dfx";
|
|
3
4
|
import { LiveJsonDiscordWSCodec } from "./DiscordGateway/DiscordWS/index.js";
|
|
4
5
|
import { LiveDiscordGateway } from "./DiscordGateway/index.js";
|
|
@@ -26,7 +27,7 @@ export const make = (config, debug = false) => {
|
|
|
26
27
|
};
|
|
27
28
|
export const makeFromConfig = (config, debug = false) => {
|
|
28
29
|
const LiveLog = debug ? Log.LiveLogDebug : Log.LiveLog;
|
|
29
|
-
const LiveConfig = DiscordConfig.makeFromConfig(config);
|
|
30
|
+
const LiveConfig = DiscordConfig.makeFromConfig(tsplus_module_2.ConfigWrap.unwrap(config));
|
|
30
31
|
const LiveEnv = tsplus_module_1.provideMerge(MemoryBot)(tsplus_module_1.merge(LiveConfig)(LiveLog));
|
|
31
32
|
return LiveEnv;
|
|
32
33
|
};
|
package/gateway.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../src/gateway.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"gateway.js","sourceRoot":"","sources":["../src/gateway.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,GAAG,EAAE,MAAM,KAAK,CAAA;AACzD,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;AAEhF,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,CAAC,MAAM,eAAe,gCAA8B,eAAe,EAA1C,wBAAwB,CAAkB,CAAA;AAEzE,MAAM,CAAC,MAAM,UAAU,2BAAmC,eAAe,EAA/C,uBAAY,eAAe,EAA1B,QAAQ,EAAmB,CAAmB,CAAA;AAEzE,MAAM,CAAC,MAAM,aAAa,2BAKxB,WAAW,EAJX,uBAGE,sBAAsB,wBADtB,eAAe,wBADf,oBAAoB,EADrB,UAAU,IAGc,CACd,CAAA;AAEb,MAAM,CAAC,MAAM,aAAa,2BAAoB,kBAAkB,EAAnC,aAAa,CAAsB,CAAA;AAEhE,MAAM,CAAC,MAAM,SAAS,sDAAgC,eAAe,EAA/B,aAAa,GAA1B,UAAU,CAAkC,CAAA;AAErE,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,MAA8B,EAAE,KAAK,GAAG,KAAK,EAAE,EAAE;IACpE,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAClD,MAAM,OAAO,gCAA0B,SAAS,wBAAtB,UAAU,EAApB,OAAO,EAAyB,CAAA;IAEhD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,MAA+C,EAC/C,KAAK,GAAG,KAAK,EACb,EAAE;IACF,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAA;IACtD,MAAM,UAAU,GAAG,aAAa,CAAC,cAAc,CAAC,gBAAA,UAAU,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;IAC1E,MAAM,OAAO,gCAA0B,SAAS,wBAAtB,UAAU,EAApB,OAAO,EAAyB,CAAA;IAEhD,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
|
package/global.d.ts
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dfx",
|
|
3
|
-
"version": "0.21.
|
|
3
|
+
"version": "0.21.19",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"publishConfig": {
|
|
6
6
|
"access": "public",
|
|
@@ -47,5 +47,5 @@
|
|
|
47
47
|
"ws": "^8.12.0"
|
|
48
48
|
},
|
|
49
49
|
"sideEffects": false,
|
|
50
|
-
"gitHead": "
|
|
50
|
+
"gitHead": "aa04779799daaa734829f4d896ce7d3c7b74a868"
|
|
51
51
|
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { Config } from "@effect/io/Config";
|
|
2
|
+
/**
|
|
3
|
+
* Wraps a nested structure, converting all primitives to a `Config`.
|
|
4
|
+
*
|
|
5
|
+
* `Wrap<{ key: string }>` becomes `{ key: Config<string> }`
|
|
6
|
+
*
|
|
7
|
+
* @since 1.0.0
|
|
8
|
+
* @category models
|
|
9
|
+
*/
|
|
10
|
+
export type Wrap<A> = (A extends Record<string, any> ? {
|
|
11
|
+
[K in keyof A]: Wrap<A[K]>;
|
|
12
|
+
} : never) | Config<A>;
|
|
13
|
+
/**
|
|
14
|
+
* Constructs a config from a `Wrap`ed value.
|
|
15
|
+
*
|
|
16
|
+
* @since 1.0.0
|
|
17
|
+
* @category constructors
|
|
18
|
+
*/
|
|
19
|
+
export declare const unwrap: <A>(wrapped: Wrap<A>) => Config<A>;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import * as tsplus_module_1 from "@effect/io/Config";
|
|
2
|
+
import { ConfigTypeId } from "@effect/io/Config";
|
|
3
|
+
/**
|
|
4
|
+
* Constructs a config from a `Wrap`ed value.
|
|
5
|
+
*
|
|
6
|
+
* @since 1.0.0
|
|
7
|
+
* @category constructors
|
|
8
|
+
*/
|
|
9
|
+
export const unwrap = (wrapped) => {
|
|
10
|
+
if (typeof wrapped === "object" &&
|
|
11
|
+
wrapped != null &&
|
|
12
|
+
ConfigTypeId in wrapped) {
|
|
13
|
+
return wrapped;
|
|
14
|
+
}
|
|
15
|
+
return tsplus_module_1.struct(Object.fromEntries(Object.entries(wrapped).map(([k, a]) => [k, unwrap(a)])));
|
|
16
|
+
};
|
|
17
|
+
//# sourceMappingURL=ConfigWrap.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"ConfigWrap.js","sourceRoot":"","sources":["../../src/utils/ConfigWrap.ts"],"names":[],"mappings":";AAAA,OAAO,EAAU,YAAY,EAAE,MAAM,mBAAmB,CAAA;AAkBxD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,MAAM,GAAG,CAAI,OAAgB,EAAa,EAAE;IACvD,IACE,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,IAAI,IAAI;QACf,YAAY,IAAI,OAAO,EACvB;QACA,OAAO,OAAO,CAAA;KACf;IAED,OAAO,uBACL,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CACrE,CAAA;AACV,CAAC,CAAA"}
|
package/webhooks.d.ts
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { DiscordConfig } from "dfx";
|
|
2
|
-
import {
|
|
2
|
+
import { ConfigWrap } from "dfx/_common";
|
|
3
3
|
import { MakeConfigOpts } from "./Interactions/webhook.js";
|
|
4
4
|
export { BadWebhookSignature, makeConfigLayer, makeHandler, makeSimpleHandler, WebhookConfig, WebhookParseError, } from "./Interactions/webhook.js";
|
|
5
5
|
export declare const MemoryRateLimit: import("./_common.js").Layer<import("./Log/index.js").Log, never, import("./RateLimit/index.js").RateLimitStore | import("./RateLimit/index.js").RateLimiter>;
|
|
6
6
|
export declare const MemoryREST: import("./_common.js").Layer<import("./DiscordConfig/index.js").DiscordConfig | import("./Log/index.js").Log, never, import("./DiscordREST/index.js").DiscordREST>;
|
|
7
7
|
export declare const make: (config: DiscordConfig.MakeOpts & MakeConfigOpts, debug?: boolean) => import("./_common.js").Layer<never, never, import("./DiscordREST/index.js").DiscordREST | import("./RateLimit/index.js").RateLimitStore | import("./RateLimit/index.js").RateLimiter | import("./Interactions/webhook.js").WebhookConfig>;
|
|
8
|
-
export declare const makeFromConfig: (
|
|
8
|
+
export declare const makeFromConfig: (options: ConfigWrap.Wrap<DiscordConfig.MakeOpts & MakeConfigOpts>, debug?: boolean) => import("./_common.js").Layer<never, import("./_common.js").ConfigError, import("./DiscordREST/index.js").DiscordREST | import("./RateLimit/index.js").RateLimitStore | import("./RateLimit/index.js").RateLimiter | import("./Interactions/webhook.js").WebhookConfig>;
|
package/webhooks.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import * as tsplus_module_1 from "@effect/io/Layer";
|
|
2
2
|
import * as tsplus_module_2 from "dfx";
|
|
3
|
+
import * as tsplus_module_3 from "dfx/_common";
|
|
3
4
|
import { LiveDiscordREST } from "./DiscordREST/index.js";
|
|
4
5
|
import { LiveHttp } from "./Http/index.js";
|
|
5
6
|
import { makeConfigLayer, makeFromConfig as makeConfigFromConfig, } from "./Interactions/webhook.js";
|
|
@@ -14,7 +15,8 @@ export const make = (config, debug = false) => {
|
|
|
14
15
|
const LiveEnv = tsplus_module_1.provide((tsplus_module_1.merge(MemoryRateLimit)(tsplus_module_1.merge(LiveWebhook)(MemoryREST))))((tsplus_module_1.merge(LiveConfig)(LiveLog)));
|
|
15
16
|
return LiveEnv;
|
|
16
17
|
};
|
|
17
|
-
export const makeFromConfig = (
|
|
18
|
+
export const makeFromConfig = (options, debug = false) => {
|
|
19
|
+
const config = tsplus_module_3.ConfigWrap.unwrap(options);
|
|
18
20
|
const LiveWebhook = makeConfigFromConfig(config);
|
|
19
21
|
const LiveLog = debug ? tsplus_module_2.Log.LiveLogDebug : tsplus_module_2.Log.LiveLog;
|
|
20
22
|
const LiveConfig = tsplus_module_2.DiscordConfig.makeFromConfig(config);
|
package/webhooks.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"webhooks.js","sourceRoot":"","sources":["../src/webhooks.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"webhooks.js","sourceRoot":"","sources":["../src/webhooks.ts"],"names":[],"mappings":";;;AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAA;AAC1C,OAAO,EAEL,eAAe,EACf,cAAc,IAAI,oBAAoB,GACvC,MAAM,2BAA2B,CAAA;AAClC,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAEhF,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,WAAW,EACX,iBAAiB,EACjB,aAAa,EACb,iBAAiB,GAClB,MAAM,2BAA2B,CAAA;AAElC,MAAM,CAAC,MAAM,eAAe,gCAA8B,eAAe,EAA1C,wBAAwB,CAAkB,CAAA;AAEzE,MAAM,CAAC,MAAM,UAAU,2BAAmC,eAAe,EAA/C,uBAAmB,QAAQ,EAA1B,eAAe,EAAY,CAAmB,CAAA;AAEzE,MAAM,CAAC,MAAM,IAAI,GAAG,CAClB,MAA+C,EAC/C,KAAK,GAAG,KAAK,EACb,EAAE;IACF,MAAM,WAAW,GAAG,eAAe,CAAC,MAAM,CAAC,CAAA;IAC3C,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,gBAAA,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAA,GAAG,CAAC,OAAO,CAAA;IACtD,MAAM,UAAU,GAAG,gBAAA,aAAa,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;IAClD,MAAM,OAAO,2BACe,uBAA4B,eAAe,wBAA7B,WAAW,EAAxB,UAAU,GAAiC,EAAtE,uBAAW,UAAU,EAApB,OAAO,EAAc,CAAgD,CAAA;IAExE,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,OAAiE,EACjE,KAAK,GAAG,KAAK,EACb,EAAE;IACF,MAAM,MAAM,GAAG,gBAAA,UAAU,CAAC,MAAM,CAAC,OAAO,CAAC,CAAA;IAEzC,MAAM,WAAW,GAAG,oBAAoB,CAAC,MAAM,CAAC,CAAA;IAChD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,gBAAA,GAAG,CAAC,YAAY,CAAC,CAAC,CAAC,gBAAA,GAAG,CAAC,OAAO,CAAA;IACtD,MAAM,UAAU,GAAG,gBAAA,aAAa,CAAC,cAAc,CAAC,MAAM,CAAC,CAAA;IACvD,MAAM,OAAO,2BACe,uBAA4B,eAAe,wBAA7B,WAAW,EAAxB,UAAU,GAAiC,EAAtE,uBAAW,UAAU,EAApB,OAAO,EAAc,CAAgD,CAAA;IAExE,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
|