naystack 1.5.41 → 1.6.0

package/dist/graphql/client.cjs.js

@@ -118,41 +118,42 @@ var tokenContext = (token) => {
 function useAuthQuery(query, variables) {
   const token = (0, import_client2.useToken)();
   const [fetch, result] = (0, import_client.useLazyQuery)(query);
-  const [calledVars, setCalledVars] = (0, import_react.useState)();
+  const prevVarsRef = (0, import_react.useRef)(null);
   (0, import_react.useEffect)(() => {
-    if (token && variables && calledVars !== JSON.stringify(variables)) {
-      setCalledVars(JSON.stringify(variables));
+    const serialized = JSON.stringify(variables);
+    if (token && variables && prevVarsRef.current !== serialized) {
+      prevVarsRef.current = serialized;
       void fetch({
         // @ts-expect-error -- to allow dynamic props
-        variables: { input },
+        variables: { input: variables },
         context: tokenContext(token),
         fetchPolicy: "no-cache"
       });
     }
-  }, [fetch, token, variables, calledVars]);
+  }, [fetch, token, variables]);
   const reFetch = (0, import_react.useCallback)(
-    (input2) => fetch({
+    (input) => fetch({
       // @ts-expect-error -- to allow dynamic props
-      variables: { input: input2 },
+      variables: { input },
       context: tokenContext(token),
       fetchPolicy: "no-cache"
     }),
     [fetch, token]
   );
-  return [reFetch, result];
+  return [reFetch, { ...result, hasAuth: !!token }];
 }
 function useAuthMutation(mutation, options) {
   const token = (0, import_client2.useToken)();
   const [mutate, result] = (0, import_client.useMutation)(mutation, options);
   const method = (0, import_react.useCallback)(
-    (input2) => mutate({
+    (input) => mutate({
       // @ts-expect-error -- to allow dynamic props
-      variables: { input: input2 },
+      variables: { input },
       context: tokenContext(token)
     }),
     [token]
   );
-  return [method, result];
+  return [method, { ...result, hasAuth: !!token }];
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/graphql/client.d.mts

@@ -1,5 +1,6 @@
+import * as graphql from 'graphql';
 import * as _apollo_client from '@apollo/client';
-import { InMemoryCacheConfig, OperationVariables, MutationHookOptions } from '@apollo/client';
+import { InMemoryCacheConfig, OperationVariables, ApolloClient, MutationHookOptions } from '@apollo/client';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import React__default, { PropsWithChildren } from 'react';
 
@@ -58,7 +59,31 @@ declare const tokenContext: (token?: string | null) => {
  *
  * @category GraphQL
  */
-declare function useAuthQuery<T, V extends OperationVariables>(query: TypedDocumentNode<T, V>, variables?: V["input"]): readonly [(input?: V["input"]) => Promise<_apollo_client.QueryResult<T, V>>, _apollo_client.QueryResult<T, V>];
+declare function useAuthQuery<T, V extends OperationVariables>(query: TypedDocumentNode<T, V>, variables?: V["input"]): readonly [(input?: V["input"]) => Promise<_apollo_client.QueryResult<T, V>>, {
+    readonly hasAuth: false;
+    readonly client: ApolloClient<any>;
+    readonly observable: _apollo_client.ObservableQuery<T, V>;
+    readonly data: T | undefined;
+    readonly previousData?: T | undefined;
+    readonly error?: _apollo_client.ApolloError;
+    readonly errors?: ReadonlyArray<graphql.GraphQLFormattedError>;
+    readonly loading: boolean;
+    readonly networkStatus: _apollo_client.NetworkStatus;
+    readonly called: boolean;
+    readonly startPolling: (pollInterval: number) => void;
+    readonly stopPolling: () => void;
+    readonly subscribeToMore: _apollo_client.SubscribeToMoreFunction<T, V>;
+    readonly updateQuery: (mapFn: _apollo_client.UpdateQueryMapFn<T, V>) => void;
+    readonly refetch: (variables?: Partial<V> | undefined) => Promise<_apollo_client.ApolloQueryResult<T>>;
+    readonly reobserve: (newOptions?: Partial<_apollo_client.WatchQueryOptions<V, T>> | undefined, newNetworkStatus?: _apollo_client.NetworkStatus) => Promise<_apollo_client.ApolloQueryResult<T>>;
+    readonly variables: V | undefined;
+    readonly fetchMore: <TFetchData = T, TFetchVars extends OperationVariables = V>(fetchMoreOptions: _apollo_client.FetchMoreQueryOptions<TFetchVars, TFetchData> & {
+        updateQuery?: ((previousQueryResult: _apollo_client.Unmasked<T>, options: {
+            fetchMoreResult: _apollo_client.Unmasked<TFetchData>;
+            variables: TFetchVars;
+        }) => _apollo_client.Unmasked<T>) | undefined;
+    }) => Promise<_apollo_client.ApolloQueryResult<TFetchData>>;
+}];
 /**
  * Hook to run a GraphQL mutation with the current user's token. Returns a function you call with the mutation input.
  *
@@ -94,6 +119,14 @@ declare function useAuthQuery<T, V extends OperationVariables>(query: TypedDocum
  *
  * @category GraphQL
  */
-declare function useAuthMutation<T, V extends OperationVariables>(mutation: TypedDocumentNode<T, V>, options?: MutationHookOptions<T, V>): readonly [(input?: V["input"]) => Promise<_apollo_client.FetchResult<T>>, _apollo_client.MutationResult<T>];
+declare function useAuthMutation<T, V extends OperationVariables>(mutation: TypedDocumentNode<T, V>, options?: MutationHookOptions<T, V>): readonly [(input?: V["input"]) => Promise<_apollo_client.FetchResult<T>>, {
+    readonly hasAuth: false;
+    readonly data?: T | null | undefined;
+    readonly error?: _apollo_client.ApolloError;
+    readonly loading: boolean;
+    readonly called: boolean;
+    readonly client: ApolloClient<object>;
+    readonly reset: () => void;
+}];
 
 export { ApolloWrapper, tokenContext, useAuthMutation, useAuthQuery };

package/dist/graphql/client.d.ts

@@ -1,5 +1,6 @@
+import * as graphql from 'graphql';
 import * as _apollo_client from '@apollo/client';
-import { InMemoryCacheConfig, OperationVariables, MutationHookOptions } from '@apollo/client';
+import { InMemoryCacheConfig, OperationVariables, ApolloClient, MutationHookOptions } from '@apollo/client';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import React__default, { PropsWithChildren } from 'react';
 
@@ -58,7 +59,31 @@ declare const tokenContext: (token?: string | null) => {
  *
  * @category GraphQL
  */
-declare function useAuthQuery<T, V extends OperationVariables>(query: TypedDocumentNode<T, V>, variables?: V["input"]): readonly [(input?: V["input"]) => Promise<_apollo_client.QueryResult<T, V>>, _apollo_client.QueryResult<T, V>];
+declare function useAuthQuery<T, V extends OperationVariables>(query: TypedDocumentNode<T, V>, variables?: V["input"]): readonly [(input?: V["input"]) => Promise<_apollo_client.QueryResult<T, V>>, {
+    readonly hasAuth: false;
+    readonly client: ApolloClient<any>;
+    readonly observable: _apollo_client.ObservableQuery<T, V>;
+    readonly data: T | undefined;
+    readonly previousData?: T | undefined;
+    readonly error?: _apollo_client.ApolloError;
+    readonly errors?: ReadonlyArray<graphql.GraphQLFormattedError>;
+    readonly loading: boolean;
+    readonly networkStatus: _apollo_client.NetworkStatus;
+    readonly called: boolean;
+    readonly startPolling: (pollInterval: number) => void;
+    readonly stopPolling: () => void;
+    readonly subscribeToMore: _apollo_client.SubscribeToMoreFunction<T, V>;
+    readonly updateQuery: (mapFn: _apollo_client.UpdateQueryMapFn<T, V>) => void;
+    readonly refetch: (variables?: Partial<V> | undefined) => Promise<_apollo_client.ApolloQueryResult<T>>;
+    readonly reobserve: (newOptions?: Partial<_apollo_client.WatchQueryOptions<V, T>> | undefined, newNetworkStatus?: _apollo_client.NetworkStatus) => Promise<_apollo_client.ApolloQueryResult<T>>;
+    readonly variables: V | undefined;
+    readonly fetchMore: <TFetchData = T, TFetchVars extends OperationVariables = V>(fetchMoreOptions: _apollo_client.FetchMoreQueryOptions<TFetchVars, TFetchData> & {
+        updateQuery?: ((previousQueryResult: _apollo_client.Unmasked<T>, options: {
+            fetchMoreResult: _apollo_client.Unmasked<TFetchData>;
+            variables: TFetchVars;
+        }) => _apollo_client.Unmasked<T>) | undefined;
+    }) => Promise<_apollo_client.ApolloQueryResult<TFetchData>>;
+}];
 /**
  * Hook to run a GraphQL mutation with the current user's token. Returns a function you call with the mutation input.
  *
@@ -94,6 +119,14 @@ declare function useAuthQuery<T, V extends OperationVariables>(query: TypedDocum
  *
  * @category GraphQL
  */
-declare function useAuthMutation<T, V extends OperationVariables>(mutation: TypedDocumentNode<T, V>, options?: MutationHookOptions<T, V>): readonly [(input?: V["input"]) => Promise<_apollo_client.FetchResult<T>>, _apollo_client.MutationResult<T>];
+declare function useAuthMutation<T, V extends OperationVariables>(mutation: TypedDocumentNode<T, V>, options?: MutationHookOptions<T, V>): readonly [(input?: V["input"]) => Promise<_apollo_client.FetchResult<T>>, {
+    readonly hasAuth: false;
+    readonly data?: T | null | undefined;
+    readonly error?: _apollo_client.ApolloError;
+    readonly loading: boolean;
+    readonly called: boolean;
+    readonly client: ApolloClient<object>;
+    readonly reset: () => void;
+}];
 
 export { ApolloWrapper, tokenContext, useAuthMutation, useAuthQuery };

package/dist/graphql/client.esm.js

@@ -13,7 +13,7 @@ import { useToken } from "naystack/auth/email/client";
 import React, {
   useCallback,
   useEffect,
-  useState
+  useRef
 } from "react";
 
 // src/env.ts
@@ -93,41 +93,42 @@ var tokenContext = (token) => {
 function useAuthQuery(query, variables) {
   const token = useToken();
   const [fetch, result] = useLazyQuery(query);
-  const [calledVars, setCalledVars] = useState();
+  const prevVarsRef = useRef(null);
   useEffect(() => {
-    if (token && variables && calledVars !== JSON.stringify(variables)) {
-      setCalledVars(JSON.stringify(variables));
+    const serialized = JSON.stringify(variables);
+    if (token && variables && prevVarsRef.current !== serialized) {
+      prevVarsRef.current = serialized;
       void fetch({
         // @ts-expect-error -- to allow dynamic props
-        variables: { input },
+        variables: { input: variables },
         context: tokenContext(token),
         fetchPolicy: "no-cache"
       });
     }
-  }, [fetch, token, variables, calledVars]);
+  }, [fetch, token, variables]);
   const reFetch = useCallback(
-    (input2) => fetch({
+    (input) => fetch({
       // @ts-expect-error -- to allow dynamic props
-      variables: { input: input2 },
+      variables: { input },
       context: tokenContext(token),
       fetchPolicy: "no-cache"
     }),
     [fetch, token]
   );
-  return [reFetch, result];
+  return [reFetch, { ...result, hasAuth: !!token }];
 }
 function useAuthMutation(mutation, options) {
   const token = useToken();
   const [mutate, result] = useMutation(mutation, options);
   const method = useCallback(
-    (input2) => mutate({
+    (input) => mutate({
       // @ts-expect-error -- to allow dynamic props
-      variables: { input: input2 },
+      variables: { input },
       context: tokenContext(token)
     }),
     [token]
   );
-  return [method, result];
+  return [method, { ...result, hasAuth: !!token }];
 }
 export {
   ApolloWrapper,

package/dist/graphql/index.cjs.js

@@ -880,6 +880,7 @@ function FieldLibrary(type, queries) {
     if (!def) continue;
     Object.defineProperty(GeneratedResolver.prototype, key, {
       value: async function(root, ctx, input) {
+        if (root[key]) return root[key];
         return def.fn(root, ctx, input);
       },
       writable: false

package/dist/graphql/index.d.mts

@@ -1,7 +1,7 @@
 export { GQLError } from './errors.mjs';
 export { initGraphQLServer } from './init.mjs';
 export { AuthorizedContext, Context } from './types.mjs';
-export { FieldLibrary, FieldResponseType, QueryLibrary, QueryResponseType, field, query } from './utils.mjs';
+export { FieldLibrary, FieldResolverDefinition, FieldResponseType, QueryDefinition, QueryLibrary, QueryResponseType, field, query } from './utils.mjs';
 import 'graphql/error';
 import '@apollo/server';
 import 'next/server';

package/dist/graphql/index.d.ts

@@ -1,7 +1,7 @@
 export { GQLError } from './errors.js';
 export { initGraphQLServer } from './init.js';
 export { AuthorizedContext, Context } from './types.js';
-export { FieldLibrary, FieldResponseType, QueryLibrary, QueryResponseType, field, query } from './utils.js';
+export { FieldLibrary, FieldResolverDefinition, FieldResponseType, QueryDefinition, QueryLibrary, QueryResponseType, field, query } from './utils.js';
 import 'graphql/error';
 import '@apollo/server';
 import 'next/server';

package/dist/graphql/index.esm.js

@@ -876,6 +876,7 @@ function FieldLibrary(type, queries) {
     if (!def) continue;
     Object.defineProperty(GeneratedResolver.prototype, key, {
       value: async function(root, ctx, input) {
+        if (root[key]) return root[key];
         return def.fn(root, ctx, input);
       },
       writable: false

package/dist/graphql/utils.cjs.js

@@ -237,6 +237,7 @@ function FieldLibrary(type, queries) {
     if (!def) continue;
     Object.defineProperty(GeneratedResolver.prototype, key, {
       value: async function(root, ctx, input) {
+        if (root[key]) return root[key];
         return def.fn(root, ctx, input);
       },
       writable: false

package/dist/graphql/utils.d.mts

@@ -264,4 +264,4 @@ type QueryResponseType<T extends QueryDefinition<any, any, any, any, any, any>>
  */
 type FieldResponseType<T extends FieldResolverDefinition<any, any, any, any, any, any, any>> = Awaited<ReturnType<T["call"]>>;
 
-export { FieldLibrary, type FieldResponseType, QueryLibrary, type QueryResponseType, field, query };
+export { FieldLibrary, type FieldResolverDefinition, type FieldResponseType, type QueryDefinition, QueryLibrary, type QueryResponseType, field, query };

package/dist/graphql/utils.d.ts

@@ -264,4 +264,4 @@ type QueryResponseType<T extends QueryDefinition<any, any, any, any, any, any>>
  */
 type FieldResponseType<T extends FieldResolverDefinition<any, any, any, any, any, any, any>> = Awaited<ReturnType<T["call"]>>;
 
-export { FieldLibrary, type FieldResponseType, QueryLibrary, type QueryResponseType, field, query };
+export { FieldLibrary, type FieldResolverDefinition, type FieldResponseType, type QueryDefinition, QueryLibrary, type QueryResponseType, field, query };

package/dist/graphql/utils.esm.js

@@ -222,6 +222,7 @@ function FieldLibrary(type, queries) {
     if (!def) continue;
     Object.defineProperty(GeneratedResolver.prototype, key, {
       value: async function(root, ctx, input) {
+        if (root[key]) return root[key];
         return def.fn(root, ctx, input);
       },
       writable: false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "naystack",
-  "version": "1.5.41",
+  "version": "1.6.0",
   "description": "A stack built with Next + GraphQL + S3 + Auth",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",