next-tinacms-dos 0.0.0-c8b1d84-20241003015733 → 0.0.0-c9e72f6-20251216031141

package/README.md

@@ -92,7 +92,7 @@ Call `createMediaHandler` to set up routes and connect your instance of the Medi
 
 Import `isAuthorized` from [`@tinacms/auth`](https://github.com/tinacms/tinacms/tree/main/packages/%40tinacms/auth).
 
-The `authorized` key will make it so only authorized users within Tina Cloud can upload and make media edits.
+The `authorized` key will make it so only authorized users within TinaCloud can upload and make media edits.
 
 
 ```

package/dist/handlers.js

@@ -1,46 +1,21 @@
-var __create = Object.create;
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
 // src/handlers.ts
-var handlers_exports = {};
-__export(handlers_exports, {
-  createMediaHandler: () => createMediaHandler,
-  mediaHandlerConfig: () => mediaHandlerConfig
-});
-module.exports = __toCommonJS(handlers_exports);
-var import_client_s3 = require("@aws-sdk/client-s3");
-var import_path = __toESM(require("path"));
-var import_fs = __toESM(require("fs"));
-var import_multer = __toESM(require("multer"));
-var import_util = require("util");
+import {
+  S3Client,
+  ListObjectsCommand,
+  PutObjectCommand,
+  DeleteObjectCommand
+} from "@aws-sdk/client-s3";
+import path from "path";
+import fs from "fs";
+import multer from "multer";
+import { promisify } from "util";
 var mediaHandlerConfig = {
   api: {
     bodyParser: false
   }
 };
 var createMediaHandler = (config, options) => {
-  const client = new import_client_s3.S3Client(config.config);
+  const client = new S3Client(config.config);
   const bucket = config.bucket;
   let mediaRoot = config.mediaRoot || "";
   if (mediaRoot) {
@@ -51,7 +26,7 @@ var createMediaHandler = (config, options) => {
       mediaRoot = mediaRoot.substr(1);
     }
   }
-  let cdnUrl = (options == null ? void 0 : options.cdnUrl) || config.config.endpoint.toString().replace(/http(s|):\/\//i, `https://${bucket}.`);
+  let cdnUrl = options?.cdnUrl || config.config.endpoint.toString().replace(/http(s|):\/\//i, `https://${bucket}.`);
   cdnUrl = cdnUrl + (cdnUrl.endsWith("/") ? "" : "/");
   return async (req, res) => {
     const isAuthorized = await config.authorized(req, res);
@@ -72,10 +47,11 @@ var createMediaHandler = (config, options) => {
   };
 };
 async function uploadMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
-  var _a;
-  const upload = (0, import_util.promisify)(
-    (0, import_multer.default)({
-      storage: import_multer.default.diskStorage({
+  const upload = promisify(
+    multer({
+      storage: multer.diskStorage({
+        // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+        // @ts-ignore
         directory: (req2, file, cb) => {
           cb(null, "/tmp");
         },
@@ -88,20 +64,19 @@ async function uploadMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
   await upload(req, res);
   const { directory } = req.body;
   let prefix = directory.replace(/^\//, "").replace(/\/$/, "");
-  if (prefix)
-    prefix = prefix + "/";
+  if (prefix) prefix = prefix + "/";
   const filePath = req.file.path;
-  const fileType = (_a = req.file) == null ? void 0 : _a.mimetype;
-  const blob = import_fs.default.readFileSync(filePath);
-  const filename = import_path.default.basename(filePath);
+  const fileType = req.file?.mimetype;
+  const blob = fs.readFileSync(filePath);
+  const filename = path.basename(filePath);
   const params = {
     Bucket: bucket,
-    Key: mediaRoot ? import_path.default.join(mediaRoot, prefix + filename) : prefix + filename,
+    Key: mediaRoot ? path.join(mediaRoot, prefix + filename) : prefix + filename,
     Body: blob,
     ACL: "public-read",
     ContentType: fileType || "application/octet-stream"
   };
-  const command = new import_client_s3.PutObjectCommand(params);
+  const command = new PutObjectCommand(params);
   try {
     const src = cdnUrl + prefix + filename;
     await client.send(command);
@@ -115,7 +90,7 @@ async function uploadMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
         "400x400": src,
         "1000x1000": src
       },
-      src: cdnUrl + (mediaRoot ? import_path.default.join(mediaRoot, prefix + filename) : prefix + filename)
+      src: cdnUrl + (mediaRoot ? path.join(mediaRoot, prefix + filename) : prefix + filename)
     });
   } catch (e) {
     console.error("Error uploading media");
@@ -140,7 +115,6 @@ function stripMediaRoot(mediaRoot, key) {
   return keyParts.join("/");
 }
 async function listMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
-  var _a;
   try {
     const {
       directory = "",
@@ -148,18 +122,17 @@ async function listMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
       offset
     } = req.query;
     let prefix = directory.replace(/^\//, "").replace(/\/$/, "");
-    if (prefix)
-      prefix = prefix + "/";
+    if (prefix) prefix = prefix + "/";
     const params = {
       Bucket: bucket,
       Delimiter: "/",
-      Prefix: mediaRoot ? import_path.default.join(mediaRoot, prefix) : prefix,
-      Marker: offset == null ? void 0 : offset.toString(),
+      Prefix: mediaRoot ? path.join(mediaRoot, prefix) : prefix,
+      Marker: offset?.toString(),
       MaxKeys: directory && !offset ? +limit + 1 : +limit
     };
-    const response = await client.send(new import_client_s3.ListObjectsCommand(params));
+    const response = await client.send(new ListObjectsCommand(params));
     const items = [];
-    (_a = response.CommonPrefixes) == null ? void 0 : _a.forEach(({ Prefix }) => {
+    response.CommonPrefixes?.forEach(({ Prefix }) => {
       const strippedPrefix = stripMediaRoot(mediaRoot, Prefix);
       if (!strippedPrefix) {
         return;
@@ -167,8 +140,8 @@ async function listMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
       items.push({
         id: Prefix,
         type: "dir",
-        filename: import_path.default.basename(strippedPrefix),
-        directory: import_path.default.dirname(strippedPrefix)
+        filename: path.basename(strippedPrefix),
+        directory: path.dirname(strippedPrefix)
       });
     });
     items.push(
@@ -190,23 +163,24 @@ async function listMedia(req, res, client, bucket, mediaRoot, cdnUrl) {
   }
 }
 var findErrorMessage = (e) => {
-  if (typeof e == "string")
-    return e;
-  if (e.message)
-    return e.message;
-  if (e.error && e.error.message)
-    return e.error.message;
+  if (typeof e == "string") return e;
+  if (e.message) return e.message;
+  if (e.error && e.error.message) return e.error.message;
   return "an error occurred";
 };
 async function deleteAsset(req, res, client, bucket) {
   const { media } = req.query;
-  const [, objectKey] = media;
+  let [, objectKey] = media;
+  const objectKeyIsSplit = media && media.length > 2 && typeof media !== "string";
+  if (objectKeyIsSplit) {
+    objectKey = media.slice(1).join("/");
+  }
   const params = {
     Bucket: bucket,
     Key: objectKey
   };
   try {
-    const data = await client.send(new import_client_s3.DeleteObjectCommand(params));
+    const data = await client.send(new DeleteObjectCommand(params));
     res.json(data);
   } catch (err) {
     console.error("Error deleting media");
@@ -219,8 +193,8 @@ async function deleteAsset(req, res, client, bucket) {
 function getDOSToTinaFunc(cdnUrl, mediaRoot) {
   return function dosToTina(file) {
     const strippedKey = stripMediaRoot(mediaRoot, file.Key);
-    const filename = import_path.default.basename(strippedKey);
-    const directory = import_path.default.dirname(strippedKey) + "/";
+    const filename = path.basename(strippedKey);
+    const directory = path.dirname(strippedKey) + "/";
     const src = cdnUrl + file.Key;
     return {
       id: file.Key,
@@ -236,8 +210,7 @@ function getDOSToTinaFunc(cdnUrl, mediaRoot) {
     };
   };
 }
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
+export {
   createMediaHandler,
   mediaHandlerConfig
-});
+};

package/dist/index.js

@@ -1,133 +1,130 @@
-(function(global, factory) {
-  typeof exports === "object" && typeof module !== "undefined" ? factory(exports, require("tinacms")) : typeof define === "function" && define.amd ? define(["exports", "tinacms"], factory) : (global = typeof globalThis !== "undefined" ? globalThis : global || self, factory(global["next-tinacms-dos"] = {}, global.NOOP));
-})(this, function(exports2, tinacms) {
-  "use strict";
-  class MediaListError extends Error {
-    constructor(config) {
-      super(config.message);
-      this.ERR_TYPE = "MediaListError";
-      this.title = config.title;
-      this.docsLink = config.docsLink;
-    }
+import { DEFAULT_MEDIA_UPLOAD_TYPES } from "tinacms";
+class MediaListError extends Error {
+  constructor(config) {
+    super(config.message);
+    this.ERR_TYPE = "MediaListError";
+    this.title = config.title;
+    this.docsLink = config.docsLink;
   }
-  const E_DEFAULT = new MediaListError({
-    title: "An Error Occurred",
-    message: "Something went wrong fetching your media from Digital Ocean Space.",
-    docsLink: "https://tina.io/packages/next-tinacms-dos"
-  });
-  const E_UNAUTHORIZED = new MediaListError({
-    title: "Unauthorized",
-    message: "You don't have access to this resource.",
-    docsLink: "https://tina.io/packages/next-tinacms-dos"
-  });
-  const E_CONFIG = new MediaListError({
-    title: "Missing Credentials",
-    message: "Unable to connect to Digital Ocean Space because one or more environment variables are missing.",
-    docsLink: "https://tina.io/docs/media-dos/"
-  });
-  const E_KEY_FAIL = new MediaListError({
-    title: "Bad Credentials",
-    message: "Unable to connect to Digital Ocean Space because one or more environment variables are misconfigured.",
-    docsLink: "https://tina.io/docs/media-dos/"
-  });
-  const E_BAD_ROUTE = new MediaListError({
-    title: "Bad Route",
-    message: "The Digital Ocean Space API route is missing or misconfigured.",
-    docsLink: "https://tina.io/packages/next-tinacms-dos/#set-up-api-routes"
-  });
-  const interpretErrorMessage = (message) => {
-    switch (message) {
-      case "Must supply cloud_name":
-      case "Must supply api_key":
-      case "Must supply api_secret":
-        return E_CONFIG;
-      case "unknown api_key":
-        return E_KEY_FAIL;
-      default:
-        return E_DEFAULT;
-    }
-  };
-  class DOSMediaStore {
-    constructor() {
-      this.fetchFunction = (input, init) => {
-        return fetch(input, init);
-      };
-      this.accept = tinacms.DEFAULT_MEDIA_UPLOAD_TYPES;
-      this.parse = (img) => {
-        return img.src;
-      };
-    }
-    async persist(media) {
-      const newFiles = [];
-      for (const item of media) {
-        const { file, directory } = item;
-        const formData = new FormData();
-        formData.append("file", file);
-        formData.append("directory", directory);
-        formData.append("filename", file.name);
-        const res = await this.fetchFunction(`/api/dos/media`, {
-          method: "POST",
-          body: formData
-        });
-        if (res.status != 200) {
-          const responseData = await res.json();
-          throw new Error(responseData.message);
-        }
-        const fileRes = await res.json();
-        await new Promise((resolve) => {
-          setTimeout(resolve, 2e3);
-        });
-        newFiles.push(fileRes);
+}
+const E_DEFAULT = new MediaListError({
+  title: "An Error Occurred",
+  message: "Something went wrong fetching your media from Digital Ocean Space.",
+  docsLink: "https://tina.io/docs/r/digital-ocean-spaces"
+});
+const E_UNAUTHORIZED = new MediaListError({
+  title: "Unauthorized",
+  message: "You don't have access to this resource.",
+  docsLink: "https://tina.io/docs/r/digital-ocean-spaces"
+});
+const E_CONFIG = new MediaListError({
+  title: "Missing Credentials",
+  message: "Unable to connect to Digital Ocean Space because one or more environment variables are missing.",
+  docsLink: "https://tina.io/docs/r/digital-ocean-spaces/"
+});
+const E_KEY_FAIL = new MediaListError({
+  title: "Bad Credentials",
+  message: "Unable to connect to Digital Ocean Space because one or more environment variables are misconfigured.",
+  docsLink: "https://tina.io/docs/r/digital-ocean-spaces/"
+});
+const E_BAD_ROUTE = new MediaListError({
+  title: "Bad Route",
+  message: "The Digital Ocean Space API route is missing or misconfigured.",
+  docsLink: "https://tina.io/docs/r/digital-ocean-spaces/#set-up-api-routes"
+});
+const interpretErrorMessage = (message) => {
+  switch (message) {
+    case "Must supply cloud_name":
+    case "Must supply api_key":
+    case "Must supply api_secret":
+      return E_CONFIG;
+    case "unknown api_key":
+      return E_KEY_FAIL;
+    default:
+      return E_DEFAULT;
+  }
+};
+class DOSMediaStore {
+  constructor() {
+    this.fetchFunction = (input, init) => {
+      return fetch(input, init);
+    };
+    this.accept = DEFAULT_MEDIA_UPLOAD_TYPES;
+    this.parse = (img) => {
+      return img.src;
+    };
+  }
+  async persist(media) {
+    const newFiles = [];
+    for (const item of media) {
+      const { file, directory } = item;
+      const formData = new FormData();
+      formData.append("file", file);
+      formData.append("directory", directory);
+      formData.append("filename", file.name);
+      const res = await this.fetchFunction(`/api/dos/media`, {
+        method: "POST",
+        body: formData
+      });
+      if (res.status != 200) {
+        const responseData = await res.json();
+        throw new Error(responseData.message);
       }
-      return newFiles;
-    }
-    async delete(media) {
-      await this.fetchFunction(`/api/dos/media/${encodeURIComponent(media.id)}`, {
-        method: "DELETE"
+      const fileRes = await res.json();
+      await new Promise((resolve) => {
+        setTimeout(resolve, 2e3);
       });
+      newFiles.push(fileRes);
     }
-    async list(options) {
-      const query = this.buildQuery(options);
-      const response = await this.fetchFunction("/api/dos/media" + query);
-      if (response.status == 401) {
-        throw E_UNAUTHORIZED;
-      }
-      if (response.status == 404) {
-        throw E_BAD_ROUTE;
-      }
-      if (response.status >= 500) {
-        const { e } = await response.json();
-        const error = interpretErrorMessage(e);
-        throw error;
-      }
-      const { items, offset } = await response.json();
-      return {
-        items: items.map((item) => item),
-        nextOffset: offset
-      };
+    return newFiles;
+  }
+  async delete(media) {
+    await this.fetchFunction(`/api/dos/media/${encodeURIComponent(media.id)}`, {
+      method: "DELETE"
+    });
+  }
+  async list(options) {
+    const query = this.buildQuery(options);
+    const response = await this.fetchFunction("/api/dos/media" + query);
+    if (response.status == 401) {
+      throw E_UNAUTHORIZED;
     }
-    buildQuery(options) {
-      const params = Object.keys(options).filter((key) => options[key] !== "" && options[key] !== void 0).map((key) => `${key}=${options[key]}`).join("&");
-      return `?${params}`;
+    if (response.status == 404) {
+      throw E_BAD_ROUTE;
     }
-  }
-  class TinaCloudDOSMediaStore extends DOSMediaStore {
-    constructor(client) {
-      super();
-      this.client = client;
-      this.fetchFunction = async (input, init) => {
-        try {
-          const url = input.toString();
-          const query = `${url.includes("?") ? "&" : "?"}clientID=${client.clientId}`;
-          const res = client.authProvider.fetchWithToken(url + query, init);
-          return res;
-        } catch (error) {
-          console.error(error);
-        }
-      };
+    if (response.status >= 500) {
+      const { e } = await response.json();
+      const error = interpretErrorMessage(e);
+      throw error;
     }
+    const { items, offset } = await response.json();
+    return {
+      items: items.map((item) => item),
+      nextOffset: offset
+    };
   }
-  exports2.DOSMediaStore = DOSMediaStore;
-  exports2.TinaCloudDOSMediaStore = TinaCloudDOSMediaStore;
-  Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
-});
+  buildQuery(options) {
+    const params = Object.keys(options).filter((key) => options[key] !== "" && options[key] !== void 0).map((key) => `${key}=${options[key]}`).join("&");
+    return `?${params}`;
+  }
+}
+class TinaCloudDOSMediaStore extends DOSMediaStore {
+  constructor(client) {
+    super();
+    this.client = client;
+    this.fetchFunction = async (input, init) => {
+      try {
+        const url = input.toString();
+        const query = `${url.includes("?") ? "&" : "?"}clientID=${client.clientId}`;
+        const res = client.authProvider.fetchWithToken(url + query, init);
+        return res;
+      } catch (error) {
+        console.error(error);
+      }
+    };
+  }
+}
+export {
+  DOSMediaStore,
+  TinaCloudDOSMediaStore
+};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "next-tinacms-dos",
-  "version": "0.0.0-c8b1d84-20241003015733",
+  "version": "0.0.0-c9e72f6-20251216031141",
   "main": "dist/index.js",
-  "module": "dist/index.mjs",
+  "module": "./dist/index.js",
   "files": [
     "dist"
   ],
@@ -18,18 +18,18 @@
     ]
   },
   "peerDependencies": {
-    "tinacms": "0.0.0-c8b1d84-20241003015733"
+    "tinacms": "0.0.0-c9e72f6-20251216031141"
   },
   "devDependencies": {
     "@types/crypto-js": "^3.1.47",
     "@types/js-cookie": "^2.2.7",
-    "@types/node": "^22.7.4",
-    "next": "14.2.10",
+    "@types/node": "^22.13.1",
+    "next": "14.2.35",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
-    "typescript": "^5.6.2",
-    "@tinacms/scripts": "1.2.3",
-    "tinacms": "0.0.0-c8b1d84-20241003015733"
+    "typescript": "^5.7.3",
+    "@tinacms/scripts": "1.4.2",
+    "tinacms": "0.0.0-c9e72f6-20251216031141"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
@@ -39,7 +39,7 @@
     "directory": "packages/next-tinacms-dos"
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.658.1",
+    "@aws-sdk/client-s3": "^3.744.0",
     "multer": "1.4.5-lts.1"
   },
   "scripts": {

package/dist/index.mjs

@@ -1,130 +0,0 @@
-import { DEFAULT_MEDIA_UPLOAD_TYPES } from "tinacms";
-class MediaListError extends Error {
-  constructor(config) {
-    super(config.message);
-    this.ERR_TYPE = "MediaListError";
-    this.title = config.title;
-    this.docsLink = config.docsLink;
-  }
-}
-const E_DEFAULT = new MediaListError({
-  title: "An Error Occurred",
-  message: "Something went wrong fetching your media from Digital Ocean Space.",
-  docsLink: "https://tina.io/packages/next-tinacms-dos"
-});
-const E_UNAUTHORIZED = new MediaListError({
-  title: "Unauthorized",
-  message: "You don't have access to this resource.",
-  docsLink: "https://tina.io/packages/next-tinacms-dos"
-});
-const E_CONFIG = new MediaListError({
-  title: "Missing Credentials",
-  message: "Unable to connect to Digital Ocean Space because one or more environment variables are missing.",
-  docsLink: "https://tina.io/docs/media-dos/"
-});
-const E_KEY_FAIL = new MediaListError({
-  title: "Bad Credentials",
-  message: "Unable to connect to Digital Ocean Space because one or more environment variables are misconfigured.",
-  docsLink: "https://tina.io/docs/media-dos/"
-});
-const E_BAD_ROUTE = new MediaListError({
-  title: "Bad Route",
-  message: "The Digital Ocean Space API route is missing or misconfigured.",
-  docsLink: "https://tina.io/packages/next-tinacms-dos/#set-up-api-routes"
-});
-const interpretErrorMessage = (message) => {
-  switch (message) {
-    case "Must supply cloud_name":
-    case "Must supply api_key":
-    case "Must supply api_secret":
-      return E_CONFIG;
-    case "unknown api_key":
-      return E_KEY_FAIL;
-    default:
-      return E_DEFAULT;
-  }
-};
-class DOSMediaStore {
-  constructor() {
-    this.fetchFunction = (input, init) => {
-      return fetch(input, init);
-    };
-    this.accept = DEFAULT_MEDIA_UPLOAD_TYPES;
-    this.parse = (img) => {
-      return img.src;
-    };
-  }
-  async persist(media) {
-    const newFiles = [];
-    for (const item of media) {
-      const { file, directory } = item;
-      const formData = new FormData();
-      formData.append("file", file);
-      formData.append("directory", directory);
-      formData.append("filename", file.name);
-      const res = await this.fetchFunction(`/api/dos/media`, {
-        method: "POST",
-        body: formData
-      });
-      if (res.status != 200) {
-        const responseData = await res.json();
-        throw new Error(responseData.message);
-      }
-      const fileRes = await res.json();
-      await new Promise((resolve) => {
-        setTimeout(resolve, 2e3);
-      });
-      newFiles.push(fileRes);
-    }
-    return newFiles;
-  }
-  async delete(media) {
-    await this.fetchFunction(`/api/dos/media/${encodeURIComponent(media.id)}`, {
-      method: "DELETE"
-    });
-  }
-  async list(options) {
-    const query = this.buildQuery(options);
-    const response = await this.fetchFunction("/api/dos/media" + query);
-    if (response.status == 401) {
-      throw E_UNAUTHORIZED;
-    }
-    if (response.status == 404) {
-      throw E_BAD_ROUTE;
-    }
-    if (response.status >= 500) {
-      const { e } = await response.json();
-      const error = interpretErrorMessage(e);
-      throw error;
-    }
-    const { items, offset } = await response.json();
-    return {
-      items: items.map((item) => item),
-      nextOffset: offset
-    };
-  }
-  buildQuery(options) {
-    const params = Object.keys(options).filter((key) => options[key] !== "" && options[key] !== void 0).map((key) => `${key}=${options[key]}`).join("&");
-    return `?${params}`;
-  }
-}
-class TinaCloudDOSMediaStore extends DOSMediaStore {
-  constructor(client) {
-    super();
-    this.client = client;
-    this.fetchFunction = async (input, init) => {
-      try {
-        const url = input.toString();
-        const query = `${url.includes("?") ? "&" : "?"}clientID=${client.clientId}`;
-        const res = client.authProvider.fetchWithToken(url + query, init);
-        return res;
-      } catch (error) {
-        console.error(error);
-      }
-    };
-  }
-}
-export {
-  DOSMediaStore,
-  TinaCloudDOSMediaStore
-};