npm - snyk-nodejs-lockfile-parser - Versions diffs - 2.2.0 → 2.2.2 - Mend

snyk-nodejs-lockfile-parser 2.2.0 → 2.2.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/dist/aliasesPreprocessors/npm-lock-v1.js CHANGED Viewed

@@ -10,6 +10,21 @@ const rewriteAliasesInNpmLockV1 = (lockfileContent) => {
             jsonLockfile.dependencies[aliasName] = cloneDeep(jsonLockfile.dependencies[pkg]);
             jsonLockfile.dependencies[aliasName].version = jsonLockfile.dependencies[pkg].version.substring(jsonLockfile.dependencies[pkg].version.lastIndexOf('@') + 1, jsonLockfile.dependencies[pkg].version.length);
             delete jsonLockfile.dependencies[pkg];
+            // Also transform possible references in transitive deps
+            // if any deps with requires have pkg in the list and with the same aliased value, we need to replace it with aliased value,
+            for (const topLevelPkg in jsonLockfile.dependencies) {
+                const requires = jsonLockfile.dependencies[topLevelPkg]
+                    .requires;
+                for (const requiredDep in requires) {
+                    if (requiredDep === pkg &&
+                        requires[requiredDep] ===
+                            `npm:${aliasName}@${jsonLockfile.dependencies[aliasName].version}`) {
+                        jsonLockfile.dependencies[topLevelPkg].requires[aliasName] =
+                            jsonLockfile.dependencies[aliasName].version;
+                        delete jsonLockfile.dependencies[topLevelPkg].requires[requiredDep];
+                    }
+                }
+            }
         }
     }
     return JSON.stringify(jsonLockfile);

package/dist/aliasesPreprocessors/npm-lock-v1.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"npm-lock-v1.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/npm-lock-v1.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AACvC,MAAM,yBAAyB,GAAG,CAAC,eAAuB,EAAU,EAAE;IAC3E,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACjD,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC;QAC5C,IAAI,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9D,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,CAChE,CAAC,EACD,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CACxD,CAAC;YACF,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAC9C,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAC/B,CAAC;YACF,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,YAAY,CACtE,GAAG,CACJ,CAAC,OAAO,CAAC,SAAS,CACjB,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAC3D,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAC9C,CAAC;YACF,OAAO,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;~~QACxC~~,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC,CAAC;~~AAtBW~~,QAAA,yBAAyB,~~6BAsBpC~~"}
1	+ {"version":3,"file":"npm-lock-v1.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/npm-lock-v1.ts"],"names":[],"mappings":";;;AAAA,8CAA8C;AACvC,MAAM,yBAAyB,GAAG,CAAC,eAAuB,EAAU,EAAE;IAC3E,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC;IACjD,KAAK,MAAM,GAAG,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC;QAC5C,IAAI,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;YAC9D,MAAM,SAAS,GAAG,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,SAAS,CAChE,CAAC,EACD,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CACxD,CAAC;YACF,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,GAAG,SAAS,CAC9C,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAC/B,CAAC;YACF,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,OAAO,GAAG,YAAY,CAAC,YAAY,CACtE,GAAG,CACJ,CAAC,OAAO,CAAC,SAAS,CACjB,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAC3D,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,MAAM,CAC9C,CAAC;YACF,OAAO,YAAY,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;YAEtC,wDAAwD;YACxD,4HAA4H;YAE5H,KAAK,MAAM,WAAW,IAAI,YAAY,CAAC,YAAY,EAAE,CAAC;gBACpD,MAAM,QAAQ,GAAG,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC;qBACpD,QAAkC,CAAC;gBACtC,KAAK,MAAM,WAAW,IAAI,QAAQ,EAAE,CAAC;oBACnC,IACE,WAAW,KAAK,GAAG;wBACnB,QAAQ,CAAC,WAAW,CAAC;4BACnB,OAAO,SAAS,IAAI,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,OAAO,EAAE,EACpE,CAAC;wBACD,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,SAAS,CAAC;4BACxD,YAAY,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC;wBAC/C,OAAO,YAAY,CAAC,YAAY,CAAC,WAAW,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;oBACtE,CAAC;gBACH,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;AACtC,CAAC,CAAC;AAzCW,QAAA,yBAAyB,6BAyCpC"}

package/dist/aliasesPreprocessors/npm-lock-v2.js CHANGED Viewed

@@ -4,6 +4,8 @@ exports.rewriteAliasesInNpmLockV2 = void 0;
 const rewriteAliasesInNpmLockV2 = (lockfilePackages) => {
     // 1. Rewrite top level "" packages in "".dependencies
     const rootPkg = lockfilePackages[''];
+    const mutatedRootPkg = [];
+    const aliasedPackages = [];
     const lockFileToReturn = lockfilePackages;
     if (rootPkg && rootPkg.dependencies) {
         const dependencies = rootPkg.dependencies;
@@ -12,6 +14,8 @@ const rewriteAliasesInNpmLockV2 = (lockfilePackages) => {
                 const aliasName = rootPkg.dependencies[pkgName].substring(4, rootPkg.dependencies[pkgName].lastIndexOf('@'));
                 const aliasVersion = rootPkg.dependencies[pkgName].substring(rootPkg.dependencies[pkgName].lastIndexOf('@') + 1, rootPkg.dependencies[pkgName].length);
                 dependencies[aliasName] = aliasVersion;
+                mutatedRootPkg.push(pkgName);
+                aliasedPackages.push(pkgName);
             }
             else {
                 dependencies[pkgName] = rootPkg.dependencies[pkgName];
@@ -21,11 +25,28 @@ const rewriteAliasesInNpmLockV2 = (lockfilePackages) => {
     }
     // 2. Rewrite alias packages
     for (const pkgName in lockfilePackages) {
-        if (pkgName != '' && lockfilePackages[pkgName].name) {
+        if (pkgName != '' &&
+            lockfilePackages[pkgName].name &&
+            mutatedRootPkg.includes(pkgName.replace('node_modules/', ''))) {
             lockFileToReturn[`node_modules/${lockfilePackages[pkgName].name}`] =
                 lockfilePackages[pkgName];
             delete lockFileToReturn[pkgName];
         }
+        // rewrite possible references in transitive deps
+        if (pkgName != '' &&
+            lockfilePackages[pkgName] &&
+            lockfilePackages[pkgName].dependencies) {
+            for (const depName in lockfilePackages[pkgName].dependencies) {
+                if (aliasedPackages.includes(depName) &&
+                    lockfilePackages[pkgName].dependencies[depName].startsWith('npm:')) {
+                    const aliasName = lockfilePackages[pkgName].dependencies[depName].substring(4, lockfilePackages[pkgName].dependencies[depName].lastIndexOf('@'));
+                    const aliasVersion = lockfilePackages[pkgName].dependencies[depName].substring(lockfilePackages[pkgName].dependencies[depName].lastIndexOf('@') +
+                        1, lockfilePackages[pkgName].dependencies[depName].length);
+                    lockFileToReturn[pkgName].dependencies[aliasName] = aliasVersion;
+                    delete lockFileToReturn[pkgName].dependencies[depName];
+                }
+            }
+        }
     }
     return lockFileToReturn;
 };

package/dist/aliasesPreprocessors/npm-lock-v2.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"npm-lock-v2.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/npm-lock-v2.ts"],"names":[],"mappings":";;;AAEO,MAAM,yBAAyB,GAAG,CACvC,gBAA4C,EAChB,EAAE;IAC9B,sDAAsD;IACtD,MAAM,OAAO,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACrC,MAAM,gBAAgB,GAA+B,gBAAgB,CAAC;IACtE,IAAI,OAAO,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACpC,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QAC1C,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrD,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,SAAS,CACvD,CAAC,EACD,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAC/C,CAAC;gBACF,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,SAAS,CAC1D,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAClD,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CACrC,CAAC;gBACF,YAAY,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;~~YACzC~~,CAAC;iBAAM,CAAC;gBACN,YAAY,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;QACD,gBAAgB,CAAC,EAAE,CAAC,CAAC,YAAY,GAAG,YAAY,CAAC;IACnD,CAAC;IAED,4BAA4B;IAC5B,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;QACvC,~~IAAI~~,OAAO,IAAI,EAAE,~~IAAI,~~gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;~~YACpD~~,gBAAgB,CAAC,gBAAgB,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;gBAChE,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;~~AApCW~~,QAAA,yBAAyB,~~6BAoCpC~~"}
1	+ {"version":3,"file":"npm-lock-v2.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/npm-lock-v2.ts"],"names":[],"mappings":";;;AAEO,MAAM,yBAAyB,GAAG,CACvC,gBAA4C,EAChB,EAAE;IAC9B,sDAAsD;IACtD,MAAM,OAAO,GAAG,gBAAgB,CAAC,EAAE,CAAC,CAAC;IACrC,MAAM,cAAc,GAAkB,EAAE,CAAC;IACzC,MAAM,eAAe,GAAkB,EAAE,CAAC;IAC1C,MAAM,gBAAgB,GAA+B,gBAAgB,CAAC;IACtE,IAAI,OAAO,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;QACpC,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC;QAC1C,KAAK,MAAM,OAAO,IAAI,OAAO,CAAC,YAAY,EAAE,CAAC;YAC3C,IAAI,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;gBACrD,MAAM,SAAS,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,SAAS,CACvD,CAAC,EACD,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAC/C,CAAC;gBACF,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,SAAS,CAC1D,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAClD,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CACrC,CAAC;gBACF,YAAY,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;gBACvC,cAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAC7B,eAAe,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YAChC,CAAC;iBAAM,CAAC;gBACN,YAAY,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC;YACxD,CAAC;QACH,CAAC;QACD,gBAAgB,CAAC,EAAE,CAAC,CAAC,YAAY,GAAG,YAAY,CAAC;IACnD,CAAC;IAED,4BAA4B;IAC5B,KAAK,MAAM,OAAO,IAAI,gBAAgB,EAAE,CAAC;QACvC,IACE,OAAO,IAAI,EAAE;YACb,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI;YAC9B,cAAc,CAAC,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,eAAe,EAAE,EAAE,CAAC,CAAC,EAC7D,CAAC;YACD,gBAAgB,CAAC,gBAAgB,gBAAgB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,CAAC;gBAChE,gBAAgB,CAAC,OAAO,CAAC,CAAC;YAC5B,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC;QACnC,CAAC;QAED,iDAAiD;QACjD,IACE,OAAO,IAAI,EAAE;YACb,gBAAgB,CAAC,OAAO,CAAC;YACzB,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,EACtC,CAAC;YACD,KAAK,MAAM,OAAO,IAAI,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,EAAE,CAAC;gBAC7D,IACE,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC;oBACjC,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,EAClE,CAAC;oBACD,MAAM,SAAS,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,CACtD,OAAO,CACR,CAAC,SAAS,CACT,CAAC,EACD,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CACjE,CAAC;oBACF,MAAM,YAAY,GAAG,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,CACzD,OAAO,CACR,CAAC,SAAS,CACT,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC;wBAC9D,CAAC,EACH,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,MAAM,CACvD,CAAC;oBAEF,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAa,CAAC,SAAS,CAAC,GAAG,YAAY,CAAC;oBAClE,OAAO,gBAAgB,CAAC,OAAO,CAAC,CAAC,YAAa,CAAC,OAAO,CAAC,CAAC;gBAC1D,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,gBAAgB,CAAC;AAC1B,CAAC,CAAC;AA3EW,QAAA,yBAAyB,6BA2EpC"}

package/dist/aliasesPreprocessors/yarn-lock-v1.js CHANGED Viewed

@@ -3,7 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.rewriteAliasesInYarnLockV1 = void 0;
 const rewriteAliasesInYarnLockV1 = (lockfileContent) => {
     const regex = /^(\s*)"(.+?@npm:)([^"]+)":/gm;
-    const lockfilePreprocessed = lockfileContent.replace(regex, '$1"$3":');
+    const matches = lockfileContent.matchAll(regex);
+    // Step 1: Replace aliased top level deps
+    let lockfilePreprocessed = lockfileContent.replace(regex, '$1"$3":');
+    // Step 2: Replace aliased top level deps possible references in transitive deps
+    for (const match of matches) {
+        const localMatch = match[0]
+            .replace(/\s/g, '')
+            .replace(/"/, '')
+            .replace(/@npm:/, ' "npm:')
+            .replace(/:$/, '');
+        let replacementValue = match[0]
+            .replace(/\s/g, '')
+            .replace(/"/g, '')
+            .replace(/.+?@npm:/, '')
+            .replace(/@(?!.*@)/, ' "')
+            .replace(/:/g, '') + '"';
+        if (replacementValue.startsWith('@')) {
+            replacementValue = replacementValue
+                .replace(/^@/, '"@')
+                .replace(/ /, '" ');
+        }
+        lockfilePreprocessed = lockfilePreprocessed.replace(localMatch, replacementValue);
+    }
     return lockfilePreprocessed;
 };
 exports.rewriteAliasesInYarnLockV1 = rewriteAliasesInYarnLockV1;

package/dist/aliasesPreprocessors/yarn-lock-v1.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"yarn-lock-v1.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/yarn-lock-v1.ts"],"names":[],"mappings":";;;AAAO,MAAM,0BAA0B,GAAG,CAAC,eAAuB,EAAU,EAAE;IAC5E,MAAM,KAAK,GAAG,8BAA8B,CAAC;~~IAE7C~~,MAAM,oBAAoB,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;~~IAEvE~~,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;~~AANW~~,QAAA,0BAA0B,~~8BAMrC~~"}
1	+ {"version":3,"file":"yarn-lock-v1.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/yarn-lock-v1.ts"],"names":[],"mappings":";;;AAAO,MAAM,0BAA0B,GAAG,CAAC,eAAuB,EAAU,EAAE;IAC5E,MAAM,KAAK,GAAG,8BAA8B,CAAC;IAC7C,MAAM,OAAO,GAAG,eAAe,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IAEhD,yCAAyC;IACzC,IAAI,oBAAoB,GAAG,eAAe,CAAC,OAAO,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IACrE,gFAAgF;IAChF,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;QAC5B,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC;aACxB,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;aAClB,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;aAChB,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC;aAC1B,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;QACrB,IAAI,gBAAgB,GAClB,KAAK,CAAC,CAAC,CAAC;aACL,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC;aAClB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC;aACjB,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC;aACvB,OAAO,CAAC,UAAU,EAAE,IAAI,CAAC;aACzB,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,GAAG,CAAC;QAC7B,IAAI,gBAAgB,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC;YACrC,gBAAgB,GAAG,gBAAgB;iBAChC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC;iBACnB,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QACxB,CAAC;QACD,oBAAoB,GAAG,oBAAoB,CAAC,OAAO,CACjD,UAAU,EACV,gBAAgB,CACjB,CAAC;IACJ,CAAC;IAED,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAhCW,QAAA,0BAA0B,8BAgCrC"}

package/dist/aliasesPreprocessors/yarn-lock-v2.d.ts CHANGED Viewed

@@ -1,2 +1,2 @@
 import { NormalisedPkgs } from '../dep-graph-builders/types';
-export declare const rewriteAliasesInYarnLockV2: (lockfileNormalisedPkgs: NormalisedPkgs) => NormalisedPkgs;
+export declare const rewriteAliasesInYarnLockV2: (pkgJson: string, lockfileNormalisedPkgs: NormalisedPkgs) => NormalisedPkgs;

package/dist/aliasesPreprocessors/yarn-lock-v2.js CHANGED Viewed

@@ -2,15 +2,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.rewriteAliasesInYarnLockV2 = void 0;
 const cloneDeep = require("lodash.clonedeep");
-const rewriteAliasesInYarnLockV2 = (lockfileNormalisedPkgs) => {
+const rewriteAliasesInYarnLockV2 = (pkgJson, lockfileNormalisedPkgs) => {
     var _a;
     const lockfileNormalisedPkgsPreprocessed = cloneDeep(lockfileNormalisedPkgs);
+    const topLevelPkgs = JSON.parse(pkgJson).dependencies;
+    const topLevelAliasedPkgs = Object.entries(topLevelPkgs)
+        .filter((entry) => {
+        return entry[1].startsWith('npm:');
+    })
+        .map((entry) => {
+        return `${entry[0]}@${entry[1]}`;
+    });
     for (const pkg in lockfileNormalisedPkgsPreprocessed) {
         const pkgSplit = pkg.substring(0, pkg.lastIndexOf('@'));
         const resolutionSplit = (_a = lockfileNormalisedPkgsPreprocessed[pkg].resolution) === null || _a === void 0 ? void 0 : _a.split(/@npm[:%3A]/)[0];
         if (!pkg.startsWith('v2@workspace') &&
             resolutionSplit &&
-            pkgSplit != resolutionSplit) {
+            pkgSplit != resolutionSplit &&
+            topLevelAliasedPkgs.includes(pkg)) {
             const newPkg = lockfileNormalisedPkgsPreprocessed[pkg];
             delete lockfileNormalisedPkgsPreprocessed[pkg];
             const newKey = pkg.replace(pkgSplit, resolutionSplit);
@@ -30,6 +39,24 @@ const rewriteAliasesInYarnLockV2 = (lockfileNormalisedPkgs) => {
             }
             lockfileNormalisedPkgsPreprocessed[pkg].dependencies = newDependencies;
         }
+        else if (
+        // Replace aliased top level deps possible references in transitive deps
+        lockfileNormalisedPkgsPreprocessed[pkg] &&
+            lockfileNormalisedPkgsPreprocessed[pkg].dependencies) {
+            const newDependencies = {};
+            for (const key in lockfileNormalisedPkgsPreprocessed[pkg].dependencies) {
+                const value = lockfileNormalisedPkgsPreprocessed[pkg].dependencies[key];
+                if (value.includes('@') &&
+                    topLevelAliasedPkgs.includes(`${key}@${value}`)) {
+                    newDependencies[value.substring(4, value.lastIndexOf('@'))] =
+                        value.substring(value.lastIndexOf('@') + 1, value.length);
+                }
+                else {
+                    newDependencies[key] = value;
+                }
+            }
+            lockfileNormalisedPkgsPreprocessed[pkg].dependencies = newDependencies;
+        }
     }
     return lockfileNormalisedPkgsPreprocessed;
 };

package/dist/aliasesPreprocessors/yarn-lock-v2.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"yarn-lock-v2.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/yarn-lock-v2.ts"],"names":[],"mappings":";;;AACA,8CAA8C;AACvC,MAAM,0BAA0B,GAAG,CACxC,sBAAsC,EACtB,EAAE;;IAClB,MAAM,kCAAkC,GAAmB,SAAS,CAClE,sBAAsB,CACvB,CAAC;IACF,KAAK,MAAM,GAAG,IAAI,kCAAkC,EAAE,CAAC;QACrD,MAAM,QAAQ,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,EAAE,GAAG,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QACxD,MAAM,eAAe,GACnB,MAAA,kCAAkC,CAAC,GAAG,CAAC,CAAC,UAAU,0CAAE,KAAK,CACvD,YAAY,EACZ,CAAC,CAAC,CAAC;QAEP,IACE,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC;YAC/B,eAAe;YACf,QAAQ,IAAI,eAAe,~~EAC3B~~,CAAC;YACD,MAAM,MAAM,GAAG,kCAAkC,CAAC,GAAG,CAAC,CAAC;YACvD,OAAO,kCAAkC,CAAC,GAAG,CAAC,CAAC;YAC/C,MAAM,MAAM,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,eAAe,CAAC,CAAC;YACtD,kCAAkC,CAAC,MAAM,CAAC,GAAG,MAAM,CAAC;QACtD,CAAC;QACD,IAAI,GAAG,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,CAAC;YACnC,MAAM,eAAe,GAA2B,EAAE,CAAC;YACnD,KAAK,MAAM,GAAG,IAAI,kCAAkC,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,CAAC;gBACvE,MAAM,KAAK,GAAG,kCAAkC,CAAC,GAAG,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBACxE,IAAI,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC;oBAC7B,eAAe,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;wBACzD,KAAK,CAAC,SAAS,CAAC,KAAK,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;gBAC9D,CAAC;qBAAM,CAAC;oBACN,eAAe,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;gBAC/B,CAAC;YACH,CAAC;YACD,kCAAkC,CAAC,GAAG,CAAC,CAAC,YAAY,GAAG,eAAe,CAAC;QACzE,CAAC;IACH,CAAC;IAED,OAAO,kCAAkC,CAAC;AAC5C,CAAC,CAAC;~~AAvCW~~,QAAA,0BAA0B,~~8BAuCrC~~"}
1	+ {"version":3,"file":"yarn-lock-v2.js","sourceRoot":"","sources":["../../lib/aliasesPreprocessors/yarn-lock-v2.ts"],"names":[],"mappings":"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"}

package/dist/dep-graph-builders/yarn-lock-v2/simple.js CHANGED Viewed

@@ -9,7 +9,7 @@ const yarn_lock_v2_1 = require("../../aliasesPreprocessors/yarn-lock-v2");
 const parseYarnLockV2Project = async (pkgJsonContent, yarnLockContent, options, workspaceArgs) => {
     const { includeDevDeps, includeOptionalDeps, strictOutOfSync, pruneWithinTopLevelDeps, honorAliases, } = options;
     const pkgs = honorAliases
-        ? (0, yarn_lock_v2_1.rewriteAliasesInYarnLockV2)((0, extract_yarnlock_v2_pkgs_1.extractPkgsFromYarnLockV2)(yarnLockContent))
+        ? (0, yarn_lock_v2_1.rewriteAliasesInYarnLockV2)(pkgJsonContent, (0, extract_yarnlock_v2_pkgs_1.extractPkgsFromYarnLockV2)(yarnLockContent))
         : (0, extract_yarnlock_v2_pkgs_1.extractPkgsFromYarnLockV2)(yarnLockContent);
     const pkgJson = (0, util_1.parsePkgJson)(honorAliases ? (0, pkgJson_1.rewriteAliasesPkgJson)(pkgJsonContent) : pkgJsonContent);
     const depgraph = await (0, build_depgraph_simple_1.buildDepGraphYarnLockV2Simple)(pkgs, pkgJson, {

package/dist/dep-graph-builders/yarn-lock-v2/simple.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/simple.ts"],"names":[],"mappings":";;;AAAA,yEAAuE;AACvE,kCAAuC;AAMvC,mEAAwE;AAExE,gEAA2E;AAC3E,0EAAqF;AAE9E,MAAM,sBAAsB,GAAG,KAAK,EACzC,cAAsB,EACtB,eAAuB,EACvB,OAAsC,EACtC,aAAuC,EACpB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,uBAAuB,EACvB,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,MAAM,IAAI,GAAG,YAAY;QACvB,CAAC,CAAC,IAAA,yCAA0B,~~EAAC~~,IAAA,oDAAyB,EAAC,eAAe,CAAC,~~CAAC~~;~~QACxE~~,CAAC,CAAC,IAAA,oDAAyB,EAAC,eAAe,CAAC,CAAC;IAE/C,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAC3C,YAAY,CAAC,CAAC,CAAC,IAAA,+BAAqB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CACtE,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,qDAA6B,EAClD,IAAI,EACJ,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,mBAAmB;QACnB,uBAAuB;KACxB,EACD,aAAa,CACd,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;~~AAnCW~~,QAAA,sBAAsB,~~0BAmCjC~~"}
1	+ {"version":3,"file":"simple.js","sourceRoot":"","sources":["../../../lib/dep-graph-builders/yarn-lock-v2/simple.ts"],"names":[],"mappings":";;;AAAA,yEAAuE;AACvE,kCAAuC;AAMvC,mEAAwE;AAExE,gEAA2E;AAC3E,0EAAqF;AAE9E,MAAM,sBAAsB,GAAG,KAAK,EACzC,cAAsB,EACtB,eAAuB,EACvB,OAAsC,EACtC,aAAuC,EACpB,EAAE;IACrB,MAAM,EACJ,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,uBAAuB,EACvB,YAAY,GACb,GAAG,OAAO,CAAC;IAEZ,MAAM,IAAI,GAAG,YAAY;QACvB,CAAC,CAAC,IAAA,yCAA0B,EACxB,cAAc,EACd,IAAA,oDAAyB,EAAC,eAAe,CAAC,CAC3C;QACH,CAAC,CAAC,IAAA,oDAAyB,EAAC,eAAe,CAAC,CAAC;IAE/C,MAAM,OAAO,GAAoB,IAAA,mBAAY,EAC3C,YAAY,CAAC,CAAC,CAAC,IAAA,+BAAqB,EAAC,cAAc,CAAC,CAAC,CAAC,CAAC,cAAc,CACtE,CAAC;IAEF,MAAM,QAAQ,GAAG,MAAM,IAAA,qDAA6B,EAClD,IAAI,EACJ,OAAO,EACP;QACE,cAAc;QACd,eAAe;QACf,mBAAmB;QACnB,uBAAuB;KACxB,EACD,aAAa,CACd,CAAC;IAEF,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAtCW,QAAA,sBAAsB,0BAsCjC"}

package/package.json CHANGED Viewed

@@ -67,5 +67,5 @@
     "typescript": "^5.4.5"
   },
   "packageManager": "yarn@2.4.1",
-  "version": "2.2.0"
+  "version": "2.2.2"
 }