@orpc/solid-query 0.0.0-next.f4d410a → 0.0.0-next.f4ed9ab

package/README.md

@@ -21,28 +21,24 @@
 
 <h3 align="center">Typesafe APIs Made Simple 🪄</h3>
 
-**oRPC is a powerful combination of RPC and OpenAPI**, makes it easy to build APIs that are end-to-end type-safe and adhere to OpenAPI standards, ensuring a smooth and enjoyable developer experience.
+**oRPC is a powerful combination of RPC and OpenAPI**, makes it easy to build APIs that are end-to-end type-safe and adhere to OpenAPI standards
 
 ---
 
 ## Highlights
 
-- **End-to-End Type Safety 🔒**: Ensure complete type safety from inputs to outputs and errors, bridging server and client seamlessly.
-- **First-Class OpenAPI 📄**: Adheres to the OpenAPI standard out of the box, ensuring seamless integration and comprehensive API documentation.
-- **Contract-First Development 📜**: (Optional) Define your API contract upfront and implement it with confidence.
-- **Exceptional Developer Experience ✨**: Enjoy a streamlined workflow with robust typing and clear, in-code documentation.
-- **Multi-Runtime Support 🌍**: Run your code seamlessly on Cloudflare, Deno, Bun, Node.js, and more.
-- **Framework Integrations 🧩**: Supports Tanstack Query (React, Vue, Solid, Svelte), Pinia Colada, and more.
-- **Server Actions ⚡️**: Fully compatible with React Server Actions on Next.js, TanStack Start, and more.
-- **Standard Schema Support 🗂️**: Effortlessly work with Zod, Valibot, ArkType, and others right out of the box.
-- **Fast & Lightweight 💨**: Built on native APIs across all runtimes – optimized for speed and efficiency.
-- **Native Types 📦**: Enjoy built-in support for Date, File, Blob, BigInt, URL and more with no extra setup.
-- **Lazy Router ⏱️**: Improve cold start times with our lazy routing feature.
-- **SSE & Streaming 📡**: Provides SSE and streaming features – perfect for real-time notifications and AI-powered streaming responses.
-- **Reusability 🔄**: Write once and reuse your code across multiple purposes effortlessly.
-- **Extendability 🔌**: Easily enhance oRPC with plugins, middleware, and interceptors.
-- **Reliability 🛡️**: Well-tested, fully TypeScript, production-ready, and MIT licensed for peace of mind.
-- **Simplicity 💡**: Enjoy straightforward, clean code with no hidden magic.
+- **🔗 End-to-End Type Safety**: Ensure type-safe inputs, outputs, and errors from client to server.
+- **📘 First-Class OpenAPI**: Built-in support that fully adheres to the OpenAPI standard.
+- **📝 Contract-First Development**: Optionally define your API contract before implementation.
+- **⚙️ Framework Integrations**: Seamlessly integrate with TanStack Query (React, Vue, Solid, Svelte), Pinia Colada, and more.
+- **🚀 Server Actions**: Fully compatible with React Server Actions on Next.js, TanStack Start, and other platforms.
+- **🔠 Standard Schema Support**: Works out of the box with Zod, Valibot, ArkType, and other schema validators.
+- **🗃️ Native Types**: Supports native types like Date, File, Blob, BigInt, URL, and more.
+- **⏱️ Lazy Router**: Enhance cold start times with our lazy routing feature.
+- **📡 SSE & Streaming**: Enjoy full type-safe support for SSE and streaming.
+- **🌍 Multi-Runtime Support**: Fast and lightweight on Cloudflare, Deno, Bun, Node.js, and beyond.
+- **🔌 Extendability**: Easily extend functionality with plugins, middleware, and interceptors.
+- **🛡️ Reliability**: Well-tested, TypeScript-based, production-ready, and MIT licensed.
 
 ## Documentation
 
@@ -53,6 +49,8 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/contract](https://www.npmjs.com/package/@orpc/contract): Build your API contract.
 - [@orpc/server](https://www.npmjs.com/package/@orpc/server): Build your API or implement API contract.
 - [@orpc/client](https://www.npmjs.com/package/@orpc/client): Consume your API on the client with type-safety.
+- [@orpc/nest](https://www.npmjs.com/package/@orpc/nest): Deeply integrate oRPC with NestJS.
+- [@orpc/react](https://www.npmjs.com/package/@orpc/react): Utilities for integrating oRPC with React and React Server Actions.
 - [@orpc/react-query](https://www.npmjs.com/package/@orpc/react-query): Integration with [React Query](https://tanstack.com/query/latest/docs/framework/react/overview).
 - [@orpc/vue-query](https://www.npmjs.com/package/@orpc/vue-query): Integration with [Vue Query](https://tanstack.com/query/latest/docs/framework/vue/overview).
 - [@orpc/solid-query](https://www.npmjs.com/package/@orpc/solid-query): Integration with [Solid Query](https://tanstack.com/query/latest/docs/framework/solid/overview).
@@ -60,6 +58,8 @@ You can find the full documentation [here](https://orpc.unnoq.com).
 - [@orpc/vue-colada](https://www.npmjs.com/package/@orpc/vue-colada): Integration with [Pinia Colada](https://pinia-colada.esm.dev/).
 - [@orpc/openapi](https://www.npmjs.com/package/@orpc/openapi): Generate OpenAPI specs and handle OpenAPI requests.
 - [@orpc/zod](https://www.npmjs.com/package/@orpc/zod): More schemas that [Zod](https://zod.dev/) doesn't support yet.
+- [@orpc/valibot](https://www.npmjs.com/package/@orpc/valibot): OpenAPI spec generation from [Valibot](https://valibot.dev/).
+- [@orpc/arktype](https://www.npmjs.com/package/@orpc/arktype): OpenAPI spec generation from [ArkType](https://arktype.io/).
 
 ## `@orpc/solid-query`
 
@@ -107,6 +107,14 @@ export function Example() {
 }
 ```
 
+## Sponsors
+
+<p align="center">
+  <a href="https://cdn.jsdelivr.net/gh/unnoq/unnoq/sponsors.svg">
+    <img src='https://cdn.jsdelivr.net/gh/unnoq/unnoq/sponsors.svg'/>
+  </a>
+</p>
+
 ## License
 
 Distributed under the MIT License. See [LICENSE](https://github.com/unnoq/orpc/blob/main/LICENSE) for more information.

package/dist/index.d.mts

@@ -1,5 +1,5 @@
 import { ClientContext, Client, NestedClient } from '@orpc/client';
-import { QueryKey, SolidQueryOptions, QueryFunctionContext, SolidInfiniteQueryOptions, SolidMutationOptions, InfiniteData } from '@tanstack/solid-query';
+import { QueryKey, SkipToken, SolidQueryOptions, QueryFunctionContext, SolidInfiniteQueryOptions, SolidMutationOptions, InfiniteData } from '@tanstack/solid-query';
 import { PartialDeep, SetOptional, MaybeOptionalOptions } from '@orpc/shared';
 
 type KeyType = 'query' | 'infinite' | 'mutation' | undefined;
@@ -13,53 +13,80 @@ declare function buildKey<TType extends KeyType, TInput>(path: string[], options
  * Utils at any level (procedure or router)
  */
 interface GeneralUtils<TInput> {
+    /**
+     * Generate a query/mutation key for checking status, invalidate, set, get, etc.
+     *
+     * @see {@link https://orpc.unnoq.com/docs/tanstack-query/basic#query-mutation-key Tanstack Query/Mutation Key Docs}
+     */
     key<UType extends KeyType = undefined>(options?: BuildKeyOptions<UType, TInput>): QueryKey;
 }
 declare function createGeneralUtils<TInput>(path: string[]): GeneralUtils<TInput>;
 
-type QueryOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError extends Error, TSelectData> = (undefined extends TInput ? {
-    input?: TInput;
+type QueryOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TSelectData> = (undefined extends TInput ? {
+    input?: TInput | SkipToken;
 } : {
-    input: TInput;
+    input: TInput | SkipToken;
 }) & (Record<never, never> extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
 }) & SetOptional<SolidQueryOptions<TOutput, TError, TSelectData>, 'queryKey'>;
-interface QueryOptionsBase<TOutput, TError extends Error> {
+interface QueryOptionsBase<TOutput, TError> {
     queryKey: QueryKey;
     queryFn(ctx: QueryFunctionContext): Promise<TOutput>;
     retry?(failureCount: number, error: TError): boolean;
+    enabled: boolean;
 }
-type InfiniteOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError extends Error, TSelectData, TPageParam> = {
-    input: (pageParam: TPageParam) => TInput;
+type InfiniteOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TSelectData, TPageParam> = {
+    input: ((pageParam: TPageParam) => TInput) | SkipToken;
 } & (Record<never, never> extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
 }) & SetOptional<SolidInfiniteQueryOptions<TOutput, TError, TSelectData, TOutput, QueryKey, TPageParam>, 'queryKey'>;
-interface InfiniteOptionsBase<TOutput, TError extends Error, TPageParam> {
+interface InfiniteOptionsBase<TOutput, TError, TPageParam> {
     queryKey: QueryKey;
     queryFn(ctx: QueryFunctionContext<QueryKey, TPageParam>): Promise<TOutput>;
     retry?(failureCount: number, error: TError): boolean;
+    enabled: boolean;
 }
-type MutationOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError extends Error, TMutationContext> = (Record<never, never> extends TClientContext ? {
+type MutationOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TMutationContext> = (Record<never, never> extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
 }) & MutationOptions<TInput, TOutput, TError, TMutationContext>;
-type MutationOptions<TInput, TOutput, TError extends Error, TMutationContext> = SolidMutationOptions<TOutput, TError, TInput, TMutationContext>;
+type MutationOptions<TInput, TOutput, TError, TMutationContext> = SolidMutationOptions<TOutput, TError, TInput, TMutationContext>;
 
-interface ProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> {
+interface ProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError> {
+    /**
+     * Calling corresponding procedure client
+     *
+     * @see {@link https://orpc.unnoq.com/docs/tanstack-query/basic#calling-procedure-clients Tanstack Calling Procedure Client Docs}
+     */
     call: Client<TClientContext, TInput, TOutput, TError>;
+    /**
+     * Generate options used for createQuery/prefetchQuery/...
+     *
+     * @see {@link https://orpc.unnoq.com/docs/tanstack-query/basic#query-options-utility Tanstack Query Options Utility Docs}
+     */
     queryOptions<U, USelectData = TOutput>(...rest: MaybeOptionalOptions<U & QueryOptionsIn<TClientContext, TInput, TOutput, TError, USelectData>>): NoInfer<U & Omit<QueryOptionsBase<TOutput, TError>, keyof U>>;
+    /**
+     * Generate options used for createInfiniteQuery/prefetchInfiniteQuery/...
+     *
+     * @see {@link https://orpc.unnoq.com/docs/tanstack-query/basic#infinite-query-options-utility Tanstack Infinite Query Options Utility Docs}
+     */
     infiniteOptions<U, UPageParam, USelectData = InfiniteData<TOutput, UPageParam>>(options: U & InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, USelectData, UPageParam>): NoInfer<U & Omit<InfiniteOptionsBase<TOutput, TError, UPageParam>, keyof U>>;
+    /**
+     * Generate options used for createMutation/...
+     *
+     * @see {@link https://orpc.unnoq.com/docs/tanstack-query/basic#mutation-options Tanstack Mutation Options Docs}
+     */
     mutationOptions<UMutationContext>(...rest: MaybeOptionalOptions<MutationOptionsIn<TClientContext, TInput, TOutput, TError, UMutationContext>>): MutationOptions<TInput, TOutput, TError, UMutationContext>;
 }
 interface CreateProcedureUtilsOptions {
     path: string[];
 }
-declare function createProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError extends Error>(client: Client<TClientContext, TInput, TOutput, TError>, options: CreateProcedureUtilsOptions): ProcedureUtils<TClientContext, TInput, TOutput, TError>;
+declare function createProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError>(client: Client<TClientContext, TInput, TOutput, TError>, options: CreateProcedureUtilsOptions): ProcedureUtils<TClientContext, TInput, TOutput, TError>;
 
 type RouterUtils<T extends NestedClient<any>> = T extends Client<infer UClientContext, infer UInput, infer UOutput, infer UError> ? ProcedureUtils<UClientContext, UInput, UOutput, UError> & GeneralUtils<UInput> : {
     [K in keyof T]: T[K] extends NestedClient<any> ? RouterUtils<T[K]> : never;
@@ -67,6 +94,13 @@ type RouterUtils<T extends NestedClient<any>> = T extends Client<infer UClientCo
 interface CreateRouterUtilsOptions {
     path?: string[];
 }
+/**
+ * Create a router utils from a client.
+ *
+ * @info Both client-side and server-side clients are supported.
+ * @see {@link https://orpc.unnoq.com/docs/tanstack-query/solid Tanstack Query Solid Docs}
+ */
 declare function createRouterUtils<T extends NestedClient<any>>(client: T, options?: CreateRouterUtilsOptions): RouterUtils<T>;
 
-export { type BuildKeyOptions, type CreateProcedureUtilsOptions, type CreateRouterUtilsOptions, type GeneralUtils, type InfiniteOptionsBase, type InfiniteOptionsIn, type KeyType, type MutationOptions, type MutationOptionsIn, type ProcedureUtils, type QueryOptionsBase, type QueryOptionsIn, type RouterUtils, buildKey, createGeneralUtils, createRouterUtils as createORPCSolidQueryUtils, createProcedureUtils, createRouterUtils };
+export { buildKey, createGeneralUtils, createRouterUtils as createORPCSolidQueryUtils, createProcedureUtils, createRouterUtils };
+export type { BuildKeyOptions, CreateProcedureUtilsOptions, CreateRouterUtilsOptions, GeneralUtils, InfiniteOptionsBase, InfiniteOptionsIn, KeyType, MutationOptions, MutationOptionsIn, ProcedureUtils, QueryOptionsBase, QueryOptionsIn, RouterUtils };

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import { ClientContext, Client, NestedClient } from '@orpc/client';
-import { QueryKey, SolidQueryOptions, QueryFunctionContext, SolidInfiniteQueryOptions, SolidMutationOptions, InfiniteData } from '@tanstack/solid-query';
+import { QueryKey, SkipToken, SolidQueryOptions, QueryFunctionContext, SolidInfiniteQueryOptions, SolidMutationOptions, InfiniteData } from '@tanstack/solid-query';
 import { PartialDeep, SetOptional, MaybeOptionalOptions } from '@orpc/shared';
 
 type KeyType = 'query' | 'infinite' | 'mutation' | undefined;
@@ -13,53 +13,80 @@ declare function buildKey<TType extends KeyType, TInput>(path: string[], options
  * Utils at any level (procedure or router)
  */
 interface GeneralUtils<TInput> {
+    /**
+     * Generate a query/mutation key for checking status, invalidate, set, get, etc.
+     *
+     * @see {@link https://orpc.unnoq.com/docs/tanstack-query/basic#query-mutation-key Tanstack Query/Mutation Key Docs}
+     */
     key<UType extends KeyType = undefined>(options?: BuildKeyOptions<UType, TInput>): QueryKey;
 }
 declare function createGeneralUtils<TInput>(path: string[]): GeneralUtils<TInput>;
 
-type QueryOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError extends Error, TSelectData> = (undefined extends TInput ? {
-    input?: TInput;
+type QueryOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TSelectData> = (undefined extends TInput ? {
+    input?: TInput | SkipToken;
 } : {
-    input: TInput;
+    input: TInput | SkipToken;
 }) & (Record<never, never> extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
 }) & SetOptional<SolidQueryOptions<TOutput, TError, TSelectData>, 'queryKey'>;
-interface QueryOptionsBase<TOutput, TError extends Error> {
+interface QueryOptionsBase<TOutput, TError> {
     queryKey: QueryKey;
     queryFn(ctx: QueryFunctionContext): Promise<TOutput>;
     retry?(failureCount: number, error: TError): boolean;
+    enabled: boolean;
 }
-type InfiniteOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError extends Error, TSelectData, TPageParam> = {
-    input: (pageParam: TPageParam) => TInput;
+type InfiniteOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TSelectData, TPageParam> = {
+    input: ((pageParam: TPageParam) => TInput) | SkipToken;
 } & (Record<never, never> extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
 }) & SetOptional<SolidInfiniteQueryOptions<TOutput, TError, TSelectData, TOutput, QueryKey, TPageParam>, 'queryKey'>;
-interface InfiniteOptionsBase<TOutput, TError extends Error, TPageParam> {
+interface InfiniteOptionsBase<TOutput, TError, TPageParam> {
     queryKey: QueryKey;
     queryFn(ctx: QueryFunctionContext<QueryKey, TPageParam>): Promise<TOutput>;
     retry?(failureCount: number, error: TError): boolean;
+    enabled: boolean;
 }
-type MutationOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError extends Error, TMutationContext> = (Record<never, never> extends TClientContext ? {
+type MutationOptionsIn<TClientContext extends ClientContext, TInput, TOutput, TError, TMutationContext> = (Record<never, never> extends TClientContext ? {
     context?: TClientContext;
 } : {
     context: TClientContext;
 }) & MutationOptions<TInput, TOutput, TError, TMutationContext>;
-type MutationOptions<TInput, TOutput, TError extends Error, TMutationContext> = SolidMutationOptions<TOutput, TError, TInput, TMutationContext>;
+type MutationOptions<TInput, TOutput, TError, TMutationContext> = SolidMutationOptions<TOutput, TError, TInput, TMutationContext>;
 
-interface ProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError extends Error> {
+interface ProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError> {
+    /**
+     * Calling corresponding procedure client
+     *
+     * @see {@link https://orpc.unnoq.com/docs/tanstack-query/basic#calling-procedure-clients Tanstack Calling Procedure Client Docs}
+     */
     call: Client<TClientContext, TInput, TOutput, TError>;
+    /**
+     * Generate options used for createQuery/prefetchQuery/...
+     *
+     * @see {@link https://orpc.unnoq.com/docs/tanstack-query/basic#query-options-utility Tanstack Query Options Utility Docs}
+     */
     queryOptions<U, USelectData = TOutput>(...rest: MaybeOptionalOptions<U & QueryOptionsIn<TClientContext, TInput, TOutput, TError, USelectData>>): NoInfer<U & Omit<QueryOptionsBase<TOutput, TError>, keyof U>>;
+    /**
+     * Generate options used for createInfiniteQuery/prefetchInfiniteQuery/...
+     *
+     * @see {@link https://orpc.unnoq.com/docs/tanstack-query/basic#infinite-query-options-utility Tanstack Infinite Query Options Utility Docs}
+     */
     infiniteOptions<U, UPageParam, USelectData = InfiniteData<TOutput, UPageParam>>(options: U & InfiniteOptionsIn<TClientContext, TInput, TOutput, TError, USelectData, UPageParam>): NoInfer<U & Omit<InfiniteOptionsBase<TOutput, TError, UPageParam>, keyof U>>;
+    /**
+     * Generate options used for createMutation/...
+     *
+     * @see {@link https://orpc.unnoq.com/docs/tanstack-query/basic#mutation-options Tanstack Mutation Options Docs}
+     */
     mutationOptions<UMutationContext>(...rest: MaybeOptionalOptions<MutationOptionsIn<TClientContext, TInput, TOutput, TError, UMutationContext>>): MutationOptions<TInput, TOutput, TError, UMutationContext>;
 }
 interface CreateProcedureUtilsOptions {
     path: string[];
 }
-declare function createProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError extends Error>(client: Client<TClientContext, TInput, TOutput, TError>, options: CreateProcedureUtilsOptions): ProcedureUtils<TClientContext, TInput, TOutput, TError>;
+declare function createProcedureUtils<TClientContext extends ClientContext, TInput, TOutput, TError>(client: Client<TClientContext, TInput, TOutput, TError>, options: CreateProcedureUtilsOptions): ProcedureUtils<TClientContext, TInput, TOutput, TError>;
 
 type RouterUtils<T extends NestedClient<any>> = T extends Client<infer UClientContext, infer UInput, infer UOutput, infer UError> ? ProcedureUtils<UClientContext, UInput, UOutput, UError> & GeneralUtils<UInput> : {
     [K in keyof T]: T[K] extends NestedClient<any> ? RouterUtils<T[K]> : never;
@@ -67,6 +94,13 @@ type RouterUtils<T extends NestedClient<any>> = T extends Client<infer UClientCo
 interface CreateRouterUtilsOptions {
     path?: string[];
 }
+/**
+ * Create a router utils from a client.
+ *
+ * @info Both client-side and server-side clients are supported.
+ * @see {@link https://orpc.unnoq.com/docs/tanstack-query/solid Tanstack Query Solid Docs}
+ */
 declare function createRouterUtils<T extends NestedClient<any>>(client: T, options?: CreateRouterUtilsOptions): RouterUtils<T>;
 
-export { type BuildKeyOptions, type CreateProcedureUtilsOptions, type CreateRouterUtilsOptions, type GeneralUtils, type InfiniteOptionsBase, type InfiniteOptionsIn, type KeyType, type MutationOptions, type MutationOptionsIn, type ProcedureUtils, type QueryOptionsBase, type QueryOptionsIn, type RouterUtils, buildKey, createGeneralUtils, createRouterUtils as createORPCSolidQueryUtils, createProcedureUtils, createRouterUtils };
+export { buildKey, createGeneralUtils, createRouterUtils as createORPCSolidQueryUtils, createProcedureUtils, createRouterUtils };
+export type { BuildKeyOptions, CreateProcedureUtilsOptions, CreateRouterUtilsOptions, GeneralUtils, InfiniteOptionsBase, InfiniteOptionsIn, KeyType, MutationOptions, MutationOptionsIn, ProcedureUtils, QueryOptionsBase, QueryOptionsIn, RouterUtils };

package/dist/index.mjs

@@ -1,3 +1,5 @@
+import { skipToken } from '@tanstack/solid-query';
+
 function buildKey(path, options) {
   const withInput = options?.input !== void 0 ? { input: options?.input } : {};
   const withType = options?.type !== void 0 ? { type: options?.type } : {};
@@ -21,16 +23,29 @@ function createProcedureUtils(client, options) {
     queryOptions(...[optionsIn = {}]) {
       return {
         queryKey: buildKey(options.path, { type: "query", input: optionsIn.input }),
-        queryFn: ({ signal }) => client(optionsIn.input, { signal, context: optionsIn.context }),
+        queryFn: ({ signal }) => {
+          if (optionsIn.input === skipToken) {
+            throw new Error("queryFn should not be called with skipToken used as input");
+          }
+          return client(optionsIn.input, { signal, context: optionsIn.context });
+        },
+        enabled: optionsIn.input !== skipToken,
         ...optionsIn
       };
     },
     infiniteOptions(optionsIn) {
       return {
-        queryKey: buildKey(options.path, { type: "infinite", input: optionsIn.input(optionsIn.initialPageParam) }),
+        queryKey: buildKey(options.path, {
+          type: "infinite",
+          input: optionsIn.input === skipToken ? skipToken : optionsIn.input(optionsIn.initialPageParam)
+        }),
         queryFn: ({ pageParam, signal }) => {
+          if (optionsIn.input === skipToken) {
+            throw new Error("queryFn should not be called with skipToken used as input");
+          }
           return client(optionsIn.input(pageParam), { signal, context: optionsIn.context });
         },
+        enabled: optionsIn.input !== skipToken,
         ...optionsIn
       };
     },

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@orpc/solid-query",
   "type": "module",
-  "version": "0.0.0-next.f4d410a",
+  "version": "0.0.0-next.f4ed9ab",
   "license": "MIT",
   "homepage": "https://orpc.unnoq.com",
   "repository": {
@@ -27,15 +27,16 @@
     "dist"
   ],
   "peerDependencies": {
-    "@tanstack/solid-query": ">=5.59.0",
+    "@tanstack/solid-query": ">=5.55.0",
     "solid-js": ">=1.9.0",
-    "@orpc/client": "0.0.0-next.f4d410a"
+    "@orpc/client": "0.0.0-next.f4ed9ab"
   },
   "dependencies": {
-    "@orpc/shared": "0.0.0-next.f4d410a"
+    "@orpc/shared": "0.0.0-next.f4ed9ab"
   },
   "devDependencies": {
-    "zod": "^3.24.2"
+    "@tanstack/vue-query": "^5.72.3",
+    "zod": "3.25.0-beta.20250516T005923"
   },
   "scripts": {
     "build": "unbuild",