@teambit/pnpm 1.0.1298 → 1.0.1299

package/dist/lockfile-deps-graph-converter.d.ts

@@ -1,6 +1,6 @@
 import { type ProjectManifest } from '@pnpm/types';
 import { type LockfileFileProjectSnapshot } from '@pnpm/lockfile.types';
-import { DependenciesGraph } from '@teambit/objects';
+import { DependenciesGraph, type PackageAttributes, type DependencyEdge } from '@teambit/objects';
 import { type CalcDepsGraphOptions, type CalcDepsGraphForComponentOptions, type ComponentIdByPkgName } from '@teambit/dependency-resolver';
 import { type BitLockfileFile } from './lynx';
 /**
@@ -19,8 +19,25 @@ type ResolveFunction = (wantedDependency: {
     resolution?: Record<string, unknown>;
 }>;
 export declare function init(): Promise<void>;
-export declare function convertLockfileToGraph(lockfile: BitLockfileFile, { pkgName, componentRootDir, componentRelativeDir, componentIdByPkgName, replaceFileVersion, }: Omit<CalcDepsGraphOptions & CalcDepsGraphForComponentOptions, 'rootDir' | 'components' | 'component'> & {
+export interface LockfileToGraphCache {
+    edges: WeakMap<object, {
+        depPath: string;
+        edge: DependencyEdge | null;
+    }>;
+    packages: WeakMap<object, {
+        pkgId: string;
+        replacedPkgId: string;
+        graphPkg: PackageAttributes;
+    }>;
+    componentIdByPkgName?: ComponentIdByPkgName;
+    depsRequiringBuild?: string[];
+    contextKey?: string;
     replaceFileVersion?: (s: string) => string;
+}
+export declare function createLockfileToGraphCache(): LockfileToGraphCache;
+export declare function convertLockfileToGraph(lockfile: BitLockfileFile, { pkgName, componentRootDir, componentRelativeDir, componentIdByPkgName, replaceFileVersion, cache, }: Omit<CalcDepsGraphOptions & CalcDepsGraphForComponentOptions, 'rootDir' | 'components' | 'component'> & {
+    replaceFileVersion?: (s: string) => string;
+    cache?: LockfileToGraphCache;
 }): DependenciesGraph;
 export declare function createFileVersionReplacer(componentIdByPkgName: ComponentIdByPkgName): (s: string) => string;
 /**

package/dist/lockfile-deps-graph-converter.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.convertGraphToLockfile = convertGraphToLockfile;
 exports.convertLockfileToGraph = convertLockfileToGraph;
 exports.createFileVersionReplacer = createFileVersionReplacer;
+exports.createLockfileToGraphCache = createLockfileToGraphCache;
 exports.filterLockfileByImporters = filterLockfileByImporters;
 exports.init = init;
 function _path() {
@@ -156,12 +157,29 @@ function scrubOwnComponentFromLockfile(lockfile, pkgName) {
     packages
   });
 }
+function createLockfileToGraphCache() {
+  return {
+    edges: new WeakMap(),
+    packages: new WeakMap()
+  };
+}
+function getCacheContextKey(componentIdByPkgName, depsRequiringBuild) {
+  let key = '';
+  for (const [pkgName, compId] of componentIdByPkgName.entries()) {
+    key += `${pkgName}:${compId.scope}/${compId.fullName}@${compId.version};`;
+  }
+  if (depsRequiringBuild?.length) {
+    key += `|build:${depsRequiringBuild.join(',')}`;
+  }
+  return key;
+}
 function convertLockfileToGraphFromCapsule(lockfile, {
   pkgName,
   componentRelativeDir,
   componentIdByPkgName,
   replaceFileVersion,
-  narrowToComponentImporter = false
+  narrowToComponentImporter = false,
+  cache
 }) {
   const narrowedLockfile = scrubOwnComponentFromLockfile(narrowToComponentImporter ? filterLockfileByImporters(lockfile, [componentRelativeDir]) : lockfile, pkgName);
   const componentImporter = narrowedLockfile.importers[componentRelativeDir];
@@ -176,7 +194,8 @@ function convertLockfileToGraphFromCapsule(lockfile, {
   return _convertLockfileToGraph(narrowedLockfile, {
     componentIdByPkgName,
     directDependencies,
-    replaceFileVersion
+    replaceFileVersion,
+    cache
   });
 }
 function importerDepsToNeighbours(importerDependencies, lifecycle, optional) {
@@ -204,7 +223,8 @@ function convertLockfileToGraph(lockfile, {
   componentRootDir,
   componentRelativeDir,
   componentIdByPkgName,
-  replaceFileVersion
+  replaceFileVersion,
+  cache
 }) {
   ensureInitialized();
   if (componentRootDir == null || pkgName == null) {
@@ -212,7 +232,8 @@ function convertLockfileToGraph(lockfile, {
       pkgName,
       componentRelativeDir,
       componentIdByPkgName,
-      replaceFileVersion
+      replaceFileVersion,
+      cache
     });
   }
   const rootImporterDeps = lockfile.importers[componentRootDir]?.dependencies?.[pkgName];
@@ -222,7 +243,8 @@ function convertLockfileToGraph(lockfile, {
       componentRelativeDir,
       componentIdByPkgName,
       replaceFileVersion,
-      narrowToComponentImporter: lockfile.importers?.[componentRootDir] != null
+      narrowToComponentImporter: lockfile.importers?.[componentRootDir] != null,
+      cache
     });
   }
   const lockedFileVersion = rootImporterDeps.version;
@@ -234,7 +256,8 @@ function convertLockfileToGraph(lockfile, {
       componentRelativeDir,
       componentIdByPkgName,
       replaceFileVersion,
-      narrowToComponentImporter: lockfile.importers?.[componentRootDir] != null
+      narrowToComponentImporter: lockfile.importers?.[componentRootDir] != null,
+      cache
     });
   }
   const componentDevImporter = lockfile.importers[componentRelativeDir];
@@ -256,8 +279,10 @@ function convertLockfileToGraph(lockfile, {
       });
     }
   }
-  delete lockfile.snapshots[lockedPkgDepPath];
-  delete lockfile.packages[dp.removeSuffix(lockedPkgDepPath)];
+  const snapshots = _objectSpread({}, lockfile.snapshots);
+  const packages = _objectSpread({}, lockfile.packages);
+  delete snapshots[lockedPkgDepPath];
+  delete packages[dp.removeSuffix(lockedPkgDepPath)];
   // Scrub back-edges from a circular workspace dep (another workspace
   // component depending on the one we're processing). Otherwise the
   // back-edge survives buildEdges but its target — the just-deleted
@@ -265,34 +290,76 @@ function convertLockfileToGraph(lockfile, {
   // convertGraphToLockfile would later materialise that neighbour as an
   // empty packages entry and ask the registry for the workspace
   // snap-version, which may never have been published.
-  for (const snapshot of Object.values(lockfile.snapshots ?? {})) {
+  for (const [depPath, snapshot] of Object.entries(snapshots)) {
+    let snapshotCopied = false;
+    let currentSnapshot = snapshot;
     for (const depType of ['dependencies', 'optionalDependencies']) {
-      const deps = snapshot[depType];
+      const deps = currentSnapshot[depType];
       if (deps?.[pkgName] === lockedFileVersion) {
-        delete deps[pkgName];
-        if (Object.keys(deps).length === 0) delete snapshot[depType];
+        if (!snapshotCopied) {
+          currentSnapshot = _objectSpread({}, currentSnapshot);
+          snapshots[depPath] = currentSnapshot;
+          snapshotCopied = true;
+        }
+        const nextDeps = _objectSpread({}, deps);
+        delete nextDeps[pkgName];
+        if (Object.keys(nextDeps).length === 0) {
+          delete currentSnapshot[depType];
+        } else {
+          currentSnapshot[depType] = nextDeps;
+        }
       }
     }
   }
-  return _convertLockfileToGraph(lockfile, {
+  return _convertLockfileToGraph(_objectSpread(_objectSpread({}, lockfile), {}, {
+    snapshots,
+    packages
+  }), {
     componentIdByPkgName,
     directDependencies,
-    replaceFileVersion
+    replaceFileVersion,
+    cache
   });
 }
 function _convertLockfileToGraph(lockfile, {
   componentIdByPkgName,
   directDependencies,
-  replaceFileVersion = createFileVersionReplacer(componentIdByPkgName)
+  replaceFileVersion,
+  cache
 }) {
+  let resolvedReplacer = replaceFileVersion;
+  if (cache) {
+    const depsRequiringBuild = lockfile.bit?.depsRequiringBuild;
+    let isContextChanged = replaceFileVersion != null && cache.replaceFileVersion != null && cache.replaceFileVersion !== replaceFileVersion;
+    if (cache.componentIdByPkgName !== componentIdByPkgName || cache.depsRequiringBuild !== depsRequiringBuild) {
+      const contextKey = getCacheContextKey(componentIdByPkgName, depsRequiringBuild);
+      if (cache.contextKey !== contextKey) {
+        isContextChanged = true;
+        cache.contextKey = contextKey;
+      }
+      cache.componentIdByPkgName = componentIdByPkgName;
+      cache.depsRequiringBuild = depsRequiringBuild;
+    }
+    if (isContextChanged) {
+      cache.edges = new WeakMap();
+      cache.packages = new WeakMap();
+      cache.replaceFileVersion = undefined;
+    }
+    resolvedReplacer ??= cache.replaceFileVersion ?? createFileVersionReplacer(componentIdByPkgName);
+    cache.replaceFileVersion = resolvedReplacer;
+  } else {
+    resolvedReplacer ??= createFileVersionReplacer(componentIdByPkgName);
+  }
   const graph = new (_objects().DependenciesGraph)({
     edges: buildEdges(lockfile, {
       directDependencies,
-      replaceFileVersion
+      replaceFileVersion: resolvedReplacer,
+      edgesCache: cache?.edges
     }),
     packages: buildPackages(lockfile, {
       componentIdByPkgName,
-      replaceFileVersion
+      replaceFileVersion: resolvedReplacer,
+      packagesCache: cache?.packages
     }),
     pnpmfileChecksum: lockfile.pnpmfileChecksum,
     lockfileSettings: lockfile.settings,
@@ -303,28 +370,40 @@ function _convertLockfileToGraph(lockfile, {
 }
 function buildEdges(lockfile, {
   directDependencies,
-  replaceFileVersion
+  replaceFileVersion,
+  edgesCache
 }) {
   const edges = [];
   for (const [depPath, snapshot] of Object.entries(lockfile.snapshots ?? {})) {
-    const neighbours = extractDependenciesFromSnapshot(snapshot, replaceFileVersion);
-    const replacedDepPath = replaceFileVersion(depPath);
-    const edge = {
-      id: replacedDepPath,
-      neighbours
-    };
-    const pkgId = dp.removeSuffix(replacedDepPath);
-    if (pkgId !== replacedDepPath) {
-      edge.attr = {
-        pkgId
+    const cached = edgesCache?.get(snapshot);
+    let edge;
+    if (cached && cached.depPath === depPath) {
+      edge = cached.edge;
+    } else {
+      const neighbours = extractDependenciesFromSnapshot(snapshot, replaceFileVersion);
+      const replacedDepPath = replaceFileVersion(depPath);
+      const candidate = {
+        id: replacedDepPath,
+        neighbours
       };
-    }
-    if (snapshot.transitivePeerDependencies) {
-      edge.attr = _objectSpread(_objectSpread({}, edge.attr), {}, {
-        transitivePeerDependencies: snapshot.transitivePeerDependencies
+      const pkgId = dp.removeSuffix(replacedDepPath);
+      if (pkgId !== replacedDepPath) {
+        candidate.attr = {
+          pkgId
+        };
+      }
+      if (snapshot.transitivePeerDependencies) {
+        candidate.attr = _objectSpread(_objectSpread({}, candidate.attr), {}, {
+          transitivePeerDependencies: snapshot.transitivePeerDependencies
+        });
+      }
+      edge = candidate.neighbours.length > 0 || candidate.id !== pkgId ? candidate : null;
+      edgesCache?.set(snapshot, {
+        depPath,
+        edge
       });
     }
-    if (edge.neighbours.length > 0 || edge.id !== pkgId) {
+    if (edge) {
       edges.push(edge);
     }
   }
@@ -363,12 +442,18 @@ function extractDependenciesFromSnapshot(snapshot, replaceFileVersion) {
 }
 function buildPackages(lockfile, {
   componentIdByPkgName,
-  replaceFileVersion
+  replaceFileVersion,
+  packagesCache
 }) {
   const depsRequiringBuild = lockfile.bit?.depsRequiringBuild;
   const depsRequiringBuildSet = depsRequiringBuild ? new Set(depsRequiringBuild) : undefined;
   const packages = new Map();
   for (const [pkgId, pkg] of Object.entries(lockfile.packages ?? {})) {
+    const cached = packagesCache?.get(pkg);
+    if (cached && cached.pkgId === pkgId) {
+      packages.set(cached.replacedPkgId, cached.graphPkg);
+      continue;
+    }
     const graphPkg = (0, _lodash().pick)(pkg, ['bundledDependencies', 'cpu', 'deprecated', 'engines', 'hasBin', 'libc', 'name', 'os', 'peerDependencies', 'peerDependenciesMeta', 'resolution', 'version']);
     if (graphPkg.resolution.type === 'directory') {
       delete graphPkg.resolution;
@@ -385,6 +470,11 @@ function buildPackages(lockfile, {
     if (depsRequiringBuildSet?.has(pkgId)) {
       graphPkg.requiresBuild = true;
     }
+    packagesCache?.set(pkg, {
+      pkgId,
+      replacedPkgId,
+      graphPkg
+    });
     packages.set(replacedPkgId, graphPkg);
   }
   return packages;
@@ -451,16 +541,11 @@ function filterLockfileByImporters(lockfile, importerIds, importersOverride) {
   }
   const filteredPackages = {};
   for (const pkgId of reachablePackages) {
-    filteredPackages[pkgId] = _objectSpread({}, lockfile.packages[pkgId]);
+    filteredPackages[pkgId] = lockfile.packages[pkgId];
   }
   const filteredSnapshots = {};
   for (const depPath of reachableSnapshots) {
-    const snapshot = lockfile.snapshots[depPath];
-    filteredSnapshots[depPath] = _objectSpread(_objectSpread(_objectSpread({}, snapshot), snapshot.dependencies ? {
-      dependencies: _objectSpread({}, snapshot.dependencies)
-    } : {}), snapshot.optionalDependencies ? {
-      optionalDependencies: _objectSpread({}, snapshot.optionalDependencies)
-    } : {});
+    filteredSnapshots[depPath] = lockfile.snapshots[depPath];
   }
   const filteredImporters = {};
   for (const importerId of importerIds) {