nx 19.3.0-canary.20240613-c86de97 → 19.4.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.3.0-canary.20240613-c86de97",
+  "version": "19.4.0-beta.0",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -70,7 +70,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.3.0-canary.20240613-c86de97"
+    "@nrwl/tao": "19.4.0-beta.0"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -85,16 +85,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.3.0-canary.20240613-c86de97",
-    "@nx/nx-darwin-arm64": "19.3.0-canary.20240613-c86de97",
-    "@nx/nx-linux-x64-gnu": "19.3.0-canary.20240613-c86de97",
-    "@nx/nx-linux-x64-musl": "19.3.0-canary.20240613-c86de97",
-    "@nx/nx-win32-x64-msvc": "19.3.0-canary.20240613-c86de97",
-    "@nx/nx-linux-arm64-gnu": "19.3.0-canary.20240613-c86de97",
-    "@nx/nx-linux-arm64-musl": "19.3.0-canary.20240613-c86de97",
-    "@nx/nx-linux-arm-gnueabihf": "19.3.0-canary.20240613-c86de97",
-    "@nx/nx-win32-arm64-msvc": "19.3.0-canary.20240613-c86de97",
-    "@nx/nx-freebsd-x64": "19.3.0-canary.20240613-c86de97"
+    "@nx/nx-darwin-x64": "19.4.0-beta.0",
+    "@nx/nx-darwin-arm64": "19.4.0-beta.0",
+    "@nx/nx-linux-x64-gnu": "19.4.0-beta.0",
+    "@nx/nx-linux-x64-musl": "19.4.0-beta.0",
+    "@nx/nx-win32-x64-msvc": "19.4.0-beta.0",
+    "@nx/nx-linux-arm64-gnu": "19.4.0-beta.0",
+    "@nx/nx-linux-arm64-musl": "19.4.0-beta.0",
+    "@nx/nx-linux-arm-gnueabihf": "19.4.0-beta.0",
+    "@nx/nx-win32-arm64-msvc": "19.4.0-beta.0",
+    "@nx/nx-freebsd-x64": "19.4.0-beta.0"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/plugins/js/lock-file/npm-parser.js

@@ -289,15 +289,16 @@ function getPackageParent(path, packages) {
 function mapSnapshots(rootLockFile, graph) {
     const nestedNodes = new Set();
     const visitedNodes = new Map();
-    const visitedPaths = new Set();
     const remappedPackages = new Map();
     // add first level children
     Object.values(graph.externalNodes).forEach((node) => {
         if (node.name === `npm:${node.data.packageName}`) {
             const mappedPackage = mapPackage(rootLockFile, node.data.packageName, node.data.version);
             remappedPackages.set(mappedPackage.path, mappedPackage);
-            visitedNodes.set(node, new Set([mappedPackage.path]));
-            visitedPaths.add(mappedPackage.path);
+            visitedNodes.set(node, {
+                packagePaths: new Set([mappedPackage.path]),
+                unresolvedParents: new Set(),
+            });
         }
         else {
             nestedNodes.add(node);
@@ -306,7 +307,7 @@ function mapSnapshots(rootLockFile, graph) {
     let remappedPackagesArray;
     if (nestedNodes.size) {
         const invertedGraph = (0, operators_1.reverse)(graph);
-        nestMappedPackages(invertedGraph, remappedPackages, nestedNodes, visitedNodes, visitedPaths, rootLockFile);
+        nestMappedPackages(invertedGraph, remappedPackages, nestedNodes, visitedNodes, rootLockFile);
         // initially we naively map package paths to topParent/../parent/child
         // but some of those should be nested higher up the tree
         remappedPackagesArray = elevateNestedPaths(remappedPackages);
@@ -332,31 +333,34 @@ function mapPackage(rootLockFile, packageName, version, parentPath = '') {
         valueV3,
     };
 }
-function nestMappedPackages(invertedGraph, result, nestedNodes, visitedNodes, visitedPaths, rootLockFile) {
+function nestMappedPackages(invertedGraph, result, nestedNodes, visitedNodes, rootLockFile) {
     const initialSize = nestedNodes.size;
     if (!initialSize) {
         return;
     }
     nestedNodes.forEach((node) => {
-        let unresolvedParents = invertedGraph.dependencies[node.name].length;
+        if (!visitedNodes.has(node)) {
+            visitedNodes.set(node, {
+                packagePaths: new Set(),
+                unresolvedParents: new Set(invertedGraph.dependencies[node.name].map(({ target }) => target)),
+            });
+        }
         invertedGraph.dependencies[node.name].forEach(({ target }) => {
+            if (!visitedNodes.get(node).unresolvedParents.has(target)) {
+                return;
+            }
             const targetNode = invertedGraph.externalNodes[target];
-            if (visitedNodes.has(targetNode)) {
-                visitedNodes.get(targetNode).forEach((path) => {
+            if (visitedNodes.has(targetNode) &&
+                !visitedNodes.get(targetNode).unresolvedParents.size) {
+                visitedNodes.get(targetNode).packagePaths.forEach((path) => {
                     const mappedPackage = mapPackage(rootLockFile, node.data.packageName, node.data.version, path + '/');
                     result.set(mappedPackage.path, mappedPackage);
-                    if (visitedNodes.has(node)) {
-                        visitedNodes.get(node).add(mappedPackage.path);
-                    }
-                    else {
-                        visitedNodes.set(node, new Set([mappedPackage.path]));
-                    }
-                    visitedPaths.add(mappedPackage.path);
+                    visitedNodes.get(node).packagePaths.add(mappedPackage.path);
+                    visitedNodes.get(node).unresolvedParents.delete(target);
                 });
-                unresolvedParents--;
             }
         });
-        if (!unresolvedParents) {
+        if (!visitedNodes.get(node).unresolvedParents.size) {
             nestedNodes.delete(node);
         }
     });
@@ -367,7 +371,7 @@ function nestMappedPackages(invertedGraph, result, nestedNodes, visitedNodes, vi
         ].join('\n'));
     }
     else {
-        nestMappedPackages(invertedGraph, result, nestedNodes, visitedNodes, visitedPaths, rootLockFile);
+        nestMappedPackages(invertedGraph, result, nestedNodes, visitedNodes, rootLockFile);
     }
 }
 // sort paths by number of segments and then alphabetically

package/src/project-graph/utils/retrieve-workspace-files.d.ts

@@ -9,12 +9,12 @@ import { LoadedNxPlugin } from '../plugins/internal-api';
  * @param nxJson
  */
 export declare function retrieveWorkspaceFiles(workspaceRoot: string, projectRootMap: Record<string, string>): Promise<{
-    allWorkspaceFiles: import("../file-utils").FileData[];
+    allWorkspaceFiles: import("nx/src/devkit-exports").FileData[];
     fileMap: {
         projectFileMap: ProjectFiles;
-        nonProjectFiles: import("../../native").FileData[];
+        nonProjectFiles: import("nx/src/native").FileData[];
     };
-    rustReferences: import("../../native").NxWorkspaceFilesExternals;
+    rustReferences: import("nx/src/native").NxWorkspaceFilesExternals;
 }>;
 /**
  * Walk through the workspace and return `ProjectConfigurations`. Only use this if the projectFileMap is not needed.