@trackunit/react-graphql-hooks 1.7.24 → 1.7.27

package/index.cjs.js

@@ -3,29 +3,10 @@
 require('react/jsx-runtime');
 var i18nLibraryTranslation = require('@trackunit/i18n-library-translation');
 var sharedUtils = require('@trackunit/shared-utils');
-var ApolloClient = require('@apollo/client');
+var client = require('@apollo/client');
+var esToolkit = require('es-toolkit');
 var react = require('react');
 var reactComponents = require('@trackunit/react-components');
-var esToolkit = require('es-toolkit');
-
-function _interopNamespaceDefault(e) {
-  var n = Object.create(null);
-  if (e) {
-    Object.keys(e).forEach(function (k) {
-      if (k !== 'default') {
-        var d = Object.getOwnPropertyDescriptor(e, k);
-        Object.defineProperty(n, k, d.get ? d : {
-          enumerable: true,
-          get: function () { return e[k]; }
-        });
-      }
-    });
-  }
-  n.default = e;
-  return Object.freeze(n);
-}
-
-var ApolloClient__namespace = /*#__PURE__*/_interopNamespaceDefault(ApolloClient);
 
 var defaultTranslations = {
 	
@@ -117,14 +98,15 @@ const unionEdgesByNodeKey = (key, previousEdges, newEdges) => {
  * @param options The lazy query options including stableData and showLoadingDuringPolling flags
  * @returns {Array} A tuple with the execute function and query result with stable data behavior and optional polling loading state
  */
-const useLazyQuery = (document, options = {}) => {
-    const { stableData = true, showLoadingDuringPolling = true, ...apolloOptions } = options;
-    // Enable network status notifications when we want to show loading during polling
-    const apolloOptionsWithNotify = react.useMemo(() => ({
-        ...apolloOptions,
-        notifyOnNetworkStatusChange: showLoadingDuringPolling || apolloOptions.notifyOnNetworkStatusChange,
-    }), [apolloOptions, showLoadingDuringPolling]);
-    const [executeQuery, result] = ApolloClient__namespace.useLazyQuery(document, apolloOptionsWithNotify);
+const useLazyQuery = (document, options) => {
+    const [executeQuery, result] = client.useLazyQuery(document, {
+        ...esToolkit.omit(options ?? {}, ["notifyOnNetworkStatusChange", "stableData", "showLoadingDuringPolling"]),
+        notifyOnNetworkStatusChange: true,
+    });
+    const { stableData, showLoadingDuringPolling } = react.useMemo(() => ({
+        stableData: options?.stableData ?? true,
+        showLoadingDuringPolling: options?.showLoadingDuringPolling ?? true,
+    }), [options?.stableData, options?.showLoadingDuringPolling]);
     const enhancedResult = react.useMemo(() => {
         const baseResult = stableData
             ? {
@@ -134,15 +116,15 @@ const useLazyQuery = (document, options = {}) => {
             : result;
         // If showLoadingDuringPolling is enabled, check for polling network status
         if (showLoadingDuringPolling) {
-            const isPolling = result.networkStatus === ApolloClient__namespace.NetworkStatus.poll;
+            const isPolling = result.networkStatus === client.NetworkStatus.poll;
             return {
                 ...baseResult,
                 loading: baseResult.loading || isPolling,
             };
         }
         return baseResult;
-    }, [result, stableData, showLoadingDuringPolling]);
-    return [executeQuery, enhancedResult];
+    }, [result, showLoadingDuringPolling, stableData]);
+    return react.useMemo(() => [executeQuery, enhancedResult], [executeQuery, enhancedResult]);
 };
 
 /**
@@ -186,7 +168,7 @@ const useLazyQuery = (document, options = {}) => {
  * @param {PaginationQueryProps<TData, TVariables>} props - The properties for configuring the query. This includes the `updateQuery` function for merging new and existing data, and options for pagination such as `pageSize`. Also includes other lazy query hook options from Apollo Client.
  * @returns {*}  {PaginationQuery}
  */
-const usePaginationQuery = (document, { ...props }) => {
+const usePaginationQuery = (document, props) => {
     const [lastFetchedData, setLastFetchedData] = react.useState();
     const [resetTrigger, setResetTrigger] = react.useState(0);
     const [abortController, setAbortController] = react.useState(new AbortController());
@@ -232,7 +214,7 @@ const usePaginationQuery = (document, { ...props }) => {
         pollInterval: internalProps.pollInterval,
         notifyOnNetworkStatusChange: true, // Needed to update networkStatus
         onCompleted: completedData => {
-            if (networkStatus === ApolloClient__namespace.NetworkStatus.refetch) {
+            if (networkStatus === client.NetworkStatus.refetch) {
                 // trigger reset for refetchQueries for the provided document.
                 setResetTrigger(prev => prev + 1);
             }
@@ -409,27 +391,26 @@ const usePaginationQuery = (document, { ...props }) => {
  * @param options The query options including stableData and showLoadingDuringPolling flags
  * @returns {object} The query result with stable data behavior and optional polling loading state
  */
-const useQuery = (document, options = {}) => {
-    const { stableData = true, showLoadingDuringPolling = true, ...apolloOptions } = options;
-    // Enable network status notifications when we want to show loading during polling
-    const apolloOptionsWithNotify = react.useMemo(() => ({
-        ...apolloOptions,
-        notifyOnNetworkStatusChange: showLoadingDuringPolling || apolloOptions.notifyOnNetworkStatusChange,
-    }), [apolloOptions, showLoadingDuringPolling]);
-    const result = ApolloClient__namespace.useQuery(document, apolloOptionsWithNotify);
+const useQuery = (document, options) => {
+    const result = client.useQuery(document, {
+        ...esToolkit.omit(options ?? {}, ["notifyOnNetworkStatusChange", "stableData", "showLoadingDuringPolling"]),
+        notifyOnNetworkStatusChange: options?.notifyOnNetworkStatusChange ?? true,
+    });
+    const { stableData, showLoadingDuringPolling } = react.useMemo(() => ({
+        stableData: options?.stableData ?? true,
+        showLoadingDuringPolling: options?.showLoadingDuringPolling ?? true,
+    }), [options?.stableData, options?.showLoadingDuringPolling]);
     return react.useMemo(() => {
-        const baseResult = stableData
-            ? {
-                ...result,
-                data: result.data ?? result.previousData,
-            }
-            : result;
+        const baseResult = {
+            ...result,
+            data: stableData ? (result.data ?? result.previousData) : result.data,
+        };
         // If showLoadingDuringPolling is enabled, check for polling network status
         if (showLoadingDuringPolling) {
-            const isPolling = result.networkStatus === ApolloClient__namespace.NetworkStatus.poll;
+            const isPolling = result.networkStatus === client.NetworkStatus.poll;
             return {
                 ...baseResult,
-                loading: baseResult.loading || isPolling,
+                loading: result.loading || isPolling,
             };
         }
         return baseResult;

package/index.esm.js

@@ -1,10 +1,10 @@
 import 'react/jsx-runtime';
 import { registerTranslations } from '@trackunit/i18n-library-translation';
 import { truthy, objectKeys } from '@trackunit/shared-utils';
-import * as ApolloClient from '@apollo/client';
+import { useLazyQuery as useLazyQuery$1, NetworkStatus, useQuery as useQuery$1 } from '@apollo/client';
+import { omit, isEqual } from 'es-toolkit';
 import { useMemo, useState, useRef, useEffect, useCallback } from 'react';
 import { useRelayPagination, defaultPageSize } from '@trackunit/react-components';
-import { isEqual } from 'es-toolkit';
 
 var defaultTranslations = {
 	
@@ -96,14 +96,15 @@ const unionEdgesByNodeKey = (key, previousEdges, newEdges) => {
  * @param options The lazy query options including stableData and showLoadingDuringPolling flags
  * @returns {Array} A tuple with the execute function and query result with stable data behavior and optional polling loading state
  */
-const useLazyQuery = (document, options = {}) => {
-    const { stableData = true, showLoadingDuringPolling = true, ...apolloOptions } = options;
-    // Enable network status notifications when we want to show loading during polling
-    const apolloOptionsWithNotify = useMemo(() => ({
-        ...apolloOptions,
-        notifyOnNetworkStatusChange: showLoadingDuringPolling || apolloOptions.notifyOnNetworkStatusChange,
-    }), [apolloOptions, showLoadingDuringPolling]);
-    const [executeQuery, result] = ApolloClient.useLazyQuery(document, apolloOptionsWithNotify);
+const useLazyQuery = (document, options) => {
+    const [executeQuery, result] = useLazyQuery$1(document, {
+        ...omit(options ?? {}, ["notifyOnNetworkStatusChange", "stableData", "showLoadingDuringPolling"]),
+        notifyOnNetworkStatusChange: true,
+    });
+    const { stableData, showLoadingDuringPolling } = useMemo(() => ({
+        stableData: options?.stableData ?? true,
+        showLoadingDuringPolling: options?.showLoadingDuringPolling ?? true,
+    }), [options?.stableData, options?.showLoadingDuringPolling]);
     const enhancedResult = useMemo(() => {
         const baseResult = stableData
             ? {
@@ -113,15 +114,15 @@ const useLazyQuery = (document, options = {}) => {
             : result;
         // If showLoadingDuringPolling is enabled, check for polling network status
         if (showLoadingDuringPolling) {
-            const isPolling = result.networkStatus === ApolloClient.NetworkStatus.poll;
+            const isPolling = result.networkStatus === NetworkStatus.poll;
             return {
                 ...baseResult,
                 loading: baseResult.loading || isPolling,
             };
         }
         return baseResult;
-    }, [result, stableData, showLoadingDuringPolling]);
-    return [executeQuery, enhancedResult];
+    }, [result, showLoadingDuringPolling, stableData]);
+    return useMemo(() => [executeQuery, enhancedResult], [executeQuery, enhancedResult]);
 };
 
 /**
@@ -165,7 +166,7 @@ const useLazyQuery = (document, options = {}) => {
  * @param {PaginationQueryProps<TData, TVariables>} props - The properties for configuring the query. This includes the `updateQuery` function for merging new and existing data, and options for pagination such as `pageSize`. Also includes other lazy query hook options from Apollo Client.
  * @returns {*}  {PaginationQuery}
  */
-const usePaginationQuery = (document, { ...props }) => {
+const usePaginationQuery = (document, props) => {
     const [lastFetchedData, setLastFetchedData] = useState();
     const [resetTrigger, setResetTrigger] = useState(0);
     const [abortController, setAbortController] = useState(new AbortController());
@@ -211,7 +212,7 @@ const usePaginationQuery = (document, { ...props }) => {
         pollInterval: internalProps.pollInterval,
         notifyOnNetworkStatusChange: true, // Needed to update networkStatus
         onCompleted: completedData => {
-            if (networkStatus === ApolloClient.NetworkStatus.refetch) {
+            if (networkStatus === NetworkStatus.refetch) {
                 // trigger reset for refetchQueries for the provided document.
                 setResetTrigger(prev => prev + 1);
             }
@@ -388,27 +389,26 @@ const usePaginationQuery = (document, { ...props }) => {
  * @param options The query options including stableData and showLoadingDuringPolling flags
  * @returns {object} The query result with stable data behavior and optional polling loading state
  */
-const useQuery = (document, options = {}) => {
-    const { stableData = true, showLoadingDuringPolling = true, ...apolloOptions } = options;
-    // Enable network status notifications when we want to show loading during polling
-    const apolloOptionsWithNotify = useMemo(() => ({
-        ...apolloOptions,
-        notifyOnNetworkStatusChange: showLoadingDuringPolling || apolloOptions.notifyOnNetworkStatusChange,
-    }), [apolloOptions, showLoadingDuringPolling]);
-    const result = ApolloClient.useQuery(document, apolloOptionsWithNotify);
+const useQuery = (document, options) => {
+    const result = useQuery$1(document, {
+        ...omit(options ?? {}, ["notifyOnNetworkStatusChange", "stableData", "showLoadingDuringPolling"]),
+        notifyOnNetworkStatusChange: options?.notifyOnNetworkStatusChange ?? true,
+    });
+    const { stableData, showLoadingDuringPolling } = useMemo(() => ({
+        stableData: options?.stableData ?? true,
+        showLoadingDuringPolling: options?.showLoadingDuringPolling ?? true,
+    }), [options?.stableData, options?.showLoadingDuringPolling]);
     return useMemo(() => {
-        const baseResult = stableData
-            ? {
-                ...result,
-                data: result.data ?? result.previousData,
-            }
-            : result;
+        const baseResult = {
+            ...result,
+            data: stableData ? (result.data ?? result.previousData) : result.data,
+        };
         // If showLoadingDuringPolling is enabled, check for polling network status
         if (showLoadingDuringPolling) {
-            const isPolling = result.networkStatus === ApolloClient.NetworkStatus.poll;
+            const isPolling = result.networkStatus === NetworkStatus.poll;
             return {
                 ...baseResult,
-                loading: baseResult.loading || isPolling,
+                loading: result.loading || isPolling,
             };
         }
         return baseResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trackunit/react-graphql-hooks",
-  "version": "1.7.24",
+  "version": "1.7.27",
   "repository": "https://github.com/Trackunit/manager",
   "license": "SEE LICENSE IN LICENSE.txt",
   "engines": {
@@ -9,11 +9,11 @@
   "dependencies": {
     "@apollo/client": "3.13.8",
     "react": "19.0.0",
-    "@trackunit/i18n-library-translation": "1.7.18",
-    "@trackunit/shared-utils": "1.9.14",
-    "@trackunit/react-test-setup": "1.4.14",
+    "@trackunit/i18n-library-translation": "1.7.21",
+    "@trackunit/shared-utils": "1.9.17",
+    "@trackunit/react-test-setup": "1.4.17",
     "es-toolkit": "^1.39.10",
-    "@trackunit/react-components": "1.9.24"
+    "@trackunit/react-components": "1.9.27"
   },
   "module": "./index.esm.js",
   "main": "./index.cjs.js",

package/src/useLazyQuery.d.ts

@@ -1,6 +1,6 @@
-import * as ApolloClient from "@apollo/client";
-type TypedDocumentNode<TData, TVariables> = ApolloClient.TypedDocumentNode<TData, TVariables>;
-export interface LazyQueryProps<TData, TVariables extends ApolloClient.OperationVariables = ApolloClient.OperationVariables> extends ApolloClient.LazyQueryHookOptions<TData, TVariables> {
+import { LazyQueryExecFunction as ApolloLazyQueryExecFunction, LazyQueryHookOptions as ApolloLazyQueryHookOptions, LazyQueryResult as ApolloLazyQueryResult, OperationVariables as ApolloOperationVariables, TypedDocumentNode as ApolloTypedDocumentNode } from "@apollo/client";
+type TypedDocumentNode<TData, TVariables> = ApolloTypedDocumentNode<TData, TVariables>;
+export interface LazyQueryProps<TData, TVariables extends ApolloOperationVariables = ApolloOperationVariables> extends ApolloLazyQueryHookOptions<TData, TVariables> {
     /**
      * A boolean value that specifies whether to return stable data (data || previousData).
      * When true, the hook will return the current data if available, otherwise the previous data.
@@ -41,5 +41,5 @@ export interface LazyQueryProps<TData, TVariables extends ApolloClient.Operation
  * @param options The lazy query options including stableData and showLoadingDuringPolling flags
  * @returns {Array} A tuple with the execute function and query result with stable data behavior and optional polling loading state
  */
-export declare const useLazyQuery: <TData, TVariables extends ApolloClient.OperationVariables>(document: TypedDocumentNode<TData, TVariables>, options?: LazyQueryProps<TData, TVariables>) => [ApolloClient.LazyQueryExecFunction<TData, TVariables>, ApolloClient.LazyQueryResult<TData, TVariables>];
+export declare const useLazyQuery: <TData, TVariables extends ApolloOperationVariables = ApolloOperationVariables>(document: TypedDocumentNode<TData, TVariables>, options?: LazyQueryProps<NoInfer<TData>, NoInfer<TVariables>>) => [ApolloLazyQueryExecFunction<TData, TVariables>, ApolloLazyQueryResult<TData, TVariables>];
 export {};

package/src/usePaginationQuery.d.ts

@@ -1,4 +1,4 @@
-import * as ApolloClient from "@apollo/client";
+import { LazyQueryHookOptions as ApolloLazyQueryHookOptions, OperationVariables as ApolloOperationVariables, TypedDocumentNode as ApolloTypedDocumentNode } from "@apollo/client";
 import { RelayPageInfo, RelayTableSupport } from "@trackunit/react-components";
 /**
  * This type is used to return the data from the query, the pagination object and the last fetched data.
@@ -11,8 +11,8 @@ export type PaginationQuery<TData> = {
     previousData: TData | undefined;
     reset: () => void;
 };
-type TypedDocumentNode<TData, TVariables> = ApolloClient.TypedDocumentNode<TData, TVariables>;
-export interface PaginationQueryProps<TData, TVariables extends ApolloClient.OperationVariables = ApolloClient.OperationVariables> extends ApolloClient.LazyQueryHookOptions<TData, TVariables> {
+type TypedDocumentNode<TData, TVariables> = ApolloTypedDocumentNode<TData, TVariables>;
+export interface PaginationQueryProps<TData, TVariables extends ApolloOperationVariables = ApolloOperationVariables> extends ApolloLazyQueryHookOptions<TData, TVariables> {
     /**
      * A function that is used to update the query results with new data.
      *
@@ -76,5 +76,5 @@ export interface PaginationQueryProps<TData, TVariables extends ApolloClient.Ope
  * @param {PaginationQueryProps<TData, TVariables>} props - The properties for configuring the query. This includes the `updateQuery` function for merging new and existing data, and options for pagination such as `pageSize`. Also includes other lazy query hook options from Apollo Client.
  * @returns {*}  {PaginationQuery}
  */
-export declare const usePaginationQuery: <TData, TVariables extends ApolloClient.OperationVariables>(document: TypedDocumentNode<TData, TVariables>, { ...props }: PaginationQueryProps<TData, TVariables>) => PaginationQuery<TData>;
+export declare const usePaginationQuery: <TData, TVariables extends ApolloOperationVariables>(document: TypedDocumentNode<TData, TVariables>, props: PaginationQueryProps<TData, TVariables>) => PaginationQuery<TData>;
 export {};

package/src/usePaginationQuery.demo.d.ts

@@ -1,11 +1,11 @@
-import * as ApolloClient from "@apollo/client";
+import { OperationVariables, TypedDocumentNode } from "@apollo/client";
 import { PaginationQueryProps } from "./usePaginationQuery";
-export interface UsePaginationQueryDemoComponentProps<TData, TVariables extends ApolloClient.OperationVariables> extends PaginationQueryProps<TData, TVariables> {
-    document: ApolloClient.TypedDocumentNode<TData, TVariables>;
+export interface UsePaginationQueryDemoComponentProps<TData, TVariables extends OperationVariables> extends PaginationQueryProps<TData, TVariables> {
+    document: TypedDocumentNode<TData, TVariables>;
 }
 /**
  * The `usePaginationQuery` Hook provides pagination when fetching data
  *
  * It returns an object containing methods and values related to pagination.
  */
-export declare const UsePaginationQueryDemoComponent: <TData, TVariables extends ApolloClient.OperationVariables>({ document, variables, pageSize, updateQuery, }: UsePaginationQueryDemoComponentProps<TData, TVariables>) => import("react/jsx-runtime").JSX.Element;
+export declare const UsePaginationQueryDemoComponent: <TData, TVariables extends OperationVariables>({ document, variables, pageSize, updateQuery, }: UsePaginationQueryDemoComponentProps<TData, TVariables>) => import("react/jsx-runtime").JSX.Element;

package/src/useQuery.d.ts

@@ -1,6 +1,7 @@
-import * as ApolloClient from "@apollo/client";
-type TypedDocumentNode<TData, TVariables> = ApolloClient.TypedDocumentNode<TData, TVariables>;
-export interface QueryProps<TData, TVariables extends ApolloClient.OperationVariables = ApolloClient.OperationVariables> extends ApolloClient.QueryHookOptions<TData, TVariables> {
+import { OperationVariables as ApolloOperationVariables, QueryHookOptions as ApolloQueryHookOptions, QueryResult as ApolloQueryResult, TypedDocumentNode as ApolloTypedDocumentNode } from "@apollo/client";
+export type TypedDocumentNode<TData, TVariables> = ApolloTypedDocumentNode<TData, TVariables>;
+export type OperationVariables = ApolloOperationVariables;
+export interface QueryProps<TData, TVariables extends ApolloOperationVariables = ApolloOperationVariables> extends ApolloQueryHookOptions<TData, TVariables> {
     /**
      * A boolean value that specifies whether to return stable data (data || previousData).
      * When true, the hook will return the current data if available, otherwise the previous data.
@@ -43,5 +44,4 @@ export interface QueryProps<TData, TVariables extends ApolloClient.OperationVari
  * @param options The query options including stableData and showLoadingDuringPolling flags
  * @returns {object} The query result with stable data behavior and optional polling loading state
  */
-export declare const useQuery: <TData, TVariables extends ApolloClient.OperationVariables>(document: TypedDocumentNode<TData, TVariables>, options?: QueryProps<TData, TVariables>) => ApolloClient.QueryResult<TData, TVariables>;
-export {};
+export declare const useQuery: <TData, TVariables extends ApolloOperationVariables = ApolloOperationVariables>(document: TypedDocumentNode<TData, TVariables>, options?: QueryProps<NoInfer<TData>, NoInfer<TVariables>>) => ApolloQueryResult<TData, TVariables>;