eden2query 0.1.0 → 0.1.2

package/README.md

@@ -17,21 +17,19 @@ import type { App } from "./server"; // your Elysia app type
 
 const client = treaty<App>("localhost:3000");
 
-// GET → queryOptions
-const resourceQuery = treatyQueryOptions({
-  queryKey: ["resource"],
-  fn: client.api.resource.get,
-});
+// GET → queryOptions (first arg is a thunk that calls the Eden GET function)
+const resourceQuery = treatyQueryOptions(
+  () => client.api.resource.get({ query: { q: "hello" } }),
+  { queryKey: ["resource"] },
+);
 
 // POST / PUT / DELETE → mutationOptions
-const createResource = treatyMutationOptions({
-  fn: client.api.resource.post,
-});
+const createResource = treatyMutationOptions(client.api.resource.post);
 
 // Parameterised routes — bind params first
-const updateResource = treatyMutationOptions({
-  fn: client.api.resource({ id: "some-id" }).put,
-});
+const updateResource = treatyMutationOptions(
+  client.api.resource({ id: "some-id" }).put,
+);
 ```
 
 Then use them with React Query as usual:
@@ -40,31 +38,35 @@ Then use them with React Query as usual:
 const { data } = useQuery(resourceQuery);
 const mutation = useMutation(createResource);
 
-mutation.mutate({ name: "New item" }); // fully typed input
+mutation.mutate({ body: { name: "New item" }, query: { q: "hello" } }); // fully typed input
 ```
 
-Works with `prefetchQuery`, `ensureQueryData`, `useSuspenseQuery`, etc.
+Works with `prefetchQuery`, `ensureQueryData`, `useSuspenseQuery`, etc:
 
-You can also pass any standard React Query options alongside `fn`:
+```ts
+const queryClient = new QueryClient();
+await queryClient.prefetchQuery(resourceQuery);
+```
+
+You can also pass any standard React Query options as the second argument:
 
 ```ts
-const resourceQuery = treatyQueryOptions({
-  queryKey: ["resource"],
-  fn: client.api.resource.get,
-  refetchInterval: 1000,
-});
-
-const createResource = treatyMutationOptions({
-  fn: client.api.resource.post,
-  onSuccess: () => console.log("created!"),
-});
+const resourceQuery = treatyQueryOptions(
+  () => client.api.resource.get({ query: { q: "hello" } }),
+  { queryKey: ["resource"], refetchInterval: 1000 },
+);
+
+const createResource = treatyMutationOptions(
+  client.api.resource.post,
+  { onSuccess: () => console.log("created!") },
+);
 ```
 
 ## API
 
-**`treatyQueryOptions({ queryKey, fn, ...queryOptions })`** — wraps an Eden GET function into `queryOptions`. Accepts all `queryOptions` fields except `queryFn`. Extracts `data` from the response and throws on `error`.
+**`treatyQueryOptions(fn, queryOptions)`** — wraps an Eden GET call into `queryOptions`. `fn` is a **thunk** (zero-argument function) that calls the Eden GET function, e.g. `() => client.api.resource.get({ query: { ... } })`. This lets you bind query parameters, headers, or any other Eden options at definition time. The second argument accepts all `queryOptions` fields except `queryFn`. Extracts `data` from the response and throws on `error`.
 
-**`treatyMutationOptions({ fn, ...mutationOptions })`** — wraps an Eden mutation function into `mutationOptions`. Accepts all `mutationOptions` fields except `mutationFn` (e.g. `onSuccess`, `onSettled`, `onMutate`). The `mutate` call accepts the same input the Eden function expects.
+**`treatyMutationOptions(fn, mutationOptions?)`** — wraps an Eden mutation function into `mutationOptions`. The optional second argument accepts all `mutationOptions` fields except `mutationFn` (e.g. `onSuccess`, `onSettled`, `onMutate`). The `mutate` call receives a single object with `body` and any other Eden options (like `query`) as the input.
 
 Both infer data, error, and input types end-to-end from your Elysia route definitions. No manual generics needed.
 

package/dist/index.d.ts

@@ -1,22 +1,16 @@
 import { Treaty } from "@elysiajs/eden";
-import { mutationOptions, queryOptions } from "@tanstack/react-query";
-type EdenFn<
-	I = any,
-	T extends Record<number, unknown> = Record<number, unknown>
-> = (input: I) => Promise<Treaty.TreatyResponse<T>>;
-declare function treatyMutationOptions<
-	T extends EdenFn,
-	P extends Parameters<T>,
-	R extends Awaited<ReturnType<T>>
->(params: {
-	fn: T;
-} & Omit<Parameters<typeof mutationOptions<R["data"], R["error"], P[0]>>[0], "mutationFn">);
-declare function treatyQueryOptions<
-	T extends EdenFn,
-	P extends Parameters<T>,
-	R extends Awaited<ReturnType<T>>
->(params: {
-	queryKey: string[];
-	fn: T;
-} & Omit<Parameters<typeof queryOptions<R["data"], R["error"], P[0]>>[0], "queryFn">);
+import { UseMutationOptions, UseQueryOptions } from "@tanstack/react-query";
+type EdenMutationFn<
+	TBody = any,
+	TOptions = any,
+	TResponse extends Record<number, unknown> = Record<number, unknown>
+> = ((body: TBody, options: TOptions) => Promise<Treaty.TreatyResponse<TResponse>>);
+type EdenQueryFn<TResponse extends Record<number, unknown> = Record<number, unknown>> = (() => Promise<Treaty.TreatyResponse<TResponse>>);
+type InferMutationVariables<TFn extends EdenMutationFn> = (unknown extends Parameters<TFn>[0] ? Parameters<TFn>[1] : Parameters<TFn>[1] & {
+	body: Parameters<TFn>[0];
+});
+type InferMutationOptions<TFn extends EdenMutationFn> = (UseMutationOptions<Awaited<ReturnType<TFn>>["data"], Awaited<ReturnType<TFn>>["error"], InferMutationVariables<TFn>>);
+type InferQueryOptions<TFn extends EdenQueryFn> = (UseQueryOptions<Awaited<ReturnType<TFn>>["data"], Awaited<ReturnType<TFn>>["error"]>);
+declare function treatyMutationOptions<TFn extends EdenMutationFn>(fn: TFn, options?: Omit<InferMutationOptions<TFn>, "mutationFn">): InferMutationOptions<TFn>;
+declare function treatyQueryOptions<TFn extends EdenQueryFn>(fn: TFn, options: Omit<InferQueryOptions<TFn>, "queryFn">): InferQueryOptions<TFn>;
 export { treatyQueryOptions, treatyMutationOptions };

package/dist/index.js

@@ -1,28 +1,28 @@
 // src/lib.ts
 import { mutationOptions, queryOptions } from "@tanstack/react-query";
-function treatyMutationOptions(params) {
+function treatyMutationOptions(fn, options) {
   return mutationOptions({
     mutationFn: async (variables) => {
-      const response = await params.fn(variables);
+      const { body, ...rest } = variables;
+      const response = await fn(body, rest);
       const { data, error } = response;
-      if (error) {
+      if (error)
         throw error;
-      }
       return data;
     },
-    ...params
+    ...options
   });
 }
-function treatyQueryOptions(params) {
+function treatyQueryOptions(fn, options) {
   return queryOptions({
-    queryKey: params.queryKey,
-    queryFn: async (variables) => {
-      const { data, error } = await params.fn(variables);
-      if (error) {
+    queryFn: async () => {
+      const response = await fn();
+      const { data, error } = response;
+      if (error)
         throw error;
-      }
       return data;
-    }
+    },
+    ...options
   });
 }
 export {
@@ -30,5 +30,5 @@ export {
   treatyMutationOptions
 };
 
-//# debugId=FB96D23A27CEDEEE64756E2164756E21
-//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsic3JjXFxsaWIudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAiaW1wb3J0IHR5cGUgeyBUcmVhdHkgfSBmcm9tIFwiQGVseXNpYWpzL2VkZW5cIjtcclxuaW1wb3J0IHsgbXV0YXRpb25PcHRpb25zLCBxdWVyeU9wdGlvbnMsIHR5cGUgVXNlTXV0YXRpb25PcHRpb25zIH0gZnJvbSBcIkB0YW5zdGFjay9yZWFjdC1xdWVyeVwiO1xyXG5cclxudHlwZSBFZGVuRm48SSA9IGFueSwgVCBleHRlbmRzIFJlY29yZDxudW1iZXIsIHVua25vd24+ID0gUmVjb3JkPG51bWJlciwgdW5rbm93bj4+ID0gKGlucHV0OiBJKSA9PiBQcm9taXNlPFRyZWF0eS5UcmVhdHlSZXNwb25zZTxUPj47XHJcblxyXG5leHBvcnQgZnVuY3Rpb24gdHJlYXR5TXV0YXRpb25PcHRpb25zPFxyXG4gIFQgZXh0ZW5kcyBFZGVuRm4sXHJcbiAgUCBleHRlbmRzIFBhcmFtZXRlcnM8VD4sXHJcbiAgUiBleHRlbmRzIEF3YWl0ZWQ8UmV0dXJuVHlwZTxUPj5cclxuPihwYXJhbXM6IHtcclxuICBmbjogVCxcclxufSAmIE9taXQ8XHJcbiAgUGFyYW1ldGVyczx0eXBlb2YgbXV0YXRpb25PcHRpb25zPFJbXCJkYXRhXCJdLCBSW1wiZXJyb3JcIl0sIFBbMF0+PlswXSwgXHJcbiAgXCJtdXRhdGlvbkZuXCJcclxuPikge1xyXG4gIHJldHVybiBtdXRhdGlvbk9wdGlvbnM8UltcImRhdGFcIl0sIFJbXCJlcnJvclwiXSwgUFswXT4oe1xyXG4gICAgbXV0YXRpb25GbjogYXN5bmMgKHZhcmlhYmxlcykgPT4ge1xyXG4gICAgICBjb25zdCByZXNwb25zZSA9IGF3YWl0IHBhcmFtcy5mbih2YXJpYWJsZXMpO1xyXG4gICAgICBjb25zdCB7IGRhdGEsIGVycm9yIH0gPSByZXNwb25zZTtcclxuICAgICAgaWYgKGVycm9yKSB7XHJcbiAgICAgICAgdGhyb3cgZXJyb3I7XHJcbiAgICAgIH1cclxuICAgICAgcmV0dXJuIGRhdGE7XHJcbiAgICB9LFxyXG4gICAgLi4ucGFyYW1zLFxyXG4gIH0pO1xyXG59XHJcblxyXG5leHBvcnQgZnVuY3Rpb24gdHJlYXR5UXVlcnlPcHRpb25zPFxyXG4gIFQgZXh0ZW5kcyBFZGVuRm4sXHJcbiAgUCBleHRlbmRzIFBhcmFtZXRlcnM8VD4sXHJcbiAgUiBleHRlbmRzIEF3YWl0ZWQ8UmV0dXJuVHlwZTxUPj5cclxuPihwYXJhbXM6IHtcclxuICBxdWVyeUtleTogc3RyaW5nW107XHJcbiAgZm46IFRcclxufSAmIE9taXQ8XHJcbiAgUGFyYW1ldGVyczx0eXBlb2YgcXVlcnlPcHRpb25zPFJbXCJkYXRhXCJdLCBSW1wiZXJyb3JcIl0sIFBbMF0+PlswXSwgXHJcbiAgXCJxdWVyeUZuXCJcclxuPikge1xyXG4gIHJldHVybiBxdWVyeU9wdGlvbnM8UltcImRhdGFcIl0sIFJbXCJlcnJvclwiXSwgUFswXT4oe1xyXG4gICAgcXVlcnlLZXk6IHBhcmFtcy5xdWVyeUtleSxcclxuICAgIHF1ZXJ5Rm46IGFzeW5jICh2YXJpYWJsZXMpID0+IHtcclxuICAgICAgY29uc3QgeyBkYXRhLCBlcnJvciB9ID0gYXdhaXQgcGFyYW1zLmZuKHZhcmlhYmxlcyk7XHJcbiAgICAgIGlmIChlcnJvcikge1xyXG4gICAgICAgIHRocm93IGVycm9yO1xyXG4gICAgICB9XHJcbiAgICAgIHJldHVybiBkYXRhO1xyXG4gICAgfVxyXG4gIH0pO1xyXG59XHJcbiIKICBdLAogICJtYXBwaW5ncyI6ICI7QUFDQTtBQUlPLFNBQVMscUJBSWYsQ0FBQyxRQUtDO0FBQUEsRUFDRCxPQUFPLGdCQUE2QztBQUFBLElBQ2xELFlBQVksT0FBTyxjQUFjO0FBQUEsTUFDL0IsTUFBTSxXQUFXLE1BQU0sT0FBTyxHQUFHLFNBQVM7QUFBQSxNQUMxQyxRQUFRLE1BQU0sVUFBVTtBQUFBLE1BQ3hCLElBQUksT0FBTztBQUFBLFFBQ1QsTUFBTTtBQUFBLE1BQ1I7QUFBQSxNQUNBLE9BQU87QUFBQTtBQUFBLE9BRU47QUFBQSxFQUNMLENBQUM7QUFBQTtBQUdJLFNBQVMsa0JBSWYsQ0FBQyxRQU1DO0FBQUEsRUFDRCxPQUFPLGFBQTBDO0FBQUEsSUFDL0MsVUFBVSxPQUFPO0FBQUEsSUFDakIsU0FBUyxPQUFPLGNBQWM7QUFBQSxNQUM1QixRQUFRLE1BQU0sVUFBVSxNQUFNLE9BQU8sR0FBRyxTQUFTO0FBQUEsTUFDakQsSUFBSSxPQUFPO0FBQUEsUUFDVCxNQUFNO0FBQUEsTUFDUjtBQUFBLE1BQ0EsT0FBTztBQUFBO0FBQUEsRUFFWCxDQUFDO0FBQUE7IiwKICAiZGVidWdJZCI6ICJGQjk2RDIzQTI3Q0VERUVFNjQ3NTZFMjE2NDc1NkUyMSIsCiAgIm5hbWVzIjogW10KfQ==
+//# debugId=42FF79B46773B5DF64756E2164756E21
+//# sourceMappingURL=data:application/json;base64,ewogICJ2ZXJzaW9uIjogMywKICAic291cmNlcyI6IFsic3JjXFxsaWIudHMiXSwKICAic291cmNlc0NvbnRlbnQiOiBbCiAgICAiaW1wb3J0IHR5cGUgeyBUcmVhdHkgfSBmcm9tIFwiQGVseXNpYWpzL2VkZW5cIjtcclxuaW1wb3J0IHsgbXV0YXRpb25PcHRpb25zLCBxdWVyeU9wdGlvbnMsIHVzZVF1ZXJ5LCB0eXBlIFVzZU11dGF0aW9uT3B0aW9ucywgdHlwZSBVc2VNdXRhdGlvblJlc3VsdCwgdHlwZSBVc2VRdWVyeU9wdGlvbnMgfSBmcm9tIFwiQHRhbnN0YWNrL3JlYWN0LXF1ZXJ5XCI7XHJcblxyXG50eXBlIEVkZW5NdXRhdGlvbkZuPFxyXG4gIFRCb2R5ID0gYW55LCBcclxuICBUT3B0aW9ucyA9IGFueSwgXHJcbiAgVFJlc3BvbnNlIGV4dGVuZHMgUmVjb3JkPG51bWJlciwgdW5rbm93bj4gPSBSZWNvcmQ8bnVtYmVyLCB1bmtub3duPlxyXG4+ID0gKFxyXG4gIChib2R5OiBUQm9keSwgb3B0aW9uczogVE9wdGlvbnMpID0+IFByb21pc2U8VHJlYXR5LlRyZWF0eVJlc3BvbnNlPFRSZXNwb25zZT4+XHJcbik7XHJcblxyXG50eXBlIEVkZW5RdWVyeUZuPFxyXG4gIFRSZXNwb25zZSBleHRlbmRzIFJlY29yZDxudW1iZXIsIHVua25vd24+ID0gUmVjb3JkPG51bWJlciwgdW5rbm93bj5cclxuPiA9IChcclxuICAoKSA9PiBQcm9taXNlPFRyZWF0eS5UcmVhdHlSZXNwb25zZTxUUmVzcG9uc2U+PlxyXG4pO1xyXG5cclxudHlwZSBJbmZlck11dGF0aW9uVmFyaWFibGVzPFRGbiBleHRlbmRzIEVkZW5NdXRhdGlvbkZuPiA9IChcclxuICB1bmtub3duIGV4dGVuZHMgUGFyYW1ldGVyczxURm4+WzBdXHJcbiAgICA/IFBhcmFtZXRlcnM8VEZuPlsxXVxyXG4gICAgOiBQYXJhbWV0ZXJzPFRGbj5bMV0gJiB7IGJvZHk6IFBhcmFtZXRlcnM8VEZuPlswXSB9XHJcbik7XHJcblxyXG50eXBlIEluZmVyTXV0YXRpb25PcHRpb25zPFRGbiBleHRlbmRzIEVkZW5NdXRhdGlvbkZuPiA9IChcclxuICBVc2VNdXRhdGlvbk9wdGlvbnM8XHJcbiAgICBBd2FpdGVkPFJldHVyblR5cGU8VEZuPj5bXCJkYXRhXCJdLFxyXG4gICAgQXdhaXRlZDxSZXR1cm5UeXBlPFRGbj4+W1wiZXJyb3JcIl0sXHJcbiAgICBJbmZlck11dGF0aW9uVmFyaWFibGVzPFRGbj5cclxuICA+XHJcbik7XHJcblxyXG50eXBlIEluZmVyUXVlcnlPcHRpb25zPFxyXG4gIFRGbiBleHRlbmRzIEVkZW5RdWVyeUZuLCBcclxuPiA9IChcclxuICBVc2VRdWVyeU9wdGlvbnM8XHJcbiAgICBBd2FpdGVkPFJldHVyblR5cGU8VEZuPj5bXCJkYXRhXCJdLFxyXG4gICAgQXdhaXRlZDxSZXR1cm5UeXBlPFRGbj4+W1wiZXJyb3JcIl1cclxuICA+XHJcbik7XHJcblxyXG5leHBvcnQgZnVuY3Rpb24gdHJlYXR5TXV0YXRpb25PcHRpb25zPFRGbiBleHRlbmRzIEVkZW5NdXRhdGlvbkZuPihcclxuICBmbjogVEZuLFxyXG4gIG9wdGlvbnM/OiBPbWl0PEluZmVyTXV0YXRpb25PcHRpb25zPFRGbj4sIFwibXV0YXRpb25GblwiPlxyXG4pOiBJbmZlck11dGF0aW9uT3B0aW9uczxURm4+IHtcclxuICByZXR1cm4gbXV0YXRpb25PcHRpb25zKHtcclxuICAgIG11dGF0aW9uRm46IGFzeW5jICh2YXJpYWJsZXMpID0+IHtcclxuICAgICAgY29uc3QgeyBib2R5LCAuLi5yZXN0IH0gPSB2YXJpYWJsZXM7XHJcbiAgICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZm4oYm9keSwgcmVzdCk7XHJcbiAgICAgIGNvbnN0IHsgZGF0YSwgZXJyb3IgfSA9IHJlc3BvbnNlO1xyXG4gICAgICBpZiAoZXJyb3IpIHRocm93IGVycm9yO1xyXG4gICAgICByZXR1cm4gZGF0YTtcclxuICAgIH0sXHJcbiAgICAuLi5vcHRpb25zLFxyXG4gIH0pO1xyXG59XHJcblxyXG5leHBvcnQgZnVuY3Rpb24gdHJlYXR5UXVlcnlPcHRpb25zPFxyXG4gIFRGbiBleHRlbmRzIEVkZW5RdWVyeUZuLFxyXG4+KFxyXG4gIGZuOiBURm4sXHJcbiAgb3B0aW9uczogT21pdDxJbmZlclF1ZXJ5T3B0aW9uczxURm4+LCBcInF1ZXJ5Rm5cIj5cclxuKTogSW5mZXJRdWVyeU9wdGlvbnM8VEZuPiB7XHJcbiAgcmV0dXJuIHF1ZXJ5T3B0aW9ucyh7XHJcbiAgICBxdWVyeUZuOiBhc3luYyAoKSA9PiB7XHJcbiAgICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgZm4oKTtcclxuICAgICAgY29uc3QgeyBkYXRhLCBlcnJvciB9ID0gcmVzcG9uc2U7XHJcbiAgICAgIGlmIChlcnJvcikgdGhyb3cgZXJyb3I7XHJcbiAgICAgIHJldHVybiBkYXRhO1xyXG4gICAgfSxcclxuICAgIC4uLm9wdGlvbnMsXHJcbiAgfSkgYXMgSW5mZXJRdWVyeU9wdGlvbnM8VEZuPjtcclxufSIKICBdLAogICJtYXBwaW5ncyI6ICI7QUFDQTtBQXVDTyxTQUFTLHFCQUFpRCxDQUMvRCxJQUNBLFNBQzJCO0FBQUEsRUFDM0IsT0FBTyxnQkFBZ0I7QUFBQSxJQUNyQixZQUFZLE9BQU8sY0FBYztBQUFBLE1BQy9CLFFBQVEsU0FBUyxTQUFTO0FBQUEsTUFDMUIsTUFBTSxXQUFXLE1BQU0sR0FBRyxNQUFNLElBQUk7QUFBQSxNQUNwQyxRQUFRLE1BQU0sVUFBVTtBQUFBLE1BQ3hCLElBQUk7QUFBQSxRQUFPLE1BQU07QUFBQSxNQUNqQixPQUFPO0FBQUE7QUFBQSxPQUVOO0FBQUEsRUFDTCxDQUFDO0FBQUE7QUFHSSxTQUFTLGtCQUVmLENBQ0MsSUFDQSxTQUN3QjtBQUFBLEVBQ3hCLE9BQU8sYUFBYTtBQUFBLElBQ2xCLFNBQVMsWUFBWTtBQUFBLE1BQ25CLE1BQU0sV0FBVyxNQUFNLEdBQUc7QUFBQSxNQUMxQixRQUFRLE1BQU0sVUFBVTtBQUFBLE1BQ3hCLElBQUk7QUFBQSxRQUFPLE1BQU07QUFBQSxNQUNqQixPQUFPO0FBQUE7QUFBQSxPQUVOO0FBQUEsRUFDTCxDQUFDO0FBQUE7IiwKICAiZGVidWdJZCI6ICI0MkZGNzlCNDY3NzNCNURGNjQ3NTZFMjE2NDc1NkUyMSIsCiAgIm5hbWVzIjogW10KfQ==

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "eden2query",
   "description": "Type-safe Eden Treaty to React Query helpers",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "type": "module",
   "files": [
     "dist"
@@ -18,6 +18,14 @@
     "./package.json": "./package.json"
   },
   "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/eyueldk/eden2query.git"
+  },
+  "homepage": "https://github.com/eyueldk/eden2query#readme",
+  "bugs": {
+    "url": "https://github.com/eyueldk/eden2query/issues"
+  },
   "keywords": [
     "elysia",
     "eden",
@@ -35,8 +43,6 @@
     "typescript": "^5"
   },
   "devDependencies": {
-    "@elysiajs/eden": "^1.4.6",
-    "@tanstack/react-query": "^5.90.20",
     "@types/bun": "latest",
     "bunup": "^0.16.22",
     "elysia": "^1.4.22"