chore(cleanup): trim 4 more cascade-dead helpers

jdalton · jdalton · commit b7d50f0bed66 · 2026-05-21T23:28:24.000-04:00
These surfaced as truly-test-only after the previous batch deleted
their last live callers. Same pattern: helper + matching test block
both deleted.

  commands/fix/git.mts: drop createSocketFixBranchParser + the
    associated SocketFixBranchParser + SocketFixBranchParseResult
    types (was only consumed by genericSocketFixBranchParser, deleted
    in the previous batch).
  env/python-version.mts: drop getPythonMajorMinor (only consumed by
    getPythonSitePackagesPath, deleted previously).
  util/ecosystem/types.mts: drop ALL_SUPPORTED_ECOSYSTEMS (only
    consumed by isValidEcosystem, deleted previously).
  util/fs/path-resolve.mts: drop findNpmDirPathSync + its support
    imports (existsSync, path, NPM, WIN32, isDirSync, NODE_MODULES).
    Was only consumed by getNpmDirPath, deleted previously.
diff --git a/packages/cli/src/commands/fix/git.mts b/packages/cli/src/commands/fix/git.mts
@@ -9,30 +9,6 @@ const GITHUB_ADVISORIES_URL = 'https://github.com/advisories'
 // GHSA ID pattern: GHSA-xxxx-xxxx-xxxx (4 alphanumeric segments).
 const GHSA_ID_PATTERN = /^GHSA-[a-z0-9]{4}-[a-z0-9]{4}-[a-z0-9]{4}$/i
 
-type SocketFixBranchParser = (
-  branch: string,
-) => SocketFixBranchParseResult | undefined
-
-type SocketFixBranchParseResult = {
-  ghsaId: string
-}
-
-export function createSocketFixBranchParser(
-  ghsaId?: string | undefined,
-): SocketFixBranchParser {
-  const pattern = getSocketFixBranchPattern(ghsaId)
-  return function parse(
-    branch: string,
-  ): SocketFixBranchParseResult | undefined {
-    const match = pattern.exec(branch) as [string, string] | null
-    if (!match) {
-      return undefined
-    }
-    const { 1: ghsaId } = match
-    return { ghsaId } as SocketFixBranchParseResult
-  }
-}
-
 export function getSocketFixBranchName(ghsaId: string): string {
   return `socket/fix/${ghsaId}`
 }
diff --git a/packages/cli/src/env/python-version.mts b/packages/cli/src/env/python-version.mts
@@ -8,20 +8,6 @@
 
 import process from 'node:process'
 
-/**
- * Get the Python major.minor version for site-packages path (e.g., "3.11").
- * Used to construct: python/lib/python3.11/site-packages/
- */
-export function getPythonMajorMinor(): string {
-  const version = getPythonVersion()
-  const parts = version?.split('.') ?? []
-  if (parts.length < 2 || !parts[0] || !parts[1]) {
-    // Return safe default instead of crashing CLI on startup.
-    return '3.11'
-  }
-  return `${parts[0]}.${parts[1]}`
-}
-
 /**
  * Get the full Python version (e.g., "3.11.14").
  */
diff --git a/packages/cli/src/util/ecosystem/types.mts b/packages/cli/src/util/ecosystem/types.mts
@@ -91,8 +91,6 @@ export const ALL_ECOSYSTEMS = [
 // export type _Check_ALL_ECOSYSTEMS_has_no_extras =
 //   ExpectNever<ExtraInAllEcosystems>
 
-export const ALL_SUPPORTED_ECOSYSTEMS = new Set<string>(ALL_ECOSYSTEMS)
-
 export function getEcosystemChoicesForMeow(): string[] {
   return [...ALL_ECOSYSTEMS]
 }
diff --git a/packages/cli/src/util/fs/path-resolve.mts b/packages/cli/src/util/fs/path-resolve.mts
@@ -1,18 +1,11 @@
-import { existsSync } from 'node:fs'
-import path from 'node:path'
-
 import { resolveRealBinSync } from '@socketsecurity/lib-stable/bin/resolve'
 import { whichRealSync } from '@socketsecurity/lib-stable/bin/which'
-import { NPM } from '@socketsecurity/lib-stable/constants/agents'
-import { WIN32 } from '@socketsecurity/lib-stable/constants/platform'
-import { isDirSync } from '@socketsecurity/lib-stable/fs/inspect'
 
 import {
   createSupportedFilesFilter,
   globWithGitIgnore,
   pathsToGlobPatterns,
 } from './glob.mts'
-import { NODE_MODULES } from '../../constants/packages.mts'
 
 import type { SocketYml } from '../socket-yaml.mts'
 import type { SocketSdkSuccessResult } from '@socketsecurity/sdk-stable'
@@ -42,73 +35,6 @@ export function findBinPathDetailsSync(binName: string): {
   return { name: binName, path: theBinPath }
 }
 
-export function findNpmDirPathSync(npmBinPath: string): string | undefined {
-  // On Windows, reject Unix absolute paths (starting with / but not //).
-  // This allows UNC paths: //server/share, \\server\share.
-  // And long paths: \\?\C:\..., //?/C:/...
-  // Backslash paths (\\...) don't match startsWith('/') so they pass through.
-  /* c8 ignore start - WIN32-only branch, tests run on macOS/Linux */
-  if (WIN32 && npmBinPath.startsWith('/') && !npmBinPath.startsWith('//')) {
-    return undefined
-  }
-  /* c8 ignore stop */
-  const MAX_ITERATIONS = 100
-  let thePath = npmBinPath
-  let iterations = 0
-  while (true) {
-    /* c8 ignore start - safety guard against infinite loop on circular symlinks */
-    if (iterations >= MAX_ITERATIONS) {
-      throw new Error(
-        `npm path resolution walked ${MAX_ITERATIONS} directories without finding lib/node_modules/npm starting from "${npmBinPath}" (current: "${thePath}"); check for a circular symlink or corrupt node install`,
-      )
-    }
-    /* c8 ignore stop */
-    iterations += 1
-    const libNmNpmPath = path.join(thePath, `lib/${NODE_MODULES}/${NPM}`)
-    // mise, which uses opaque binaries, puts its npm bin in a path like:
-    //   /Users/<user>/.local/share/mise/installs/node/vX.X.X/bin/npm.
-    // HOWEVER, the location of the npm install is:
-    //   /Users/<user>/.local/share/mise/installs/node/vX.X.X/lib/node_modules/npm.
-    if (
-      // Use existsSync here because statsSync, even with { throwIfNoEntry: false },
-      // will throw an ENOTDIR error for paths like ./a-file-that-exists/a-directory-that-does-not.
-      // See https://github.com/nodejs/node/issues/56993.
-      isDirSync(libNmNpmPath)
-    ) {
-      thePath = libNmNpmPath
-    }
-    const hasNmInCurrPath = isDirSync(path.join(thePath, NODE_MODULES))
-    const hasNmInParentPath =
-      !hasNmInCurrPath && isDirSync(path.join(thePath, `../${NODE_MODULES}`))
-    if (
-      // npm bin paths may look like:
-      //   /usr/local/share/npm/bin/npm
-      //   ~/.nvm/versions/node/vX.X.X/bin/npm
-      //   %USERPROFILE%\AppData\Roaming\npm\bin\npm.cmd
-      // OR
-      //   C:\Program Files\nodejs\npm.cmd
-      //
-      // In practically all cases the npm path contains a node_modules folder:
-      //   /usr/local/share/npm/bin/npm/node_modules
-      //   C:\Program Files\nodejs\node_modules
-      (hasNmInCurrPath ||
-        // In some bespoke cases the node_modules folder is in the parent directory.
-        hasNmInParentPath) &&
-      // Optimistically look for the default location.
-      (path.basename(thePath) === NPM ||
-        // Chocolatey installs npm bins in the same directory as node bins.
-        (!!WIN32 && existsSync(path.join(thePath, `${NPM}.cmd`))))
-    ) {
-      return hasNmInParentPath ? path.dirname(thePath) : thePath
-    }
-    const parent = path.dirname(thePath)
-    if (parent === thePath) {
-      return undefined
-    }
-    thePath = parent
-  }
-}
-
 type PackageFilesForScanOptions = {
   cwd?: string | undefined
   config?: SocketYml | undefined
diff --git a/packages/cli/test/unit/commands/fix/git.test.mts b/packages/cli/test/unit/commands/fix/git.test.mts
@@ -14,7 +14,6 @@
 import { describe, expect, it } from 'vitest'
 
 import {
-  createSocketFixBranchParser,
   getSocketFixBranchName,
   getSocketFixBranchPattern,
   getSocketFixCommitMessage,
@@ -154,29 +153,6 @@ describe('fix/git utilities', () => {
     })
   })
 
-  describe('createSocketFixBranchParser', () => {
-    it('parses socket fix branch names', () => {
-      const parser = createSocketFixBranchParser()
-      const result = parser('socket/fix/GHSA-1234-5678-9abc')
-      expect(result).toEqual({ ghsaId: 'GHSA-1234-5678-9abc' })
-    })
-
-    it('returns undefined for non-matching branches', () => {
-      const parser = createSocketFixBranchParser()
-      expect(parser('main')).toBeUndefined()
-      expect(parser('feature/something')).toBeUndefined()
-      expect(parser('socket/other/GHSA-1234')).toBeUndefined()
-    })
-
-    it('parses with specific GHSA ID filter', () => {
-      const parser = createSocketFixBranchParser('GHSA-1234-5678-9abc')
-      expect(parser('socket/fix/GHSA-1234-5678-9abc')).toEqual({
-        ghsaId: 'GHSA-1234-5678-9abc',
-      })
-      expect(parser('socket/fix/GHSA-other-ghsa-idxx')).toBeUndefined()
-    })
-  })
-
   describe('getSocketFixCommitMessage', () => {
     it('returns basic commit message without details', () => {
       expect(getSocketFixCommitMessage('GHSA-1234-5678-9abc')).toBe(
diff --git a/packages/cli/test/unit/env/python-version.test.mts b/packages/cli/test/unit/env/python-version.test.mts
@@ -6,10 +6,7 @@
 
 import { afterEach, beforeEach, describe, expect, it } from 'vitest'
 
-import {
-  getPythonMajorMinor,
-  getPythonVersion,
-} from '../../../src/env/python-version.mts'
+import { getPythonVersion } from '../../../src/env/python-version.mts'
 
 describe('env/python-version', () => {
   let original: string | undefined
@@ -33,30 +30,4 @@ describe('env/python-version', () => {
     })
   })
 
-  describe('getPythonMajorMinor', () => {
-    it('returns major.minor from a full semver-style string', () => {
-      process.env['INLINED_PYTHON_VERSION'] = '3.12.5'
-      expect(getPythonMajorMinor()).toBe('3.12')
-    })
-
-    it('returns major.minor when only major.minor is set', () => {
-      process.env['INLINED_PYTHON_VERSION'] = '3.13'
-      expect(getPythonMajorMinor()).toBe('3.13')
-    })
-
-    it('falls back to 3.11 when version is missing', () => {
-      delete process.env['INLINED_PYTHON_VERSION']
-      expect(getPythonMajorMinor()).toBe('3.11')
-    })
-
-    it('falls back to 3.11 when version is malformed (one part)', () => {
-      process.env['INLINED_PYTHON_VERSION'] = '3'
-      expect(getPythonMajorMinor()).toBe('3.11')
-    })
-
-    it('falls back to 3.11 when version is empty', () => {
-      process.env['INLINED_PYTHON_VERSION'] = ''
-      expect(getPythonMajorMinor()).toBe('3.11')
-    })
-  })
 })
diff --git a/packages/cli/test/unit/util/basics/vfs-extract.test.mts b/packages/cli/test/unit/util/basics/vfs-extract.test.mts
@@ -32,11 +32,6 @@ vi.mock('../../../../src/util/sea/detect.mts', () => ({
   isSeaBinary: mockIsSeaBinary,
 }))
 
-const mockGetPythonMajorMinor = vi.hoisted(() => vi.fn(() => '3.12'))
-vi.mock('../../../../src/env/python-version.mts', () => ({
-  getPythonMajorMinor: mockGetPythonMajorMinor,
-}))
-
 vi.mock('../../../../src/constants/paths.mts', () => ({
   UPDATE_STORE_DIR: '.socket/_dlx',
 }))
diff --git a/packages/cli/test/unit/util/ecosystem/types.test.mts b/packages/cli/test/unit/util/ecosystem/types.test.mts
@@ -16,7 +16,6 @@ import { describe, expect, it } from 'vitest'
 
 import {
   ALL_ECOSYSTEMS,
-  ALL_SUPPORTED_ECOSYSTEMS,
   getEcosystemChoicesForMeow,
 } from '../../../../src/util/ecosystem/types.mts'
 
@@ -41,18 +40,6 @@ describe('ecosystem utilities', () => {
     })
   })
 
-  describe('ALL_SUPPORTED_ECOSYSTEMS', () => {
-    it('is a Set containing all ecosystems', () => {
-      expect(ALL_SUPPORTED_ECOSYSTEMS).toBeInstanceOf(Set)
-      expect(ALL_SUPPORTED_ECOSYSTEMS.size).toBe(ALL_ECOSYSTEMS.length)
-
-      for (let i = 0, { length } = ALL_ECOSYSTEMS; i < length; i += 1) {
-        const ecosystem = ALL_ECOSYSTEMS[i]
-        expect(ALL_SUPPORTED_ECOSYSTEMS.has(ecosystem)).toBe(true)
-      }
-    })
-  })
-
   describe('getEcosystemChoicesForMeow', () => {
     it('returns array of all ecosystems', () => {
       const choices = getEcosystemChoicesForMeow()
diff --git a/packages/cli/test/unit/util/fs/path-resolve.test.mts b/packages/cli/test/unit/util/fs/path-resolve.test.mts
@@ -25,7 +25,6 @@ import {
 } from '../../../../src/constants/packages.mts'
 import {
   findBinPathDetailsSync,
-  findNpmDirPathSync,
   getPackageFilesForScan,
 } from '../../../../src/util/fs/path-resolve.mts'
 import { createTestWorkspace } from '../../../helpers/workspace-helper.mts'
@@ -439,103 +438,4 @@ describe('Path Resolve', () => {
     })
   })
 
-  describe('findNpmDirPathSync', () => {
-    beforeEach(() => {
-      vi.clearAllMocks()
-    })
-
-    it('finds npm directory in lib/node_modules structure', async () => {
-      const { isDirSync } = vi.mocked(await import('@socketsecurity/lib-stable/fs/inspect'))
-
-      isDirSync.mockImplementation(p => {
-        const pathStr = normalizePath(String(p))
-        if (pathStr.includes('lib/node_modules/npm')) {
-          return true
-        }
-        if (pathStr.endsWith('/node_modules')) {
-          return true
-        }
-        return false
-      })
-
-      const result = findNpmDirPathSync('/usr/local/bin/npm')
-
-      expect(WIN32 ? result : normalizePath(result)).toBe(
-        WIN32
-          ? undefined
-          : normalizePath('/usr/local/bin/npm/lib/node_modules/npm'),
-      )
-    })
-
-    it('finds npm directory with node_modules in current path', async () => {
-      const { isDirSync } = vi.mocked(await import('@socketsecurity/lib-stable/fs/inspect'))
-
-      isDirSync.mockImplementation(p => {
-        const pathStr = normalizePath(String(p))
-        if (pathStr === normalizePath('/usr/local/npm/node_modules')) {
-          return true
-        }
-        return false
-      })
-
-      const result = findNpmDirPathSync('/usr/local/npm')
-
-      expect(WIN32 ? result : normalizePath(result)).toBe(
-        WIN32 ? undefined : normalizePath('/usr/local/npm'),
-      )
-    })
-
-    it('finds npm directory with node_modules in parent path', async () => {
-      const { isDirSync } = vi.mocked(await import('@socketsecurity/lib-stable/fs/inspect'))
-
-      isDirSync.mockImplementation(p => {
-        const pathStr = normalizePath(String(p))
-        if (pathStr === normalizePath('/usr/local/npm/node_modules')) {
-          return false
-        }
-        if (pathStr === normalizePath('/usr/local/node_modules')) {
-          return true
-        }
-        return false
-      })
-
-      const result = findNpmDirPathSync('/usr/local/npm')
-
-      expect(WIN32 ? result : normalizePath(result)).toBe(
-        WIN32 ? undefined : normalizePath('/usr/local'),
-      )
-    })
-
-    it('returns undefined when no npm directory found', async () => {
-      const { isDirSync } = vi.mocked(await import('@socketsecurity/lib-stable/fs/inspect'))
-
-      isDirSync.mockReturnValue(false)
-
-      const result = findNpmDirPathSync('/random/path')
-
-      expect(result).toBeUndefined()
-    })
-
-    it('handles nvm directory structure', async () => {
-      const { isDirSync } = vi.mocked(await import('@socketsecurity/lib-stable/fs/inspect'))
-
-      isDirSync.mockImplementation(p => {
-        const pathStr = normalizePath(String(p))
-        if (pathStr.includes('.nvm') && pathStr.endsWith('/node_modules')) {
-          return true
-        }
-        return false
-      })
-
-      const result = findNpmDirPathSync(
-        '/Users/user/.nvm/versions/node/v18.0.0/bin/npm',
-      )
-
-      expect(WIN32 ? result : normalizePath(result)).toBe(
-        WIN32
-          ? undefined
-          : normalizePath('/Users/user/.nvm/versions/node/v18.0.0/bin/npm'),
-      )
-    })
-  })
 })

Original file line number	Diff line number	Diff line change
`@@ -91,8 +91,6 @@ export const ALL_ECOSYSTEMS = [`
`91`	`91`	`// export type _Check_ALL_ECOSYSTEMS_has_no_extras =`
`92`	`92`	`// ExpectNever<ExtraInAllEcosystems>`
`93`	`93`
`94`		`-export const ALL_SUPPORTED_ECOSYSTEMS = new Set<string>(ALL_ECOSYSTEMS)`
`95`		`-`
`96`	`94`	`export function getEcosystemChoicesForMeow(): string[] {`
`97`	`95`	`return [...ALL_ECOSYSTEMS]`
`98`	`96`	`}`