clean up clode and tests

Author: EvilGenius13

packages/cli-kit/src/public/node/archiver.integration.test.ts

@@ -26,7 +26,7 @@ describe('zip', () => {
 
       // Then
       const archiveEntries = await readArchiveFiles(zipPath)
-      const expectedEntries = withExplicitDirectoryEntries(structure)
+      const expectedEntries = ['extensions/', 'extensions/first/', 'extensions/first/main.js', 'test.json']
       expect(expectedEntries.sort()).toEqual(archiveEntries.sort())
     })
   })
@@ -50,7 +50,10 @@ describe('zip', () => {
 
       // Then
       const archiveEntries = await readArchiveFiles(zipPath)
-      const expectedEntries = withExplicitDirectoryEntries([`extensions/first/main.js`])
+
+      expect(archiveEntries).toContain('extensions/')
+      expect(archiveEntries).toContain('extensions/first/')
+      const expectedEntries = ['extensions/', 'extensions/first/', 'extensions/first/main.js']
       expect(expectedEntries.sort()).toEqual(archiveEntries.sort())
     })
   })
@@ -159,19 +162,3 @@ async function readArchiveFiles(zipPath: string) {
 
   return archiveEntries
 }
-
-function withExplicitDirectoryEntries(files: string[]): string[] {
-  const entries = new Set<string>()
-  for (const file of files) {
-    entries.add(file)
-    let currentDir = dirname(file)
-    while (currentDir && currentDir !== '.' && currentDir !== '/') {
-      const dirEntry = currentDir.endsWith('/') ? currentDir : `${currentDir}/`
-      entries.add(dirEntry)
-      const parent = dirname(currentDir)
-      if (parent === currentDir) break
-      currentDir = parent
-    }
-  }
-  return Array.from(entries)
-}

packages/cli-kit/src/public/node/archiver.ts

@@ -52,24 +52,21 @@ export async function zip(options: ZipOptions): Promise<void> {
     })
     archive.pipe(output)
 
-    // Find parent directories to add explicitly to the archive
     const directoriesToAdd = new Set<string>()
     for (const filePath of pathsToZip) {
-      const relPath = relativePath(inputDirectory, filePath)
-      collectParentDirectories(relPath, directoriesToAdd)
+      const fileRelativePath = relativePath(inputDirectory, filePath)
+      collectParentDirectories(fileRelativePath, directoriesToAdd)
     }
 
-    // Add directories, parents before children
     const sortedDirs = Array.from(directoriesToAdd).sort((left, right) => left.localeCompare(right))
     for (const dir of sortedDirs) {
       const dirName = dir.endsWith('/') ? dir : `${dir}/`
       archive.append(Buffer.alloc(0), {name: dirName})
     }
 
-    // Add files
     for (const filePath of pathsToZip) {
-      const rel = relativePath(inputDirectory, filePath)
-      if (filePath && rel) archive.file(filePath, {name: rel})
+      const fileRelativePath = relativePath(inputDirectory, filePath)
+      if (filePath && fileRelativePath) archive.file(filePath, {name: fileRelativePath})
     }
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises