@pnpm/plugin-commands-env 5.0.12 → 5.1.1

package/lib/index.d.ts

@@ -1,3 +1,3 @@
 import * as env from './env';
-import * as node from './node';
-export { env, node };
+import { prepareExecutionEnv } from './node';
+export { env, prepareExecutionEnv };

package/lib/index.js

@@ -23,9 +23,9 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.node = exports.env = void 0;
+exports.prepareExecutionEnv = exports.env = void 0;
 const env = __importStar(require("./env"));
 exports.env = env;
-const node = __importStar(require("./node"));
-exports.node = node;
+const node_1 = require("./node");
+Object.defineProperty(exports, "prepareExecutionEnv", { enumerable: true, get: function () { return node_1.prepareExecutionEnv; } });
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4B;AAGnB,kBAAG;AAFZ,6CAA8B;AAEhB,oBAAI"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,2CAA4B;AAGnB,kBAAG;AAFZ,iCAA4C;AAE9B,oGAFL,0BAAmB,OAEK"}

package/lib/node.d.ts

@@ -1,8 +1,10 @@
 import { type Config } from '@pnpm/config';
 import { type FetchFromRegistry } from '@pnpm/fetch';
+import { type PrepareExecutionEnvOptions, type PrepareExecutionEnvResult } from '@pnpm/types';
 export type NvmNodeCommandOptions = Pick<Config, 'bin' | 'global' | 'fetchRetries' | 'fetchRetryFactor' | 'fetchRetryMaxtimeout' | 'fetchRetryMintimeout' | 'fetchTimeout' | 'userAgent' | 'ca' | 'cert' | 'httpProxy' | 'httpsProxy' | 'key' | 'localAddress' | 'noProxy' | 'rawConfig' | 'strictSsl' | 'storeDir' | 'useNodeVersion' | 'pnpmHomeDir'> & Partial<Pick<Config, 'configDir' | 'cliOptions' | 'sslConfigs'>> & {
     remote?: boolean;
 };
+export declare function prepareExecutionEnv(config: NvmNodeCommandOptions, { extraBinPaths, executionEnv }: PrepareExecutionEnvOptions): Promise<PrepareExecutionEnvResult>;
 export declare function getNodeBinDir(opts: NvmNodeCommandOptions): Promise<string>;
 export declare function getNodeVersionsBaseDir(pnpmHomeDir: string): string;
 export declare function getNodeDir(fetch: FetchFromRegistry, opts: NvmNodeCommandOptions & {

package/lib/node.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getNodeDir = exports.getNodeVersionsBaseDir = exports.getNodeBinDir = void 0;
+exports.getNodeDir = exports.getNodeVersionsBaseDir = exports.getNodeBinDir = exports.prepareExecutionEnv = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const util_1 = __importDefault(require("util"));
@@ -15,6 +15,23 @@ const load_json_file_1 = __importDefault(require("load-json-file"));
 const write_json_file_1 = __importDefault(require("write-json-file"));
 const getNodeMirror_1 = require("./getNodeMirror");
 const parseNodeSpecifier_1 = require("./parseNodeSpecifier");
+const nodeFetchPromises = {};
+async function prepareExecutionEnv(config, { extraBinPaths, executionEnv }) {
+    if (!executionEnv?.nodeVersion)
+        return { extraBinPaths: extraBinPaths ?? [] };
+    let nodePathPromise = nodeFetchPromises[executionEnv.nodeVersion];
+    if (!nodePathPromise) {
+        nodePathPromise = getNodeBinDir({
+            ...config,
+            useNodeVersion: executionEnv.nodeVersion,
+        });
+        nodeFetchPromises[executionEnv.nodeVersion] = nodePathPromise;
+    }
+    return {
+        extraBinPaths: [await nodePathPromise, ...extraBinPaths ?? []],
+    };
+}
+exports.prepareExecutionEnv = prepareExecutionEnv;
 async function getNodeBinDir(opts) {
     const fetch = (0, fetch_1.createFetchFromRegistry)(opts);
     const nodesDir = getNodeVersionsBaseDir(opts.pnpmHomeDir);

package/lib/node.js.map

@@ -1 +1 @@
-{"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,gDAAuB;AAEvB,uCAA6E;AAC7E,yCAAyC;AACzC,qDAA8C;AAC9C,iDAA+C;AAC/C,oEAAyC;AACzC,sEAA2C;AAC3C,mDAA+C;AAC/C,6DAAyD;AA2BlD,KAAK,UAAU,aAAa,CAAE,IAA2B;IAC9D,MAAM,KAAK,GAAG,IAAA,+BAAuB,EAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACzD,IAAI,iBAAiB,GAAG,IAAI,CAAC,cAAc,IAAI,CAAC,MAAM,wBAAwB,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAA;IAClG,IAAI,iBAAiB,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAC/D,iBAAiB,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAU,CAAA,CAAC,WAAW,CAAC,CAAC,GAAG,CAAA,CAAC,sBAAsB;QAC1F,IAAI,iBAAiB,IAAI,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;QAC7D,CAAC;QACD,MAAM,IAAA,yBAAa,EAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,EAAE;YACxD,OAAO,EAAE,iBAAiB;SAC3B,CAAC,CAAA;IACJ,CAAC;IACD,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,IAAA,uCAAkB,EAAC,iBAAiB,CAAC,CAAA;IAChF,MAAM,iBAAiB,GAAG,IAAA,6BAAa,EAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;IACvE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE;QACtC,GAAG,IAAI;QACP,cAAc;QACd,iBAAiB;KAClB,CAAC,CAAA;IACF,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AAC3E,CAAC;AAtBD,sCAsBC;AAED,SAAgB,sBAAsB,CAAE,WAAmB;IACzD,OAAO,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;AACzC,CAAC;AAFD,wDAEC;AAEM,KAAK,UAAU,UAAU,CAAE,KAAwB,EAAE,IAAmF;IAC7I,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACzD,MAAM,YAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACtD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IAC3D,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,MAAM,IAAA,yBAAY,EAAC;YAClC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE;YACtB,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC,CAAA;QACF,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC5C,IAAA,mBAAU,EAAC,oBAAoB,IAAI,CAAC,cAAc,MAAM,CAAC,CAAA;QACzD,MAAM,IAAA,wBAAS,EAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE;YACtD,GAAG,IAAI;YACP,OAAO;YACP,KAAK,EAAE;gBACL,UAAU,EAAE,IAAI,CAAC,oBAAoB;gBACrC,UAAU,EAAE,IAAI,CAAC,oBAAoB;gBACrC,OAAO,EAAE,IAAI,CAAC,YAAY;gBAC1B,MAAM,EAAE,IAAI,CAAC,gBAAgB;aAC9B;SACF,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAxBD,gCAwBC;AAED,KAAK,UAAU,wBAAwB,CAAE,QAAgB;IACvD,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,wBAAY,EAAuB,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAA;IACvF,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,IAAI,cAAI,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC5E,OAAO,EAAE,CAAA;QACX,CAAC;QACD,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC"}
+{"version":3,"file":"node.js","sourceRoot":"","sources":["../src/node.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAmB;AACnB,gDAAuB;AACvB,gDAAuB;AAEvB,uCAA6E;AAC7E,yCAAyC;AACzC,qDAA8C;AAC9C,iDAA+C;AAE/C,oEAAyC;AACzC,sEAA2C;AAC3C,mDAA+C;AAC/C,6DAAyD;AA2BzD,MAAM,iBAAiB,GAAoC,EAAE,CAAA;AAEtD,KAAK,UAAU,mBAAmB,CAAE,MAA6B,EAAE,EAAE,aAAa,EAAE,YAAY,EAA8B;IACnI,IAAI,CAAC,YAAY,EAAE,WAAW;QAAE,OAAO,EAAE,aAAa,EAAE,aAAa,IAAI,EAAE,EAAE,CAAA;IAE7E,IAAI,eAAe,GAAG,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,CAAA;IACjE,IAAI,CAAC,eAAe,EAAE,CAAC;QACrB,eAAe,GAAG,aAAa,CAAC;YAC9B,GAAG,MAAM;YACT,cAAc,EAAE,YAAY,CAAC,WAAW;SACzC,CAAC,CAAA;QACF,iBAAiB,CAAC,YAAY,CAAC,WAAW,CAAC,GAAG,eAAe,CAAA;IAC/D,CAAC;IAED,OAAO;QACL,aAAa,EAAE,CAAC,MAAM,eAAe,EAAE,GAAG,aAAa,IAAI,EAAE,CAAC;KAC/D,CAAA;AACH,CAAC;AAfD,kDAeC;AAEM,KAAK,UAAU,aAAa,CAAE,IAA2B;IAC9D,MAAM,KAAK,GAAG,IAAA,+BAAuB,EAAC,IAAI,CAAC,CAAA;IAC3C,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACzD,IAAI,iBAAiB,GAAG,IAAI,CAAC,cAAc,IAAI,CAAC,MAAM,wBAAwB,CAAC,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAA;IAClG,IAAI,iBAAiB,IAAI,IAAI,EAAE,CAAC;QAC9B,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,iCAAiC,CAAC,CAAA;QAC/D,iBAAiB,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAU,CAAA,CAAC,WAAW,CAAC,CAAC,GAAG,CAAA,CAAC,sBAAsB;QAC1F,IAAI,iBAAiB,IAAI,IAAI,EAAE,CAAC;YAC9B,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;QAC7D,CAAC;QACD,MAAM,IAAA,yBAAa,EAAC,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,EAAE;YACxD,OAAO,EAAE,iBAAiB;SAC3B,CAAC,CAAA;IACJ,CAAC;IACD,MAAM,EAAE,cAAc,EAAE,cAAc,EAAE,GAAG,IAAA,uCAAkB,EAAC,iBAAiB,CAAC,CAAA;IAChF,MAAM,iBAAiB,GAAG,IAAA,6BAAa,EAAC,IAAI,CAAC,SAAS,EAAE,cAAc,CAAC,CAAA;IACvE,MAAM,OAAO,GAAG,MAAM,UAAU,CAAC,KAAK,EAAE;QACtC,GAAG,IAAI;QACP,cAAc;QACd,iBAAiB;KAClB,CAAC,CAAA;IACF,OAAO,OAAO,CAAC,QAAQ,KAAK,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,cAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;AAC3E,CAAC;AAtBD,sCAsBC;AAED,SAAgB,sBAAsB,CAAE,WAAmB;IACzD,OAAO,cAAI,CAAC,IAAI,CAAC,WAAW,EAAE,QAAQ,CAAC,CAAA;AACzC,CAAC;AAFD,wDAEC;AAEM,KAAK,UAAU,UAAU,CAAE,KAAwB,EAAE,IAAmF;IAC7I,MAAM,QAAQ,GAAG,sBAAsB,CAAC,IAAI,CAAC,WAAW,CAAC,CAAA;IACzD,MAAM,YAAE,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAA;IACtD,MAAM,UAAU,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,cAAc,CAAC,CAAA;IAC3D,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE,CAAC;QAC/B,MAAM,QAAQ,GAAG,MAAM,IAAA,yBAAY,EAAC;YAClC,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE;YACtB,SAAS,EAAE,IAAI,CAAC,QAAQ;YACxB,WAAW,EAAE,IAAI,CAAC,WAAW;SAC9B,CAAC,CAAA;QACF,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAC5C,IAAA,mBAAU,EAAC,oBAAoB,IAAI,CAAC,cAAc,MAAM,CAAC,CAAA;QACzD,MAAM,IAAA,wBAAS,EAAC,KAAK,EAAE,IAAI,CAAC,cAAc,EAAE,UAAU,EAAE;YACtD,GAAG,IAAI;YACP,OAAO;YACP,KAAK,EAAE;gBACL,UAAU,EAAE,IAAI,CAAC,oBAAoB;gBACrC,UAAU,EAAE,IAAI,CAAC,oBAAoB;gBACrC,OAAO,EAAE,IAAI,CAAC,YAAY;gBAC1B,MAAM,EAAE,IAAI,CAAC,gBAAgB;aAC9B;SACF,CAAC,CAAA;IACJ,CAAC;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAxBD,gCAwBC;AAED,KAAK,UAAU,wBAAwB,CAAE,QAAgB;IACvD,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,wBAAY,EAAuB,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC,CAAA;IACvF,CAAC;IAAC,OAAO,GAAY,EAAE,CAAC;QACtB,IAAI,cAAI,CAAC,KAAK,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YAC5E,OAAO,EAAE,CAAA;QACX,CAAC;QACD,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC"}

package/lib/replaceOrAddNodeIntoBinPaths.d.ts

@@ -0,0 +1 @@
+export declare function replaceOrAddNodeIntoBinPaths(binPaths: string[], baseDir: string, nodePath: string): string[];

package/lib/replaceOrAddNodeIntoBinPaths.js

@@ -0,0 +1,22 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.replaceOrAddNodeIntoBinPaths = void 0;
+const path_1 = __importDefault(require("path"));
+function replaceOrAddNodeIntoBinPaths(binPaths, baseDir, nodePath) {
+    baseDir = path_1.default.resolve(baseDir);
+    if (!baseDir.endsWith(path_1.default.sep)) {
+        baseDir += path_1.default.sep;
+    }
+    const index = binPaths.findIndex(dir => dir.startsWith(baseDir));
+    if (index < 0) {
+        return [...binPaths, nodePath];
+    }
+    else {
+        return [...binPaths.slice(0, index), nodePath, ...binPaths.slice(index + 1)];
+    }
+}
+exports.replaceOrAddNodeIntoBinPaths = replaceOrAddNodeIntoBinPaths;
+//# sourceMappingURL=replaceOrAddNodeIntoBinPaths.js.map

package/lib/replaceOrAddNodeIntoBinPaths.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"replaceOrAddNodeIntoBinPaths.js","sourceRoot":"","sources":["../src/replaceOrAddNodeIntoBinPaths.ts"],"names":[],"mappings":";;;;;;AAAA,gDAAuB;AAEvB,SAAgB,4BAA4B,CAAE,QAAkB,EAAE,OAAe,EAAE,QAAgB;IACjG,OAAO,GAAG,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;IAC/B,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,cAAI,CAAC,GAAG,CAAC,EAAE,CAAC;QAChC,OAAO,IAAI,cAAI,CAAC,GAAG,CAAA;IACrB,CAAC;IAED,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;IAChE,IAAI,KAAK,GAAG,CAAC,EAAE,CAAC;QACd,OAAO,CAAC,GAAG,QAAQ,EAAE,QAAQ,CAAC,CAAA;IAChC,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC,EAAE,QAAQ,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAA;IAC9E,CAAC;AACH,CAAC;AAZD,oEAYC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/plugin-commands-env",
-  "version": "5.0.12",
+  "version": "5.1.1",
   "description": "pnpm commands for managing Node.js",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -35,14 +35,15 @@
     "semver": "^7.6.2",
     "symlink-dir": "^6.0.1",
     "write-json-file": "^4.3.0",
-    "@pnpm/cli-utils": "3.1.4",
+    "@pnpm/cli-utils": "3.1.6",
+    "@pnpm/config": "21.6.3",
     "@pnpm/error": "6.0.1",
-    "@pnpm/config": "21.6.1",
-    "@pnpm/node.resolver": "3.0.8",
-    "@pnpm/fetch": "8.0.3",
-    "@pnpm/node.fetcher": "4.0.8",
+    "@pnpm/fetch": "8.0.4",
+    "@pnpm/node.fetcher": "4.0.10",
+    "@pnpm/node.resolver": "3.0.10",
     "@pnpm/store-path": "9.0.1",
-    "@pnpm/remove-bins": "6.0.4"
+    "@pnpm/remove-bins": "6.0.5",
+    "@pnpm/types": "11.1.0"
   },
   "funding": "https://opencollective.com/pnpm",
   "devDependencies": {
@@ -55,8 +56,8 @@
     "nock": "13.3.4",
     "node-fetch": "npm:@pnpm/node-fetch@1.0.0",
     "path-name": "^1.0.0",
-    "@pnpm/plugin-commands-env": "5.0.12",
-    "@pnpm/prepare": "0.0.97"
+    "@pnpm/prepare": "0.0.99",
+    "@pnpm/plugin-commands-env": "5.1.1"
   },
   "exports": {
     ".": "./lib/index.js"