naystack 1.4.9 → 1.4.11

package/README.md

@@ -59,17 +59,15 @@ Wrap your application with `AuthWrapper` in your root layout or a client compone
 ```typescript
 // gql/client.ts
 "use client";
-import { getAuthWrapper } from "naystack/auth/email/client";
+import { AuthWrapper } from "naystack/auth/email/client";
 
-export const AuthWrapper = getAuthWrapper("/api/email");
 ```
 
 ### Frontend Usage
 
 ```typescript
-import { getEmailAuthUtils, useToken } from "naystack/auth/email/client";
+import { useLogin, useSignUp, useLogout, useToken } from "naystack/auth/email/client";
 
-const { useLogin, useSignUp, useLogout } = getEmailAuthUtils("/api/email");
 
 function AuthComponent() {
   const login = useLogin();
@@ -108,11 +106,7 @@ Call your GraphQL API from server components or actions:
 
 ```typescript
 // gql/server.ts
-import { getGraphQLQuery } from "naystack/graphql/server";
-
-export const query = getGraphQLQuery({
-  uri: process.env.NEXT_PUBLIC_BACKEND_BASE_URL!,
-});
+import { query } from "naystack/graphql/server";
 
 // Usage in Page
 const data = await query(MyQueryDocument, { variables });
@@ -124,18 +118,17 @@ For client-side GraphQL with Apollo:
 
 ```typescript
 // gql/client.ts
-import { getApolloWrapper } from "naystack/graphql/client";
+import { ApolloWrapper } from "naystack/graphql/client";
 
-export const ApolloWrapper = getApolloWrapper("/api");
 ```
 
 ### Frontend Usage
 
 ```typescript
-import { useQuery, useMutation } from "@apollo/client";
+import { useAuthQuery, useAuthMutation } from "naystack/graphql/client";
 
 function Profile() {
-  const { data } = useQuery(GetCurrentUserDocument);
+  const [getCurrentUser, { loading }] = useAuthMutation(GetCurrentUserDocument);
   // ...
 }
 ```
@@ -170,9 +163,7 @@ export const { PUT, uploadFile, getDownloadURL } = setupFileUpload({
 ### Client Setup & Usage
 
 ```typescript
-import { getUseFileUpload } from "naystack/file/client";
-
-const useFileUpload = getUseFileUpload("/api/upload");
+import { useFileUpload } from "naystack/file/client";
 
 function UploadButton() {
   const upload = useFileUpload();

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

@@ -33,10 +33,10 @@ var client_exports = {};
 __export(client_exports, {
   AuthWrapper: () => AuthWrapper,
   TokenContext: () => TokenContext,
-  useLoginWithEmail: () => useLoginWithEmail,
+  useLogin: () => useLogin,
   useLogout: () => useLogout,
   useSetToken: () => useSetToken,
-  useSignUpWithEmail: () => useSignUpWithEmail,
+  useSignUp: () => useSignUp,
   useToken: () => useToken
 });
 module.exports = __toCommonJS(client_exports);
@@ -62,7 +62,7 @@ function useSetToken() {
   const { setToken } = (0, import_react.useContext)(TokenContext);
   return setToken;
 }
-function useSignUpWithEmail(endpoint) {
+function useSignUp() {
   const setToken = useSetToken();
   return (0, import_react.useCallback)(
     async (data) => {
@@ -81,7 +81,7 @@ function useSignUpWithEmail(endpoint) {
     [setToken]
   );
 }
-function useLoginWithEmail() {
+function useLogin() {
   const setToken = useSetToken();
   return (0, import_react.useCallback)(
     async (data) => {
@@ -118,9 +118,9 @@ function useLogout() {
 0 && (module.exports = {
   AuthWrapper,
   TokenContext,
-  useLoginWithEmail,
+  useLogin,
   useLogout,
   useSetToken,
-  useSignUpWithEmail,
+  useSignUp,
   useToken
 });

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

@@ -9,8 +9,8 @@ declare const AuthWrapper: ({ children }: {
 }) => React__default.JSX.Element;
 declare function useToken(): string | null;
 declare function useSetToken(): React__default.Dispatch<React__default.SetStateAction<string | null>>;
-declare function useSignUpWithEmail(endpoint: string): (data: object) => Promise<string | null>;
-declare function useLoginWithEmail(): (data: object) => Promise<string | null>;
+declare function useSignUp(): (data: object) => Promise<string | null>;
+declare function useLogin(): (data: object) => Promise<string | null>;
 declare function useLogout(): (data?: object) => Promise<void>;
 
-export { AuthWrapper, TokenContext, useLoginWithEmail, useLogout, useSetToken, useSignUpWithEmail, useToken };
+export { AuthWrapper, TokenContext, useLogin, useLogout, useSetToken, useSignUp, useToken };

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

@@ -9,8 +9,8 @@ declare const AuthWrapper: ({ children }: {
 }) => React__default.JSX.Element;
 declare function useToken(): string | null;
 declare function useSetToken(): React__default.Dispatch<React__default.SetStateAction<string | null>>;
-declare function useSignUpWithEmail(endpoint: string): (data: object) => Promise<string | null>;
-declare function useLoginWithEmail(): (data: object) => Promise<string | null>;
+declare function useSignUp(): (data: object) => Promise<string | null>;
+declare function useLogin(): (data: object) => Promise<string | null>;
 declare function useLogout(): (data?: object) => Promise<void>;
 
-export { AuthWrapper, TokenContext, useLoginWithEmail, useLogout, useSetToken, useSignUpWithEmail, useToken };
+export { AuthWrapper, TokenContext, useLogin, useLogout, useSetToken, useSignUp, useToken };

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

@@ -29,7 +29,7 @@ function useSetToken() {
   const { setToken } = useContext(TokenContext);
   return setToken;
 }
-function useSignUpWithEmail(endpoint) {
+function useSignUp() {
   const setToken = useSetToken();
   return useCallback(
     async (data) => {
@@ -48,7 +48,7 @@ function useSignUpWithEmail(endpoint) {
     [setToken]
   );
 }
-function useLoginWithEmail() {
+function useLogin() {
   const setToken = useSetToken();
   return useCallback(
     async (data) => {
@@ -84,9 +84,9 @@ function useLogout() {
 export {
   AuthWrapper,
   TokenContext,
-  useLoginWithEmail,
+  useLogin,
   useLogout,
   useSetToken,
-  useSignUpWithEmail,
+  useSignUp,
   useToken
 };

package/dist/graphql/utils.d.mts

@@ -1,34 +1,31 @@
 import { GraphQLScalarType } from 'graphql';
-import { ClassType, Query, Arg } from 'type-graphql';
+import { Query, Arg, ClassType } from 'type-graphql';
 import { AuthorizedContext, Context } from './types.mjs';
 
 type ReturnOptions = Parameters<typeof Query>[1];
 type ArgsOptions = Parameters<typeof Arg>[2];
-type Values = object | string | number | boolean;
-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, IsAuth extends boolean> {
-    output: T extends object ? ClassType<DeepPartial<T>> | [ClassType<DeepPartial<T>>] : OtherTypes<T>;
+type ParsedGQLType<T> = T extends ClassType<infer U> ? U : T extends GraphQLScalarType<infer U> ? U : T extends Record<infer K, string | number> ? T[K] : T;
+type ParsedGQLTypeWithArray<T> = T extends Array<infer U> ? ParsedGQLType<U>[] : ParsedGQLType<T>;
+interface BaseDefinition<T, U, IsAuth extends boolean = false> {
+    output: T;
     outputOptions?: ReturnOptions;
-    input?: U extends object ? ClassType<U> | [ClassType<U>] : OtherTypes<U>;
+    input?: U;
     inputOptions?: ArgsOptions;
     authorized?: IsAuth;
 }
-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[];
+interface QueryDefinition<T, U, IsAuth extends boolean = false> extends BaseDefinition<T, U, IsAuth> {
+    fn: (ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithArray<U>) => Promise<ParsedGQLTypeWithArray<T>> | ParsedGQLTypeWithArray<T>;
     mutation?: boolean;
 }
-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[];
+interface FieldResolverDefinition<T, U, Root, IsAuth extends boolean = false> extends BaseDefinition<T, U, IsAuth> {
+    fn: (root: Root, ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithArray<U>) => Promise<ParsedGQLTypeWithArray<T>> | ParsedGQLTypeWithArray<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 query<T, U, IsAuth extends boolean = false>(fn: QueryDefinition<T, U, IsAuth>["fn"], options: Omit<QueryDefinition<T, U, IsAuth>, "fn">): QueryDefinition<T, U, IsAuth>;
+declare function field<T, U, IsAuth extends boolean, Root>(fn: FieldResolverDefinition<T, U, Root, IsAuth>["fn"], options: Omit<FieldResolverDefinition<T, U, Root, IsAuth>, "fn">): FieldResolverDefinition<T, U, Root, IsAuth>;
 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, any, X>> = Record<string, FieldResolverDefinition<any, any, any, X>>>(type: ClassType, queries: T): {
+declare function FieldLibrary<X extends object, T extends Record<string, FieldResolverDefinition<any, any, X, any>> = Record<string, FieldResolverDefinition<any, any, X, any>>>(type: ClassType, queries: T): {
     new (): {};
 };
 

package/dist/graphql/utils.d.ts

@@ -1,34 +1,31 @@
 import { GraphQLScalarType } from 'graphql';
-import { ClassType, Query, Arg } from 'type-graphql';
+import { Query, Arg, ClassType } from 'type-graphql';
 import { AuthorizedContext, Context } from './types.js';
 
 type ReturnOptions = Parameters<typeof Query>[1];
 type ArgsOptions = Parameters<typeof Arg>[2];
-type Values = object | string | number | boolean;
-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, IsAuth extends boolean> {
-    output: T extends object ? ClassType<DeepPartial<T>> | [ClassType<DeepPartial<T>>] : OtherTypes<T>;
+type ParsedGQLType<T> = T extends ClassType<infer U> ? U : T extends GraphQLScalarType<infer U> ? U : T extends Record<infer K, string | number> ? T[K] : T;
+type ParsedGQLTypeWithArray<T> = T extends Array<infer U> ? ParsedGQLType<U>[] : ParsedGQLType<T>;
+interface BaseDefinition<T, U, IsAuth extends boolean = false> {
+    output: T;
     outputOptions?: ReturnOptions;
-    input?: U extends object ? ClassType<U> | [ClassType<U>] : OtherTypes<U>;
+    input?: U;
     inputOptions?: ArgsOptions;
     authorized?: IsAuth;
 }
-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[];
+interface QueryDefinition<T, U, IsAuth extends boolean = false> extends BaseDefinition<T, U, IsAuth> {
+    fn: (ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithArray<U>) => Promise<ParsedGQLTypeWithArray<T>> | ParsedGQLTypeWithArray<T>;
     mutation?: boolean;
 }
-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[];
+interface FieldResolverDefinition<T, U, Root, IsAuth extends boolean = false> extends BaseDefinition<T, U, IsAuth> {
+    fn: (root: Root, ctx: IsAuth extends true ? AuthorizedContext : Context, data: ParsedGQLTypeWithArray<U>) => Promise<ParsedGQLTypeWithArray<T>> | ParsedGQLTypeWithArray<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 query<T, U, IsAuth extends boolean = false>(fn: QueryDefinition<T, U, IsAuth>["fn"], options: Omit<QueryDefinition<T, U, IsAuth>, "fn">): QueryDefinition<T, U, IsAuth>;
+declare function field<T, U, IsAuth extends boolean, Root>(fn: FieldResolverDefinition<T, U, Root, IsAuth>["fn"], options: Omit<FieldResolverDefinition<T, U, Root, IsAuth>, "fn">): FieldResolverDefinition<T, U, Root, IsAuth>;
 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, any, X>> = Record<string, FieldResolverDefinition<any, any, any, X>>>(type: ClassType, queries: T): {
+declare function FieldLibrary<X extends object, T extends Record<string, FieldResolverDefinition<any, any, X, any>> = Record<string, FieldResolverDefinition<any, any, X, any>>>(type: ClassType, queries: T): {
     new (): {};
 };
 

package/package.json

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