naystack 1.2.14 → 1.2.16

package/README.md

@@ -19,13 +19,15 @@ yarn add naystack
 
 Naystack provides the following modules, each accessible via its own import path:
 
-| Module      | Import Path        | Description                                     |
-| ----------- | ------------------ | ----------------------------------------------- |
-| **Auth**    | `naystack/auth`    | Email, Google, and Instagram authentication     |
-| **GraphQL** | `naystack/graphql` | GraphQL server initialization with type-graphql |
-| **Client**  | `naystack/client`  | Client-side hooks and utilities                 |
-| **File**    | `naystack/file`    | File upload to AWS S3                           |
-| **Socials** | `naystack/socials` | Instagram and Threads API integration           |
+| Module      | Import Path                | Description                                                        |
+| ----------- | -------------------------- | ------------------------------------------------------------------ |
+| **Auth**    | `naystack/auth`           | Email, Google, and Instagram authentication (server-side routes)  |
+| **Auth UI** | `naystack/auth/email/client` | Client-side React hooks for login / signup / logout flows     |
+| **GraphQL** | `naystack/graphql`        | GraphQL server initialization with type-graphql                   |
+| **GQL App** | `naystack/graphql/client` / `naystack/graphql/server` | Apollo Client helpers for Next.js App Router (client + server) |
+| **Client**  | `naystack/client`         | Generic client-side hooks and utilities                            |
+| **File**    | `naystack/file`           | File upload to AWS S3                                              |
+| **Socials** | `naystack/socials`        | Instagram and Threads API integration                              |
 
 ---
 
@@ -39,11 +41,21 @@ import {
 } from "naystack/auth";
 ```
 
+### High-level Auth Flow in a Next.js App Router project
+
+From a real-world setup (like `veas-web`), the pieces look like this:
+
+- **Server-side auth routes** – created with `getEmailAuthRoutes` (and optionally Google / Instagram)
+- **Server-side GraphQL context** – uses `getUserIdFromRequest` from the email auth routes
+- **Client-side auth hooks** – created with `getEmailAuthUtils` and used in login/signup/logout forms
+
+The sections below show each part in more detail.
+
 ### Email Authentication
 
 Setup email-based authentication with JWT tokens and optional Turnstile captcha verification.
 
-**Basic Example:**
+**Next.js App Router Example (server routes):**
 
 ```typescript
 const emailAuth = getEmailAuthRoutes({
@@ -61,6 +73,101 @@ const emailAuth = getEmailAuthRoutes({
 export const { GET, POST, PUT, DELETE, getUserIdFromRequest } = emailAuth;
 ```
 
+**Client-side hooks (login, signup, logout) – as used in `veas-web`:**
+
+```typescript
+// app/(auth)/utils.ts
+import { getEmailAuthUtils } from "naystack/auth/email/client";
+
+// The argument is the URL where your email auth API lives
+export const { useLogin, useLogout, useSignUp } =
+  getEmailAuthUtils("/api/email");
+```
+
+```typescript
+// app/(auth)/login/components/form.tsx
+"use client";
+import React, { useState } from "react";
+import { useLogin } from "@/app/(auth)/utils";
+import { useRouter } from "next/navigation";
+
+export default function LoginForm() {
+  const login = useLogin();
+  const router = useRouter();
+  const [email, setEmail] = useState("");
+  const [password, setPassword] = useState("");
+
+  return (
+    <form
+      onSubmit={async (e) => {
+        e.preventDefault();
+        const ok = await login({ email, password });
+        if (ok) router.push("/dashboard");
+      }}
+    >
+      {/* inputs + submit */}
+    </form>
+  );
+}
+```
+
+```typescript
+// app/(auth)/signup/components/form.tsx
+"use client";
+import React, { useState } from "react";
+import { useSignUp } from "@/app/(auth)/utils";
+import { useRouter } from "next/navigation";
+
+export default function SignupForm() {
+  const signUp = useSignUp();
+  const router = useRouter();
+  const [email, setEmail] = useState("");
+  const [password, setPassword] = useState("");
+
+  return (
+    <form
+      onSubmit={async (e) => {
+        e.preventDefault();
+        const ok = await signUp({ email, password });
+        if (ok) router.push("/onboard");
+      }}
+    >
+      {/* inputs + submit */}
+    </form>
+  );
+}
+```
+
+```typescript
+// app/dashboard/components/logout-button.tsx
+"use client";
+import React, { useState } from "react";
+import { useLogout } from "@/app/(auth)/utils";
+import { useRouter } from "next/navigation";
+
+export default function LogoutButton() {
+  const logout = useLogout();
+  const [loading, setLoading] = useState(false);
+  const router = useRouter();
+
+  const handleLogout = async () => {
+    setLoading(true);
+    try {
+      await logout();
+      router.push("/login");
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <button onClick={handleLogout} disabled={loading}>
+      {loading ? "Logging out..." : "Logout"}
+    </button>
+  );
+}
+```
+
 **Real-World Example with Drizzle ORM:**
 
 ```typescript
@@ -302,7 +409,7 @@ import {
 import type { Context, AuthorizedContext } from "naystack/graphql";
 ```
 
-### Initialize GraphQL Server
+### Initialize GraphQL Server (Next.js App Router)
 
 **Basic Example:**
 
@@ -357,6 +464,17 @@ export const { GET, POST } = await initGraphQLServer({
 });
 ```
 
+### Real-world pattern from a full Next.js app (like `veas-web`)
+
+In a typical app you will:
+
+- Define **GraphQL resolvers** using `QueryLibrary` / `FieldLibrary`
+- Initialize the GraphQL **API route** with `initGraphQLServer`
+- Use **server-side helper** `getGraphQLQuery` to call GraphQL from RSC / server actions
+- Use **client-side helper** `getApolloWrapper` and `useAuthMutation` for client components
+
+The next sections show how these pieces fit together.
+
 #### Options
 
 | Option        | Type                                 | Required | Description                      |
@@ -483,6 +601,139 @@ const fields = {
 const UserFieldResolver = FieldLibrary(User, fields);
 ```
 
+**How this looks in a real app (`veas-web`-style):**
+
+```typescript
+// app/api/(graphql)/User/db.ts
+import { pgTable, serial, text, timestamp, real } from "drizzle-orm/pg-core";
+
+export const UserTable = pgTable("users", {
+  id: serial("id").primaryKey(),
+  email: text("email").notNull(),
+  password: text("password").notNull(),
+  name: text("name"),
+  dateOfBirth: timestamp("date_of_birth"),
+  placeOfBirthLat: real("place_of_birth_lat"),
+  placeOfBirthLong: real("place_of_birth_long"),
+  timezone: real("timezone"),
+});
+
+export type UserDB = typeof UserTable.$inferSelect;
+```
+
+```typescript
+// app/api/(graphql)/User/types.ts
+import { Field, ObjectType } from "type-graphql";
+
+@ObjectType("User")
+export class User {
+  @Field()
+  id: number;
+
+  @Field()
+  email: string;
+
+  @Field(() => String, { nullable: true })
+  name: string | null;
+
+  @Field(() => Date, { nullable: true })
+  dateOfBirth: Date | null;
+
+  @Field(() => Number, { nullable: true })
+  placeOfBirthLat: number | null;
+
+  @Field(() => Number, { nullable: true })
+  placeOfBirthLong: number | null;
+
+  @Field(() => Number, { nullable: true })
+  timezone: number | null;
+
+  @Field()
+  isOnboarded: boolean;
+}
+```
+
+```typescript
+// app/api/(graphql)/User/resolvers/is-onboarded.ts
+import { field } from "naystack/graphql";
+import type { UserDB } from "../db";
+
+export default field(
+  async (user: UserDB) => {
+    return (
+      !!user.name &&
+      !!user.dateOfBirth &&
+      user.placeOfBirthLat !== null &&
+      user.placeOfBirthLong !== null &&
+      user.timezone !== null
+    );
+  },
+  { output: Boolean },
+);
+```
+
+```typescript
+// app/api/(graphql)/User/resolvers/get-current-user.ts
+import { query } from "naystack/graphql";
+import { db } from "@/app/api/lib/db";
+import { UserTable } from "../db";
+import { eq } from "drizzle-orm";
+import { User } from "../types";
+
+export default query(
+  async (ctx: { userId: number | null }) => {
+    if (!ctx.userId) return null;
+    const [user] = await db
+      .select()
+      .from(UserTable)
+      .where(eq(UserTable.id, ctx.userId));
+    return user || null;
+  },
+  {
+    output: User,
+  },
+);
+```
+
+```typescript
+// app/api/(graphql)/User/graphql.ts
+import { QueryLibrary, FieldLibrary } from "naystack/graphql";
+import getCurrentUser from "./resolvers/get-current-user";
+import onboardUser from "./resolvers/onboard-user";
+import isOnboarded from "./resolvers/is-onboarded";
+import type { UserDB } from "./db";
+import { User } from "./types";
+
+export const UserResolvers = QueryLibrary({
+  getCurrentUser,
+  onboardUser,
+});
+
+export const UserFieldResolvers = FieldLibrary<UserDB>(User, {
+  isOnboarded,
+});
+```
+
+```typescript
+// app/api/(graphql)/route.ts
+import { initGraphQLServer } from "naystack/graphql";
+import { UserResolvers, UserFieldResolvers } from "./User/graphql";
+import { getUserIdFromRequest } from "@/app/api/(auth)/email";
+
+export const { GET, POST } = await initGraphQLServer({
+  resolvers: [UserResolvers, UserFieldResolvers],
+  context: async (req) => {
+    const res = getUserIdFromRequest(req);
+    if (!res) return { userId: null };
+    return {
+      userId: res.accessUserId ?? res.refreshUserID ?? null,
+    };
+  },
+});
+```
+
+This gives you a full GraphQL API route that uses Naystack’s auth, Drizzle models, and functional resolvers.
+
 **Real-World Example:**
 
 ```typescript

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

@@ -220,7 +220,14 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getUserIdFromRequest: (req) => getUserContext(options.refreshKey, options.signingKey, req)
+    getContext: (req) => {
+      const ids = getUserContext(options.refreshKey, options.signingKey, req);
+      if (!ids) return { userId: null };
+      if (ids.refreshUserID) {
+        return { userId: ids.refreshUserID, isRefreshID: true };
+      }
+      return { userId: ids.accessUserId };
+    }
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

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

@@ -14,10 +14,16 @@ declare function getEmailAuthRoutes(options: InitRoutesOptions): {
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>>;
-    getUserIdFromRequest: (req: NextRequest) => {
-        refreshUserID?: number;
-        accessUserId?: number;
-    } | null;
+    getContext: (req: NextRequest) => {
+        userId: null;
+        isRefreshID?: undefined;
+    } | {
+        userId: number;
+        isRefreshID: boolean;
+    } | {
+        userId: number | undefined;
+        isRefreshID?: undefined;
+    };
 };
 
 export { getEmailAuthRoutes };

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

@@ -14,10 +14,16 @@ declare function getEmailAuthRoutes(options: InitRoutesOptions): {
         accessToken: string | undefined;
         refreshToken: string | undefined;
     }>>;
-    getUserIdFromRequest: (req: NextRequest) => {
-        refreshUserID?: number;
-        accessUserId?: number;
-    } | null;
+    getContext: (req: NextRequest) => {
+        userId: null;
+        isRefreshID?: undefined;
+    } | {
+        userId: number;
+        isRefreshID: boolean;
+    } | {
+        userId: number | undefined;
+        isRefreshID?: undefined;
+    };
 };
 
 export { getEmailAuthRoutes };

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

@@ -194,7 +194,14 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getUserIdFromRequest: (req) => getUserContext(options.refreshKey, options.signingKey, req)
+    getContext: (req) => {
+      const ids = getUserContext(options.refreshKey, options.signingKey, req);
+      if (!ids) return { userId: null };
+      if (ids.refreshUserID) {
+        return { userId: ids.refreshUserID, isRefreshID: true };
+      }
+      return { userId: ids.accessUserId };
+    }
   };
 }
 export {

package/dist/auth/index.cjs.js

@@ -234,7 +234,14 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getUserIdFromRequest: (req) => getUserContext(options.refreshKey, options.signingKey, req)
+    getContext: (req) => {
+      const ids = getUserContext(options.refreshKey, options.signingKey, req);
+      if (!ids) return { userId: null };
+      if (ids.refreshUserID) {
+        return { userId: ids.refreshUserID, isRefreshID: true };
+      }
+      return { userId: ids.accessUserId };
+    }
   };
 }
 

package/dist/auth/index.esm.js

@@ -206,7 +206,14 @@ function getEmailAuthRoutes(options) {
     POST: getPostRoute(options),
     PUT: getPutRoute(options),
     DELETE: getDeleteRoute(options),
-    getUserIdFromRequest: (req) => getUserContext(options.refreshKey, options.signingKey, req)
+    getContext: (req) => {
+      const ids = getUserContext(options.refreshKey, options.signingKey, req);
+      if (!ids) return { userId: null };
+      if (ids.refreshUserID) {
+        return { userId: ids.refreshUserID, isRefreshID: true };
+      }
+      return { userId: ids.accessUserId };
+    }
   };
 }
 

package/dist/graphql/index.cjs.js

@@ -579,11 +579,11 @@ async function initGraphQLServer({
   authChecker,
   resolvers,
   plugins,
-  context
+  getContext
 }) {
   const { typeDefs, resolvers: builtResolvers } = await (0, import_type_graphql.buildTypeDefsAndResolvers)({
     validate: true,
-    authChecker,
+    authChecker: authChecker || (({ context }) => !!context.userId),
     resolvers
   });
   const server = new import_server.ApolloServer({
@@ -593,10 +593,7 @@ async function initGraphQLServer({
       process.env.NODE_ENV === "production" ? (0, import_default.ApolloServerPluginLandingPageProductionDefault)() : (0, import_default.ApolloServerPluginLandingPageLocalDefault)(),
       {
         async requestDidStart({ request, contextValue }) {
-          if (
-            // eslint-disable-next-line
-            contextValue.onlyQuery && !request.query?.startsWith("query")
-          )
+          if (contextValue.isRefreshID && !request.query?.startsWith("query"))
             contextValue.userId = null;
         }
       },
@@ -606,12 +603,11 @@ async function initGraphQLServer({
     status400ForVariableCoercionErrors: true
   });
   const handler = (0, import_next.startServerAndCreateNextHandler)(server, {
-    context
+    context: getContext
   });
   return {
     GET: (request) => handler(request),
-    POST: (request) => handler(request),
-    context
+    POST: (request) => handler(request)
   };
 }
 
@@ -655,6 +651,9 @@ function QueryLibrary(queries) {
         descriptor
       );
     }
+    if (def.authorized) {
+      (0, import_type_graphql2.Authorized)()(GeneratedResolver, key);
+    }
     (0, import_type_graphql2.Ctx)()(GeneratedResolver.prototype, key, 0);
     if (def.input) {
       (0, import_type_graphql2.Arg)("input", () => def.input || String, def.inputOptions)(

package/dist/graphql/index.esm.js

@@ -566,11 +566,11 @@ async function initGraphQLServer({
   authChecker,
   resolvers,
   plugins,
-  context
+  getContext
 }) {
   const { typeDefs, resolvers: builtResolvers } = await buildTypeDefsAndResolvers({
     validate: true,
-    authChecker,
+    authChecker: authChecker || (({ context }) => !!context.userId),
     resolvers
   });
   const server = new ApolloServer({
@@ -580,10 +580,7 @@ async function initGraphQLServer({
       process.env.NODE_ENV === "production" ? ApolloServerPluginLandingPageProductionDefault() : ApolloServerPluginLandingPageLocalDefault(),
       {
         async requestDidStart({ request, contextValue }) {
-          if (
-            // eslint-disable-next-line
-            contextValue.onlyQuery && !request.query?.startsWith("query")
-          )
+          if (contextValue.isRefreshID && !request.query?.startsWith("query"))
             contextValue.userId = null;
         }
       },
@@ -593,12 +590,11 @@ async function initGraphQLServer({
     status400ForVariableCoercionErrors: true
   });
   const handler = startServerAndCreateNextHandler(server, {
-    context
+    context: getContext
   });
   return {
     GET: (request) => handler(request),
-    POST: (request) => handler(request),
-    context
+    POST: (request) => handler(request)
   };
 }
 
@@ -651,6 +647,9 @@ function QueryLibrary(queries) {
         descriptor
       );
     }
+    if (def.authorized) {
+      Authorized()(GeneratedResolver, key);
+    }
     Ctx()(GeneratedResolver.prototype, key, 0);
     if (def.input) {
       Arg("input", () => def.input || String, def.inputOptions)(

package/dist/graphql/init.cjs.js

@@ -32,11 +32,11 @@ async function initGraphQLServer({
   authChecker,
   resolvers,
   plugins,
-  context
+  getContext
 }) {
   const { typeDefs, resolvers: builtResolvers } = await (0, import_type_graphql.buildTypeDefsAndResolvers)({
     validate: true,
-    authChecker,
+    authChecker: authChecker || (({ context }) => !!context.userId),
     resolvers
   });
   const server = new import_server.ApolloServer({
@@ -46,10 +46,7 @@ async function initGraphQLServer({
       process.env.NODE_ENV === "production" ? (0, import_default.ApolloServerPluginLandingPageProductionDefault)() : (0, import_default.ApolloServerPluginLandingPageLocalDefault)(),
       {
         async requestDidStart({ request, contextValue }) {
-          if (
-            // eslint-disable-next-line
-            contextValue.onlyQuery && !request.query?.startsWith("query")
-          )
+          if (contextValue.isRefreshID && !request.query?.startsWith("query"))
             contextValue.userId = null;
         }
       },
@@ -59,12 +56,11 @@ async function initGraphQLServer({
     status400ForVariableCoercionErrors: true
   });
   const handler = (0, import_next.startServerAndCreateNextHandler)(server, {
-    context
+    context: getContext
   });
   return {
     GET: (request) => handler(request),
-    POST: (request) => handler(request),
-    context
+    POST: (request) => handler(request)
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/graphql/init.d.mts

@@ -2,15 +2,14 @@ import { ApolloServerPlugin } from '@apollo/server';
 import { NextRequest } from 'next/server';
 import { AuthChecker, NonEmptyArray } from 'type-graphql';
 
-declare function initGraphQLServer({ authChecker, resolvers, plugins, context, }: {
+declare function initGraphQLServer({ authChecker, resolvers, plugins, getContext, }: {
     authChecker?: AuthChecker<any>;
     resolvers: NonEmptyArray<Function>;
     plugins?: ApolloServerPlugin[];
-    context?: (req: NextRequest) => Promise<any>;
+    getContext?: (req: NextRequest) => Promise<any>;
 }): Promise<{
     GET: (request: NextRequest) => Promise<Response>;
     POST: (request: NextRequest) => Promise<Response>;
-    context: ((req: NextRequest) => Promise<any>) | undefined;
 }>;
 
 export { initGraphQLServer };

package/dist/graphql/init.d.ts

@@ -2,15 +2,14 @@ import { ApolloServerPlugin } from '@apollo/server';
 import { NextRequest } from 'next/server';
 import { AuthChecker, NonEmptyArray } from 'type-graphql';
 
-declare function initGraphQLServer({ authChecker, resolvers, plugins, context, }: {
+declare function initGraphQLServer({ authChecker, resolvers, plugins, getContext, }: {
     authChecker?: AuthChecker<any>;
     resolvers: NonEmptyArray<Function>;
     plugins?: ApolloServerPlugin[];
-    context?: (req: NextRequest) => Promise<any>;
+    getContext?: (req: NextRequest) => Promise<any>;
 }): Promise<{
     GET: (request: NextRequest) => Promise<Response>;
     POST: (request: NextRequest) => Promise<Response>;
-    context: ((req: NextRequest) => Promise<any>) | undefined;
 }>;
 
 export { initGraphQLServer };

package/dist/graphql/init.esm.js

@@ -13,11 +13,11 @@ async function initGraphQLServer({
   authChecker,
   resolvers,
   plugins,
-  context
+  getContext
 }) {
   const { typeDefs, resolvers: builtResolvers } = await buildTypeDefsAndResolvers({
     validate: true,
-    authChecker,
+    authChecker: authChecker || (({ context }) => !!context.userId),
     resolvers
   });
   const server = new ApolloServer({
@@ -27,10 +27,7 @@ async function initGraphQLServer({
       process.env.NODE_ENV === "production" ? ApolloServerPluginLandingPageProductionDefault() : ApolloServerPluginLandingPageLocalDefault(),
       {
         async requestDidStart({ request, contextValue }) {
-          if (
-            // eslint-disable-next-line
-            contextValue.onlyQuery && !request.query?.startsWith("query")
-          )
+          if (contextValue.isRefreshID && !request.query?.startsWith("query"))
             contextValue.userId = null;
         }
       },
@@ -40,12 +37,11 @@ async function initGraphQLServer({
     status400ForVariableCoercionErrors: true
   });
   const handler = startServerAndCreateNextHandler(server, {
-    context
+    context: getContext
   });
   return {
     GET: (request) => handler(request),
-    POST: (request) => handler(request),
-    context
+    POST: (request) => handler(request)
   };
 }
 export {

package/dist/graphql/server.cjs.js

@@ -21,10 +21,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var server_exports = {};
 __export(server_exports, {
   Injector: () => Injector,
-  PreloadQuery: () => PreloadQuery,
-  getClient: () => getClient,
-  getGraphQLQuery: () => getGraphQLQuery,
-  query: () => query
+  getGraphQLQuery: () => getGraphQLQuery
 });
 module.exports = __toCommonJS(server_exports);
 var import_client = require("@apollo/client");
@@ -46,22 +43,8 @@ async function InjectorSuspensed({
   const data = await fetch();
   return /* @__PURE__ */ React.createElement(Component, { loading: false, ...props || {}, data });
 }
-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({
-      // 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)(() => {
+  const { query } = (0, import_client_integration_nextjs.registerApolloClient)(() => {
     return new import_client.ApolloClient({
       cache: new import_client.InMemoryCache(),
       link: new import_client.HttpLink({
@@ -70,7 +53,7 @@ var getGraphQLQuery = ({ uri }) => {
     });
   });
   return async (_query, options) => {
-    const res = await query2({
+    const res = await query({
       query: _query,
       variables: options?.variables,
       context: {
@@ -92,8 +75,5 @@ var getGraphQLQuery = ({ uri }) => {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   Injector,
-  PreloadQuery,
-  getClient,
-  getGraphQLQuery,
-  query
+  getGraphQLQuery
 });

package/dist/graphql/server.d.mts

@@ -1,8 +1,6 @@
-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">;
@@ -18,9 +16,6 @@ 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?: {
@@ -30,4 +25,4 @@ declare const getGraphQLQuery: ({ uri }: {
     noCookie?: boolean;
 }) => Promise<T>;
 
-export { Injector, PreloadQuery, getClient, getGraphQLQuery, query };
+export { Injector, getGraphQLQuery };

package/dist/graphql/server.d.ts

@@ -1,8 +1,6 @@
-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">;
@@ -18,9 +16,6 @@ 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?: {
@@ -30,4 +25,4 @@ declare const getGraphQLQuery: ({ uri }: {
     noCookie?: boolean;
 }) => Promise<T>;
 
-export { Injector, PreloadQuery, getClient, getGraphQLQuery, query };
+export { Injector, getGraphQLQuery };

package/dist/graphql/server.esm.js

@@ -22,22 +22,8 @@ async function InjectorSuspensed({
   const data = await fetch();
   return /* @__PURE__ */ React.createElement(Component, { loading: false, ...props || {}, data });
 }
-var { getClient, query, PreloadQuery } = registerApolloClient(() => {
-  return new ApolloClient({
-    cache: new InMemoryCache(),
-    link: new HttpLink({
-      // 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(() => {
+  const { query } = registerApolloClient(() => {
     return new ApolloClient({
       cache: new InMemoryCache(),
       link: new HttpLink({
@@ -46,7 +32,7 @@ var getGraphQLQuery = ({ uri }) => {
     });
   });
   return async (_query, options) => {
-    const res = await query2({
+    const res = await query({
       query: _query,
       variables: options?.variables,
       context: {
@@ -67,8 +53,5 @@ var getGraphQLQuery = ({ uri }) => {
 };
 export {
   Injector,
-  PreloadQuery,
-  getClient,
-  getGraphQLQuery,
-  query
+  getGraphQLQuery
 };

package/dist/graphql/utils.cjs.js

@@ -73,6 +73,9 @@ function QueryLibrary(queries) {
         descriptor
       );
     }
+    if (def.authorized) {
+      (0, import_type_graphql.Authorized)()(GeneratedResolver, key);
+    }
     (0, import_type_graphql.Ctx)()(GeneratedResolver.prototype, key, 0);
     if (def.input) {
       (0, import_type_graphql.Arg)("input", () => def.input || String, def.inputOptions)(

package/dist/graphql/utils.d.mts

@@ -1,6 +1,6 @@
 import { GraphQLScalarType } from 'graphql';
 import { ClassType, Query, Arg } from 'type-graphql';
-import { Context } from './types.mjs';
+import { AuthorizedContext, Context } from './types.mjs';
 
 type ReturnOptions = Parameters<typeof Query>[1];
 type ArgsOptions = Parameters<typeof Arg>[2];
@@ -9,26 +9,26 @@ type DeepPartial<T> = {
     [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
 };
 type OtherTypes<T> = GraphQLScalarType<T, T> | [GraphQLScalarType<T, T>] | NumberConstructor | [NumberConstructor] | StringConstructor | [StringConstructor] | BooleanConstructor | [BooleanConstructor];
-interface BaseDefinition<T extends Values, U extends Values> {
+interface BaseDefinition<T extends Values, U extends Values, IsAuth extends boolean> {
     output: T extends object ? ClassType<DeepPartial<T>> | [ClassType<DeepPartial<T>>] : OtherTypes<T>;
     outputOptions?: ReturnOptions;
     input?: U extends object ? ClassType<U> | [ClassType<U>] : OtherTypes<U>;
     inputOptions?: ArgsOptions;
-    authorized?: boolean;
+    authorized?: IsAuth;
 }
-interface QueryDefinition<T extends Values, U extends Values> extends BaseDefinition<T, U> {
-    fn: (ctx: Context, data: U) => Promise<T | T[]> | T | T[];
+interface QueryDefinition<T extends Values, U extends Values, IsAuth extends boolean> extends BaseDefinition<T, U, IsAuth> {
+    fn: (ctx: IsAuth extends true ? AuthorizedContext : Context, data: U) => Promise<T | T[]> | T | T[];
     mutation?: boolean;
 }
-interface FieldResolverDefinition<T extends Values, U extends Values, Root> extends BaseDefinition<T, U> {
-    fn: (root: Root, ctx: Context, data: U) => Promise<T | T[]> | T | T[];
+interface FieldResolverDefinition<T extends Values, U extends Values, IsAuth extends boolean, Root> extends BaseDefinition<T, U, IsAuth> {
+    fn: (root: Root, ctx: IsAuth extends true ? AuthorizedContext : Context, data: U) => Promise<T | T[]> | T | T[];
 }
-declare function query<T extends Values, U extends Values>(fn: QueryDefinition<T, U>["fn"], options: Omit<QueryDefinition<T, U>, "fn">): QueryDefinition<T, U>;
-declare function field<T extends Values, U extends Values, Root>(fn: FieldResolverDefinition<T, U, Root>["fn"], options: Omit<FieldResolverDefinition<T, U, Root>, "fn">): FieldResolverDefinition<T, U, Root>;
-declare function QueryLibrary<T extends Record<string, QueryDefinition<any, any>>>(queries: T): {
+declare function query<T extends Values, U extends Values, IsAuth extends boolean>(fn: QueryDefinition<T, U, IsAuth>["fn"], options: Omit<QueryDefinition<T, U, IsAuth>, "fn">): QueryDefinition<T, U, IsAuth>;
+declare function field<T extends Values, U extends Values, IsAuth extends boolean, Root>(fn: FieldResolverDefinition<T, U, IsAuth, Root>["fn"], options: Omit<FieldResolverDefinition<T, U, IsAuth, Root>, "fn">): FieldResolverDefinition<T, U, IsAuth, Root>;
+declare function QueryLibrary<T extends Record<string, QueryDefinition<any, any, any>>>(queries: T): {
     new (): {};
 };
-declare function FieldLibrary<X extends object, T extends Record<string, FieldResolverDefinition<any, any, X>> = Record<string, FieldResolverDefinition<any, any, X>>>(type: ClassType, queries: T): {
+declare function FieldLibrary<X extends object, T extends Record<string, FieldResolverDefinition<any, any, any, X>> = Record<string, FieldResolverDefinition<any, any, any, X>>>(type: ClassType, queries: T): {
     new (): {};
 };
 

package/dist/graphql/utils.d.ts

@@ -1,6 +1,6 @@
 import { GraphQLScalarType } from 'graphql';
 import { ClassType, Query, Arg } from 'type-graphql';
-import { Context } from './types.js';
+import { AuthorizedContext, Context } from './types.js';
 
 type ReturnOptions = Parameters<typeof Query>[1];
 type ArgsOptions = Parameters<typeof Arg>[2];
@@ -9,26 +9,26 @@ type DeepPartial<T> = {
     [K in keyof T]?: T[K] extends object ? DeepPartial<T[K]> : T[K];
 };
 type OtherTypes<T> = GraphQLScalarType<T, T> | [GraphQLScalarType<T, T>] | NumberConstructor | [NumberConstructor] | StringConstructor | [StringConstructor] | BooleanConstructor | [BooleanConstructor];
-interface BaseDefinition<T extends Values, U extends Values> {
+interface BaseDefinition<T extends Values, U extends Values, IsAuth extends boolean> {
     output: T extends object ? ClassType<DeepPartial<T>> | [ClassType<DeepPartial<T>>] : OtherTypes<T>;
     outputOptions?: ReturnOptions;
     input?: U extends object ? ClassType<U> | [ClassType<U>] : OtherTypes<U>;
     inputOptions?: ArgsOptions;
-    authorized?: boolean;
+    authorized?: IsAuth;
 }
-interface QueryDefinition<T extends Values, U extends Values> extends BaseDefinition<T, U> {
-    fn: (ctx: Context, data: U) => Promise<T | T[]> | T | T[];
+interface QueryDefinition<T extends Values, U extends Values, IsAuth extends boolean> extends BaseDefinition<T, U, IsAuth> {
+    fn: (ctx: IsAuth extends true ? AuthorizedContext : Context, data: U) => Promise<T | T[]> | T | T[];
     mutation?: boolean;
 }
-interface FieldResolverDefinition<T extends Values, U extends Values, Root> extends BaseDefinition<T, U> {
-    fn: (root: Root, ctx: Context, data: U) => Promise<T | T[]> | T | T[];
+interface FieldResolverDefinition<T extends Values, U extends Values, IsAuth extends boolean, Root> extends BaseDefinition<T, U, IsAuth> {
+    fn: (root: Root, ctx: IsAuth extends true ? AuthorizedContext : Context, data: U) => Promise<T | T[]> | T | T[];
 }
-declare function query<T extends Values, U extends Values>(fn: QueryDefinition<T, U>["fn"], options: Omit<QueryDefinition<T, U>, "fn">): QueryDefinition<T, U>;
-declare function field<T extends Values, U extends Values, Root>(fn: FieldResolverDefinition<T, U, Root>["fn"], options: Omit<FieldResolverDefinition<T, U, Root>, "fn">): FieldResolverDefinition<T, U, Root>;
-declare function QueryLibrary<T extends Record<string, QueryDefinition<any, any>>>(queries: T): {
+declare function query<T extends Values, U extends Values, IsAuth extends boolean>(fn: QueryDefinition<T, U, IsAuth>["fn"], options: Omit<QueryDefinition<T, U, IsAuth>, "fn">): QueryDefinition<T, U, IsAuth>;
+declare function field<T extends Values, U extends Values, IsAuth extends boolean, Root>(fn: FieldResolverDefinition<T, U, IsAuth, Root>["fn"], options: Omit<FieldResolverDefinition<T, U, IsAuth, Root>, "fn">): FieldResolverDefinition<T, U, IsAuth, Root>;
+declare function QueryLibrary<T extends Record<string, QueryDefinition<any, any, any>>>(queries: T): {
     new (): {};
 };
-declare function FieldLibrary<X extends object, T extends Record<string, FieldResolverDefinition<any, any, X>> = Record<string, FieldResolverDefinition<any, any, X>>>(type: ClassType, queries: T): {
+declare function FieldLibrary<X extends object, T extends Record<string, FieldResolverDefinition<any, any, any, X>> = Record<string, FieldResolverDefinition<any, any, any, X>>>(type: ClassType, queries: T): {
     new (): {};
 };
 

package/dist/graphql/utils.esm.js

@@ -58,6 +58,9 @@ function QueryLibrary(queries) {
         descriptor
       );
     }
+    if (def.authorized) {
+      Authorized()(GeneratedResolver, key);
+    }
     Ctx()(GeneratedResolver.prototype, key, 0);
     if (def.input) {
       Arg("input", () => def.input || String, def.inputOptions)(

package/package.json

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