@vladimirdev635/gql-client-vue 0.0.110 → 0.0.112

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vladimirdev635/gql-client-vue",
-    "version": "0.0.110",
+    "version": "0.0.112",
     "type": "module",
     "main": "./index.js",
     "types": "./index.d.ts",

package/useOperation.d.ts

@@ -1,4 +1,4 @@
-import { ShallowRef, type Ref } from 'vue';
+import { MaybeRefOrGetter, ShallowRef } from 'vue';
 import type { ExecuteResult, IExecutor, OperationResult, OperationVariables, RequestContext, SyncOperation } from './types.js';
 export interface OperationLoadingState {
     state: 'loading';
@@ -12,4 +12,4 @@ export interface OperationFailureState {
 }
 export type OperationState<TResult> = OperationLoadingState | OperationSuccessState<TResult> | OperationFailureState;
 export type UseOperationHookReturnType<TResult> = ShallowRef<OperationState<TResult>>;
-export declare function useOperation<TExecutor extends IExecutor<TRequestContext>, TRequestContext extends RequestContext, TOperation extends SyncOperation<unknown, unknown>>(executor: TExecutor, operation: TOperation, variables: OperationVariables<TOperation> | Ref<OperationVariables<TOperation>>, requestContext: TRequestContext | Ref<TRequestContext>): UseOperationHookReturnType<OperationResult<TOperation>>;
+export declare function useOperation<TExecutor extends IExecutor<TRequestContext>, TRequestContext extends RequestContext, TOperation extends SyncOperation<unknown, unknown>>(executor: TExecutor, operation: TOperation, variables: MaybeRefOrGetter<OperationVariables<TOperation>>, requestContext: MaybeRefOrGetter<TRequestContext>): UseOperationHookReturnType<OperationResult<TOperation>>;

package/{useOperation.jsx → useOperation.js}

@@ -1,14 +1,10 @@
-import { isRef, onUnmounted, shallowRef, watch, } from 'vue';
+import { onUnmounted, shallowRef, toValue, watch, } from 'vue';
 import { loadingState } from './loading-state.js';
 export function useOperation(executor, operation, variables, requestContext) {
     const state = shallowRef(loadingState);
-    watch([
-        () => executor,
-        () => operation,
-        () => (isRef(variables) ? variables.value : variables),
-        () => isRef(requestContext) ? requestContext.value : requestContext,
-    ], ([exec, op, vars, ctx]) => {
-        exec.executeSync(op, vars, ctx)
+    watch([() => toValue(variables), () => toValue(requestContext)], ([vars, ctx]) => {
+        executor
+            .executeSync(operation, vars, ctx)
             .then((result) => {
             state.value = { state: 'success', ...result };
         })

package/useSubscription.d.ts

@@ -1,5 +1,5 @@
-import { type Ref, type ShallowRef } from 'vue';
+import { MaybeRefOrGetter, type ShallowRef } from 'vue';
 import type { IExecutor, OperationResult, OperationVariables, RequestContext, SubOpAsyncIterable, SubscriptionOperation } from './types.js';
 import { type OperationState } from './useOperation.js';
 export type UseSubscriptionHookReturnType<TResult> = ShallowRef<OperationState<SubOpAsyncIterable<TResult>>>;
-export declare function useSubscription<TExecutor extends IExecutor<TRequestContext>, TRequestContext extends RequestContext, TOperation extends SubscriptionOperation<unknown, unknown>>(executor: TExecutor, operation: TOperation, variables: OperationVariables<TOperation> | Ref<OperationVariables<TOperation>>, requestContext: TRequestContext | Ref<TRequestContext>): UseSubscriptionHookReturnType<OperationResult<TOperation>>;
+export declare function useSubscription<TExecutor extends IExecutor<TRequestContext>, TRequestContext extends RequestContext, TOperation extends SubscriptionOperation<unknown, unknown>>(executor: TExecutor, operation: TOperation, variables: MaybeRefOrGetter<OperationVariables<TOperation>>, requestContext: MaybeRefOrGetter<TRequestContext>): UseSubscriptionHookReturnType<OperationResult<TOperation>>;

package/{useSubscription.jsx → useSubscription.js}

@@ -1,13 +1,8 @@
-import { isRef, onUnmounted, shallowRef, watch, } from 'vue';
+import { onUnmounted, shallowRef, toValue, watch, } from 'vue';
 import { loadingState } from './loading-state.js';
 export function useSubscription(executor, operation, variables, requestContext) {
     const state = shallowRef(loadingState);
-    watch([
-        () => executor,
-        () => operation,
-        () => (isRef(variables) ? variables.value : variables),
-        () => isRef(requestContext) ? requestContext.value : requestContext,
-    ], ([exec, op, vars, ctx], _oldValues, onCleanup) => {
+    watch([() => toValue(variables), () => toValue(requestContext)], ([vars, ctx], _, onCleanup) => {
         const controller = new AbortController();
         onCleanup(() => {
             if (state.value.state === 'success') {
@@ -18,7 +13,8 @@ export function useSubscription(executor, operation, variables, requestContext)
             }
             state.value = loadingState;
         });
-        exec.executeSubscription(op, vars, ctx, controller)
+        executor
+            .executeSubscription(operation, vars, ctx, controller)
             .then((result) => {
             if (controller.signal.aborted)
                 return;