@veloxts/client 0.6.79 → 0.6.81

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @veloxts/client
 
+## 0.6.81
+
+### Patch Changes
+
+- fix(client): update ProcedureCollection type inference for two-parameter interface
+
+## 0.6.80
+
+### Patch Changes
+
+- fix(router,client): preserve procedure type literals for query/mutation discrimination + lint fixes
+
 ## 0.6.79
 
 ### Patch Changes

package/dist/react/proxy-types.d.ts

@@ -323,15 +323,14 @@ export interface VeloxMutationOptions<TOutput, TInput, TContext = unknown> exten
  * Resolves a procedure to its appropriate hook interface
  * based on whether it's a query or mutation
  *
- * Note: The type check uses 'mutation' first because CompiledProcedure's `type`
- * property may be widened to 'query' | 'mutation' union. We check mutation
- * explicitly and default to query for everything else.
+ * With the TType generic parameter preserved through the procedure builder chain,
+ * we can now properly discriminate between query and mutation types.
+ * The ClientProcedure<TInput, TOutput, TType> captures the literal 'query' or 'mutation'
+ * type, enabling accurate type resolution.
  *
  * @internal
  */
-type VeloxProcedureHooks<TProcedure> = TProcedure extends ClientProcedure<infer TInput, infer TOutput> ? TProcedure extends {
-    readonly type: 'mutation';
-} ? VeloxMutationProcedure<TInput, TOutput> : VeloxQueryProcedure<TInput, TOutput> : never;
+type VeloxProcedureHooks<TProcedure> = TProcedure extends ClientProcedure<infer TInput, infer TOutput, infer TType> ? TType extends 'mutation' ? VeloxMutationProcedure<TInput, TOutput> : TType extends 'query' ? VeloxQueryProcedure<TInput, TOutput> : VeloxQueryProcedure<TInput, TOutput> : never;
 /**
  * Maps a procedures record to hook interfaces
  *

package/dist/react/types.d.ts

@@ -17,13 +17,13 @@ import type { ClientConfig, ClientFromRouter, InferProcedureInput, InferProcedur
  * @template TNamespace - The namespace key (e.g., 'users', 'posts')
  * @template TProcedureName - The procedure name (e.g., 'getUser', 'listUsers')
  */
-export type GetProcedure<TRouter, TNamespace extends keyof TRouter, TProcedureName extends keyof GetProceduresFromCollection<TRouter[TNamespace]>> = TRouter[TNamespace] extends ProcedureCollection<infer TProcedures> ? TProcedureName extends keyof TProcedures ? TProcedures[TProcedureName] : never : never;
+export type GetProcedure<TRouter, TNamespace extends keyof TRouter, TProcedureName extends keyof GetProceduresFromCollection<TRouter[TNamespace]>> = TRouter[TNamespace] extends ProcedureCollection<infer _TN, infer TProcedures> ? TProcedureName extends keyof TProcedures ? TProcedures[TProcedureName] : never : never;
 /**
  * Extracts the procedures record from a collection
  *
  * @template TCollection - The procedure collection type
  */
-export type GetProceduresFromCollection<TCollection> = TCollection extends ProcedureCollection ? TCollection['procedures'] : never;
+export type GetProceduresFromCollection<TCollection> = TCollection extends ProcedureCollection<string, infer TProcedures> ? TProcedures : never;
 /**
  * Options for useQuery hook
  *

package/dist/types.d.ts

@@ -19,12 +19,13 @@ export type ProcedureType = 'query' | 'mutation';
  *
  * @template TInput - The validated input type
  * @template TOutput - The handler output type
+ * @template TType - The procedure type literal ('query' or 'mutation')
  *
  * @see {@link https://github.com/veloxts/velox-ts-framework/velox | @veloxts/router CompiledProcedure}
  */
-export interface ClientProcedure<TInput = unknown, TOutput = unknown> {
+export interface ClientProcedure<TInput = unknown, TOutput = unknown, TType extends ProcedureType = ProcedureType> {
     /** Whether this is a query or mutation */
-    readonly type: ProcedureType;
+    readonly type: TType;
     /** The procedure handler function - uses `any` for ctx to enable contravariant matching with CompiledProcedure */
     readonly handler: (args: {
         input: TInput;
@@ -58,7 +59,7 @@ export interface ClientProcedure<TInput = unknown, TOutput = unknown> {
  *
  * NOTE: Uses `any` for variance compatibility with @veloxts/router's ProcedureRecord
  */
-export type ProcedureRecord = Record<string, ClientProcedure<any, any>>;
+export type ProcedureRecord = Record<string, ClientProcedure<any, any, any>>;
 /**
  * Procedure collection with namespace
  *
@@ -80,13 +81,19 @@ export interface ProcedureCollection<TNamespace extends string = string, TProced
  *
  * Works with both ClientProcedure and @veloxts/router's CompiledProcedure
  */
-export type InferProcedureInput<T> = T extends ClientProcedure<infer I, unknown> ? I : never;
+export type InferProcedureInput<T> = T extends ClientProcedure<infer I, unknown, ProcedureType> ? I : never;
 /**
  * Extracts the output type from a procedure
  *
  * Works with both ClientProcedure and @veloxts/router's CompiledProcedure
  */
-export type InferProcedureOutput<T> = T extends ClientProcedure<unknown, infer O> ? O : never;
+export type InferProcedureOutput<T> = T extends ClientProcedure<unknown, infer O, ProcedureType> ? O : never;
+/**
+ * Extracts the type (query/mutation) from a procedure
+ *
+ * Works with both ClientProcedure and @veloxts/router's CompiledProcedure
+ */
+export type InferProcedureType<T> = T extends ClientProcedure<unknown, unknown, infer TType> ? TType : never;
 /**
  * Builds a callable client interface from a single procedure collection
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@veloxts/client",
-  "version": "0.6.79",
+  "version": "0.6.81",
   "description": "Type-safe frontend API client for VeloxTS framework",
   "type": "module",
   "main": "dist/index.js",