fix: extra tar by 7z on windows

Author: aminya

dist/legacy/setup-cpp.js

@@ -7,7 +7,13 @@ import { loadAssetList, matchAsset } from "../utils/asset/load-assets.js"
 import { arm64, armv7, powerpc64le, sparc64, sparcv9, x86, x86_64 } from "../utils/env/arch.js"
 import { hasDnf } from "../utils/env/hasDnf.js"
 import { ubuntuVersion } from "../utils/env/ubuntu_version.js"
-import { ArchiveType, extractTarByExe, getArchiveType, getExtractFunction } from "../utils/setup/extract.js"
+import {
+  ArchiveType,
+  extract7Zip,
+  extractTarByExe,
+  getArchiveType,
+  getExtractFunction,
+} from "../utils/setup/extract.js"
 import type { PackageInfo } from "../utils/setup/setupBin.js"
 
 const dirname = typeof __dirname === "string" ? __dirname : path.dirname(fileURLToPath(import.meta.url))
@@ -26,13 +32,14 @@ export async function getLLVMPackageInfo(
     extractedFolderName: "",
     binRelativeDir: "bin",
     binFileName: addExeExt("clang"),
-    extractFunction: process.platform === "win32"
-        && (archiveType === ArchiveType.Tar || archiveType === ArchiveType.TarGz || archiveType === ArchiveType.TarXz)
-      ? (file: string, dest: string) => {
-        // strip components to get the top folder on Windows
-        return extractTarByExe(file, dest, 1)
-      }
-      : getExtractFunction(archiveType),
+    extractFunction:
+      (archiveType === ArchiveType.Tar || archiveType === ArchiveType.TarGz || archiveType === ArchiveType.TarXz)
+        ? (file: string, dest: string) => {
+          return process.platform === "win32"
+            ? extract7Zip(file, dest, true)
+            : extractTarByExe(file, dest, 1)
+        }
+        : getExtractFunction(archiveType),
   }
 }
 

dist/legacy/setup-cpp.js.map

@@ -2,8 +2,7 @@ import { basename, dirname, join } from "path"
 import { grantUserWriteAccess } from "admina"
 import { info, warning } from "ci-log"
 import { execa } from "execa"
-import { mkdirp, move } from "fs-extra"
-import { rm } from "fs/promises"
+import { mkdirp, move, readdir, remove, stat } from "fs-extra"
 import which from "which"
 import { setupSevenZip } from "../../sevenzip/sevenzip.js"
 import { setupTar } from "../../tar/tar.js"
@@ -50,7 +49,7 @@ export function getExtractFunction(archiveType: ArchiveType) {
     case ArchiveType.Tar:
     case ArchiveType.TarGz:
     case ArchiveType.TarXz:
-      return extractTarByExe
+      return process.platform === "win32" ? extract7Zip : extractTarByExe
     case ArchiveType.Zip:
       return extractZip
     default:
@@ -61,23 +60,11 @@ export function getExtractFunction(archiveType: ArchiveType) {
 let sevenZip: string | undefined
 
 /// Extract 7z using 7z
-export async function extract7Zip(file: string, dest: string) {
+export async function extract7Zip(file: string, dest: string, stripComponents: boolean = false) {
   const name = basename(file)
 
   if (/.*\.tar\..+$/.test(name)) {
-    // if the file is tar.*, extract the compression first
-    const tarDir = dirname(file)
-    await run7zip(file, tarDir)
-    // extract the tar
-    const tarName = name.slice(0, -3)
-    const tarFile = join(tarDir, tarName)
-    await run7zip(tarFile, tarDir)
-    await rm(tarFile)
-    // Move the extracted files to the destination
-    const folderName = tarName.slice(0, -4)
-    const folderPath = join(tarDir, folderName)
-    info(`Moving ${folderPath} to ${dest}`)
-    await move(folderPath, dest, { overwrite: true })
+    await extractTarXzBy7zip(file, name, dest, stripComponents)
   } else {
     // extract the 7z file directly
     await run7zip(file, dest)
@@ -86,6 +73,53 @@ export async function extract7Zip(file: string, dest: string) {
   return dest
 }
 
+async function extractTarXzBy7zip(file: string, name: string, dest: string, stripComponents: boolean) {
+  if (!/.*\.tar\..+$/.test(name)) {
+    throw new Error(`Invalid tar file: ${name}`)
+  }
+  // extract the compression first
+  const tarDir = dirname(file)
+  await run7zip(file, tarDir)
+  // extract the tar
+  const tarName = name.slice(0, -3)
+  const tarFile = join(tarDir, tarName)
+  await run7zip(tarFile, tarDir)
+  await remove(tarFile)
+  // move the extracted files to the destination
+  const folderName = tarName.slice(0, -4)
+  const folderPath = join(tarDir, folderName)
+  info(`Moving ${folderPath} to ${dest}`)
+  await move(folderPath, dest, { overwrite: true })
+
+  if (stripComponents) {
+    await stripPathComponents(dest, folderName)
+  }
+}
+
+async function stripPathComponents(dest: string, folderName: string) {
+  // get all subfolders in the folder
+  const subFolders = await readdir(join(dest, folderName))
+  await Promise.all(
+    subFolders.map(async (subFolder) => {
+      const subFolderPath = join(dest, subFolder)
+      if (!(await stat(subFolderPath)).isDirectory()) {
+        // if the subfolder is not a directory, do nothing
+        return
+      }
+      // for each subfolder, move all files to the destination
+      const subFiles = await readdir(subFolderPath)
+      await Promise.all(
+        subFiles.map((subFile) => {
+          return move(join(subFolderPath, subFile), join(dest, subFile), { overwrite: true })
+        }),
+      )
+      // remove the subfolder
+      await remove(subFolderPath)
+      return
+    }),
+  )
+}
+
 async function run7zip(file: string, dest: string) {
   info(`7z: extracting ${file} to ${dest}`)
   await execa(await getSevenZip(), ["x", file, `-o${dest}`, "-y"], { stdio: "inherit" })