refactor: rename lockfile-types to lockfile.types

.changeset/stale-kings-poke.md

@@ -0,0 +1,5 @@
+---
+"@pnpm/lockfile.types": major
+---
+
+Rename project from `@pnpm/lockfile-types` to `@pnpm/lockfile.types`.

.meta-updater/src/index.ts

@@ -229,7 +229,7 @@ async function updateManifest (workspaceDir: string, manifest: ProjectManifest,
   const relative = normalizePath(path.relative(workspaceDir, dir))
   let scripts: Record<string, string>
   switch (manifest.name) {
-  case '@pnpm/lockfile-types':
+  case '@pnpm/lockfile.types':
     scripts = { ...manifest.scripts }
     break
   case '@pnpm/headless':

__utils__/assert-project/package.json

@@ -42,7 +42,7 @@
   "dependencies": {
     "@pnpm/assert-store": "workspace:*",
     "@pnpm/constants": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/modules-yaml": "workspace:*",
     "@pnpm/registry-mock": "catalog:",
     "@pnpm/types": "workspace:*",

__utils__/assert-project/src/index.ts

@@ -3,7 +3,7 @@ import path from 'path'
 import util from 'util'
 import { assertStore } from '@pnpm/assert-store'
 import { WANTED_LOCKFILE } from '@pnpm/constants'
-import { type LockfileFileV9 } from '@pnpm/lockfile-types'
+import { type LockfileFileV9 } from '@pnpm/lockfile.types'
 import { type Modules } from '@pnpm/modules-yaml'
 import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'
 import { sync as readYamlFile } from 'read-yaml-file'

__utils__/assert-project/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../lockfile/lockfile-types"
+      "path": "../../lockfile/types"
     },
     {
       "path": "../../packages/constants"

dedupe/check/package.json

@@ -31,7 +31,7 @@
   "dependencies": {
     "@pnpm/dedupe.types": "workspace:*",
     "@pnpm/error": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/types": "workspace:*"
   },
   "devDependencies": {

dedupe/check/src/dedupeDiffCheck.ts

@@ -1,4 +1,4 @@
-import { type ResolvedDependencies, type Lockfile } from '@pnpm/lockfile-types'
+import { type ResolvedDependencies, type Lockfile } from '@pnpm/lockfile.types'
 import {
   type ResolutionChangesByAlias,
   type DedupeCheckIssues,

dedupe/check/test/dedupeDiffCheck.ts

@@ -1,5 +1,5 @@
 import { DedupeCheckIssuesError, dedupeDiffCheck } from '@pnpm/dedupe.check'
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { type DepPath, type ProjectId } from '@pnpm/types'
 
 describe('dedupeDiffCheck', () => {

dedupe/check/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../lockfile/lockfile-types"
+      "path": "../../lockfile/types"
     },
     {
       "path": "../../packages/error"

exec/plugin-commands-rebuild/package.json

@@ -59,7 +59,7 @@
     "@pnpm/get-context": "workspace:*",
     "@pnpm/lifecycle": "workspace:*",
     "@pnpm/link-bins": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/lockfile-utils": "workspace:*",
     "@pnpm/lockfile-walker": "workspace:*",
     "@pnpm/modules-yaml": "workspace:*",

exec/plugin-commands-rebuild/src/implementation/index.ts

@@ -15,7 +15,7 @@ import {
   runPostinstallHooks,
 } from '@pnpm/lifecycle'
 import { linkBins } from '@pnpm/link-bins'
-import { type TarballResolution } from '@pnpm/lockfile-types'
+import { type TarballResolution } from '@pnpm/lockfile.types'
 import {
   type Lockfile,
   nameVerFromPkgSnapshot,

exec/plugin-commands-rebuild/tsconfig.json

@@ -39,15 +39,15 @@
     {
       "path": "../../deps/graph-sequencer"
     },
-    {
-      "path": "../../lockfile/lockfile-types"
-    },
     {
       "path": "../../lockfile/lockfile-utils"
     },
     {
       "path": "../../lockfile/lockfile-walker"
     },
+    {
+      "path": "../../lockfile/types"
+    },
     {
       "path": "../../packages/calc-dep-state"
     },

hooks/pnpmfile/package.json

@@ -37,7 +37,7 @@
     "@pnpm/crypto.base32-hash": "workspace:*",
     "@pnpm/error": "workspace:*",
     "@pnpm/hooks.types": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/store-controller-types": "workspace:*",
     "@pnpm/types": "workspace:*",
     "chalk": "catalog:",

hooks/pnpmfile/src/Hooks.ts

@@ -1,5 +1,5 @@
 import type { PreResolutionHook } from '@pnpm/hooks.types'
-import type { Lockfile } from '@pnpm/lockfile-types'
+import type { Lockfile } from '@pnpm/lockfile.types'
 import type { Log } from '@pnpm/core-loggers'
 import type { CustomFetchers } from '@pnpm/fetcher-base'
 import { type ImportIndexedPackageAsync } from '@pnpm/store-controller-types'

hooks/pnpmfile/tsconfig.json

@@ -13,7 +13,7 @@
       "path": "../../fetching/fetcher-base"
     },
     {
-      "path": "../../lockfile/lockfile-types"
+      "path": "../../lockfile/types"
     },
     {
       "path": "../../packages/core-loggers"

hooks/types/package.json

@@ -31,7 +31,7 @@
     "@pnpm/hooks.types": "workspace:*"
   },
   "dependencies": {
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/types": "workspace:*"
   },
   "funding": "https://opencollective.com/pnpm",

hooks/types/src/index.ts

@@ -1,4 +1,4 @@
-import type { Lockfile } from '@pnpm/lockfile-types'
+import type { Lockfile } from '@pnpm/lockfile.types'
 import type { Registries } from '@pnpm/types'
 
 export interface PreResolutionHookContext {

hooks/types/tsconfig.json

@@ -10,7 +10,7 @@
   ],
   "references": [
     {
-      "path": "../../lockfile/lockfile-types"
+      "path": "../../lockfile/types"
     },
     {
       "path": "../../packages/types"

lockfile/audit/package.json

@@ -45,7 +45,7 @@
     "@pnpm/fetch": "workspace:*",
     "@pnpm/fetching-types": "workspace:*",
     "@pnpm/list": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/lockfile-utils": "workspace:*",
     "@pnpm/lockfile-walker": "workspace:*",
     "@pnpm/lockfile.detect-dep-types": "workspace:*",

lockfile/audit/src/index.ts

@@ -4,7 +4,7 @@ import util from 'util'
 import { PnpmError } from '@pnpm/error'
 import { type AgentOptions, fetchWithAgent, type RetryTimeoutOptions } from '@pnpm/fetch'
 import { type GetAuthHeader } from '@pnpm/fetching-types'
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { globalWarn } from '@pnpm/logger'
 import { type DependenciesField } from '@pnpm/types'
 import { lockfileToAuditTree } from './lockfileToAuditTree'

lockfile/audit/src/lockfileToAuditTree.ts

@@ -1,5 +1,5 @@
 import path from 'path'
-import { type Lockfile, type TarballResolution } from '@pnpm/lockfile-types'
+import { type Lockfile, type TarballResolution } from '@pnpm/lockfile.types'
 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'

lockfile/audit/tsconfig.json

@@ -39,14 +39,14 @@
     {
       "path": "../lockfile-file"
     },
-    {
-      "path": "../lockfile-types"
-    },
     {
       "path": "../lockfile-utils"
     },
     {
       "path": "../lockfile-walker"
+    },
+    {
+      "path": "../types"
     }
   ]
 }

lockfile/detect-dep-types/package.json

@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@pnpm/dependency-path": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/types": "workspace:*"
   },
   "funding": "https://opencollective.com/pnpm",

lockfile/detect-dep-types/src/index.ts

@@ -1,4 +1,4 @@
-import { type Lockfile, type PackageSnapshots, type ResolvedDependencies } from '@pnpm/lockfile-types'
+import { type Lockfile, type PackageSnapshots, type ResolvedDependencies } from '@pnpm/lockfile.types'
 import * as dp from '@pnpm/dependency-path'
 import { type DepPath } from '@pnpm/types'
 

lockfile/detect-dep-types/tsconfig.json

@@ -16,7 +16,7 @@
       "path": "../../packages/types"
     },
     {
-      "path": "../lockfile-types"
+      "path": "../types"
     }
   ]
 }

lockfile/filter-lockfile/package.json

@@ -45,7 +45,7 @@
     "@pnpm/constants": "workspace:*",
     "@pnpm/dependency-path": "workspace:*",
     "@pnpm/error": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/lockfile-utils": "workspace:*",
     "@pnpm/lockfile-walker": "workspace:*",
     "@pnpm/package-is-installable": "workspace:*",

lockfile/filter-lockfile/src/filterImporter.ts

@@ -1,4 +1,4 @@
-import { type ProjectSnapshot } from '@pnpm/lockfile-types'
+import { type ProjectSnapshot } from '@pnpm/lockfile.types'
 import { type DependenciesField } from '@pnpm/types'
 
 export function filterImporter (

lockfile/filter-lockfile/src/filterLockfile.ts

@@ -1,4 +1,4 @@
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { type DependenciesField, type DepPath, type ProjectId } from '@pnpm/types'
 import { filterLockfileByImporters } from './filterLockfileByImporters'
 

lockfile/filter-lockfile/src/filterLockfileByImporters.ts

@@ -3,7 +3,7 @@ import { LockfileMissingDependencyError } from '@pnpm/error'
 import {
   type Lockfile,
   type PackageSnapshots,
-} from '@pnpm/lockfile-types'
+} from '@pnpm/lockfile.types'
 import { lockfileWalker, type LockfileWalkerStep } from '@pnpm/lockfile-walker'
 import { logger } from '@pnpm/logger'
 import { type DependenciesField, type DepPath, type ProjectId } from '@pnpm/types'

lockfile/filter-lockfile/src/filterLockfileByImportersAndEngine.ts

@@ -3,7 +3,7 @@ import { LockfileMissingDependencyError } from '@pnpm/error'
 import {
   type Lockfile,
   type PackageSnapshots,
-} from '@pnpm/lockfile-types'
+} from '@pnpm/lockfile.types'
 import { nameVerFromPkgSnapshot } from '@pnpm/lockfile-utils'
 import { logger } from '@pnpm/logger'
 import { packageIsInstallable } from '@pnpm/package-is-installable'

lockfile/filter-lockfile/tsconfig.json

@@ -24,14 +24,14 @@
     {
       "path": "../../packages/types"
     },
-    {
-      "path": "../lockfile-types"
-    },
     {
       "path": "../lockfile-utils"
     },
     {
       "path": "../lockfile-walker"
+    },
+    {
+      "path": "../types"
     }
   ]
 }

lockfile/lockfile-file/package.json

@@ -51,7 +51,7 @@
     "@pnpm/error": "workspace:*",
     "@pnpm/git-resolver": "workspace:*",
     "@pnpm/git-utils": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/lockfile-utils": "workspace:*",
     "@pnpm/merge-lockfile-changes": "workspace:*",
     "@pnpm/types": "workspace:*",

lockfile/lockfile-file/src/gitMergeFile.ts

@@ -1,4 +1,4 @@
-import { type Lockfile, type LockfileFile } from '@pnpm/lockfile-types'
+import { type Lockfile, type LockfileFile } from '@pnpm/lockfile.types'
 import { mergeLockfileChanges } from '@pnpm/merge-lockfile-changes'
 import yaml from 'js-yaml'
 import { convertToLockfileObject } from './lockfileFormatConverters'

lockfile/lockfile-file/src/index.ts

@@ -6,6 +6,6 @@ export {
 } from './write'
 export { existsNonEmptyWantedLockfile } from './existsWantedLockfile'
 export { getLockfileImporterId } from './getLockfileImporterId'
-export * from '@pnpm/lockfile-types'
+export * from '@pnpm/lockfile.types'
 export * from './read'
 export { cleanGitBranchLockfiles } from './gitBranchLockfile'

lockfile/lockfile-file/src/lockfileFormatConverters.ts

@@ -12,7 +12,7 @@ import {
   type PackageInfo,
   type LockfileFileV9,
   type PackageSnapshots,
-} from '@pnpm/lockfile-types'
+} from '@pnpm/lockfile.types'
 import { type DepPath, DEPENDENCIES_FIELDS } from '@pnpm/types'
 import equals from 'ramda/src/equals'
 import isEmpty from 'ramda/src/isEmpty'

lockfile/lockfile-file/src/read.ts

@@ -7,7 +7,7 @@ import {
 } from '@pnpm/constants'
 import { PnpmError } from '@pnpm/error'
 import { mergeLockfileChanges } from '@pnpm/merge-lockfile-changes'
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { type ProjectId } from '@pnpm/types'
 import comverToSemver from 'comver-to-semver'
 import yaml from 'js-yaml'

lockfile/lockfile-file/src/sortLockfileKeys.ts

@@ -1,6 +1,6 @@
 import { lexCompare } from '@pnpm/util.lex-comparator'
 import sortKeys from 'sort-keys'
-import { type LockfileFileV9, type LockfileFile } from '@pnpm/lockfile-types'
+import { type LockfileFileV9, type LockfileFile } from '@pnpm/lockfile.types'
 
 const ORDERED_KEYS = {
   resolution: 1,

lockfile/lockfile-file/src/write.ts

@@ -1,6 +1,6 @@
 import { promises as fs } from 'fs'
 import path from 'path'
-import { type LockfileFileV9, type Lockfile, type LockfileFile } from '@pnpm/lockfile-types'
+import { type LockfileFileV9, type Lockfile, type LockfileFile } from '@pnpm/lockfile.types'
 import { WANTED_LOCKFILE } from '@pnpm/constants'
 import rimraf from '@zkochan/rimraf'
 import yaml from 'js-yaml'

lockfile/lockfile-file/tsconfig.json

@@ -27,14 +27,14 @@
     {
       "path": "../../resolving/git-resolver"
     },
-    {
-      "path": "../lockfile-types"
-    },
     {
       "path": "../lockfile-utils"
     },
     {
       "path": "../merge-lockfile-changes"
+    },
+    {
+      "path": "../types"
     }
   ]
 }

lockfile/lockfile-utils/package.json

@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "@pnpm/dependency-path": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/pick-fetcher": "workspace:*",
     "@pnpm/resolver-base": "workspace:*",
     "@pnpm/types": "workspace:*",

lockfile/lockfile-utils/src/extendProjectsWithTargetDirs.ts

@@ -1,5 +1,5 @@
 import path from 'path'
-import { type Lockfile, type TarballResolution } from '@pnpm/lockfile-types'
+import { type Lockfile, type TarballResolution } from '@pnpm/lockfile.types'
 import { depPathToFilename } from '@pnpm/dependency-path'
 import { type ProjectId, type DepPath } from '@pnpm/types'
 import { packageIdFromSnapshot } from './packageIdFromSnapshot'

lockfile/lockfile-utils/src/index.ts

@@ -6,7 +6,7 @@ export { packageIdFromSnapshot } from './packageIdFromSnapshot'
 export { packageIsIndependent } from './packageIsIndependent'
 export { pkgSnapshotToResolution } from './pkgSnapshotToResolution'
 export { refIsLocalTarball, refIsLocalDirectory } from './refIsLocalTarball'
-export * from '@pnpm/lockfile-types'
+export * from '@pnpm/lockfile.types'
 
 // for backward compatibility
 export const getPkgShortId = refToRelative

lockfile/lockfile-utils/src/nameVerFromPkgSnapshot.ts

@@ -1,4 +1,4 @@
-import { type PackageSnapshot } from '@pnpm/lockfile-types'
+import { type PackageSnapshot } from '@pnpm/lockfile.types'
 import * as dp from '@pnpm/dependency-path'
 import { type PkgResolutionId } from '@pnpm/types'
 

lockfile/lockfile-utils/src/packageIdFromSnapshot.ts

@@ -1,5 +1,5 @@
 import { type DepPath, type PkgId } from '@pnpm/types'
-import { type PackageSnapshot } from '@pnpm/lockfile-types'
+import { type PackageSnapshot } from '@pnpm/lockfile.types'
 import * as dp from '@pnpm/dependency-path'
 
 export function packageIdFromSnapshot (

lockfile/lockfile-utils/src/packageIsIndependent.ts

@@ -1,4 +1,4 @@
-import { type PackageSnapshot } from '@pnpm/lockfile-types'
+import { type PackageSnapshot } from '@pnpm/lockfile.types'
 
 export function packageIsIndependent ({ dependencies, optionalDependencies }: PackageSnapshot): boolean {
   return dependencies === undefined && optionalDependencies === undefined

lockfile/lockfile-utils/src/pkgSnapshotToResolution.ts

@@ -1,5 +1,5 @@
 import url from 'url'
-import { type PackageSnapshot, type TarballResolution } from '@pnpm/lockfile-types'
+import { type PackageSnapshot, type TarballResolution } from '@pnpm/lockfile.types'
 import { type Resolution } from '@pnpm/resolver-base'
 import { type Registries } from '@pnpm/types'
 import * as dp from '@pnpm/dependency-path'

lockfile/lockfile-utils/tsconfig.json

@@ -22,7 +22,7 @@
       "path": "../../resolving/resolver-base"
     },
     {
-      "path": "../lockfile-types"
+      "path": "../types"
     }
   ]
 }

lockfile/lockfile-walker/package.json

@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "@pnpm/dependency-path": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/types": "workspace:*"
   },
   "funding": "https://opencollective.com/pnpm",

lockfile/lockfile-walker/src/index.ts

@@ -1,4 +1,4 @@
-import { type Lockfile, type PackageSnapshot } from '@pnpm/lockfile-types'
+import { type Lockfile, type PackageSnapshot } from '@pnpm/lockfile.types'
 import { type DependenciesField, type DepPath, type ProjectId } from '@pnpm/types'
 import * as dp from '@pnpm/dependency-path'
 

lockfile/lockfile-walker/tsconfig.json

@@ -16,7 +16,7 @@
       "path": "../../packages/types"
     },
     {
-      "path": "../lockfile-types"
+      "path": "../types"
     }
   ]
 }

lockfile/merge-lockfile-changes/package.json

@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/merge-lockfile-changes#readme",
   "dependencies": {
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/types": "workspace:*",
     "comver-to-semver": "catalog:",
     "ramda": "catalog:",

lockfile/merge-lockfile-changes/src/index.ts

@@ -1,4 +1,4 @@
-import { type Lockfile, type PackageSnapshot, type PackageSnapshots } from '@pnpm/lockfile-types'
+import { type Lockfile, type PackageSnapshot, type PackageSnapshots } from '@pnpm/lockfile.types'
 import { type DepPath, type ProjectId } from '@pnpm/types'
 import comverToSemver from 'comver-to-semver'
 import semver from 'semver'

lockfile/merge-lockfile-changes/test/index.ts

@@ -1,4 +1,4 @@
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { type DepPath, type ProjectId } from '@pnpm/types'
 import { mergeLockfileChanges } from '../src'
 

lockfile/merge-lockfile-changes/tsconfig.json

@@ -13,7 +13,7 @@
       "path": "../../packages/types"
     },
     {
-      "path": "../lockfile-types"
+      "path": "../types"
     }
   ]
 }

lockfile/prune-lockfile/package.json

@@ -38,7 +38,7 @@
   "dependencies": {
     "@pnpm/constants": "workspace:*",
     "@pnpm/dependency-path": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/types": "workspace:*",
     "ramda": "catalog:"
   },

lockfile/prune-lockfile/src/index.ts

@@ -4,14 +4,14 @@ import {
   type PackageSnapshots,
   type ProjectSnapshot,
   type ResolvedDependencies,
-} from '@pnpm/lockfile-types'
+} from '@pnpm/lockfile.types'
 import { type DepPath, type PackageManifest, type ProjectId } from '@pnpm/types'
 import { refToRelative } from '@pnpm/dependency-path'
 import difference from 'ramda/src/difference'
 import isEmpty from 'ramda/src/isEmpty'
 import unnest from 'ramda/src/unnest'
 
-export * from '@pnpm/lockfile-types'
+export * from '@pnpm/lockfile.types'
 
 // cannot import DependenciesGraph from @pnpm/resolve-dependencies due to circular dependency
 type DependenciesGraph = Record<DepPath, { optional?: boolean }>

lockfile/prune-lockfile/tsconfig.json

@@ -19,7 +19,7 @@
       "path": "../../packages/types"
     },
     {
-      "path": "../lockfile-types"
+      "path": "../types"
     }
   ]
 }

lockfile/types/README.md

@@ -1,3 +1,3 @@
-# @pnpm/lockfile-types
+# @pnpm/lockfile.types
 
 > Types for the lockfile

lockfile/types/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@pnpm/lockfile-types",
-  "version": "7.1.3",
+  "name": "@pnpm/lockfile.types",
+  "version": "0.0.0",
   "description": "Types for the pnpm-lock.yaml lockfile",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,17 +11,18 @@
     "lib",
     "!*.map"
   ],
-  "repository": "https://github.com/pnpm/pnpm/blob/main/lockfile/lockfile-types",
+  "repository": "https://github.com/pnpm/pnpm/blob/main/lockfile/types",
   "keywords": [
     "pnpm9",
     "pnpm",
-    "types"
+    "types",
+    "lockfile"
   ],
   "license": "MIT",
   "bugs": {
     "url": "https://github.com/pnpm/pnpm/issues"
   },
-  "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/lockfile-types#readme",
+  "homepage": "https://github.com/pnpm/pnpm/blob/main/lockfile/types#readme",
   "scripts": {
     "lint": "eslint \"src/**/*.ts\"",
     "compile": "tsc --build && pnpm run lint --fix",
@@ -32,7 +33,7 @@
     "@pnpm/types": "workspace:*"
   },
   "devDependencies": {
-    "@pnpm/lockfile-types": "workspace:*"
+    "@pnpm/lockfile.types": "workspace:*"
   },
   "exports": {
     ".": "./lib/index.js"

lockfile/verification/package.json

@@ -37,7 +37,7 @@
     "@pnpm/dependency-path": "workspace:*",
     "@pnpm/get-context": "workspace:*",
     "@pnpm/lockfile-utils": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/read-package-json": "workspace:*",
     "@pnpm/resolver-base": "workspace:*",
     "@pnpm/types": "workspace:*",

lockfile/verification/src/allCatalogsAreUpToDate.ts

@@ -1,4 +1,4 @@
-import { type CatalogSnapshots } from '@pnpm/lockfile-types'
+import { type CatalogSnapshots } from '@pnpm/lockfile.types'
 import { type Catalogs } from '@pnpm/catalogs.types'
 
 export function allCatalogsAreUpToDate (

lockfile/verification/src/allProjectsAreUpToDate.ts

@@ -6,7 +6,7 @@ import {
   type Lockfile,
   type ProjectSnapshot,
   type PackageSnapshots,
-} from '@pnpm/lockfile-types'
+} from '@pnpm/lockfile.types'
 import { refIsLocalDirectory, refIsLocalTarball } from '@pnpm/lockfile-utils'
 import { safeReadPackageJsonFromDir } from '@pnpm/read-package-json'
 import { refToRelative } from '@pnpm/dependency-path'

lockfile/verification/src/satisfiesPackageManifest.ts

@@ -1,4 +1,4 @@
-import { type ProjectSnapshot } from '@pnpm/lockfile-types'
+import { type ProjectSnapshot } from '@pnpm/lockfile.types'
 import {
   DEPENDENCIES_FIELDS,
   type ProjectManifest,

lockfile/verification/test/allProjectsAreUpToDate.test.ts

@@ -3,7 +3,7 @@ import { prepareEmpty } from '@pnpm/prepare'
 import { type ProjectId, type ProjectRootDir } from '@pnpm/types'
 import { allProjectsAreUpToDate } from '@pnpm/lockfile.verification'
 import { writeFile, mkdir } from 'fs/promises'
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 
 const fooManifest = {
   name: 'foo',

lockfile/verification/tsconfig.json

@@ -34,10 +34,10 @@
       "path": "../../resolving/resolver-base"
     },
     {
-      "path": "../lockfile-types"
+      "path": "../lockfile-utils"
     },
     {
-      "path": "../lockfile-utils"
+      "path": "../types"
     }
   ]
 }

packages/calc-dep-state/package.json

@@ -32,7 +32,7 @@
     "@pnpm/constants": "workspace:*",
     "@pnpm/crypto.object-hasher": "workspace:*",
     "@pnpm/dependency-path": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/lockfile-utils": "workspace:*",
     "@pnpm/types": "workspace:*",
     "sort-keys": "catalog:"

packages/calc-dep-state/src/index.ts

@@ -1,6 +1,6 @@
 import { ENGINE_NAME } from '@pnpm/constants'
 import { getPkgIdWithPatchHash, refToRelative } from '@pnpm/dependency-path'
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { type DepPath, type PkgIdWithPatchHash } from '@pnpm/types'
 import { hashObjectWithoutSorting } from '@pnpm/crypto.object-hasher'
 import sortKeys from 'sort-keys'

packages/calc-dep-state/tsconfig.json

@@ -13,10 +13,10 @@
       "path": "../../crypto/object-hasher"
     },
     {
-      "path": "../../lockfile/lockfile-types"
+      "path": "../../lockfile/lockfile-utils"
     },
     {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/types"
     },
     {
       "path": "../constants"

pkg-manager/core/package.json

@@ -82,7 +82,7 @@
     "@pnpm/core": "workspace:*",
     "@pnpm/crypto.object-hasher": "workspace:*",
     "@pnpm/git-utils": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/package-store": "workspace:*",
     "@pnpm/prepare": "workspace:*",
     "@pnpm/read-package-json": "workspace:*",

pkg-manager/core/test/install/excludeLinksFromLockfile.ts

@@ -8,7 +8,7 @@ import {
   type MutatedProject,
   type ProjectOptions,
 } from '@pnpm/core'
-import { type Lockfile, type LockfileFile } from '@pnpm/lockfile-types'
+import { type Lockfile, type LockfileFile } from '@pnpm/lockfile.types'
 import { type ProjectRootDir, type ProjectId } from '@pnpm/types'
 import { prepareEmpty, preparePackages, tempDir } from '@pnpm/prepare'
 import { addDistTag } from '@pnpm/registry-mock'

pkg-manager/core/test/install/overrides.ts

@@ -6,7 +6,7 @@ import { prepareEmpty, preparePackages } from '@pnpm/prepare'
 import { addDistTag } from '@pnpm/registry-mock'
 import { WANTED_LOCKFILE } from '@pnpm/constants'
 import { type MutatedProject, type ProjectOptions, addDependenciesToPackage, mutateModulesInSingleProject, mutateModules } from '@pnpm/core'
-import { type LockfileFileV9 } from '@pnpm/lockfile-types'
+import { type LockfileFileV9 } from '@pnpm/lockfile.types'
 import { type ProjectRootDir, type ProjectManifest } from '@pnpm/types'
 import {
   testDefaults,

pkg-manager/core/test/lockfile.ts

@@ -5,7 +5,7 @@ import { type RootLog } from '@pnpm/core-loggers'
 import { type PnpmError } from '@pnpm/error'
 import { fixtures } from '@pnpm/test-fixtures'
 import { type Lockfile, type TarballResolution } from '@pnpm/lockfile-file'
-import { type LockfileFileV9 } from '@pnpm/lockfile-types'
+import { type LockfileFileV9 } from '@pnpm/lockfile.types'
 import { tempDir, prepareEmpty, preparePackages } from '@pnpm/prepare'
 import { readPackageJsonFromDir } from '@pnpm/read-package-json'
 import { addDistTag, getIntegrity, REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'

pkg-manager/core/tsconfig.json

@@ -72,9 +72,6 @@
     {
       "path": "../../lockfile/lockfile-to-pnp"
     },
-    {
-      "path": "../../lockfile/lockfile-types"
-    },
     {
       "path": "../../lockfile/lockfile-utils"
     },
@@ -87,6 +84,9 @@
     {
       "path": "../../lockfile/prune-lockfile"
     },
+    {
+      "path": "../../lockfile/types"
+    },
     {
       "path": "../../lockfile/verification"
     },

pkg-manager/hoist/package.json

@@ -43,7 +43,7 @@
     "@pnpm/core-loggers": "workspace:*",
     "@pnpm/dependency-path": "workspace:*",
     "@pnpm/link-bins": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/lockfile-utils": "workspace:*",
     "@pnpm/lockfile-walker": "workspace:*",
     "@pnpm/matcher": "workspace:*",

pkg-manager/hoist/tsconfig.json

@@ -12,15 +12,15 @@
     {
       "path": "../../config/matcher"
     },
-    {
-      "path": "../../lockfile/lockfile-types"
-    },
     {
       "path": "../../lockfile/lockfile-utils"
     },
     {
       "path": "../../lockfile/lockfile-walker"
     },
+    {
+      "path": "../../lockfile/types"
+    },
     {
       "path": "../../packages/constants"
     },

pkg-manager/modules-cleaner/package.json

@@ -31,7 +31,7 @@
     "@pnpm/core-loggers": "workspace:*",
     "@pnpm/dependency-path": "workspace:*",
     "@pnpm/filter-lockfile": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/lockfile-utils": "workspace:*",
     "@pnpm/read-modules-dir": "workspace:*",
     "@pnpm/remove-bins": "workspace:*",

pkg-manager/modules-cleaner/src/prune.ts

@@ -9,7 +9,7 @@ import {
   type Lockfile,
   type PackageSnapshots,
   type ProjectSnapshot,
-} from '@pnpm/lockfile-types'
+} from '@pnpm/lockfile.types'
 import { packageIdFromSnapshot } from '@pnpm/lockfile-utils'
 import { logger } from '@pnpm/logger'
 import { readModulesDir } from '@pnpm/read-modules-dir'

pkg-manager/modules-cleaner/tsconfig.json

@@ -16,10 +16,10 @@
       "path": "../../lockfile/filter-lockfile"
     },
     {
-      "path": "../../lockfile/lockfile-types"
+      "path": "../../lockfile/lockfile-utils"
     },
     {
-      "path": "../../lockfile/lockfile-utils"
+      "path": "../../lockfile/types"
     },
     {
       "path": "../../packages/core-loggers"

pkg-manager/plugin-commands-installation/package.json

@@ -70,7 +70,7 @@
     "@pnpm/find-workspace-dir": "workspace:*",
     "@pnpm/get-context": "workspace:*",
     "@pnpm/graceful-fs": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/manifest-utils": "workspace:*",
     "@pnpm/matcher": "workspace:*",
     "@pnpm/outdated": "workspace:*",

pkg-manager/plugin-commands-installation/src/installDeps.ts

@@ -9,7 +9,7 @@ import { arrayOfWorkspacePackagesToMap } from '@pnpm/get-context'
 import { filterPkgsBySelectorObjects } from '@pnpm/filter-workspace-packages'
 import { filterDependenciesByType } from '@pnpm/manifest-utils'
 import { findWorkspacePackages } from '@pnpm/workspace.find-packages'
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { rebuildProjects } from '@pnpm/plugin-commands-rebuild'
 import { createOrConnectStoreController, type CreateStoreControllerOptions } from '@pnpm/store-connection-manager'
 import { type IncludedDependencies, type Project, type ProjectsGraph, type ProjectRootDir, type PrepareExecutionEnv } from '@pnpm/types'

pkg-manager/plugin-commands-installation/test/addRecursive.ts

@@ -1,6 +1,6 @@
 import path from 'path'
 import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir'
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { add } from '@pnpm/plugin-commands-installation'
 import { preparePackages } from '@pnpm/prepare'
 import { type ProjectId } from '@pnpm/types'

pkg-manager/plugin-commands-installation/test/dedupe.ts

@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import { DedupeCheckIssuesError } from '@pnpm/dedupe.check'
 import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir'
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { dedupe, install } from '@pnpm/plugin-commands-installation'
 import { prepare } from '@pnpm/prepare'
 import { fixtures } from '@pnpm/test-fixtures'

pkg-manager/plugin-commands-installation/test/miscRecursive.ts

@@ -2,7 +2,7 @@ import fs from 'fs'
 import path from 'path'
 import { type PnpmError } from '@pnpm/error'
 import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir'
-import { type LockfileFile } from '@pnpm/lockfile-types'
+import { type LockfileFile } from '@pnpm/lockfile.types'
 import { add, install, remove, update } from '@pnpm/plugin-commands-installation'
 import { preparePackages } from '@pnpm/prepare'
 import { addDistTag } from '@pnpm/registry-mock'

pkg-manager/plugin-commands-installation/test/update/interactive.ts

@@ -1,6 +1,6 @@
 import path from 'path'
 import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir'
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { add, install, update } from '@pnpm/plugin-commands-installation'
 import { prepare, preparePackages } from '@pnpm/prepare'
 import { REGISTRY_MOCK_PORT } from '@pnpm/registry-mock'

pkg-manager/plugin-commands-installation/test/update/recursive.ts

@@ -1,6 +1,6 @@
 import { type PnpmError } from '@pnpm/error'
 import { filterPackagesFromDir } from '@pnpm/workspace.filter-packages-from-dir'
-import { type Lockfile } from '@pnpm/lockfile-types'
+import { type Lockfile } from '@pnpm/lockfile.types'
 import { readModulesManifest } from '@pnpm/modules-yaml'
 import { install, update } from '@pnpm/plugin-commands-installation'
 import { preparePackages } from '@pnpm/prepare'

pkg-manager/plugin-commands-installation/tsconfig.json

@@ -52,7 +52,7 @@
       "path": "../../hooks/pnpmfile"
     },
     {
-      "path": "../../lockfile/lockfile-types"
+      "path": "../../lockfile/types"
     },
     {
       "path": "../../packages/constants"

pkg-manager/resolve-dependencies/package.json

@@ -35,7 +35,7 @@
     "@pnpm/core-loggers": "workspace:*",
     "@pnpm/dependency-path": "workspace:*",
     "@pnpm/error": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/lockfile-utils": "workspace:*",
     "@pnpm/lockfile.preferred-versions": "workspace:*",
     "@pnpm/manifest-utils": "workspace:*",

pkg-manager/resolve-dependencies/src/getCatalogSnapshots.ts

@@ -1,4 +1,4 @@
-import { type CatalogSnapshots } from '@pnpm/lockfile-types'
+import { type CatalogSnapshots } from '@pnpm/lockfile.types'
 import { type ResolvedDirectDependency } from './resolveDependencyTree'
 
 export function getCatalogSnapshots (resolvedDirectDeps: readonly ResolvedDirectDependency[]): CatalogSnapshots {

pkg-manager/resolve-dependencies/src/index.ts

@@ -7,7 +7,7 @@ import { globalWarn } from '@pnpm/logger'
 import {
   type Lockfile,
   type ProjectSnapshot,
-} from '@pnpm/lockfile-types'
+} from '@pnpm/lockfile.types'
 import {
   getAllDependenciesFromManifest,
   getSpecFromPackageManifest,

pkg-manager/resolve-dependencies/src/resolveDependencies.ts

@@ -10,7 +10,7 @@ import {
   type Lockfile,
   type PackageSnapshot,
   type ResolvedDependencies,
-} from '@pnpm/lockfile-types'
+} from '@pnpm/lockfile.types'
 import {
   nameVerFromPkgSnapshot,
   pkgSnapshotToResolution,

pkg-manager/resolve-dependencies/src/resolveDependencyTree.ts

@@ -1,6 +1,6 @@
 import { resolveFromCatalog } from '@pnpm/catalogs.resolver'
 import { type Catalogs } from '@pnpm/catalogs.types'
-import { type Lockfile, type PatchFile } from '@pnpm/lockfile-types'
+import { type Lockfile, type PatchFile } from '@pnpm/lockfile.types'
 import { type PreferredVersions, type Resolution, type WorkspacePackages } from '@pnpm/resolver-base'
 import { type StoreController } from '@pnpm/store-controller-types'
 import {

pkg-manager/resolve-dependencies/tsconfig.json

@@ -21,9 +21,6 @@
     {
       "path": "../../fetching/pick-fetcher"
     },
-    {
-      "path": "../../lockfile/lockfile-types"
-    },
     {
       "path": "../../lockfile/lockfile-utils"
     },
@@ -33,6 +30,9 @@
     {
       "path": "../../lockfile/prune-lockfile"
     },
+    {
+      "path": "../../lockfile/types"
+    },
     {
       "path": "../../packages/constants"
     },

pnpm-lock.yaml

@@ -813,9 +813,9 @@ importers:
       '@pnpm/constants':
         specifier: workspace:*
         version: link:../../packages/constants
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
+        version: link:../../lockfile/types
       '@pnpm/modules-yaml':
         specifier: workspace:*
         version: link:../../pkg-manager/modules-yaml
@@ -1523,9 +1523,9 @@ importers:
       '@pnpm/error':
         specifier: workspace:*
         version: link:../../packages/error
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
+        version: link:../../lockfile/types
       '@pnpm/types':
         specifier: workspace:*
         version: link:../../packages/types
@@ -1949,15 +1949,15 @@ importers:
       '@pnpm/link-bins':
         specifier: workspace:*
         version: link:../../pkg-manager/link-bins
-      '@pnpm/lockfile-types':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
       '@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/logger':
         specifier: ^5.0.0
         version: 5.0.0
@@ -2597,9 +2597,9 @@ importers:
       '@pnpm/hooks.types':
         specifier: workspace:*
         version: link:../types
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
+        version: link:../../lockfile/types
       '@pnpm/logger':
         specifier: ^5.0.0
         version: 5.0.0
@@ -2671,9 +2671,9 @@ importers:
 
   hooks/types:
     dependencies:
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
+        version: link:../../lockfile/types
       '@pnpm/types':
         specifier: workspace:*
         version: link:../../packages/types
@@ -2696,9 +2696,6 @@ importers:
       '@pnpm/list':
         specifier: workspace:*
         version: link:../../reviewing/list
-      '@pnpm/lockfile-types':
-        specifier: workspace:*
-        version: link:../lockfile-types
       '@pnpm/lockfile-utils':
         specifier: workspace:*
         version: link:../lockfile-utils
@@ -2708,6 +2705,9 @@ importers:
       '@pnpm/lockfile.detect-dep-types':
         specifier: workspace:*
         version: link:../detect-dep-types
+      '@pnpm/lockfile.types':
+        specifier: workspace:*
+        version: link:../types
       '@pnpm/logger':
         specifier: ^5.0.0
         version: 5.0.0
@@ -2745,9 +2745,9 @@ importers:
       '@pnpm/dependency-path':
         specifier: workspace:*
         version: link:../../packages/dependency-path
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../lockfile-types
+        version: link:../types
       '@pnpm/types':
         specifier: workspace:*
         version: link:../../packages/types
@@ -2770,15 +2770,15 @@ importers:
       '@pnpm/error':
         specifier: workspace:*
         version: link:../../packages/error
-      '@pnpm/lockfile-types':
-        specifier: workspace:*
-        version: link:../lockfile-types
       '@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/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-types':
-        specifier: workspace:*
-        version: link:../lockfile-types
       '@pnpm/lockfile-utils':
         specifier: workspace:*
         version: link:../lockfile-utils
+      '@pnpm/lockfile.types':
+        specifier: workspace:*
+        version: link:../types
       '@pnpm/logger':
         specifier: ^5.0.0
         version: 5.0.0
@@ -2939,24 +2939,14 @@ importers:
         specifier: 'catalog:'
         version: 0.29.12
 
-  lockfile/lockfile-types:
-    dependencies:
-      '@pnpm/types':
-        specifier: workspace:*
-        version: link:../../packages/types
-    devDependencies:
-      '@pnpm/lockfile-types':
-        specifier: workspace:*
-        version: 'link:'
-
   lockfile/lockfile-utils:
     dependencies:
       '@pnpm/dependency-path':
         specifier: workspace:*
         version: link:../../packages/dependency-path
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../lockfile-types
+        version: link:../types
       '@pnpm/pick-fetcher':
         specifier: workspace:*
         version: link:../../fetching/pick-fetcher
@@ -2994,9 +2984,9 @@ importers:
       '@pnpm/dependency-path':
         specifier: workspace:*
         version: link:../../packages/dependency-path
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../lockfile-types
+        version: link:../types
       '@pnpm/types':
         specifier: workspace:*
         version: link:../../packages/types
@@ -3010,9 +3000,9 @@ importers:
 
   lockfile/merge-lockfile-changes:
     dependencies:
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../lockfile-types
+        version: link:../types
       '@pnpm/types':
         specifier: workspace:*
         version: link:../../packages/types
@@ -3139,9 +3129,9 @@ importers:
       '@pnpm/dependency-path':
         specifier: workspace:*
         version: link:../../packages/dependency-path
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../lockfile-types
+        version: link:../types
       '@pnpm/types':
         specifier: workspace:*
         version: link:../../packages/types
@@ -3159,6 +3149,16 @@ importers:
         specifier: 'catalog:'
         version: 1.1.0
 
+  lockfile/types:
+    dependencies:
+      '@pnpm/types':
+        specifier: workspace:*
+        version: link:../../packages/types
+    devDependencies:
+      '@pnpm/lockfile.types':
+        specifier: workspace:*
+        version: 'link:'
+
   lockfile/verification:
     dependencies:
       '@pnpm/catalogs.types':
@@ -3170,12 +3170,12 @@ importers:
       '@pnpm/get-context':
         specifier: workspace:*
         version: link:../../pkg-manager/get-context
-      '@pnpm/lockfile-types':
-        specifier: workspace:*
-        version: link:../lockfile-types
       '@pnpm/lockfile-utils':
         specifier: workspace:*
         version: link:../lockfile-utils
+      '@pnpm/lockfile.types':
+        specifier: workspace:*
+        version: link:../types
       '@pnpm/logger':
         specifier: ^5.0.0
         version: 5.0.0
@@ -3341,12 +3341,12 @@ importers:
       '@pnpm/dependency-path':
         specifier: workspace:*
         version: link:../dependency-path
-      '@pnpm/lockfile-types':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
       '@pnpm/lockfile-utils':
         specifier: workspace:*
         version: link:../../lockfile/lockfile-utils
+      '@pnpm/lockfile.types':
+        specifier: workspace:*
+        version: link:../../lockfile/types
       '@pnpm/types':
         specifier: workspace:*
         version: link:../types
@@ -4015,9 +4015,9 @@ importers:
       '@pnpm/git-utils':
         specifier: workspace:*
         version: link:../../packages/git-utils
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
+        version: link:../../lockfile/types
       '@pnpm/package-store':
         specifier: workspace:*
         version: link:../../store/package-store
@@ -4372,15 +4372,15 @@ importers:
       '@pnpm/link-bins':
         specifier: workspace:*
         version: link:../link-bins
-      '@pnpm/lockfile-types':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
       '@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/logger':
         specifier: ^5.0.0
         version: 5.0.0
@@ -4509,12 +4509,12 @@ importers:
       '@pnpm/filter-lockfile':
         specifier: workspace:*
         version: link:../../lockfile/filter-lockfile
-      '@pnpm/lockfile-types':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
       '@pnpm/lockfile-utils':
         specifier: workspace:*
         version: link:../../lockfile/lockfile-utils
+      '@pnpm/lockfile.types':
+        specifier: workspace:*
+        version: link:../../lockfile/types
       '@pnpm/logger':
         specifier: ^5.0.0
         version: 5.0.0
@@ -4747,9 +4747,9 @@ importers:
       '@pnpm/graceful-fs':
         specifier: workspace:*
         version: link:../../fs/graceful-fs
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
+        version: link:../../lockfile/types
       '@pnpm/logger':
         specifier: ^5.0.0
         version: 5.0.0
@@ -5042,15 +5042,15 @@ importers:
       '@pnpm/error':
         specifier: workspace:*
         version: link:../../packages/error
-      '@pnpm/lockfile-types':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
       '@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/logger':
         specifier: ^5.0.0
         version: 5.0.0
@@ -5377,9 +5377,9 @@ importers:
       '@pnpm/find-workspace-dir':
         specifier: workspace:*
         version: link:../workspace/find-workspace-dir
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../lockfile/lockfile-types
+        version: link:../lockfile/types
       '@pnpm/logger':
         specifier: 'catalog:'
         version: 5.0.0
@@ -5724,9 +5724,9 @@ importers:
       '@pnpm/assert-project':
         specifier: workspace:*
         version: link:../../__utils__/assert-project
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
+        version: link:../../lockfile/types
       '@pnpm/plugin-commands-deploy':
         specifier: workspace:*
         version: 'link:'
@@ -6191,9 +6191,6 @@ importers:
       '@pnpm/lockfile-file':
         specifier: workspace:*
         version: link:../../lockfile/lockfile-file
-      '@pnpm/lockfile-types':
-        specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
       '@pnpm/lockfile-utils':
         specifier: workspace:*
         version: link:../../lockfile/lockfile-utils
@@ -6203,6 +6200,9 @@ importers:
       '@pnpm/lockfile.detect-dep-types':
         specifier: workspace:*
         version: link:../../lockfile/detect-dep-types
+      '@pnpm/lockfile.types':
+        specifier: workspace:*
+        version: link:../../lockfile/types
       '@pnpm/logger':
         specifier: ^5.0.0
         version: 5.0.0
@@ -6955,9 +6955,9 @@ importers:
       '@pnpm/graceful-fs':
         specifier: workspace:*
         version: link:../../fs/graceful-fs
-      '@pnpm/lockfile-types':
+      '@pnpm/lockfile.types':
         specifier: workspace:*
-        version: link:../../lockfile/lockfile-types
+        version: link:../../lockfile/types
       '@pnpm/parse-wanted-dependency':
         specifier: workspace:*
         version: link:../../packages/parse-wanted-dependency

pnpm/package.json

@@ -37,7 +37,7 @@
     "@pnpm/dependency-path": "workspace:*",
     "@pnpm/filter-workspace-packages": "workspace:*",
     "@pnpm/find-workspace-dir": "workspace:*",
-    "@pnpm/lockfile-types": "workspace:*",
+    "@pnpm/lockfile.types": "workspace:*",
     "@pnpm/logger": "catalog:",
     "@pnpm/modules-yaml": "workspace:*",
     "@pnpm/nopt": "catalog:",

pnpm/test/install/hooks.ts

@@ -1,6 +1,6 @@
 import fs from 'fs'
 import path from 'path'
-import { type LockfileV9 as Lockfile } from '@pnpm/lockfile-types'
+import { type LockfileV9 as Lockfile } from '@pnpm/lockfile.types'
 import { prepare, preparePackages } from '@pnpm/prepare'
 import { sync as readYamlFile } from 'read-yaml-file'
 import loadJsonFile from 'load-json-file'