naystack 1.4.10 → 1.4.12

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/graphql/utils.d.mts

@@ -1,34 +1,35 @@
 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 NullableOptions<T, X extends boolean> = T & {
+    nullable: X;
 };
-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>;
-    outputOptions?: ReturnOptions;
-    input?: U extends object ? ClassType<U> | [ClassType<U>] : OtherTypes<U>;
-    inputOptions?: ArgsOptions;
+type ParsedGQLType<T> = T extends StringConstructor ? string : T extends NumberConstructor ? number : T extends BooleanConstructor ? boolean : T extends GraphQLScalarType<infer U> ? U : T extends ClassType<infer U> ? U : T extends Record<infer K, string | number> ? T[K] : void;
+type ParsedGQLTypeWithArray<T> = T extends Array<infer U> ? ParsedGQLType<U>[] : ParsedGQLType<T>;
+type ParsedGQLTypeWithNullability<T, IsNullable extends boolean> = IsNullable extends true ? ParsedGQLTypeWithArray<T> | null | undefined : ParsedGQLTypeWithArray<T>;
+interface BaseDefinition<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> {
+    output: T;
+    outputOptions?: NullableOptions<ReturnOptions, OutputNullable>;
+    input?: U;
+    inputOptions?: NullableOptions<ArgsOptions, InputNullable>;
     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, 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>) => Promise<ParsedGQLTypeWithNullability<T, OutputNullable>> | ParsedGQLTypeWithNullability<T, OutputNullable>;
     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[];
+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>;
+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>) => Promise<ParsedGQLTypeWithNullability<T, OutputNullable>> | ParsedGQLTypeWithNullability<T, OutputNullable>;
 }
-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 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>>>(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,35 @@
 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 NullableOptions<T, X extends boolean> = T & {
+    nullable: X;
 };
-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>;
-    outputOptions?: ReturnOptions;
-    input?: U extends object ? ClassType<U> | [ClassType<U>] : OtherTypes<U>;
-    inputOptions?: ArgsOptions;
+type ParsedGQLType<T> = T extends StringConstructor ? string : T extends NumberConstructor ? number : T extends BooleanConstructor ? boolean : T extends GraphQLScalarType<infer U> ? U : T extends ClassType<infer U> ? U : T extends Record<infer K, string | number> ? T[K] : void;
+type ParsedGQLTypeWithArray<T> = T extends Array<infer U> ? ParsedGQLType<U>[] : ParsedGQLType<T>;
+type ParsedGQLTypeWithNullability<T, IsNullable extends boolean> = IsNullable extends true ? ParsedGQLTypeWithArray<T> | null | undefined : ParsedGQLTypeWithArray<T>;
+interface BaseDefinition<T, U, IsAuth extends boolean = false, OutputNullable extends boolean = false, InputNullable extends boolean = false> {
+    output: T;
+    outputOptions?: NullableOptions<ReturnOptions, OutputNullable>;
+    input?: U;
+    inputOptions?: NullableOptions<ArgsOptions, InputNullable>;
     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, 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>) => Promise<ParsedGQLTypeWithNullability<T, OutputNullable>> | ParsedGQLTypeWithNullability<T, OutputNullable>;
     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[];
+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>;
+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>) => Promise<ParsedGQLTypeWithNullability<T, OutputNullable>> | ParsedGQLTypeWithNullability<T, OutputNullable>;
 }
-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 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>>>(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.10",
+  "version": "1.4.12",
   "description": "A stack built with Next + GraphQL + S3 + Auth",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",