@depup/nx 23.2.1-depup.8 → 23.3.0-depup.0

package/dist/src/native/index.js

@@ -210,7 +210,7 @@ Module._load = function (request, parent, isMain) {
 
 const indexModulePath = require.resolve('./native-bindings.js');
 delete require.cache[indexModulePath];
-const indexModule = require('./native-bindings.js');
-
-module.exports = indexModule;
+// A direct re-export: node's CommonJS export lexer follows this form, so ESM
+// importers see the named exports. Assigning via a variable hides them.
+module.exports = require('./native-bindings.js');
 Module._load = originalLoad;

package/dist/src/native/native-bindings.js

@@ -582,9 +582,11 @@ module.exports.FileLock = nativeBinding.FileLock
 module.exports.HashPlanInspector = nativeBinding.HashPlanInspector
 module.exports.HashPlanner = nativeBinding.HashPlanner
 module.exports.HttpRemoteCache = nativeBinding.HttpRemoteCache
+module.exports.IgnoredIndexReader = nativeBinding.IgnoredIndexReader
 module.exports.ImportResult = nativeBinding.ImportResult
 module.exports.NxCache = nativeBinding.NxCache
 module.exports.NxConsolePreferences = nativeBinding.NxConsolePreferences
+module.exports.NxPluginCapabilities = nativeBinding.NxPluginCapabilities
 module.exports.NxTaskHistory = nativeBinding.NxTaskHistory
 module.exports.ProcessMetricsCollector = nativeBinding.ProcessMetricsCollector
 module.exports.RunningTasksService = nativeBinding.RunningTasksService
@@ -592,8 +594,10 @@ module.exports.RustPseudoTerminal = nativeBinding.RustPseudoTerminal
 module.exports.TaskDetails = nativeBinding.TaskDetails
 module.exports.TaskHasher = nativeBinding.TaskHasher
 module.exports.TaskInvocationTracker = nativeBinding.TaskInvocationTracker
-module.exports.Watcher = nativeBinding.Watcher
+module.exports.UltracacheConfigurations = nativeBinding.UltracacheConfigurations
+module.exports.UltracacheConfigurationStore = nativeBinding.UltracacheConfigurationStore
 module.exports.WorkspaceContext = nativeBinding.WorkspaceContext
+module.exports.affectedTasks = nativeBinding.affectedTasks
 module.exports.BatchStatus = nativeBinding.BatchStatus
 module.exports.canInstallNxConsole = nativeBinding.canInstallNxConsole
 module.exports.canInstallNxConsoleForEditor = nativeBinding.canInstallNxConsoleForEditor
@@ -601,7 +605,10 @@ module.exports.closeDbConnection = nativeBinding.closeDbConnection
 module.exports.connectToNxDb = nativeBinding.connectToNxDb
 module.exports.copy = nativeBinding.copy
 module.exports.detectAiAgent = nativeBinding.detectAiAgent
+module.exports.diffJson = nativeBinding.diffJson
+module.exports.directlyTouchedProjects = nativeBinding.directlyTouchedProjects
 module.exports.EventType = nativeBinding.EventType
+module.exports.expandFilesInput = nativeBinding.expandFilesInput
 module.exports.expandOutputs = nativeBinding.expandOutputs
 module.exports.findImports = nativeBinding.findImports
 module.exports.flushTelemetry = nativeBinding.flushTelemetry
@@ -613,6 +620,8 @@ module.exports.getFilesForOutputsBatch = nativeBinding.getFilesForOutputsBatch
 module.exports.getHardcodedIgnorePatterns = nativeBinding.getHardcodedIgnorePatterns
 module.exports.getMainWorktreeRoot = nativeBinding.getMainWorktreeRoot
 module.exports.getTransformableOutputs = nativeBinding.getTransformableOutputs
+module.exports.getUltracacheDeferredTaskIds = nativeBinding.getUltracacheDeferredTaskIds
+module.exports.getUltracacheReport = nativeBinding.getUltracacheReport
 module.exports.GroupType = nativeBinding.GroupType
 module.exports.hashArray = nativeBinding.hashArray
 module.exports.hashFile = nativeBinding.hashFile
@@ -625,6 +634,7 @@ module.exports.isAiAgent = nativeBinding.isAiAgent
 module.exports.isEditorInstalled = nativeBinding.isEditorInstalled
 module.exports.killProcessTree = nativeBinding.killProcessTree
 module.exports.killProcessTreeGraceful = nativeBinding.killProcessTreeGraceful
+module.exports.locateTouchedProjects = nativeBinding.locateTouchedProjects
 module.exports.logDebug = nativeBinding.logDebug
 module.exports.matchGlobPaths = nativeBinding.matchGlobPaths
 module.exports.matchOutputPaths = nativeBinding.matchOutputPaths
@@ -633,10 +643,12 @@ module.exports.remove = nativeBinding.remove
 module.exports.restoreTerminal = nativeBinding.restoreTerminal
 module.exports.RunMode = nativeBinding.RunMode
 module.exports.SupportedEditor = nativeBinding.SupportedEditor
+module.exports.sweepBatchOutputs = nativeBinding.sweepBatchOutputs
 module.exports.TaskStatus = nativeBinding.TaskStatus
 module.exports.testOnlyTransferFileMap = nativeBinding.testOnlyTransferFileMap
 module.exports.trackEvent = nativeBinding.trackEvent
 module.exports.trackPageView = nativeBinding.trackPageView
 module.exports.transferProjectGraph = nativeBinding.transferProjectGraph
+module.exports.UltracacheMode = nativeBinding.UltracacheMode
 module.exports.validateOutputs = nativeBinding.validateOutputs
 module.exports.WorkspaceErrors = nativeBinding.WorkspaceErrors

package/dist/src/native/transform-objects.d.ts

@@ -1,3 +1,12 @@
 import { ProjectGraph } from '../config/project-graph';
-import { ProjectGraph as RustProjectGraph } from './index';
-export declare function transformProjectGraphForRust(graph: ProjectGraph): RustProjectGraph;
+import { ExternalObject, ProjectGraph as RustProjectGraph } from './index';
+/** The graph copied into Rust, once per graph. */
+export declare function transformProjectGraphForRust(graph: ProjectGraph): ExternalObject<RustProjectGraph>;
+/**
+ * Only what the touched-project locators read: project roots, named inputs and
+ * target inputs. Copying target options and every edge costs several times
+ * what the locators themselves do on a large workspace.
+ */
+export declare function transformProjectGraphForLocators(graph: ProjectGraph): ExternalObject<RustProjectGraph>;
+/** The graph in Rust's shape, still a JS object. Uncached, so safe to edit. */
+export declare function toRustProjectGraph(graph: ProjectGraph): RustProjectGraph;

package/dist/src/native/transform-objects.js

@@ -1,7 +1,52 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformProjectGraphForRust = transformProjectGraphForRust;
+exports.transformProjectGraphForLocators = transformProjectGraphForLocators;
+exports.toRustProjectGraph = toRustProjectGraph;
+const index_1 = require("./index");
+/**
+ * Keyed by graph identity, but weak so a replaced graph is collectable. A run's
+ * hasher reuses what affected's planner already copied.
+ */
+const transferred = new WeakMap();
+/** The graph copied into Rust, once per graph. */
 function transformProjectGraphForRust(graph) {
+    let ref = transferred.get(graph);
+    if (!ref) {
+        ref = (0, index_1.transferProjectGraph)(toRustProjectGraph(graph));
+        transferred.set(graph, ref);
+    }
+    return ref;
+}
+/** Per graph like `transferred`: `nx release` runs the locators once per commit. */
+const transferredForLocators = new WeakMap();
+/**
+ * Only what the touched-project locators read: project roots, named inputs and
+ * target inputs. Copying target options and every edge costs several times
+ * what the locators themselves do on a large workspace.
+ */
+function transformProjectGraphForLocators(graph) {
+    let ref = transferredForLocators.get(graph);
+    if (!ref) {
+        const nodes = {};
+        for (const [name, node] of Object.entries(graph.nodes)) {
+            const targets = {};
+            for (const [target, config] of Object.entries(node.data.targets ?? {})) {
+                targets[target] = { inputs: config.inputs };
+            }
+            nodes[name] = {
+                root: node.data.root,
+                namedInputs: node.data.namedInputs,
+                targets,
+            };
+        }
+        ref = (0, index_1.transferProjectGraph)({ nodes, externalNodes: {}, dependencies: {} });
+        transferredForLocators.set(graph, ref);
+    }
+    return ref;
+}
+/** The graph in Rust's shape, still a JS object. Uncached, so safe to edit. */
+function toRustProjectGraph(graph) {
     const dependencies = {};
     const nodes = {};
     const externalNodes = {};
@@ -32,6 +77,7 @@ function transformProjectGraphForRust(graph) {
     }
     for (const [projectName, externalNode] of Object.entries(graph.externalNodes ?? {})) {
         externalNodes[projectName] = {
+            type: externalNode.type,
             packageName: externalNode.data.packageName,
             hash: externalNode.data.hash,
             version: externalNode.data.version,

package/dist/src/nx-cloud/generators/connect-to-nx-cloud/connect-to-nx-cloud.js

@@ -11,6 +11,7 @@ const url_shorten_1 = require("../../utilities/url-shorten");
 const get_cloud_options_1 = require("../../utilities/get-cloud-options");
 const path_1 = require("path");
 const git_utils_1 = require("../../../utils/git-utils");
+const http_client_1 = require("../../../utils/http-client");
 function printCloudConnectionDisabledMessage() {
     output_1.output.error({
         title: `Connections to Nx Cloud are disabled for this workspace`,
@@ -46,10 +47,13 @@ function getNxInitDate() {
 }
 async function createNxCloudWorkspaceV1(workspaceName, installationSource, nxInitDate) {
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
-    const response = await require('axios').post(`${apiUrl}/nx-cloud/create-org-and-workspace`, {
-        workspaceName,
-        installationSource,
-        nxInitDate,
+    const response = await (0, http_client_1.httpRequest)(`${apiUrl}/nx-cloud/create-org-and-workspace`, {
+        method: 'POST',
+        data: {
+            workspaceName,
+            installationSource,
+            nxInitDate,
+        },
     });
     if (response.data.message) {
         throw new Error(response.data.message);
@@ -58,10 +62,13 @@ async function createNxCloudWorkspaceV1(workspaceName, installationSource, nxIni
 }
 async function createNxCloudWorkspaceV2(workspaceName, installationSource, nxInitDate) {
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
-    const response = await require('axios').post(`${apiUrl}/nx-cloud/v2/create-org-and-workspace`, {
-        workspaceName,
-        installationSource,
-        nxInitDate,
+    const response = await (0, http_client_1.httpRequest)(`${apiUrl}/nx-cloud/v2/create-org-and-workspace`, {
+        method: 'POST',
+        data: {
+            workspaceName,
+            installationSource,
+            nxInitDate,
+        },
     });
     if (response.data.message) {
         throw new Error(response.data.message);

package/dist/src/nx-cloud/update-manager.d.ts

@@ -1,4 +1,5 @@
 import type { CloudTaskRunnerOptions } from './nx-cloud-tasks-runner-shell';
+import type { ReadUltracacheConfigurationsOptions, ReadUltracacheConfigurationsResult } from '../ultracache/fetch';
 import { TasksRunner } from '../tasks-runner/tasks-runner';
 import { RemoteCacheV2 } from '../tasks-runner/default-tasks-runner';
 export declare class NxCloudEnterpriseOutdatedError extends Error {
@@ -12,6 +13,8 @@ export interface NxCloudClient {
     commands: Record<string, () => Promise<void>>;
     nxCloudTasksRunner: TasksRunner<CloudTaskRunnerOptions>;
     getRemoteCache: () => RemoteCacheV2;
+    /** Clients that expose Ultracache configurations; see `fetchUltracacheConfigurations`. */
+    readUltracacheConfigurations?: (options: ReadUltracacheConfigurationsOptions) => Promise<ReadUltracacheConfigurationsResult | null>;
 }
 export declare function verifyOrUpdateNxCloudClient(options?: {
     url?: string;

package/dist/src/nx-cloud/update-manager.js

@@ -6,9 +6,11 @@ exports.getBundleInstallDefaultLocation = getBundleInstallDefaultLocation;
 const tslib_1 = require("tslib");
 const fs_1 = require("fs");
 const zlib_1 = require("zlib");
+const stream_1 = require("stream");
 const path_1 = require("path");
 const os_1 = require("os");
-const axios_1 = require("./utilities/axios");
+const nx_cloud_http_client_1 = require("./utilities/nx-cloud-http-client");
+const http_client_1 = require("../utils/http-client");
 const debug_logger_1 = require("./debug-logger");
 const tar = tslib_1.__importStar(require("tar-stream"));
 const cache_directory_1 = require("../utils/cache-directory");
@@ -32,14 +34,14 @@ async function verifyOrUpdateNxCloudClient(options) {
     const currentBundle = getLatestInstalledRunnerBundle();
     const apiUrl = process.env.NX_CLOUD_API || options?.url || 'https://cloud.nx.app';
     if (shouldVerifyInstalledRunnerBundle(currentBundle)) {
-        const axios = (0, axios_1.createApiAxiosInstance)(options);
+        const httpClient = (0, nx_cloud_http_client_1.createApiHttpClient)(options);
         let verifyBundleResponse;
         try {
-            verifyBundleResponse = await verifyCurrentBundle(axios, currentBundle);
+            verifyBundleResponse = await verifyCurrentBundle(httpClient, currentBundle);
         }
         catch (e) {
             // Enterprise image compatibility, to be removed
-            if (e.message === 'Request failed with status code 404' && apiUrl) {
+            if (e instanceof http_client_1.HttpError && e.status === 404 && apiUrl) {
                 throw new NxCloudEnterpriseOutdatedError(apiUrl);
             }
             (0, debug_logger_1.debugLog)('Could not verify bundle. Resetting validation timer and using previously installed or default runner. Error: ', e);
@@ -72,7 +74,7 @@ async function verifyOrUpdateNxCloudClient(options) {
         if (version === 'NX_ENTERPRISE_OUTDATED_IMAGE') {
             throw new NxCloudEnterpriseOutdatedError(apiUrl);
         }
-        const fullPath = await downloadAndExtractClientBundle(axios, runnerBundleInstallDirectory, version, url);
+        const fullPath = await downloadAndExtractClientBundle(httpClient, runnerBundleInstallDirectory, version, url);
         (0, debug_logger_1.debugLog)('Done: ', fullPath);
         const nxCloudClient = require(fullPath);
         if (nxCloudClient.commands === undefined) {
@@ -157,8 +159,8 @@ function shouldVerifyInstalledRunnerBundle(currentBundle) {
     }
     return true;
 }
-async function verifyCurrentBundle(axios, currentBundle) {
-    return axios.get('/nx-cloud/client/verify', {
+async function verifyCurrentBundle(httpClient, currentBundle) {
+    return httpClient.get('/nx-cloud/client/verify', {
         params: currentBundle
             ? {
                 version: currentBundle.version,
@@ -209,10 +211,10 @@ function hashDirectory(dir) {
     const combinedHashes = hashes.sort().join('');
     return (0, crypto_1.createHash)('sha256').update(combinedHashes).digest('hex');
 }
-async function downloadAndExtractClientBundle(axios, runnerBundleInstallDirectory, version, url) {
+async function downloadAndExtractClientBundle(httpClient, runnerBundleInstallDirectory, version, url) {
     let resp;
     try {
-        resp = await axios.get(url, {
+        resp = await httpClient.get(url, {
             responseType: 'stream',
         });
     }
@@ -238,6 +240,8 @@ async function downloadAndExtractClientBundle(axios, runnerBundleInstallDirector
             else if (headers.type === 'file') {
                 const outputFilePath = (0, path_1.join)(bundleExtractLocation, headers.name);
                 const writeStream = (0, fs_1.createWriteStream)(outputFilePath);
+                // Surface disk errors through the pipeline instead of crashing
+                writeStream.on('error', (e) => extract.destroy(e));
                 stream.pipe(writeStream);
                 // Continue the tar stream after the write stream closes
                 writeStream.on('close', () => {
@@ -246,15 +250,17 @@ async function downloadAndExtractClientBundle(axios, runnerBundleInstallDirector
                 stream.resume();
             }
         });
-        extract.on('error', (e) => {
-            rej(e);
-        });
         extract.on('finish', function () {
             removeOldClientBundles(version);
             writeBundleVerificationLock();
             res(bundleExtractLocation);
         });
-        resp.data.pipe((0, zlib_1.createGunzip)()).pipe(extract);
+        // pipeline propagates download/gunzip errors that .pipe() would leave
+        // uncaught
+        (0, stream_1.pipeline)(resp.data, (0, zlib_1.createGunzip)(), extract, (e) => {
+            if (e)
+                rej(e);
+        });
     });
 }
 function removeOldClientBundles(currentInstallVersion) {

package/dist/src/nx-cloud/utilities/client.d.ts

@@ -5,6 +5,6 @@ export declare class UnknownCommandError extends Error {
     constructor(command: string, availableCommands: string[]);
 }
 export declare function getCloudClient(options: CloudTaskRunnerOptions): Promise<{
-    invoke: (command: string, exit?: boolean) => void;
+    invoke: (command: string, exit?: boolean) => Promise<void>;
     availableCommands: string[];
 }>;

package/dist/src/nx-cloud/utilities/client.js

@@ -19,7 +19,7 @@ async function getCloudClient(options) {
     return {
         invoke: (command, exit = true) => {
             if (command in nxCloudClient.commands) {
-                nxCloudClient.commands[command]()
+                return nxCloudClient.commands[command]()
                     .then(() => {
                     if (exit) {
                         process.exit(0);

package/dist/src/nx-cloud/utilities/is-workspace-claimed.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isWorkspaceClaimed = isWorkspaceClaimed;
 const get_cloud_options_1 = require("./get-cloud-options");
+const http_client_1 = require("../../utils/http-client");
 async function isWorkspaceClaimed(accessToken) {
     if (!accessToken)
         return false;
@@ -10,7 +11,7 @@ async function isWorkspaceClaimed(accessToken) {
         const requestData = (0, get_cloud_options_1.isNxCloudId)(accessToken)
             ? { nxCloudId: accessToken }
             : { nxCloudAccessToken: accessToken };
-        const response = await require('axios').post(`${apiUrl}/nx-cloud/is-workspace-claimed`, requestData);
+        const response = await (0, http_client_1.httpRequest)(`${apiUrl}/nx-cloud/is-workspace-claimed`, { method: 'POST', data: requestData });
         if (response.data.message) {
             return false;
         }

package/dist/src/nx-cloud/utilities/nx-cloud-http-client.d.ts

@@ -0,0 +1,5 @@
+import { type HttpClient } from '../../utils/http-client';
+export declare function createApiHttpClient(options?: {
+    url?: string;
+    customProxyConfigPath?: string;
+}): HttpClient;

package/dist/src/nx-cloud/utilities/nx-cloud-http-client.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createApiHttpClient = createApiHttpClient;
+const http_client_1 = require("../../utils/http-client");
+const environment_1 = require("./environment");
+function createApiHttpClient(options) {
+    if (options?.customProxyConfigPath) {
+        const { logger } = require('../../utils/logger');
+        // The client bundle still reads this file for its own requests
+        logger.warn('customProxyConfigPath is not used for downloading the Nx Cloud client. Set HTTP_PROXY/HTTPS_PROXY/NO_PROXY (and NODE_EXTRA_CA_CERTS for custom certificates) instead.');
+    }
+    return (0, http_client_1.createHttpClient)({
+        baseURL: process.env.NX_CLOUD_API || options?.url || 'https://cloud.nx.app',
+        timeout: environment_1.NX_CLOUD_NO_TIMEOUTS ? environment_1.UNLIMITED_TIMEOUT : 10000,
+    });
+}

package/dist/src/nx-cloud/utilities/url-shorten.js

@@ -5,10 +5,11 @@ exports.getURLifShortenFailed = getURLifShortenFailed;
 const logger_1 = require("../../utils/logger");
 const get_cloud_options_1 = require("./get-cloud-options");
 const git_utils_1 = require("../../utils/git-utils");
+const http_client_1 = require("../../utils/http-client");
 async function createNxCloudOnboardingURL(onboardingSource, accessToken, meta, forceManual = false, forceGithub = false, directory, 
 // Aborting tears down the in-flight request; without it a caller that stops
 // waiting (see prefetchRemoteCacheOnboardingUrl) leaves the socket holding
-// the event loop open, since axios has no default timeout.
+// the event loop open, since these requests have no timeout.
 signal) {
     const remoteInfo = (0, git_utils_1.getVcsRemoteInfo)(directory);
     const apiUrl = (0, get_cloud_options_1.getCloudUrl)();
@@ -26,14 +27,18 @@ signal) {
     }
     const source = getSource(onboardingSource);
     try {
-        const response = await require('axios').post(`${apiUrl}/nx-cloud/onboarding`, {
-            type: usesGithub ? 'GITHUB' : 'MANUAL',
-            source,
-            accessToken: usesGithub ? null : accessToken,
-            selectedRepositoryName: remoteInfo?.slug ?? null,
-            repositoryDomain: remoteInfo?.domain ?? null,
-            meta,
-        }, { signal });
+        const response = await (0, http_client_1.httpRequest)(`${apiUrl}/nx-cloud/onboarding`, {
+            method: 'POST',
+            data: {
+                type: usesGithub ? 'GITHUB' : 'MANUAL',
+                source,
+                accessToken: usesGithub ? null : accessToken,
+                selectedRepositoryName: remoteInfo?.slug ?? null,
+                repositoryDomain: remoteInfo?.domain ?? null,
+                meta,
+            },
+            signal,
+        });
         if (!response?.data || response.data.message) {
             throw new Error(response?.data?.message ?? 'Failed to shorten Nx Cloud URL');
         }
@@ -69,7 +74,9 @@ function getURLifShortenFailed(usesGithub, githubSlug, apiUrl, source, accessTok
 }
 async function getInstallationSupportsGitHub(apiUrl, signal) {
     try {
-        const response = await require('axios').get(`${apiUrl}/nx-cloud/system/features`, { signal });
+        const response = await (0, http_client_1.httpRequest)(`${apiUrl}/nx-cloud/system/features`, {
+            signal,
+        });
         if (!response?.data || response.data.message) {
             throw new Error(response?.data?.message ?? 'Failed to shorten Nx Cloud URL');
         }

package/dist/src/plugins/js/index.js

@@ -18,12 +18,16 @@ const lock_file_1 = require("./lock-file/lock-file");
 const build_dependencies_1 = require("./project-graph/build-dependencies/build-dependencies");
 const config_1 = require("./utils/config");
 exports.name = 'nx/js/dependencies-and-lockfile';
-// Separate in-memory caches
-let cachedExternalNodes;
+// An install can rewrite the lockfile between createNodes and
+// createDependencies, so both parse the one createNodes read.
+let cachedLockFile;
 let cachedKeyMap;
 exports.createNodes = [
     (0, globs_1.combineGlobPatterns)(lock_file_1.LOCKFILES),
     (files, _, context) => {
+        // A long-lived process must not reuse a lockfile this computation skipped.
+        cachedLockFile = undefined;
+        cachedKeyMap = undefined;
         return (0, plugins_1.createNodesFromFiles)(internalCreateNodes, files, _, context);
     },
 ];
@@ -42,41 +46,45 @@ function internalCreateNodes(lockFile, _, context) {
         ? (0, fs_1.readFileSync)(lockFilePath, 'utf-8')
         : (0, bun_parser_1.readBunLockFile)(lockFilePath);
     const lockFileHash = getLockFileHash(lockFileContents);
-    if (!lockFileNeedsReprocessing(lockFileHash, externalNodesHashFile)) {
-        const { nodes, keyMap } = readCachedExternalNodes();
-        cachedExternalNodes = nodes;
-        cachedKeyMap = keyMap;
+    cachedLockFile = { packageManager, lockFile, lockFileContents, lockFileHash };
+    const cached = readCache(externalNodesCache, lockFileHash);
+    if (cached) {
+        cachedKeyMap = deserializeKeyMap(cached.keyMap, cached.nodes);
         return {
-            externalNodes: nodes,
+            externalNodes: cached.nodes,
         };
     }
-    const { nodes: externalNodes, keyMap } = (0, lock_file_1.getLockFileNodes)(packageManager, lockFileContents, lockFileHash, context);
-    cachedExternalNodes = externalNodes;
+    const { nodes: externalNodes, keyMap } = (0, lock_file_1.getLockFileNodes)(packageManager, lockFile, lockFileContents, lockFileHash, context);
     cachedKeyMap = keyMap;
-    writeExternalNodesCache(lockFileHash, externalNodes, keyMap);
+    writeCache(externalNodesCache, lockFileHash, {
+        nodes: externalNodes,
+        keyMap: serializeKeyMap(keyMap),
+    });
     return {
         externalNodes,
     };
 }
 const createDependencies = (_, ctx) => {
     const pluginConfig = (0, config_1.jsPluginConfig)(ctx.nxJsonConfiguration);
-    const packageManager = (0, package_manager_1.detectPackageManager)(workspace_root_1.workspaceRoot);
     let lockfileDependencies = [];
     // lockfile may not exist yet
     if (pluginConfig.analyzeLockfile &&
-        (0, lock_file_1.lockFileExists)(packageManager) &&
-        cachedExternalNodes) {
-        const lockFilePath = (0, path_1.join)(workspace_root_1.workspaceRoot, (0, lock_file_1.getLockFileName)(packageManager));
-        const lockFileContents = packageManager !== 'bun'
-            ? (0, fs_1.readFileSync)(lockFilePath, 'utf-8')
-            : (0, bun_parser_1.readBunLockFile)(lockFilePath);
-        const lockFileHash = getLockFileHash(lockFileContents);
-        if (!lockFileNeedsReprocessing(lockFileHash, dependenciesHashFile)) {
-            lockfileDependencies = readCachedDependencies();
+        cachedLockFile &&
+        (0, lock_file_1.lockFileExists)(cachedLockFile.packageManager)) {
+        const { packageManager, lockFile, lockFileContents, lockFileHash } = cachedLockFile;
+        // Cached dependencies name their external nodes, and those names also
+        // depend on node_modules hoisting.
+        const dependenciesHash = (0, file_hasher_1.hashArray)([
+            lockFileHash,
+            ...Object.keys(ctx.externalNodes),
+        ]);
+        const cachedDependencies = readCache(dependenciesCache, dependenciesHash);
+        if (cachedDependencies) {
+            lockfileDependencies = cachedDependencies;
         }
         else {
-            lockfileDependencies = (0, lock_file_1.getLockFileDependencies)(packageManager, lockFileContents, lockFileHash, ctx, cachedKeyMap);
-            writeDependenciesCache(lockFileHash, lockfileDependencies);
+            lockfileDependencies = (0, lock_file_1.getLockFileDependencies)(packageManager, lockFile, lockFileContents, lockFileHash, ctx, cachedKeyMap);
+            writeCache(dependenciesCache, dependenciesHash, lockfileDependencies);
         }
     }
     perf_hooks_1.performance.mark('build typescript dependencies - start');
@@ -107,7 +115,7 @@ function serializeKeyMap(keyMap) {
     }
     return serialized;
 }
-// Deserialize keyMap from JSON format using ctx.externalNodes
+// Deserialize keyMap from JSON format
 function deserializeKeyMap(serialized, externalNodes) {
     const keyMap = new Map();
     for (const [key, value] of Object.entries(serialized)) {
@@ -131,47 +139,24 @@ function deserializeKeyMap(serialized, externalNodes) {
     }
     return keyMap;
 }
-function lockFileNeedsReprocessing(lockHash, hashFilePath) {
+function readCache(path, key) {
     try {
-        return (0, fs_1.readFileSync)(hashFilePath).toString() !== lockHash;
+        const cache = JSON.parse((0, fs_1.readFileSync)(path, 'utf-8'));
+        return cache.key === key ? cache.data : undefined;
     }
     catch {
-        return true;
-    }
-}
-// External nodes cache functions
-function writeExternalNodesCache(hash, nodes, keyMap) {
-    const serializedKeyMap = serializeKeyMap(keyMap);
-    const cacheData = { nodes, keyMap: serializedKeyMap };
-    const content = safeStringify(cacheData);
-    if (content === undefined) {
-        logger_1.logger.warn(`Failed to serialize external nodes cache. Skipping cache write.`);
-        tryRemoveFile(externalNodesCache);
-        tryRemoveFile(externalNodesHashFile);
-        return;
-    }
-    (0, plugin_cache_utils_1.safeWriteFileCache)(externalNodesCache, content);
-    if ((0, fs_1.existsSync)(externalNodesCache)) {
-        (0, plugin_cache_utils_1.safeWriteFileCache)(externalNodesHashFile, hash);
+        // Another process can be mid-write, so an unreadable cache is a miss.
+        return undefined;
     }
 }
-function readCachedExternalNodes() {
-    const { nodes, keyMap } = JSON.parse((0, fs_1.readFileSync)(externalNodesCache, 'utf-8'));
-    return { nodes, keyMap: deserializeKeyMap(keyMap, nodes) };
-}
-// Dependencies cache functions
-function writeDependenciesCache(hash, dependencies) {
-    const content = safeStringify(dependencies);
+function writeCache(path, key, data) {
+    const content = safeStringify({ key, data });
     if (content === undefined) {
-        logger_1.logger.warn(`Failed to serialize dependencies cache. Skipping cache write.`);
-        tryRemoveFile(dependenciesCache);
-        tryRemoveFile(dependenciesHashFile);
+        logger_1.logger.warn(`Failed to serialize ${path}. Skipping cache write.`);
+        tryRemoveFile(path);
         return;
     }
-    (0, plugin_cache_utils_1.safeWriteFileCache)(dependenciesCache, content);
-    if ((0, fs_1.existsSync)(dependenciesCache)) {
-        (0, plugin_cache_utils_1.safeWriteFileCache)(dependenciesHashFile, hash);
-    }
+    (0, plugin_cache_utils_1.safeWriteFileCache)(path, content);
 }
 function safeStringify(data) {
     try {
@@ -191,11 +176,7 @@ function tryRemoveFile(path) {
         // Best effort
     }
 }
-function readCachedDependencies() {
-    return JSON.parse((0, fs_1.readFileSync)(dependenciesCache).toString());
-}
-// Cache file paths
-const externalNodesHashFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'lockfile-nodes.hash');
-const dependenciesHashFile = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'lockfile-dependencies.hash');
-const externalNodesCache = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'parsed-lock-file.nodes.json');
-const dependenciesCache = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'parsed-lock-file.dependencies.json');
+// Each cache file holds its key, so key and data come from one write.
+// Older Nx versions read other names with a hash file; keep these distinct.
+const externalNodesCache = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'lockfile-nodes.json');
+const dependenciesCache = (0, path_1.join)(cache_directory_1.workspaceDataDirectory, 'lockfile-dependencies.json');

package/dist/src/plugins/js/lock-file/lock-file.d.ts

@@ -10,9 +10,9 @@ import { PackageManager } from '../../../utils/package-manager';
 export declare const LOCKFILES: string[];
 export declare const AUTO_AFFECTED_LOCK_FILES: readonly ["yarn.lock", "package-lock.json", "pnpm-lock.yaml", "pnpm-lock.yml", "bun.lockb", "bun.lock"];
 /**
- * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
+ * Parses the lockfile into external nodes, plus the keyMap that getLockFileDependencies reads.
  */
-export declare function getLockFileNodes(packageManager: PackageManager, contents: string, lockFileHash: string, context: CreateNodesContext): {
+export declare function getLockFileNodes(packageManager: PackageManager, lockFile: string, contents: string, lockFileHash: string, context: CreateNodesContext): {
     nodes: Record<string, ProjectGraphExternalNode>;
     keyMap: Map<string, any>;
 };
@@ -21,9 +21,9 @@ export declare function getLockFileNodesForName(lockFile: string, contents: stri
     keyMap: Map<string, any>;
 };
 /**
- * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
+ * Parses the lockfile into dependencies between external nodes.
  */
-export declare function getLockFileDependencies(packageManager: PackageManager, contents: string, lockFileHash: string, context: CreateDependenciesContext, keyMap: Map<string, any>): RawProjectGraphDependency[];
+export declare function getLockFileDependencies(packageManager: PackageManager, lockFile: string, contents: string, lockFileHash: string, context: CreateDependenciesContext, keyMap: Map<string, any>): RawProjectGraphDependency[];
 export declare function lockFileExists(packageManager: PackageManager): boolean;
 /**
  * Returns lock file name based on the detected package manager in the root