refactor: add recursive option to safeMkdir calls

jdalton · jdalton · commit df107f78df4b · 2025-10-31T11:45:35.000-04:00
- Add { recursive: true } option to all safeMkdir calls for consistency
- Ensures directories are created with proper parent directory handling
- Aligns with safeMkdir best practices
diff --git a/packages/cli/src/bootstrap/node.mts b/packages/cli/src/bootstrap/node.mts
@@ -46,7 +46,7 @@ async function downloadCli(): Promise<void> {
   const dlxDir = getDlxDir()
   const cliDir = getCliPackageDir()
 
-  await safeMkdir(dlxDir)
+  await safeMkdir(dlxDir, { recursive: true })
 
   console.error(`Downloading ${packageName}...`)
 
@@ -77,7 +77,7 @@ async function downloadCli(): Promise<void> {
       try {
         const tarballPath = path.join(dlxDir, tarballName.trim())
 
-        await safeMkdir(cliDir)
+        await safeMkdir(cliDir, { recursive: true })
 
         const tarExtractProcess = spawn(
           'tar',
diff --git a/packages/cli/src/commands/fix/ghsa-tracker.mts b/packages/cli/src/commands/fix/ghsa-tracker.mts
@@ -46,7 +46,7 @@ export async function saveGhsaTracker(
   const trackerPath = path.join(cwd, TRACKER_FILE)
 
   // Ensure .socket directory exists.
-  await safeMkdir(path.dirname(trackerPath))
+  await safeMkdir(path.dirname(trackerPath), { recursive: true })
 
   await writeJson(trackerPath, tracker, { spaces: 2 })
   debug(`ghsa-tracker: saved ${tracker.fixed.length} records to ${trackerPath}`)
diff --git a/packages/cli/src/commands/install/setup-tab-completion.mts b/packages/cli/src/commands/install/setup-tab-completion.mts
@@ -42,7 +42,7 @@ export async function setupTabCompletion(targetName: string): Promise<
 
   if (!fs.existsSync(targetDir)) {
     debug('create: target dir')
-    safeMkdirSync(targetDir)
+    safeMkdirSync(targetDir, { recursive: true })
   }
 
   updateInstalledTabCompletionScript(targetPath)
diff --git a/packages/cli/src/commands/optimize/cmd-optimize.test.mts b/packages/cli/src/commands/optimize/cmd-optimize.test.mts
@@ -68,7 +68,7 @@ async function _createTempFixture(sourceDir: string): Promise<string> {
   )
 
   // Copy the fixture files to the temp directory.
-  await safeMkdir(tempDir)
+  await safeMkdir(tempDir, { recursive: true })
 
   // Copy package.json.
   const sourcePackageJson = path.join(sourceDir, PACKAGE_JSON)
diff --git a/packages/cli/src/commands/patch/handle-patch-get.mts b/packages/cli/src/commands/patch/handle-patch-get.mts
@@ -65,7 +65,7 @@ export async function handlePatchGet({
 
     // Create output directory if it doesn't exist.
     if (!existsSync(targetDir)) {
-      await safeMkdir(targetDir)
+      await safeMkdir(targetDir, { recursive: true })
     }
 
     spinner?.text('Copying patch files')
@@ -88,7 +88,7 @@ export async function handlePatchGet({
       // Create subdirectories if needed.
       if (!existsSync(targetFileDir)) {
         // eslint-disable-next-line no-await-in-loop
-        await safeMkdir(targetFileDir)
+        await safeMkdir(targetFileDir, { recursive: true })
       }
 
       // eslint-disable-next-line no-await-in-loop
diff --git a/packages/cli/src/commands/scan/create-scan-from-github.mts b/packages/cli/src/commands/scan/create-scan-from-github.mts
@@ -467,7 +467,7 @@ async function streamDownloadWithFetch(
     // before starting the download.
     const dir = path.dirname(localPath)
     if (!existsSync(dir)) {
-      safeMkdirSync(dir)
+      safeMkdirSync(dir, { recursive: true })
     }
 
     const fileStream = createWriteStream(localPath)
diff --git a/packages/cli/src/commands/self-update/handle-self-update.mts b/packages/cli/src/commands/self-update/handle-self-update.mts
@@ -158,8 +158,8 @@ async function updateStubBinary(
     const downloadsDir = getSocketCliUpdaterDownloadsDir()
     const stagingDir = getSocketCliUpdaterStagingDir()
 
-    await safeMkdir(downloadsDir)
-    await safeMkdir(stagingDir)
+    await safeMkdir(downloadsDir, { recursive: true })
+    await safeMkdir(stagingDir, { recursive: true })
 
     const timestamp = Date.now()
     const tarballPath = path.join(downloadsDir, `stub-${timestamp}.tgz`)
@@ -377,7 +377,7 @@ Examples
 
   // Create temporary directory for download.
   const tempDir = path.join(os.tmpdir(), `socket-update-${Date.now()}`)
-  await safeMkdir(tempDir)
+  await safeMkdir(tempDir, { recursive: true })
 
   try {
     const tarballPath = path.join(tempDir, 'package.tgz')
diff --git a/packages/cli/src/index.mts b/packages/cli/src/index.mts
@@ -27,7 +27,7 @@ const compressed = readFileSync(cliBzPath)
 const decompressed = brotliDecompressSync(compressed)
 
 // Ensure build/ directory exists.
-safeMkdirSync(buildPath)
+safeMkdirSync(buildPath, { recursive: true })
 
 // Write to build/ directory (gitignored, local to package).
 const tempCliPath = path.join(buildPath, `cli-runtime-${process.pid}.js`)
diff --git a/packages/cli/src/utils/dlx/binary.mts b/packages/cli/src/utils/dlx/binary.mts
@@ -202,7 +202,7 @@ async function downloadBinary(
 
   try {
     // Ensure directory exists.
-    await safeMkdir(path.dirname(destPath))
+    await safeMkdir(path.dirname(destPath), { recursive: true })
 
     // Get the response as a buffer and compute hash.
     const arrayBuffer = await response.arrayBuffer()
@@ -391,7 +391,7 @@ export async function dlxBinary(
 
   if (downloaded) {
     // Ensure cache directory exists.
-    await safeMkdir(cacheEntryDir)
+    await safeMkdir(cacheEntryDir, { recursive: true })
 
     // Download the binary.
     computedChecksum = await downloadBinary(url, binaryPath, checksum)
diff --git a/packages/cli/src/utils/git/github.mts b/packages/cli/src/utils/git/github.mts
@@ -82,7 +82,7 @@ export async function writeCache(
   const githubCachePath = getGithubCachePath()
   const cacheJsonPath = path.join(githubCachePath, `${key}.json`)
   if (!existsSync(githubCachePath)) {
-    await safeMkdir(githubCachePath)
+    await safeMkdir(githubCachePath, { recursive: true })
   }
   await writeJson(cacheJsonPath, data as JsonContent)
 }
diff --git a/packages/cli/src/utils/manifest/patch-backup.mts b/packages/cli/src/utils/manifest/patch-backup.mts
@@ -132,7 +132,7 @@ async function updateMetadata(
 
     // Write back
     const metadataPath = getMetadataPath(uuid)
-    await safeMkdir(dirname(metadataPath))
+    await safeMkdir(dirname(metadataPath), { recursive: true })
     await fs.writeFile(
       metadataPath,
       JSON.stringify(updatedMetadata, null, 2),
@@ -241,7 +241,7 @@ export async function restoreBackup(
     })
 
     // Ensure parent directory exists
-    await safeMkdir(dirname(filePath))
+    await safeMkdir(dirname(filePath), { recursive: true })
 
     // Write back to original location
     await fs.writeFile(filePath, entry.data)
diff --git a/packages/cli/src/utils/manifest/patches.mts b/packages/cli/src/utils/manifest/patches.mts
@@ -167,7 +167,7 @@ export async function writeManifest(
   const manifestPath = getManifestPath(cwd)
 
   // Ensure parent directory exists
-  await safeMkdir(dirname(manifestPath))
+  await safeMkdir(dirname(manifestPath), { recursive: true })
 
   // Write atomically (write to temp file, then rename)
   const tempPath = `${manifestPath}.tmp`
diff --git a/packages/cli/src/utils/python/standalone.mts b/packages/cli/src/utils/python/standalone.mts
@@ -194,7 +194,7 @@ async function downloadPython(pythonDir: string): Promise<void> {
   const tarballName = 'python-standalone.tar.gz'
 
   // Ensure directory exists.
-  await safeMkdir(pythonDir)
+  await safeMkdir(pythonDir, { recursive: true })
 
   try {
     // Use downloadBinary to download the tarball with caching (without execution).
diff --git a/packages/cli/src/utils/registry/npm-registry.mts b/packages/cli/src/utils/registry/npm-registry.mts
@@ -276,15 +276,19 @@ export async function extractTarball(
       const targetPath = path.join(targetDir, sanitizedPath)
 
       if (file.type === 'directory') {
-        await retryWithBackoff(() => safeMkdir(targetPath)).catch(error => {
+        await retryWithBackoff(() =>
+          safeMkdir(targetPath, { recursive: true }),
+        ).catch(error => {
           throw new Error(
             `Failed to create directory ${targetPath}: ${error instanceof Error ? error.message : String(error)}`,
           )
         })
       } else if (file.type === 'file' && file.data) {
         // Ensure parent directory exists.
         const parentDir = path.dirname(targetPath)
-        await retryWithBackoff(() => safeMkdir(parentDir)).catch(error => {
+        await retryWithBackoff(() =>
+          safeMkdir(parentDir, { recursive: true }),
+        ).catch(error => {
           const code = (error as NodeJS.ErrnoException)?.code
           if (code === 'ENOSPC') {
             throw new Error(
@@ -434,7 +438,7 @@ export async function extractBinaryFromTarball(
 
     // Ensure destination directory exists.
     const destDir = path.dirname(destination)
-    await safeMkdir(destDir)
+    await safeMkdir(destDir, { recursive: true })
 
     // Write binary to destination.
     await fs.writeFile(
diff --git a/packages/cli/src/utils/sea/build.mts b/packages/cli/src/utils/sea/build.mts
@@ -72,7 +72,7 @@ export async function buildTarget(
   } as SeaBuildOptions
 
   // Ensure output directory exists.
-  await safeMkdir(outputDir)
+  await safeMkdir(outputDir, { recursive: true })
 
   // Download Node.js binary for target platform.
   const nodeBinary = await downloadNodeBinary(
@@ -83,7 +83,7 @@ export async function buildTarget(
 
   // Generate output path.
   const outputPath = normalizePath(path.join(outputDir, target.outputName))
-  await safeMkdir(outputDir)
+  await safeMkdir(outputDir, { recursive: true })
 
   // Generate SEA configuration.
   const configPath = await generateSeaConfig(entryPoint, outputPath)
@@ -169,7 +169,7 @@ export async function downloadNodeBinary(
       createHash('sha256').update(downloadUrl).digest('hex'),
     ),
   )
-  await safeMkdir(tempDir)
+  await safeMkdir(tempDir, { recursive: true })
 
   try {
     // Save archive.
@@ -227,7 +227,7 @@ export async function downloadNodeBinary(
 
     // Ensure target directory exists.
     const targetDir = path.dirname(nodePath)
-    await safeMkdir(targetDir)
+    await safeMkdir(targetDir, { recursive: true })
 
     // Move binary to final location.
     await fs.copyFile(extractedBinary, nodePath)
diff --git a/packages/cli/src/utils/update/store.mts b/packages/cli/src/utils/update/store.mts
@@ -127,7 +127,7 @@ class UpdateStore {
       // Ensure directory exists.
       const storeDir = path.dirname(this.storePath)
       try {
-        safeMkdirSync(storeDir)
+        safeMkdirSync(storeDir, { recursive: true })
       } catch (error) {
         logger.warn(
           `Failed to create store directory: ${error instanceof Error ? error.message : String(error)}`,
diff --git a/packages/cli/test/helpers/workspace-helper.mts b/packages/cli/test/helpers/workspace-helper.mts
@@ -109,7 +109,7 @@ export async function createTestWorkspace(
   const tempDirName = `socket-cli-workspace-${Date.now()}-${Math.random().toString(36).slice(2)}`
   const workspacePath = path.join(tempBaseDir, tempDirName)
 
-  await safeMkdir(workspacePath)
+  await safeMkdir(workspacePath, { recursive: true })
 
   // Create package.json if specified
   if (packageJson) {
@@ -130,7 +130,7 @@ export async function createTestWorkspace(
     const filePath = path.join(workspacePath, file.path)
     const fileDir = path.dirname(filePath)
     // eslint-disable-next-line no-await-in-loop
-    await safeMkdir(fileDir)
+    await safeMkdir(fileDir, { recursive: true })
 
     const content =
       typeof file.content === 'string'
@@ -143,12 +143,14 @@ export async function createTestWorkspace(
 
   // Create node_modules directory if requested
   if (createNodeModules) {
-    await safeMkdir(path.join(workspacePath, 'node_modules'))
+    await safeMkdir(path.join(workspacePath, 'node_modules'), {
+      recursive: true,
+    })
   }
 
   // Initialize git repository if requested
   if (initGit) {
-    await safeMkdir(path.join(workspacePath, '.git'))
+    await safeMkdir(path.join(workspacePath, '.git'), { recursive: true })
   }
 
   // Create workspace instance
@@ -183,7 +185,7 @@ export async function createTestWorkspace(
     writeFile: async (relativePath: string, content: string) => {
       const filePath = path.join(workspacePath, relativePath)
       const fileDir = path.dirname(filePath)
-      await safeMkdir(fileDir)
+      await safeMkdir(fileDir, { recursive: true })
       await fs.writeFile(filePath, content, 'utf8')
     },
   }
diff --git a/packages/socket/package.json b/packages/socket/package.json
@@ -1,6 +1,6 @@
 {
   "name": "socket",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "description": "CLI for Socket.dev",
   "private": true,
   "homepage": "https://github.com/SocketDev/socket-cli",

Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export async function setupTabCompletion(targetName: string): Promise<`
`42`	`42`
`43`	`43`	`if (!fs.existsSync(targetDir)) {`
`44`	`44`	`debug('create: target dir')`
`45`		`- safeMkdirSync(targetDir)`
	`45`	`+ safeMkdirSync(targetDir, { recursive: true })`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`updateInstalledTabCompletionScript(targetPath)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ async function _createTempFixture(sourceDir: string): Promise<string> {`
`68`	`68`	`)`
`69`	`69`
`70`	`70`	`// Copy the fixture files to the temp directory.`
`71`		`- await safeMkdir(tempDir)`
	`71`	`+ await safeMkdir(tempDir, { recursive: true })`
`72`	`72`
`73`	`73`	`// Copy package.json.`
`74`	`74`	`const sourcePackageJson = path.join(sourceDir, PACKAGE_JSON)`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ export async function handlePatchGet({`
`65`	`65`
`66`	`66`	`// Create output directory if it doesn't exist.`
`67`	`67`	`if (!existsSync(targetDir)) {`
`68`		`- await safeMkdir(targetDir)`
	`68`	`+ await safeMkdir(targetDir, { recursive: true })`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`spinner?.text('Copying patch files')`
`@@ -88,7 +88,7 @@ export async function handlePatchGet({`
`88`	`88`	`// Create subdirectories if needed.`
`89`	`89`	`if (!existsSync(targetFileDir)) {`
`90`	`90`	`// eslint-disable-next-line no-await-in-loop`
`91`		`- await safeMkdir(targetFileDir)`
	`91`	`+ await safeMkdir(targetFileDir, { recursive: true })`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`// eslint-disable-next-line no-await-in-loop`
Original file line number	Diff line number	Diff line change
`@@ -467,7 +467,7 @@ async function streamDownloadWithFetch(`
`467`	`467`	`// before starting the download.`
`468`	`468`	`const dir = path.dirname(localPath)`
`469`	`469`	`if (!existsSync(dir)) {`
`470`		`- safeMkdirSync(dir)`
	`470`	`+ safeMkdirSync(dir, { recursive: true })`
`471`	`471`	`}`
`472`	`472`
`473`	`473`	`const fileStream = createWriteStream(localPath)`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ export async function writeCache(`
`82`	`82`	`const githubCachePath = getGithubCachePath()`
`83`	`83`	const cacheJsonPath = path.join(githubCachePath, `${key}.json`)
`84`	`84`	`if (!existsSync(githubCachePath)) {`
`85`		`- await safeMkdir(githubCachePath)`
	`85`	`+ await safeMkdir(githubCachePath, { recursive: true })`
`86`	`86`	`}`
`87`	`87`	`await writeJson(cacheJsonPath, data as JsonContent)`
`88`	`88`	`}`