snyk 1.1241.0 → 1.1243.0

package/dist/cli/245.index.js

@@ -221422,7 +221422,12 @@ const getChildNode = (name, depInfo, pkgs, strictOutOfSync, includeDevDeps, incl
     }
     let depData = pkgs[childNodeKey];
     const resolvedToWorkspace = () => {
-        const workspacesDeclaration = pkgs['']['workspaces'] || [];
+        // Workspaces can be set as an array, or as an object
+        // { packages: [] }, this can be checked in
+        // https://github.com/npm/map-workspaces/blob/ff82968a3dbb78659fb7febfce4841bf58c514de/lib/index.js#L27-L41
+        const workspacesDeclaration = Array.isArray(pkgs['']['workspaces']['packages'])
+            ? pkgs['']['workspaces']['packages']
+            : pkgs['']['workspaces'] || [];
         const resolvedPath = depData.resolved || '';
         const fixedResolvedPath = resolvedPath.replace(/\\/g, '/');
         const normalizedWorkspacesDefn = workspacesDeclaration.map((p) => {
@@ -221479,9 +221484,14 @@ const getChildNodeKey = (name, version, ancestry, pkgs, pkgKeysByName) => {
         // `node_modules/a/node_modules/b` into ["a", "b"]
         // To do this we remove the first node_modules substring
         // and then split on the rest
-        const candidateAncestry = candidate
-            .replace('node_modules/', '')
-            .split('/node_modules/');
+        const candidateAncestry = (candidate.startsWith('node_modules/')
+            ? candidate.replace('node_modules/', '').split('/node_modules/')
+            : candidate.split('/node_modules/')).map((el) => {
+            if (pkgs[el]) {
+                return pkgs[el].name || el;
+            }
+            return el;
+        });
         // Check the ancestry of the candidate is a subset of
         // the current pkg. If it is not then it can't be a
         // valid key.
@@ -221507,13 +221517,13 @@ const getChildNodeKey = (name, version, ancestry, pkgs, pkgKeysByName) => {
     if (filteredCandidates.length === 1) {
         return filteredCandidates[0];
     }
-    const ancestry_names = ancestry.map((el) => el.name).concat(name);
-    while (ancestry_names.length > 0) {
-        const possible_key = `node_modules/${ancestry_names.join('/node_modules/')}`;
-        if (pkgs[possible_key]) {
-            return possible_key;
+    const ancestryNames = ancestry.map((el) => el.name).concat(name);
+    while (ancestryNames.length > 0) {
+        const possibleKey = `node_modules/${ancestryNames.join('/node_modules/')}`;
+        if (filteredCandidates.includes(possibleKey)) {
+            return possibleKey;
         }
-        ancestry_names.shift();
+        ancestryNames.shift();
     }
     // Here we go through th eancestry backwards to find the nearest
     // ancestor package
@@ -231638,6 +231648,9 @@ async function publish(projectPath, targetFramework) {
     // and will potentially also support multiple target frameworks.
     const publishDirLine = response.stdout
         .split(/[\r\n]+/)
+        // Projects that are referring to other local projects in their PackageReference item groups will also be restored
+        // in a chained operation. The project we're interested in will be shown last, thus we reverse it.
+        .reverse()
         // TODO: For multiple target frameworks, replace `find` with a map or something of that kind to return more than the first.
         // The first thing to get published ought to be the project's own .dll or .exe file, depending on the architecture.
         // E.g., something like: