nx 23.3.0-beta.6 → 23.3.0-beta.7

package/dist/src/io-snapshots/outputs.js

@@ -19,7 +19,7 @@ function applyIoSnapshotOutputs(projectGraph, taskGraph, snapshots) {
     }
     // Same walk as hashing, already confined to the workspace and outside
     // node_modules/.nx/.git; ineligible tasks are absent.
-    const observed = (0, native_1.getObservedIoSnapshotOutputs)(snapshots, taskGraph, (0, overrides_1.ioSnapshotEligibilityOptions)(projectGraph, taskGraph));
+    const observed = (0, native_1.getObservedIoSnapshotOutputs)(snapshots, (0, overrides_1.getUltraCacheConfig)(taskGraph), (0, overrides_1.ioSnapshotEligibilityOptions)(projectGraph, taskGraph));
     for (const [taskId, outputs] of Object.entries(observed)) {
         const task = taskGraph.tasks[taskId];
         if (task) {

package/dist/src/io-snapshots/overrides.d.ts

@@ -1,6 +1,11 @@
 import type { ProjectGraph } from '../config/project-graph';
 import type { TaskGraph } from '../config/task-graph';
-import { type IoSnapshotEligibilityOptions, type IoSnapshotReport, type IoSnapshots } from '../native';
+import { type IoSnapshotEligibilityOptions, type IoSnapshotReport, type IoSnapshots, type TaskUltracacheConfiguration } from '../native';
+/**
+ * Each task's ultracache configuration: all the native eligibility walk reads
+ * from a task. `null`, not `undefined`: the native map drops `undefined` keys.
+ */
+export declare function getUltraCacheConfig(taskGraph: TaskGraph): Record<string, TaskUltracacheConfiguration | null>;
 /** The eligibility walk's view of the run's tasks, as JS resolves it. */
 export declare function ioSnapshotEligibilityOptions(projectGraph: ProjectGraph, taskGraph: TaskGraph): IoSnapshotEligibilityOptions;
 /**

package/dist/src/io-snapshots/overrides.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getUltraCacheConfig = getUltraCacheConfig;
 exports.ioSnapshotEligibilityOptions = ioSnapshotEligibilityOptions;
 exports.buildIoSnapshotOverrides = buildIoSnapshotOverrides;
 const native_1 = require("../native");
@@ -32,6 +33,16 @@ function customHasherTaskIds(projectGraph, taskGraph) {
     customHasherMemo.set(taskGraph, ids);
     return ids;
 }
+/**
+ * Each task's ultracache configuration: all the native eligibility walk reads
+ * from a task. `null`, not `undefined`: the native map drops `undefined` keys.
+ */
+function getUltraCacheConfig(taskGraph) {
+    return Object.fromEntries(Object.entries(taskGraph.tasks).map(([id, task]) => [
+        id,
+        task.ultracache ?? null,
+    ]));
+}
 /** The eligibility walk's view of the run's tasks, as JS resolves it. */
 function ioSnapshotEligibilityOptions(projectGraph, taskGraph) {
     return {
@@ -45,5 +56,5 @@ function ioSnapshotEligibilityOptions(projectGraph, taskGraph) {
  * the `--verbose` run summary.
  */
 function buildIoSnapshotOverrides(projectGraph, taskGraph, snapshots) {
-    return (0, native_1.getIoSnapshotReport)(snapshots, taskGraph, ioSnapshotEligibilityOptions(projectGraph, taskGraph));
+    return (0, native_1.getIoSnapshotReport)(snapshots, getUltraCacheConfig(taskGraph), ioSnapshotEligibilityOptions(projectGraph, taskGraph));
 }

package/dist/src/native/index.d.ts

@@ -722,7 +722,7 @@ export declare function getHardcodedIgnorePatterns(): Array<string>
 export declare function getIoSnapshotDeferredTaskIds(snapshots: IoSnapshots, taskGraph: TaskGraph): Array<string>
 
 /** The eligibility report, for the run summary. */
-export declare function getIoSnapshotReport(snapshots: IoSnapshots, taskGraph: TaskGraph, options?: IoSnapshotEligibilityOptions | undefined | null): IoSnapshotReport
+export declare function getIoSnapshotReport(snapshots: IoSnapshots, tasks: Record<string, TaskUltracacheConfiguration | null>, options?: IoSnapshotEligibilityOptions | undefined | null): IoSnapshotReport
 
 /**
  * If `workspace_root` is inside a git worktree, returns the main repo root.
@@ -734,7 +734,7 @@ export declare function getMainWorktreeRoot(workspaceRoot: string): string | nul
  * Observed outputs per eligible task, for the runner to union into
  * `task.outputs`.
  */
-export declare function getObservedIoSnapshotOutputs(snapshots: IoSnapshots, taskGraph: TaskGraph, options?: IoSnapshotEligibilityOptions | undefined | null): Record<string, Array<string>>
+export declare function getObservedIoSnapshotOutputs(snapshots: IoSnapshots, tasks: Record<string, TaskUltracacheConfiguration | null>, options?: IoSnapshotEligibilityOptions | undefined | null): Record<string, Array<string>>
 
 export declare function getTransformableOutputs(outputs: Array<string>): Array<string>
 

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

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

@@ -54,14 +54,14 @@ const PNPM_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, PNP
 const BUN_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, bun_parser_1.BUN_LOCK_FILE);
 const BUN_TEXT_LOCK_PATH = (0, node_path_1.join)(workspace_root_1.workspaceRoot, bun_parser_1.BUN_TEXT_LOCK_FILE);
 /**
- * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
+ * Parses the lockfile into external nodes, plus the keyMap that getLockFileDependencies reads.
  */
-function getLockFileNodes(packageManager, contents, lockFileHash, context) {
+function getLockFileNodes(packageManager, lockFile, contents, lockFileHash, context) {
     try {
         const packageJson = packageManager === 'yarn' || packageManager === 'bun'
             ? (0, fileutils_1.readJsonFile)((0, node_path_1.join)(context.workspaceRoot, 'package.json'))
             : undefined;
-        return getLockFileNodesForName(getLockFileName(packageManager), contents, lockFileHash, packageJson);
+        return getLockFileNodesForName(lockFile, contents, lockFileHash, packageJson);
     }
     catch (e) {
         if (!isPostInstallProcess()) {
@@ -94,9 +94,9 @@ function getLockFileNodesForName(lockFile, contents, lockFileHash, packageJson)
     throw new Error(`Unknown lock file: ${lockFile}`);
 }
 /**
- * Parses lock file and maps dependencies and metadata to {@link LockFileGraph}
+ * Parses the lockfile into dependencies between external nodes.
  */
-function getLockFileDependencies(packageManager, contents, lockFileHash, context, keyMap) {
+function getLockFileDependencies(packageManager, lockFile, contents, lockFileHash, context, keyMap) {
     try {
         if (packageManager === 'yarn') {
             return (0, yarn_parser_1.getYarnLockfileDependencies)(contents, lockFileHash, context, keyMap);
@@ -108,8 +108,7 @@ function getLockFileDependencies(packageManager, contents, lockFileHash, context
             return (0, npm_parser_1.getNpmLockfileDependencies)(contents, lockFileHash, context, keyMap);
         }
         if (packageManager === 'bun') {
-            const lockFilePath = getLockFilePath(packageManager);
-            if (lockFilePath.endsWith(bun_parser_1.BUN_TEXT_LOCK_FILE)) {
+            if (lockFile === bun_parser_1.BUN_TEXT_LOCK_FILE) {
                 // Bun parser doesn't use keyMap
                 return (0, bun_parser_1.getBunTextLockfileDependencies)(contents, lockFileHash, context);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "23.3.0-beta.6",
+  "version": "23.3.0-beta.7",
   "private": false,
   "type": "commonjs",
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
@@ -185,16 +185,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "23.3.0-beta.6",
-    "@nx/nx-darwin-x64": "23.3.0-beta.6",
-    "@nx/nx-freebsd-x64": "23.3.0-beta.6",
-    "@nx/nx-linux-arm-gnueabihf": "23.3.0-beta.6",
-    "@nx/nx-linux-arm64-gnu": "23.3.0-beta.6",
-    "@nx/nx-linux-arm64-musl": "23.3.0-beta.6",
-    "@nx/nx-linux-x64-gnu": "23.3.0-beta.6",
-    "@nx/nx-linux-x64-musl": "23.3.0-beta.6",
-    "@nx/nx-win32-arm64-msvc": "23.3.0-beta.6",
-    "@nx/nx-win32-x64-msvc": "23.3.0-beta.6"
+    "@nx/nx-darwin-arm64": "23.3.0-beta.7",
+    "@nx/nx-darwin-x64": "23.3.0-beta.7",
+    "@nx/nx-freebsd-x64": "23.3.0-beta.7",
+    "@nx/nx-linux-arm-gnueabihf": "23.3.0-beta.7",
+    "@nx/nx-linux-arm64-gnu": "23.3.0-beta.7",
+    "@nx/nx-linux-arm64-musl": "23.3.0-beta.7",
+    "@nx/nx-linux-x64-gnu": "23.3.0-beta.7",
+    "@nx/nx-linux-x64-musl": "23.3.0-beta.7",
+    "@nx/nx-win32-arm64-msvc": "23.3.0-beta.7",
+    "@nx/nx-win32-x64-msvc": "23.3.0-beta.7"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",