fix: slug string conflict with scope

yarnpkg · Feb 2, 2024 · 86c1e37 · 86c1e37
1 parent 943a9f0
commit 86c1e37
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 3 deletions.
diff --git a/packages/acceptance-tests/pkg-tests-specs/sources/commands/pack.test.js b/packages/acceptance-tests/pkg-tests-specs/sources/commands/pack.test.js
@@ -765,7 +765,7 @@ describe(`Commands`, () => {
         await run(`install`);
 
         await run(`pack`, `--out`, `%s.tgz`);
-        expect(xfs.existsSync(`${path}/@scope-test.tgz`)).toEqual(true);
+        expect(xfs.existsSync(`${path}/@scope_test.tgz`)).toEqual(true);
       }),
     );
 
@@ -791,7 +791,7 @@ describe(`Commands`, () => {
         await run(`install`);
 
         await run(`pack`, `--out`, `%s-%v.tgz`);
-        expect(xfs.existsSync(`${path}/@scope-test-0.0.1.tgz`)).toEqual(true);
+        expect(xfs.existsSync(`${path}/@scope_test-0.0.1.tgz`)).toEqual(true);
       }),
     );
 

diff --git a/packages/yarnpkg-core/sources/structUtils.ts b/packages/yarnpkg-core/sources/structUtils.ts
@@ -665,7 +665,7 @@ export function stringifyLocator(locator: Locator) {
  */
 export function slugifyIdent(ident: Ident) {
   if (ident.scope !== null) {
-    return `@${ident.scope}-${ident.name}`;
+    return `@${ident.scope}_${ident.name}`;
   } else {
     return ident.name;
   }

diff --git a/packages/yarnpkg-core/tests/structUtils.test.ts b/packages/yarnpkg-core/tests/structUtils.test.ts
@@ -0,0 +1,23 @@
+import * as structUtils from '../sources/structUtils';
+
+describe(`structUtils`, () => {
+  describe(`makeIdent`, () => {
+    it(`should return a unique slug string with scope`, () => {
+      const slugA = structUtils.slugifyIdent(structUtils.makeIdent(`myscope`, `user-email`));
+      expect(slugA).toEqual(`@myscope_user-email`);
+      const slugB = structUtils.slugifyIdent(structUtils.makeIdent(`myscope-user`, `email`));
+      expect(slugB).toEqual(`@myscope-user_email`);
+      expect(slugA).not.toEqual(slugB);
+    });
+  });
+
+  describe(`slugifyIdent`, () => {
+    it(`should return a unique slug string with scope`, () => {
+      const slugA = structUtils.slugifyIdent(structUtils.makeIdent(`myscope`, `user-email`));
+      expect(slugA).toEqual(`@myscope_user-email`);
+      const slugB = structUtils.slugifyIdent(structUtils.makeIdent(`myscope-user`, `email`));
+      expect(slugB).toEqual(`@myscope-user_email`);
+      expect(slugA).not.toEqual(slugB);
+    });
+  });
+});