image-exporter 1.0.9 → 1.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "image-exporter",
-  "version": "1.0.9",
+  "version": "1.1.1",
   "description": "Easily download one or more DOM elements as images",
   "main": "src/index.ts",
   "type": "module",
@@ -48,6 +48,6 @@
     "concurrently": "^9.1.2",
     "http-server": "^14.1.1",
     "typescript": "^5.7.3",
-    "vite": "^5.4.14"
+    "vite": "^6.2.0"
   }
 }

package/src/capture/download-images.ts

@@ -1,6 +1,7 @@
 import { Config, Image, Label } from "../types";
 import download from "downloadjs";
 import JSZip from "jszip";
+import { defaultConfig } from "../config";
 
 /**
  * downloadImages
@@ -9,13 +10,20 @@ import JSZip from "jszip";
  *
  * If multiple images are provided, they will be zipped and downloaded as a file.
  */
-export async function downloadImages(images: Image[], config: Config) {
-  if (images.length === 1) {
-    const image = images[0];
+export async function downloadImages(
+  images: Image[],
+  userConfig: Config = defaultConfig
+) {
+  const config = userConfig ? { ...defaultConfig, ...userConfig } : defaultConfig;
 
+  // Ensure unique filenames before downloading
+  const uniqueImages = ensureUniqueFileNames(images);
+
+  if (uniqueImages.length === 1) {
+    const image = uniqueImages[0];
     await download(image.dataURL, image.fileName);
-  } else if (images.length > 1) {
-    const imagesBlob = await zipUpImages(images);
+  } else if (uniqueImages.length > 1) {
+    const imagesBlob = await zipUpImages(uniqueImages);
     if (imagesBlob) await download(imagesBlob, parseLabel(config));
   }
 }
@@ -67,3 +75,41 @@ function parseLabel(config: Config): Label {
     return "images";
   }
 }
+
+/**
+ * ensureUniqueFileNames
+ *
+ * Ensures all image filenames are unique by adding -2, -3, etc. to duplicates
+ * before the file extension.
+ */
+function ensureUniqueFileNames(images: Image[]): Image[] {
+  const fileNameMap = new Map<string, number>();
+
+  return images.map((image) => {
+    const { fileName } = image;
+
+    // Split the filename into base and extension
+    const lastDotIndex = fileName.lastIndexOf(".");
+    const baseName = lastDotIndex !== -1 ? fileName.substring(0, lastDotIndex) : fileName;
+    const extension = lastDotIndex !== -1 ? fileName.substring(lastDotIndex) : "";
+
+    // Check if this base filename has been seen before
+    if (!fileNameMap.has(fileName)) {
+      fileNameMap.set(fileName, 1);
+      return image;
+    }
+
+    // If it's a duplicate, increment the counter and create a new filename
+    const count = fileNameMap.get(fileName)! + 1;
+    fileNameMap.set(fileName, count);
+
+    // Create new filename with -2, -3, etc. before the extension
+    const newFileName = `${baseName}-${count}${extension}`;
+
+    // Return a new image object with the updated filename
+    return {
+      ...image,
+      fileName: newFileName,
+    };
+  });
+}

package/src/index.ts

@@ -4,11 +4,13 @@
 /*                            by briantuckerdesign                            */
 /* -------------------------------------------------------------------------- */
 import { capture } from "./capture";
+import { downloadImages } from "./capture/download-images";
 
 /** Exports for use in browser */
 if (typeof window !== "undefined") {
   (window as any).imageExporter = capture;
+  (window as any).imageExporterDownload = downloadImages;
 }
 
 /** Exports for use as an imported package */
-export { capture };
+export { capture, downloadImages };