@yarnpkg/nm 3.0.0 → 3.0.1-rc.12

package/lib/buildNodeModulesTree.js

@@ -73,7 +73,15 @@ const buildLocatorMap = (nodeModulesTree) => {
         val.locations = val.locations.sort((loc1, loc2) => {
             const len1 = loc1.split(fslib_1.ppath.delimiter).length;
             const len2 = loc2.split(fslib_1.ppath.delimiter).length;
-            return len1 !== len2 ? len2 - len1 : loc2.localeCompare(loc1);
+            if (loc2 === loc1) {
+                return 0;
+            }
+            else if (len1 !== len2) {
+                return len2 - len1;
+            }
+            else {
+                return loc2 > loc1 ? 1 : -1;
+            }
         });
     }
     return map;
@@ -194,7 +202,7 @@ const buildPackageTree = (pnp, options) => {
         reference: topLocator.reference,
         peerNames: topPkg.packagePeers,
         dependencies: new Set(),
-        isWorkspace: true,
+        dependencyKind: hoist_1.HoisterDependencyKind.WORKSPACE,
     };
     const nodes = new Map();
     const getNodeKey = (name, locator) => `${stringifyLocator(locator)}:${name}`;
@@ -209,7 +217,11 @@ const buildPackageTree = (pnp, options) => {
         }
         const isExternalSoftLinkPackage = isExternalSoftLink(pkg, locator, pnp, topPkgPortableLocation);
         if (!node) {
-            const isWorkspace = pkg.linkType === LinkType.SOFT && locator.name.endsWith(WORKSPACE_NAME_SUFFIX);
+            let dependencyKind = hoist_1.HoisterDependencyKind.REGULAR;
+            if (isExternalSoftLinkPackage)
+                dependencyKind = hoist_1.HoisterDependencyKind.EXTERNAL_SOFT_LINK;
+            else if (pkg.linkType === LinkType.SOFT && locator.name.endsWith(WORKSPACE_NAME_SUFFIX))
+                dependencyKind = hoist_1.HoisterDependencyKind.WORKSPACE;
             node = {
                 name,
                 identName: locator.name,
@@ -217,8 +229,8 @@ const buildPackageTree = (pnp, options) => {
                 dependencies: new Set(),
                 // View peer dependencies as regular dependencies for workspaces
                 // (meeting workspace peer dependency constraints is sometimes hard, sometimes impossible for the nm linker)
-                peerNames: isWorkspace ? new Set() : pkg.packagePeers,
-                isWorkspace,
+                peerNames: dependencyKind === hoist_1.HoisterDependencyKind.WORKSPACE ? new Set() : pkg.packagePeers,
+                dependencyKind,
             };
             nodes.set(nodeKey, node);
         }
@@ -325,7 +337,7 @@ const buildPackageTree = (pnp, options) => {
                     const isHoistBorder = parentHoistingLimits === NodeModulesHoistingLimits.DEPENDENCIES
                         || depHoistingLimits === NodeModulesHoistingLimits.DEPENDENCIES
                         || depHoistingLimits === NodeModulesHoistingLimits.WORKSPACES;
-                    addPackageToTree(stringifyLocator(depLocator) === stringifyLocator(locator) ? name : depName, depPkg, depLocator, node, pkg, allDependencies, relativeDepCwd, isHoistBorder);
+                    addPackageToTree(depName, depPkg, depLocator, node, pkg, allDependencies, relativeDepCwd, isHoistBorder);
                 }
             }
         }

package/lib/hoist.d.ts

@@ -46,6 +46,11 @@
  * until you run out of candidates for current tree root.
  */
 declare type PackageName = string;
+export declare enum HoisterDependencyKind {
+    REGULAR = 0,
+    WORKSPACE = 1,
+    EXTERNAL_SOFT_LINK = 2
+}
 export declare type HoisterTree = {
     name: PackageName;
     identName: PackageName;
@@ -53,7 +58,7 @@ export declare type HoisterTree = {
     dependencies: Set<HoisterTree>;
     peerNames: Set<PackageName>;
     hoistPriority?: number;
-    isWorkspace?: boolean;
+    dependencyKind?: HoisterDependencyKind;
 };
 export declare type HoisterResult = {
     name: PackageName;

package/lib/hoist.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hoist = void 0;
+exports.hoist = exports.HoisterDependencyKind = void 0;
+var HoisterDependencyKind;
+(function (HoisterDependencyKind) {
+    HoisterDependencyKind[HoisterDependencyKind["REGULAR"] = 0] = "REGULAR";
+    HoisterDependencyKind[HoisterDependencyKind["WORKSPACE"] = 1] = "WORKSPACE";
+    HoisterDependencyKind[HoisterDependencyKind["EXTERNAL_SOFT_LINK"] = 2] = "EXTERNAL_SOFT_LINK";
+})(HoisterDependencyKind = exports.HoisterDependencyKind || (exports.HoisterDependencyKind = {}));
 var Hoistable;
 (function (Hoistable) {
     Hoistable[Hoistable["YES"] = 0] = "YES";
@@ -134,7 +140,7 @@ const getUsedDependencies = (rootNodePath) => {
 const decoupleGraphNode = (parent, node) => {
     if (node.decoupled)
         return node;
-    const { name, references, ident, locator, dependencies, originalDependencies, hoistedDependencies, peerNames, reasons, isHoistBorder, hoistPriority, isWorkspace, hoistedFrom, hoistedTo } = node;
+    const { name, references, ident, locator, dependencies, originalDependencies, hoistedDependencies, peerNames, reasons, isHoistBorder, hoistPriority, dependencyKind, hoistedFrom, hoistedTo } = node;
     // To perform node hoisting from parent node we must clone parent nodes up to the root node,
     // because some other package in the tree might depend on the parent package where hoisting
     // cannot be performed
@@ -151,7 +157,7 @@ const decoupleGraphNode = (parent, node) => {
         decoupled: true,
         isHoistBorder,
         hoistPriority,
-        isWorkspace,
+        dependencyKind,
         hoistedFrom: new Map(hoistedFrom),
         hoistedTo: new Map(hoistedTo),
     };
@@ -323,11 +329,17 @@ const getNodeHoistInfo = (rootNode, rootNodePathLocators, nodePath, node, usedDe
     if (outputReason && !isHoistable)
         reason = `- self-reference`;
     if (isHoistable) {
-        isHoistable = !node.isWorkspace;
+        isHoistable = node.dependencyKind !== HoisterDependencyKind.WORKSPACE;
         if (outputReason && !isHoistable) {
             reason = `- workspace`;
         }
     }
+    if (isHoistable) {
+        isHoistable = node.dependencyKind !== HoisterDependencyKind.EXTERNAL_SOFT_LINK || node.dependencies.size === 0;
+        if (outputReason && !isHoistable) {
+            reason = `- external soft link with unhoisted dependencies`;
+        }
+    }
     if (isHoistable) {
         // Direct workspace dependencies must be hoisted to any common ancestor workspace of all the
         // graph paths that include the dependency, because otherwise running app with
@@ -340,7 +352,7 @@ const getNodeHoistInfo = (rootNode, rootNodePathLocators, nodePath, node, usedDe
         // It is difficult to find all common ancestors, but there is one easy to find common ancestor -
         // the root workspace, so, for now, we either hoist direct dependencies into the root workspace, or we keep them
         // unhoisted, thus we are safe from various pathological cases with `--preserve-symlinks`
-        isHoistable = !parentNode.isWorkspace || parentNode.hoistedFrom.has(node.name) || rootNodePathLocators.size === 1;
+        isHoistable = parentNode.dependencyKind !== HoisterDependencyKind.WORKSPACE || parentNode.hoistedFrom.has(node.name) || rootNodePathLocators.size === 1;
         if (outputReason && !isHoistable) {
             reason = parentNode.reasons.get(node.name);
         }
@@ -614,7 +626,7 @@ const cloneTree = (tree, options) => {
         decoupled: true,
         isHoistBorder: true,
         hoistPriority: 0,
-        isWorkspace: true,
+        dependencyKind: HoisterDependencyKind.WORKSPACE,
         hoistedFrom: new Map(),
         hoistedTo: new Map(),
     };
@@ -623,7 +635,7 @@ const cloneTree = (tree, options) => {
         let workNode = seenNodes.get(node);
         const isSeen = !!workNode;
         if (!workNode) {
-            const { name, identName, reference, peerNames, hoistPriority, isWorkspace } = node;
+            const { name, identName, reference, peerNames, hoistPriority, dependencyKind } = node;
             const dependenciesNmHoistingLimits = options.hoistingLimits.get(parentNode.locator);
             workNode = {
                 name,
@@ -638,7 +650,7 @@ const cloneTree = (tree, options) => {
                 decoupled: true,
                 isHoistBorder: dependenciesNmHoistingLimits ? dependenciesNmHoistingLimits.has(name) : false,
                 hoistPriority: hoistPriority || 0,
-                isWorkspace: isWorkspace || false,
+                dependencyKind: dependencyKind || HoisterDependencyKind.REGULAR,
                 hoistedFrom: new Map(),
                 hoistedTo: new Map(),
             };
@@ -801,7 +813,14 @@ const dumpDepTree = (tree) => {
         if (nodeCount > MAX_NODES_TO_DUMP || parents.has(pkg))
             return ``;
         nodeCount++;
-        const dependencies = Array.from(pkg.dependencies.values()).sort((n1, n2) => n1.name.localeCompare(n2.name));
+        const dependencies = Array.from(pkg.dependencies.values()).sort((n1, n2) => {
+            if (n1.name === n2.name) {
+                return 0;
+            }
+            else {
+                return n1.name > n2.name ? 1 : -1;
+            }
+        });
         let str = ``;
         parents.add(pkg);
         for (let idx = 0; idx < dependencies.length; idx++) {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@yarnpkg/nm",
-  "version": "3.0.0",
+  "version": "3.0.1-rc.12",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "sideEffects": false,
   "dependencies": {
-    "@yarnpkg/core": "^3.1.0",
-    "@yarnpkg/fslib": "^2.6.0"
+    "@yarnpkg/core": "^3.2.0-rc.12",
+    "@yarnpkg/fslib": "^2.6.1-rc.7"
   },
   "devDependencies": {
-    "@yarnpkg/pnp": "^3.1.0"
+    "@yarnpkg/pnp": "^3.1.1-rc.12"
   },
   "scripts": {
     "postpack": "rm -rf lib",
@@ -32,5 +32,6 @@
   },
   "engines": {
     "node": ">=12 <14 || 14.2 - 14.9 || >14.10.0"
-  }
+  },
+  "stableVersion": "3.0.0"
 }