naystack 1.4.16 → 1.4.20

package/dist/graphql/index.esm.js

@@ -562,6 +562,15 @@ import { startServerAndCreateNextHandler } from "@as-integrations/next";
 import {
   buildTypeDefsAndResolvers
 } from "type-graphql";
+
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
+// src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
@@ -577,7 +586,7 @@ async function initGraphQLServer({
     typeDefs,
     resolvers: builtResolvers,
     plugins: [
-      process.env.NODE_ENV === "production" ? ApolloServerPluginLandingPageProductionDefault() : ApolloServerPluginLandingPageLocalDefault(),
+      getEnv("NODE_ENV" /* NODE_ENV */, true) === "production" ? ApolloServerPluginLandingPageProductionDefault() : ApolloServerPluginLandingPageLocalDefault(),
       {
         async requestDidStart({ request, contextValue }) {
           if (contextValue.isRefreshID && !request.query?.startsWith("query"))
@@ -586,7 +595,7 @@ async function initGraphQLServer({
       },
       ...plugins || []
     ],
-    introspection: process.env.NODE_ENV !== "production",
+    introspection: getEnv("NODE_ENV" /* NODE_ENV */, true) !== "production",
     status400ForVariableCoercionErrors: true
   });
   const handler = startServerAndCreateNextHandler(server, {
@@ -599,6 +608,8 @@ async function initGraphQLServer({
 }
 
 // src/graphql/utils.ts
+import { cacheLife, cacheTag } from "next/cache";
+import { cookies as cookies2 } from "next/headers";
 import {
   Arg,
   Authorized,
@@ -609,8 +620,59 @@ import {
   Resolver,
   Root
 } from "type-graphql";
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
+import { compare } from "bcryptjs";
+import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
+import { cookies } from "next/headers";
+import { redirect } from "next/navigation";
+import { NextResponse } from "next/server";
+function getUserIdFromRefreshToken(refreshKey, refreshToken) {
+  if (refreshToken)
+    try {
+      const decoded = verify(refreshToken, refreshKey);
+      if (typeof decoded !== "string" && typeof decoded.id === "number")
+        return decoded.id;
+    } catch (e) {
+      if (!(e instanceof JsonWebTokenError)) console.error(e, "errors");
+      return null;
+    }
+  return null;
+}
+
+// src/graphql/utils.ts
 function query(fn, options) {
-  return { ...options, fn };
+  return { ...options, fn, call: getCaller(fn, options) };
+}
+var getUserId = async () => {
+  const Cookie = await cookies2();
+  const refresh = Cookie.get(REFRESH_COOKIE_NAME)?.value;
+  return refresh ? getUserIdFromRefreshToken(refresh) : null;
+};
+function getCaller(fn, options) {
+  return async (data, config) => {
+    if (config?.revalidate) {
+      const cachedFn = (data2, config2) => {
+        "use cache";
+        if (config2?.revalidate) cacheLife(config2.revalidate);
+        if (config2?.tags) cacheTag(...config2.tags);
+        const ctx2 = {
+          userId: null,
+          isRefreshID: true
+        };
+        return fn(ctx2, data2);
+      };
+      return cachedFn(data, config);
+    }
+    const ctx = {
+      userId: options.authorized ? await getUserId() : null,
+      isRefreshID: true
+    };
+    return fn(ctx, data);
+  };
 }
 function field(fn, options) {
   return { ...options, fn };

package/dist/graphql/init.cjs.js

@@ -28,6 +28,15 @@ var import_server = require("@apollo/server");
 var import_default = require("@apollo/server/plugin/landingPage/default");
 var import_next = require("@as-integrations/next");
 var import_type_graphql = require("type-graphql");
+
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
+// src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
@@ -43,7 +52,7 @@ async function initGraphQLServer({
     typeDefs,
     resolvers: builtResolvers,
     plugins: [
-      process.env.NODE_ENV === "production" ? (0, import_default.ApolloServerPluginLandingPageProductionDefault)() : (0, import_default.ApolloServerPluginLandingPageLocalDefault)(),
+      getEnv("NODE_ENV" /* NODE_ENV */, true) === "production" ? (0, import_default.ApolloServerPluginLandingPageProductionDefault)() : (0, import_default.ApolloServerPluginLandingPageLocalDefault)(),
       {
         async requestDidStart({ request, contextValue }) {
           if (contextValue.isRefreshID && !request.query?.startsWith("query"))
@@ -52,7 +61,7 @@ async function initGraphQLServer({
       },
       ...plugins || []
     ],
-    introspection: process.env.NODE_ENV !== "production",
+    introspection: getEnv("NODE_ENV" /* NODE_ENV */, true) !== "production",
     status400ForVariableCoercionErrors: true
   });
   const handler = (0, import_next.startServerAndCreateNextHandler)(server, {

package/dist/graphql/init.esm.js

@@ -9,6 +9,15 @@ import { startServerAndCreateNextHandler } from "@as-integrations/next";
 import {
   buildTypeDefsAndResolvers
 } from "type-graphql";
+
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
+// src/graphql/init.ts
 async function initGraphQLServer({
   authChecker,
   resolvers,
@@ -24,7 +33,7 @@ async function initGraphQLServer({
     typeDefs,
     resolvers: builtResolvers,
     plugins: [
-      process.env.NODE_ENV === "production" ? ApolloServerPluginLandingPageProductionDefault() : ApolloServerPluginLandingPageLocalDefault(),
+      getEnv("NODE_ENV" /* NODE_ENV */, true) === "production" ? ApolloServerPluginLandingPageProductionDefault() : ApolloServerPluginLandingPageLocalDefault(),
       {
         async requestDidStart({ request, contextValue }) {
           if (contextValue.isRefreshID && !request.query?.startsWith("query"))
@@ -33,7 +42,7 @@ async function initGraphQLServer({
       },
       ...plugins || []
     ],
-    introspection: process.env.NODE_ENV !== "production",
+    introspection: getEnv("NODE_ENV" /* NODE_ENV */, true) !== "production",
     status400ForVariableCoercionErrors: true
   });
   const handler = startServerAndCreateNextHandler(server, {

package/dist/graphql/server.cjs.js

@@ -28,6 +28,15 @@ 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");
+
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
+// src/graphql/server.tsx
 function Injector({
   fetch,
   Component,
@@ -47,7 +56,7 @@ var { query: gqlQuery } = (0, import_client_integration_nextjs.registerApolloCli
   return new import_client.ApolloClient({
     cache: new import_client.InMemoryCache(),
     link: new import_client.HttpLink({
-      uri: process.env.NEXT_PUBLIC_GRAPHQL_ENDPOINT
+      uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
     })
   });
 });

package/dist/graphql/server.esm.js

@@ -7,6 +7,15 @@ import {
 import { registerApolloClient } from "@apollo/client-integration-nextjs";
 import { cookies } from "next/headers";
 import { Suspense } from "react";
+
+// src/env.ts
+function getEnv(key, skipCheck) {
+  const value = process.env[key];
+  if (!skipCheck && !value) throw new Error(`${key} is not defined`);
+  return value;
+}
+
+// src/graphql/server.tsx
 function Injector({
   fetch,
   Component,
@@ -26,7 +35,7 @@ var { query: gqlQuery } = registerApolloClient(() => {
   return new ApolloClient({
     cache: new InMemoryCache(),
     link: new HttpLink({
-      uri: process.env.NEXT_PUBLIC_GRAPHQL_ENDPOINT
+      uri: getEnv("NEXT_PUBLIC_GRAPHQL_ENDPOINT" /* NEXT_PUBLIC_GRAPHQL_ENDPOINT */)
     })
   });
 });

package/dist/graphql/utils.cjs.js

@@ -34,9 +34,62 @@ __export(utils_exports, {
   query: () => query
 });
 module.exports = __toCommonJS(utils_exports);
+var import_cache = require("next/cache");
+var import_headers2 = require("next/headers");
 var import_type_graphql = require("type-graphql");
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
+var import_bcryptjs = require("bcryptjs");
+var import_jsonwebtoken = require("jsonwebtoken");
+var import_headers = require("next/headers");
+var import_navigation = require("next/navigation");
+var import_server = require("next/server");
+function getUserIdFromRefreshToken(refreshKey, refreshToken) {
+  if (refreshToken)
+    try {
+      const decoded = (0, import_jsonwebtoken.verify)(refreshToken, refreshKey);
+      if (typeof decoded !== "string" && typeof decoded.id === "number")
+        return decoded.id;
+    } catch (e) {
+      if (!(e instanceof import_jsonwebtoken.JsonWebTokenError)) console.error(e, "errors");
+      return null;
+    }
+  return null;
+}
+
+// src/graphql/utils.ts
 function query(fn, options) {
-  return { ...options, fn };
+  return { ...options, fn, call: getCaller(fn, options) };
+}
+var getUserId = async () => {
+  const Cookie = await (0, import_headers2.cookies)();
+  const refresh = Cookie.get(REFRESH_COOKIE_NAME)?.value;
+  return refresh ? getUserIdFromRefreshToken(refresh) : null;
+};
+function getCaller(fn, options) {
+  return async (data, config) => {
+    if (config?.revalidate) {
+      const cachedFn = (data2, config2) => {
+        "use cache";
+        if (config2?.revalidate) (0, import_cache.cacheLife)(config2.revalidate);
+        if (config2?.tags) (0, import_cache.cacheTag)(...config2.tags);
+        const ctx2 = {
+          userId: null,
+          isRefreshID: true
+        };
+        return fn(ctx2, data2);
+      };
+      return cachedFn(data, config);
+    }
+    const ctx = {
+      userId: options.authorized ? await getUserId() : null,
+      isRefreshID: true
+    };
+    return fn(ctx, data);
+  };
 }
 function field(fn, options) {
   return { ...options, fn };

package/dist/graphql/utils.d.mts

@@ -1,4 +1,5 @@
 import { GraphQLScalarType } from 'graphql';
+import { cacheLife } from 'next/cache';
 import { Query, Arg, ClassType } from 'type-graphql';
 import { AuthorizedContext, Context } from './types.mjs';
 
@@ -15,6 +16,7 @@ type NullableOptions<T, X extends boolean> = T & {
 type ParsedGQLType<T, MergeNullUndefined extends boolean> = T extends StringConstructor ? string : T extends NumberConstructor ? number : T extends BooleanConstructor ? boolean : T extends GraphQLScalarType<infer U> ? U : T extends ClassType<infer U> ? MergeNullUndefined extends true ? NormalizeNullUndefined<U> : U : T extends Record<infer K, string | number> ? T[K] : void;
 type ParsedGQLTypeWithArray<T, MergeNullUndefined extends boolean> = T extends Array<infer U> ? ParsedGQLType<U, MergeNullUndefined>[] : ParsedGQLType<T, MergeNullUndefined>;
 type ParsedGQLTypeWithNullability<T, IsNullable extends boolean, MergeNullUndefined extends boolean> = IsNullable extends true ? ParsedGQLTypeWithArray<T, MergeNullUndefined> | null | undefined : ParsedGQLTypeWithArray<T, MergeNullUndefined>;
+type Promisify<T> = T | Promise<T>;
 interface BaseDefinition<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> {
     output: T;
     outputOptions?: NullableOptions<ReturnOptions, OutputNullable>;
@@ -23,12 +25,17 @@ interface BaseDefinition<T, U, IsAuth extends boolean = false, OutputNullable ex
     authorized?: IsAuth;
 }
 interface QueryDefinition<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> extends BaseDefinition<T, U, IsAuth, OutputNullable, InputNullable> {
-    fn: (ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promise<ParsedGQLTypeWithNullability<T, OutputNullable, true>> | ParsedGQLTypeWithNullability<T, OutputNullable, true>;
+    fn: (ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
+    call: (data: ParsedGQLTypeWithNullability<U, InputNullable, false>, config?: CallerConfig<IsAuth>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
     mutation?: boolean;
 }
-declare function query<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false>(fn: QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>["fn"], options: Omit<QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>, "fn">): QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>;
+type CallerConfig<IsAuth extends boolean> = {
+    revalidate?: IsAuth extends true ? never : Parameters<typeof cacheLife>[0];
+    tags?: IsAuth extends true ? never : string[];
+};
+declare function query<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false>(fn: QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>["fn"], options: Omit<QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>, "fn" | "call">): QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>;
 interface FieldResolverDefinition<T, U, Root, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> extends BaseDefinition<T, U, IsAuth, OutputNullable, InputNullable> {
-    fn: (root: Root, ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promise<ParsedGQLTypeWithNullability<T, OutputNullable, true>> | ParsedGQLTypeWithNullability<T, OutputNullable, true>;
+    fn: (root: Root, ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
 }
 declare function field<T, U, IsAuth extends boolean, Root, OutputNullable extends boolean = false, InputNullable extends boolean = false>(fn: FieldResolverDefinition<T, U, Root, IsAuth, OutputNullable, InputNullable>["fn"], options: Omit<FieldResolverDefinition<T, U, Root, IsAuth, OutputNullable, InputNullable>, "fn">): FieldResolverDefinition<T, U, Root, IsAuth, OutputNullable, InputNullable>;
 declare function QueryLibrary<T extends Record<string, QueryDefinition<any, any, any, any, any>>>(queries: T): {

package/dist/graphql/utils.d.ts

@@ -1,4 +1,5 @@
 import { GraphQLScalarType } from 'graphql';
+import { cacheLife } from 'next/cache';
 import { Query, Arg, ClassType } from 'type-graphql';
 import { AuthorizedContext, Context } from './types.js';
 
@@ -15,6 +16,7 @@ type NullableOptions<T, X extends boolean> = T & {
 type ParsedGQLType<T, MergeNullUndefined extends boolean> = T extends StringConstructor ? string : T extends NumberConstructor ? number : T extends BooleanConstructor ? boolean : T extends GraphQLScalarType<infer U> ? U : T extends ClassType<infer U> ? MergeNullUndefined extends true ? NormalizeNullUndefined<U> : U : T extends Record<infer K, string | number> ? T[K] : void;
 type ParsedGQLTypeWithArray<T, MergeNullUndefined extends boolean> = T extends Array<infer U> ? ParsedGQLType<U, MergeNullUndefined>[] : ParsedGQLType<T, MergeNullUndefined>;
 type ParsedGQLTypeWithNullability<T, IsNullable extends boolean, MergeNullUndefined extends boolean> = IsNullable extends true ? ParsedGQLTypeWithArray<T, MergeNullUndefined> | null | undefined : ParsedGQLTypeWithArray<T, MergeNullUndefined>;
+type Promisify<T> = T | Promise<T>;
 interface BaseDefinition<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> {
     output: T;
     outputOptions?: NullableOptions<ReturnOptions, OutputNullable>;
@@ -23,12 +25,17 @@ interface BaseDefinition<T, U, IsAuth extends boolean = false, OutputNullable ex
     authorized?: IsAuth;
 }
 interface QueryDefinition<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> extends BaseDefinition<T, U, IsAuth, OutputNullable, InputNullable> {
-    fn: (ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promise<ParsedGQLTypeWithNullability<T, OutputNullable, true>> | ParsedGQLTypeWithNullability<T, OutputNullable, true>;
+    fn: (ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
+    call: (data: ParsedGQLTypeWithNullability<U, InputNullable, false>, config?: CallerConfig<IsAuth>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
     mutation?: boolean;
 }
-declare function query<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false>(fn: QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>["fn"], options: Omit<QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>, "fn">): QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>;
+type CallerConfig<IsAuth extends boolean> = {
+    revalidate?: IsAuth extends true ? never : Parameters<typeof cacheLife>[0];
+    tags?: IsAuth extends true ? never : string[];
+};
+declare function query<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false>(fn: QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>["fn"], options: Omit<QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>, "fn" | "call">): QueryDefinition<T, U, IsAuth, OutputNullable, InputNullable>;
 interface FieldResolverDefinition<T, U, Root, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> extends BaseDefinition<T, U, IsAuth, OutputNullable, InputNullable> {
-    fn: (root: Root, ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promise<ParsedGQLTypeWithNullability<T, OutputNullable, true>> | ParsedGQLTypeWithNullability<T, OutputNullable, true>;
+    fn: (root: Root, ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithNullability<U, InputNullable, false>) => Promisify<ParsedGQLTypeWithNullability<T, OutputNullable, true>>;
 }
 declare function field<T, U, IsAuth extends boolean, Root, OutputNullable extends boolean = false, InputNullable extends boolean = false>(fn: FieldResolverDefinition<T, U, Root, IsAuth, OutputNullable, InputNullable>["fn"], options: Omit<FieldResolverDefinition<T, U, Root, IsAuth, OutputNullable, InputNullable>, "fn">): FieldResolverDefinition<T, U, Root, IsAuth, OutputNullable, InputNullable>;
 declare function QueryLibrary<T extends Record<string, QueryDefinition<any, any, any, any, any>>>(queries: T): {

package/dist/graphql/utils.esm.js

@@ -10,6 +10,8 @@ var __decorateClass = (decorators, target, key, kind) => {
 };
 
 // src/graphql/utils.ts
+import { cacheLife, cacheTag } from "next/cache";
+import { cookies as cookies2 } from "next/headers";
 import {
   Arg,
   Authorized,
@@ -20,8 +22,59 @@ import {
   Resolver,
   Root
 } from "type-graphql";
+
+// src/auth/constants.ts
+var REFRESH_COOKIE_NAME = "refresh";
+
+// src/auth/email/token.ts
+import { compare } from "bcryptjs";
+import { JsonWebTokenError, sign, verify } from "jsonwebtoken";
+import { cookies } from "next/headers";
+import { redirect } from "next/navigation";
+import { NextResponse } from "next/server";
+function getUserIdFromRefreshToken(refreshKey, refreshToken) {
+  if (refreshToken)
+    try {
+      const decoded = verify(refreshToken, refreshKey);
+      if (typeof decoded !== "string" && typeof decoded.id === "number")
+        return decoded.id;
+    } catch (e) {
+      if (!(e instanceof JsonWebTokenError)) console.error(e, "errors");
+      return null;
+    }
+  return null;
+}
+
+// src/graphql/utils.ts
 function query(fn, options) {
-  return { ...options, fn };
+  return { ...options, fn, call: getCaller(fn, options) };
+}
+var getUserId = async () => {
+  const Cookie = await cookies2();
+  const refresh = Cookie.get(REFRESH_COOKIE_NAME)?.value;
+  return refresh ? getUserIdFromRefreshToken(refresh) : null;
+};
+function getCaller(fn, options) {
+  return async (data, config) => {
+    if (config?.revalidate) {
+      const cachedFn = (data2, config2) => {
+        "use cache";
+        if (config2?.revalidate) cacheLife(config2.revalidate);
+        if (config2?.tags) cacheTag(...config2.tags);
+        const ctx2 = {
+          userId: null,
+          isRefreshID: true
+        };
+        return fn(ctx2, data2);
+      };
+      return cachedFn(data, config);
+    }
+    const ctx = {
+      userId: options.authorized ? await getUserId() : null,
+      isRefreshID: true
+    };
+    return fn(ctx, data);
+  };
 }
 function field(fn, options) {
   return { ...options, fn };

package/package.json

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