nx 23.3.0-beta.5 → 23.3.0-beta.7

package/dist/src/utils/json-diff.js

@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JsonDiffType = void 0;
 exports.isJsonChange = isJsonChange;
 exports.jsonDiff = jsonDiff;
-exports.walkJsonTree = walkJsonTree;
-exports.deepEquals = deepEquals;
+const native_1 = require("../native");
 var JsonDiffType;
 (function (JsonDiffType) {
     JsonDiffType["Deleted"] = "JsonPropertyDeleted";
@@ -16,97 +15,10 @@ function isJsonChange(change) {
         change.type === JsonDiffType.Deleted ||
         change.type === JsonDiffType.Modified);
 }
+/**
+ * The changes from `lhs` to `rhs`: every path whose value was deleted or
+ * modified, containers included, then every added path.
+ */
 function jsonDiff(lhs, rhs) {
-    const result = [];
-    const seenInLhs = new Set();
-    walkJsonTree(lhs, [], (path, lhsValue) => {
-        seenInLhs.add(hashArray(path));
-        const rhsValue = getJsonValue(path, rhs);
-        if (rhsValue === undefined) {
-            result.push({
-                type: JsonDiffType.Deleted,
-                path,
-                value: {
-                    lhs: lhsValue,
-                    rhs: undefined,
-                },
-            });
-        }
-        else if (!deepEquals(lhsValue, rhsValue)) {
-            result.push({
-                type: JsonDiffType.Modified,
-                path,
-                value: {
-                    lhs: lhsValue,
-                    rhs: rhsValue,
-                },
-            });
-        }
-        return typeof lhsValue === 'object' || Array.isArray(lhsValue);
-    });
-    walkJsonTree(rhs, [], (path, rhsValue) => {
-        const addedInRhs = !seenInLhs.has(hashArray(path));
-        if (addedInRhs) {
-            result.push({
-                type: JsonDiffType.Added,
-                path,
-                value: {
-                    lhs: undefined,
-                    rhs: rhsValue,
-                },
-            });
-        }
-        return typeof rhsValue === 'object' || Array.isArray(rhsValue);
-    });
-    return result;
-}
-// Depth-first walk down JSON tree.
-function walkJsonTree(json, currPath, visitor) {
-    if (!json || typeof json !== 'object') {
-        return;
-    }
-    Object.keys(json).forEach((key) => {
-        const path = currPath.concat([key]);
-        const shouldContinue = visitor(path, json[key]);
-        if (shouldContinue) {
-            walkJsonTree(json[key], path, visitor);
-        }
-    });
-}
-function hashArray(ary) {
-    return JSON.stringify(ary);
-}
-function getJsonValue(path, json) {
-    let curr = json;
-    for (const k of path) {
-        curr = curr[k];
-        if (curr === undefined) {
-            break;
-        }
-    }
-    return curr;
-}
-function deepEquals(a, b) {
-    if (a === b) {
-        return true;
-    }
-    // Values do not need to be checked for deep equality and the above is false
-    if (
-    // Values are different types
-    typeof a !== typeof b ||
-        // Values are the same type but not an object or array
-        (typeof a !== 'object' && !Array.isArray(a)) ||
-        // Objects are the same type, objects or arrays, but do not have the same number of keys
-        Object.keys(a).length !== Object.keys(b).length) {
-        return false;
-    }
-    // Values need to be checked for deep equality
-    return Object.entries(a).reduce((equal, [key, aValue]) => {
-        // Skip other keys if it is already not equal.
-        if (!equal) {
-            return equal;
-        }
-        // Traverse the object
-        return deepEquals(aValue, b[key]);
-    }, true);
+    return ((0, native_1.diffJson)(JSON.stringify(lhs ?? null), JSON.stringify(rhs ?? null)) ?? []);
 }

package/dist/src/utils/nx-cloud-utils.d.ts

@@ -1,4 +1,6 @@
 import { NxJsonConfiguration } from '../config/nx-json';
 export declare function isNxCloudDisabled(nxJson: NxJsonConfiguration): boolean;
 export declare function isNxCloudUsed(nxJson: NxJsonConfiguration): boolean;
+/** Whether nx.json connects the workspace to Nx Cloud, ignoring the env. */
+export declare function isNxCloudConfigured(nxJson: NxJsonConfiguration): boolean;
 export declare function getNxCloudUrl(nxJson: NxJsonConfiguration): string;

package/dist/src/utils/nx-cloud-utils.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNxCloudDisabled = isNxCloudDisabled;
 exports.isNxCloudUsed = isNxCloudUsed;
+exports.isNxCloudConfigured = isNxCloudConfigured;
 exports.getNxCloudUrl = getNxCloudUrl;
 function isNxCloudDisabled(nxJson) {
     return process.env.NX_NO_CLOUD === 'true' || nxJson.neverConnectToCloud;
@@ -12,7 +13,11 @@ function isNxCloudUsed(nxJson) {
     }
     return (!!process.env.NX_CLOUD_AUTH_TOKEN ||
         !!process.env.NX_CLOUD_ACCESS_TOKEN ||
-        !!nxJson.nxCloudAccessToken ||
+        isNxCloudConfigured(nxJson));
+}
+/** Whether nx.json connects the workspace to Nx Cloud, ignoring the env. */
+function isNxCloudConfigured(nxJson) {
+    return (!!nxJson.nxCloudAccessToken ||
         !!nxJson.nxCloudId ||
         !!Object.values(nxJson.tasksRunnerOptions ?? {}).find((r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud'));
 }

package/dist/src/utils/project-graph-utils.d.ts

@@ -1,6 +1,8 @@
 import { ProjectGraph, ProjectGraphProjectNode } from '../config/project-graph';
 import type { ProjectConfiguration } from '../config/workspace-json-project-json';
 export declare function projectHasTarget(project: ProjectGraphProjectNode, target: string): boolean;
+/** The projects that define at least one of `targets`. */
+export declare function runnableForTarget(projects: Record<string, ProjectGraphProjectNode>, targets: string[]): Set<string>;
 export declare function projectHasTargetAndConfiguration(project: ProjectGraphProjectNode, target: string, configuration: string): any;
 export declare function getSourceDirOfDependentProjects(projectName: string, projectGraph?: ProjectGraph): [
     projectDirs: string[],

package/dist/src/utils/project-graph-utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.projectHasTarget = projectHasTarget;
+exports.runnableForTarget = runnableForTarget;
 exports.projectHasTargetAndConfiguration = projectHasTargetAndConfiguration;
 exports.getSourceDirOfDependentProjects = getSourceDirOfDependentProjects;
 exports.findAllProjectNodeDependencies = findAllProjectNodeDependencies;
@@ -13,6 +14,17 @@ function projectHasTarget(project, target) {
         project.data.targets &&
         project.data.targets[target]);
 }
+/** The projects that define at least one of `targets`. */
+function runnableForTarget(projects, targets) {
+    const runnable = new Set();
+    for (const projectName in projects) {
+        const project = projects[projectName];
+        if (targets.some((target) => projectHasTarget(project, target))) {
+            runnable.add(projectName);
+        }
+    }
+    return runnable;
+}
 function projectHasTargetAndConfiguration(project, target, configuration) {
     return (projectHasTarget(project, target) &&
         project.data.targets[target].configurations &&

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "23.3.0-beta.5",
+  "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.",
@@ -11,6 +11,7 @@
   },
   "files": [
     "dist/bin",
+    "dist/nx-cloud-internals.*",
     "dist/plugins",
     "dist/presets",
     "dist/release",
@@ -114,7 +115,7 @@
     "hasown": "2.0.4",
     "https-proxy-agent": "5.0.1",
     "ieee754": "1.2.1",
-    "ignore": "7.0.5",
+    "ignore": "7.0.6",
     "inherits": "2.0.4",
     "is-docker": "3.0.0",
     "is-fullwidth-code-point": "3.0.0",
@@ -148,7 +149,7 @@
     "restore-cursor": "3.1.0",
     "run-applescript": "7.0.0",
     "safe-buffer": "5.2.1",
-    "semver": "7.8.4",
+    "semver": "7.8.5",
     "signal-exit": "3.0.7",
     "sisteransi": "1.0.5",
     "smol-toml": "1.7.1",
@@ -184,16 +185,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-arm64": "23.3.0-beta.5",
-    "@nx/nx-darwin-x64": "23.3.0-beta.5",
-    "@nx/nx-freebsd-x64": "23.3.0-beta.5",
-    "@nx/nx-linux-arm-gnueabihf": "23.3.0-beta.5",
-    "@nx/nx-linux-arm64-gnu": "23.3.0-beta.5",
-    "@nx/nx-linux-arm64-musl": "23.3.0-beta.5",
-    "@nx/nx-linux-x64-gnu": "23.3.0-beta.5",
-    "@nx/nx-linux-x64-musl": "23.3.0-beta.5",
-    "@nx/nx-win32-arm64-msvc": "23.3.0-beta.5",
-    "@nx/nx-win32-x64-msvc": "23.3.0-beta.5"
+    "@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",
@@ -278,6 +279,9 @@
   },
   "typesVersions": {
     "*": {
+      "nx-cloud-internals": [
+        "dist/nx-cloud-internals.d.ts"
+      ],
       "bin/*": [
         "dist/bin/*.d.ts"
       ],
@@ -366,6 +370,11 @@
     },
     "./package.json": "./package.json",
     "./package": "./package.json",
+    "./nx-cloud-internals": {
+      "@nx/nx-source": "./nx-cloud-internals.ts",
+      "types": "./dist/nx-cloud-internals.d.ts",
+      "default": "./dist/nx-cloud-internals.js"
+    },
     "./migrations.json": "./migrations.json",
     "./migrations": "./migrations.json",
     "./generators.json": "./generators.json",

package/schemas/nx-schema.json

@@ -924,6 +924,9 @@
         "cache": {
           "$ref": "#/definitions/targetDefaultsConfig/properties/cache"
         },
+        "ultracache": {
+          "$ref": "#/definitions/targetDefaultsConfig/properties/ultracache"
+        },
         "syncGenerators": {
           "$ref": "#/definitions/targetDefaultsConfig/properties/syncGenerators"
         }
@@ -1050,6 +1053,37 @@
           "type": "boolean",
           "description": "Specifies if the given target should be cacheable"
         },
+        "ultracache": {
+          "type": "object",
+          "description": "Configures ultracache for tasks of this target. Nx Cloud only.",
+          "properties": {
+            "...": {
+              "type": "boolean",
+              "const": true,
+              "description": "Merges with the inherited ultracache configuration instead of replacing it. Keys before this token defer to the inherited value; keys after it win."
+            },
+            "mode": {
+              "enum": ["on", "warn", "error", "off"],
+              "default": "on",
+              "description": "How this target's tasks participate. 'on' records IO and lets the recording stand in for the declared inputs and outputs. 'warn' records and reports undeclared reads and writes without applying them. 'error' is reserved for failing the task on an undeclared read or write; until per-target enforcement lands it behaves as 'warn'. 'off' records nothing."
+            },
+            "ignoredReads": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "Workspace-relative glob patterns for reads excluded from ultracache reports. The first path segment cannot contain '*', and '?', '!', '[', ']' and extglobs are not supported; anchor the pattern to a directory instead of leading with '**'."
+            },
+            "ignoredWrites": {
+              "type": "array",
+              "items": {
+                "type": "string"
+              },
+              "description": "Workspace-relative glob patterns for writes excluded from ultracache reports. The first path segment cannot contain '*', and '?', '!', '[', ']' and extglobs are not supported; anchor the pattern to a directory instead of leading with '**'."
+            }
+          },
+          "additionalProperties": false
+        },
         "syncGenerators": {
           "type": "array",
           "items": {

package/schemas/project-schema.json

@@ -138,6 +138,37 @@
             "type": "boolean",
             "description": "Specifies if the given target should be cacheable"
           },
+          "ultracache": {
+            "type": "object",
+            "description": "Configures ultracache for tasks of this target. Nx Cloud only.",
+            "properties": {
+              "...": {
+                "type": "boolean",
+                "const": true,
+                "description": "Merges with the inherited ultracache configuration instead of replacing it. Keys before this token defer to the inherited value; keys after it win."
+              },
+              "mode": {
+                "enum": ["on", "warn", "error", "off"],
+                "default": "on",
+                "description": "How this target's tasks participate. 'on' records IO and lets the recording stand in for the declared inputs and outputs. 'warn' records and reports undeclared reads and writes without applying them. 'error' is reserved for failing the task on an undeclared read or write; until per-target enforcement lands it behaves as 'warn'. 'off' records nothing."
+              },
+              "ignoredReads": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "Workspace-relative glob patterns for reads excluded from ultracache reports. The first path segment cannot contain '*', and '?', '!', '[', ']' and extglobs are not supported; anchor the pattern to a directory instead of leading with '**'."
+              },
+              "ignoredWrites": {
+                "type": "array",
+                "items": {
+                  "type": "string"
+                },
+                "description": "Workspace-relative glob patterns for writes excluded from ultracache reports. The first path segment cannot contain '*', and '?', '!', '[', ']' and extglobs are not supported; anchor the pattern to a directory instead of leading with '**'."
+              }
+            },
+            "additionalProperties": false
+          },
           "continuous": {
             "type": "boolean",
             "default": false,

package/dist/src/project-graph/affected/locators/project-glob-changes.d.ts

@@ -1,2 +0,0 @@
-import { TouchedProjectLocator } from '../affected-project-graph-models';
-export declare const getTouchedProjectsFromProjectGlobChanges: TouchedProjectLocator;

package/dist/src/project-graph/affected/locators/project-glob-changes.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTouchedProjectsFromProjectGlobChanges = void 0;
-const minimatch_1 = require("minimatch");
-const nx_json_1 = require("../../../config/nx-json");
-const workspace_root_1 = require("../../../utils/workspace-root");
-const globs_1 = require("../../../utils/globs");
-const get_plugins_1 = require("../../plugins/get-plugins");
-const file_utils_1 = require("../../file-utils");
-const getTouchedProjectsFromProjectGlobChanges = async (touchedFiles, projectGraphNodes, _nxJson, _packageJson, _projectGraph, projectDeletionAffectsAllProjects = true) => {
-    // Only deletions matter here. Uses `isDeletedFile`, not `getChanges()`,
-    // which also parses json/lock files at two revisions for every touched file.
-    const deleted = touchedFiles.filter((touchedFile) => (0, file_utils_1.isDeletedFile)(touchedFile.file));
-    if (!deleted.length) {
-        return [];
-    }
-    const globPattern = await (async () => {
-        if (process.env.NX_FORCE_REUSE_CACHED_GRAPH === 'true') {
-            return (0, globs_1.combineGlobPatterns)([
-                '**/package.json',
-                '**/project.json',
-                'project.json',
-                'package.json',
-            ]);
-        }
-        const nxJson = (0, nx_json_1.readNxJson)(workspace_root_1.workspaceRoot);
-        const capabilities = await (0, get_plugins_1.capabilitiesOfConfiguredPlugins)(nxJson, workspace_root_1.workspaceRoot);
-        return (0, globs_1.combineGlobPatterns)(capabilities
-            .map((capability) => capability.createNodesPattern)
-            .filter((pattern) => !!pattern));
-    })();
-    const configDeleted = deleted.some((touchedFile) => (0, minimatch_1.minimatch)(touchedFile.file, globPattern, { dot: true }));
-    // If any project has been deleted, we must assume all projects were
-    // affected. A modified project configuration is under its own project's
-    // root, which marks that project affected without this locator.
-    return configDeleted && projectDeletionAffectsAllProjects
-        ? Object.keys(projectGraphNodes)
-        : [];
-};
-exports.getTouchedProjectsFromProjectGlobChanges = getTouchedProjectsFromProjectGlobChanges;

package/dist/src/project-graph/affected/locators/workspace-json-changes.d.ts

@@ -1,4 +0,0 @@
-import { WholeFileChange } from '../../file-utils';
-import { JsonChange } from '../../../utils/json-diff';
-import { TouchedProjectLocator } from '../affected-project-graph-models';
-export declare const getTouchedProjectsInWorkspaceJson: TouchedProjectLocator<WholeFileChange | JsonChange>;

package/dist/src/project-graph/affected/locators/workspace-json-changes.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTouchedProjectsInWorkspaceJson = void 0;
-const file_utils_1 = require("../../file-utils");
-const json_diff_1 = require("../../../utils/json-diff");
-const getTouchedProjectsInWorkspaceJson = (touchedFiles, projectGraphNodes) => {
-    const workspaceChange = touchedFiles.find((change) => change.file === `angular.json`);
-    if (!workspaceChange) {
-        return [];
-    }
-    const changes = workspaceChange.getChanges();
-    if (changes.some((change) => {
-        if ((0, json_diff_1.isJsonChange)(change)) {
-            return change.path[0] !== 'projects';
-        }
-        if ((0, file_utils_1.isWholeFileChange)(change)) {
-            return true;
-        }
-        return false;
-    })) {
-        return Object.keys(projectGraphNodes);
-    }
-    const touched = [];
-    for (let i = 0; i < changes.length; i++) {
-        const change = changes[i];
-        if (!(0, json_diff_1.isJsonChange)(change) || change.path[0] !== 'projects') {
-            continue;
-        }
-        // Only look for changes that are changes to the whole project definition
-        if (change.path.length !== 2) {
-            continue;
-        }
-        switch (change.type) {
-            case json_diff_1.JsonDiffType.Deleted: {
-                // We are not sure which projects used to depend on a deleted project
-                // so return all projects to be safe
-                return Object.keys(projectGraphNodes);
-            }
-            default: {
-                // Add the project name
-                touched.push(change.path[1]);
-            }
-        }
-    }
-    return touched;
-};
-exports.getTouchedProjectsInWorkspaceJson = getTouchedProjectsInWorkspaceJson;

package/dist/src/project-graph/affected/locators/workspace-projects.d.ts

@@ -1,3 +0,0 @@
-import { TouchedProjectLocator } from '../affected-project-graph-models';
-export declare const getTouchedProjects: TouchedProjectLocator;
-export declare const getImplicitlyTouchedProjects: TouchedProjectLocator;

package/dist/src/project-graph/affected/locators/workspace-projects.js

@@ -1,74 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getImplicitlyTouchedProjects = exports.getTouchedProjects = void 0;
-const minimatch_1 = require("minimatch");
-const find_project_for_path_1 = require("../../utils/find-project-for-path");
-const getTouchedProjects = (touchedFiles, projectGraphNodes) => {
-    const projectRootMap = (0, find_project_for_path_1.createProjectRootMappings)(projectGraphNodes);
-    return touchedFiles.reduce((affected, f) => {
-        const matchingProject = (0, find_project_for_path_1.findProjectForPath)(f.file, projectRootMap);
-        if (matchingProject) {
-            affected.push(matchingProject);
-        }
-        return affected;
-    }, []);
-};
-exports.getTouchedProjects = getTouchedProjects;
-const getImplicitlyTouchedProjects = (fileChanges, projectGraphNodes, nxJson) => {
-    const implicits = {
-        'nx.json': '*',
-    };
-    Object.values(projectGraphNodes || {}).forEach((node) => {
-        const namedInputs = {
-            ...nxJson.namedInputs,
-            ...node.data.namedInputs,
-        };
-        extractFilesFromTargetInputs(node.data.targets, namedInputs).forEach((input) => {
-            implicits[input] ??= [];
-            if (Array.isArray(implicits[input])) {
-                implicits[input].push(node.name);
-            }
-        });
-    });
-    const touched = new Set();
-    for (const [pattern, projects] of Object.entries(implicits)) {
-        const implicitDependencyWasChanged = fileChanges.some((f) => (0, minimatch_1.minimatch)(f.file, pattern, { dot: true }));
-        if (!implicitDependencyWasChanged) {
-            continue;
-        }
-        // File change affects all projects, just return all projects.
-        if (projects === '*') {
-            return Object.keys(projectGraphNodes);
-        }
-        else if (Array.isArray(projects)) {
-            projects.forEach((project) => touched.add(project));
-        }
-    }
-    return Array.from(touched);
-};
-exports.getImplicitlyTouchedProjects = getImplicitlyTouchedProjects;
-function extractFilesFromTargetInputs(targets, namedInputs) {
-    const globalFiles = [];
-    for (const target of Object.values(targets || {})) {
-        if (target.inputs) {
-            globalFiles.push(...extractFilesFromInputs(target.inputs, namedInputs));
-        }
-    }
-    return globalFiles;
-}
-function extractFilesFromInputs(inputs, namedInputs) {
-    const globalFiles = [];
-    for (const input of inputs) {
-        if (typeof input === 'string' && input in namedInputs) {
-            globalFiles.push(...extractFilesFromInputs(namedInputs[input], namedInputs));
-        }
-        else if (typeof input === 'string' &&
-            input.startsWith('{workspaceRoot}/')) {
-            globalFiles.push(input.substring('{workspaceRoot}/'.length));
-        }
-        else if (input.fileset && input.fileset.startsWith('{workspaceRoot}/')) {
-            globalFiles.push(input.fileset.substring('{workspaceRoot}/'.length));
-        }
-    }
-    return globalFiles;
-}