fix: installation of packages with () in scope name

close #6348
pnpm · Apr 3, 2023 · bb0bd38 · bb0bd38
1 parent af3e555
commit bb0bd38
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts b/lockfile/lockfile-file/src/experiments/inlineSpecifiersLockfileConverters.ts
@@ -162,7 +162,6 @@ export function revertFromInlineSpecifiersFormat (lockfile: InlineSpecifiersLock
 export function convertNewDepPathToOldDepPath (oldDepPath: string) {
   if (!oldDepPath.includes('@', 2)) return oldDepPath
   const index = oldDepPath.indexOf('@', oldDepPath.indexOf('/@') + 2)
-  if (oldDepPath.includes('(') && index > oldDepPath.indexOf('(')) return oldDepPath
   return `${oldDepPath.substring(0, index)}/${oldDepPath.substring(index + 1)}`
 }
 

diff --git a/packages/dependency-path/test/index.ts b/packages/dependency-path/test/index.ts
@@ -98,6 +98,14 @@ test('parse()', () => {
     version: '1.0.0',
   })
 
+  expect(parse('/@(-.-)/foo/1.0.0(@types/babel__core@7.1.14)(foo@1.0.0)')).toStrictEqual({
+    host: undefined,
+    isAbsolute: false,
+    name: '@(-.-)/foo',
+    peersSuffix: '(@types/babel__core@7.1.14)(foo@1.0.0)',
+    version: '1.0.0',
+  })
+
   expect(() => parse('/foo/bar')).toThrow(/\/foo\/bar is an invalid relative dependency path/)
 
   expect(parse('file:project(foo@1.0.0)')).toStrictEqual({

diff --git a/pkg-manager/core/test/lockfile.ts b/pkg-manager/core/test/lockfile.ts
@@ -1596,3 +1596,10 @@ test('lockfile is not written when it has no changes', async () => {
   await install(manifest, await testDefaults())
   expect(await fs.stat(WANTED_LOCKFILE)).toHaveProperty('mtimeMs', initialMtime)
 })
+
+test('installation should work with packages that have () in the scope name', async () => {
+  prepareEmpty()
+  const opts = await testDefaults()
+  const manifest = await addDependenciesToPackage({}, ['@(-.-)/env@0.3.1'], opts)
+  await install(manifest, opts)
+})