naystack 1.8.1 → 1.8.3

package/dist/graphql/clear-store.cjs.js

@@ -0,0 +1,47 @@
+"use strict";
+"use client";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/graphql/clear-store.tsx
+var clear_store_exports = {};
+__export(clear_store_exports, {
+  ClearStoreOnLogout: () => ClearStoreOnLogout
+});
+module.exports = __toCommonJS(clear_store_exports);
+var import_client = require("@apollo/client");
+var import_client2 = require("naystack/auth/client");
+var import_react = require("react");
+function ClearStoreOnLogout() {
+  const client = (0, import_client.useApolloClient)();
+  const token = (0, import_client2.useToken)();
+  const hadToken = (0, import_react.useRef)(false);
+  (0, import_react.useEffect)(() => {
+    if (token) {
+      hadToken.current = true;
+    } else if (token === null && hadToken.current) {
+      hadToken.current = false;
+      void client.clearStore();
+    }
+  }, [client, token]);
+  return null;
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ClearStoreOnLogout
+});

package/dist/graphql/clear-store.d.mts

@@ -0,0 +1,16 @@
+/**
+ * Clears the Apollo cache on logout so a subsequent login can't read the
+ * previous user's cached data. Mount inside an `ApolloProvider` — both the
+ * native (`ApolloWrapper` in `graphql/client`) and Next (`graphql/next`)
+ * wrappers render it, so any query that opts into a cache-reading `fetchPolicy`
+ * is safe across account switches without per-call-site cleanup.
+ *
+ * Keyed on the token transitioning to `null` (logout / session loss). Same-user
+ * access-token refreshes go string→string and never pass through `null`, so the
+ * cache survives them; only a real logout empties the store. Renders nothing.
+ *
+ * @category GraphQL
+ */
+declare function ClearStoreOnLogout(): null;
+
+export { ClearStoreOnLogout };

package/dist/graphql/clear-store.d.ts

@@ -0,0 +1,16 @@
+/**
+ * Clears the Apollo cache on logout so a subsequent login can't read the
+ * previous user's cached data. Mount inside an `ApolloProvider` — both the
+ * native (`ApolloWrapper` in `graphql/client`) and Next (`graphql/next`)
+ * wrappers render it, so any query that opts into a cache-reading `fetchPolicy`
+ * is safe across account switches without per-call-site cleanup.
+ *
+ * Keyed on the token transitioning to `null` (logout / session loss). Same-user
+ * access-token refreshes go string→string and never pass through `null`, so the
+ * cache survives them; only a real logout empties the store. Renders nothing.
+ *
+ * @category GraphQL
+ */
+declare function ClearStoreOnLogout(): null;
+
+export { ClearStoreOnLogout };

package/dist/graphql/clear-store.esm.js

@@ -0,0 +1,23 @@
+"use client";
+
+// src/graphql/clear-store.tsx
+import { useApolloClient } from "@apollo/client";
+import { useToken } from "naystack/auth/client";
+import { useEffect, useRef } from "react";
+function ClearStoreOnLogout() {
+  const client = useApolloClient();
+  const token = useToken();
+  const hadToken = useRef(false);
+  useEffect(() => {
+    if (token) {
+      hadToken.current = true;
+    } else if (token === null && hadToken.current) {
+      hadToken.current = false;
+      void client.clearStore();
+    }
+  }, [client, token]);
+  return null;
+}
+export {
+  ClearStoreOnLogout
+};

package/dist/graphql/client.cjs.js

@@ -37,9 +37,9 @@ __export(client_exports, {
   useAuthQuery: () => useAuthQuery
 });
 module.exports = __toCommonJS(client_exports);
-var import_client = require("@apollo/client");
-var import_client2 = require("naystack/auth/client");
-var import_react = __toESM(require("react"));
+var import_client3 = require("@apollo/client");
+var import_client4 = require("naystack/auth/client");
+var import_react2 = __toESM(require("react"));
 
 // src/env.ts
 var EXTRA_ENV = globalThis.__NAYSTACK_ENV__ || (globalThis.__NAYSTACK_ENV__ = {});
@@ -91,11 +91,30 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
+// src/graphql/clear-store.tsx
+var import_client = require("@apollo/client");
+var import_client2 = require("naystack/auth/client");
+var import_react = require("react");
+function ClearStoreOnLogout() {
+  const client = (0, import_client.useApolloClient)();
+  const token = (0, import_client2.useToken)();
+  const hadToken = (0, import_react.useRef)(false);
+  (0, import_react.useEffect)(() => {
+    if (token) {
+      hadToken.current = true;
+    } else if (token === null && hadToken.current) {
+      hadToken.current = false;
+      void client.clearStore();
+    }
+  }, [client, token]);
+  return null;
+}
+
 // src/graphql/client.tsx
 function makeClient(cacheConfig) {
-  return new import_client.ApolloClient({
-    cache: new import_client.InMemoryCache(cacheConfig),
-    link: new import_client.HttpLink({
+  return new import_client3.ApolloClient({
+    cache: new import_client3.InMemoryCache(cacheConfig),
+    link: new import_client3.HttpLink({
       uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
     })
   });
@@ -104,7 +123,9 @@ var ApolloWrapper = ({
   children,
   cacheConfig
 }) => {
-  return /* @__PURE__ */ import_react.default.createElement(import_client.ApolloProvider, { client: makeClient(cacheConfig) }, children);
+  const clientRef = (0, import_react2.useRef)(null);
+  if (!clientRef.current) clientRef.current = makeClient(cacheConfig);
+  return /* @__PURE__ */ import_react2.default.createElement(import_client3.ApolloProvider, { client: clientRef.current }, /* @__PURE__ */ import_react2.default.createElement(ClearStoreOnLogout, null), children);
 };
 var tokenContext = (token) => {
   if (!token) return void 0;
@@ -115,12 +136,13 @@ var tokenContext = (token) => {
     credentials: `omit`
   };
 };
-function useAuthQuery(query, variables) {
-  const [fetch, result] = (0, import_client.useLazyQuery)(query, {
-    fetchPolicy: "no-cache"
+function useAuthQuery(query, variables, options) {
+  const [fetch, result] = (0, import_client3.useLazyQuery)(query, {
+    fetchPolicy: "no-cache",
+    ...options
   });
-  const prevVarsRef = (0, import_react.useRef)(null);
-  (0, import_react.useEffect)(() => {
+  const prevVarsRef = (0, import_react2.useRef)(null);
+  (0, import_react2.useEffect)(() => {
     const serialized = JSON.stringify(variables);
     if (variables && prevVarsRef.current !== serialized) {
       prevVarsRef.current = serialized;
@@ -133,7 +155,7 @@ function useAuthQuery(query, variables) {
       });
     }
   }, [fetch, variables]);
-  const reFetch = (0, import_react.useCallback)(
+  const reFetch = (0, import_react2.useCallback)(
     (input) => fetch({
       // @ts-expect-error -- to allow dynamic props
       variables: { input },
@@ -146,9 +168,9 @@ function useAuthQuery(query, variables) {
   return [reFetch, result];
 }
 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)(
+  const token = (0, import_client4.useToken)();
+  const [mutate, result] = (0, import_client3.useMutation)(mutation, options);
+  const method = (0, import_react2.useCallback)(
     (input) => mutate({
       // @ts-expect-error -- to allow dynamic props
       variables: { input },

package/dist/graphql/client.d.mts

@@ -1,5 +1,5 @@
 import * as _apollo_client from '@apollo/client';
-import { InMemoryCacheConfig, OperationVariables, MutationHookOptions, ApolloClient } from '@apollo/client';
+import { InMemoryCacheConfig, OperationVariables, LazyQueryHookOptions, MutationHookOptions, ApolloClient } from '@apollo/client';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import React__default, { PropsWithChildren } from 'react';
 
@@ -25,10 +25,14 @@ declare const tokenContext: (token?: string | null) => {
  * Hook to run a GraphQL query with the current user's token. The query auto-fires when both the token
  * and variables are available. Returns a refetch function and the Apollo query result.
  *
- * Uses `fetchPolicy: "no-cache"` by default to always get fresh data.
+ * Defaults to `fetchPolicy: "no-cache"` (always fresh, safe for viewer-keyed data).
+ * Override per-query via `options` — e.g. `{ fetchPolicy: "cache-first" }` for static
+ * reference data, or `{ fetchPolicy: "cache-and-network" }` to show cached data
+ * instantly while refetching.
  *
  * @param query - A `TypedDocumentNode` for the query (e.g. from codegen or a `gql` template).
  * @param variables - Optional initial variables (the `input` value). Automatically wrapped as `{ input: variables }` before sending. Query fires automatically when this and token are set; change to refetch.
+ * @param options - Optional Apollo `LazyQueryHookOptions` (e.g. `fetchPolicy`, `notifyOnNetworkStatusChange`). Merged into the underlying `useLazyQuery`.
  * @returns Tuple: `[refetch, result]`.
  *   - `refetch(input)` — runs the query again with the given input (wrapped as `variables.input`).
  *   - `result` — `{ data, loading, error, hasAuth }` from Apollo. `hasAuth` is `true` when an auth token is available.
@@ -58,7 +62,7 @@ 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"], options?: LazyQueryHookOptions<T, V>): readonly [(input?: V["input"]) => Promise<_apollo_client.QueryResult<T, V>>, _apollo_client.QueryResult<T, V>];
 /**
  * Hook to run a GraphQL mutation with the current user's token. Returns a function you call with the mutation input.
  *

package/dist/graphql/client.d.ts

@@ -1,5 +1,5 @@
 import * as _apollo_client from '@apollo/client';
-import { InMemoryCacheConfig, OperationVariables, MutationHookOptions, ApolloClient } from '@apollo/client';
+import { InMemoryCacheConfig, OperationVariables, LazyQueryHookOptions, MutationHookOptions, ApolloClient } from '@apollo/client';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 import React__default, { PropsWithChildren } from 'react';
 
@@ -25,10 +25,14 @@ declare const tokenContext: (token?: string | null) => {
  * Hook to run a GraphQL query with the current user's token. The query auto-fires when both the token
  * and variables are available. Returns a refetch function and the Apollo query result.
  *
- * Uses `fetchPolicy: "no-cache"` by default to always get fresh data.
+ * Defaults to `fetchPolicy: "no-cache"` (always fresh, safe for viewer-keyed data).
+ * Override per-query via `options` — e.g. `{ fetchPolicy: "cache-first" }` for static
+ * reference data, or `{ fetchPolicy: "cache-and-network" }` to show cached data
+ * instantly while refetching.
  *
  * @param query - A `TypedDocumentNode` for the query (e.g. from codegen or a `gql` template).
  * @param variables - Optional initial variables (the `input` value). Automatically wrapped as `{ input: variables }` before sending. Query fires automatically when this and token are set; change to refetch.
+ * @param options - Optional Apollo `LazyQueryHookOptions` (e.g. `fetchPolicy`, `notifyOnNetworkStatusChange`). Merged into the underlying `useLazyQuery`.
  * @returns Tuple: `[refetch, result]`.
  *   - `refetch(input)` — runs the query again with the given input (wrapped as `variables.input`).
  *   - `result` — `{ data, loading, error, hasAuth }` from Apollo. `hasAuth` is `true` when an auth token is available.
@@ -58,7 +62,7 @@ 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"], options?: LazyQueryHookOptions<T, V>): readonly [(input?: V["input"]) => Promise<_apollo_client.QueryResult<T, V>>, _apollo_client.QueryResult<T, V>];
 /**
  * Hook to run a GraphQL mutation with the current user's token. Returns a function you call with the mutation input.
  *

package/dist/graphql/client.esm.js

@@ -9,11 +9,11 @@ import {
   useLazyQuery,
   useMutation
 } from "@apollo/client";
-import { useToken } from "naystack/auth/client";
+import { useToken as useToken2 } from "naystack/auth/client";
 import React, {
   useCallback,
-  useEffect,
-  useRef
+  useEffect as useEffect2,
+  useRef as useRef2
 } from "react";
 
 // src/env.ts
@@ -66,6 +66,25 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
+// src/graphql/clear-store.tsx
+import { useApolloClient } from "@apollo/client";
+import { useToken } from "naystack/auth/client";
+import { useEffect, useRef } from "react";
+function ClearStoreOnLogout() {
+  const client = useApolloClient();
+  const token = useToken();
+  const hadToken = useRef(false);
+  useEffect(() => {
+    if (token) {
+      hadToken.current = true;
+    } else if (token === null && hadToken.current) {
+      hadToken.current = false;
+      void client.clearStore();
+    }
+  }, [client, token]);
+  return null;
+}
+
 // src/graphql/client.tsx
 function makeClient(cacheConfig) {
   return new ApolloClient({
@@ -79,7 +98,9 @@ var ApolloWrapper = ({
   children,
   cacheConfig
 }) => {
-  return /* @__PURE__ */ React.createElement(ApolloProvider, { client: makeClient(cacheConfig) }, children);
+  const clientRef = useRef2(null);
+  if (!clientRef.current) clientRef.current = makeClient(cacheConfig);
+  return /* @__PURE__ */ React.createElement(ApolloProvider, { client: clientRef.current }, /* @__PURE__ */ React.createElement(ClearStoreOnLogout, null), children);
 };
 var tokenContext = (token) => {
   if (!token) return void 0;
@@ -90,12 +111,13 @@ var tokenContext = (token) => {
     credentials: `omit`
   };
 };
-function useAuthQuery(query, variables) {
+function useAuthQuery(query, variables, options) {
   const [fetch, result] = useLazyQuery(query, {
-    fetchPolicy: "no-cache"
+    fetchPolicy: "no-cache",
+    ...options
   });
-  const prevVarsRef = useRef(null);
-  useEffect(() => {
+  const prevVarsRef = useRef2(null);
+  useEffect2(() => {
     const serialized = JSON.stringify(variables);
     if (variables && prevVarsRef.current !== serialized) {
       prevVarsRef.current = serialized;
@@ -121,7 +143,7 @@ function useAuthQuery(query, variables) {
   return [reFetch, result];
 }
 function useAuthMutation(mutation, options) {
-  const token = useToken();
+  const token = useToken2();
   const [mutate, result] = useMutation(mutation, options);
   const method = useCallback(
     (input) => mutate({

package/dist/graphql/next.cjs.js

@@ -34,9 +34,9 @@ __export(next_exports, {
   ApolloWrapper: () => ApolloWrapper
 });
 module.exports = __toCommonJS(next_exports);
-var import_client = require("@apollo/client");
+var import_client3 = require("@apollo/client");
 var import_client_integration_nextjs = require("@apollo/client-integration-nextjs");
-var import_react = __toESM(require("react"));
+var import_react2 = __toESM(require("react"));
 
 // src/env.ts
 var EXTRA_ENV = globalThis.__NAYSTACK_ENV__ || (globalThis.__NAYSTACK_ENV__ = {});
@@ -88,11 +88,30 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
+// src/graphql/clear-store.tsx
+var import_client = require("@apollo/client");
+var import_client2 = require("naystack/auth/client");
+var import_react = require("react");
+function ClearStoreOnLogout() {
+  const client = (0, import_client.useApolloClient)();
+  const token = (0, import_client2.useToken)();
+  const hadToken = (0, import_react.useRef)(false);
+  (0, import_react.useEffect)(() => {
+    if (token) {
+      hadToken.current = true;
+    } else if (token === null && hadToken.current) {
+      hadToken.current = false;
+      void client.clearStore();
+    }
+  }, [client, token]);
+  return null;
+}
+
 // src/graphql/next.tsx
 function makeClient(cacheConfig) {
   return new import_client_integration_nextjs.ApolloClient({
     cache: new import_client_integration_nextjs.InMemoryCache(cacheConfig),
-    link: new import_client.HttpLink({
+    link: new import_client3.HttpLink({
       uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
     })
   });
@@ -101,7 +120,7 @@ var ApolloWrapper = ({
   children,
   cacheConfig
 }) => {
-  return /* @__PURE__ */ import_react.default.createElement(import_client_integration_nextjs.ApolloNextAppProvider, { makeClient: () => makeClient(cacheConfig) }, children);
+  return /* @__PURE__ */ import_react2.default.createElement(import_client_integration_nextjs.ApolloNextAppProvider, { makeClient: () => makeClient(cacheConfig) }, /* @__PURE__ */ import_react2.default.createElement(ClearStoreOnLogout, null), children);
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/graphql/next.esm.js

@@ -59,6 +59,25 @@ function getEnv(key, skipCheck) {
   return value;
 }
 
+// src/graphql/clear-store.tsx
+import { useApolloClient } from "@apollo/client";
+import { useToken } from "naystack/auth/client";
+import { useEffect, useRef } from "react";
+function ClearStoreOnLogout() {
+  const client = useApolloClient();
+  const token = useToken();
+  const hadToken = useRef(false);
+  useEffect(() => {
+    if (token) {
+      hadToken.current = true;
+    } else if (token === null && hadToken.current) {
+      hadToken.current = false;
+      void client.clearStore();
+    }
+  }, [client, token]);
+  return null;
+}
+
 // src/graphql/next.tsx
 function makeClient(cacheConfig) {
   return new ApolloClient({
@@ -72,7 +91,7 @@ var ApolloWrapper = ({
   children,
   cacheConfig
 }) => {
-  return /* @__PURE__ */ React.createElement(ApolloNextAppProvider, { makeClient: () => makeClient(cacheConfig) }, children);
+  return /* @__PURE__ */ React.createElement(ApolloNextAppProvider, { makeClient: () => makeClient(cacheConfig) }, /* @__PURE__ */ React.createElement(ClearStoreOnLogout, null), children);
 };
 export {
   ApolloWrapper

package/dist/graphql/utils.d.mts

@@ -34,8 +34,15 @@ type Promisify<T> = T | Promise<T>;
  * there's no refresh cookie the only way to keep that promise is to not call the
  * resolver at all — hence the added `null`, which surfaces the logged-out case in
  * the types instead of passing a null `userId` through the cast.
+ *
+ * `[IsAuth] extends [true]` (not `IsAuth extends true`) is deliberate: `field()`
+ * has no `= false` default and can't reverse-infer `IsAuth` from a `ctx: Context`
+ * signature, so a non-authorized field infers `IsAuth = boolean`. A naked
+ * conditional would distribute over `true | false` and union `null` into every
+ * public field's return. The tuple wrapper stops the distribution, so only a
+ * literal `true` adds `null`.
  */
-type AuthCallReturn<IsAuth extends boolean, R> = IsAuth extends true ? Awaited<R> | null : Awaited<R>;
+type AuthCallReturn<IsAuth extends boolean, R> = [IsAuth] extends [true] ? Awaited<R> | null : Awaited<R>;
 /** Base for query/field definition (output, input, options). */
 interface BaseDefinition<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> {
     output: T;

package/dist/graphql/utils.d.ts

@@ -34,8 +34,15 @@ type Promisify<T> = T | Promise<T>;
  * there's no refresh cookie the only way to keep that promise is to not call the
  * resolver at all — hence the added `null`, which surfaces the logged-out case in
  * the types instead of passing a null `userId` through the cast.
+ *
+ * `[IsAuth] extends [true]` (not `IsAuth extends true`) is deliberate: `field()`
+ * has no `= false` default and can't reverse-infer `IsAuth` from a `ctx: Context`
+ * signature, so a non-authorized field infers `IsAuth = boolean`. A naked
+ * conditional would distribute over `true | false` and union `null` into every
+ * public field's return. The tuple wrapper stops the distribution, so only a
+ * literal `true` adds `null`.
  */
-type AuthCallReturn<IsAuth extends boolean, R> = IsAuth extends true ? Awaited<R> | null : Awaited<R>;
+type AuthCallReturn<IsAuth extends boolean, R> = [IsAuth] extends [true] ? Awaited<R> | null : Awaited<R>;
 /** Base for query/field definition (output, input, options). */
 interface BaseDefinition<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> {
     output: T;

package/package.json

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