@srpc.org/react-query 0.20.3 → 0.20.5

package/README.md

@@ -1,4 +1,4 @@
-# @srpc/react-query
+# @srpc.org/react-query
 
 React Query integration for SRPC - Type-safe RPC with automatic React Query hooks and query/mutation options generation.
 
@@ -6,11 +6,11 @@ React Query integration for SRPC - Type-safe RPC with automatic React Query hook
 
 ```bash
 # Using JSR (recommended)
-deno add @srpc/react-query
-npx jsr add @srpc/react-query
-yarn dlx jsr add @srpc/react-query
-pnpm dlx jsr add @srpc/react-query
-bunx jsr add @srpc/react-query
+deno add @srpc.org/react-query
+npx jsr add @srpc.org/react-query
+yarn dlx jsr add @srpc.org/react-query
+pnpm dlx jsr add @srpc.org/react-query
+bunx jsr add @srpc.org/react-query
 ```
 
 ## Features
@@ -25,7 +25,7 @@ bunx jsr add @srpc/react-query
 ## Prerequisites
 
 This package requires:
-- `@srpc/core` - The core SRPC framework
+- `@srpc.org/core` - The core SRPC framework
 - `@tanstack/react-query` v5.90 or higher
 - `react` v19 or higher
 
@@ -35,7 +35,7 @@ This package requires:
 
 ```typescript
 // server/router.ts
-import { initSRPC } from "@srpc/core/server";
+import { initSRPC } from "@srpc.org/core/server";
 
 const s = initSRPC();
 
@@ -60,7 +60,7 @@ export type AppRouter = typeof appRouter;
 
 ```typescript
 // lib/rpc.ts
-import { createSRPCClient } from "@srpc/core/client";
+import { createSRPCClient } from "@srpc.org/core/client";
 import { createSRPCContext } from "@srpc.org/react-query";
 import type { AppRouter } from "../server/router";
 
@@ -229,7 +229,7 @@ const postQuery = useQuery(srpc.posts.drafts.list.queryOptions());
 If you prefer not to use React Context:
 
 ```typescript
-import { createSRPCClient } from "@srpc/core/client";
+import { createSRPCClient } from "@srpc.org/core/client";
 import { createSRPCQueryOptions } from "@srpc.org/react-query";
 import { useQuery } from "@tanstack/react-query";
 import type { AppRouter } from "./server/router";
@@ -254,7 +254,7 @@ function MyComponent() {
 ### Custom Serialization
 
 ```typescript
-import { createSRPCClient } from "@srpc/core/client";
+import { createSRPCClient } from "@srpc.org/core/client";
 import { createSRPCContext } from "@srpc.org/react-query";
 import superjson from "superjson";
 

package/dist/context.d.ts

@@ -1,5 +1,5 @@
-import { SRPC, AnySRPC } from '@srpc/core/server';
-import { AnyRoutes, AnyProcedure, ClientProcedure, DecoratedProcedureRecord } from '@srpc/core/shared';
+import { SRPC, AnySRPC } from '@srpc.org/core/server';
+import { AnyRoutes, AnyProcedure, ClientProcedure, DecoratedProcedureRecord } from '@srpc.org/core/shared';
 import React, { PropsWithChildren } from 'react';
 import { UseQueryOptions, UseMutationOptions } from '@tanstack/react-query';
 
@@ -14,7 +14,7 @@ import { UseQueryOptions, UseMutationOptions } from '@tanstack/react-query';
  *
  * @example Basic usage
  * ```typescript
- * import { createSRPCClient } from "@srpc/core/client";
+ * import { createSRPCClient } from "@srpc.org/core/client";
  * import { createSRPCQueryOptions } from "@srpc.org/react-query";
  * import { useQuery } from "@tanstack/react-query";
  * import type { AppRouter } from "./server";
@@ -85,6 +85,8 @@ import { UseQueryOptions, UseMutationOptions } from '@tanstack/react-query';
 type OptionsFactory<Procedure extends ClientProcedure<any>, TInput = Parameters<Procedure>, TOutput = ReturnType<Procedure>> = {
     queryOptions: (...args: Parameters<Procedure>) => UseQueryOptions<TOutput>;
     mutationOptions: () => UseMutationOptions<TOutput, Error, TInput>;
+    queryKey: (...args: Parameters<Procedure>) => string[];
+    mutationKey: () => string[];
 };
 /**
  * Type that recursively transforms an SRPC router into a structure with React Query options.
@@ -135,8 +137,8 @@ type DecoratedQueryProcedureRecord<TRouter extends AnyRoutes> = {
  *
  * @example Complete setup
  * ```typescript
- * import { createSRPCClient } from "@srpc/core/client";
- * import { createSRPCContext } from "@srpc/react-query/context";
+ * import { createSRPCClient } from "@srpc.org/core/client";
+ * import { createSRPCContext } from "@srpc.org/react-query/context";
  * import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
  * import type { AppRouter } from "./server";
  *
@@ -237,7 +239,7 @@ type SRPCContextFactory<TRouter extends AnySRPC> = {
  *
  * @example Basic setup
  * ```typescript
- * import { createSRPCClient } from "@srpc/core/client";
+ * import { createSRPCClient } from "@srpc.org/core/client";
  * import { createSRPCContext } from "@srpc.org/react-query";
  * import type { AppRouter } from "./server";
  *

package/dist/context.js

@@ -1,7 +1,7 @@
 'use client';
 import { jsx } from 'react/jsx-runtime';
 import { createContext, useContext, useMemo } from 'react';
-import { createRecursiveProxy } from '@srpc/core/shared';
+import { createRecursiveProxy } from '@srpc.org/core/shared';
 import { queryOptions, mutationOptions } from '@tanstack/react-query';
 
 /**
@@ -26,7 +26,7 @@ import { queryOptions, mutationOptions } from '@tanstack/react-query';
  *
  * @example Basic usage
  * ```typescript
- * import { createSRPCClient } from "@srpc/core/client";
+ * import { createSRPCClient } from "@srpc.org/core/client";
  * import { createSRPCQueryOptions } from "@srpc.org/react-query";
  * import { useQuery, useMutation } from "@tanstack/react-query";
  * import type { AppRouter } from "./server";
@@ -81,6 +81,12 @@ import { queryOptions, mutationOptions } from '@tanstack/react-query';
     return createRecursiveProxy(({ path, args })=>{
         const lastPath = path[path.length - 1];
         const pathWithoutTarget = path.slice(0, -1);
+        if (lastPath === "queryKey" || lastPath === "mutationKey") {
+            return [
+                ...pathWithoutTarget,
+                args
+            ];
+        }
         const procedure = pathWithoutTarget.reduce((acc, key)=>acc[key], client);
         if (typeof procedure !== "function") {
             throw new Error(`Procedure at path ${pathWithoutTarget.join(".")} is not a function`);
@@ -118,8 +124,8 @@ import { queryOptions, mutationOptions } from '@tanstack/react-query';
  *
  * @example Complete setup
  * ```typescript
- * import { createSRPCClient } from "@srpc/core/client";
- * import { createSRPCContext } from "@srpc/react-query/context";
+ * import { createSRPCClient } from "@srpc.org/core/client";
+ * import { createSRPCContext } from "@srpc.org/react-query/context";
  * import { QueryClient, QueryClientProvider } from "@tanstack/react-query";
  * import type { AppRouter } from "./server";
  *
@@ -168,7 +174,7 @@ import { queryOptions, mutationOptions } from '@tanstack/react-query';
  *
  * @example Basic setup
  * ```typescript
- * import { createSRPCClient } from "@srpc/core/client";
+ * import { createSRPCClient } from "@srpc.org/core/client";
  * import { createSRPCContext } from "@srpc.org/react-query";
  * import type { AppRouter } from "./server";
  *

package/dist/index.d.ts

@@ -1,5 +1,5 @@
-import { SRPC, AnySRPC } from '@srpc/core/server';
-import { ClientProcedure, AnyRoutes, AnyProcedure, DecoratedProcedureRecord } from '@srpc/core/shared';
+import { SRPC, AnySRPC } from '@srpc.org/core/server';
+import { ClientProcedure, AnyRoutes, AnyProcedure, DecoratedProcedureRecord } from '@srpc.org/core/shared';
 import { UseQueryOptions, UseMutationOptions } from '@tanstack/react-query';
 export { SRPCContextFactory, SRPCContextValue, createSRPCContext } from './context.js';
 
@@ -14,7 +14,7 @@ export { SRPCContextFactory, SRPCContextValue, createSRPCContext } from './conte
  *
  * @example Basic usage
  * ```typescript
- * import { createSRPCClient } from "@srpc/core/client";
+ * import { createSRPCClient } from "@srpc.org/core/client";
  * import { createSRPCQueryOptions } from "@srpc.org/react-query";
  * import { useQuery } from "@tanstack/react-query";
  * import type { AppRouter } from "./server";
@@ -85,6 +85,8 @@ export { SRPCContextFactory, SRPCContextValue, createSRPCContext } from './conte
 type OptionsFactory<Procedure extends ClientProcedure<any>, TInput = Parameters<Procedure>, TOutput = ReturnType<Procedure>> = {
     queryOptions: (...args: Parameters<Procedure>) => UseQueryOptions<TOutput>;
     mutationOptions: () => UseMutationOptions<TOutput, Error, TInput>;
+    queryKey: (...args: Parameters<Procedure>) => string[];
+    mutationKey: () => string[];
 };
 /**
  * Type that recursively transforms an SRPC router into a structure with React Query options.
@@ -145,7 +147,7 @@ type DecoratedQueryProcedureRecord<TRouter extends AnyRoutes> = {
  *
  * @example Basic usage
  * ```typescript
- * import { createSRPCClient } from "@srpc/core/client";
+ * import { createSRPCClient } from "@srpc.org/core/client";
  * import { createSRPCQueryOptions } from "@srpc.org/react-query";
  * import { useQuery, useMutation } from "@tanstack/react-query";
  * import type { AppRouter } from "./server";

package/dist/index.js

@@ -1,4 +1,4 @@
-import { createRecursiveProxy } from '@srpc/core/shared';
+import { createRecursiveProxy } from '@srpc.org/core/shared';
 import { queryOptions, mutationOptions } from '@tanstack/react-query';
 export { createSRPCContext } from './context.js';
 
@@ -24,7 +24,7 @@ export { createSRPCContext } from './context.js';
  *
  * @example Basic usage
  * ```typescript
- * import { createSRPCClient } from "@srpc/core/client";
+ * import { createSRPCClient } from "@srpc.org/core/client";
  * import { createSRPCQueryOptions } from "@srpc.org/react-query";
  * import { useQuery, useMutation } from "@tanstack/react-query";
  * import type { AppRouter } from "./server";
@@ -79,6 +79,12 @@ export { createSRPCContext } from './context.js';
     return createRecursiveProxy(({ path, args })=>{
         const lastPath = path[path.length - 1];
         const pathWithoutTarget = path.slice(0, -1);
+        if (lastPath === "queryKey" || lastPath === "mutationKey") {
+            return [
+                ...pathWithoutTarget,
+                args
+            ];
+        }
         const procedure = pathWithoutTarget.reduce((acc, key)=>acc[key], client);
         if (typeof procedure !== "function") {
             throw new Error(`Procedure at path ${pathWithoutTarget.join(".")} is not a function`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@srpc.org/react-query",
-  "version": "0.20.3",
+  "version": "0.20.5",
   "description": "React Query integration for SRPC - Type-safe RPC with automatic React Query hooks",
   "type": "module",
   "main": "./dist/index.js",
@@ -35,12 +35,12 @@
     "get-port-please": "^3.1.2",
     "react": "^19.2.0",
     "vitest": "^4.0.10",
-    "@srpc.org/core": "0.20.3"
+    "@srpc.org/core": "0.20.5"
   },
   "peerDependencies": {
     "@tanstack/react-query": ">=5.90",
     "react": ">=19",
-    "@srpc.org/core": "0.20.3"
+    "@srpc.org/core": "0.20.5"
   },
   "scripts": {
     "build": "bunchee",