@openapi-qraft/react 1.12.1-beta.0 → 1.13.0-beta.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @openapi-qraft/react
 
+## 1.13.0-beta.0
+
+### Minor Changes
+
+- 6d35890: Improve `userQuery()` to support calling without `{}` as the first argument if all parameters are optional or no parameters are required.
+- 39a159c: Improve `useMutation` to support calling `mutate()` or `mutateAsync()` without arguments if body or parameters are optional or `undefined`.
+
+## 1.12.1
+
 ## 1.12.1-beta.0
 
 ## 1.12.0

package/dist/types/lib/AreAllOptional.d.ts

@@ -0,0 +1,4 @@
+export type AreAllOptional<T> = NonNullable<T> extends never ? true : {
+    [K in keyof T]-?: undefined extends T[K] ? never : K;
+}[keyof T] extends never ? true : false;
+//# sourceMappingURL=AreAllOptional.d.ts.map

package/dist/types/lib/AreAllOptional.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"AreAllOptional.d.ts","sourceRoot":"","sources":["../../../src/lib/AreAllOptional.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,CAAC,CAAC,IAC1B,WAAW,CAAC,CAAC,CAAC,SAAS,KAAK,GACxB,IAAI,GACJ;KACK,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,GAAG,SAAS,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,GAAG,CAAC;CACrD,CAAC,MAAM,CAAC,CAAC,SAAS,KAAK,GACxB,IAAI,GACJ,KAAK,CAAC"}

package/dist/types/service-operation/ServiceOperationUseMutation.d.ts

@@ -1,17 +1,31 @@
 import type { DefaultError, QueryClient } from '@tanstack/query-core';
 import type { UseMutationOptions, UseMutationResult } from '@tanstack/react-query';
+import type { AreAllOptional } from '../lib/AreAllOptional.js';
 import type { ServiceOperationMutationKey } from './ServiceOperationKey.js';
 export interface ServiceOperationUseMutation<TSchema extends {
     url: string;
     method: string;
 }, TBody, TData, TParams, TError = DefaultError> {
     getMutationKey<TMutationKeyParams extends TParams | undefined = undefined>(parameters?: TMutationKeyParams): ServiceOperationMutationKey<TSchema, TMutationKeyParams>;
-    useMutation<TVariables extends MutationVariables<TBody, TParams>, TContext = unknown>(parameters?: undefined, options?: Omit<UseMutationOptions<TData, TError, TVariables, TContext>, 'mutationKey'> & {
-        mutationKey?: ServiceOperationMutationKey<TSchema, TParams>;
-    }, queryClient?: QueryClient): UseMutationResult<TData, TError | Error, TVariables, TContext>;
-    useMutation<TVariables extends TBody, TContext = unknown>(parameters: TParams, options?: Omit<UseMutationOptions<TData, TError, TVariables, TContext>, 'mutationKey'>, queryClient?: QueryClient): UseMutationResult<TData, TError | Error, TVariables, TContext>;
+    useMutation<TVariables extends MutationVariables<TBody, TParams>, TContext = unknown>(parameters?: undefined, options?: ServiceOperationUseMutationOptions<TSchema, TData, TParams, TVariables, TError, TContext>, queryClient?: QueryClient): UseMutationResult<TData, TError | Error, TVariables, TContext>;
+    useMutation<TVariables extends TBody, TContext = unknown>(parameters: AreAllOptional<TParams> extends true ? TParams | void : TParams, options?: ServiceOperationUseMutationOptions<TSchema, TData, TParams, TVariables, TError, TContext>, queryClient?: QueryClient): UseMutationResult<TData, TError | Error, AreAllOptional<TVariables> extends true ? TVariables | void : TVariables, TContext>;
 }
-export type MutationVariables<TBody, TParams> = {
+export type MutationVariables<TBody, TParams> = NonNullable<TBody> extends never ? NonNullable<TParams> extends never ? void : AreAllOptional<TParams> extends true ? TParams | void : TParams : NonNullable<TParams> extends never ? AreAllOptional<TBody> extends true ? {
+    body?: TBody;
+} | void : {
     body: TBody;
-} & (NonNullable<TParams> extends never ? {} : TParams);
+} : AreAllOptional<TBody> extends true ? AreAllOptional<TParams> extends true ? ({
+    body?: TBody;
+} & TParams) | void : {
+    body?: TBody;
+} & TParams : {
+    body: TBody;
+} & TParams;
+type ServiceOperationUseMutationOptions<TSchema extends {
+    url: string;
+    method: string;
+}, TData, TParams, TVariables, TError, TContext = unknown> = Omit<UseMutationOptions<TData, TError, TVariables, TContext>, 'mutationKey'> & {
+    mutationKey?: ServiceOperationMutationKey<TSchema, TParams>;
+};
+export {};
 //# sourceMappingURL=ServiceOperationUseMutation.d.ts.map

package/dist/types/service-operation/ServiceOperationUseMutation.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceOperationUseMutation.d.ts","sourceRoot":"","sources":["../../../src/service-operation/ServiceOperationUseMutation.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,KAAK,EACV,kBAAkB,EAClB,iBAAiB,EAClB,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,0BAA0B,CAAC;AAE5E,MAAM,WAAW,2BAA2B,CAC1C,OAAO,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC/C,KAAK,EACL,KAAK,EACL,OAAO,EACP,MAAM,GAAG,YAAY;IAErB,cAAc,CAAC,kBAAkB,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EACvE,UAAU,CAAC,EAAE,kBAAkB,GAC9B,2BAA2B,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;IAE5D,WAAW,CACT,UAAU,SAAS,iBAAiB,CAAC,KAAK,EAAE,OAAO,CAAC,EACpD,QAAQ,GAAG,OAAO,EAElB,UAAU,CAAC,EAAE,SAAS,EACtB,OAAO,CAAC,EAAE,IAAI,CACZ,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,EACvD,aAAa,CACd,GAAG;QACF,WAAW,CAAC,EAAE,2BAA2B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;KAC7D,EACD,WAAW,CAAC,EAAE,WAAW,GACxB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;IAElE,WAAW,CAAC,UAAU,SAAS,KAAK,EAAE,QAAQ,GAAG,OAAO,EACtD,UAAU,EAAE,OAAO,EACnB,OAAO,CAAC,EAAE,IAAI,CACZ,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,CAAC,EACvD,aAAa,CACd,EACD,WAAW,CAAC,EAAE,WAAW,GACxB,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,EAAE,UAAU,EAAE,QAAQ,CAAC,CAAC;CACnE;AAED,MAAM,MAAM,iBAAiB,CAAC,KAAK,EAAE,OAAO,IAAI;IAC9C,IAAI,EAAE,KAAK,CAAC;CACb,GAAG,CAAC,WAAW,CAAC,OAAO,CAAC,SAAS,KAAK,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC"}
+{"version":3,"file":"ServiceOperationUseMutation.d.ts","sourceRoot":"","sources":["../../../src/service-operation/ServiceOperationUseMutation.ts"],"names":[],"mappings":"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"}

package/dist/types/service-operation/ServiceOperationUseQuery.d.ts

@@ -1,12 +1,13 @@
 import type { DefaultError, QueryClient } from '@tanstack/query-core';
 import type { DefinedInitialDataOptions, DefinedUseQueryResult, UndefinedInitialDataOptions, UseQueryResult } from '@tanstack/react-query';
+import { AreAllOptional } from '../lib/AreAllOptional.js';
 import type { ServiceOperationQueryKey } from './ServiceOperationKey.js';
 export interface ServiceOperationUseQuery<TSchema extends {
     url: string;
     method: string;
 }, TQueryFnData, TParams = {}, TError = DefaultError> {
     getQueryKey<QueryKeyParams extends TParams | undefined = undefined>(parameters?: QueryKeyParams): ServiceOperationQueryKey<TSchema, QueryKeyParams>;
-    useQuery<TData = TQueryFnData>(parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>, options?: Omit<UndefinedInitialDataOptions<TQueryFnData, TError, TData, ServiceOperationQueryKey<TSchema, TParams>>, 'queryKey'>, queryClient?: QueryClient): UseQueryResult<TData, TError | Error>;
-    useQuery<TData = TQueryFnData>(parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>, options: Omit<DefinedInitialDataOptions<TQueryFnData, TError, TData, ServiceOperationQueryKey<TSchema, TParams>>, 'queryKey'>, queryClient?: QueryClient): DefinedUseQueryResult<TData, TError | Error>;
+    useQuery<TData = TQueryFnData>(parameters: ServiceOperationQueryKey<TSchema, TParams> | (AreAllOptional<TParams> extends true ? TParams | void : TParams), options?: Omit<UndefinedInitialDataOptions<TQueryFnData, TError, TData, ServiceOperationQueryKey<TSchema, TParams>>, 'queryKey'>, queryClient?: QueryClient): UseQueryResult<TData, TError | Error>;
+    useQuery<TData = TQueryFnData>(parameters: ServiceOperationQueryKey<TSchema, TParams> | (AreAllOptional<TParams> extends true ? TParams | void : TParams), options: Omit<DefinedInitialDataOptions<TQueryFnData, TError, TData, ServiceOperationQueryKey<TSchema, TParams>>, 'queryKey'>, queryClient?: QueryClient): DefinedUseQueryResult<TData, TError | Error>;
 }
 //# sourceMappingURL=ServiceOperationUseQuery.d.ts.map

package/dist/types/service-operation/ServiceOperationUseQuery.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServiceOperationUseQuery.d.ts","sourceRoot":"","sources":["../../../src/service-operation/ServiceOperationUseQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,EACrB,2BAA2B,EAC3B,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEzE,MAAM,WAAW,wBAAwB,CACvC,OAAO,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC/C,YAAY,EACZ,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,YAAY;IAErB,WAAW,CAAC,cAAc,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EAChE,UAAU,CAAC,EAAE,cAAc,GAC1B,wBAAwB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAErD,QAAQ,CAAC,KAAK,GAAG,YAAY,EAC3B,UAAU,EAAE,OAAO,GAAG,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,EAChE,OAAO,CAAC,EAAE,IAAI,CACZ,2BAA2B,CACzB,YAAY,EACZ,MAAM,EACN,KAAK,EACL,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAC3C,EACD,UAAU,CACX,EACD,WAAW,CAAC,EAAE,WAAW,GACxB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;IAEzC,QAAQ,CAAC,KAAK,GAAG,YAAY,EAC3B,UAAU,EAAE,OAAO,GAAG,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,EAChE,OAAO,EAAE,IAAI,CACX,yBAAyB,CACvB,YAAY,EACZ,MAAM,EACN,KAAK,EACL,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAC3C,EACD,UAAU,CACX,EACD,WAAW,CAAC,EAAE,WAAW,GACxB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;CACjD"}
+{"version":3,"file":"ServiceOperationUseQuery.d.ts","sourceRoot":"","sources":["../../../src/service-operation/ServiceOperationUseQuery.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACtE,OAAO,KAAK,EACV,yBAAyB,EACzB,qBAAqB,EACrB,2BAA2B,EAC3B,cAAc,EACf,MAAM,uBAAuB,CAAC;AAE/B,OAAO,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAC1D,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,0BAA0B,CAAC;AAEzE,MAAM,WAAW,wBAAwB,CACvC,OAAO,SAAS;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,EAC/C,YAAY,EACZ,OAAO,GAAG,EAAE,EACZ,MAAM,GAAG,YAAY;IAErB,WAAW,CAAC,cAAc,SAAS,OAAO,GAAG,SAAS,GAAG,SAAS,EAChE,UAAU,CAAC,EAAE,cAAc,GAC1B,wBAAwB,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;IAErD,QAAQ,CAAC,KAAK,GAAG,YAAY,EAC3B,UAAU,EACN,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,GAC1C,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,EACrE,OAAO,CAAC,EAAE,IAAI,CACZ,2BAA2B,CACzB,YAAY,EACZ,MAAM,EACN,KAAK,EACL,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAC3C,EACD,UAAU,CACX,EACD,WAAW,CAAC,EAAE,WAAW,GACxB,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;IAEzC,QAAQ,CAAC,KAAK,GAAG,YAAY,EAC3B,UAAU,EACN,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,GAC1C,CAAC,cAAc,CAAC,OAAO,CAAC,SAAS,IAAI,GAAG,OAAO,GAAG,IAAI,GAAG,OAAO,CAAC,EACrE,OAAO,EAAE,IAAI,CACX,yBAAyB,CACvB,YAAY,EACZ,MAAM,EACN,KAAK,EACL,wBAAwB,CAAC,OAAO,EAAE,OAAO,CAAC,CAC3C,EACD,UAAU,CACX,EACD,WAAW,CAAC,EAAE,WAAW,GACxB,qBAAqB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC;CACjD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openapi-qraft/react",
-  "version": "1.12.1-beta.0",
+  "version": "1.13.0-beta.0",
   "description": "API client for React, providing type-safe requests and dynamic Tanstack Query React Hooks via a modular, Proxy-based architecture.",
   "scripts": {
     "build": "NODE_ENV=production rollup --config rollup.config.mjs && tsc --project tsconfig.build.json --emitDeclarationOnly",
@@ -15,9 +15,9 @@
   },
   "sideEffects": false,
   "devDependencies": {
-    "@openapi-qraft/cli": "1.12.1-beta.0",
+    "@openapi-qraft/cli": "1.13.0-beta.0",
     "@openapi-qraft/eslint-config": "1.0.0",
-    "@openapi-qraft/openapi-typescript-plugin": "^1.0.6-beta.0",
+    "@openapi-qraft/openapi-typescript-plugin": "^1.0.7-beta.0",
     "@openapi-qraft/rollup-config": "1.0.0",
     "@openapi-qraft/test-fixtures": "1.0.0",
     "@tanstack/react-query": "^5.17.3",

package/src/lib/AreAllOptional.ts

@@ -0,0 +1,8 @@
+export type AreAllOptional<T> =
+  NonNullable<T> extends never
+    ? true
+    : {
+          [K in keyof T]-?: undefined extends T[K] ? never : K;
+        }[keyof T] extends never
+      ? true
+      : false;

package/src/service-operation/ServiceOperationUseMutation.ts

@@ -4,6 +4,7 @@ import type {
   UseMutationResult,
 } from '@tanstack/react-query';
 
+import type { AreAllOptional } from '../lib/AreAllOptional.js';
 import type { ServiceOperationMutationKey } from './ServiceOperationKey.js';
 
 export interface ServiceOperationUseMutation<
@@ -22,25 +23,65 @@ export interface ServiceOperationUseMutation<
     TContext = unknown,
   >(
     parameters?: undefined,
-    options?: Omit<
-      UseMutationOptions<TData, TError, TVariables, TContext>,
-      'mutationKey'
-    > & {
-      mutationKey?: ServiceOperationMutationKey<TSchema, TParams>;
-    },
+    options?: ServiceOperationUseMutationOptions<
+      TSchema,
+      TData,
+      TParams,
+      TVariables,
+      TError,
+      TContext
+    >,
     queryClient?: QueryClient
   ): UseMutationResult<TData, TError | Error, TVariables, TContext>;
 
   useMutation<TVariables extends TBody, TContext = unknown>(
-    parameters: TParams,
-    options?: Omit<
-      UseMutationOptions<TData, TError, TVariables, TContext>,
-      'mutationKey'
+    parameters: AreAllOptional<TParams> extends true ? TParams | void : TParams,
+    options?: ServiceOperationUseMutationOptions<
+      TSchema,
+      TData,
+      TParams,
+      TVariables,
+      TError,
+      TContext
     >,
     queryClient?: QueryClient
-  ): UseMutationResult<TData, TError | Error, TVariables, TContext>;
+  ): UseMutationResult<
+    TData,
+    TError | Error,
+    AreAllOptional<TVariables> extends true ? TVariables | void : TVariables,
+    TContext
+  >;
 }
 
-export type MutationVariables<TBody, TParams> = {
-  body: TBody;
-} & (NonNullable<TParams> extends never ? {} : TParams);
+export type MutationVariables<TBody, TParams> =
+  NonNullable<TBody> extends never
+    ? NonNullable<TParams> extends never
+      ? void
+      : AreAllOptional<TParams> extends true
+        ? TParams | void
+        : TParams
+    : NonNullable<TParams> extends never
+      ? AreAllOptional<TBody> extends true
+        ? { body?: TBody } | void
+        : { body: TBody }
+      : AreAllOptional<TBody> extends true
+        ? AreAllOptional<TParams> extends true
+          ? ({ body?: TBody } & TParams) | void
+          : { body?: TBody } & TParams
+        : {
+            body: TBody;
+          } & TParams;
+
+type ServiceOperationUseMutationOptions<
+  TSchema extends { url: string; method: string },
+  TData,
+  TParams,
+  TVariables,
+  TError,
+  TContext = unknown,
+> = Omit<
+  UseMutationOptions<TData, TError, TVariables, TContext>,
+  'mutationKey'
+> & {
+  mutationKey?: ServiceOperationMutationKey<TSchema, TParams>;
+};

package/src/service-operation/ServiceOperationUseQuery.ts

@@ -6,6 +6,7 @@ import type {
   UseQueryResult,
 } from '@tanstack/react-query';
 
+import { AreAllOptional } from '../lib/AreAllOptional.js';
 import type { ServiceOperationQueryKey } from './ServiceOperationKey.js';
 
 export interface ServiceOperationUseQuery<
@@ -19,7 +20,9 @@ export interface ServiceOperationUseQuery<
   ): ServiceOperationQueryKey<TSchema, QueryKeyParams>;
 
   useQuery<TData = TQueryFnData>(
-    parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
+    parameters:
+      | ServiceOperationQueryKey<TSchema, TParams>
+      | (AreAllOptional<TParams> extends true ? TParams | void : TParams),
     options?: Omit<
       UndefinedInitialDataOptions<
         TQueryFnData,
@@ -33,7 +36,9 @@ export interface ServiceOperationUseQuery<
   ): UseQueryResult<TData, TError | Error>;
 
   useQuery<TData = TQueryFnData>(
-    parameters: TParams | ServiceOperationQueryKey<TSchema, TParams>,
+    parameters:
+      | ServiceOperationQueryKey<TSchema, TParams>
+      | (AreAllOptional<TParams> extends true ? TParams | void : TParams),
     options: Omit<
       DefinedInitialDataOptions<
         TQueryFnData,