naystack 1.2.17 → 1.2.20

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

@@ -17,16 +17,40 @@ var __copyProps = (to, from, except, desc) => {
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// src/auth/email/client.ts
+// src/auth/email/client.tsx
 var client_exports = {};
 __export(client_exports, {
-  getEmailAuthUtils: () => getEmailAuthUtils
+  TokenContext: () => TokenContext,
+  getApolloWrapper: () => getApolloWrapper,
+  getEmailAuthUtils: () => getEmailAuthUtils,
+  useSetToken: () => useSetToken,
+  useToken: () => useToken
 });
 module.exports = __toCommonJS(client_exports);
-var import_client = require("naystack/graphql/client");
 var import_react = require("react");
+var TokenContext = (0, import_react.createContext)({
+  token: null,
+  setToken: () => null
+});
+var getApolloWrapper = (endpoint) => ({ children }) => {
+  const [token, setToken] = (0, import_react.useState)(null);
+  (0, import_react.useEffect)(() => {
+    fetch(endpoint, {
+      credentials: "include"
+    }).then((res) => res.json()).then((data) => setToken(data.accessToken));
+  }, []);
+  return /* @__PURE__ */ React.createElement(TokenContext.Provider, { value: { token, setToken } }, children);
+};
+function useToken() {
+  const { token } = (0, import_react.useContext)(TokenContext);
+  return token;
+}
+function useSetToken() {
+  const { setToken } = (0, import_react.useContext)(TokenContext);
+  return setToken;
+}
 function useSignUpWithEmail(endpoint) {
-  const setToken = (0, import_client.useSetToken)();
+  const setToken = useSetToken();
   return (0, import_react.useCallback)(
     async (data) => {
       const res = await fetch(endpoint, {
@@ -45,7 +69,7 @@ function useSignUpWithEmail(endpoint) {
   );
 }
 function useLoginWithEmail(endpoint) {
-  const setToken = (0, import_client.useSetToken)();
+  const setToken = useSetToken();
   return (0, import_react.useCallback)(
     async (data) => {
       const res = await fetch(endpoint, {
@@ -64,7 +88,7 @@ function useLoginWithEmail(endpoint) {
   );
 }
 function useLogout(endpoint) {
-  const setToken = (0, import_client.useSetToken)();
+  const setToken = useSetToken();
   return (0, import_react.useCallback)(
     async (data) => {
       setToken(null);
@@ -86,5 +110,9 @@ function getEmailAuthUtils(endpoint) {
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getEmailAuthUtils
+  TokenContext,
+  getApolloWrapper,
+  getEmailAuthUtils,
+  useSetToken,
+  useToken
 });

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

@@ -1,7 +1,19 @@
+import * as react from 'react';
+import { Dispatch, SetStateAction } from 'react';
+
+declare const TokenContext: react.Context<{
+    token: string | null;
+    setToken: Dispatch<SetStateAction<string | null>>;
+}>;
+declare const getApolloWrapper: (endpoint: string) => ({ children }: {
+    children: React.ReactNode;
+}) => react.JSX.Element;
+declare function useToken(): string | null;
+declare function useSetToken(): Dispatch<SetStateAction<string | null>>;
 declare function getEmailAuthUtils(endpoint: string): {
     useSignUp: () => (data: object) => Promise<string | null>;
     useLogin: () => (data: object) => Promise<string | null>;
     useLogout: () => (data?: object) => Promise<void>;
 };
 
-export { getEmailAuthUtils };
+export { TokenContext, getApolloWrapper, getEmailAuthUtils, useSetToken, useToken };

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

@@ -1,7 +1,19 @@
+import * as react from 'react';
+import { Dispatch, SetStateAction } from 'react';
+
+declare const TokenContext: react.Context<{
+    token: string | null;
+    setToken: Dispatch<SetStateAction<string | null>>;
+}>;
+declare const getApolloWrapper: (endpoint: string) => ({ children }: {
+    children: React.ReactNode;
+}) => react.JSX.Element;
+declare function useToken(): string | null;
+declare function useSetToken(): Dispatch<SetStateAction<string | null>>;
 declare function getEmailAuthUtils(endpoint: string): {
     useSignUp: () => (data: object) => Promise<string | null>;
     useLogin: () => (data: object) => Promise<string | null>;
     useLogout: () => (data?: object) => Promise<void>;
 };
 
-export { getEmailAuthUtils };
+export { TokenContext, getApolloWrapper, getEmailAuthUtils, useSetToken, useToken };

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

@@ -1,6 +1,32 @@
-// src/auth/email/client.ts
-import { useSetToken } from "naystack/graphql/client";
-import { useCallback } from "react";
+// src/auth/email/client.tsx
+import {
+  createContext,
+  useCallback,
+  useContext,
+  useEffect,
+  useState
+} from "react";
+var TokenContext = createContext({
+  token: null,
+  setToken: () => null
+});
+var getApolloWrapper = (endpoint) => ({ children }) => {
+  const [token, setToken] = useState(null);
+  useEffect(() => {
+    fetch(endpoint, {
+      credentials: "include"
+    }).then((res) => res.json()).then((data) => setToken(data.accessToken));
+  }, []);
+  return /* @__PURE__ */ React.createElement(TokenContext.Provider, { value: { token, setToken } }, children);
+};
+function useToken() {
+  const { token } = useContext(TokenContext);
+  return token;
+}
+function useSetToken() {
+  const { setToken } = useContext(TokenContext);
+  return setToken;
+}
 function useSignUpWithEmail(endpoint) {
   const setToken = useSetToken();
   return useCallback(
@@ -61,5 +87,9 @@ function getEmailAuthUtils(endpoint) {
   };
 }
 export {
-  getEmailAuthUtils
+  TokenContext,
+  getApolloWrapper,
+  getEmailAuthUtils,
+  useSetToken,
+  useToken
 };

package/dist/client/hooks.d.mts

@@ -1,6 +1,6 @@
-import * as React from 'react';
+import * as react from 'react';
 
-declare function useVisibility(onVisible?: () => void): React.RefObject<null>;
+declare function useVisibility(onVisible?: () => void): react.RefObject<null>;
 declare function useBreakpoint(query: string): boolean | null;
 
 export { useBreakpoint, useVisibility };

package/dist/client/hooks.d.ts

@@ -1,6 +1,6 @@
-import * as React from 'react';
+import * as react from 'react';
 
-declare function useVisibility(onVisible?: () => void): React.RefObject<null>;
+declare function useVisibility(onVisible?: () => void): react.RefObject<null>;
 declare function useBreakpoint(query: string): boolean | null;
 
 export { useBreakpoint, useVisibility };

package/dist/file/client.cjs.js

@@ -20,32 +20,29 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/file/client.ts
 var client_exports = {};
 __export(client_exports, {
-  getHandleImageUpload: () => getHandleImageUpload
+  getUseFileUpload: () => getUseFileUpload
 });
 module.exports = __toCommonJS(client_exports);
-var getHandleImageUpload = (route) => ({
-  file,
-  type,
-  token,
-  data,
-  sync
-}) => {
-  const formData = new FormData();
-  formData.append("type", type);
-  if (file) formData.append("file", file);
-  if (sync) formData.append("sync", sync.toString());
-  if (data) formData.append("data", JSON.stringify(data));
-  return fetch(route, {
-    method: "PUT",
-    body: formData,
-    headers: {
-      Authorization: `Bearer ${token}`
-    }
-  }).then(
-    async (res) => await res.json() || null
-  );
+var import_client = require("naystack/auth/email/client");
+var getUseFileUpload = (route) => () => {
+  const token = (0, import_client.useToken)();
+  return (file, type, data) => {
+    const formData = new FormData();
+    formData.append("type", type);
+    formData.append("file", file);
+    if (data) formData.append("data", JSON.stringify(data));
+    return fetch(route, {
+      method: "PUT",
+      body: formData,
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    }).then(
+      async (res) => await res.json() || null
+    );
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getHandleImageUpload
+  getUseFileUpload
 });

package/dist/file/client.d.mts

@@ -1,13 +1,7 @@
-declare const getHandleImageUpload: (route: string) => ({ file, type, token, data, sync, }: {
-    file?: File | Blob;
-    token: string;
-    type: string;
-    sync?: boolean;
-    data?: object;
-}) => Promise<ImageUploadResponseType>;
-interface ImageUploadResponseType {
+declare const getUseFileUpload: (route: string) => () => (file: File | Blob, type: string, data?: object) => Promise<FileUploadResponseType>;
+interface FileUploadResponseType {
     url?: string;
-    response?: object;
+    onUploadResponse?: object;
 }
 
-export { type ImageUploadResponseType, getHandleImageUpload };
+export { getUseFileUpload };

package/dist/file/client.d.ts

@@ -1,13 +1,7 @@
-declare const getHandleImageUpload: (route: string) => ({ file, type, token, data, sync, }: {
-    file?: File | Blob;
-    token: string;
-    type: string;
-    sync?: boolean;
-    data?: object;
-}) => Promise<ImageUploadResponseType>;
-interface ImageUploadResponseType {
+declare const getUseFileUpload: (route: string) => () => (file: File | Blob, type: string, data?: object) => Promise<FileUploadResponseType>;
+interface FileUploadResponseType {
     url?: string;
-    response?: object;
+    onUploadResponse?: object;
 }
 
-export { type ImageUploadResponseType, getHandleImageUpload };
+export { getUseFileUpload };

package/dist/file/client.esm.js

@@ -1,26 +1,23 @@
 // src/file/client.ts
-var getHandleImageUpload = (route) => ({
-  file,
-  type,
-  token,
-  data,
-  sync
-}) => {
-  const formData = new FormData();
-  formData.append("type", type);
-  if (file) formData.append("file", file);
-  if (sync) formData.append("sync", sync.toString());
-  if (data) formData.append("data", JSON.stringify(data));
-  return fetch(route, {
-    method: "PUT",
-    body: formData,
-    headers: {
-      Authorization: `Bearer ${token}`
-    }
-  }).then(
-    async (res) => await res.json() || null
-  );
+import { useToken } from "naystack/auth/email/client";
+var getUseFileUpload = (route) => () => {
+  const token = useToken();
+  return (file, type, data) => {
+    const formData = new FormData();
+    formData.append("type", type);
+    formData.append("file", file);
+    if (data) formData.append("data", JSON.stringify(data));
+    return fetch(route, {
+      method: "PUT",
+      body: formData,
+      headers: {
+        Authorization: `Bearer ${token}`
+      }
+    }).then(
+      async (res) => await res.json() || null
+    );
+  };
 };
 export {
-  getHandleImageUpload
+  getUseFileUpload
 };

package/dist/file/index.cjs.js

@@ -25,7 +25,6 @@ __export(file_exports, {
 module.exports = __toCommonJS(file_exports);
 
 // src/file/put.ts
-var import_functions2 = require("@vercel/functions");
 var import_server3 = require("next/server");
 var import_uuid = require("uuid");
 
@@ -76,10 +75,8 @@ var getContext = (refreshKey, signingKey, req) => {
 };
 
 // src/file/utils.ts
-var import_node_crypto = require("crypto");
 var import_client_s3 = require("@aws-sdk/client-s3");
 var import_s3_request_presigner = require("@aws-sdk/s3-request-presigner");
-var import_functions = require("@vercel/functions");
 var getS3Client = (options) => new import_client_s3.S3Client({
   region: options.region,
   credentials: {
@@ -88,30 +85,34 @@ var getS3Client = (options) => new import_client_s3.S3Client({
   }
 });
 var getURLPrefix = (options) => `https://${options.bucket}.s3.${options.region}.amazonaws.com/`;
-function getHash(keys) {
-  return (0, import_node_crypto.createHash)("sha256").update(keys.join("/")).digest("hex");
+function getKey(keys) {
+  return typeof keys === "string" ? keys : keys.join("/");
 }
-var getUploadFileURL = (client, Bucket) => (keys, isPublic) => {
+var getUploadURL = (client, Bucket) => (keys) => {
   const command = new import_client_s3.PutObjectCommand({
     Bucket,
-    Key: getHash(keys),
-    ACL: isPublic ? "public-read" : void 0
+    Key: getKey(keys),
+    ACL: "public-read"
   });
   return (0, import_s3_request_presigner.getSignedUrl)(client, command, { expiresIn: 300 });
 };
-var getFileURL = (options) => (keys) => {
-  if (typeof keys === "string") return `${getURLPrefix(options)}${keys}`;
-  return `${getURLPrefix(options)}${getHash(keys)}`;
+var getDownloadURL = (options) => (keys) => {
+  return `${getURLPrefix(options)}${getKey(keys)}`;
 };
-var uploadImage = (client, options) => async (url, key, blob) => {
-  const photoBlob = blob || await fetch(url).then((file) => file.blob());
-  if (photoBlob) {
-    (0, import_functions.waitUntil)(uploadFile(client, options.bucket)(photoBlob, getHash(key)));
-    return getFileURL(options)(key);
+var uploadFile = (client, options) => async (keys, {
+  url,
+  blob
+}) => {
+  if (!blob && !url) return null;
+  const fileBlob = blob || await fetch(url).then((file) => file.blob());
+  if (fileBlob) {
+    const key = getKey(keys);
+    await uploadBlob(client, options.bucket)(fileBlob, key);
+    return getDownloadURL(options)(key);
   }
   return null;
 };
-var deleteImage = (client, options) => async (url) => {
+var deleteFile = (client, options) => async (url) => {
   const key = url.split(getURLPrefix(options))[1];
   if (key) {
     try {
@@ -128,7 +129,7 @@ var deleteImage = (client, options) => async (url) => {
   }
   return false;
 };
-var uploadFile = (client, Bucket) => async (file, key) => {
+var uploadBlob = (client, Bucket) => async (file, key) => {
   const fileBuffer = await file.arrayBuffer();
   return client.send(
     new import_client_s3.PutObjectCommand({
@@ -148,33 +149,25 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
   if (!ctx?.userId || ctx.isRefreshID)
     return import_server3.NextResponse.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
-  const type = formData.get("type");
-  const sync = Boolean(formData.get("sync"));
   const file = formData.get("file");
+  if (!file) return import_server3.NextResponse.json({ error: "no file" }, { status: 400 });
   const data = formData.get("data");
-  const imageKey = (0, import_uuid.v4)();
-  const url = file ? getFileURL(options)(imageKey) : null;
-  const handleKeyProcessing = async () => {
-    if (file) await uploadFile(client, options.bucket)(file, imageKey);
-    if (!type || !ctx.userId || ctx.isRefreshID) return;
-    const { deleteURL, response } = await options.processFile({
-      url,
-      type,
-      userId: ctx.userId,
-      data: typeof data === "string" ? JSON.parse(data) : void 0
-    });
-    if (deleteURL) await deleteImage(client, options)(deleteURL);
-    return response;
+  const inputData = {
+    type: formData.get("type") + "",
+    userId: ctx.userId,
+    data: typeof data === "string" ? JSON.parse(data) : void 0
   };
-  if (!sync) {
-    (0, import_functions2.waitUntil)(handleKeyProcessing());
-    return import_server3.NextResponse.json({ url });
-  } else {
-    return import_server3.NextResponse.json({
-      url,
-      response: await handleKeyProcessing()
-    });
-  }
+  const fileKey = options.getKey ? await options.getKey(inputData) : (0, import_uuid.v4)();
+  const url = getDownloadURL(options)(fileKey);
+  await uploadBlob(client, options.bucket)(file, fileKey);
+  const onUploadResponse = await options.onUpload({
+    ...inputData,
+    url
+  });
+  return import_server3.NextResponse.json({
+    url,
+    onUploadResponse
+  });
 };
 
 // src/file/setup.ts
@@ -182,11 +175,10 @@ function setupFileUpload(options) {
   const client = getS3Client(options);
   return {
     PUT: getFileUploadPutRoute(options, client),
-    getUploadFileURL: getUploadFileURL(client, options.bucket),
-    uploadImage: uploadImage(client, options),
-    deleteImage: deleteImage(client, options),
-    getFileURL: getFileURL(options),
-    uploadFile: uploadFile(client, options.bucket)
+    uploadFile: uploadFile(client, options),
+    deleteFile: deleteFile(client, options),
+    getUploadURL: getUploadURL(client, options.bucket),
+    getDownloadURL: getDownloadURL(options)
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/file/index.d.mts

@@ -1,3 +1,2 @@
 export { setupFileUpload } from './setup.mjs';
-import '@aws-sdk/client-s3';
 import 'next/server';

package/dist/file/index.d.ts

@@ -1,3 +1,2 @@
 export { setupFileUpload } from './setup.js';
-import '@aws-sdk/client-s3';
 import 'next/server';

package/dist/file/index.esm.js

@@ -1,5 +1,4 @@
 // src/file/put.ts
-import { waitUntil as waitUntil2 } from "@vercel/functions";
 import { NextResponse as NextResponse3 } from "next/server";
 import { v4 } from "uuid";
 
@@ -50,14 +49,12 @@ var getContext = (refreshKey, signingKey, req) => {
 };
 
 // src/file/utils.ts
-import { createHash } from "crypto";
 import {
   DeleteObjectCommand,
   PutObjectCommand,
   S3Client
 } from "@aws-sdk/client-s3";
 import { getSignedUrl } from "@aws-sdk/s3-request-presigner";
-import { waitUntil } from "@vercel/functions";
 var getS3Client = (options) => new S3Client({
   region: options.region,
   credentials: {
@@ -66,30 +63,34 @@ var getS3Client = (options) => new S3Client({
   }
 });
 var getURLPrefix = (options) => `https://${options.bucket}.s3.${options.region}.amazonaws.com/`;
-function getHash(keys) {
-  return createHash("sha256").update(keys.join("/")).digest("hex");
+function getKey(keys) {
+  return typeof keys === "string" ? keys : keys.join("/");
 }
-var getUploadFileURL = (client, Bucket) => (keys, isPublic) => {
+var getUploadURL = (client, Bucket) => (keys) => {
   const command = new PutObjectCommand({
     Bucket,
-    Key: getHash(keys),
-    ACL: isPublic ? "public-read" : void 0
+    Key: getKey(keys),
+    ACL: "public-read"
   });
   return getSignedUrl(client, command, { expiresIn: 300 });
 };
-var getFileURL = (options) => (keys) => {
-  if (typeof keys === "string") return `${getURLPrefix(options)}${keys}`;
-  return `${getURLPrefix(options)}${getHash(keys)}`;
+var getDownloadURL = (options) => (keys) => {
+  return `${getURLPrefix(options)}${getKey(keys)}`;
 };
-var uploadImage = (client, options) => async (url, key, blob) => {
-  const photoBlob = blob || await fetch(url).then((file) => file.blob());
-  if (photoBlob) {
-    waitUntil(uploadFile(client, options.bucket)(photoBlob, getHash(key)));
-    return getFileURL(options)(key);
+var uploadFile = (client, options) => async (keys, {
+  url,
+  blob
+}) => {
+  if (!blob && !url) return null;
+  const fileBlob = blob || await fetch(url).then((file) => file.blob());
+  if (fileBlob) {
+    const key = getKey(keys);
+    await uploadBlob(client, options.bucket)(fileBlob, key);
+    return getDownloadURL(options)(key);
   }
   return null;
 };
-var deleteImage = (client, options) => async (url) => {
+var deleteFile = (client, options) => async (url) => {
   const key = url.split(getURLPrefix(options))[1];
   if (key) {
     try {
@@ -106,7 +107,7 @@ var deleteImage = (client, options) => async (url) => {
   }
   return false;
 };
-var uploadFile = (client, Bucket) => async (file, key) => {
+var uploadBlob = (client, Bucket) => async (file, key) => {
   const fileBuffer = await file.arrayBuffer();
   return client.send(
     new PutObjectCommand({
@@ -126,33 +127,25 @@ var getFileUploadPutRoute = (options, client) => async (req) => {
   if (!ctx?.userId || ctx.isRefreshID)
     return NextResponse3.json({ error: "unauthorized" }, { status: 401 });
   const formData = await req.formData();
-  const type = formData.get("type");
-  const sync = Boolean(formData.get("sync"));
   const file = formData.get("file");
+  if (!file) return NextResponse3.json({ error: "no file" }, { status: 400 });
   const data = formData.get("data");
-  const imageKey = v4();
-  const url = file ? getFileURL(options)(imageKey) : null;
-  const handleKeyProcessing = async () => {
-    if (file) await uploadFile(client, options.bucket)(file, imageKey);
-    if (!type || !ctx.userId || ctx.isRefreshID) return;
-    const { deleteURL, response } = await options.processFile({
-      url,
-      type,
-      userId: ctx.userId,
-      data: typeof data === "string" ? JSON.parse(data) : void 0
-    });
-    if (deleteURL) await deleteImage(client, options)(deleteURL);
-    return response;
+  const inputData = {
+    type: formData.get("type") + "",
+    userId: ctx.userId,
+    data: typeof data === "string" ? JSON.parse(data) : void 0
   };
-  if (!sync) {
-    waitUntil2(handleKeyProcessing());
-    return NextResponse3.json({ url });
-  } else {
-    return NextResponse3.json({
-      url,
-      response: await handleKeyProcessing()
-    });
-  }
+  const fileKey = options.getKey ? await options.getKey(inputData) : v4();
+  const url = getDownloadURL(options)(fileKey);
+  await uploadBlob(client, options.bucket)(file, fileKey);
+  const onUploadResponse = await options.onUpload({
+    ...inputData,
+    url
+  });
+  return NextResponse3.json({
+    url,
+    onUploadResponse
+  });
 };
 
 // src/file/setup.ts
@@ -160,11 +153,10 @@ function setupFileUpload(options) {
   const client = getS3Client(options);
   return {
     PUT: getFileUploadPutRoute(options, client),
-    getUploadFileURL: getUploadFileURL(client, options.bucket),
-    uploadImage: uploadImage(client, options),
-    deleteImage: deleteImage(client, options),
-    getFileURL: getFileURL(options),
-    uploadFile: uploadFile(client, options.bucket)
+    uploadFile: uploadFile(client, options),
+    deleteFile: deleteFile(client, options),
+    getUploadURL: getUploadURL(client, options.bucket),
+    getDownloadURL: getDownloadURL(options)
   };
 }
 export {