@yarnpkg/nm 4.0.0-rc.9 → 4.0.0

package/lib/buildNodeModulesTree.d.ts

@@ -10,10 +10,10 @@ export declare enum NodeModulesHoistingLimits {
     DEPENDENCIES = "dependencies",
     NONE = "none"
 }
-export declare type NodeModulesBaseNode = {
+export type NodeModulesBaseNode = {
     dirList: Set<Filename>;
 };
-export declare type NodeModulesPackageNode = {
+export type NodeModulesPackageNode = {
     locator: LocatorKey;
     target: PortablePath;
     linkType: LinkType;
@@ -30,8 +30,8 @@ export declare type NodeModulesPackageNode = {
  * /home/user/project/node_modules/foo -> {target: '/home/user/project/.yarn/.cache/foo.zip/node_modules/foo', linkType: 'HARD'}
  * /home/user/project/node_modules/bar -> {target: '/home/user/project/packages/bar', linkType: 'SOFT'}
  */
-export declare type NodeModulesTree = Map<PortablePath, NodeModulesBaseNode | NodeModulesPackageNode>;
-export declare type NodeModulesTreeErrors = Array<{
+export type NodeModulesTree = Map<PortablePath, NodeModulesBaseNode | NodeModulesPackageNode>;
+export type NodeModulesTreeErrors = Array<{
     messageName: MessageName;
     text: string;
 }>;
@@ -43,7 +43,7 @@ export interface NodeModulesTreeOptions {
     project?: Project;
 }
 /** Package locator key for usage inside maps */
-declare type LocatorKey = string;
+type LocatorKey = string;
 /**
  * Returns path to archive, if package location is inside the archive.
  *
@@ -65,7 +65,7 @@ export declare const buildNodeModulesTree: (pnp: PnpApi, options: NodeModulesTre
     errors: NodeModulesTreeErrors;
     preserveSymlinksRequired: boolean;
 };
-export declare type NodeModulesLocatorMap = Map<LocatorKey, {
+export type NodeModulesLocatorMap = Map<LocatorKey, {
     target: PortablePath;
     linkType: LinkType;
     locations: Array<PortablePath>;

package/lib/buildNodeModulesTree.js

@@ -12,13 +12,13 @@ var LinkType;
 (function (LinkType) {
     LinkType["HARD"] = "HARD";
     LinkType["SOFT"] = "SOFT";
-})(LinkType = exports.LinkType || (exports.LinkType = {}));
+})(LinkType || (exports.LinkType = LinkType = {}));
 var NodeModulesHoistingLimits;
 (function (NodeModulesHoistingLimits) {
     NodeModulesHoistingLimits["WORKSPACES"] = "workspaces";
     NodeModulesHoistingLimits["DEPENDENCIES"] = "dependencies";
     NodeModulesHoistingLimits["NONE"] = "none";
-})(NodeModulesHoistingLimits = exports.NodeModulesHoistingLimits || (exports.NodeModulesHoistingLimits = {}));
+})(NodeModulesHoistingLimits || (exports.NodeModulesHoistingLimits = NodeModulesHoistingLimits = {}));
 /** node_modules path segment */
 const NODE_MODULES = `node_modules`;
 /**
@@ -207,7 +207,6 @@ const buildPackageTree = (pnp, options) => {
     const nodes = new Map();
     const getNodeKey = (name, locator) => `${stringifyLocator(locator)}:${name}`;
     const addPackageToTree = (name, pkg, locator, parent, parentPkg, parentDependencies, parentRelativeCwd, isHoistBorder) => {
-        var _a, _b;
         const nodeKey = getNodeKey(name, locator);
         let node = nodes.get(nodeKey);
         const isSeen = !!node;
@@ -331,9 +330,9 @@ const buildPackageTree = (pnp, options) => {
                             }
                         }
                     }
-                    const parentHoistingLimits = (_a = options.hoistingLimitsByCwd) === null || _a === void 0 ? void 0 : _a.get(parentRelativeCwd);
+                    const parentHoistingLimits = options.hoistingLimitsByCwd?.get(parentRelativeCwd);
                     const relativeDepCwd = isExternalSoftLinkDep ? parentRelativeCwd : fslib_1.ppath.relative(topPkgPortableLocation, fslib_1.npath.toPortablePath(depPkg.packageLocation)) || fslib_2.PortablePath.dot;
-                    const depHoistingLimits = (_b = options.hoistingLimitsByCwd) === null || _b === void 0 ? void 0 : _b.get(relativeDepCwd);
+                    const depHoistingLimits = options.hoistingLimitsByCwd?.get(relativeDepCwd);
                     const isHoistBorder = parentHoistingLimits === NodeModulesHoistingLimits.DEPENDENCIES
                         || depHoistingLimits === NodeModulesHoistingLimits.DEPENDENCIES
                         || depHoistingLimits === NodeModulesHoistingLimits.WORKSPACES;
@@ -390,11 +389,11 @@ const populateNodeModulesTree = (pnp, hoistedTree, options) => {
     const getPackageName = (identName) => {
         const [nameOrScope, name] = identName.split(`/`);
         return name ? {
-            scope: (0, fslib_1.toFilename)(nameOrScope),
-            name: (0, fslib_1.toFilename)(name),
+            scope: nameOrScope,
+            name: name,
         } : {
             scope: null,
-            name: (0, fslib_1.toFilename)(nameOrScope),
+            name: nameOrScope,
         };
     };
     const seenNodes = new Set();
@@ -402,9 +401,11 @@ const populateNodeModulesTree = (pnp, hoistedTree, options) => {
         if (seenNodes.has(pkg))
             return;
         seenNodes.add(pkg);
+        const pkgReferences = Array.from(pkg.references).sort().join(`#`);
         for (const dep of pkg.dependencies) {
+            const depReferences = Array.from(dep.references).sort().join(`#`);
             // We do not want self-references in node_modules, since they confuse existing tools
-            if (dep === pkg)
+            if (dep.identName === pkg.identName && depReferences === pkgReferences)
                 continue;
             const references = Array.from(dep.references).sort();
             const locator = { name: dep.identName, reference: references[0] };
@@ -422,7 +423,8 @@ const populateNodeModulesTree = (pnp, hoistedTree, options) => {
                 const workspace = options.project.workspacesByCwd.get(leafNode.target.slice(0, -1));
                 isAnonymousWorkspace = !!(workspace && !workspace.manifest.name);
             }
-            if (!dep.name.endsWith(WORKSPACE_NAME_SUFFIX) && !isAnonymousWorkspace) {
+            const isCircularSymlink = leafNode.linkType === LinkType.SOFT && nodeModulesLocation.startsWith(leafNode.target);
+            if (!dep.name.endsWith(WORKSPACE_NAME_SUFFIX) && !isAnonymousWorkspace && !isCircularSymlink) {
                 const prevNode = tree.get(nodeModulesLocation);
                 if (prevNode) {
                     if (prevNode.dirList) {
@@ -443,7 +445,7 @@ const populateNodeModulesTree = (pnp, hoistedTree, options) => {
                 const nodeModulesIdx = segments.indexOf(NODE_MODULES);
                 for (let segCount = segments.length - 1; nodeModulesIdx >= 0 && segCount > nodeModulesIdx; segCount--) {
                     const dirPath = fslib_1.npath.toPortablePath(segments.slice(0, segCount).join(fslib_1.ppath.sep));
-                    const targetDir = (0, fslib_1.toFilename)(segments[segCount]);
+                    const targetDir = segments[segCount];
                     const subdirs = tree.get(dirPath);
                     if (!subdirs) {
                         tree.set(dirPath, { dirList: new Set([targetDir]) });

package/lib/hoist.d.ts

@@ -45,13 +45,13 @@
  * the next node as current tree root and run the algorithm again
  * until you run out of candidates for current tree root.
  */
-declare type PackageName = string;
+type PackageName = string;
 export declare enum HoisterDependencyKind {
     REGULAR = 0,
     WORKSPACE = 1,
     EXTERNAL_SOFT_LINK = 2
 }
-export declare type HoisterTree = {
+export type HoisterTree = {
     name: PackageName;
     identName: PackageName;
     reference: string;
@@ -60,13 +60,13 @@ export declare type HoisterTree = {
     hoistPriority?: number;
     dependencyKind?: HoisterDependencyKind;
 };
-export declare type HoisterResult = {
+export type HoisterResult = {
     name: PackageName;
     identName: PackageName;
     references: Set<string>;
     dependencies: Set<HoisterResult>;
 };
-declare type Locator = string;
+type Locator = string;
 declare enum DebugLevel {
     NONE = -1,
     PERF = 0,
@@ -74,7 +74,7 @@ declare enum DebugLevel {
     REASONS = 2,
     INTENSIVE_CHECK = 9
 }
-export declare type HoistOptions = {
+export type HoistOptions = {
     /** Runs self-checks after hoisting is finished */
     check?: boolean;
     /** Debug level */

package/lib/hoist.js

@@ -6,7 +6,7 @@ var 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 = {}));
+})(HoisterDependencyKind || (exports.HoisterDependencyKind = HoisterDependencyKind = {}));
 var Hoistable;
 (function (Hoistable) {
     Hoistable[Hoistable["YES"] = 0] = "YES";
@@ -442,7 +442,7 @@ const getNodeHoistInfo = (rootNode, rootNodePathLocators, nodePath, node, usedDe
             if (!usedDep || origDep.ident !== usedDep.ident) {
                 isHoistable = false;
                 if (outputReason)
-                    reason = `- previously hoisted dependency mismatch, needed: ${prettyPrintLocator(origDep.locator)}, available: ${prettyPrintLocator(usedDep === null || usedDep === void 0 ? void 0 : usedDep.locator)}`;
+                    reason = `- previously hoisted dependency mismatch, needed: ${prettyPrintLocator(origDep.locator)}, available: ${prettyPrintLocator(usedDep?.locator)}`;
                 break;
             }
         }

package/lib/index.d.ts

@@ -4,3 +4,5 @@ export type { NodeModulesBaseNode, NodeModulesPackageNode, NodeModulesTreeOption
 export { NodeModulesHoistingLimits, } from './buildNodeModulesTree';
 export { buildNodeModulesTree, buildLocatorMap, getArchivePath, };
 export type { NodeModulesLocatorMap };
+export type { HoisterTree, HoisterResult } from './hoist';
+export { hoist, HoisterDependencyKind } from './hoist';

package/lib/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getArchivePath = exports.buildLocatorMap = exports.buildNodeModulesTree = exports.NodeModulesHoistingLimits = void 0;
+exports.HoisterDependencyKind = exports.hoist = exports.getArchivePath = exports.buildLocatorMap = exports.buildNodeModulesTree = exports.NodeModulesHoistingLimits = void 0;
 const buildNodeModulesTree_1 = require("./buildNodeModulesTree");
 Object.defineProperty(exports, "getArchivePath", { enumerable: true, get: function () { return buildNodeModulesTree_1.getArchivePath; } });
 const buildNodeModulesTree_2 = require("./buildNodeModulesTree");
@@ -8,3 +8,6 @@ Object.defineProperty(exports, "buildNodeModulesTree", { enumerable: true, get:
 Object.defineProperty(exports, "buildLocatorMap", { enumerable: true, get: function () { return buildNodeModulesTree_2.buildLocatorMap; } });
 var buildNodeModulesTree_3 = require("./buildNodeModulesTree");
 Object.defineProperty(exports, "NodeModulesHoistingLimits", { enumerable: true, get: function () { return buildNodeModulesTree_3.NodeModulesHoistingLimits; } });
+var hoist_1 = require("./hoist");
+Object.defineProperty(exports, "hoist", { enumerable: true, get: function () { return hoist_1.hoist; } });
+Object.defineProperty(exports, "HoisterDependencyKind", { enumerable: true, get: function () { return hoist_1.HoisterDependencyKind; } });

package/package.json

@@ -1,16 +1,17 @@
 {
   "name": "@yarnpkg/nm",
-  "version": "4.0.0-rc.9",
+  "version": "4.0.0",
   "license": "BSD-2-Clause",
   "main": "./lib/index.js",
-  "types": "./lib/index.d.ts",
+  "exports": {
+    ".": "./lib/index.js",
+    "./package.json": "./package.json"
+  },
   "sideEffects": false,
   "dependencies": {
-    "@yarnpkg/core": "^4.0.0-rc.9",
-    "@yarnpkg/fslib": "^3.0.0-rc.9"
-  },
-  "devDependencies": {
-    "@yarnpkg/pnp": "^4.0.0-rc.9"
+    "@yarnpkg/core": "^4.0.0",
+    "@yarnpkg/fslib": "^3.0.0",
+    "@yarnpkg/pnp": "^4.0.0"
   },
   "scripts": {
     "postpack": "rm -rf lib",
@@ -20,7 +21,10 @@
   },
   "publishConfig": {
     "main": "./lib/index.js",
-    "types": "./lib/index.d.ts"
+    "exports": {
+      ".": "./lib/index.js",
+      "./package.json": "./package.json"
+    }
   },
   "files": [
     "/lib/**/*"
@@ -31,7 +35,6 @@
     "directory": "packages/yarnpkg-nm"
   },
   "engines": {
-    "node": ">=14.15.0"
-  },
-  "stableVersion": "3.0.1"
+    "node": ">=18.12.0"
+  }
 }