naystack 1.2.12 → 1.2.14

package/dist/auth/email/client.cjs.js

@@ -20,10 +20,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/auth/email/client.ts
 var client_exports = {};
 __export(client_exports, {
-  getEmailAuthUtils: () => getEmailAuthUtils,
-  useLoginWithEmail: () => useLoginWithEmail,
-  useLogout: () => useLogout,
-  useSignUpWithEmail: () => useSignUpWithEmail
+  getEmailAuthUtils: () => getEmailAuthUtils
 });
 module.exports = __toCommonJS(client_exports);
 var import_client = require("naystack/graphql/client");
@@ -49,7 +46,6 @@ function useSignUpWithEmail(endpoint) {
 }
 function useLoginWithEmail(endpoint) {
   const setToken = (0, import_client.useSetToken)();
-  console.warn(setToken, "2");
   return (0, import_react.useCallback)(
     async (data) => {
       const res = await fetch(endpoint, {
@@ -68,8 +64,7 @@ function useLoginWithEmail(endpoint) {
   );
 }
 function useLogout(endpoint) {
-  const { setToken, token } = (0, import_react.useContext)(import_client.TokenContext);
-  console.warn(token, setToken, "1");
+  const setToken = (0, import_client.useSetToken)();
   return (0, import_react.useCallback)(
     async (data) => {
       setToken(null);
@@ -91,8 +86,5 @@ function getEmailAuthUtils(endpoint) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getEmailAuthUtils,
-  useLoginWithEmail,
-  useLogout,
-  useSignUpWithEmail
+  getEmailAuthUtils
 });

package/dist/auth/email/client.d.mts

@@ -1,10 +1,7 @@
-declare function useSignUpWithEmail(endpoint: string): (data: object) => Promise<string | null>;
-declare function useLoginWithEmail(endpoint: string): (data: object) => Promise<string | null>;
-declare function useLogout(endpoint: string): (data?: object) => Promise<void>;
 declare function getEmailAuthUtils(endpoint: string): {
     useSignUp: () => (data: object) => Promise<string | null>;
     useLogin: () => (data: object) => Promise<string | null>;
     useLogout: () => (data?: object) => Promise<void>;
 };
 
-export { getEmailAuthUtils, useLoginWithEmail, useLogout, useSignUpWithEmail };
+export { getEmailAuthUtils };

package/dist/auth/email/client.d.ts

@@ -1,10 +1,7 @@
-declare function useSignUpWithEmail(endpoint: string): (data: object) => Promise<string | null>;
-declare function useLoginWithEmail(endpoint: string): (data: object) => Promise<string | null>;
-declare function useLogout(endpoint: string): (data?: object) => Promise<void>;
 declare function getEmailAuthUtils(endpoint: string): {
     useSignUp: () => (data: object) => Promise<string | null>;
     useLogin: () => (data: object) => Promise<string | null>;
     useLogout: () => (data?: object) => Promise<void>;
 };
 
-export { getEmailAuthUtils, useLoginWithEmail, useLogout, useSignUpWithEmail };
+export { getEmailAuthUtils };

package/dist/auth/email/client.esm.js

@@ -1,6 +1,6 @@
 // src/auth/email/client.ts
-import { TokenContext, useSetToken } from "naystack/graphql/client";
-import { useCallback, useContext } from "react";
+import { useSetToken } from "naystack/graphql/client";
+import { useCallback } from "react";
 function useSignUpWithEmail(endpoint) {
   const setToken = useSetToken();
   return useCallback(
@@ -22,7 +22,6 @@ function useSignUpWithEmail(endpoint) {
 }
 function useLoginWithEmail(endpoint) {
   const setToken = useSetToken();
-  console.warn(setToken, "2");
   return useCallback(
     async (data) => {
       const res = await fetch(endpoint, {
@@ -41,8 +40,7 @@ function useLoginWithEmail(endpoint) {
   );
 }
 function useLogout(endpoint) {
-  const { setToken, token } = useContext(TokenContext);
-  console.warn(token, setToken, "1");
+  const setToken = useSetToken();
   return useCallback(
     async (data) => {
       setToken(null);
@@ -63,8 +61,5 @@ function getEmailAuthUtils(endpoint) {
   };
 }
 export {
-  getEmailAuthUtils,
-  useLoginWithEmail,
-  useLogout,
-  useSignUpWithEmail
+  getEmailAuthUtils
 };

package/dist/graphql/server.cjs.js

@@ -21,10 +21,14 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var server_exports = {};
 __export(server_exports, {
   Injector: () => Injector,
-  getGraphQLQuery: () => getGraphQLQuery
+  PreloadQuery: () => PreloadQuery,
+  getClient: () => getClient,
+  getGraphQLQuery: () => getGraphQLQuery,
+  query: () => query
 });
 module.exports = __toCommonJS(server_exports);
 var import_client = require("@apollo/client");
+var import_client_integration_nextjs = require("@apollo/client-integration-nextjs");
 var import_headers = require("next/headers");
 var import_react = require("react");
 function Injector({
@@ -42,15 +46,31 @@ async function InjectorSuspensed({
   const data = await fetch();
   return /* @__PURE__ */ React.createElement(Component, { loading: false, ...props || {}, data });
 }
-var getGraphQLQuery = ({ uri }) => {
-  const client = new import_client.ApolloClient({
+var { getClient, query, PreloadQuery } = (0, import_client_integration_nextjs.registerApolloClient)(() => {
+  return new import_client.ApolloClient({
     cache: new import_client.InMemoryCache(),
     link: new import_client.HttpLink({
-      uri
+      // this needs to be an absolute url, as relative urls cannot be used in SSR
+      uri: "http://example.com/api/graphql",
+      fetchOptions: {
+        // you can pass additional options that should be passed to `fetch` here,
+        // e.g. Next.js-related `fetch` options regarding caching and revalidation
+        // see https://nextjs.org/docs/app/api-reference/functions/fetch#fetchurl-options
+      }
     })
   });
+});
+var getGraphQLQuery = ({ uri }) => {
+  const { query: query2 } = (0, import_client_integration_nextjs.registerApolloClient)(() => {
+    return new import_client.ApolloClient({
+      cache: new import_client.InMemoryCache(),
+      link: new import_client.HttpLink({
+        uri
+      })
+    });
+  });
   return async (_query, options) => {
-    const res = await client.query({
+    const res = await query2({
       query: _query,
       variables: options?.variables,
       context: {
@@ -72,5 +92,8 @@ var getGraphQLQuery = ({ uri }) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Injector,
-  getGraphQLQuery
+  PreloadQuery,
+  getClient,
+  getGraphQLQuery,
+  query
 });

package/dist/graphql/server.d.mts

@@ -1,6 +1,8 @@
+import * as _apollo_client_integration_nextjs from '@apollo/client-integration-nextjs';
+import * as _apollo_client from '@apollo/client';
+import { ApolloClient, OperationVariables } from '@apollo/client';
 import * as React from 'react';
 import { FC } from 'react';
-import { OperationVariables } from '@apollo/client';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 
 type OmittedProps<Y> = Omit<Omit<Y, "loading">, "data">;
@@ -16,6 +18,9 @@ declare function Injector<T, Y>({ fetch, Component, props, }: {
         loading: boolean;
     } & Y>;
 } & ComponentProps<Y>): React.JSX.Element;
+declare const getClient: () => ApolloClient<_apollo_client.NormalizedCacheObject>;
+declare const query: <T = any, TVariables extends OperationVariables = OperationVariables>(options: _apollo_client.QueryOptions<TVariables, T>) => Promise<_apollo_client.ApolloQueryResult<_apollo_client.MaybeMasked<T>>>;
+declare const PreloadQuery: _apollo_client_integration_nextjs.PreloadQueryComponent;
 declare const getGraphQLQuery: ({ uri }: {
     uri: string;
 }) => <T, V extends OperationVariables>(_query: TypedDocumentNode<T, V>, options?: {
@@ -25,4 +30,4 @@ declare const getGraphQLQuery: ({ uri }: {
     noCookie?: boolean;
 }) => Promise<T>;
 
-export { Injector, getGraphQLQuery };
+export { Injector, PreloadQuery, getClient, getGraphQLQuery, query };

package/dist/graphql/server.d.ts

@@ -1,6 +1,8 @@
+import * as _apollo_client_integration_nextjs from '@apollo/client-integration-nextjs';
+import * as _apollo_client from '@apollo/client';
+import { ApolloClient, OperationVariables } from '@apollo/client';
 import * as React from 'react';
 import { FC } from 'react';
-import { OperationVariables } from '@apollo/client';
 import { TypedDocumentNode } from '@graphql-typed-document-node/core';
 
 type OmittedProps<Y> = Omit<Omit<Y, "loading">, "data">;
@@ -16,6 +18,9 @@ declare function Injector<T, Y>({ fetch, Component, props, }: {
         loading: boolean;
     } & Y>;
 } & ComponentProps<Y>): React.JSX.Element;
+declare const getClient: () => ApolloClient<_apollo_client.NormalizedCacheObject>;
+declare const query: <T = any, TVariables extends OperationVariables = OperationVariables>(options: _apollo_client.QueryOptions<TVariables, T>) => Promise<_apollo_client.ApolloQueryResult<_apollo_client.MaybeMasked<T>>>;
+declare const PreloadQuery: _apollo_client_integration_nextjs.PreloadQueryComponent;
 declare const getGraphQLQuery: ({ uri }: {
     uri: string;
 }) => <T, V extends OperationVariables>(_query: TypedDocumentNode<T, V>, options?: {
@@ -25,4 +30,4 @@ declare const getGraphQLQuery: ({ uri }: {
     noCookie?: boolean;
 }) => Promise<T>;
 
-export { Injector, getGraphQLQuery };
+export { Injector, PreloadQuery, getClient, getGraphQLQuery, query };

package/dist/graphql/server.esm.js

@@ -4,6 +4,7 @@ import {
   HttpLink,
   InMemoryCache
 } from "@apollo/client";
+import { registerApolloClient } from "@apollo/client-integration-nextjs";
 import { cookies } from "next/headers";
 import { Suspense } from "react";
 function Injector({
@@ -21,15 +22,31 @@ async function InjectorSuspensed({
   const data = await fetch();
   return /* @__PURE__ */ React.createElement(Component, { loading: false, ...props || {}, data });
 }
-var getGraphQLQuery = ({ uri }) => {
-  const client = new ApolloClient({
+var { getClient, query, PreloadQuery } = registerApolloClient(() => {
+  return new ApolloClient({
     cache: new InMemoryCache(),
     link: new HttpLink({
-      uri
+      // this needs to be an absolute url, as relative urls cannot be used in SSR
+      uri: "http://example.com/api/graphql",
+      fetchOptions: {
+        // you can pass additional options that should be passed to `fetch` here,
+        // e.g. Next.js-related `fetch` options regarding caching and revalidation
+        // see https://nextjs.org/docs/app/api-reference/functions/fetch#fetchurl-options
+      }
     })
   });
+});
+var getGraphQLQuery = ({ uri }) => {
+  const { query: query2 } = registerApolloClient(() => {
+    return new ApolloClient({
+      cache: new InMemoryCache(),
+      link: new HttpLink({
+        uri
+      })
+    });
+  });
   return async (_query, options) => {
-    const res = await client.query({
+    const res = await query2({
       query: _query,
       variables: options?.variables,
       context: {
@@ -50,5 +67,8 @@ var getGraphQLQuery = ({ uri }) => {
 };
 export {
   Injector,
-  getGraphQLQuery
+  PreloadQuery,
+  getClient,
+  getGraphQLQuery,
+  query
 };

package/package.json

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