@discordkit/core 1.1.0-next.2 → 2.0.0

package/dist/addParams.d.ts

@@ -1,2 +1,2 @@
 export type RequestParams = Partial<Record<string, number[] | string[] | boolean | number | string | null | undefined>>;
-export declare const addParams: <P extends Partial<Record<string, string | number | boolean | string[] | number[] | null | undefined>>>(url: URL, params: P) => URL;
+export declare const addParams: (url: URL, params: RequestParams) => URL;

package/dist/addParams.js.map

@@ -1 +1 @@
-{"version":3,"file":"addParams.js","sourceRoot":"","sources":["../src/addParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAS/C,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,GAAQ,EACR,MAAS,EACJ,EAAE;IACP,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"addParams.js","sourceRoot":"","sources":["../src/addParams.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAS/C,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,GAAQ,EAAE,MAAqB,EAAO,EAAE;IAChE,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC"}

package/dist/buildURL.d.ts

@@ -1 +1,2 @@
-export declare const buildURL: <P extends Partial<Record<string, string | number | boolean | string[] | number[] | null | undefined>>>(resource: string, params?: P | undefined, base?: string) => URL;
+import { type RequestParams } from "./addParams.js";
+export declare const buildURL: (resource: string, params?: RequestParams, base?: string) => URL;

package/dist/buildURL.js.map

@@ -1 +1 @@
-{"version":3,"file":"buildURL.js","sourceRoot":"","sources":["../src/buildURL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAsB,MAAM,gBAAgB,CAAC;AAE/D,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAAgB,EAChB,MAAU,EACV,IAAa,EACR,EAAE,CACP,SAAS,CACP,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,IAAI,IAAI,QAAQ,CAAC,EACtD,MAAM,IAAI,EAAE,CACb,CAAC"}
+{"version":3,"file":"buildURL.js","sourceRoot":"","sources":["../src/buildURL.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAC/C,OAAO,EAAE,SAAS,EAAsB,MAAM,gBAAgB,CAAC;AAE/D,MAAM,CAAC,MAAM,QAAQ,GAAG,CACtB,QAAgB,EAChB,MAAsB,EACtB,IAAa,EACR,EAAE,CACP,SAAS,CACP,IAAI,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,EAAE,IAAI,IAAI,QAAQ,CAAC,EACtD,MAAM,IAAI,EAAE,CACb,CAAC"}

package/dist/isNonNullable.d.ts

@@ -1,3 +1,4 @@
+type Maybe<T> = T | null | undefined;
 /**
  * Used to test whether a `Maybe` typed value is `null` or `undefined`.
  *
@@ -16,4 +17,5 @@
  * }
  * ```
  */
-export declare const isNonNullable: <T extends unknown>(val?: T | undefined) => val is NonNullable<T>;
+export declare const isNonNullable: <T extends Maybe<unknown>>(val?: T) => val is NonNullable<T>;
+export {};

package/dist/methods.d.ts

@@ -1,7 +1,11 @@
-import type { BaseSchema, Output } from "valibot";
+import type { GenericSchema, GenericSchemaAsync, InferOutput } from "valibot";
 import type { RequestParams } from "./addParams.js";
 import type { RequestBody } from "./request.js";
-export type Fetcher<S extends BaseSchema | null = null, R = void> = S extends null ? () => Promise<R> : (config: Output<NonNullable<S>>) => Promise<R>;
+export type Fetcher<
+/** A schema to validate the input arguments of a fetch call */
+S extends GenericSchema | GenericSchemaAsync | null = null, 
+/** The return value expected from the fetch call */
+R = void> = S extends null ? () => Promise<R> : (config: InferOutput<NonNullable<S>>) => Promise<R>;
 export declare const get: <T>(url: string, params?: RequestParams) => Promise<T>;
 export declare const post: <T>(url: string, body?: RequestBody) => Promise<T>;
 export declare const put: <T>(url: string, body?: RequestBody) => Promise<T>;

package/dist/methods.js.map

@@ -1 +1 @@
-{"version":3,"file":"methods.js","sourceRoot":"","sources":["../src/methods.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AASvC,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAK,GAAW,EAAE,MAAsB,EAAc,EAAE,CAC9E,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;AAEjC,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAK,GAAW,EAAE,IAAkB,EAAc,EAAE,CAC3E,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AAEvC,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAK,GAAW,EAAE,IAAkB,EAAc,EAAE,CAC1E,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AAEtC,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EAAK,GAAW,EAAE,IAAkB,EAAc,EAAE,CAC5E,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAExC,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAY,GAAW,EAAc,EAAE,CAChE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC"}
+{"version":3,"file":"methods.js","sourceRoot":"","sources":["../src/methods.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAEzC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAWvC,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAK,GAAW,EAAE,MAAsB,EAAc,EAAE,CAC9E,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;AAEjC,MAAM,CAAC,MAAM,IAAI,GAAG,KAAK,EAAK,GAAW,EAAE,IAAkB,EAAc,EAAE,CAC3E,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;AAEvC,MAAM,CAAC,MAAM,GAAG,GAAG,KAAK,EAAK,GAAW,EAAE,IAAkB,EAAc,EAAE,CAC1E,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;AAEtC,MAAM,CAAC,MAAM,KAAK,GAAG,KAAK,EAAK,GAAW,EAAE,IAAkB,EAAc,EAAE,CAC5E,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,IAAI,CAAC,CAAC;AAExC,MAAM,CAAC,MAAM,MAAM,GAAG,KAAK,EAAY,GAAW,EAAc,EAAE,CAChE,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,QAAQ,CAAC,CAAC"}

package/dist/snowflake.d.ts

@@ -1 +1 @@
-export declare const snowflake: import("valibot").SpecialSchema<string, string>;
+export declare const snowflake: import("valibot").CustomSchema<string, import("valibot").ErrorMessage<import("valibot").CustomIssue> | undefined>;

package/dist/snowflake.js

@@ -1,11 +1,9 @@
-import { special, coerce, date, is } from "valibot";
+import { custom, pipe, transform, union, string, number, is } from "valibot";
 import { isNonNullable } from "./isNonNullable.js";
-export const snowflake = special((val) => isNonNullable(val) &&
+export const snowflake = custom((val) => isNonNullable(val) &&
     (typeof val === `bigint` ||
         typeof val === `number` ||
         typeof val === `string`)
-    ? is(coerce(date(), (input) => new Date(input)), 
-    // eslint-disable-next-line no-bitwise
-    Number((BigInt(val) >> 22n) + 1420070400000n))
+    ? is(pipe(union([string(), number()]), transform((input) => new Date(input))), Number((BigInt(val) >> 22n) + 1420070400000n))
     : false, `Invalid Snowflake ID`);
 //# sourceMappingURL=snowflake.js.map

package/dist/snowflake.js.map

@@ -1 +1 @@
-{"version":3,"file":"snowflake.js","sourceRoot":"","sources":["../src/snowflake.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,MAAM,SAAS,GAAG,OAAO,CAC9B,CAAC,GAAG,EAAE,EAAE,CACN,aAAa,CAAC,GAAG,CAAC;IAClB,CAAC,OAAO,GAAG,KAAK,QAAQ;QACtB,OAAO,GAAG,KAAK,QAAQ;QACvB,OAAO,GAAG,KAAK,QAAQ,CAAC;IACxB,CAAC,CAAC,EAAE,CACA,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,KAAa,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC;IAClD,sCAAsC;IACtC,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC,CAC9C;IACH,CAAC,CAAC,KAAK,EACX,sBAAsB,CACvB,CAAC"}
+{"version":3,"file":"snowflake.js","sourceRoot":"","sources":["../src/snowflake.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAC7B,CAAC,GAAG,EAAE,EAAE,CACN,aAAa,CAAC,GAAG,CAAC;IAClB,CAAC,OAAO,GAAG,KAAK,QAAQ;QACtB,OAAO,GAAG,KAAK,QAAQ;QACvB,OAAO,GAAG,KAAK,QAAQ,CAAC;IACxB,CAAC,CAAC,EAAE,CACA,IAAI,CACF,KAAK,CAAC,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAC3B,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,KAAK,CAAC,CAAC,CACtC,EACD,MAAM,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,GAAG,cAAc,CAAC,CAC9C;IACH,CAAC,CAAC,KAAK,EACX,sBAAsB,CACvB,CAAC"}

package/dist/toProcedure.d.ts

@@ -1,36 +1,31 @@
-import type { BaseSchema, Output } from "valibot";
-import type { AnyRootConfig, inferParser, Procedure, unsetMarker } from "@trpc/server";
-import { type Wrap } from "./wrap.js";
+import type { GenericSchema, GenericSchemaAsync, InferInput, InferOutput } from "valibot";
+import type { AnyProcedureBuilder, MutationProcedure, ProcedureType, QueryProcedure, SubscriptionProcedure } from "@trpc/server/unstable-core-do-not-import";
 import type { Fetcher } from "./methods.js";
-type Result<T = void> = T extends BaseSchema ? Output<T> : T;
-type UnsetMarker = typeof unsetMarker;
-type BaseProcedure<T extends "mutation" | "query" | "subscription", I extends BaseSchema | null = null, O extends BaseSchema | null = null> = Procedure<T, {
-    _config: AnyRootConfig;
-    _ctx_out: object;
-    _input_in: I extends BaseSchema ? inferParser<Wrap<I>>["in"] : UnsetMarker;
-    _input_out: I extends BaseSchema ? inferParser<Wrap<I>>["out"] : UnsetMarker;
-    _output_in: O extends BaseSchema ? inferParser<Wrap<O>>["in"] : UnsetMarker;
-    _output_out: O extends BaseSchema ? inferParser<Wrap<O>>["out"] : UnsetMarker;
-    _meta: object;
-}>;
+type Result<T = void> = T extends GenericSchema | GenericSchemaAsync ? InferOutput<T> : T;
+type Schema = GenericSchema | GenericSchemaAsync;
+type ProvedureDef<I extends Schema | null = null, O extends Schema | null = null> = I extends Schema ? O extends Schema ? {
+    input: InferInput<I>;
+    output: InferOutput<O>;
+    meta: unknown;
+} : {
+    input: InferInput<I>;
+    output: undefined;
+    meta: unknown;
+} : O extends Schema ? {
+    input: undefined;
+    output: InferOutput<O>;
+    meta: unknown;
+} : {
+    input: undefined;
+    output: undefined;
+    meta: unknown;
+};
+type BaseProcedure<T extends ProcedureType, I extends Schema | null = null, O extends Schema | null = null> = T extends `query` ? QueryProcedure<ProvedureDef<I, O>> : T extends `mutation` ? MutationProcedure<ProvedureDef<I, O>> : SubscriptionProcedure<ProvedureDef<I, O>>;
 /**
  * Given a {@link Fetcher | Fetcher} function and it's associated input and
  * output Zod schemas, this produces a function which accepts a tRPC procedure
  * builder of the given procedure type. This can then be used in a tRPC router
  * to scaffold an API route to forward a request to Discord's API.
  */
-export declare const toProcedure: <T extends "query" | "mutation" | "subscription", I extends BaseSchema | null = null, O extends BaseSchema | null = null>(type: T, fn: Fetcher<I extends BaseSchema ? I : null, Result<O>>, input?: I | undefined, output?: O | undefined) => (procedure: import("@trpc/server").ProcedureBuilder<{
-    _config: import("@trpc/server").RootConfig<{
-        ctx: object;
-        meta: object;
-        errorShape: import("@trpc/server").DefaultErrorShape;
-        transformer: import("@trpc/server").DefaultDataTransformer;
-    }>;
-    _ctx_out: object;
-    _input_in: typeof unsetMarker;
-    _input_out: typeof unsetMarker;
-    _output_in: typeof unsetMarker;
-    _output_out: typeof unsetMarker;
-    _meta: object;
-}>) => BaseProcedure<T, I, O>;
+export declare const toProcedure: <T extends ProcedureType, I extends GenericSchema | GenericSchemaAsync | null = null, O extends GenericSchema | GenericSchemaAsync | null = null>(type: T, fn: Fetcher<I extends GenericSchema | GenericSchemaAsync ? I : null, Result<O>>, input?: I, output?: O) => (procedure: AnyProcedureBuilder) => BaseProcedure<T, I, O>;
 export {};

package/dist/toProcedure.js

@@ -1,4 +1,3 @@
-import { wrap } from "./wrap.js";
 import { isNonNullable } from "./isNonNullable.js";
 /**
  * Given a {@link Fetcher | Fetcher} function and it's associated input and
@@ -10,16 +9,16 @@ export const toProcedure = (type, fn, input, output) => (procedure) => {
     if (isNonNullable(input) && isNonNullable(output)) {
         // @ts-expect-error
         return procedure
-            .input(wrap(input))
-            .output(wrap(output))[type](async (opts) => fn(opts.input));
+            .input(input)
+            .output(output)[type](async (opts) => fn(opts.input));
     }
     if (isNonNullable(input) && !isNonNullable(output)) {
         // @ts-expect-error
-        return procedure.input(wrap(input))[type](async (opts) => fn(opts.input));
+        return procedure.input(input)[type](async (opts) => fn(opts.input));
     }
     if (!isNonNullable(input) && isNonNullable(output)) {
         // @ts-expect-error
-        return procedure.output(wrap(output))[type](async () => fn());
+        return procedure.output(output)[type](async () => fn());
     }
     // @ts-expect-error
     return procedure[type](async () => fn());

package/dist/toProcedure.js.map

@@ -1 +1 @@
-{"version":3,"file":"toProcedure.js","sourceRoot":"","sources":["../src/toProcedure.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,IAAI,EAAa,MAAM,WAAW,CAAC;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AA8BnD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GACtB,CAKE,IAAO,EACP,EAAuD,EACvD,KAAS,EACT,MAAU,EACV,EAAE,CACJ,CAAC,SAA2B,EAA0B,EAAE;IACtD,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,mBAAmB;QACnB,OAAO,SAAS;aACb,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;aAClB,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CACpB,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,mBAAmB;QACnB,OAAO,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC5E,CAAC;IACD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,mBAAmB;QACnB,OAAO,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAChE,CAAC;IACD,mBAAmB;IACnB,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC3C,CAAC,CAAC"}
+{"version":3,"file":"toProcedure.js","sourceRoot":"","sources":["../src/toProcedure.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAsCnD;;;;;GAKG;AACH,MAAM,CAAC,MAAM,WAAW,GACtB,CAKE,IAAO,EACP,EAGC,EACD,KAAS,EACT,MAAU,EACV,EAAE,CACJ,CAAC,SAA8B,EAA0B,EAAE;IACzD,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QAClD,mBAAmB;QACnB,OAAO,SAAS;aACb,KAAK,CAAC,KAAK,CAAC;aACZ,MAAM,CAAC,MAAM,CAAC,CACd,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAC3C,CAAC;IACD,IAAI,aAAa,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,mBAAmB;QACnB,OAAO,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IACtE,CAAC;IACD,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;QACnD,mBAAmB;QACnB,OAAO,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;IAC1D,CAAC;IACD,mBAAmB;IACnB,OAAO,SAAS,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC;AAC3C,CAAC,CAAC"}

package/dist/toQuery.d.ts

@@ -1,4 +1,4 @@
-import type { BaseSchema } from "valibot";
+import type { GenericSchema } from "valibot";
 import type { Fetcher } from "./methods.js";
 interface Register {
 }
@@ -6,7 +6,7 @@ type QueryKey = readonly unknown[];
 type QueryMeta = Register extends {
     queryMeta: infer TQueryMeta;
 } ? TQueryMeta extends Record<string, unknown> ? TQueryMeta : Record<string, unknown> : Record<string, unknown>;
-type FetchDirection = "backward" | "forward";
+type FetchDirection = `backward` | `forward`;
 type QueryFunctionContext<TQueryKey extends QueryKey = QueryKey, TPageParam = never> = [TPageParam] extends [never] ? {
     queryKey: TQueryKey;
     signal: AbortSignal;
@@ -24,5 +24,5 @@ export type QueryFunction<T = unknown, TQueryKey extends QueryKey = QueryKey, TP
  * which can then be used with React-Query as a query function without
  * the need for any additional boilerplate.
  */
-export declare const toQuery: <S extends BaseSchema | null, R, T extends Fetcher<S, R>>(fn: T) => Parameters<T>["length"] extends 0 ? () => QueryFunction<Awaited<ReturnType<T>>, QueryKey, never> : (config: Parameters<T>[0]) => QueryFunction<Awaited<ReturnType<T>>, QueryKey, never>;
+export declare const toQuery: <S extends GenericSchema | null, R, T extends Fetcher<S, R>>(fn: T) => Parameters<T>[`length`] extends 0 ? () => QueryFunction<Awaited<ReturnType<T>>> : (config: Parameters<T>[0]) => QueryFunction<Awaited<ReturnType<T>>>;
 export {};

package/dist/toValidated.d.ts

@@ -1,6 +1,7 @@
-import type { BaseSchema, Output } from "valibot";
+import { type GenericSchema, type GenericSchemaAsync, type InferOutput } from "valibot";
 import type { Fetcher } from "./methods.js";
-type ToValidated = <F extends Fetcher<BaseSchema, Output<BaseSchema>> | Fetcher<BaseSchema> | Fetcher<null, null> | Fetcher<null, Output<BaseSchema>>>(...args: F extends Fetcher<infer I, ReturnType<F> extends Promise<void> ? never : Output<BaseSchema & infer O>> ? [fn: F, input: I, output: O] : F extends Fetcher<null, ReturnType<F> extends Promise<void> ? never : Output<BaseSchema & infer O>> ? [fn: F, input: null, output: O] : F extends Fetcher<infer I> ? [fn: F, input: I] : F extends Fetcher<null, null> ? [fn: F] : never) => F;
+type InferFetcherSchema<F> = F extends Fetcher<infer S, unknown> ? S : never;
+type InferFetcherReturn<F> = F extends Fetcher<GenericSchema | GenericSchemaAsync | null, infer R> ? R : never;
 /**
  * Given a {@link Fetcher | Fetcher} function and it's associated input
  * and output Zod schemas, this returns a new validated {@link Fetcher | Fetcher} function which will validate it's input and result at runtime.
@@ -8,5 +9,5 @@ type ToValidated = <F extends Fetcher<BaseSchema, Output<BaseSchema>> | Fetcher<
  * type-safety when dealing with raw user input in a framework agnostic
  * environment.
  */
-export declare const toValidated: ToValidated;
+export declare const toValidated: <F extends Fetcher<GenericSchema | GenericSchemaAsync, InferOutput<GenericSchema | GenericSchemaAsync>> | Fetcher<GenericSchema | GenericSchemaAsync> | Fetcher<null, null> | Fetcher<null, InferOutput<GenericSchema | GenericSchemaAsync>>>(fn: F, input?: InferFetcherSchema<F> | null, output?: GenericSchema<unknown, InferFetcherReturn<F>> | GenericSchemaAsync<unknown, InferFetcherReturn<F>>) => F;
 export {};

package/dist/toValidated.js

@@ -1,6 +1,4 @@
-import { isNonNullable } from "./isNonNullable.js";
-import { isObject } from "./isObject.js";
-const isSchema = (val) => isNonNullable(val) && isObject(val) && `_parse` in val;
+import { parseAsync, isOfKind } from "valibot";
 /**
  * Given a {@link Fetcher | Fetcher} function and it's associated input
  * and output Zod schemas, this returns a new validated {@link Fetcher | Fetcher} function which will validate it's input and result at runtime.
@@ -8,16 +6,18 @@ const isSchema = (val) => isNonNullable(val) && isObject(val) && `_parse` in val
  * type-safety when dealing with raw user input in a framework agnostic
  * environment.
  */
-export const toValidated = (fn, input, output) => 
-// @ts-expect-error
-async (config) => {
-    if (isSchema(input)) {
-        input._parse(config);
+export const toValidated = (fn, input, output) => new Proxy(fn, {
+    async apply(target, _, [config]) {
+        // Validate the fetcher args before fetching
+        if (input && isOfKind(`schema`, input)) {
+            await parseAsync(input, config);
+        }
+        const result = await target(config);
+        // Validate the result of the fetch call before returning
+        if (output && isOfKind(`schema`, output)) {
+            await parseAsync(output, result);
+        }
+        return result;
     }
-    const result = await fn(config);
-    if (isSchema(output)) {
-        output._parse(result);
-    }
-    return result;
-};
+});
 //# sourceMappingURL=toValidated.js.map

package/dist/toValidated.js.map

@@ -1 +1 @@
-{"version":3,"file":"toValidated.js","sourceRoot":"","sources":["../src/toValidated.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAGzC,MAAM,QAAQ,GAAG,CAAC,GAAY,EAAqB,EAAE,CACnD,aAAa,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,IAAI,QAAQ,IAAI,GAAG,CAAC;AA4BzD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GACtB,CAAC,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;AACtB,mBAAmB;AACnB,KAAK,EAAE,MAAM,EAAE,EAAE;IACf,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACpB,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACvB,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,MAAM,CAAC,CAAC;IAEhC,IAAI,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;QACrB,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;IACxB,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
+{"version":3,"file":"toValidated.js","sourceRoot":"","sources":["../src/toValidated.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,UAAU,EACV,QAAQ,EACT,MAAM,SAAS,CAAC;AASjB;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,CAUzB,EAAK,EACL,KAAoC,EACpC,MAEsD,EACnD,EAAE,CACL,IAAI,KAAK,CAAI,EAAE,EAAE;IACf,KAAK,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC;QAC7B,4CAA4C;QAC5C,IAAI,KAAK,IAAI,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE,CAAC;YACvC,MAAM,UAAU,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClC,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC;QAEpC,yDAAyD;QACzD,IAAI,MAAM,IAAI,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;YACzC,MAAM,UAAU,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,MAAuB,CAAC;IACjC,CAAC;CACF,CAAC,CAAC"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@discordkit/core",
   "description": "Core utility functions for Discordkit",
-  "version": "1.1.0-next.2",
+  "version": "2.0.0",
   "license": "MIT",
   "author": "Drake Costa <drake@saeris.gg> (https://saeris.gg)",
   "keywords": [
@@ -43,12 +43,13 @@
   "sideEffects": false,
   "scripts": {
     "dev": "yarn build --watch --declarationmap",
-    "build": "tsc --project ./tsconfig.build.json"
+    "build": "tsc",
+    "lint": "eslint --cache"
   },
   "peerDependencies": {
-    "valibot": ">= 0.21.0"
+    "valibot": ">= 1.0.0"
   },
   "devDependencies": {
-    "typescript": "^5.3.2"
+    "typescript": "^5.8.3"
   }
 }

package/dist/wrap.d.ts

@@ -1,18 +0,0 @@
-import { type BaseSchema, type BaseSchemaAsync, type Input, type Output } from "valibot";
-export interface ValidationIssue {
-    message: string;
-    path?: unknown[];
-}
-export interface TypeSchema<TOutput, TInput = TOutput> {
-    _input: TInput;
-    _output: TOutput;
-    assert(data: unknown): Promise<TOutput>;
-    parse(data: unknown): Promise<TOutput>;
-    validate(data: unknown): Promise<{
-        data: TOutput;
-    } | {
-        issues: ValidationIssue[];
-    }>;
-}
-export type Wrap<T extends BaseSchema | BaseSchemaAsync> = TypeSchema<Output<T>, Input<T>>;
-export declare function wrap<TSchema extends BaseSchema | BaseSchemaAsync>(schema: TSchema): TypeSchema<Output<TSchema>, Input<TSchema>>;

package/dist/wrap.js

@@ -1,34 +0,0 @@
-import { safeParseAsync } from "valibot";
-// Adapted from https://github.com/decs/typeschema
-export function wrap(schema) {
-    const validate = async (data) => {
-        const result = await safeParseAsync(schema, data);
-        if (result.success) {
-            return {
-                data: result.output
-            };
-        }
-        return {
-            issues: result.issues.map(({ message, path }) => ({
-                message,
-                path: path?.map(({ key }) => key) ?? []
-            }))
-        };
-    };
-    const assert = async (data) => {
-        const result = await validate(data);
-        if (`data` in result)
-            return result.data;
-        throw new AggregateError(result.issues, `Assertion failed`);
-    };
-    return {
-        // eslint-disable-next-line no-undefined
-        _input: undefined,
-        // eslint-disable-next-line no-undefined
-        _output: undefined,
-        assert,
-        parse: assert,
-        validate
-    };
-}
-//# sourceMappingURL=wrap.js.map

package/dist/wrap.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"wrap.js","sourceRoot":"","sources":["../src/wrap.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAKf,MAAM,SAAS,CAAC;AAsBjB,kDAAkD;AAClD,MAAM,UAAU,IAAI,CAClB,MAAe;IAEf,MAAM,QAAQ,GAAG,KAAK,EACpB,IAAa,EACuD,EAAE;QACtE,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAClD,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACnB,OAAO;gBACL,IAAI,EAAE,MAAM,CAAC,MAAM;aACpB,CAAC;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;gBAChD,OAAO;gBACP,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,EAAE;aACxC,CAAC,CAAC;SACJ,CAAC;IACJ,CAAC,CAAC;IAEF,MAAM,MAAM,GAAG,KAAK,EAAE,IAAa,EAA4B,EAAE;QAC/D,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,IAAI,MAAM,IAAI,MAAM;YAAE,OAAO,MAAM,CAAC,IAAI,CAAC;QACzC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAC9D,CAAC,CAAC;IAEF,OAAO;QACL,wCAAwC;QACxC,MAAM,EAAE,SAAiC;QACzC,wCAAwC;QACxC,OAAO,EAAE,SAAkC;QAC3C,MAAM;QACN,KAAK,EAAE,MAAM;QACb,QAAQ;KACT,CAAC;AACJ,CAAC"}