@pnpm/lockfile.fs 1100.1.4 → 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/lib/yamlDocuments.d.ts

@@ -6,7 +6,7 @@ export declare const YAML_DOCUMENT_START = "---\n";
  * Stops reading as soon as the second document separator is found.
  * Returns null if the file doesn't exist or doesn't start with "---\n".
  */
-export declare function streamReadFirstYamlDocument(filePath: string): Promise<string | null>;
+export declare function streamReadFirstYamlDocument(filePath: string, readBufferSize?: number): Promise<string | null>;
 /**
  * Extracts the main lockfile content (second YAML document) from a combined string.
  * If the file starts with "---\n", returns the content after the separator.

package/lib/yamlDocuments.js

@@ -1,51 +1,54 @@
-import { createReadStream } from 'node:fs';
+import { open } from 'node:fs/promises';
+import { StringDecoder } from 'node:string_decoder';
 import util from 'node:util';
 import stripBom from 'strip-bom';
 export const YAML_DOCUMENT_SEPARATOR = '\n---\n';
 export const YAML_DOCUMENT_START = '---\n';
+const READ_BUFFER_SIZE = 64 * 1024;
 /**
  * Reads the first YAML document from a multi-document YAML file using streaming.
  * The file must start with "---\n" to indicate it contains an env lockfile document.
  * Stops reading as soon as the second document separator is found.
  * Returns null if the file doesn't exist or doesn't start with "---\n".
  */
-export async function streamReadFirstYamlDocument(filePath) {
-    const stream = createReadStream(filePath, { encoding: 'utf8' });
-    const chunks = stream[Symbol.asyncIterator]();
+export async function streamReadFirstYamlDocument(filePath, readBufferSize = READ_BUFFER_SIZE) {
+    let fileHandle;
     let buffer = '';
+    let firstChunk = true;
     try {
-        // Phase 1: verify the file starts with "---\n"
-        for (let chunk = await chunks.next(); !chunk.done; chunk = await chunks.next()) { // eslint-disable-line no-await-in-loop
-            if (buffer.length === 0) {
-                // Strip BOM from the first chunk. Safe because the stream uses utf8 encoding,
-                // so the 3-byte BOM is decoded into a single \uFEFF character in the first chunk.
-                buffer = stripBom(chunk.value);
-            }
-            else {
-                buffer += chunk.value;
+        fileHandle = await open(filePath, 'r');
+        const decoder = new StringDecoder('utf8');
+        const readBuffer = Buffer.allocUnsafe(normalizeReadBufferSize(readBufferSize));
+        let position = 0;
+        while (true) {
+            const { bytesRead } = await fileHandle.read(readBuffer, 0, readBuffer.length, position); // eslint-disable-line no-await-in-loop
+            if (bytesRead === 0)
+                break;
+            position += bytesRead;
+            let chunk = decoder.write(readBuffer.subarray(0, bytesRead));
+            if (firstChunk && chunk.length > 0) {
+                // Strip BOM from the first chunk. Safe because the decoder uses utf8,
+                // so the 3-byte BOM is decoded into a single \uFEFF character.
+                chunk = stripBom(chunk);
+                firstChunk = false;
             }
+            buffer += chunk;
             // Normalize CRLF (Windows) to LF so document separator detection works.
             buffer = buffer.replace(/\r\n/g, '\n');
-            if (buffer.length >= YAML_DOCUMENT_START.length)
-                break;
-        }
-        if (!buffer.startsWith(YAML_DOCUMENT_START)) {
-            stream.destroy();
-            return null;
-        }
-        // Phase 2: find the second "---" separator
-        while (true) {
+            if (canRejectDocumentStart(buffer)) {
+                return null;
+            }
             const sep = buffer.indexOf(YAML_DOCUMENT_SEPARATOR, YAML_DOCUMENT_START.length);
             if (sep !== -1) {
-                stream.destroy();
                 return buffer.slice(YAML_DOCUMENT_START.length, sep);
             }
-            const chunk = await chunks.next(); // eslint-disable-line no-await-in-loop
-            if (chunk.done)
-                break;
-            // Normalize CRLF (Windows) to LF so the separator search matches on Windows-checked-out files.
-            buffer = (buffer + chunk.value).replace(/\r\n/g, '\n');
         }
+        const remainder = decoder.end();
+        if (remainder.length > 0) {
+            buffer += firstChunk ? stripBom(remainder) : remainder;
+            buffer = buffer.replace(/\r\n/g, '\n');
+        }
+        return null;
     }
     catch (err) {
         if (util.types.isNativeError(err) && 'code' in err && err.code === 'ENOENT') {
@@ -53,8 +56,20 @@ export async function streamReadFirstYamlDocument(filePath) {
         }
         throw err;
     }
-    stream.destroy();
-    return null;
+    finally {
+        await fileHandle?.close().catch(() => { });
+    }
+}
+function canRejectDocumentStart(buffer) {
+    if (buffer.length < YAML_DOCUMENT_START.length)
+        return false;
+    if (buffer === '---\r')
+        return false;
+    return !buffer.startsWith(YAML_DOCUMENT_START);
+}
+function normalizeReadBufferSize(readBufferSize) {
+    const size = Number.isFinite(readBufferSize) ? Math.floor(readBufferSize) : READ_BUFFER_SIZE;
+    return size > 0 ? size : READ_BUFFER_SIZE;
 }
 /**
  * Extracts the main lockfile content (second YAML document) from a combined string.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/lockfile.fs",
-  "version": "1100.1.4",
+  "version": "1100.1.6",
   "description": "Read/write pnpm-lock.yaml files",
   "keywords": [
     "pnpm",
@@ -34,24 +34,24 @@
     "js-yaml": "npm:@zkochan/js-yaml@0.0.11",
     "normalize-path": "^3.0.0",
     "ramda": "npm:@pnpm/ramda@0.28.1",
-    "semver": "^7.8.1",
+    "semver": "^7.8.4",
     "strip-bom": "^5.0.0",
     "write-file-atomic": "^7.0.1",
-    "@pnpm/constants": "1100.0.0",
-    "@pnpm/deps.path": "1100.0.7",
+    "@pnpm/lockfile.types": "1100.0.11",
+    "@pnpm/lockfile.merger": "1100.0.11",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/lockfile.types": "1100.0.10",
-    "@pnpm/lockfile.merger": "1100.0.10",
-    "@pnpm/lockfile.utils": "1100.0.12",
-    "@pnpm/object.key-sorting": "1100.0.0",
-    "@pnpm/network.git-utils": "1100.0.1",
-    "@pnpm/types": "1101.3.1"
+    "@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"
   },
   "peerDependencies": {
-    "@pnpm/logger": "^1001.0.1"
+    "@pnpm/logger": "^1100.0.0"
   },
   "devDependencies": {
-    "@jest/globals": "30.3.0",
+    "@jest/globals": "30.4.1",
     "@types/js-yaml": "^4.0.9",
     "@types/normalize-path": "^3.0.2",
     "@types/ramda": "0.31.1",
@@ -60,7 +60,7 @@
     "tempy": "3.0.0",
     "write-yaml-file": "^6.0.0",
     "yaml-tag": "1.1.0",
-    "@pnpm/lockfile.fs": "1100.1.4",
+    "@pnpm/lockfile.fs": "1100.1.6",
     "@pnpm/logger": "1100.0.0"
   },
   "engines": {