Merge pull request #86 from whale4113/fix/whale/unique-id

fix(chrome-extension): entry filename already exists

Author: whale4113

.changeset/chatty-signs-check.md

@@ -0,0 +1,5 @@
+---
+'@dolphin/chrome-extension': patch
+---
+
+fix: entry filename already exists

apps/chrome-extension/package.json

@@ -5,7 +5,8 @@
   "scripts": {
     "type-check": "vue-tsc -b",
     "build": "node --experimental-strip-types ./scripts/cli.ts build",
-    "dev:pages": "vite"
+    "dev:pages": "vite",
+    "test": "vitest run"
   },
   "devDependencies": {
     "@babel/core": "catalog:dev",

apps/chrome-extension/src/common/utils.ts

@@ -39,3 +39,32 @@ export const withSignal = async <T>(
 
   return result
 }
+
+export class UniqueFileName {
+  private usedNames = new Set<string>()
+  private fileNameToPreId = new Map<string, number>()
+
+  generate(originFileName: string): string {
+    let newFileName = originFileName
+
+    while (this.usedNames.has(newFileName)) {
+      const startDotIndex = originFileName.lastIndexOf('.')
+
+      const preId = this.fileNameToPreId.get(originFileName) ?? 0
+      const id = preId + 1
+      this.fileNameToPreId.set(originFileName, id)
+
+      newFileName =
+        startDotIndex === -1
+          ? originFileName.concat(`-${id.toFixed()}`)
+          : originFileName
+              .slice(0, startDotIndex)
+              .concat(`-${id.toFixed()}`)
+              .concat(originFileName.slice(startDotIndex))
+    }
+
+    this.usedNames.add(newFileName)
+
+    return newFileName
+  }
+}

apps/chrome-extension/src/scripts/download-lark-docx-as-markdown.ts

@@ -9,10 +9,12 @@ import { CommonTranslationKey, en, Namespace, zh } from '../common/i18n'
 import { confirm } from '../common/notification'
 import { legacyFileSave } from '../common/legacy'
 import { reportBug } from '../common/issue'
-import { withSignal } from '../common/utils'
+import { UniqueFileName, withSignal } from '../common/utils'
 import { getDownloadSettings } from '../common/settings'
 import { DownloadMethod, SettingKey } from '@/common/settings'
 
+const uniqueFileName = new UniqueFileName()
+
 const DOWNLOAD_ABORTED = 'Download aborted'
 
 const enum TranslationKey {
@@ -85,32 +87,6 @@ i18next
   })
   .catch(console.error)
 
-const usedNames = new Set<string>()
-const fileNameToPreId = new Map<string, number>()
-const uniqueFileName = (originFileName: string) => {
-  if (usedNames.has(originFileName)) {
-    const startDotIndex = originFileName.lastIndexOf('.')
-
-    const preId = fileNameToPreId.get(originFileName) ?? 0
-    const id = preId + 1
-    fileNameToPreId.set(originFileName, id)
-
-    const fileName =
-      startDotIndex === -1
-        ? originFileName.concat(`-${id.toFixed()}`)
-        : originFileName
-            .slice(0, startDotIndex)
-            .concat(`-${id.toFixed()}`)
-            .concat(originFileName.slice(startDotIndex))
-
-    return fileName
-  }
-
-  usedNames.add(originFileName)
-
-  return originFileName
-}
-
 interface ProgressOptions {
   onProgress?: (progress: number) => void
   onComplete?: () => void
@@ -186,7 +162,7 @@ const downloadImage = async (
           const content = await fetchBlob()
           if (!content) return null
 
-          const name = uniqueFileName('diagram.png')
+          const name = uniqueFileName.generate('diagram.png')
           const filename = `images/${name}`
 
           image.url = filename
@@ -205,7 +181,7 @@ const downloadImage = async (
           const sources = await fetchSources()
           if (!sources) return null
 
-          const name = uniqueFileName(originName)
+          const name = uniqueFileName.generate(originName)
           const filename = `images/${name}`
 
           const { src } = sources
@@ -300,7 +276,7 @@ const downloadFile = async (
   const result = await withSignal(
     async () => {
       try {
-        const filename = `files/${uniqueFileName(name)}`
+        const filename = `files/${uniqueFileName.generate(name)}`
 
         const response = await fetchFile({ signal: controller.signal })
         try {

apps/chrome-extension/tests/utils.test.ts

@@ -0,0 +1,22 @@
+import { describe, expect, it } from 'vitest'
+import { UniqueFileName } from '../src/common/utils'
+
+describe('UniqueFileName', () => {
+  it('should generate unique filename', () => {
+    const uniqueFilename = new UniqueFileName()
+    const filename = uniqueFilename.generate('test.txt')
+    expect(filename).toBe('test.txt')
+
+    const filename2 = uniqueFilename.generate('test.txt')
+    expect(filename2).toBe('test-1.txt')
+
+    const filename3 = uniqueFilename.generate('test-1.txt')
+    expect(filename3).toBe('test-1-1.txt')
+
+    const filename4 = uniqueFilename.generate('test-2.txt')
+    expect(filename4).toBe('test-2.txt')
+
+    const filename5 = uniqueFilename.generate('test.txt')
+    expect(filename5).toBe('test-3.txt')
+  })
+})

apps/chrome-extension/tsconfig.node.json

@@ -4,5 +4,11 @@
     "noEmit": true
   },
   "extends": "@dolphin/typescript-config/node.json",
-  "include": ["scripts", "tsdown.config.ts", "vite.config.ts"]
+  "include": [
+    "scripts",
+    "tests",
+    "tsdown.config.ts",
+    "vite.config.ts",
+    "vitest.config.ts"
+  ]
 }

apps/chrome-extension/vitest.config.ts

@@ -0,0 +1,10 @@
+import { defineConfig } from 'vitest/config'
+
+export default defineConfig({
+  resolve: {
+    conditions: ['dev'],
+  },
+  test: {
+    environment: 'happy-dom',
+  },
+})