refactor: rename filter-utils to lockfile.utils

2025-12-25 08:08:14 -05:00 · 2024-07-28 01:35:40 +02:00
parent 8055a30be1
commit c5ef9b0643
83 changed files with 196 additions and 191 deletions
--- a/.changeset/old-clouds-brush.md
+++ b/.changeset/old-clouds-brush.md
@@ -0,0 +1,5 @@
+---
+"@pnpm/lockfile.utils": major
+---
+
+Package renamed from `@pnpm/lockfile-utils".
--- a/deps/graph-builder/package.json
+++ b/deps/graph-builder/package.json
@@ -43,7 +43,7 @@
    "@pnpm/core-loggers": "workspace:*",
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/lockfile.fs": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/modules-yaml": "workspace:*",
    "@pnpm/package-is-installable": "workspace:*",
    "@pnpm/store-controller-types": "workspace:*",
--- a/deps/graph-builder/src/lockfileToDepGraph.ts
+++ b/deps/graph-builder/src/lockfileToDepGraph.ts
@@ -11,7 +11,7 @@ import {
  nameVerFromPkgSnapshot,
  packageIdFromSnapshot,
  pkgSnapshotToResolution,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import { logger } from '@pnpm/logger'
 import { type IncludedDependencies } from '@pnpm/modules-yaml'
 import { packageIsInstallable } from '@pnpm/package-is-installable'
--- a/deps/graph-builder/tsconfig.json
+++ b/deps/graph-builder/tsconfig.json
@@ -16,7 +16,7 @@
      "path": "../../lockfile/fs"
    },
    {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/utils"
    },
    {
      "path": "../../packages/constants"
--- a/exec/plugin-commands-rebuild/package.json
+++ b/exec/plugin-commands-rebuild/package.json
@@ -60,7 +60,7 @@
    "@pnpm/lifecycle": "workspace:*",
    "@pnpm/link-bins": "workspace:*",
    "@pnpm/lockfile.types": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/lockfile-walker": "workspace:*",
    "@pnpm/modules-yaml": "workspace:*",
    "@pnpm/normalize-registries": "workspace:*",
--- a/exec/plugin-commands-rebuild/src/implementation/index.ts
+++ b/exec/plugin-commands-rebuild/src/implementation/index.ts
@@ -21,7 +21,7 @@ import {
  nameVerFromPkgSnapshot,
  packageIsIndependent,
  type PackageSnapshots,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import { lockfileWalker, type LockfileWalkerStep } from '@pnpm/lockfile-walker'
 import { logger, streamParser } from '@pnpm/logger'
 import { writeModulesManifest } from '@pnpm/modules-yaml'
--- a/exec/plugin-commands-rebuild/tsconfig.json
+++ b/exec/plugin-commands-rebuild/tsconfig.json
@@ -39,15 +39,15 @@
    {
      "path": "../../deps/graph-sequencer"
    },
-    {
-      "path": "../../lockfile/lockfile-utils"
-    },
    {
      "path": "../../lockfile/lockfile-walker"
    },
    {
      "path": "../../lockfile/types"
    },
+    {
+      "path": "../../lockfile/utils"
+    },
    {
      "path": "../../packages/calc-dep-state"
    },
--- a/lockfile/audit/package.json
+++ b/lockfile/audit/package.json
@@ -46,7 +46,7 @@
    "@pnpm/fetching-types": "workspace:*",
    "@pnpm/list": "workspace:*",
    "@pnpm/lockfile.types": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/lockfile-walker": "workspace:*",
    "@pnpm/lockfile.detect-dep-types": "workspace:*",
    "@pnpm/read-project-manifest": "workspace:*",
--- a/lockfile/audit/src/lockfileToAuditTree.ts
+++ b/lockfile/audit/src/lockfileToAuditTree.ts
@@ -1,6 +1,6 @@
 import path from 'path'
 import { type Lockfile, type TarballResolution } from '@pnpm/lockfile.types'
-import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils'
+import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils'
 import { lockfileWalkerGroupImporterSteps, type LockfileWalkerStep } from '@pnpm/lockfile-walker'
 import { detectDepTypes, type DepTypes, DepType } from '@pnpm/lockfile.detect-dep-types'
 import { type DependenciesField, type ProjectId } from '@pnpm/types'
--- a/lockfile/audit/tsconfig.json
+++ b/lockfile/audit/tsconfig.json
@@ -39,14 +39,14 @@
    {
      "path": "../fs"
    },
-    {
-      "path": "../lockfile-utils"
-    },
    {
      "path": "../lockfile-walker"
    },
    {
      "path": "../types"
+    },
+    {
+      "path": "../utils"
    }
  ]
 }
--- a/lockfile/filtering/package.json
+++ b/lockfile/filtering/package.json
@@ -46,7 +46,7 @@
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/error": "workspace:*",
    "@pnpm/lockfile.types": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/lockfile-walker": "workspace:*",
    "@pnpm/package-is-installable": "workspace:*",
    "@pnpm/types": "workspace:*",
--- a/lockfile/filtering/src/filterLockfileByImportersAndEngine.ts
+++ b/lockfile/filtering/src/filterLockfileByImportersAndEngine.ts
@@ -4,7 +4,7 @@ import {
  type Lockfile,
  type PackageSnapshots,
 } from '@pnpm/lockfile.types'
-import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils'
+import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils'
 import { logger } from '@pnpm/logger'
 import { packageIsInstallable } from '@pnpm/package-is-installable'
 import { type DepPath, type SupportedArchitectures, type DependenciesField, type ProjectId } from '@pnpm/types'
--- a/lockfile/filtering/tsconfig.json
+++ b/lockfile/filtering/tsconfig.json
@@ -24,14 +24,14 @@
    {
      "path": "../../packages/types"
    },
-    {
-      "path": "../lockfile-utils"
-    },
    {
      "path": "../lockfile-walker"
    },
    {
      "path": "../types"
+    },
+    {
+      "path": "../utils"
    }
  ]
 }
--- a/lockfile/fs/package.json
+++ b/lockfile/fs/package.json
@@ -52,7 +52,7 @@
    "@pnpm/git-resolver": "workspace:*",
    "@pnpm/git-utils": "workspace:*",
    "@pnpm/lockfile.types": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/merge-lockfile-changes": "workspace:*",
    "@pnpm/types": "workspace:*",
    "@pnpm/util.lex-comparator": "catalog:",
--- a/lockfile/fs/tsconfig.json
+++ b/lockfile/fs/tsconfig.json
@@ -27,14 +27,14 @@
    {
      "path": "../../resolving/git-resolver"
    },
-    {
-      "path": "../lockfile-utils"
-    },
    {
      "path": "../merge-lockfile-changes"
    },
    {
      "path": "../types"
+    },
+    {
+      "path": "../utils"
    }
  ]
 }
--- a/lockfile/lockfile-to-pnp/package.json
+++ b/lockfile/lockfile-to-pnp/package.json
@@ -41,7 +41,7 @@
  "dependencies": {
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/lockfile.fs": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/types": "workspace:*",
    "@yarnpkg/pnp": "catalog:",
    "normalize-path": "catalog:",
--- a/lockfile/lockfile-to-pnp/src/index.ts
+++ b/lockfile/lockfile-to-pnp/src/index.ts
@@ -3,7 +3,7 @@ import path from 'path'
 import { type Lockfile } from '@pnpm/lockfile.fs'
 import {
  nameVerFromPkgSnapshot,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import { type Registries } from '@pnpm/types'
 import { depPathToFilename, refToRelative } from '@pnpm/dependency-path'
 import { generateInlinedScript, type PackageRegistry } from '@yarnpkg/pnp'
--- a/lockfile/lockfile-to-pnp/tsconfig.json
+++ b/lockfile/lockfile-to-pnp/tsconfig.json
@@ -19,7 +19,7 @@
      "path": "../fs"
    },
    {
-      "path": "../lockfile-utils"
+      "path": "../utils"
    }
  ]
 }
--- a/lockfile/preferred-versions/package.json
+++ b/lockfile/preferred-versions/package.json
@@ -33,7 +33,7 @@
    "@pnpm/lockfile.preferred-versions": "workspace:*"
  },
  "dependencies": {
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/manifest-utils": "workspace:*",
    "@pnpm/resolver-base": "workspace:*",
    "@pnpm/types": "workspace:*",
--- a/lockfile/preferred-versions/src/index.ts
+++ b/lockfile/preferred-versions/src/index.ts
@@ -1,4 +1,4 @@
-import { nameVerFromPkgSnapshot, type PackageSnapshots } from '@pnpm/lockfile-utils'
+import { nameVerFromPkgSnapshot, type PackageSnapshots } from '@pnpm/lockfile.utils'
 import { getAllDependenciesFromManifest } from '@pnpm/manifest-utils'
 import { DIRECT_DEP_SELECTOR_WEIGHT, type PreferredVersions } from '@pnpm/resolver-base'
 import { type DependencyManifest, type ProjectManifest } from '@pnpm/types'
--- a/lockfile/preferred-versions/tsconfig.json
+++ b/lockfile/preferred-versions/tsconfig.json
@@ -19,7 +19,7 @@
      "path": "../../resolving/resolver-base"
    },
    {
-      "path": "../lockfile-utils"
+      "path": "../utils"
    }
  ]
 }
--- a/lockfile/lockfile-utils/CHANGELOG.md
+++ b/lockfile/lockfile-utils/CHANGELOG.md
--- a/lockfile/lockfile-utils/README.md
+++ b/lockfile/lockfile-utils/README.md
--- a/lockfile/lockfile-utils/jest.config.js
+++ b/lockfile/lockfile-utils/jest.config.js
--- a/lockfile/lockfile-utils/package.json
+++ b/lockfile/lockfile-utils/package.json
@@ -1,6 +1,6 @@
 {
-  "name": "@pnpm/lockfile-utils",
-  "version": "11.0.4",
+  "name": "@pnpm/lockfile.utils",
+  "version": "0.0.0",
  "description": "Utils for dealing with pnpm-lock.yaml",
  "main": "lib/index.js",
  "types": "lib/index.d.ts",
@@ -18,7 +18,7 @@
    "prepublishOnly": "pnpm run compile",
    "compile": "tsc --build && pnpm run lint --fix"
  },
-  "repository": "https://github.com/pnpm/pnpm/blob/main/lockfile/lockfile-utils",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/lockfile/utils",
  "keywords": [
    "pnpm9",
    "pnpm",
@@ -29,9 +29,9 @@
  "bugs": {
    "url": "https://github.com/pnpm/pnpm/issues"
  },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/lockfile-utils#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/utils#readme",
  "devDependencies": {
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@types/ramda": "catalog:",
    "tempy": "catalog:",
    "write-yaml-file": "catalog:",
--- a/lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts
+++ b/lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts
--- a/lockfile/lockfile-utils/src/index.ts
+++ b/lockfile/lockfile-utils/src/index.ts
--- a/lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts
+++ b/lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts
--- a/lockfile/lockfile-utils/src/packageIdFromSnapshot.ts
+++ b/lockfile/lockfile-utils/src/packageIdFromSnapshot.ts
--- a/lockfile/lockfile-utils/src/packageIsIndependent.ts
+++ b/lockfile/lockfile-utils/src/packageIsIndependent.ts
--- a/lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts
+++ b/lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts
--- a/lockfile/lockfile-utils/src/refIsLocalTarball.ts
+++ b/lockfile/lockfile-utils/src/refIsLocalTarball.ts
--- a/lockfile/lockfile-utils/test/nameVerFromPkgSnapshot.ts
+++ b/lockfile/lockfile-utils/test/nameVerFromPkgSnapshot.ts
@@ -1,4 +1,4 @@
-import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils'
+import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils'

 test('nameVerFromPkgSnapshot()', () => {
  expect(nameVerFromPkgSnapshot('foo@some-weird-path', {
--- a/lockfile/lockfile-utils/test/pkgSnapshotToResolution.ts
+++ b/lockfile/lockfile-utils/test/pkgSnapshotToResolution.ts
@@ -1,4 +1,4 @@
-import { pkgSnapshotToResolution } from '@pnpm/lockfile-utils'
+import { pkgSnapshotToResolution } from '@pnpm/lockfile.utils'

 test('pkgSnapshotToResolution()', () => {
  expect(pkgSnapshotToResolution('foo@1.0.0', {
--- a/lockfile/lockfile-utils/test/tsconfig.json
+++ b/lockfile/lockfile-utils/test/tsconfig.json
--- a/lockfile/lockfile-utils/tsconfig.json
+++ b/lockfile/lockfile-utils/tsconfig.json
--- a/lockfile/lockfile-utils/tsconfig.lint.json
+++ b/lockfile/lockfile-utils/tsconfig.lint.json
--- a/lockfile/verification/package.json
+++ b/lockfile/verification/package.json
@@ -36,7 +36,7 @@
    "@pnpm/catalogs.types": "workspace:*",
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/get-context": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/lockfile.types": "workspace:*",
    "@pnpm/read-package-json": "workspace:*",
    "@pnpm/resolver-base": "workspace:*",
--- a/lockfile/verification/src/allProjectsAreUpToDate.ts
+++ b/lockfile/verification/src/allProjectsAreUpToDate.ts
@@ -7,7 +7,7 @@ import {
  type ProjectSnapshot,
  type PackageSnapshots,
 } from '@pnpm/lockfile.types'
-import { refIsLocalDirectory, refIsLocalTarball } from '@pnpm/lockfile-utils'
+import { refIsLocalDirectory, refIsLocalTarball } from '@pnpm/lockfile.utils'
 import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json'
 import { refToRelative } from '@pnpm/dependency-path'
 import { type DirectoryResolution, type WorkspacePackages } from '@pnpm/resolver-base'
--- a/lockfile/verification/tsconfig.json
+++ b/lockfile/verification/tsconfig.json
@@ -34,10 +34,10 @@
      "path": "../../resolving/resolver-base"
    },
    {
-      "path": "../lockfile-utils"
+      "path": "../types"
    },
    {
-      "path": "../types"
+      "path": "../utils"
    }
  ]
 }
--- a/modules-mounter/daemon/package.json
+++ b/modules-mounter/daemon/package.json
@@ -45,7 +45,7 @@
    "@pnpm/config": "workspace:*",
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/lockfile.fs": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/logger": "catalog:",
    "@pnpm/store-path": "workspace:*",
    "@pnpm/store.cafs": "workspace:*",
--- a/modules-mounter/daemon/src/createFuseHandlers.ts
+++ b/modules-mounter/daemon/src/createFuseHandlers.ts
@@ -4,7 +4,7 @@ import { getFilePathInCafs, getFilePathByModeInCafs, type PackageFilesIndex } fr
 import { type Lockfile, readWantedLockfile, type PackageSnapshot, type TarballResolution } from '@pnpm/lockfile.fs'
 import {
  nameVerFromPkgSnapshot,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import { type DepPath } from '@pnpm/types'
 import * as schemas from 'hyperdrive-schemas'
 import loadJsonFile from 'load-json-file'
--- a/modules-mounter/daemon/src/makeVirtualNodeModules.ts
+++ b/modules-mounter/daemon/src/makeVirtualNodeModules.ts
@@ -1,7 +1,7 @@
 import path from 'path'
 import { type Lockfile } from '@pnpm/lockfile.fs'
 import { DEPENDENCIES_FIELDS, type ProjectId } from '@pnpm/types'
-import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils'
+import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils'
 import * as dp from '@pnpm/dependency-path'
 import normalize from 'normalize-path'

--- a/modules-mounter/daemon/tsconfig.json
+++ b/modules-mounter/daemon/tsconfig.json
@@ -16,7 +16,7 @@
      "path": "../../lockfile/fs"
    },
    {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/utils"
    },
    {
      "path": "../../packages/dependency-path"
--- a/packages/calc-dep-state/package.json
+++ b/packages/calc-dep-state/package.json
@@ -33,7 +33,7 @@
    "@pnpm/crypto.object-hasher": "workspace:*",
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/lockfile.types": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/types": "workspace:*",
    "sort-keys": "catalog:"
  },
--- a/packages/calc-dep-state/tsconfig.json
+++ b/packages/calc-dep-state/tsconfig.json
@@ -13,10 +13,10 @@
      "path": "../../crypto/object-hasher"
    },
    {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/types"
    },
    {
-      "path": "../../lockfile/types"
+      "path": "../../lockfile/utils"
    },
    {
      "path": "../constants"
--- a/patching/plugin-commands-patching/package.json
+++ b/patching/plugin-commands-patching/package.json
@@ -48,7 +48,7 @@
    "@pnpm/error": "workspace:*",
    "@pnpm/fs.packlist": "workspace:*",
    "@pnpm/lockfile.fs": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/modules-yaml": "workspace:*",
    "@pnpm/parse-wanted-dependency": "workspace:*",
    "@pnpm/patching.apply-patch": "workspace:*",
--- a/patching/plugin-commands-patching/src/getPatchedDependency.ts
+++ b/patching/plugin-commands-patching/src/getPatchedDependency.ts
@@ -2,7 +2,7 @@ import path from 'path'
 import { parseWantedDependency, type ParseWantedDependencyResult } from '@pnpm/parse-wanted-dependency'
 import { prompt } from 'enquirer'
 import { readCurrentLockfile, type TarballResolution } from '@pnpm/lockfile.fs'
-import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils'
+import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils'
 import { PnpmError } from '@pnpm/error'
 import { readModulesManifest } from '@pnpm/modules-yaml'
 import { isGitHostedPkgUrl } from '@pnpm/pick-fetcher'
--- a/patching/plugin-commands-patching/tsconfig.json
+++ b/patching/plugin-commands-patching/tsconfig.json
@@ -34,7 +34,7 @@
      "path": "../../lockfile/fs"
    },
    {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/utils"
    },
    {
      "path": "../../packages/constants"
--- a/pkg-manager/core/package.json
+++ b/pkg-manager/core/package.json
@@ -38,7 +38,7 @@
    "@pnpm/lockfile.verification": "workspace:*",
    "@pnpm/lockfile.fs": "workspace:*",
    "@pnpm/lockfile-to-pnp": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/lockfile-walker": "workspace:*",
    "@pnpm/lockfile.preferred-versions": "workspace:*",
    "@pnpm/manifest-utils": "workspace:*",
--- a/pkg-manager/core/src/install/index.ts
+++ b/pkg-manager/core/src/install/index.ts
@@ -35,7 +35,7 @@ import {
  type PatchFile,
 } from '@pnpm/lockfile.fs'
 import { writePnpFile } from '@pnpm/lockfile-to-pnp'
-import { extendProjectsWithTargetDirs } from '@pnpm/lockfile-utils'
+import { extendProjectsWithTargetDirs } from '@pnpm/lockfile.utils'
 import { allProjectsAreUpToDate, satisfiesPackageManifest } from '@pnpm/lockfile.verification'
 import { getPreferredVersionsFromLockfileAndManifests } from '@pnpm/lockfile.preferred-versions'
 import { logger, globalInfo, streamParser } from '@pnpm/logger'
--- a/pkg-manager/core/tsconfig.json
+++ b/pkg-manager/core/tsconfig.json
@@ -72,9 +72,6 @@
    {
      "path": "../../lockfile/lockfile-to-pnp"
    },
-    {
-      "path": "../../lockfile/lockfile-utils"
-    },
    {
      "path": "../../lockfile/lockfile-walker"
    },
@@ -87,6 +84,9 @@
    {
      "path": "../../lockfile/types"
    },
+    {
+      "path": "../../lockfile/utils"
+    },
    {
      "path": "../../lockfile/verification"
    },
--- a/pkg-manager/headless/package.json
+++ b/pkg-manager/headless/package.json
@@ -79,7 +79,7 @@
    "@pnpm/link-bins": "workspace:*",
    "@pnpm/lockfile.fs": "workspace:*",
    "@pnpm/lockfile-to-pnp": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/modules-cleaner": "workspace:*",
    "@pnpm/modules-yaml": "workspace:*",
    "@pnpm/package-is-installable": "workspace:*",
--- a/pkg-manager/headless/src/index.ts
+++ b/pkg-manager/headless/src/index.ts
@@ -37,7 +37,7 @@ import { writePnpFile } from '@pnpm/lockfile-to-pnp'
 import {
  extendProjectsWithTargetDirs,
  nameVerFromPkgSnapshot,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import {
  type LogBase,
  logger,
--- a/pkg-manager/headless/src/lockfileToHoistedDepGraph.ts
+++ b/pkg-manager/headless/src/lockfileToHoistedDepGraph.ts
@@ -9,7 +9,7 @@ import {
  nameVerFromPkgSnapshot,
  packageIdFromSnapshot,
  pkgSnapshotToResolution,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import { type IncludedDependencies } from '@pnpm/modules-yaml'
 import { packageIsInstallable } from '@pnpm/package-is-installable'
 import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json'
--- a/pkg-manager/headless/tsconfig.json
+++ b/pkg-manager/headless/tsconfig.json
@@ -49,7 +49,7 @@
      "path": "../../lockfile/lockfile-to-pnp"
    },
    {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/utils"
    },
    {
      "path": "../../packages/calc-dep-state"
--- a/pkg-manager/hoist/package.json
+++ b/pkg-manager/hoist/package.json
@@ -44,7 +44,7 @@
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/link-bins": "workspace:*",
    "@pnpm/lockfile.types": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/lockfile-walker": "workspace:*",
    "@pnpm/matcher": "workspace:*",
    "@pnpm/types": "workspace:*",
--- a/pkg-manager/hoist/src/index.ts
+++ b/pkg-manager/hoist/src/index.ts
@@ -6,7 +6,7 @@ import { linkBinsOfPkgsByAliases, type WarnFunction } from '@pnpm/link-bins'
 import {
  type Lockfile,
  nameVerFromPkgSnapshot,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import { lockfileWalker, type LockfileWalkerStep } from '@pnpm/lockfile-walker'
 import { logger } from '@pnpm/logger'
 import { createMatcher } from '@pnpm/matcher'
--- a/pkg-manager/hoist/tsconfig.json
+++ b/pkg-manager/hoist/tsconfig.json
@@ -12,15 +12,15 @@
    {
      "path": "../../config/matcher"
    },
-    {
-      "path": "../../lockfile/lockfile-utils"
-    },
    {
      "path": "../../lockfile/lockfile-walker"
    },
    {
      "path": "../../lockfile/types"
    },
+    {
+      "path": "../../lockfile/utils"
+    },
    {
      "path": "../../packages/constants"
    },
--- a/pkg-manager/modules-cleaner/package.json
+++ b/pkg-manager/modules-cleaner/package.json
@@ -32,7 +32,7 @@
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/lockfile.filtering": "workspace:*",
    "@pnpm/lockfile.types": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/read-modules-dir": "workspace:*",
    "@pnpm/remove-bins": "workspace:*",
    "@pnpm/store-controller-types": "workspace:*",
--- a/pkg-manager/modules-cleaner/src/prune.ts
+++ b/pkg-manager/modules-cleaner/src/prune.ts
@@ -10,7 +10,7 @@ import {
  type PackageSnapshots,
  type ProjectSnapshot,
 } from '@pnpm/lockfile.types'
-import { packageIdFromSnapshot } from '@pnpm/lockfile-utils'
+import { packageIdFromSnapshot } from '@pnpm/lockfile.utils'
 import { logger } from '@pnpm/logger'
 import { readModulesDir } from '@pnpm/read-modules-dir'
 import { type StoreController } from '@pnpm/store-controller-types'
--- a/pkg-manager/modules-cleaner/tsconfig.json
+++ b/pkg-manager/modules-cleaner/tsconfig.json
@@ -16,10 +16,10 @@
      "path": "../../lockfile/filtering"
    },
    {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/types"
    },
    {
-      "path": "../../lockfile/types"
+      "path": "../../lockfile/utils"
    },
    {
      "path": "../../packages/core-loggers"
--- a/pkg-manager/real-hoist/package.json
+++ b/pkg-manager/real-hoist/package.json
@@ -32,7 +32,7 @@
  "dependencies": {
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/error": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@yarnpkg/nm": "catalog:"
  },
  "funding": "https://opencollective.com/pnpm",
--- a/pkg-manager/real-hoist/src/index.ts
+++ b/pkg-manager/real-hoist/src/index.ts
@@ -3,7 +3,7 @@ import {
  type Lockfile,
  type ProjectId,
  nameVerFromPkgSnapshot,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import * as dp from '@pnpm/dependency-path'
 import { hoist as _hoist, HoisterDependencyKind, type HoisterTree, type HoisterResult } from '@yarnpkg/nm'

--- a/pkg-manager/real-hoist/tsconfig.json
+++ b/pkg-manager/real-hoist/tsconfig.json
@@ -16,7 +16,7 @@
      "path": "../../lockfile/fs"
    },
    {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/utils"
    },
    {
      "path": "../../packages/dependency-path"
--- a/pkg-manager/resolve-dependencies/package.json
+++ b/pkg-manager/resolve-dependencies/package.json
@@ -36,7 +36,7 @@
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/error": "workspace:*",
    "@pnpm/lockfile.types": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/lockfile.preferred-versions": "workspace:*",
    "@pnpm/manifest-utils": "workspace:*",
    "@pnpm/npm-resolver": "workspace:*",
--- a/pkg-manager/resolve-dependencies/src/resolveDependencies.ts
+++ b/pkg-manager/resolve-dependencies/src/resolveDependencies.ts
@@ -14,7 +14,7 @@ import {
 import {
  nameVerFromPkgSnapshot,
  pkgSnapshotToResolution,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import { logger } from '@pnpm/logger'
 import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package'
 import {
--- a/pkg-manager/resolve-dependencies/tsconfig.json
+++ b/pkg-manager/resolve-dependencies/tsconfig.json
@@ -21,9 +21,6 @@
    {
      "path": "../../fetching/pick-fetcher"
    },
-    {
-      "path": "../../lockfile/lockfile-utils"
-    },
    {
      "path": "../../lockfile/preferred-versions"
    },
@@ -33,6 +30,9 @@
    {
      "path": "../../lockfile/types"
    },
+    {
+      "path": "../../lockfile/utils"
+    },
    {
      "path": "../../packages/constants"
    },
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1573,12 +1573,12 @@ importers:
      '@pnpm/dependency-path':
        specifier: workspace:*
        version: link:../../packages/dependency-path
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile.fs':
        specifier: workspace:*
        version: link:../../lockfile/fs
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -1949,15 +1949,15 @@ importers:
      '@pnpm/link-bins':
        specifier: workspace:*
        version: link:../../pkg-manager/link-bins
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile-walker':
        specifier: workspace:*
        version: link:../../lockfile/lockfile-walker
      '@pnpm/lockfile.types':
        specifier: workspace:*
        version: link:../../lockfile/types
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -2696,9 +2696,6 @@ importers:
      '@pnpm/list':
        specifier: workspace:*
        version: link:../../reviewing/list
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../lockfile-utils
      '@pnpm/lockfile-walker':
        specifier: workspace:*
        version: link:../lockfile-walker
@@ -2708,6 +2705,9 @@ importers:
      '@pnpm/lockfile.types':
        specifier: workspace:*
        version: link:../types
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -2770,15 +2770,15 @@ importers:
      '@pnpm/error':
        specifier: workspace:*
        version: link:../../packages/error
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../lockfile-utils
      '@pnpm/lockfile-walker':
        specifier: workspace:*
        version: link:../lockfile-walker
      '@pnpm/lockfile.types':
        specifier: workspace:*
        version: link:../types
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -2828,12 +2828,12 @@ importers:
      '@pnpm/git-utils':
        specifier: workspace:*
        version: link:../../packages/git-utils
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../lockfile-utils
      '@pnpm/lockfile.types':
        specifier: workspace:*
        version: link:../types
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -2907,12 +2907,12 @@ importers:
      '@pnpm/dependency-path':
        specifier: workspace:*
        version: link:../../packages/dependency-path
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../lockfile-utils
      '@pnpm/lockfile.fs':
        specifier: workspace:*
        version: link:../fs
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -2939,46 +2939,6 @@ importers:
        specifier: 'catalog:'
        version: 0.29.12

-  lockfile/lockfile-utils:
-    dependencies:
-      '@pnpm/dependency-path':
-        specifier: workspace:*
-        version: link:../../packages/dependency-path
-      '@pnpm/lockfile.types':
-        specifier: workspace:*
-        version: link:../types
-      '@pnpm/pick-fetcher':
-        specifier: workspace:*
-        version: link:../../fetching/pick-fetcher
-      '@pnpm/resolver-base':
-        specifier: workspace:*
-        version: link:../../resolving/resolver-base
-      '@pnpm/types':
-        specifier: workspace:*
-        version: link:../../packages/types
-      get-npm-tarball-url:
-        specifier: 'catalog:'
-        version: 2.1.0
-      ramda:
-        specifier: 'catalog:'
-        version: '@pnpm/ramda@0.28.1'
-    devDependencies:
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: 'link:'
-      '@types/ramda':
-        specifier: 'catalog:'
-        version: 0.29.12
-      tempy:
-        specifier: 'catalog:'
-        version: 1.0.1
-      write-yaml-file:
-        specifier: 'catalog:'
-        version: 5.0.0
-      yaml-tag:
-        specifier: 'catalog:'
-        version: 1.1.0
-
  lockfile/lockfile-walker:
    dependencies:
      '@pnpm/dependency-path':
@@ -3101,9 +3061,9 @@ importers:

  lockfile/preferred-versions:
    dependencies:
-      '@pnpm/lockfile-utils':
+      '@pnpm/lockfile.utils':
        specifier: workspace:*
-        version: link:../lockfile-utils
+        version: link:../utils
      '@pnpm/manifest-utils':
        specifier: workspace:*
        version: link:../../pkg-manifest/manifest-utils
@@ -3159,6 +3119,46 @@ importers:
        specifier: workspace:*
        version: 'link:'

+  lockfile/utils:
+    dependencies:
+      '@pnpm/dependency-path':
+        specifier: workspace:*
+        version: link:../../packages/dependency-path
+      '@pnpm/lockfile.types':
+        specifier: workspace:*
+        version: link:../types
+      '@pnpm/pick-fetcher':
+        specifier: workspace:*
+        version: link:../../fetching/pick-fetcher
+      '@pnpm/resolver-base':
+        specifier: workspace:*
+        version: link:../../resolving/resolver-base
+      '@pnpm/types':
+        specifier: workspace:*
+        version: link:../../packages/types
+      get-npm-tarball-url:
+        specifier: 'catalog:'
+        version: 2.1.0
+      ramda:
+        specifier: 'catalog:'
+        version: '@pnpm/ramda@0.28.1'
+    devDependencies:
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: 'link:'
+      '@types/ramda':
+        specifier: 'catalog:'
+        version: 0.29.12
+      tempy:
+        specifier: 'catalog:'
+        version: 1.0.1
+      write-yaml-file:
+        specifier: 'catalog:'
+        version: 5.0.0
+      yaml-tag:
+        specifier: 'catalog:'
+        version: 1.1.0
+
  lockfile/verification:
    dependencies:
      '@pnpm/catalogs.types':
@@ -3170,12 +3170,12 @@ importers:
      '@pnpm/get-context':
        specifier: workspace:*
        version: link:../../pkg-manager/get-context
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../lockfile-utils
      '@pnpm/lockfile.types':
        specifier: workspace:*
        version: link:../types
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -3225,12 +3225,12 @@ importers:
      '@pnpm/dependency-path':
        specifier: workspace:*
        version: link:../../packages/dependency-path
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile.fs':
        specifier: workspace:*
        version: link:../../lockfile/fs
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: 'catalog:'
        version: 5.0.0
@@ -3341,12 +3341,12 @@ importers:
      '@pnpm/dependency-path':
        specifier: workspace:*
        version: link:../dependency-path
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile.types':
        specifier: workspace:*
        version: link:../../lockfile/types
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/types':
        specifier: workspace:*
        version: link:../types
@@ -3667,12 +3667,12 @@ importers:
      '@pnpm/fs.packlist':
        specifier: workspace:*
        version: link:../../fs/packlist
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile.fs':
        specifier: workspace:*
        version: link:../../lockfile/fs
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -3873,9 +3873,6 @@ importers:
      '@pnpm/lockfile-to-pnp':
        specifier: workspace:*
        version: link:../../lockfile/lockfile-to-pnp
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile-walker':
        specifier: workspace:*
        version: link:../../lockfile/lockfile-walker
@@ -3888,6 +3885,9 @@ importers:
      '@pnpm/lockfile.preferred-versions':
        specifier: workspace:*
        version: link:../../lockfile/preferred-versions
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/lockfile.verification':
        specifier: workspace:*
        version: link:../../lockfile/verification
@@ -4224,15 +4224,15 @@ importers:
      '@pnpm/lockfile-to-pnp':
        specifier: workspace:*
        version: link:../../lockfile/lockfile-to-pnp
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile.filtering':
        specifier: workspace:*
        version: link:../../lockfile/filtering
      '@pnpm/lockfile.fs':
        specifier: workspace:*
        version: link:../../lockfile/fs
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -4372,15 +4372,15 @@ importers:
      '@pnpm/link-bins':
        specifier: workspace:*
        version: link:../link-bins
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile-walker':
        specifier: workspace:*
        version: link:../../lockfile/lockfile-walker
      '@pnpm/lockfile.types':
        specifier: workspace:*
        version: link:../../lockfile/types
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -4506,15 +4506,15 @@ importers:
      '@pnpm/dependency-path':
        specifier: workspace:*
        version: link:../../packages/dependency-path
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile.filtering':
        specifier: workspace:*
        version: link:../../lockfile/filtering
      '@pnpm/lockfile.types':
        specifier: workspace:*
        version: link:../../lockfile/types
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -4965,9 +4965,9 @@ importers:
      '@pnpm/error':
        specifier: workspace:*
        version: link:../../packages/error
-      '@pnpm/lockfile-utils':
+      '@pnpm/lockfile.utils':
        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
+        version: link:../../lockfile/utils
      '@yarnpkg/nm':
        specifier: 'catalog:'
        version: 4.0.2(typanion@3.14.0)
@@ -5042,15 +5042,15 @@ importers:
      '@pnpm/error':
        specifier: workspace:*
        version: link:../../packages/error
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile.preferred-versions':
        specifier: workspace:*
        version: link:../../lockfile/preferred-versions
      '@pnpm/lockfile.types':
        specifier: workspace:*
        version: link:../../lockfile/types
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -6118,15 +6118,15 @@ importers:
      '@pnpm/dependency-path':
        specifier: workspace:*
        version: link:../../packages/dependency-path
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile.detect-dep-types':
        specifier: workspace:*
        version: link:../../lockfile/detect-dep-types
      '@pnpm/lockfile.fs':
        specifier: workspace:*
        version: link:../../lockfile/fs
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/matcher':
        specifier: workspace:*
        version: link:../../config/matcher
@@ -6188,9 +6188,6 @@ importers:
      '@pnpm/error':
        specifier: workspace:*
        version: link:../../packages/error
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile-walker':
        specifier: workspace:*
        version: link:../../lockfile/lockfile-walker
@@ -6203,6 +6200,9 @@ importers:
      '@pnpm/lockfile.types':
        specifier: workspace:*
        version: link:../../lockfile/types
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -6313,12 +6313,12 @@ importers:
      '@pnpm/hooks.read-package-hook':
        specifier: workspace:*
        version: link:../../hooks/read-package-hook
-      '@pnpm/lockfile-utils':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
      '@pnpm/lockfile.fs':
        specifier: workspace:*
        version: link:../../lockfile/fs
+      '@pnpm/lockfile.utils':
+        specifier: workspace:*
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
@@ -6852,9 +6852,9 @@ importers:
      '@pnpm/get-context':
        specifier: workspace:*
        version: link:../../pkg-manager/get-context
-      '@pnpm/lockfile-utils':
+      '@pnpm/lockfile.utils':
        specifier: workspace:*
-        version: link:../../lockfile/lockfile-utils
+        version: link:../../lockfile/utils
      '@pnpm/logger':
        specifier: ^5.0.0
        version: 5.0.0
--- a/renovate.json
+++ b/renovate.json
@@ -23,7 +23,7 @@
    "@pnpm/local-resolver",
    "@pnpm/lockfile-file",
    "@pnpm/lockfile-types",
-    "@pnpm/lockfile-utils",
+    "@pnpm/lockfile.utils",
    "@pnpm/logger",
    "@pnpm/modules-cleaner",
    "@pnpm/modules-yaml",
--- a/reviewing/dependencies-hierarchy/package.json
+++ b/reviewing/dependencies-hierarchy/package.json
@@ -34,7 +34,7 @@
  "dependencies": {
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/lockfile.fs": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/lockfile.detect-dep-types": "workspace:*",
    "@pnpm/matcher": "workspace:*",
    "@pnpm/modules-yaml": "workspace:*",
--- a/reviewing/dependencies-hierarchy/src/getPkgInfo.ts
+++ b/reviewing/dependencies-hierarchy/src/getPkgInfo.ts
@@ -7,7 +7,7 @@ import {
 import {
  nameVerFromPkgSnapshot,
  pkgSnapshotToResolution,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import { type DepTypes, DepType } from '@pnpm/lockfile.detect-dep-types'
 import { type Registries } from '@pnpm/types'
 import { depPathToFilename, refToRelative } from '@pnpm/dependency-path'
--- a/reviewing/dependencies-hierarchy/tsconfig.json
+++ b/reviewing/dependencies-hierarchy/tsconfig.json
@@ -28,7 +28,7 @@
      "path": "../../lockfile/fs"
    },
    {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/utils"
    },
    {
      "path": "../../packages/constants"
--- a/reviewing/license-scanner/package.json
+++ b/reviewing/license-scanner/package.json
@@ -38,7 +38,7 @@
    "@pnpm/error": "workspace:*",
    "@pnpm/lockfile.fs": "workspace:*",
    "@pnpm/lockfile.types": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/lockfile-walker": "workspace:*",
    "@pnpm/lockfile.detect-dep-types": "workspace:*",
    "@pnpm/package-is-installable": "workspace:*",
--- a/reviewing/license-scanner/src/getPkgInfo.ts
+++ b/reviewing/license-scanner/src/getPkgInfo.ts
@@ -14,7 +14,7 @@ import {
 import loadJsonFile from 'load-json-file'
 import { PnpmError } from '@pnpm/error'
 import { type LicensePackage } from './licenses'
-import { type DirectoryResolution, type PackageSnapshot, pkgSnapshotToResolution, type Resolution } from '@pnpm/lockfile-utils'
+import { type DirectoryResolution, type PackageSnapshot, pkgSnapshotToResolution, type Resolution } from '@pnpm/lockfile.utils'
 import { fetchFromDir } from '@pnpm/directory-fetcher'

 const limitPkgReads = pLimit(4)
--- a/reviewing/license-scanner/src/lockfileToLicenseNodeTree.ts
+++ b/reviewing/license-scanner/src/lockfileToLicenseNodeTree.ts
@@ -1,5 +1,5 @@
 import { type Lockfile, type TarballResolution } from '@pnpm/lockfile.types'
-import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils'
+import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils'
 import { packageIsInstallable } from '@pnpm/package-is-installable'
 import {
  lockfileWalkerGroupImporterSteps,
--- a/reviewing/license-scanner/tsconfig.json
+++ b/reviewing/license-scanner/tsconfig.json
@@ -21,15 +21,15 @@
    {
      "path": "../../lockfile/fs"
    },
-    {
-      "path": "../../lockfile/lockfile-utils"
-    },
    {
      "path": "../../lockfile/lockfile-walker"
    },
    {
      "path": "../../lockfile/types"
    },
+    {
+      "path": "../../lockfile/utils"
+    },
    {
      "path": "../../packages/constants"
    },
--- a/reviewing/outdated/package.json
+++ b/reviewing/outdated/package.json
@@ -41,7 +41,7 @@
    "@pnpm/error": "workspace:*",
    "@pnpm/hooks.read-package-hook": "workspace:*",
    "@pnpm/lockfile.fs": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/manifest-utils": "workspace:*",
    "@pnpm/matcher": "workspace:*",
    "@pnpm/modules-yaml": "workspace:*",
--- a/reviewing/outdated/src/outdated.ts
+++ b/reviewing/outdated/src/outdated.ts
@@ -12,7 +12,7 @@ import {
  type Lockfile,
  type ProjectSnapshot,
 } from '@pnpm/lockfile.fs'
-import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils'
+import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils'
 import { getAllDependenciesFromManifest } from '@pnpm/manifest-utils'
 import { parsePref } from '@pnpm/npm-resolver'
 import { pickRegistryForPackage } from '@pnpm/pick-registry-for-package'
--- a/reviewing/outdated/tsconfig.json
+++ b/reviewing/outdated/tsconfig.json
@@ -31,7 +31,7 @@
      "path": "../../lockfile/fs"
    },
    {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/utils"
    },
    {
      "path": "../../packages/constants"
--- a/store/plugin-commands-store/package.json
+++ b/store/plugin-commands-store/package.json
@@ -50,7 +50,7 @@
    "@pnpm/dependency-path": "workspace:*",
    "@pnpm/error": "workspace:*",
    "@pnpm/get-context": "workspace:*",
-    "@pnpm/lockfile-utils": "workspace:*",
+    "@pnpm/lockfile.utils": "workspace:*",
    "@pnpm/normalize-registries": "workspace:*",
    "@pnpm/parse-wanted-dependency": "workspace:*",
    "@pnpm/pick-registry-for-package": "workspace:*",
--- a/store/plugin-commands-store/src/storeStatus/index.ts
+++ b/store/plugin-commands-store/src/storeStatus/index.ts
@@ -5,7 +5,7 @@ import {
  nameVerFromPkgSnapshot,
  packageIdFromSnapshot,
  type PackageSnapshot,
-} from '@pnpm/lockfile-utils'
+} from '@pnpm/lockfile.utils'
 import { streamParser } from '@pnpm/logger'
 import * as dp from '@pnpm/dependency-path'
 import { type DepPath } from '@pnpm/types'
--- a/store/plugin-commands-store/tsconfig.json
+++ b/store/plugin-commands-store/tsconfig.json
@@ -34,7 +34,7 @@
      "path": "../../lockfile/fs"
    },
    {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/utils"
    },
    {
      "path": "../../packages/dependency-path"