image-exporter 1.0.6 → 1.0.7

package/dist/image-exporter.es.js

@@ -777,7 +777,8 @@ async function toJpeg(node, options = {}) {
 function handleFileNames(imageOptions, filenames) {
   let proposedFilename = imageOptions.label;
   if (imageOptions.includeScaleInLabel) proposedFilename += `_@${imageOptions.scale}x`;
-  proposedFilename += `.${imageOptions.format}`;
+  const extension = `.${imageOptions.format}`;
+  proposedFilename += extension;
   if (!filenames.includes(proposedFilename)) {
     filenames.push(proposedFilename);
     return proposedFilename;
@@ -787,18 +788,19 @@ function handleFileNames(imageOptions, filenames) {
   if (match) {
     const baseFilename = proposedFilename.replace(numberPattern, "");
     let counter = parseInt(match[1], 10);
-    while (filenames.includes(`${baseFilename}-${counter}`)) {
+    while (filenames.includes(`${baseFilename}-${counter}${extension}`)) {
       counter++;
     }
-    const newFilename = `${baseFilename}-${counter}`;
+    const newFilename = `${baseFilename}-${counter}${extension}`;
     filenames.push(newFilename);
     return newFilename;
   } else {
+    const baseFilename = proposedFilename.replace(extension, "");
     let counter = 2;
-    while (filenames.includes(`${proposedFilename}-${counter}`)) {
+    while (filenames.includes(`${baseFilename}-${counter}${extension}`)) {
       counter++;
     }
-    const newFilename = `${proposedFilename}-${counter}`;
+    const newFilename = `${baseFilename}-${counter}${extension}`;
     filenames.push(newFilename);
     return newFilename;
   }

package/dist/image-exporter.umd.js

@@ -782,7 +782,8 @@
   function handleFileNames(imageOptions, filenames) {
     let proposedFilename = imageOptions.label;
     if (imageOptions.includeScaleInLabel) proposedFilename += `_@${imageOptions.scale}x`;
-    proposedFilename += `.${imageOptions.format}`;
+    const extension = `.${imageOptions.format}`;
+    proposedFilename += extension;
     if (!filenames.includes(proposedFilename)) {
       filenames.push(proposedFilename);
       return proposedFilename;
@@ -792,18 +793,19 @@
     if (match) {
       const baseFilename = proposedFilename.replace(numberPattern, "");
       let counter = parseInt(match[1], 10);
-      while (filenames.includes(`${baseFilename}-${counter}`)) {
+      while (filenames.includes(`${baseFilename}-${counter}${extension}`)) {
         counter++;
       }
-      const newFilename = `${baseFilename}-${counter}`;
+      const newFilename = `${baseFilename}-${counter}${extension}`;
       filenames.push(newFilename);
       return newFilename;
     } else {
+      const baseFilename = proposedFilename.replace(extension, "");
       let counter = 2;
-      while (filenames.includes(`${proposedFilename}-${counter}`)) {
+      while (filenames.includes(`${baseFilename}-${counter}${extension}`)) {
         counter++;
       }
-      const newFilename = `${proposedFilename}-${counter}`;
+      const newFilename = `${baseFilename}-${counter}${extension}`;
       filenames.push(newFilename);
       return newFilename;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "image-exporter",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "description": "Easily download one or more DOM elements as images",
   "main": "src/index.ts",
   "type": "module",

package/src/capture/handle-filenames.ts

@@ -9,12 +9,13 @@ import { ImageOptions, Label } from "../types";
  * If it doesn't, the function will start with "-2" and increment the number until a unique filename is found.
  */
 export function handleFileNames(imageOptions: ImageOptions, filenames: string[]): Label {
-  // Finish alterting filenames before checking for uniqueness
+  // Finish altering filenames before checking for uniqueness
   let proposedFilename = imageOptions.label;
   // Add scale to filename if includeScaleInLabel is true
   if (imageOptions.includeScaleInLabel) proposedFilename += `_@${imageOptions.scale}x`;
   // Add format to filename last
-  proposedFilename += `.${imageOptions.format}`;
+  const extension = `.${imageOptions.format}`;
+  proposedFilename += extension;
 
   // If filename is unique, add it to array and return as-is
   if (!filenames.includes(proposedFilename)) {
@@ -31,21 +32,22 @@ export function handleFileNames(imageOptions: ImageOptions, filenames: string[])
     const baseFilename = proposedFilename.replace(numberPattern, "");
     let counter = parseInt(match[1], 10);
 
-    while (filenames.includes(`${baseFilename}-${counter}`)) {
+    while (filenames.includes(`${baseFilename}-${counter}${extension}`)) {
       counter++;
     }
 
-    const newFilename = `${baseFilename}-${counter}`;
+    const newFilename = `${baseFilename}-${counter}${extension}`;
     filenames.push(newFilename);
     return newFilename;
   } else {
-    // File doesn't end with -n, start with -1 and increment if needed
+    // File doesn't end with -n, start with -2 and increment if needed
+    const baseFilename = proposedFilename.replace(extension, "");
     let counter = 2;
-    while (filenames.includes(`${proposedFilename}-${counter}`)) {
+    while (filenames.includes(`${baseFilename}-${counter}${extension}`)) {
       counter++;
     }
 
-    const newFilename = `${proposedFilename}-${counter}`;
+    const newFilename = `${baseFilename}-${counter}${extension}`;
     filenames.push(newFilename);
     return newFilename;
   }