fix: don't add unnecessary trailing slash

ref pnpm/pnpm#2933
pnpm · Nov 22, 2021 · 6b8ffc0 · 6b8ffc0
1 parent 50e663e
commit 6b8ffc0
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -4,6 +4,9 @@ module.exports = function (registry) {
  if (typeof registry !== 'string') {
  throw new TypeError('`registry` should be a string')
  }
- if (registry[registry.length - 1] === '/') return registry
+ if (
+ registry.endsWith('/') ||
+ registry.indexOf('/', registry.indexOf('//') + 2) != -1
+ ) return registry
  return `${registry}/`
 }
diff --git a/test.js b/test.js
@@ -6,5 +6,11 @@ test('normalizeRegistrUrl()', t => {
  t.throws(() => normalizeRegistrUrl(1), '`registry` should be a string')
  t.equal(normalizeRegistrUrl('https://registry.npmjs.org'), 'https://registry.npmjs.org/')
  t.equal(normalizeRegistrUrl('https://registry.npmjs.org/'), 'https://registry.npmjs.org/')
+ t.equal(normalizeRegistrUrl('https://registry.npmjs.org/foo'), 'https://registry.npmjs.org/foo')
+ t.equal(normalizeRegistrUrl('https://registry.npmjs.org/foo/'), 'https://registry.npmjs.org/foo/')
+ t.equal(normalizeRegistrUrl('//registry.npmjs.org'), '//registry.npmjs.org/')
+ t.equal(normalizeRegistrUrl('//registry.npmjs.org/'), '//registry.npmjs.org/')
+ t.equal(normalizeRegistrUrl('//registry.npmjs.org/foo'), '//registry.npmjs.org/foo')
+ t.equal(normalizeRegistrUrl('//registry.npmjs.org/foo/'), '//registry.npmjs.org/foo/')
  t.end()
 })