@teambit/pnpm 1.0.1123 → 1.0.1125

package/dist/pnpm.package-manager.js

@@ -46,30 +46,16 @@ function _lockfile() {
   };
   return data;
 }
-function _modulesYaml() {
-  const data = require("@pnpm/modules-yaml");
-  _modulesYaml = function () {
+function _depsInspection() {
+  const data = require("@pnpm/deps.inspection.tree-builder");
+  _depsInspection = function () {
     return data;
   };
   return data;
 }
-function _reviewing() {
-  const data = require("@pnpm/reviewing.dependencies-hierarchy");
-  _reviewing = function () {
-    return data;
-  };
-  return data;
-}
-function _list() {
-  const data = require("@pnpm/list");
-  _list = function () {
-    return data;
-  };
-  return data;
-}
-function _lockfile2() {
-  const data = require("@pnpm/lockfile.fs");
-  _lockfile2 = function () {
+function _depsInspection2() {
+  const data = require("@pnpm/deps.inspection.list");
+  _depsInspection2 = function () {
     return data;
   };
   return data;
@@ -116,19 +102,29 @@ function _pnpmPruneModules() {
   };
   return data;
 }
-function _lynx() {
-  const data = require("./lynx");
-  _lynx = function () {
-    return data;
-  };
-  return data;
-}
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+let pnpmEsmPromise;
+function loadPnpmEsm() {
+  pnpmEsmPromise ??= (async () => {
+    const {
+      loadEsm
+    } = require('./load-pnpm-esm.cjs');
+    const {
+      lockfileFs,
+      modulesYaml
+    } = await loadEsm();
+    return {
+      lockfileFs,
+      modulesYaml
+    };
+  })();
+  return pnpmEsmPromise;
+}
 class PnpmPackageManager {
   constructor(depResolver, logger, cloud) {
     this.depResolver = depResolver;
@@ -157,31 +153,43 @@ class PnpmPackageManager {
     _defineProperty(this, "readConfig", (0, _lodash().memoize)(this._readConfig));
   }
   async dependenciesGraphToLockfile(dependenciesGraph, opts) {
+    await (0, _lockfileDepsGraphConverter().init)();
     const registries = opts.registries ?? new (_pkgEntities().Registries)(new (_pkgEntities().Registry)('https://node-registry.bit.cloud', false), {});
+    // eslint-disable-next-line global-require, import/no-dynamic-require
+    const {
+      generateResolverAndFetcher
+    } = require('./lynx');
     const {
       resolve
-    } = await (0, _lynx().generateResolverAndFetcher)(_objectSpread(_objectSpread({}, opts), {}, {
+    } = await generateResolverAndFetcher(_objectSpread(_objectSpread({}, opts), {}, {
       registries
     }));
     const graphLockfile = await (0, _lockfileDepsGraphConverter().convertGraphToLockfile)(dependenciesGraph, _objectSpread(_objectSpread({}, opts), {}, {
       resolve
     }));
+    const {
+      lockfileFs: {
+        readWantedLockfile,
+        writeLockfileFile,
+        convertToLockfileFile: convertLockfileObjectToLockfileFile
+      }
+    } = await loadPnpmEsm();
     // Merge the graph-derived subset into any existing wanted lockfile rather than
     // overwriting. Only the importers, packages, and snapshots referenced by the
     // imported components' subgraph are re-stated here; every other workspace dep's
     // locked version must be preserved so pnpm doesn't re-resolve it to a newer
     // registry version.
-    const existingLockfile = await (0, _lockfile2().readWantedLockfile)(opts.rootDir, {
+    const existingLockfile = await readWantedLockfile(opts.rootDir, {
       ignoreIncompatible: true
     });
-    const mergedLockfile = existingLockfile ? mergeGraphLockfileIntoExisting((0, _lockfile2().convertToLockfileFile)(existingLockfile), graphLockfile) : graphLockfile;
+    const mergedLockfile = existingLockfile ? mergeGraphLockfileIntoExisting(convertLockfileObjectToLockfileFile(existingLockfile), graphLockfile) : graphLockfile;
     Object.assign(mergedLockfile, {
       bit: _objectSpread(_objectSpread({}, mergedLockfile.bit), {}, {
         restoredFromModel: true
       })
     });
     const lockfilePath = (0, _path().join)(opts.rootDir, 'pnpm-lock.yaml');
-    await (0, _lockfile2().writeLockfileFile)(lockfilePath, mergedLockfile);
+    await writeLockfileFile(lockfilePath, mergedLockfile);
     this.logger.debug(`generated a lockfile from dependencies graph at ${lockfilePath}`);
     if (process.env.DEPS_GRAPH_LOG) {
       // eslint-disable-next-line no-console
@@ -239,6 +247,7 @@ class PnpmPackageManager {
       });
     }
     this.modulesManifestCache.delete(rootDir);
+    const hoistPattern = resolveHoistPattern(installOptions.hoistPatterns, config.hoistPattern);
     const {
       dependenciesChanged,
       rebuild,
@@ -263,7 +272,7 @@ class PnpmPackageManager {
       dedupeInjectedDeps: installOptions.dedupeInjectedDeps ?? false,
       dryRun: installOptions.dependenciesGraph == null && installOptions.dryRun,
       overrides: installOptions.overrides,
-      hoistPattern: installOptions.hoistPatterns ?? config.hoistPattern,
+      hoistPattern,
       publicHoistPattern: config.shamefullyHoist ? ['*'] : ['@eslint/plugin-*', '*eslint-plugin*', '@prettier/plugin-*', '*prettier-plugin-*'],
       hoistWorkspacePackages: installOptions.hoistWorkspacePackages ?? false,
       hoistInjectedDependencies: installOptions.hoistInjectedDependencies,
@@ -358,35 +367,44 @@ class PnpmPackageManager {
     const {
       config
     } = await this.readConfig();
-    const configuredUserAgent = config.rawConfig['user-agent'];
+    const configuredUserAgent = config.userAgent;
     if (!configuredUserAgent && !this.username) {
       this.username = (await this.cloud.getCurrentUser())?.username ?? 'anonymous';
     }
-    // We need to use config.rawConfig as it will only contain the settings defined by the user.
-    // config contains default values of the settings when they are not defined by the user.
     const result = {
       userAgent: configuredUserAgent ?? `bit user/${this.username}`
     };
-    if (config.rawConfig['max-sockets'] != null) {
-      result.maxSockets = config.rawConfig['max-sockets'];
+    // The resolved config carries the engine's defaults for the numeric
+    // network settings, and anything returned here overrides Bit's global
+    // network config in the dependency resolver's merge — so only settings
+    // the user explicitly configured may pass through. `explicitSettings`
+    // ships in @pnpm/napi > 12.0.0-beta.2; on older engines nothing is
+    // forwarded and the engine still honors `.npmrc` itself.
+    const explicitSettings = new Set(config.explicitSettings ?? []);
+    if (config.maxSockets != null && explicitSettings.has('maxSockets')) {
+      result.maxSockets = config.maxSockets;
     }
-    if (config.rawConfig['network-concurrency'] != null) {
-      result.networkConcurrency = config.rawConfig['network-concurrency'];
+    if (config.networkConcurrency != null && explicitSettings.has('networkConcurrency')) {
+      result.networkConcurrency = config.networkConcurrency;
     }
-    if (config.rawConfig['fetch-retries'] != null) {
-      result.fetchRetries = config.rawConfig['fetch-retries'];
+    if (config.fetchRetries != null && explicitSettings.has('fetchRetries')) {
+      result.fetchRetries = config.fetchRetries;
     }
-    if (config.rawConfig['fetch-timeout'] != null) {
-      result.fetchTimeout = config.rawConfig['fetch-timeout'];
+    if (config.fetchTimeout != null && explicitSettings.has('fetchTimeout')) {
+      result.fetchTimeout = config.fetchTimeout;
     }
-    if (config.rawConfig['fetch-retry-maxtimeout'] != null) {
-      result.fetchRetryMaxtimeout = config.rawConfig['fetch-retry-maxtimeout'];
+    if (config.fetchRetryMaxtimeout != null && explicitSettings.has('fetchRetryMaxtimeout')) {
+      result.fetchRetryMaxtimeout = config.fetchRetryMaxtimeout;
     }
-    if (config.rawConfig['fetch-retry-mintimeout'] != null) {
-      result.fetchRetryMintimeout = config.rawConfig['fetch-retry-mintimeout'];
+    if (config.fetchRetryMintimeout != null && explicitSettings.has('fetchRetryMintimeout')) {
+      result.fetchRetryMintimeout = config.fetchRetryMintimeout;
     }
-    if (config.rawConfig['strict-ssl'] != null) {
-      result.strictSSL = config.rawConfig['strict-ssl'];
+    // Unlike the numeric settings above, strictSsl/ca/cert/key are optional
+    // in the engine's projection and populated only when explicitly
+    // configured (the engine applies its own defaults at client-build
+    // time), so presence is already the explicit gate.
+    if (config.strictSsl != null) {
+      result.strictSSL = config.strictSsl;
     }
     if (config.ca != null) {
       result.ca = config.ca;
@@ -432,7 +450,12 @@ class PnpmPackageManager {
     if (this.modulesManifestCache.has(lockfileDir)) {
       return this.modulesManifestCache.get(lockfileDir);
     }
-    const modulesManifest = await (0, _modulesYaml().readModulesManifest)((0, _path().join)(lockfileDir, 'node_modules'));
+    const {
+      modulesYaml: {
+        readModulesManifest
+      }
+    } = await loadPnpmEsm();
+    const modulesManifest = await readModulesManifest((0, _path().join)(lockfileDir, 'node_modules'));
     if (modulesManifest) {
       this.modulesManifestCache.set(lockfileDir, modulesManifest);
     }
@@ -445,7 +468,12 @@ class PnpmPackageManager {
     return (0, _pnpmPruneModules().pnpmPruneModules)(rootDir);
   }
   async findUsages(depName, opts) {
-    const lockfile = await (0, _lockfile2().readWantedLockfile)(opts.lockfileDir, {
+    const {
+      lockfileFs: {
+        readWantedLockfile
+      }
+    } = await loadPnpmEsm();
+    const lockfile = await readWantedLockfile(opts.lockfileDir, {
       ignoreIncompatible: false
     });
     if (!lockfile) return '';
@@ -459,7 +487,7 @@ class PnpmPackageManager {
         version: pkgJson?.version ?? ''
       });
     }
-    const trees = await (0, _reviewing().buildDependentsTree)([depName], projectPaths, {
+    const trees = await (0, _depsInspection().buildDependentsTree)([depName], projectPaths, {
       include: {
         dependencies: true,
         devDependencies: true,
@@ -484,7 +512,7 @@ class PnpmPackageManager {
         return manifest.name;
       }
     });
-    return (0, _list().renderDependentsTree)(trees, {
+    return (0, _depsInspection2().renderDependentsTree)(trees, {
       depth: opts.depth ?? Infinity,
       long: false
     });
@@ -494,7 +522,14 @@ class PnpmPackageManager {
    * Calculating the dependencies graph of a given component using the lockfile.
    */
   async calcDependenciesGraph(opts) {
-    const originalLockfile = await (0, _lockfile2().readWantedLockfile)(opts.rootDir, {
+    await (0, _lockfileDepsGraphConverter().init)();
+    const {
+      lockfileFs: {
+        readWantedLockfile,
+        convertToLockfileFile: convertLockfileObjectToLockfileFile
+      }
+    } = await loadPnpmEsm();
+    const originalLockfile = await readWantedLockfile(opts.rootDir, {
       ignoreIncompatible: false
     });
     if (!originalLockfile) {
@@ -532,16 +567,27 @@ class PnpmPackageManager {
         importers: _objectSpread(_objectSpread({}, originalLockfile.importers), clonedImporters)
       });
       for (const importerId of filterByImporterIds) {
-        for (const depType of ['dependencies', 'devDependencies', 'optionalDependencies', 'specifiers', 'dependenciesMeta']) {
-          for (const workspacePkgName of opts.componentIdByPkgName.keys()) {
-            if (workspacePkgName !== pkgName) {
-              delete lockfile.importers[importerId]?.[depType]?.[workspacePkgName];
-            }
+        const importer = lockfile.importers[importerId];
+        if (importer == null) continue;
+        for (const workspacePkgName of opts.componentIdByPkgName.keys()) {
+          if (workspacePkgName === pkgName) continue;
+          // In the component's own importer, an injected sibling (a "file:"
+          // ref) is a real direct dependency of this component — the graph
+          // converter rewrites it to the component's semver id. Entries in
+          // any other importer (e.g. the capsule/workspace root) merely
+          // wire the workspace together and must not leak into this
+          // component's graph.
+          if (importerId === componentImporterId) {
+            const ref = importer.dependencies?.[workspacePkgName] ?? importer.devDependencies?.[workspacePkgName] ?? importer.optionalDependencies?.[workspacePkgName];
+            if (typeof ref === 'string' && ref.startsWith('file:')) continue;
+          }
+          for (const depType of ['dependencies', 'devDependencies', 'optionalDependencies', 'specifiers', 'dependenciesMeta']) {
+            delete importer[depType]?.[workspacePkgName];
           }
         }
       }
       // Filters the lockfile so that it only includes packages related to the given component.
-      const partialLockfile = (0, _lockfile2().convertToLockfileFile)((0, _lockfile().filterLockfileByImporters)(lockfile, filterByImporterIds, {
+      const partialLockfile = convertLockfileObjectToLockfileFile((0, _lockfile().filterLockfileByImporters)(lockfile, filterByImporterIds, {
         include: {
           dependencies: true,
           devDependencies: true,
@@ -560,6 +606,16 @@ class PnpmPackageManager {
   }
 }
 exports.PnpmPackageManager = PnpmPackageManager;
+function resolveHoistPattern(hoistPatternsFromBitConfig, hoistPatternFromPnpmConfig) {
+  if (hoistPatternsFromBitConfig == null) return hoistPatternFromPnpmConfig ?? ['*'];
+  if (isDefaultHoistPattern(hoistPatternsFromBitConfig) && hoistPatternFromPnpmConfig && !isDefaultHoistPattern(hoistPatternFromPnpmConfig)) {
+    return hoistPatternFromPnpmConfig;
+  }
+  return hoistPatternsFromBitConfig;
+}
+function isDefaultHoistPattern(hoistPattern) {
+  return hoistPattern.length === 1 && hoistPattern[0] === '*';
+}
 function tryReadPackageJson(pkgDir) {
   try {
     return JSON.parse(_fs().default.readFileSync((0, _path().join)(pkgDir, 'package.json'), 'utf8'));
@@ -611,6 +667,7 @@ function mergeGraphLockfileIntoExisting(existing, graph) {
       depsRequiringBuild: mergedDepsRequiringBuild
     });
   }
+  pruneUnreachableLockfileEntries(merged);
   return merged;
 }
 function mergeEntryRecords(existing, graph) {
@@ -623,5 +680,56 @@ function mergeEntryRecords(existing, graph) {
   }
   return merged;
 }
+function pruneUnreachableLockfileEntries(lockfile) {
+  const reachablePackages = new Set();
+  const reachableSnapshots = new Set();
+  // An explicit stack: deep dependency chains would overflow the call
+  // stack with a recursive walk.
+  const stack = [];
+  const visit = depPath => {
+    stack.push(depPath);
+    while (stack.length > 0) {
+      const current = stack.pop();
+      if (reachableSnapshots.has(current)) continue;
+      reachableSnapshots.add(current);
+      reachablePackages.add(removePeerSuffix(current));
+      const snapshot = lockfile.snapshots?.[current];
+      if (!snapshot) continue;
+      for (const depType of ['dependencies', 'optionalDependencies']) {
+        for (const [name, ref] of Object.entries(snapshot[depType] ?? {})) {
+          if (ref.startsWith('link:') || ref.startsWith('file:')) continue;
+          stack.push(`${name}@${ref}`);
+        }
+      }
+    }
+  };
+  for (const importer of Object.values(lockfile.importers ?? {})) {
+    for (const depType of ['dependencies', 'devDependencies', 'optionalDependencies']) {
+      for (const [name, dep] of Object.entries(importer[depType] ?? {})) {
+        const version = typeof dep === 'string' ? dep : dep.version;
+        if (!version || version.startsWith('link:') || version.startsWith('file:')) continue;
+        visit(`${name}@${version}`);
+      }
+    }
+  }
+  for (const pkgId of Object.keys(lockfile.packages ?? {})) {
+    if (!reachablePackages.has(pkgId)) {
+      delete lockfile.packages[pkgId];
+    }
+  }
+  for (const depPath of Object.keys(lockfile.snapshots ?? {})) {
+    if (!reachableSnapshots.has(depPath)) {
+      delete lockfile.snapshots[depPath];
+    }
+  }
+  const bitAttrs = lockfile.bit;
+  if (bitAttrs?.depsRequiringBuild) {
+    bitAttrs.depsRequiringBuild = bitAttrs.depsRequiringBuild.filter(depPath => reachablePackages.has(removePeerSuffix(depPath)));
+  }
+}
+function removePeerSuffix(depPath) {
+  const suffixStart = depPath.indexOf('(');
+  return suffixStart === -1 ? depPath : depPath.slice(0, suffixStart);
+}
 
 //# sourceMappingURL=pnpm.package-manager.js.map