nx 19.2.0-canary.20240525-af463c4 → 19.2.0-canary.20240528-7f11a1d

package/src/plugins/js/lock-file/utils/pnpm-normalizer.js

@@ -4,14 +4,29 @@
  * It will convert inline specifiers to the separate specifiers format and ensure importers are present.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.stringifyToPnpmYaml = exports.parseAndNormalizePnpmLockfile = exports.loadPnpmHoistedDepsDefinition = exports.isV6Lockfile = void 0;
+exports.stringifyToPnpmYaml = exports.parseAndNormalizePnpmLockfile = exports.loadPnpmHoistedDepsDefinition = exports.usesLeadingDash = exports.isV5Syntax = void 0;
 const fs_1 = require("fs");
-const workspace_root_1 = require("../../../../utils/workspace-root");
 const semver_1 = require("semver");
-function isV6Lockfile(data) {
-    return data.lockfileVersion.toString().startsWith('6.');
+const workspace_root_1 = require("../../../../utils/workspace-root");
+const file_hasher_1 = require("../../../../hasher/file-hasher");
+function isV5Syntax(data) {
+    if (+data.lockfileVersion.toString() >= 6) {
+        return false;
+    }
+    else {
+        return true;
+    }
 }
-exports.isV6Lockfile = isV6Lockfile;
+exports.isV5Syntax = isV5Syntax;
+function usesLeadingDash(data) {
+    if (+data.lockfileVersion.toString() >= 9) {
+        false;
+    }
+    else {
+        return true;
+    }
+}
+exports.usesLeadingDash = usesLeadingDash;
 function loadPnpmHoistedDepsDefinition() {
     const fullPath = `${workspace_root_1.workspaceRoot}/node_modules/.modules.yaml`;
     if ((0, fs_1.existsSync)(fullPath)) {
@@ -24,33 +39,157 @@ function loadPnpmHoistedDepsDefinition() {
     }
 }
 exports.loadPnpmHoistedDepsDefinition = loadPnpmHoistedDepsDefinition;
-/*************************************************************************
- * THE FOLLOWING CODE IS COPIED & simplified FROM @pnpm/lockfile-file for convenience
- *************************************************************************/
 /**
  * Parsing and mapping logic from pnpm lockfile `read` function
- * https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/read.ts#L91
  */
 function parseAndNormalizePnpmLockfile(content) {
     const { load } = require('@zkochan/js-yaml');
-    const lockFileData = load(content);
-    return revertFromInlineSpecifiersFormatIfNecessary(convertFromLockfileFileMutable(lockFileData));
+    return convertToLockfileObject(load(content));
 }
 exports.parseAndNormalizePnpmLockfile = parseAndNormalizePnpmLockfile;
+// https://github.com/pnpm/pnpm/blob/50e37072f42bcca6d393a74bed29f7f0e029805d/lockfile/lockfile-file/src/write.ts#L22
+const LOCKFILE_YAML_FORMAT = {
+    blankLines: true,
+    lineWidth: -1, // This is setting line width to never wrap
+    noCompatMode: true,
+    noRefs: true,
+    sortKeys: false,
+};
+const LOCKFILE_YAML_PRE9_FORMAT = {
+    ...LOCKFILE_YAML_FORMAT,
+    lineWidth: 1000,
+};
+/**
+ * Mapping and writing logic from pnpm lockfile `write` function
+ */
+function stringifyToPnpmYaml(lockfile) {
+    const { dump } = require('@zkochan/js-yaml');
+    const lockfileVersion = +lockfile.lockfileVersion;
+    if (lockfileVersion >= 9) {
+        const adaptedLockfile = convertToLockfileFile(lockfile, {
+            forceSharedFormat: true,
+        });
+        return dump(sortLockfileKeys(adaptedLockfile), LOCKFILE_YAML_FORMAT);
+    }
+    else {
+        // https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/write.ts#L77
+        const adaptedLockfile = lockfileVersion >= 6
+            ? convertToInlineSpecifiersFormat(lockfile)
+            : lockfile;
+        return dump(sortLockfileKeys(normalizeLockfileV6(adaptedLockfile, lockfileVersion >= 6)), LOCKFILE_YAML_PRE9_FORMAT);
+    }
+}
+exports.stringifyToPnpmYaml = stringifyToPnpmYaml;
 /**
- * Reverts changes from the "forceSharedFormat" write option if necessary.
- * https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/read.ts#L234
+ * The following code was copied over from pnpm source code and modified to work in this context.
  */
+// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L17
+function convertToInlineSpecifiersFormat(lockfile) {
+    let importers = lockfile.importers;
+    let packages = lockfile.packages;
+    importers = Object.fromEntries(Object.entries(lockfile.importers ?? {}).map(([importerId, pkgSnapshot]) => {
+        const newSnapshot = { ...pkgSnapshot };
+        if (newSnapshot.dependencies != null) {
+            newSnapshot.dependencies = mapValues(newSnapshot.dependencies, convertOldRefToNewRef);
+        }
+        if (newSnapshot.optionalDependencies != null) {
+            newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertOldRefToNewRef);
+        }
+        if (newSnapshot.devDependencies != null) {
+            newSnapshot.devDependencies = mapValues(newSnapshot.devDependencies, convertOldRefToNewRef);
+        }
+        return [importerId, newSnapshot];
+    }));
+    packages = Object.fromEntries(Object.entries(lockfile.packages ?? {}).map(([depPath, pkgSnapshot]) => {
+        const newSnapshot = { ...pkgSnapshot };
+        if (newSnapshot.dependencies != null) {
+            newSnapshot.dependencies = mapValues(newSnapshot.dependencies, convertOldRefToNewRef);
+        }
+        if (newSnapshot.optionalDependencies != null) {
+            newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertOldRefToNewRef);
+        }
+        return [convertOldDepPathToNewDepPath(depPath), newSnapshot];
+    }));
+    const newLockfile = {
+        ...lockfile,
+        packages,
+        lockfileVersion: lockfile.lockfileVersion.toString(),
+        importers: mapValues(importers, convertProjectSnapshotToInlineSpecifiersFormat),
+    };
+    if (newLockfile.time) {
+        newLockfile.time = Object.fromEntries(Object.entries(newLockfile.time).map(([depPath, time]) => [
+            convertOldDepPathToNewDepPath(depPath),
+            time,
+        ]));
+    }
+    return newLockfile;
+}
+// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L72
+function convertOldDepPathToNewDepPath(oldDepPath) {
+    const parsedDepPath = dpParse(oldDepPath);
+    if (!parsedDepPath.name || !parsedDepPath.version)
+        return oldDepPath;
+    let newDepPath = `/${parsedDepPath.name}@${parsedDepPath.version}`;
+    if (parsedDepPath.peersSuffix) {
+        if (parsedDepPath.peersSuffix.startsWith('(')) {
+            newDepPath += parsedDepPath.peersSuffix;
+        }
+        else {
+            newDepPath += `_${parsedDepPath.peersSuffix}`;
+        }
+    }
+    if (parsedDepPath.host) {
+        newDepPath = `${parsedDepPath.host}${newDepPath}`;
+    }
+    return newDepPath;
+}
+// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L89
+function convertOldRefToNewRef(oldRef) {
+    if (oldRef.startsWith('link:') || oldRef.startsWith('file:')) {
+        return oldRef;
+    }
+    if (oldRef.includes('/')) {
+        return convertOldDepPathToNewDepPath(oldRef);
+    }
+    return oldRef;
+}
+// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L179
+function convertProjectSnapshotToInlineSpecifiersFormat(projectSnapshot) {
+    const { specifiers, ...rest } = projectSnapshot;
+    const convertBlock = (block) => block != null
+        ? convertResolvedDependenciesToInlineSpecifiersFormat(block, {
+            specifiers,
+        })
+        : block;
+    return {
+        ...rest,
+        dependencies: convertBlock(projectSnapshot.dependencies),
+        optionalDependencies: convertBlock(projectSnapshot.optionalDependencies),
+        devDependencies: convertBlock(projectSnapshot.devDependencies),
+    };
+}
+// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L195
+function convertResolvedDependenciesToInlineSpecifiersFormat(resolvedDependencies, { specifiers }) {
+    return mapValues(resolvedDependencies, (version, depName) => ({
+        specifier: specifiers[depName],
+        version,
+    }));
+}
+// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/packages/types/src/misc.ts#L6
+const DEPENDENCIES_FIELDS = [
+    'optionalDependencies',
+    'dependencies',
+    'devDependencies',
+];
+// https://github.com/pnpm/pnpm/blob/cca56c0c6c956d036883003092ca1d11bbb700f6/lockfile/lockfile-file/src/lockfileFormatConverters.ts#L169
 function convertFromLockfileFileMutable(lockfileFile) {
     if (typeof lockfileFile?.['importers'] === 'undefined') {
         lockfileFile.importers = {
             '.': {
-                specifiers: lockfileFile['specifiers'] ?? {},
                 dependenciesMeta: lockfileFile['dependenciesMeta'],
                 publishDirectory: lockfileFile['publishDirectory'],
             },
         };
-        delete lockfileFile.specifiers;
         for (const depType of DEPENDENCIES_FIELDS) {
             if (lockfileFile[depType] != null) {
                 lockfileFile.importers['.'][depType] = lockfileFile[depType];
@@ -58,31 +197,208 @@ function convertFromLockfileFileMutable(lockfileFile) {
             }
         }
     }
+    else if (isV5Syntax(lockfileFile)) {
+        // remap the importers from v5 to the new format
+        for (const depType of DEPENDENCIES_FIELDS) {
+            if (lockfileFile.importers['.'][depType]) {
+                for (const [depName, version] of Object.entries(lockfileFile.importers['.'][depType])) {
+                    lockfileFile.importers['.'][depType][depName] = {
+                        version,
+                        specifier: (lockfileFile['specifiers'] ||
+                            lockfileFile.importers['.']['specifiers'])[depName],
+                    };
+                }
+            }
+        }
+    }
     return lockfileFile;
 }
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/write.ts#L27
-const LOCKFILE_YAML_FORMAT = {
-    blankLines: true,
-    lineWidth: 1000,
-    noCompatMode: true,
-    noRefs: true,
-    sortKeys: false,
-};
-/**
- * Mapping and writing logic from pnpm lockfile `write` function
- * https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/write.ts#L77
- */
-function stringifyToPnpmYaml(lockfile) {
-    const isLockfileV6 = isV6Lockfile(lockfile);
-    const adaptedLockfile = isLockfileV6
-        ? convertToInlineSpecifiersFormat(lockfile)
-        : lockfile;
-    const { dump } = require('@zkochan/js-yaml');
-    return dump(sortLockfileKeys(normalizeLockfile(adaptedLockfile, isLockfileV6)), LOCKFILE_YAML_FORMAT);
+// https://github.com/pnpm/pnpm/blob/cca56c0c6c956d036883003092ca1d11bbb700f6/lockfile/lockfile-file/src/lockfileFormatConverters.ts#L187
+function convertToLockfileObject(lockfile) {
+    if (lockfile.snapshots) {
+        return convertLockfileV9ToLockfileObject(lockfile);
+    }
+    convertPkgIds(lockfile);
+    const { importers, ...rest } = convertFromLockfileFileMutable(lockfile);
+    const newLockfile = {
+        ...rest,
+        importers: mapValues(importers ?? {}, revertProjectSnapshot),
+    };
+    return newLockfile;
+}
+// https://github.com/pnpm/pnpm/blob/cca56c0c6c956d036883003092ca1d11bbb700f6/lockfile/lockfile-file/src/lockfileFormatConverters.ts#L201
+function convertPkgIds(lockfile) {
+    const oldIdToNewId = {};
+    if (lockfile.packages == null || isEmpty(lockfile.packages))
+        return;
+    for (const [pkgId, pkg] of Object.entries(lockfile.packages ?? {})) {
+        if (pkg.name) {
+            const { id, peersSuffix } = parseDepPath(pkgId);
+            let newId = `${pkg.name}@`;
+            if ('tarball' in pkg.resolution) {
+                newId += pkg.resolution.tarball;
+                if (pkg.resolution.path) {
+                    newId += `#path:${pkg.resolution.path}`;
+                }
+            }
+            else if ('repo' in pkg.resolution) {
+                newId += createGitHostedPkgId(pkg.resolution);
+            }
+            else if ('directory' in pkg.resolution) {
+                newId += id;
+            }
+            else {
+                continue;
+            }
+            oldIdToNewId[pkgId] = `${newId}${peersSuffix}`;
+            if (id !== pkgId) {
+                oldIdToNewId[id] = newId;
+            }
+        }
+        else {
+            const { id, peersSuffix } = parseDepPath(pkgId);
+            const newId = id.substring(1);
+            oldIdToNewId[pkgId] = `${newId}${peersSuffix}`;
+            if (id !== pkgId) {
+                oldIdToNewId[id] = newId;
+            }
+        }
+    }
+    const newLockfilePackages = {};
+    for (const [pkgId, pkg] of Object.entries(lockfile.packages ?? {})) {
+        if (oldIdToNewId[pkgId]) {
+            if (pkg.id) {
+                pkg.id = oldIdToNewId[pkg.id];
+            }
+            newLockfilePackages[oldIdToNewId[pkgId]] = pkg;
+        }
+        else {
+            newLockfilePackages[pkgId] = pkg;
+        }
+        for (const depType of ['dependencies', 'optionalDependencies']) {
+            for (const [alias, depPath] of Object.entries(pkg[depType] ?? {})) {
+                if (oldIdToNewId[depPath]) {
+                    if (oldIdToNewId[depPath].startsWith(`${alias}@`)) {
+                        pkg[depType][alias] = oldIdToNewId[depPath].substring(alias.length + 1);
+                    }
+                    else {
+                        pkg[depType][alias] = oldIdToNewId[depPath];
+                    }
+                }
+            }
+        }
+    }
+    lockfile.packages = newLockfilePackages;
+    if ((lockfile.dependencies != null ||
+        lockfile.devDependencies != null ||
+        lockfile.optionalDependencies != null) &&
+        !lockfile.importers?.['.']) {
+        lockfile.importers = lockfile.importers ?? {};
+        lockfile.importers['.'] = {
+            dependencies: lockfile.dependencies,
+            devDependencies: lockfile.devDependencies,
+            optionalDependencies: lockfile.optionalDependencies,
+        };
+        delete lockfile.dependencies;
+        delete lockfile.devDependencies;
+        delete lockfile.optionalDependencies;
+    }
+    for (const importer of Object.values(lockfile.importers ?? {})) {
+        for (const depType of [
+            'dependencies',
+            'optionalDependencies',
+            'devDependencies',
+        ]) {
+            for (const [alias, { version }] of Object.entries(importer[depType] ?? {})) {
+                if (oldIdToNewId[version]) {
+                    if (oldIdToNewId[version].startsWith(`${alias}@`)) {
+                        importer[depType][alias].version = oldIdToNewId[version].substring(alias.length + 1);
+                    }
+                    else {
+                        importer[depType][alias].version = oldIdToNewId[version];
+                    }
+                }
+            }
+        }
+    }
+    for (const depType of [
+        'dependencies',
+        'optionalDependencies',
+        'devDependencies',
+    ]) {
+        for (const [alias, { version }] of Object.entries(lockfile[depType] ?? {})) {
+            if (oldIdToNewId[version]) {
+                lockfile[depType][alias].version = oldIdToNewId[version];
+            }
+        }
+    }
+}
+// https://github.com/pnpm/pnpm/blob/cca56c0c6c956d036883003092ca1d11bbb700f6/lockfile/lockfile-file/src/lockfileFormatConverters.ts#L289
+function convertLockfileV9ToLockfileObject(lockfile) {
+    const { importers, ...rest } = convertFromLockfileFileMutable(lockfile);
+    const packages = {};
+    for (const [depPath, pkg] of Object.entries(lockfile.snapshots ?? {})) {
+        const pkgId = removePeersSuffix(depPath);
+        packages[depPath] = Object.assign(pkg, lockfile.packages?.[pkgId]);
+    }
+    return {
+        ...omit(['snapshots'], rest),
+        packages,
+        importers: mapValues(importers ?? {}, revertProjectSnapshot),
+    };
+}
+// https://github.com/pnpm/pnpm/blob/cca56c0c6c956d036883003092ca1d11bbb700f6/lockfile/lockfile-file/src/lockfileFormatConverters.ts#L331
+function revertProjectSnapshot(from) {
+    const specifiers = {};
+    function moveSpecifiers(from) {
+        const resolvedDependencies = {};
+        for (const [depName, { specifier, version }] of Object.entries(from)) {
+            const existingValue = specifiers[depName];
+            if (existingValue != null && existingValue !== specifier) {
+                throw new Error(`Project snapshot lists the same dependency more than once with conflicting versions: ${depName}`);
+            }
+            specifiers[depName] = specifier;
+            resolvedDependencies[depName] = version;
+        }
+        return resolvedDependencies;
+    }
+    const dependencies = from.dependencies == null
+        ? from.dependencies
+        : moveSpecifiers(from.dependencies);
+    const devDependencies = from.devDependencies == null
+        ? from.devDependencies
+        : moveSpecifiers(from.devDependencies);
+    const optionalDependencies = from.optionalDependencies == null
+        ? from.optionalDependencies
+        : moveSpecifiers(from.optionalDependencies);
+    return {
+        ...from,
+        specifiers,
+        dependencies,
+        devDependencies,
+        optionalDependencies,
+    };
+}
+// https://github.com/pnpm/pnpm/blob/cca56c0c6c956d036883003092ca1d11bbb700f6/lockfile/lockfile-file/src/lockfileFormatConverters.ts#L367
+function mapValues(obj, mapper) {
+    const result = {};
+    for (const [key, value] of Object.entries(obj)) {
+        result[key] = mapper(value, key);
+    }
+    return result;
+}
+// https://github.com/pnpm/pnpm/blob/cca56c0c6c956d036883003092ca1d11bbb700f6/resolving/git-resolver/src/createGitHostedPkgId.ts#L1
+function createGitHostedPkgId({ repo, commit, path, }) {
+    let id = `${repo.includes('://') ? '' : 'https://'}${repo}#${commit}`;
+    if (!id.startsWith('git+'))
+        id = `git+${id}`;
+    if (path) {
+        id += `&path:${path}`;
+    }
+    return id;
 }
-exports.stringifyToPnpmYaml = stringifyToPnpmYaml;
 // https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/write.ts#L106
-function normalizeLockfile(lockfile, isLockfileV6) {
+function normalizeLockfileV6(lockfile, isLockfileV6) {
     let lockfileToSave;
     if (Object.keys(lockfile.importers).length === 1 && lockfile.importers['.']) {
         lockfileToSave = {
@@ -126,6 +442,13 @@ function normalizeLockfile(lockfile, isLockfileV6) {
             delete lockfileToSave.packages;
         }
     }
+    if (lockfileToSave.packages) {
+        const newPackages = {};
+        for (const [depPath, pkgSnapshot] of Object.entries(lockfileToSave.packages)) {
+            const newDepPath = depPath.replace(/\/$/, '');
+            newPackages[newDepPath] = pkgSnapshot;
+        }
+    }
     if (lockfileToSave.time) {
         lockfileToSave.time = (isLockfileV6 ? pruneTimeInLockfileV6 : pruneTime)(lockfileToSave.time, lockfile.importers);
     }
@@ -136,18 +459,18 @@ function normalizeLockfile(lockfile, isLockfileV6) {
         isEmpty(lockfileToSave.patchedDependencies)) {
         delete lockfileToSave.patchedDependencies;
     }
-    if (lockfileToSave.neverBuiltDependencies != null) {
-        if (isEmpty(lockfileToSave.neverBuiltDependencies)) {
-            delete lockfileToSave.neverBuiltDependencies;
+    if (lockfileToSave['neverBuiltDependencies'] != null) {
+        if (isEmpty(lockfileToSave['neverBuiltDependencies'])) {
+            delete lockfileToSave['neverBuiltDependencies'];
         }
         else {
-            lockfileToSave.neverBuiltDependencies =
-                lockfileToSave.neverBuiltDependencies.sort();
+            lockfileToSave['neverBuiltDependencies'] =
+                lockfileToSave['neverBuiltDependencies'].sort();
         }
     }
-    if (lockfileToSave.onlyBuiltDependencies != null) {
-        lockfileToSave.onlyBuiltDependencies =
-            lockfileToSave.onlyBuiltDependencies.sort();
+    if (lockfileToSave['onlyBuiltDependencies'] != null) {
+        lockfileToSave['onlyBuiltDependencies'] =
+            lockfileToSave['onlyBuiltDependencies'].sort();
     }
     if (!lockfileToSave.packageExtensionsChecksum) {
         delete lockfileToSave.packageExtensionsChecksum;
@@ -216,268 +539,146 @@ function pruneTime(time, importers) {
     }
     return pickBy((depPath) => rootDepPaths.has(depPath), time);
 }
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/sortLockfileKeys.ts#L34
-const ROOT_KEYS_ORDER = {
-    lockfileVersion: 1,
-    // only and never are conflict options.
-    neverBuiltDependencies: 2,
-    onlyBuiltDependencies: 2,
-    overrides: 3,
-    packageExtensionsChecksum: 4,
-    patchedDependencies: 5,
-    specifiers: 10,
-    dependencies: 11,
-    optionalDependencies: 12,
-    devDependencies: 13,
-    dependenciesMeta: 14,
-    importers: 15,
-    packages: 16,
-};
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/sortLockfileKeys.ts#L60
-function sortLockfileKeys(lockfile) {
-    let sortedLockfile = {};
-    const sortedKeys = Object.keys(lockfile).sort((a, b) => ROOT_KEYS_ORDER[a] - ROOT_KEYS_ORDER[b]);
-    for (const key of sortedKeys) {
-        sortedLockfile[key] = lockfile[key];
-    }
-    return sortedLockfile;
-}
-/**
- * Types from https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/InlineSpecifiersLockfile.ts
- */
-const INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX = '-inlineSpecifiers';
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L10
-function isExperimentalInlineSpecifiersFormat(lockfile) {
-    const { lockfileVersion } = lockfile;
-    return (lockfileVersion.toString().startsWith('6.') ||
-        (typeof lockfileVersion === 'string' &&
-            lockfileVersion.endsWith(INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX)));
-}
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L17
-function convertToInlineSpecifiersFormat(lockfile) {
-    let importers = lockfile.importers;
-    let packages = lockfile.packages;
-    if (isV6Lockfile(lockfile)) {
-        importers = Object.fromEntries(Object.entries(lockfile.importers ?? {}).map(([importerId, pkgSnapshot]) => {
-            const newSnapshot = { ...pkgSnapshot };
-            if (newSnapshot.dependencies != null) {
-                newSnapshot.dependencies = mapValues(newSnapshot.dependencies, convertOldRefToNewRef);
-            }
-            if (newSnapshot.optionalDependencies != null) {
-                newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertOldRefToNewRef);
-            }
-            if (newSnapshot.devDependencies != null) {
-                newSnapshot.devDependencies = mapValues(newSnapshot.devDependencies, convertOldRefToNewRef);
-            }
-            return [importerId, newSnapshot];
-        }));
-        packages = Object.fromEntries(Object.entries(lockfile.packages ?? {}).map(([depPath, pkgSnapshot]) => {
-            const newSnapshot = { ...pkgSnapshot };
-            if (newSnapshot.dependencies != null) {
-                newSnapshot.dependencies = mapValues(newSnapshot.dependencies, convertOldRefToNewRef);
-            }
-            if (newSnapshot.optionalDependencies != null) {
-                newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertOldRefToNewRef);
-            }
-            return [convertOldDepPathToNewDepPath(depPath), newSnapshot];
-        }));
+// https://github.com/pnpm/pnpm/blob/34bc8f48e10dc5a7d54eaa657638f8ccfb406aa4/lockfile/lockfile-file/src/lockfileFormatConverters.ts#L29
+function convertToLockfileFile(lockfile, opts) {
+    const packages = {};
+    const snapshots = {};
+    for (const [depPath, pkg] of Object.entries(lockfile.packages ?? {})) {
+        snapshots[depPath] = pick([
+            'dependencies',
+            'optionalDependencies',
+            'transitivePeerDependencies',
+            'optional',
+            'id',
+        ], pkg);
+        const pkgId = removePeersSuffix(depPath);
+        if (!packages[pkgId]) {
+            packages[pkgId] = pick([
+                'resolution',
+                'bundledDependencies',
+                'cpu',
+                'deprecated',
+                'engines',
+                'hasBin',
+                'libc',
+                'name',
+                'os',
+                'peerDependencies',
+                'peerDependenciesMeta',
+                'version',
+            ], pkg);
+        }
     }
     const newLockfile = {
         ...lockfile,
+        snapshots,
         packages,
-        lockfileVersion: isV6Lockfile(lockfile)
-            ? lockfile.lockfileVersion.toString()
-            : lockfile.lockfileVersion
-                .toString()
-                .endsWith(INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX)
-                ? lockfile.lockfileVersion.toString()
-                : `${lockfile.lockfileVersion}${INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX}`,
-        importers: mapValues(importers, convertProjectSnapshotToInlineSpecifiersFormat),
+        lockfileVersion: lockfile.lockfileVersion.toString(),
+        importers: mapValues(lockfile.importers, convertProjectSnapshotToInlineSpecifiersFormat),
     };
-    if (isV6Lockfile(lockfile) && newLockfile.time) {
-        newLockfile.time = Object.fromEntries(Object.entries(newLockfile.time).map(([depPath, time]) => [
-            convertOldDepPathToNewDepPath(depPath),
-            time,
-        ]));
-    }
-    return newLockfile;
+    return normalizeLockfile(newLockfile, opts);
 }
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L72
-function convertOldDepPathToNewDepPath(oldDepPath) {
-    const parsedDepPath = dpParse(oldDepPath);
-    if (!parsedDepPath.name || !parsedDepPath.version)
-        return oldDepPath;
-    let newDepPath = `/${parsedDepPath.name}@${parsedDepPath.version}`;
-    if (parsedDepPath.peersSuffix) {
-        if (parsedDepPath.peersSuffix.startsWith('(')) {
-            newDepPath += parsedDepPath.peersSuffix;
+// https://github.com/pnpm/pnpm/blob/34bc8f48e10dc5a7d54eaa657638f8ccfb406aa4/lockfile/lockfile-file/src/lockfileFormatConverters.ts#L68
+function normalizeLockfile(lockfile, opts) {
+    let lockfileToSave;
+    if (!opts.forceSharedFormat &&
+        equals(Object.keys(lockfile.importers ?? {}), ['.'])) {
+        lockfileToSave = {
+            ...lockfile,
+            ...lockfile.importers?.['.'],
+        };
+        delete lockfileToSave.importers;
+        for (const depType of DEPENDENCIES_FIELDS) {
+            if (isEmpty(lockfileToSave[depType])) {
+                delete lockfileToSave[depType];
+            }
         }
-        else {
-            newDepPath += `_${parsedDepPath.peersSuffix}`;
+        if (isEmpty(lockfileToSave.packages) || lockfileToSave.packages == null) {
+            delete lockfileToSave.packages;
+        }
+        if (isEmpty(lockfileToSave.snapshots) ||
+            lockfileToSave.snapshots == null) {
+            delete lockfileToSave.snapshots;
         }
     }
-    if (parsedDepPath.host) {
-        newDepPath = `${parsedDepPath.host}${newDepPath}`;
-    }
-    return newDepPath;
-}
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L89
-function convertOldRefToNewRef(oldRef) {
-    if (oldRef.startsWith('link:') || oldRef.startsWith('file:')) {
-        return oldRef;
-    }
-    if (oldRef.includes('/')) {
-        return convertOldDepPathToNewDepPath(oldRef);
-    }
-    return oldRef;
-}
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L99
-function revertFromInlineSpecifiersFormatIfNecessary(lockfile) {
-    return isExperimentalInlineSpecifiersFormat(lockfile)
-        ? revertFromInlineSpecifiersFormat(lockfile)
-        : lockfile;
-}
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L105
-function revertFromInlineSpecifiersFormat(lockfile) {
-    const { lockfileVersion, importers, ...rest } = lockfile;
-    const originalVersionStr = lockfileVersion.replace(INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX, '');
-    const originalVersion = Number(originalVersionStr);
-    if (isNaN(originalVersion)) {
-        throw new Error(`Unable to revert lockfile from inline specifiers format. Invalid version parsed: ${originalVersionStr}`);
-    }
-    let revertedImporters = mapValues(importers, revertProjectSnapshot);
-    let packages = lockfile.packages;
-    if (originalVersionStr.startsWith('6.')) {
-        revertedImporters = Object.fromEntries(Object.entries(revertedImporters ?? {}).map(([importerId, pkgSnapshot]) => {
-            const newSnapshot = { ...pkgSnapshot };
-            if (newSnapshot.dependencies != null) {
-                newSnapshot.dependencies = mapValues(newSnapshot.dependencies, convertNewRefToOldRef);
-            }
-            if (newSnapshot.optionalDependencies != null) {
-                newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertNewRefToOldRef);
-            }
-            if (newSnapshot.devDependencies != null) {
-                newSnapshot.devDependencies = mapValues(newSnapshot.devDependencies, convertNewRefToOldRef);
-            }
-            return [importerId, newSnapshot];
-        }));
-        packages = Object.fromEntries(Object.entries(lockfile.packages ?? {}).map(([depPath, pkgSnapshot]) => {
-            const newSnapshot = { ...pkgSnapshot };
-            if (newSnapshot.dependencies != null) {
-                newSnapshot.dependencies = mapValues(newSnapshot.dependencies, convertNewRefToOldRef);
-            }
-            if (newSnapshot.optionalDependencies != null) {
-                newSnapshot.optionalDependencies = mapValues(newSnapshot.optionalDependencies, convertNewRefToOldRef);
-            }
-            return [convertNewDepPathToOldDepPath(depPath), newSnapshot];
-        }));
+    else {
+        lockfileToSave = {
+            ...lockfile,
+            importers: mapValues(lockfile.importers ?? {}, (importer) => {
+                const normalizedImporter = {};
+                if (importer.dependenciesMeta != null &&
+                    !isEmpty(importer.dependenciesMeta)) {
+                    normalizedImporter.dependenciesMeta = importer.dependenciesMeta;
+                }
+                for (const depType of DEPENDENCIES_FIELDS) {
+                    if (!isEmpty(importer[depType] ?? {})) {
+                        normalizedImporter[depType] = importer[depType];
+                    }
+                }
+                if (importer.publishDirectory) {
+                    normalizedImporter.publishDirectory = importer.publishDirectory;
+                }
+                return normalizedImporter;
+            }),
+        };
+        if (isEmpty(lockfileToSave.packages) || lockfileToSave.packages == null) {
+            delete lockfileToSave.packages;
+        }
+        if (isEmpty(lockfileToSave.snapshots) ||
+            lockfileToSave.snapshots == null) {
+            delete lockfileToSave.snapshots;
+        }
     }
-    const newLockfile = {
-        ...rest,
-        lockfileVersion: lockfileVersion.endsWith(INLINE_SPECIFIERS_FORMAT_LOCKFILE_VERSION_SUFFIX)
-            ? originalVersion
-            : lockfileVersion,
-        packages,
-        importers: revertedImporters,
-    };
-    if (originalVersionStr.startsWith('6.') && newLockfile.time) {
-        newLockfile.time = Object.fromEntries(Object.entries(newLockfile.time).map(([depPath, time]) => [
-            convertNewDepPathToOldDepPath(depPath),
-            time,
-        ]));
+    // This code only handles v9 format
+    // if (lockfileToSave.time) {
+    //   lockfileToSave.time = pruneTimeInLockfileV6(lockfileToSave.time, lockfile.importers ?? {})
+    // }
+    if (lockfileToSave.overrides != null && isEmpty(lockfileToSave.overrides)) {
+        delete lockfileToSave.overrides;
     }
-    return newLockfile;
-}
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L162
-function convertNewDepPathToOldDepPath(oldDepPath) {
-    if (!oldDepPath.includes('@', 2))
-        return oldDepPath;
-    const index = oldDepPath.indexOf('@', oldDepPath.indexOf('/@') + 2);
-    if (oldDepPath.includes('(') && index > oldDepPath.indexOf('('))
-        return oldDepPath;
-    return `${oldDepPath.substring(0, index)}/${oldDepPath.substring(index + 1)}`;
-}
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L169
-function convertNewRefToOldRef(oldRef) {
-    if (oldRef.startsWith('link:') || oldRef.startsWith('file:')) {
-        return oldRef;
+    if (lockfileToSave.patchedDependencies != null &&
+        isEmpty(lockfileToSave.patchedDependencies)) {
+        delete lockfileToSave.patchedDependencies;
     }
-    if (oldRef.includes('@')) {
-        return convertNewDepPathToOldDepPath(oldRef);
+    if (!lockfileToSave.packageExtensionsChecksum) {
+        delete lockfileToSave.packageExtensionsChecksum;
     }
-    return oldRef;
-}
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L179
-function convertProjectSnapshotToInlineSpecifiersFormat(projectSnapshot) {
-    const { specifiers, ...rest } = projectSnapshot;
-    const convertBlock = (block) => block != null
-        ? convertResolvedDependenciesToInlineSpecifiersFormat(block, {
-            specifiers,
-        })
-        : block;
-    return {
-        ...rest,
-        dependencies: convertBlock(projectSnapshot.dependencies),
-        optionalDependencies: convertBlock(projectSnapshot.optionalDependencies),
-        devDependencies: convertBlock(projectSnapshot.devDependencies),
-    };
-}
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L195
-function convertResolvedDependenciesToInlineSpecifiersFormat(resolvedDependencies, { specifiers }) {
-    return mapValues(resolvedDependencies, (version, depName) => ({
-        specifier: specifiers[depName],
-        version,
-    }));
-}
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L205
-function revertProjectSnapshot(from) {
-    const specifiers = {};
-    function moveSpecifiers(from) {
-        const resolvedDependencies = {};
-        for (const [depName, { specifier, version }] of Object.entries(from)) {
-            const existingValue = specifiers[depName];
-            if (existingValue != null && existingValue !== specifier) {
-                throw new Error(`Project snapshot lists the same dependency more than once with conflicting versions: ${depName}`);
-            }
-            specifiers[depName] = specifier;
-            resolvedDependencies[depName] = version;
-        }
-        return resolvedDependencies;
+    if (!lockfileToSave.ignoredOptionalDependencies?.length) {
+        delete lockfileToSave.ignoredOptionalDependencies;
     }
-    const dependencies = from.dependencies
-        ? moveSpecifiers(from.dependencies)
-        : null;
-    const devDependencies = from.devDependencies
-        ? moveSpecifiers(from.devDependencies)
-        : null;
-    const optionalDependencies = from.optionalDependencies
-        ? moveSpecifiers(from.optionalDependencies)
-        : null;
-    return {
-        ...from,
-        specifiers,
-        dependencies,
-        devDependencies,
-        optionalDependencies,
-    };
-}
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts#L241
-function mapValues(obj, mapper) {
-    const result = {};
-    for (const [key, value] of Object.entries(obj)) {
-        result[key] = mapper(value, key);
+    if (!lockfileToSave.pnpmfileChecksum) {
+        delete lockfileToSave.pnpmfileChecksum;
     }
-    return result;
+    return lockfileToSave;
 }
-/*************************************************************************
- * THE FOLLOWING CODE IS COPIED FROM @pnpm/types for convenience
- *************************************************************************/
-// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/packages/types/src/misc.ts#L6
-const DEPENDENCIES_FIELDS = [
-    'optionalDependencies',
+const ROOT_KEYS = [
+    'lockfileVersion',
+    'neverBuiltDependencies',
+    'onlyBuiltDependencies',
+    'settings',
+    'overrides',
+    'packageExtensionsChecksum',
+    'pnpmfileChecksum',
+    'patchedDependencies',
+    'specifiers',
     'dependencies',
+    'optionalDependencies',
     'devDependencies',
+    'dependenciesMeta',
+    'importers',
+    'packages',
 ];
+const ROOT_KEYS_ORDER = Object.fromEntries(ROOT_KEYS.map((key, index) => [key, index]));
+// https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/lockfile/lockfile-file/src/sortLockfileKeys.ts#L60
+// TODO(meeroslav): pnpm has not a more sophisticated implementation for this function. check if this becomes a bottleneck
+function sortLockfileKeys(lockfile) {
+    let sortedLockfile = {};
+    const sortedKeys = Object.keys(lockfile).sort((a, b) => ROOT_KEYS_ORDER[a] - ROOT_KEYS_ORDER[b]);
+    for (const key of sortedKeys) {
+        sortedLockfile[key] = lockfile[key];
+    }
+    return sortedLockfile;
+}
 /*************************************************************************
  * THE FOLLOWING CODE IS COPIED FROM @pnpm/dependency-path for convenience
  *************************************************************************/
@@ -485,6 +686,46 @@ const DEPENDENCIES_FIELDS = [
 function isAbsolute(dependencyPath) {
     return dependencyPath[0] !== '/';
 }
+// https://github.com/pnpm/pnpm/blob/cca56c0c6c956d036883003092ca1d11bbb700f6/packages/dependency-path/src/index.ts#L9
+function indexOfPeersSuffix(depPath) {
+    if (!depPath.endsWith(')'))
+        return -1;
+    let open = 1;
+    for (let i = depPath.length - 2; i >= 0; i--) {
+        if (depPath[i] === '(') {
+            open--;
+        }
+        else if (depPath[i] === ')') {
+            open++;
+        }
+        else if (!open) {
+            return i + 1;
+        }
+    }
+    return -1;
+}
+// https://github.com/pnpm/pnpm/blob/cca56c0c6c956d036883003092ca1d11bbb700f6/packages/dependency-path/src/index.ts#L29
+function parseDepPath(relDepPath) {
+    const sepIndex = indexOfPeersSuffix(relDepPath);
+    if (sepIndex !== -1) {
+        return {
+            id: relDepPath.substring(0, sepIndex),
+            peersSuffix: relDepPath.substring(sepIndex),
+        };
+    }
+    return {
+        id: relDepPath,
+        peersSuffix: '',
+    };
+}
+// https://github.com/pnpm/pnpm/blob/cca56c0c6c956d036883003092ca1d11bbb700f6/packages/dependency-path/src/index.ts#L43
+function removePeersSuffix(relDepPath) {
+    const sepIndex = indexOfPeersSuffix(relDepPath);
+    if (sepIndex !== -1) {
+        return relDepPath.substring(0, sepIndex);
+    }
+    return relDepPath;
+}
 // https://github.com/pnpm/pnpm/blob/af3e5559d377870d4c3d303429b3ed1a4e64fedc/packages/dependency-path/src/index.ts#L80
 function dpRefToRelative(reference, pkgName) {
     if (reference.startsWith('link:')) {
@@ -559,6 +800,18 @@ function dpParse(dependencyPath) {
 /********************************************************************************
  * THE FOLLOWING CODE IS COPIED AND SIMPLIFIED FROM @pnpm/ramda for convenience
  *******************************************************************************/
+// https://github.com/pnpm/ramda/blob/50c6b57110b2f3631ed8633141f12012b7768d85/source/pick.js#L22
+function pick(names, obj) {
+    var result = {};
+    var idx = 0;
+    while (idx < names.length) {
+        if (names[idx] in obj) {
+            result[names[idx]] = obj[names[idx]];
+        }
+        idx += 1;
+    }
+    return result;
+}
 // https://github.com/pnpm/ramda/blob/50c6b57110b2f3631ed8633141f12012b7768d85/source/pickBy.js#L24
 function pickBy(test, obj) {
     let result = {};
@@ -573,3 +826,30 @@ function pickBy(test, obj) {
 function isEmpty(obj) {
     return obj != null && Object.keys(obj).length === 0;
 }
+// https://github.com/pnpm/ramda/blob/50c6b57110b2f3631ed8633141f12012b7768d85/source/omit.js#L19
+function omit(names, obj) {
+    let result = {};
+    let index = {};
+    let idx = 0;
+    const len = names.length;
+    while (idx < len) {
+        index[names[idx]] = 1;
+        idx += 1;
+    }
+    for (var prop in obj) {
+        if (!index.hasOwnProperty(prop)) {
+            result[prop] = obj[prop];
+        }
+    }
+    return result;
+}
+// This is a simplified internal implementation of the `equals` to replace complex function from Ramda
+function equals(a, b) {
+    if (Array.isArray(a) && Array.isArray(b)) {
+        return a.length === b.length && a.every((v, i) => v === b[i]);
+    }
+    if (typeof a === 'object' && typeof b === 'object') {
+        return (0, file_hasher_1.hashObject)(a) === (0, file_hasher_1.hashObject)(b);
+    }
+    return a === b;
+}