@teambit/pnpm 1.0.1124 → 1.0.1126

package/.npmignore

@@ -0,0 +1,18 @@
+dist/tsconfig.tsbuildinfo
+dist/tsconfig.json
+/tsconfig.json
+
+package-tar/
+.bit-capsule-ready
+/*.ts
+artifacts/*
+!artifacts/env-template
+!artifacts/ui-bundle
+!artifacts/preview-bundle
+package-tar/
+.bit-capsule-ready
+/*.ts
+artifacts/*
+!artifacts/env-template
+!artifacts/ui-bundle
+!artifacts/preview-bundle

package/dist/get-proxy-config.d.ts

@@ -1,8 +1,3 @@
 import type { PackageManagerProxyConfig } from '@teambit/dependency-resolver';
-import type { Config } from '@pnpm/config';
-export declare function getProxyConfig(config: Config): PackageManagerProxyConfig;
-export type ProxyConfig = {
-    httpProxy?: string;
-    httpsProxy?: string;
-    noProxy?: boolean | string;
-};
+import type { ResolvedConfig } from '@pnpm/napi';
+export declare function getProxyConfig(config: ResolvedConfig): PackageManagerProxyConfig;

package/dist/get-proxy-config.js

@@ -5,14 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.getProxyConfig = getProxyConfig;
 function getProxyConfig(config) {
-  const httpProxy = config.httpProxy;
-  const httpsProxy = config.httpsProxy || httpProxy;
-  const proxyConfig = {
-    httpProxy,
-    httpsProxy,
-    noProxy: config.rawConfig.noproxy
+  return {
+    httpProxy: config.httpProxy,
+    httpsProxy: config.httpsProxy ?? config.httpProxy,
+    noProxy: config.noProxy
   };
-  return proxyConfig;
 }
 
 //# sourceMappingURL=get-proxy-config.js.map

package/dist/get-proxy-config.js.map

@@ -1 +1 @@
-{"version":3,"names":["getProxyConfig","config","httpProxy","httpsProxy","proxyConfig","noProxy","rawConfig","noproxy"],"sources":["get-proxy-config.ts"],"sourcesContent":["import type { PackageManagerProxyConfig } from '@teambit/dependency-resolver';\nimport type { Config } from '@pnpm/config';\n\nexport function getProxyConfig(config: Config): PackageManagerProxyConfig {\n  const httpProxy = config.httpProxy;\n  const httpsProxy = config.httpsProxy || httpProxy;\n  const proxyConfig: PackageManagerProxyConfig = {\n    httpProxy,\n    httpsProxy,\n    noProxy: config.rawConfig.noproxy,\n  };\n  return proxyConfig;\n}\n\nexport type ProxyConfig = {\n  httpProxy?: string;\n  httpsProxy?: string;\n  noProxy?: boolean | string;\n};\n"],"mappings":";;;;;;AAGO,SAASA,cAAcA,CAACC,MAAc,EAA6B;EACxE,MAAMC,SAAS,GAAGD,MAAM,CAACC,SAAS;EAClC,MAAMC,UAAU,GAAGF,MAAM,CAACE,UAAU,IAAID,SAAS;EACjD,MAAME,WAAsC,GAAG;IAC7CF,SAAS;IACTC,UAAU;IACVE,OAAO,EAAEJ,MAAM,CAACK,SAAS,CAACC;EAC5B,CAAC;EACD,OAAOH,WAAW;AACpB","ignoreList":[]}
+{"version":3,"names":["getProxyConfig","config","httpProxy","httpsProxy","noProxy"],"sources":["get-proxy-config.ts"],"sourcesContent":["import type { PackageManagerProxyConfig } from '@teambit/dependency-resolver';\nimport type { ResolvedConfig } from '@pnpm/napi';\n\nexport function getProxyConfig(config: ResolvedConfig): PackageManagerProxyConfig {\n  return {\n    httpProxy: config.httpProxy,\n    httpsProxy: config.httpsProxy ?? config.httpProxy,\n    noProxy: config.noProxy,\n  };\n}\n"],"mappings":";;;;;;AAGO,SAASA,cAAcA,CAACC,MAAsB,EAA6B;EAChF,OAAO;IACLC,SAAS,EAAED,MAAM,CAACC,SAAS;IAC3BC,UAAU,EAAEF,MAAM,CAACE,UAAU,IAAIF,MAAM,CAACC,SAAS;IACjDE,OAAO,EAAEH,MAAM,CAACG;EAClB,CAAC;AACH","ignoreList":[]}

package/dist/get-registries.d.ts

@@ -1,3 +1,3 @@
 import type { RegistriesMap } from '@teambit/dependency-resolver';
-import type { Config } from '@pnpm/config';
-export declare function getRegistries(config: Config): RegistriesMap;
+import type { ResolvedConfig } from '@pnpm/napi';
+export declare function getRegistries(config: ResolvedConfig): RegistriesMap;

package/dist/get-registries.js

@@ -4,35 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.getRegistries = getRegistries;
-function _credentialsByUri() {
-  const data = _interopRequireDefault(require("credentials-by-uri"));
-  _credentialsByUri = function () {
-    return data;
-  };
-  return data;
-}
-function _toolboxString() {
-  const data = require("@teambit/toolbox.string.strip-trailing-char");
-  _toolboxString = function () {
-    return data;
-  };
-  return data;
-}
-function _lodash() {
-  const data = require("lodash");
-  _lodash = function () {
-    return data;
-  };
-  return data;
-}
-function _nerfDart() {
-  const data = _interopRequireDefault(require("nerf-dart"));
-  _nerfDart = 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; }
@@ -40,71 +11,36 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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); }
 function getRegistries(config) {
   const registriesMap = {};
-  Object.keys(config.registries).forEach(regName => {
-    const uri = config.registries[regName];
-    let credentials = (0, _credentialsByUri().default)(config.rawConfig, uri);
-    let originalAuthConfig = getOriginalAuthConfigByUri(config.rawConfig, uri);
-    if ((0, _lodash().isEmpty)(credentials)) {
-      credentials = (0, _credentialsByUri().default)(config.rawConfig, switchTrailingSlash(uri));
-      originalAuthConfig = getOriginalAuthConfigByUri(config.rawConfig, switchTrailingSlash(uri));
-    }
-    registriesMap[regName] = _objectSpread({
-      uri,
-      alwaysAuth: !!credentials.alwaysAuth,
-      authHeaderValue: credentials.authHeaderValue
-    }, originalAuthConfig);
-  });
+  for (const {
+    name,
+    url,
+    authHeader
+  } of config.registries) {
+    registriesMap[name] = _objectSpread({
+      uri: url,
+      alwaysAuth: !!authHeader,
+      authHeaderValue: authHeader
+    }, originalAuthFromHeader(authHeader));
+  }
   return registriesMap;
 }
 
-// based on https://github.com/pnpm/credentials-by-uri/blob/master/index.js
-function getOriginalAuthConfigByUri(config, uri) {
-  const nerfed = (0, _nerfDart().default)(uri);
-  const defnerf = (0, _nerfDart().default)(config.registry);
-  const creds = getScopedCredentials(nerfed, `${nerfed}:`, config);
-  if (nerfed !== defnerf) return creds;
-  const defaultCredentials = getScopedCredentials(nerfed, '', config);
-  return {
-    originalAuthType: creds.originalAuthType || defaultCredentials.originalAuthType,
-    originalAuthValue: creds.originalAuthValue || defaultCredentials.originalAuthValue
-  };
-}
-function getScopedCredentials(nerfed, scope, config) {
-  const token = config[`${scope}_authToken`];
-  // Check for bearer token
-  if (token) {
-    return {
-      originalAuthType: `authToken`,
-      originalAuthValue: token
-    };
-  }
-  const auth = config[`${scope}_auth`];
-
-  // Check for basic auth token
-  if (auth) {
+/**
+ * Reconstruct the npmrc-style credential a header came from, for consumers
+ * that regenerate `.npmrc` entries from Bit's registry model: `Bearer` is an
+ * `_authToken` credential and `Basic` an `_auth` (base64 `user:password`) one.
+ */
+function originalAuthFromHeader(authHeader) {
+  if (authHeader?.startsWith('Bearer ')) {
     return {
-      originalAuthType: `auth`,
-      originalAuthValue: auth
+      originalAuthType: 'authToken',
+      originalAuthValue: authHeader.slice('Bearer '.length)
     };
   }
-
-  // Check for username/password auth
-  let username;
-  let password;
-  if (config[`${scope}username`]) {
-    username = config[`${scope}username`];
-  }
-  if (config[`${scope}_password`]) {
-    if (scope === '') {
-      password = config[`${scope}_password`];
-    } else {
-      password = Buffer.from(config[`${scope}_password`], 'base64').toString('utf8');
-    }
-  }
-  if (username && password) {
+  if (authHeader?.startsWith('Basic ')) {
     return {
-      originalAuthType: `auth`,
-      originalAuthValue: Buffer.from(`${username}:${password}`).toString('base64')
+      originalAuthType: 'auth',
+      originalAuthValue: authHeader.slice('Basic '.length)
     };
   }
   return {
@@ -112,11 +48,5 @@ function getScopedCredentials(nerfed, scope, config) {
     originalAuthValue: ''
   };
 }
-function switchTrailingSlash(uri) {
-  if (!uri.endsWith('/')) {
-    return `${uri}/`;
-  }
-  return (0, _toolboxString().stripTrailingChar)(uri, '/');
-}
 
 //# sourceMappingURL=get-registries.js.map

package/dist/get-registries.js.map

@@ -1 +1 @@
-{"version":3,"names":["_credentialsByUri","data","_interopRequireDefault","require","_toolboxString","_lodash","_nerfDart","e","__esModule","default","ownKeys","r","t","Object","keys","getOwnPropertySymbols","o","filter","getOwnPropertyDescriptor","enumerable","push","apply","_objectSpread","arguments","length","forEach","_defineProperty","getOwnPropertyDescriptors","defineProperties","defineProperty","_toPropertyKey","value","configurable","writable","i","_toPrimitive","Symbol","toPrimitive","call","TypeError","String","Number","getRegistries","config","registriesMap","registries","regName","uri","credentials","getCredentialsByURI","rawConfig","originalAuthConfig","getOriginalAuthConfigByUri","isEmpty","switchTrailingSlash","alwaysAuth","authHeaderValue","nerfed","toNerfDart","defnerf","registry","creds","getScopedCredentials","defaultCredentials","originalAuthType","originalAuthValue","scope","token","auth","username","password","Buffer","from","toString","endsWith","stripTrailingChar"],"sources":["get-registries.ts"],"sourcesContent":["import getCredentialsByURI from 'credentials-by-uri';\nimport type { RegistriesMap } from '@teambit/dependency-resolver';\nimport { stripTrailingChar } from '@teambit/toolbox.string.strip-trailing-char';\nimport type { Config } from '@pnpm/config';\nimport { isEmpty } from 'lodash';\nimport toNerfDart from 'nerf-dart';\n\ntype OriginalAuthConfig = {\n  originalAuthType: string;\n  originalAuthValue: string;\n};\n\nexport function getRegistries(config: Config): RegistriesMap {\n  const registriesMap: RegistriesMap = {};\n\n  Object.keys(config.registries).forEach((regName) => {\n    const uri = config.registries[regName];\n    let credentials = getCredentialsByURI(config.rawConfig, uri);\n    let originalAuthConfig = getOriginalAuthConfigByUri(config.rawConfig, uri);\n    if (isEmpty(credentials)) {\n      credentials = getCredentialsByURI(config.rawConfig, switchTrailingSlash(uri));\n      originalAuthConfig = getOriginalAuthConfigByUri(config.rawConfig, switchTrailingSlash(uri));\n    }\n    registriesMap[regName] = {\n      uri,\n      alwaysAuth: !!credentials.alwaysAuth,\n      authHeaderValue: credentials.authHeaderValue,\n      ...originalAuthConfig,\n    };\n  });\n  return registriesMap;\n}\n\n// based on https://github.com/pnpm/credentials-by-uri/blob/master/index.js\nfunction getOriginalAuthConfigByUri(config: Record<string, any>, uri: string): OriginalAuthConfig {\n  const nerfed = toNerfDart(uri);\n  const defnerf = toNerfDart(config.registry);\n\n  const creds = getScopedCredentials(nerfed, `${nerfed}:`, config);\n  if (nerfed !== defnerf) return creds;\n  const defaultCredentials = getScopedCredentials(nerfed, '', config);\n  return {\n    originalAuthType: creds.originalAuthType || defaultCredentials.originalAuthType,\n    originalAuthValue: creds.originalAuthValue || defaultCredentials.originalAuthValue,\n  };\n}\n\nfunction getScopedCredentials(nerfed: string, scope: string, config: Record<string, any>): OriginalAuthConfig {\n  const token = config[`${scope}_authToken`];\n  // Check for bearer token\n  if (token) {\n    return {\n      originalAuthType: `authToken`,\n      originalAuthValue: token,\n    };\n  }\n\n  const auth = config[`${scope}_auth`];\n\n  // Check for basic auth token\n  if (auth) {\n    return {\n      originalAuthType: `auth`,\n      originalAuthValue: auth,\n    };\n  }\n\n  // Check for username/password auth\n  let username;\n  let password;\n  if (config[`${scope}username`]) {\n    username = config[`${scope}username`];\n  }\n  if (config[`${scope}_password`]) {\n    if (scope === '') {\n      password = config[`${scope}_password`];\n    } else {\n      password = Buffer.from(config[`${scope}_password`], 'base64').toString('utf8');\n    }\n  }\n\n  if (username && password) {\n    return {\n      originalAuthType: `auth`,\n      originalAuthValue: Buffer.from(`${username}:${password}`).toString('base64'),\n    };\n  }\n\n  return {\n    originalAuthType: '',\n    originalAuthValue: '',\n  };\n}\n\nfunction switchTrailingSlash(uri: string): string {\n  if (!uri.endsWith('/')) {\n    return `${uri}/`;\n  }\n  return stripTrailingChar(uri, '/');\n}\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["getRegistries","config","registriesMap","name","url","authHeader","registries","_objectSpread","uri","alwaysAuth","authHeaderValue","originalAuthFromHeader","startsWith","originalAuthType","originalAuthValue","slice","length"],"sources":["get-registries.ts"],"sourcesContent":["import type { RegistriesMap } from '@teambit/dependency-resolver';\nimport type { ResolvedConfig } from '@pnpm/napi';\n\nexport function getRegistries(config: ResolvedConfig): RegistriesMap {\n  const registriesMap: RegistriesMap = {};\n  for (const { name, url, authHeader } of config.registries) {\n    registriesMap[name] = {\n      uri: url,\n      alwaysAuth: !!authHeader,\n      authHeaderValue: authHeader,\n      ...originalAuthFromHeader(authHeader),\n    };\n  }\n  return registriesMap;\n}\n\n/**\n * Reconstruct the npmrc-style credential a header came from, for consumers\n * that regenerate `.npmrc` entries from Bit's registry model: `Bearer` is an\n * `_authToken` credential and `Basic` an `_auth` (base64 `user:password`) one.\n */\nfunction originalAuthFromHeader(authHeader: string | undefined): {\n  originalAuthType: string;\n  originalAuthValue: string;\n} {\n  if (authHeader?.startsWith('Bearer ')) {\n    return { originalAuthType: 'authToken', originalAuthValue: authHeader.slice('Bearer '.length) };\n  }\n  if (authHeader?.startsWith('Basic ')) {\n    return { originalAuthType: 'auth', originalAuthValue: authHeader.slice('Basic '.length) };\n  }\n  return { originalAuthType: '', originalAuthValue: '' };\n}\n"],"mappings":";;;;;;;;;;;AAGO,SAASA,aAAaA,CAACC,MAAsB,EAAiB;EACnE,MAAMC,aAA4B,GAAG,CAAC,CAAC;EACvC,KAAK,MAAM;IAAEC,IAAI;IAAEC,GAAG;IAAEC;EAAW,CAAC,IAAIJ,MAAM,CAACK,UAAU,EAAE;IACzDJ,aAAa,CAACC,IAAI,CAAC,GAAAI,aAAA;MACjBC,GAAG,EAAEJ,GAAG;MACRK,UAAU,EAAE,CAAC,CAACJ,UAAU;MACxBK,eAAe,EAAEL;IAAU,GACxBM,sBAAsB,CAACN,UAAU,CAAC,CACtC;EACH;EACA,OAAOH,aAAa;AACtB;;AAEA;AACA;AACA;AACA;AACA;AACA,SAASS,sBAAsBA,CAACN,UAA8B,EAG5D;EACA,IAAIA,UAAU,EAAEO,UAAU,CAAC,SAAS,CAAC,EAAE;IACrC,OAAO;MAAEC,gBAAgB,EAAE,WAAW;MAAEC,iBAAiB,EAAET,UAAU,CAACU,KAAK,CAAC,SAAS,CAACC,MAAM;IAAE,CAAC;EACjG;EACA,IAAIX,UAAU,EAAEO,UAAU,CAAC,QAAQ,CAAC,EAAE;IACpC,OAAO;MAAEC,gBAAgB,EAAE,MAAM;MAAEC,iBAAiB,EAAET,UAAU,CAACU,KAAK,CAAC,QAAQ,CAACC,MAAM;IAAE,CAAC;EAC3F;EACA,OAAO;IAAEH,gBAAgB,EAAE,EAAE;IAAEC,iBAAiB,EAAE;EAAG,CAAC;AACxD","ignoreList":[]}

package/dist/load-pnpm-esm.cjs

@@ -0,0 +1,19 @@
+'use strict';
+
+// Native CJS so Babel's modules-commonjs transform leaves the import() alone.
+// @pnpm/deps.path, @pnpm/lockfile.fs, and @pnpm/installing.modules-yaml are
+// ESM-only and must go through Node's ESM loader.
+let esmPromise;
+exports.loadEsm = async () => {
+  esmPromise ??= Promise.all([
+    import('@pnpm/deps.path'),
+    import('@pnpm/lockfile.fs'),
+    import('@pnpm/installing.modules-yaml'),
+  ]).then(([dp, lockfileFs, modulesYaml]) => ({
+    dp,
+    lockfileFs,
+    modulesYaml,
+    getLockfileImporterId: lockfileFs.getLockfileImporterId,
+  }));
+  return esmPromise;
+};

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

@@ -1,11 +1,27 @@
 import { type ProjectManifest } from '@pnpm/types';
-import { type ResolveFunction } from '@pnpm/client';
 import { DependenciesGraph } from '@teambit/objects';
 import { type CalcDepsGraphOptions, type CalcDepsGraphForComponentOptions } from '@teambit/dependency-resolver';
 import { type BitLockfileFile } from './lynx';
+/**
+ * Minimal structural signature of the `resolve` function returned by
+ * `generateResolverAndFetcher` in `./lynx` (backed by `@pnpm/napi`'s
+ * `resolveDependency`). Only the parts this module consumes are typed.
+ */
+type ResolveFunction = (wantedDependency: {
+    alias?: string;
+    bareSpecifier?: string;
+}, opts: {
+    lockfileDir?: string;
+    projectDir?: string;
+    preferredVersions?: Record<string, unknown>;
+}) => Promise<{
+    resolution?: Record<string, unknown>;
+}>;
+export declare function init(): Promise<void>;
 export declare function convertLockfileToGraph(lockfile: BitLockfileFile, { pkgName, componentRootDir, componentRelativeDir, componentIdByPkgName, }: Omit<CalcDepsGraphOptions & CalcDepsGraphForComponentOptions, 'rootDir' | 'components' | 'component'>): DependenciesGraph;
 export declare function convertGraphToLockfile(_graph: DependenciesGraph, { manifests, rootDir, resolve, }: {
     manifests: Record<string, ProjectManifest>;
     rootDir: string;
     resolve: ResolveFunction;
 }): Promise<BitLockfileFile>;
+export {};

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

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.convertGraphToLockfile = convertGraphToLockfile;
 exports.convertLockfileToGraph = convertLockfileToGraph;
+exports.init = init;
 function _path() {
   const data = _interopRequireDefault(require("path"));
   _path = function () {
@@ -12,13 +13,6 @@ function _path() {
   };
   return data;
 }
-function dp() {
-  const data = _interopRequireWildcard(require("@pnpm/dependency-path"));
-  dp = function () {
-    return data;
-  };
-  return data;
-}
 function _lodash() {
   const data = require("lodash");
   _lodash = function () {
@@ -47,13 +41,6 @@ function _objects() {
   };
   return data;
 }
-function _lockfile() {
-  const data = require("@pnpm/lockfile.fs");
-  _lockfile = function () {
-    return data;
-  };
-  return data;
-}
 function _normalizePath() {
   const data = _interopRequireDefault(require("normalize-path"));
   _normalizePath = function () {
@@ -61,13 +48,41 @@ function _normalizePath() {
   };
   return data;
 }
-function _interopRequireWildcard(e, t) { if ("function" == typeof WeakMap) var r = new WeakMap(), n = new WeakMap(); return (_interopRequireWildcard = function (e, t) { if (!t && e && e.__esModule) return e; var o, i, f = { __proto__: null, default: e }; if (null === e || "object" != typeof e && "function" != typeof e) return f; if (o = t ? n : r) { if (o.has(e)) return o.get(e); o.set(e, f); } for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]); return f; })(e, t); }
 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); }
+/**
+ * Minimal structural signature of the `resolve` function returned by
+ * `generateResolverAndFetcher` in `./lynx` (backed by `@pnpm/napi`'s
+ * `resolveDependency`). Only the parts this module consumes are typed.
+ */
+
+// @pnpm/deps.path and @pnpm/lockfile.fs are ESM-only; load them through a .cjs
+// shim so the require() chain in the build capsule's mocha runner doesn't trip
+// on the transitive ESM import. Call `init()` once before invoking the public
+// converters; helpers reach for these module-level slots synchronously.
+let dp;
+let getLockfileImporterId;
+let loading;
+function ensureInitialized() {
+  if (!dp || !getLockfileImporterId) {
+    throw new Error('lockfile-deps-graph-converter: await init() before calling the converters');
+  }
+}
+function init() {
+  loading ??= (async () => {
+    const {
+      loadEsm
+    } = require('./load-pnpm-esm.cjs');
+    const m = await loadEsm();
+    dp = m.dp;
+    getLockfileImporterId = m.getLockfileImporterId;
+  })();
+  return loading;
+}
 function convertLockfileToGraphFromCapsule(lockfile, {
   componentRelativeDir,
   componentIdByPkgName
@@ -92,7 +107,10 @@ function importerDepsToNeighbours(importerDependencies, lifecycle, optional) {
     version,
     specifier
   }] of Object.entries(importerDependencies)) {
-    const id = dp().refToRelative(version, name);
+    // `refToRelative` yields null for non-registry refs (`link:` and
+    // friends) — those are workspace wiring, not graph nodes.
+    const id = dp.refToRelative(version, name);
+    if (id == null) continue;
     neighbours.push({
       name,
       specifier,
@@ -109,6 +127,7 @@ function convertLockfileToGraph(lockfile, {
   componentRelativeDir,
   componentIdByPkgName
 }) {
+  ensureInitialized();
   if (componentRootDir == null || pkgName == null) {
     return convertLockfileToGraphFromCapsule(lockfile, {
       componentRelativeDir,
@@ -125,7 +144,8 @@ function convertLockfileToGraph(lockfile, {
   for (const depType of ['dependencies', 'optionalDependencies']) {
     const optional = depType === 'optionalDependencies';
     for (const [name, version] of Object.entries(lockedPkg[depType] ?? {})) {
-      const id = dp().refToRelative(version, name);
+      const id = dp.refToRelative(version, name);
+      if (id == null) continue;
       directDependencies.push({
         name,
         specifier: componentDevImporter[depType]?.[name]?.specifier ?? '*',
@@ -136,7 +156,7 @@ function convertLockfileToGraph(lockfile, {
     }
   }
   delete lockfile.snapshots[lockedPkgDepPath];
-  delete lockfile.packages[dp().removeSuffix(lockedPkgDepPath)];
+  delete lockfile.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
@@ -188,7 +208,7 @@ function buildEdges(lockfile, {
       id: replacedDepPath,
       neighbours
     };
-    const pkgId = dp().removeSuffix(replacedDepPath);
+    const pkgId = dp.removeSuffix(replacedDepPath);
     if (pkgId !== replacedDepPath) {
       edge.attr = {
         pkgId
@@ -225,7 +245,7 @@ function extractDependenciesFromSnapshot(snapshot, replaceFileVersion) {
     optional: true
   }]) {
     for (const [name, ref] of Object.entries(snapshot[depTypeField] ?? {})) {
-      const subDepPath = dp().refToRelative(ref, name);
+      const subDepPath = dp.refToRelative(ref, name);
       if (subDepPath != null) {
         dependencies.push({
           id: replaceFileVersion(subDepPath),
@@ -249,7 +269,7 @@ function buildPackages(lockfile, {
       delete graphPkg.resolution;
     }
     const replacedPkgId = replaceFileVersion(pkgId);
-    const parsed = dp().parse(replacedPkgId);
+    const parsed = dp.parse(replacedPkgId);
     if (parsed.name && componentIdByPkgName.has(parsed.name)) {
       const compId = componentIdByPkgName.get(parsed.name);
       graphPkg.component = {
@@ -283,6 +303,7 @@ async function convertGraphToLockfile(_graph, {
   rootDir,
   resolve
 }) {
+  await init();
   const graphString = _graph.serialize();
   const graph = _objects().DependenciesGraph.deserialize(graphString);
   dropOrphanFilePkgs(graph);
@@ -336,7 +357,7 @@ async function convertGraphToLockfile(_graph, {
   const rootEdge = graph.findRootEdge();
   if (rootEdge) {
     for (const [projectDir, manifest] of Object.entries(manifests)) {
-      const projectId = (0, _lockfile().getLockfileImporterId)(rootDir, projectDir);
+      const projectId = getLockfileImporterId(rootDir, projectDir);
       lockfile.importers[projectId] = {
         dependencies: {},
         devDependencies: {},
@@ -351,9 +372,9 @@ async function convertGraphToLockfile(_graph, {
               specifier
             };
           } else {
-            const edgeId = rootEdge.neighbours.find(directDep => directDep.name === name && (directDep.specifier === specifier || dp().removeSuffix(directDep.id) === `${name}@${specifier}`))?.id;
+            const edgeId = rootEdge.neighbours.find(directDep => directDep.name === name && (directDep.specifier === specifier || dp.removeSuffix(directDep.id) === `${name}@${specifier}`))?.id;
             if (edgeId) {
-              const parsed = dp().parse(edgeId);
+              const parsed = dp.parse(edgeId);
               const ref = depPathToRef(parsed);
               lockfile.importers[projectId][depType][name] = {
                 version: ref,
@@ -375,8 +396,8 @@ async function convertGraphToLockfile(_graph, {
           alias: pkgToResolve.name,
           bareSpecifier: pkgToResolve.version
         }, {
-          lockfileDir: '',
-          projectDir: '',
+          lockfileDir: rootDir,
+          projectDir: rootDir,
           preferredVersions: {}
         });
       } catch (err) {
@@ -397,7 +418,7 @@ async function convertGraphToLockfile(_graph, {
       const {
         resolution
       } = resolveResult;
-      if ('integrity' in resolution && resolution.integrity) {
+      if (resolution != null && 'integrity' in resolution && resolution.integrity) {
         lockfile.packages[pkgToResolve.pkgId].resolution = {
           integrity: resolution.integrity
         };
@@ -426,6 +447,7 @@ async function convertGraphToLockfile(_graph, {
   if (failedWorkspaceComponentPkgs.size > 0) {
     scrubPkgsFromLockfile(lockfile, failedWorkspaceComponentPkgs);
   }
+  dropUnreachableLockfileEntries(lockfile);
   // Validate the generated lockfile
   for (const [depPath, pkg] of Object.entries(lockfile.packages)) {
     if (pkg.resolution == null || Object.keys(pkg.resolution).length === 0) {
@@ -438,7 +460,7 @@ async function convertGraphToLockfile(_graph, {
     for (const {
       id
     } of neighbours) {
-      const parsed = dp().parse(id);
+      const parsed = dp.parse(id);
       deps[parsed.name] = depPathToRef(parsed);
       if (!allEdgeIds.has(id)) {
         snapshots[id] = {};
@@ -461,7 +483,7 @@ function getPkgsToResolve(lockfile, manifests) {
   }
   for (const [pkgId, pkg] of Object.entries(lockfile.packages ?? {})) {
     if (pkg.resolution == null || 'type' in pkg.resolution && pkg.resolution.type === 'directory') {
-      const parsed = dp().parse(pkgId);
+      const parsed = dp.parse(pkgId);
       if (parsed.name && parsed.version && (!pkgsInTheWorkspaces.has(parsed.name) || pkgsInTheWorkspaces.get(parsed.name) !== parsed.version)) {
         pkgsToResolve.push({
           name: parsed.name,
@@ -473,11 +495,58 @@ function getPkgsToResolve(lockfile, manifests) {
   }
   return pkgsToResolve;
 }
+function dropUnreachableLockfileEntries(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(dp.removeSuffix(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, {
+        version
+      }] of Object.entries(importer[depType] ?? {})) {
+        if (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];
+    }
+  }
+  if (lockfile.bit?.depsRequiringBuild) {
+    lockfile.bit.depsRequiringBuild = lockfile.bit.depsRequiringBuild.filter(depPath => reachablePackages.has(dp.removeSuffix(depPath)));
+  }
+}
 function depPathToRef(depPath) {
   return `${depPath.version}${depPath.patchHash ?? ''}${depPath.peerDepGraphHash ?? ''}`;
 }
 function isFilePkgId(pkgId) {
-  return dp().parse(pkgId).nonSemverVersion?.startsWith('file:') ?? false;
+  return dp.parse(pkgId).nonSemverVersion?.startsWith('file:') ?? false;
 }
 
 /**
@@ -539,7 +608,7 @@ function dropOrphanFilePkgs(graph) {
  */
 function dropOrphanNeighbours(graph) {
   const edgeIds = new Set(graph.edges.map(edge => edge.id));
-  const isOrphan = n => !edgeIds.has(n.id) && !graph.packages.has(dp().removeSuffix(n.id));
+  const isOrphan = n => !edgeIds.has(n.id) && !graph.packages.has(dp.removeSuffix(n.id));
   graph.edges = graph.edges.map(edge => {
     if (!edge.neighbours.some(isOrphan)) return edge;
     return _objectSpread(_objectSpread({}, edge), {}, {
@@ -557,7 +626,7 @@ function dropOrphanNeighbours(graph) {
  * specifier, which is the same path as a graph-less install for that one dep.
  */
 function scrubPkgsFromLockfile(lockfile, pkgIds) {
-  const matches = depPath => pkgIds.has(dp().removeSuffix(depPath));
+  const matches = depPath => pkgIds.has(dp.removeSuffix(depPath));
   for (const pkgId of pkgIds) {
     delete lockfile.packages[pkgId];
   }