fix: correctly install implicit nested types dependencies (#6800)

## What's the problem this PR addresses?
Closes #6442

By default - yarn will automatically add `@types/foo` for a package, if
the package
has a peer dependency on `foo`. This happens in the `normalizePackage`
core,
and exists as packages often don't specify the correct peer
dependencies.

However, given a scenario where:
```json
"dependencies": {
    "peer-deps-implicit-types-conflict": "1.0.0",
    "@types/no-deps": "1.0.0",
}
```
where `peer-deps-implicit-types-conflict` has a dependency on
`@types/no-deps:2.0.0`,
```json
  "dependencies": {
    "@types/no-deps": "2.0.0"
  },
  "peerDependencies": {
    "no-deps": "1.0.0"
  }
```
yarn will only install `@types/no-deps:1.0.0` - even though
`@types/no-deps: 2.0.0` is specified
as a dependency!

## How did you fix it?

The fix is rather trivial and thanks to the helpful comment here -
#6442 (comment) -
simply don't install the automatic `@types/foo` for a package that has
`foo` as a peer-dependency, if the package already specifies
`@types/foo` as a **dependency**.

There is already logic for this behavior when it comes to `@types/`
already existing in `peerDependencies` or `peerDependenciesMeta` - this
PR just extends that to `dependencies` as well.
...

## Checklist

<!--- Don't worry if you miss something, chores are automatically
tested. -->
<!--- This checklist exists to help you remember doing the chores when
you submit a PR. -->
<!--- Put an `x` in all the boxes that apply. -->
- [x] I have read the [Contributing
Guide](https://yarnpkg.com/advanced/contributing).

<!-- See
https://yarnpkg.com/advanced/contributing#preparing-your-pr-to-be-released
for more details. -->
<!-- Check with `yarn version check` and fix with `yarn version check
-i` -->
- [x] I have set the packages that need to be released for my changes to
be effective.

<!-- The "Testing chores" workflow validates that your PR follows our
guidelines. -->
<!-- If it doesn't pass, click on it to see details as to what your PR
might be missing. -->
- [x] I will check that all automated PR checks pass before the PR gets
reviewed.

---------

Co-authored-by: Maël Nison <[email protected]>

Author: spanishpear

.pnp.cjs

@@ -0,0 +1,35 @@
+releases:
+  "@yarnpkg/cli": patch
+  "@yarnpkg/core": patch
+
+declined:
+  - "@yarnpkg/plugin-compat"
+  - "@yarnpkg/plugin-constraints"
+  - "@yarnpkg/plugin-dlx"
+  - "@yarnpkg/plugin-essentials"
+  - "@yarnpkg/plugin-exec"
+  - "@yarnpkg/plugin-file"
+  - "@yarnpkg/plugin-git"
+  - "@yarnpkg/plugin-github"
+  - "@yarnpkg/plugin-http"
+  - "@yarnpkg/plugin-init"
+  - "@yarnpkg/plugin-interactive-tools"
+  - "@yarnpkg/plugin-jsr"
+  - "@yarnpkg/plugin-link"
+  - "@yarnpkg/plugin-nm"
+  - "@yarnpkg/plugin-npm"
+  - "@yarnpkg/plugin-npm-cli"
+  - "@yarnpkg/plugin-pack"
+  - "@yarnpkg/plugin-patch"
+  - "@yarnpkg/plugin-pnp"
+  - "@yarnpkg/plugin-pnpm"
+  - "@yarnpkg/plugin-stage"
+  - "@yarnpkg/plugin-typescript"
+  - "@yarnpkg/plugin-version"
+  - "@yarnpkg/plugin-workspace-tools"
+  - "@yarnpkg/builder"
+  - "@yarnpkg/doctor"
+  - "@yarnpkg/extensions"
+  - "@yarnpkg/nm"
+  - "@yarnpkg/pnpify"
+  - "@yarnpkg/sdks"

.yarn/versions/29002943.yml

@@ -0,0 +1,7 @@
+module.exports = require(`./package.json`);
+
+for (const key of [`dependencies`, `devDependencies`, `peerDependencies`]) {
+  for (const dep of Object.keys(module.exports[key] || {})) {
+    module.exports[key][dep] = require(dep);
+  }
+}

packages/acceptance-tests/pkg-tests-fixtures/packages/peer-deps-implicit-types-conflict-1.0.0/index.js

@@ -0,0 +1,10 @@
+{
+  "name": "peer-deps-implicit-types-conflict",
+  "version": "1.0.0",
+  "dependencies": {
+    "@types/no-deps": "2.0.0"
+  },
+  "peerDependencies": {
+    "no-deps": "1.0.0"
+  }
+}

packages/acceptance-tests/pkg-tests-fixtures/packages/peer-deps-implicit-types-conflict-1.0.0/package.json

@@ -100,6 +100,29 @@ describe(`Features`, () => {
         },
       ),
     );
+
+    test(
+      `it should correctly resolve nested dependencies with different versions of types packages`,
+      makeTemporaryEnv(
+        {
+          dependencies: {
+            'peer-deps-implicit-types-conflict': `1.0.0`,
+            '@types/no-deps': `1.0.0`,
+          },
+        },
+        async ({path, run, source}) => {
+          await run(`install`);
+
+          await expect(
+            source(`require('@types/no-deps').version`),
+          ).resolves.toEqual(`1.0.0`);
+
+          await expect(
+            source(`require(require.resolve('@types/no-deps', { paths: [require.resolve('peer-deps-implicit-types-conflict/package.json')] })).version`),
+          ).resolves.toEqual(`2.0.0`);
+        },
+      ),
+    );
   });
 });
 

packages/acceptance-tests/pkg-tests-specs/sources/features/peerDependenciesMeta.test.ts

@@ -1971,7 +1971,7 @@ export class Configuration {
       const typesIdent = structUtils.makeIdent(`types`, typesName);
       const stringifiedTypesIdent = structUtils.stringifyIdent(typesIdent);
 
-      if (pkg.peerDependencies.has(typesIdent.identHash) || pkg.peerDependenciesMeta.has(stringifiedTypesIdent))
+      if (pkg.peerDependencies.has(typesIdent.identHash) || pkg.peerDependenciesMeta.has(stringifiedTypesIdent) || pkg.dependencies.has(typesIdent.identHash))
         continue;
 
       pkg.peerDependencies.set(typesIdent.identHash, structUtils.makeDescriptor(typesIdent, `*`));