dfx 0.2.0 → 0.3.0

package/DiscordREST/index.d.ts

@@ -1,18 +1,15 @@
 import * as T from "@effect-ts/core/Effect";
-import { Has } from "@effect-ts/system/Has";
-import { AxiosInstance, AxiosRequestConfig } from "axios";
+import { _A } from "@effect-ts/core/Utils";
+import { AxiosRequestConfig } from "axios";
 import * as Config from "../DiscordConfig";
-import { Endpoints } from "../types";
-import { Response, RESTError } from "./types";
-interface AxiosEndpoints extends Endpoints<AxiosRequestConfig> {
-}
-export interface DiscordREST extends AxiosEndpoints {
-    _tag: "DiscordREST";
-    axios: AxiosInstance;
+declare const make: T.Effect<import("@effect-ts/system/Has").Has<Config.DiscordConfig>, never, {
+    _tag: string;
+    axios: import("axios").AxiosInstance;
+    request: <A>(config: AxiosRequestConfig<any>) => import("./types").Response<A>;
+}>;
+export interface DiscordREST extends _A<typeof make> {
 }
 export declare const DiscordREST: import("@effect-ts/system/Has").Tag<DiscordREST>;
-export declare const LiveDiscordREST: import("@effect-ts/system/Layer").Layer<Has<Config.DiscordConfig>, never, Has<DiscordREST>>;
-export declare const rest: <R, E, B>(f: (a: DiscordREST) => T.Effect<R, E, B>, __trace?: string | undefined) => T.Effect<R & Has<DiscordREST>, E, B>;
-declare type InferResponse<T extends (...args: any[]) => Response<any>> = T extends (...args: any[]) => Response<infer R> ? R : never;
-export declare const call: <K extends keyof AxiosEndpoints>(method: K, ...args: Parameters<AxiosEndpoints[K]>) => T.Effect<Has<DiscordREST>, RESTError, InferResponse<AxiosEndpoints[K]>>;
+export declare const LiveDiscordREST: import("@effect-ts/system/Layer").Layer<import("@effect-ts/system/Has").Has<Config.DiscordConfig>, never, import("@effect-ts/system/Has").Has<DiscordREST>>;
+export declare const rest: import("../types").Endpoints<AxiosRequestConfig<any>>;
 export {};

package/DiscordREST/index.js

@@ -1,19 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.call = exports.rest = exports.LiveDiscordREST = exports.DiscordREST = void 0;
+exports.rest = exports.LiveDiscordREST = exports.DiscordREST = void 0;
 const tslib_1 = require("tslib");
 const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
 const fileName_1 = "DiscordREST/index.ts";
 const T = tslib_1.__importStar(require("@effect-ts/core/Effect"));
-const Has_1 = require("@effect-ts/system/Has");
+const Has_1 = require("@effect-ts/core/Has");
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const Config = tslib_1.__importStar(require("../DiscordConfig"));
 const types_1 = require("../types");
 const Http = tslib_1.__importStar(require("./http"));
-exports.DiscordREST = (0, Has_1.tag)();
 const make = T.gen(function* (_) {
-    const token = yield* _(Config.token, fileName_1 + ":22:25");
-    const config = yield* _(Config.rest, fileName_1 + ":23:26");
+    const token = yield* _(Config.token, fileName_1 + ":15:25");
+    const config = yield* _(Config.rest, fileName_1 + ":16:26");
     const axios = axios_1.default.create({
         baseURL: config.baseUrl,
         headers: {
@@ -21,47 +20,44 @@ const make = T.gen(function* (_) {
         },
     });
     const request = Http.request(axios);
-    const routes = (0, types_1.createRoutes)(({ method, url, params = {}, options = {} }) => {
-        const hasBody = method !== "GET" && method !== "DELETE";
-        let hasFormData = false;
-        if (typeof options.data?.append === "function") {
-            hasFormData = true;
-            options.data.append("payload_json", JSON.stringify(params));
-        }
-        const qsParams = hasBody
-            ? options.params
-            : {
-                ...(options.params || {}),
-                ...params,
-            };
-        const data = hasFormData || !hasBody
-            ? options.data
-            : {
-                ...(options.data || {}),
-                ...params,
-            };
-        const config = {
-            ...options,
-            headers: {
-                ...(options.headers || {}),
-                ...(hasFormData ? data.getHeaders() : {}),
-            },
-            method: method,
-            url,
-            params: qsParams,
-            data,
-        };
-        return request(config);
-    });
-    const rest = {
+    return {
         _tag: "DiscordREST",
         axios,
-        ...routes,
+        request,
     };
-    return rest;
-}, fileName_1 + ":21:19");
+}, fileName_1 + ":14:19");
+exports.DiscordREST = (0, Has_1.tag)();
 exports.LiveDiscordREST = T.toLayer(exports.DiscordREST)(make);
-exports.rest = T.accessServiceM(exports.DiscordREST);
-const call = (method, ...args) => (0, exports.rest)((r) => r[method](...args), fileName_1 + ":97:7");
-exports.call = call;
+exports.rest = (0, types_1.createRoutes)(({ method, url, params = {}, options = {} }) => T.accessServiceM(exports.DiscordREST)(({ request }) => {
+    const hasBody = method !== "GET" && method !== "DELETE";
+    let hasFormData = false;
+    if (typeof options.data?.append === "function") {
+        hasFormData = true;
+        options.data.append("payload_json", JSON.stringify(params));
+    }
+    const qsParams = hasBody
+        ? options.params
+        : {
+            ...(options.params || {}),
+            ...params,
+        };
+    const data = hasFormData || !hasBody
+        ? options.data
+        : {
+            ...(options.data || {}),
+            ...params,
+        };
+    const config = {
+        ...options,
+        headers: {
+            ...(options.headers || {}),
+            ...(hasFormData ? data.getHeaders() : {}),
+        },
+        method: method,
+        url,
+        params: qsParams,
+        data,
+    };
+    return request(config);
+}, fileName_1 + ":39:34"));
 //# sourceMappingURL=index.js.map

package/DiscordREST/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,+CAAgD;AAChD,0DAAwE;AACxE,iEAA0C;AAC1C,oCAAkD;AAClD,qDAA8B;AAQjB,QAAA,WAAW,GAAG,IAAA,SAAG,GAAe,CAAA;AAO7C,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,wBAAC,CAAA;IACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,wBAAC,CAAA;IAEpC,MAAM,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC;QACzB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,OAAO,EAAE;YACP,aAAa,EAAE,OAAO,KAAK,EAAE;SAC9B;KACF,CAAC,CAAA;IACF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IACnC,MAAM,MAAM,GAAG,IAAA,oBAAY,EACzB,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE;QAC7C,MAAM,OAAO,GAAG,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,CAAA;QACvD,IAAI,WAAW,GAAG,KAAK,CAAA;QAEvB,IAAI,OAAO,OAAO,CAAC,IAAI,EAAE,MAAM,KAAK,UAAU,EAAE;YAC9C,WAAW,GAAG,IAAI,CACjB;YAAC,OAAO,CAAC,IAAiB,CAAC,MAAM,CAChC,cAAc,EACd,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACvB,CAAA;SACF;QAED,MAAM,QAAQ,GAAG,OAAO;YACtB,CAAC,CAAC,OAAO,CAAC,MAAM;YAChB,CAAC,CAAC;gBACE,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;gBACzB,GAAG,MAAM;aACV,CAAA;QACL,MAAM,IAAI,GACR,WAAW,IAAI,CAAC,OAAO;YACrB,CAAC,CAAC,OAAO,CAAC,IAAI;YACd,CAAC,CAAC;gBACE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;gBACvB,GAAG,MAAM;aACV,CAAA;QAEP,MAAM,MAAM,GAAG;YACb,GAAG,OAAO;YACV,OAAO,EAAE;gBACP,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;gBAC1B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAC1C;YACD,MAAM,EAAE,MAAgB;YACxB,GAAG;YACH,MAAM,EAAE,QAAQ;YAChB,IAAI;SACL,CAAA;QACD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAA;IACxB,CAAC,CACF,CAAA;IAED,MAAM,IAAI,GAAgB;QACxB,IAAI,EAAE,aAAa;QACnB,KAAK;QACL,GAAG,MAAM;KACV,CAAA;IAED,OAAO,IAAI,CAAA;AACb,CAAC,wBAAC,CAAA;AAEW,QAAA,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,mBAAW,CAAC,CAAC,IAAI,CAAC,CAAA;AAE9C,QAAA,IAAI,GAAG,CAAC,CAAC,cAAc,CAAC,mBAAW,CAAC,CAAA;AAQ1C,MAAM,IAAI,GAAG,CAClB,MAAS,EACT,GAAG,IAAmC,EACmC,EAAE,CAC3E,IAAA,YAAI,EAAC,CAAC,CAAC,EAAE,EAAE,CAAE,CAAC,CAAC,MAAM,CAAS,CAAC,GAAG,IAAI,CAAC,uBAAC,CAAA;AAJ7B,QAAA,IAAI,QAIyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;AAAA,kEAA2C;AAC3C,6CAAyC;AAEzC,0DAAyD;AACzD,iEAA0C;AAC1C,oCAAuC;AACvC,qDAA8B;AAO9B,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,wBAAC,CAAA;IACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,wBAAC,CAAA;IAEpC,MAAM,KAAK,GAAG,eAAK,CAAC,MAAM,CAAC;QACzB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,OAAO,EAAE;YACP,aAAa,EAAE,OAAO,KAAK,EAAE;SAC9B;KACF,CAAC,CAAA;IACF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAEnC,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,KAAK;QACL,OAAO;KACR,CAAA;AACH,CAAC,wBAAC,CAAA;AAGW,QAAA,WAAW,GAAG,IAAA,SAAG,GAAe,CAAA;AAChC,QAAA,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,mBAAW,CAAC,CAAC,IAAI,CAAC,CAAA;AAE9C,QAAA,IAAI,GAAG,IAAA,oBAAY,EAC9B,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE,CAC7C,CAAC,CAAC,cAAc,CAAC,mBAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5C,MAAM,OAAO,GAAG,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,CAAA;IACvD,IAAI,WAAW,GAAG,KAAK,CAAA;IAEvB,IAAI,OAAO,OAAO,CAAC,IAAI,EAAE,MAAM,KAAK,UAAU,EAAE;QAC9C,WAAW,GAAG,IAAI,CACjB;QAAC,OAAO,CAAC,IAAiB,CAAC,MAAM,CAChC,cAAc,EACd,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACvB,CAAA;KACF;IAED,MAAM,QAAQ,GAAG,OAAO;QACtB,CAAC,CAAC,OAAO,CAAC,MAAM;QAChB,CAAC,CAAC;YACE,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;YACzB,GAAG,MAAM;SACV,CAAA;IACL,MAAM,IAAI,GACR,WAAW,IAAI,CAAC,OAAO;QACrB,CAAC,CAAC,OAAO,CAAC,IAAI;QACd,CAAC,CAAC;YACE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;YACvB,GAAG,MAAM;SACV,CAAA;IAEP,MAAM,MAAM,GAAG;QACb,GAAG,OAAO;QACV,OAAO,EAAE;YACP,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1C;QACD,MAAM,EAAE,MAAgB;QACxB,GAAG;QACH,MAAM,EAAE,QAAQ;QAChB,IAAI;KACL,CAAA;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAA;AACxB,CAAC,wBAAC,CACL,CAAA"}

package/DiscordREST/index.ts

@@ -1,17 +1,10 @@
 import * as T from "@effect-ts/core/Effect"
-import { Has, tag } from "@effect-ts/system/Has"
-import Axios, { AxiosInstance, AxiosRequestConfig, Method } from "axios"
+import { tag } from "@effect-ts/core/Has"
+import { _A } from "@effect-ts/core/Utils"
+import Axios, { AxiosRequestConfig, Method } from "axios"
 import * as Config from "../DiscordConfig"
-import { createRoutes, Endpoints } from "../types"
+import { createRoutes } from "../types"
 import * as Http from "./http"
-import { Response, RESTError } from "./types"
-
-interface AxiosEndpoints extends Endpoints<AxiosRequestConfig> {}
-export interface DiscordREST extends AxiosEndpoints {
-  _tag: "DiscordREST"
-  axios: AxiosInstance
-}
-export const DiscordREST = tag<DiscordREST>()
 
 interface FormData {
   append: (key: string, value: unknown) => void
@@ -29,8 +22,21 @@ const make = T.gen(function* (_) {
     },
   })
   const request = Http.request(axios)
-  const routes = createRoutes<AxiosRequestConfig>(
-    ({ method, url, params = {}, options = {} }) => {
+
+  return {
+    _tag: "DiscordREST",
+    axios,
+    request,
+  }
+})
+
+export interface DiscordREST extends _A<typeof make> {}
+export const DiscordREST = tag<DiscordREST>()
+export const LiveDiscordREST = T.toLayer(DiscordREST)(make)
+
+export const rest = createRoutes<AxiosRequestConfig>(
+  ({ method, url, params = {}, options = {} }) =>
+    T.accessServiceM(DiscordREST)(({ request }) => {
       const hasBody = method !== "GET" && method !== "DELETE"
       let hasFormData = false
 
@@ -67,31 +73,7 @@ const make = T.gen(function* (_) {
         params: qsParams,
         data,
       }
-      return request(config)
-    },
-  )
-
-  const rest: DiscordREST = {
-    _tag: "DiscordREST",
-    axios,
-    ...routes,
-  }
-
-  return rest
-})
-
-export const LiveDiscordREST = T.toLayer(DiscordREST)(make)
 
-export const rest = T.accessServiceM(DiscordREST)
-
-type InferResponse<T extends (...args: any[]) => Response<any>> = T extends (
-  ...args: any[]
-) => Response<infer R>
-  ? R
-  : never
-
-export const call = <K extends keyof AxiosEndpoints>(
-  method: K,
-  ...args: Parameters<AxiosEndpoints[K]>
-): T.Effect<Has<DiscordREST>, RESTError, InferResponse<AxiosEndpoints[K]>> =>
-  rest((r) => (r[method] as any)(...args))
+      return request(config)
+    }),
+)

package/DiscordREST/types.d.ts

@@ -1,5 +1,7 @@
 import * as T from "@effect-ts/core/Effect";
+import { Has } from "@effect-ts/core/Has";
 import { AxiosError, AxiosRequestConfig } from "axios";
+import { DiscordREST } from ".";
 export declare type RESTError = {
     _tag: "http";
     config: AxiosRequestConfig<unknown>;
@@ -9,4 +11,4 @@ export declare type RESTError = {
     _tag: "axios";
     cause: AxiosError<never>;
 };
-export declare type Response<T> = T.IO<RESTError, T>;
+export declare type Response<T> = T.Effect<Has<DiscordREST>, RESTError, T>;

package/DiscordREST/types.ts

@@ -1,5 +1,7 @@
 import * as T from "@effect-ts/core/Effect"
+import { Has } from "@effect-ts/core/Has"
 import { AxiosError, AxiosRequestConfig } from "axios"
+import { DiscordREST } from "."
 
 export type RESTError =
   | {
@@ -10,4 +12,4 @@ export type RESTError =
     }
   | { _tag: "axios"; cause: AxiosError<never> }
 
-export type Response<T> = T.IO<RESTError, T>
+export type Response<T> = T.Effect<Has<DiscordREST>, RESTError, T>

package/bot.js

@@ -21,7 +21,7 @@ const Config = (0, mod_1.makeConfigLayer)({
 // logger
 const logger = T.chain_(mod_1.gateway, ({ raw }) => CB.forEach_(raw, (p) => (0, Log_1.log)(p)), fileName_1 + ":27:24");
 // ping command
-const pingPong = (CB.forEach_(CB.filter_((0, mod_1.fromDispatch)("MESSAGE_CREATE"), (msg) => msg.content.startsWith("!ping")), (msg) => (0, mod_1.callRest)("createMessage", msg.channel_id, {
+const pingPong = (CB.forEach_(CB.filter_((0, mod_1.fromDispatch)("MESSAGE_CREATE"), (msg) => msg.content.startsWith("!ping")), (msg) => mod_1.rest.createMessage(msg.channel_id, {
     content: "Pong!",
 })));
 (R.runMain(T.provideSomeLayer(Config)(T.provideSomeLayer(mod_1.DebugEnv)(T.zipPar(pingPong, fileName_1 + ":43:11")(T.zipPar(logger, fileName_1 + ":42:11")(mod_1.run))))));

package/bot.js.map

@@ -1 +1 @@
-{"version":3,"file":"bot.js","sourceRoot":"","sources":["bot.ts"],"names":[],"mappings":";;;;;AAAA,kEAA2C;AAC3C,uDAA+C;AAC/C,mEAA4C;AAC5C,8DAAuC;AACvC,uDAAgC;AAChC,+BAA2B;AAC3B,+BAOc;AACd,mCAAwC;AAExC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,MAAM,GAAG,IAAA,qBAAe,EAAC;IAC7B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAkB;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,sBAAc,CAAC,MAAM,GAAG,sBAAc,CAAC,cAAc;KAC/D;CACF,CAAC,CAAA;AAEF,SAAS;AACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,aAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,CAAC,CAAC,CAAC,wBAAC,CAAA;AAE9E,eAAe;AACf,MAAM,QAAQ,IAGZ,EAAE,UADF,EAAE,SADF,IAAA,kBAAY,EAAC,gBAAgB,CAAC,EACpB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GACvC,CAAC,GAAG,EAAE,EAAE,CACjB,IAAA,cAAQ,EAAC,eAAe,EAAE,GAAG,CAAC,UAAU,EAAE;IACxC,OAAO,EAAE,OAAO;CACjB,CAAC,EAEL,CAAA;AAED,CAOE,CAAC,CAAC,OAAO,CADT,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAD1B,CAAC,CAAC,gBAAgB,CAAC,cAAQ,CAAC,CAF5B,CAAC,CAAC,MAAM,CAAC,QAAQ,wBAAC,CADlB,CAAC,CAAC,MAAM,CAAC,MAAM,wBAAC,CADhB,SAAG,OAOJ"}
+{"version":3,"file":"bot.js","sourceRoot":"","sources":["bot.ts"],"names":[],"mappings":";;;;;AAAA,kEAA2C;AAC3C,uDAA+C;AAC/C,mEAA4C;AAC5C,8DAAuC;AACvC,uDAAgC;AAChC,+BAA2B;AAC3B,+BAOc;AACd,mCAAwC;AAExC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,MAAM,GAAG,IAAA,qBAAe,EAAC;IAC7B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAkB;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,sBAAc,CAAC,MAAM,GAAG,sBAAc,CAAC,cAAc;KAC/D;CACF,CAAC,CAAA;AAEF,SAAS;AACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,aAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAA,SAAG,EAAC,CAAC,CAAC,CAAC,wBAAC,CAAA;AAE9E,eAAe;AACf,MAAM,QAAQ,IAGZ,EAAE,UADF,EAAE,SADF,IAAA,kBAAY,EAAC,gBAAgB,CAAC,EACpB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GACvC,CAAC,GAAG,EAAE,EAAE,CACjB,UAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE;IACjC,OAAO,EAAE,OAAO;CACjB,CAAC,EAEL,CAAA;AAED,CAOE,CAAC,CAAC,OAAO,CADT,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAD1B,CAAC,CAAC,gBAAgB,CAAC,cAAQ,CAAC,CAF5B,CAAC,CAAC,MAAM,CAAC,QAAQ,wBAAC,CADlB,CAAC,CAAC,MAAM,CAAC,MAAM,wBAAC,CADhB,SAAG,OAOJ"}

package/bot.ts

@@ -5,11 +5,11 @@ import * as CB from "callbag-effect-ts"
 import * as Dotenv from "dotenv"
 import { log } from "./Log"
 import {
-  callRest,
   DebugEnv,
   fromDispatch,
   gateway,
   makeConfigLayer,
+  rest,
   run,
 } from "./mod"
 import { GatewayIntents } from "./types"
@@ -31,7 +31,7 @@ const pingPong = pipe(
   fromDispatch("MESSAGE_CREATE"),
   CB.filter((msg) => msg.content.startsWith("!ping")),
   CB.forEach((msg) =>
-    callRest("createMessage", msg.channel_id, {
+    rest.createMessage(msg.channel_id, {
       content: "Pong!",
     }),
   ),

package/esm/DiscordREST/index.js

@@ -1,15 +1,14 @@
 import * as tracing_1 from "@effect-ts/core/Tracing";
 const fileName_1 = "DiscordREST/index.ts";
 import * as T from "@effect-ts/core/Effect";
-import { tag } from "@effect-ts/system/Has";
+import { tag } from "@effect-ts/core/Has";
 import Axios from "axios";
 import * as Config from "../DiscordConfig";
 import { createRoutes } from "../types";
 import * as Http from "./http";
-export const DiscordREST = tag();
 const make = T.gen(function* (_) {
-    const token = yield* _(Config.token, fileName_1 + ":22:25");
-    const config = yield* _(Config.rest, fileName_1 + ":23:26");
+    const token = yield* _(Config.token, fileName_1 + ":15:25");
+    const config = yield* _(Config.rest, fileName_1 + ":16:26");
     const axios = Axios.create({
         baseURL: config.baseUrl,
         headers: {
@@ -17,46 +16,44 @@ const make = T.gen(function* (_) {
         },
     });
     const request = Http.request(axios);
-    const routes = createRoutes(({ method, url, params = {}, options = {} }) => {
-        const hasBody = method !== "GET" && method !== "DELETE";
-        let hasFormData = false;
-        if (typeof options.data?.append === "function") {
-            hasFormData = true;
-            options.data.append("payload_json", JSON.stringify(params));
-        }
-        const qsParams = hasBody
-            ? options.params
-            : {
-                ...(options.params || {}),
-                ...params,
-            };
-        const data = hasFormData || !hasBody
-            ? options.data
-            : {
-                ...(options.data || {}),
-                ...params,
-            };
-        const config = {
-            ...options,
-            headers: {
-                ...(options.headers || {}),
-                ...(hasFormData ? data.getHeaders() : {}),
-            },
-            method: method,
-            url,
-            params: qsParams,
-            data,
-        };
-        return request(config);
-    });
-    const rest = {
+    return {
         _tag: "DiscordREST",
         axios,
-        ...routes,
+        request,
     };
-    return rest;
-}, fileName_1 + ":21:19");
+}, fileName_1 + ":14:19");
+export const DiscordREST = tag();
 export const LiveDiscordREST = T.toLayer(DiscordREST)(make);
-export const rest = T.accessServiceM(DiscordREST);
-export const call = (method, ...args) => rest((r) => r[method](...args), fileName_1 + ":97:7");
+export const rest = createRoutes(({ method, url, params = {}, options = {} }) => T.accessServiceM(DiscordREST)(({ request }) => {
+    const hasBody = method !== "GET" && method !== "DELETE";
+    let hasFormData = false;
+    if (typeof options.data?.append === "function") {
+        hasFormData = true;
+        options.data.append("payload_json", JSON.stringify(params));
+    }
+    const qsParams = hasBody
+        ? options.params
+        : {
+            ...(options.params || {}),
+            ...params,
+        };
+    const data = hasFormData || !hasBody
+        ? options.data
+        : {
+            ...(options.data || {}),
+            ...params,
+        };
+    const config = {
+        ...options,
+        headers: {
+            ...(options.headers || {}),
+            ...(hasFormData ? data.getHeaders() : {}),
+        },
+        method: method,
+        url,
+        params: qsParams,
+        data,
+    };
+    return request(config);
+}, fileName_1 + ":39:34"));
 //# sourceMappingURL=index.js.map

package/esm/DiscordREST/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../DiscordREST/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../DiscordREST/index.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAAE,GAAG,EAAE,MAAM,qBAAqB,CAAA;AAEzC,OAAO,KAAqC,MAAM,OAAO,CAAA;AACzD,OAAO,KAAK,MAAM,MAAM,kBAAkB,CAAA;AAC1C,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAA;AACvC,OAAO,KAAK,IAAI,MAAM,QAAQ,CAAA;AAO9B,MAAM,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,CAAC;IAC7B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,wBAAC,CAAA;IACpC,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,wBAAC,CAAA;IAEpC,MAAM,KAAK,GAAG,KAAK,CAAC,MAAM,CAAC;QACzB,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,OAAO,EAAE;YACP,aAAa,EAAE,OAAO,KAAK,EAAE;SAC9B;KACF,CAAC,CAAA;IACF,MAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAEnC,OAAO;QACL,IAAI,EAAE,aAAa;QACnB,KAAK;QACL,OAAO;KACR,CAAA;AACH,CAAC,wBAAC,CAAA;AAGF,MAAM,CAAC,MAAM,WAAW,GAAG,GAAG,EAAe,CAAA;AAC7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAA;AAE3D,MAAM,CAAC,MAAM,IAAI,GAAG,YAAY,CAC9B,CAAC,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,EAAE,EAAE,OAAO,GAAG,EAAE,EAAE,EAAE,EAAE,CAC7C,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE;IAC5C,MAAM,OAAO,GAAG,MAAM,KAAK,KAAK,IAAI,MAAM,KAAK,QAAQ,CAAA;IACvD,IAAI,WAAW,GAAG,KAAK,CAAA;IAEvB,IAAI,OAAO,OAAO,CAAC,IAAI,EAAE,MAAM,KAAK,UAAU,EAAE;QAC9C,WAAW,GAAG,IAAI,CACjB;QAAC,OAAO,CAAC,IAAiB,CAAC,MAAM,CAChC,cAAc,EACd,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CACvB,CAAA;KACF;IAED,MAAM,QAAQ,GAAG,OAAO;QACtB,CAAC,CAAC,OAAO,CAAC,MAAM;QAChB,CAAC,CAAC;YACE,GAAG,CAAC,OAAO,CAAC,MAAM,IAAI,EAAE,CAAC;YACzB,GAAG,MAAM;SACV,CAAA;IACL,MAAM,IAAI,GACR,WAAW,IAAI,CAAC,OAAO;QACrB,CAAC,CAAC,OAAO,CAAC,IAAI;QACd,CAAC,CAAC;YACE,GAAG,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;YACvB,GAAG,MAAM;SACV,CAAA;IAEP,MAAM,MAAM,GAAG;QACb,GAAG,OAAO;QACV,OAAO,EAAE;YACP,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC;YAC1B,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAC1C;QACD,MAAM,EAAE,MAAgB;QACxB,GAAG;QACH,MAAM,EAAE,QAAQ;QAChB,IAAI;KACL,CAAA;IAED,OAAO,OAAO,CAAC,MAAM,CAAC,CAAA;AACxB,CAAC,wBAAC,CACL,CAAA"}

package/esm/bot.js

@@ -6,7 +6,7 @@ import * as R from "@effect-ts/node/Runtime";
 import * as CB from "callbag-effect-ts";
 import * as Dotenv from "dotenv";
 import { log } from "./Log";
-import { callRest, DebugEnv, fromDispatch, gateway, makeConfigLayer, run, } from "./mod";
+import { DebugEnv, fromDispatch, gateway, makeConfigLayer, rest, run, } from "./mod";
 import { GatewayIntents } from "./types";
 Dotenv.config();
 const Config = makeConfigLayer({
@@ -18,7 +18,7 @@ const Config = makeConfigLayer({
 // logger
 const logger = T.chain_(gateway, ({ raw }) => CB.forEach_(raw, (p) => log(p)), fileName_1 + ":27:24");
 // ping command
-const pingPong = (CB.forEach_(CB.filter_(fromDispatch("MESSAGE_CREATE"), (msg) => msg.content.startsWith("!ping")), (msg) => callRest("createMessage", msg.channel_id, {
+const pingPong = (CB.forEach_(CB.filter_(fromDispatch("MESSAGE_CREATE"), (msg) => msg.content.startsWith("!ping")), (msg) => rest.createMessage(msg.channel_id, {
     content: "Pong!",
 })));
 (R.runMain(T.provideSomeLayer(Config)(T.provideSomeLayer(DebugEnv)(T.zipPar(pingPong, fileName_1 + ":43:11")(T.zipPar(logger, fileName_1 + ":42:11")(run))))));

package/esm/bot.js.map

@@ -1 +1 @@
-{"version":3,"file":"bot.js","sourceRoot":"","sources":["../bot.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,yBAAyB,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAC3B,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,eAAe,EACf,GAAG,GACJ,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAExC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,MAAM,GAAG,eAAe,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAkB;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,cAAc;KAC/D;CACF,CAAC,CAAA;AAEF,SAAS;AACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAC,CAAA;AAE9E,eAAe;AACf,MAAM,QAAQ,IAGZ,EAAE,UADF,EAAE,SADF,YAAY,CAAC,gBAAgB,CAAC,EACpB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GACvC,CAAC,GAAG,EAAE,EAAE,CACjB,QAAQ,CAAC,eAAe,EAAE,GAAG,CAAC,UAAU,EAAE;IACxC,OAAO,EAAE,OAAO;CACjB,CAAC,EAEL,CAAA;AAED,CAOE,CAAC,CAAC,OAAO,CADT,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAD1B,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAF5B,CAAC,CAAC,MAAM,CAAC,QAAQ,wBAAC,CADlB,CAAC,CAAC,MAAM,CAAC,MAAM,wBAAC,CADhB,GAAG,OAOJ"}
+{"version":3,"file":"bot.js","sourceRoot":"","sources":["../bot.ts"],"names":[],"mappings":";;AAAA,OAAO,KAAK,CAAC,MAAM,wBAAwB,CAAA;AAC3C,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAA;AAC/C,OAAO,KAAK,CAAC,MAAM,yBAAyB,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,mBAAmB,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAA;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAA;AAC3B,OAAO,EACL,QAAQ,EACR,YAAY,EACZ,OAAO,EACP,eAAe,EACf,IAAI,EACJ,GAAG,GACJ,MAAM,OAAO,CAAA;AACd,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAExC,MAAM,CAAC,MAAM,EAAE,CAAA;AAEf,MAAM,MAAM,GAAG,eAAe,CAAC;IAC7B,KAAK,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAkB;IACrC,OAAO,EAAE;QACP,OAAO,EAAE,cAAc,CAAC,MAAM,GAAG,cAAc,CAAC,cAAc;KAC/D;CACF,CAAC,CAAA;AAEF,SAAS;AACT,MAAM,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,wBAAC,CAAA;AAE9E,eAAe;AACf,MAAM,QAAQ,IAGZ,EAAE,UADF,EAAE,SADF,YAAY,CAAC,gBAAgB,CAAC,EACpB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,GACvC,CAAC,GAAG,EAAE,EAAE,CACjB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,EAAE;IACjC,OAAO,EAAE,OAAO;CACjB,CAAC,EAEL,CAAA;AAED,CAOE,CAAC,CAAC,OAAO,CADT,CAAC,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAD1B,CAAC,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAF5B,CAAC,CAAC,MAAM,CAAC,QAAQ,wBAAC,CADlB,CAAC,CAAC,MAAM,CAAC,MAAM,wBAAC,CADhB,GAAG,OAOJ"}

package/esm/mod.js

@@ -12,5 +12,5 @@ export const DebugEnv = DiscordEnv["+++"](LiveLogDebug);
 export const DefaultEnv = DiscordEnv["+++"](LiveLog);
 export { makeLayer as makeConfigLayer } from "./DiscordConfig";
 export { gateway, fromDispatch, run } from "./DiscordGateway";
-export { rest, call as callRest } from "./DiscordREST";
+export { rest } from "./DiscordREST";
 //# sourceMappingURL=mod.js.map

package/esm/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["../mod.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,MAAM,CAAA;AAE1B,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,CAC/C,KAAK,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAC9B,KAAK,CAAC,CAAC,kBAAkB,CAAC,CAAA;AAE7B,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,CAAA;AAErD,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAA;AACvD,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAA;AAEpD,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC7D,OAAO,EAAE,IAAI,EAAE,IAAI,IAAI,QAAQ,EAAE,MAAM,eAAe,CAAA"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["../mod.ts"],"names":[],"mappings":";;AAAA,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAA;AACrD,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAC/C,OAAO,KAAK,KAAK,MAAM,gBAAgB,CAAA;AACvC,OAAO,EAAE,aAAa,EAAE,MAAM,aAAa,CAAA;AAC3C,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,OAAO,CAAA;AAC7C,OAAO,KAAK,EAAE,MAAM,MAAM,CAAA;AAE1B,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,aAAa,CAAC,CAC/C,KAAK,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAC9B,KAAK,CAAC,CAAC,kBAAkB,CAAC,CAAA;AAE7B,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,CAAA;AAErD,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,YAAY,CAAC,CAAA;AACvD,MAAM,CAAC,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAA;AAEpD,OAAO,EAAE,SAAS,IAAI,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAC9D,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAC7D,OAAO,EAAE,IAAI,EAAE,MAAM,eAAe,CAAA"}

package/mod.d.ts

@@ -4,4 +4,4 @@ export declare const DebugEnv: import("@effect-ts/system/Layer").Layer<import("@
 export declare const DefaultEnv: import("@effect-ts/system/Layer").Layer<import("@effect-ts/system/Has").Has<import("./DiscordConfig").DiscordConfig>, never, import("@effect-ts/system/Has").Has<WS.WS> & import("@effect-ts/system/Has").Has<import("./DiscordWS").DiscordWS> & import("@effect-ts/system/Has").Has<Shard.DiscordShard> & import("@effect-ts/system/Has").Has<import("./DiscordGateway").DiscordGateway> & import("@effect-ts/system/Has").Has<import("./DiscordREST").DiscordREST> & import("@effect-ts/system/Has").Has<import("./Log").Log>>;
 export { makeLayer as makeConfigLayer } from "./DiscordConfig";
 export { gateway, fromDispatch, run } from "./DiscordGateway";
-export { rest, call as callRest } from "./DiscordREST";
+export { rest } from "./DiscordREST";

package/mod.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.callRest = exports.rest = exports.run = exports.fromDispatch = exports.gateway = exports.makeConfigLayer = exports.DefaultEnv = exports.DebugEnv = void 0;
+exports.rest = exports.run = exports.fromDispatch = exports.gateway = exports.makeConfigLayer = exports.DefaultEnv = exports.DebugEnv = void 0;
 const tslib_1 = require("tslib");
 const tracing_1 = tslib_1.__importStar(require("@effect-ts/core/Tracing"));
 const fileName_1 = "mod.ts";
@@ -22,5 +22,4 @@ Object.defineProperty(exports, "fromDispatch", { enumerable: true, get: function
 Object.defineProperty(exports, "run", { enumerable: true, get: function () { return DiscordGateway_2.run; } });
 var DiscordREST_2 = require("./DiscordREST");
 Object.defineProperty(exports, "rest", { enumerable: true, get: function () { return DiscordREST_2.rest; } });
-Object.defineProperty(exports, "callRest", { enumerable: true, get: function () { return DiscordREST_2.call; } });
 //# sourceMappingURL=mod.js.map

package/mod.js.map

@@ -1 +1 @@
-{"version":3,"file":"mod.js","sourceRoot":"","sources":["mod.ts"],"names":[],"mappings":";;;;;;AAAA,qDAAqD;AACrD,+CAA+C;AAC/C,8DAAuC;AACvC,2CAA2C;AAC3C,+BAA6C;AAC7C,iDAA0B;AAE1B,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,yBAAa,CAAC,CAC/C,KAAK,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAC9B,KAAK,CAAC,CAAC,mCAAkB,CAAC,CAAA;AAE7B,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,6BAAe,CAAC,CAAA;AAExC,QAAA,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,kBAAY,CAAC,CAAA;AAC1C,QAAA,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,aAAO,CAAC,CAAA;AAEpD,iDAA8D;AAArD,gHAAA,SAAS,OAAmB;AACrC,mDAA6D;AAApD,yGAAA,OAAO,OAAA;AAAE,8GAAA,YAAY,OAAA;AAAE,qGAAA,GAAG,OAAA;AACnC,6CAAsD;AAA7C,mGAAA,IAAI,OAAA;AAAE,uGAAA,IAAI,OAAY"}
+{"version":3,"file":"mod.js","sourceRoot":"","sources":["mod.ts"],"names":[],"mappings":";;;;;;AAAA,qDAAqD;AACrD,+CAA+C;AAC/C,8DAAuC;AACvC,2CAA2C;AAC3C,+BAA6C;AAC7C,iDAA0B;AAE1B,MAAM,UAAU,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,yBAAa,CAAC,CAC/C,KAAK,CAAC,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAC9B,KAAK,CAAC,CAAC,mCAAkB,CAAC,CAAA;AAE7B,MAAM,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,6BAAe,CAAC,CAAA;AAExC,QAAA,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,kBAAY,CAAC,CAAA;AAC1C,QAAA,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,aAAO,CAAC,CAAA;AAEpD,iDAA8D;AAArD,gHAAA,SAAS,OAAmB;AACrC,mDAA6D;AAApD,yGAAA,OAAO,OAAA;AAAE,8GAAA,YAAY,OAAA;AAAE,qGAAA,GAAG,OAAA;AACnC,6CAAoC;AAA3B,mGAAA,IAAI,OAAA"}

package/mod.ts

@@ -16,4 +16,4 @@ export const DefaultEnv = DiscordEnv["+++"](LiveLog)
 
 export { makeLayer as makeConfigLayer } from "./DiscordConfig"
 export { gateway, fromDispatch, run } from "./DiscordGateway"
-export { rest, call as callRest } from "./DiscordREST"
+export { rest } from "./DiscordREST"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dfx",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Effect-TS discord library",
   "main": "mod.js",
   "author": "Tim Smart <tim.smart@arisechurch.com>",
@@ -63,5 +63,5 @@
       "require": "./WS/index.js"
     }
   },
-  "gitHead": "acf2de82ea16a96c37d33d167b0f13061655f146"
+  "gitHead": "da62d81057810fa1bb07bb0552d695e34cdea010"
 }