@pnpm/lockfile.fs 1100.1.5 → 1100.1.6

package/lib/gitBranchLockfile.d.ts

@@ -1,2 +1,3 @@
 export declare function getGitBranchLockfileNames(lockfileDir: string): Promise<string[]>;
+export declare function getGitBranchLockfileNamesSync(lockfileDir: string): string[];
 export declare function cleanGitBranchLockfiles(lockfileDir: string): Promise<void>;

package/lib/gitBranchLockfile.js

@@ -1,16 +1,22 @@
-import { promises as fs } from 'node:fs';
+import fs, { promises as fsp } from 'node:fs';
 import path from 'node:path';
+// Branch lockfiles are written as `pnpm-lock.<branch>.yaml` with literal
+// dots and a non-empty branch segment. Escaping the dots keeps unrelated
+// files out of the matches that feed scanning and `cleanGitBranchLockfiles`.
+const GIT_BRANCH_LOCKFILE_NAME = /^pnpm-lock\..+\.yaml$/;
 export async function getGitBranchLockfileNames(lockfileDir) {
-    const files = await fs.readdir(lockfileDir);
-    // eslint-disable-next-line regexp/no-useless-non-capturing-group
-    const gitBranchLockfileNames = files.filter(file => file.match(/^pnpm-lock.(?:.*).yaml$/));
-    return gitBranchLockfileNames;
+    const files = await fsp.readdir(lockfileDir);
+    return files.filter(file => GIT_BRANCH_LOCKFILE_NAME.test(file));
+}
+export function getGitBranchLockfileNamesSync(lockfileDir) {
+    const files = fs.readdirSync(lockfileDir);
+    return files.filter(file => GIT_BRANCH_LOCKFILE_NAME.test(file));
 }
 export async function cleanGitBranchLockfiles(lockfileDir) {
     const gitBranchLockfiles = await getGitBranchLockfileNames(lockfileDir);
     await Promise.all(gitBranchLockfiles.map(async (file) => {
         const filepath = path.join(lockfileDir, file);
-        await fs.unlink(filepath);
+        await fsp.unlink(filepath);
     }));
 }
 //# sourceMappingURL=gitBranchLockfile.js.map

package/lib/index.d.ts

@@ -1,7 +1,7 @@
 export { createEnvLockfile, readEnvLockfile, writeEnvLockfile } from './envLockfile.js';
 export { existsNonEmptyWantedLockfile } from './existsWantedLockfile.js';
 export { getLockfileImporterId } from './getLockfileImporterId.js';
-export { cleanGitBranchLockfiles } from './gitBranchLockfile.js';
+export { cleanGitBranchLockfiles, getGitBranchLockfileNamesSync } from './gitBranchLockfile.js';
 export { convertToLockfileFile, convertToLockfileObject } from './lockfileFormatConverters.js';
 export { getWantedLockfileName } from './lockfileName.js';
 export * from './read.js';

package/lib/index.js

@@ -1,7 +1,7 @@
 export { createEnvLockfile, readEnvLockfile, writeEnvLockfile } from './envLockfile.js';
 export { existsNonEmptyWantedLockfile } from './existsWantedLockfile.js';
 export { getLockfileImporterId } from './getLockfileImporterId.js';
-export { cleanGitBranchLockfiles } from './gitBranchLockfile.js';
+export { cleanGitBranchLockfiles, getGitBranchLockfileNamesSync } from './gitBranchLockfile.js';
 export { convertToLockfileFile, convertToLockfileObject } from './lockfileFormatConverters.js';
 export { getWantedLockfileName } from './lockfileName.js';
 export * from './read.js';

package/lib/lockfileName.d.ts

@@ -1,5 +1,6 @@
 export interface GetWantedLockfileNameOptions {
     useGitBranchLockfile?: boolean;
     mergeGitBranchLockfiles?: boolean;
+    cwd?: string;
 }
 export declare function getWantedLockfileName(opts?: GetWantedLockfileNameOptions): Promise<string>;

package/lib/lockfileName.js

@@ -1,8 +1,8 @@
 import { WANTED_LOCKFILE } from '@pnpm/constants';
 import { getCurrentBranch } from '@pnpm/network.git-utils';
-export async function getWantedLockfileName(opts = { useGitBranchLockfile: false, mergeGitBranchLockfiles: false }) {
+export async function getWantedLockfileName(opts = {}) {
     if (opts.useGitBranchLockfile && !opts.mergeGitBranchLockfiles) {
-        const currentBranchName = await getCurrentBranch();
+        const currentBranchName = await getCurrentBranch({ cwd: opts.cwd });
         if (currentBranchName) {
             return WANTED_LOCKFILE.replace('.yaml', `.${stringifyBranchName(currentBranchName)}.yaml`);
         }

package/lib/read.d.ts

@@ -33,7 +33,7 @@ export declare function readWantedLockfileFile(pkgPath: string, opts: {
     useGitBranchLockfile?: boolean;
     mergeGitBranchLockfiles?: boolean;
 }): Promise<LockfileFile | null>;
-export declare function wantedLockfileHasMergeConflictsSync(pkgPath: string): boolean;
+export declare function wantedLockfileHasMergeConflictsSync(pkgPath: string, lockfileName?: string): boolean;
 export declare function createLockfileObject(importerIds: ProjectId[], opts: {
     lockfileVersion: string;
     autoInstallPeers: boolean;

package/lib/read.js

@@ -39,9 +39,9 @@ export async function readWantedLockfile(pkgPath, opts) {
 export async function readWantedLockfileFile(pkgPath, opts) {
     return (await _readWantedLockfile(pkgPath, opts)).lockfileFile;
 }
-export function wantedLockfileHasMergeConflictsSync(pkgPath) {
+export function wantedLockfileHasMergeConflictsSync(pkgPath, lockfileName = WANTED_LOCKFILE) {
     try {
-        const lockfileRawContent = stripBom(fs.readFileSync(path.join(pkgPath, WANTED_LOCKFILE), 'utf8'));
+        const lockfileRawContent = stripBom(fs.readFileSync(path.join(pkgPath, lockfileName), 'utf8'));
         return isDiff(extractMainDocument(lockfileRawContent));
     }
     catch (err) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/lockfile.fs",
-  "version": "1100.1.5",
+  "version": "1100.1.6",
   "description": "Read/write pnpm-lock.yaml files",
   "keywords": [
     "pnpm",
@@ -37,15 +37,15 @@
     "semver": "^7.8.4",
     "strip-bom": "^5.0.0",
     "write-file-atomic": "^7.0.1",
-    "@pnpm/lockfile.utils": "1100.0.13",
     "@pnpm/lockfile.types": "1100.0.11",
     "@pnpm/lockfile.merger": "1100.0.11",
-    "@pnpm/network.git-utils": "1100.0.1",
-    "@pnpm/types": "1101.3.2",
+    "@pnpm/error": "1100.0.0",
+    "@pnpm/network.git-utils": "1100.0.2",
     "@pnpm/object.key-sorting": "1100.0.1",
+    "@pnpm/types": "1101.3.2",
+    "@pnpm/lockfile.utils": "1100.0.13",
     "@pnpm/deps.path": "1100.0.8",
-    "@pnpm/constants": "1100.0.0",
-    "@pnpm/error": "1100.0.0"
+    "@pnpm/constants": "1100.0.0"
   },
   "peerDependencies": {
     "@pnpm/logger": "^1100.0.0"
@@ -60,8 +60,8 @@
     "tempy": "3.0.0",
     "write-yaml-file": "^6.0.0",
     "yaml-tag": "1.1.0",
-    "@pnpm/logger": "1100.0.0",
-    "@pnpm/lockfile.fs": "1100.1.5"
+    "@pnpm/lockfile.fs": "1100.1.6",
+    "@pnpm/logger": "1100.0.0"
   },
   "engines": {
     "node": ">=22.13"