refactor: move proxyVarSubDir validation to shared path-extender

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: zkochan

os/env/path-extender-posix/path-extender-posix.ts

@@ -43,24 +43,10 @@ export async function addDirToPosixEnvPath (
   dir: string,
   opts: AddDirToPosixEnvPathOpts
 ): Promise<PathExtenderPosixReport> {
-  if (opts.proxyVarSubDir) {
-    validateSubDir(opts.proxyVarSubDir)
-  }
   const currentShell = detectCurrentShell()
   return await updateShell(currentShell, dir, opts)
 }
 
-function validateSubDir (subDir: string): void {
-  if (
-    subDir.startsWith('/') ||
-    subDir.startsWith('\\') ||
-    subDir.includes('..') ||
-    /[;\n\r"'`$%|<>&]/.test(subDir)
-  ) {
-    throw new PnpmError('INVALID_SUBDIR', `Invalid proxyVarSubDir: "${subDir}"`)
-  }
-}
-
 function detectCurrentShell () {
   if (process.env.ZSH_VERSION) return 'zsh'
   if (process.env.BASH_VERSION) return 'bash'

os/env/path-extender-windows/path-extender-windows.ts

@@ -61,21 +61,7 @@ export async function addDirToWindowsEnvPath (dir: string, opts?: AddDirToWindow
 
 export type EnvVariableChangeAction = 'skipped' | 'updated'
 
-function validateSubDir (subDir: string): void {
-  if (
-    subDir.startsWith('/') ||
-    subDir.startsWith('\\') ||
-    subDir.includes('..') ||
-    /[;%"'`<>&]/.test(subDir)
-  ) {
-    throw new PnpmError('INVALID_SUBDIR', `Invalid proxyVarSubDir: "${subDir}"`)
-  }
-}
-
 async function _addDirToWindowsEnvPath (dir: string, opts: AddDirToWindowsEnvPathOpts = {}): Promise<PathExtenderWindowsReport> {
-  if (opts.proxyVarSubDir) {
-    validateSubDir(opts.proxyVarSubDir)
-  }
   const addedDir = path.normalize(dir)
   const registryOutput = await getRegistryOutput()
   const changes: PathExtenderWindowsReport = []

os/env/path-extender/path-extender.ts

@@ -1,3 +1,4 @@
+import { PnpmError } from '@pnpm/error'
 import {
   addDirToPosixEnvPath,
   AddDirToPosixEnvPathOpts,
@@ -14,6 +15,16 @@ export type PathExtenderReport = Pick<PathExtenderPosixReport, 'oldSettings' | '
 export type AddDirToEnvPathOpts = AddDirToPosixEnvPathOpts
 
 export async function addDirToEnvPath(dir: string, opts: AddDirToEnvPathOpts): Promise<PathExtenderReport> {
+  if (opts.proxyVarSubDir) {
+    if (
+      opts.proxyVarSubDir.startsWith('/') ||
+      opts.proxyVarSubDir.startsWith('\\') ||
+      opts.proxyVarSubDir.includes('..') ||
+      /[;%"'`$<>&|\n\r]/.test(opts.proxyVarSubDir)
+    ) {
+      throw new PnpmError('INVALID_SUBDIR', `Invalid proxyVarSubDir: "${opts.proxyVarSubDir}"`)
+    }
+  }
   if (process.platform === 'win32') {
     return renderWindowsReport(await addDirToWindowsEnvPath(dir, {
         position: opts.position,