Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion workspaces/arborist/lib/case-insensitive-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ module.exports = class CIMap extends Map {
}

#normKey (key) {
if (typeof key !== 'string') {
// ASCII keys without uppercase letters are already normalized.
if (typeof key !== 'string' || !/[A-Z\u0080-\uffff]/.test(key)) {
return key
}
return key.normalize('NFKD').toLowerCase()
Expand Down
36 changes: 36 additions & 0 deletions workspaces/arborist/test/case-insensitive-map.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,39 @@ t.test('do not get confused with undefined or weird values', t => {
])
t.end()
})

t.test('preserves case folding and Unicode normalization', t => {
for (const [key, equivalent] of [
['@scope/package-name_1.0', '@SCOPE/PACKAGE-NAME_1.0'],
['caf\u00e9', 'cafe\u0301'],
['\u212a', 'k'],
['\ufb03', 'ffi'],
['\uff21', 'a'],
['\ud835\udc00', 'a'],
['\u0130', 'i\u0307'],
]) {
const cmap = new CMap([[key, 1]])
t.equal(cmap.get(equivalent), 1)
t.equal(cmap.has(equivalent), true)
cmap.set(equivalent, 2)
t.equal(cmap.size, 1)
t.equal(cmap.get(key), 2)
t.strictSame([...cmap.keys()], [equivalent])
t.equal(cmap.delete(key), true)
t.equal(cmap.has(equivalent), false)
}
t.end()
})

t.test('preserves empty, undefined-valued, and non-string keys', t => {
const object = {}
const symbol = Symbol('key')
for (const key of ['', '\u0000', undefined, null, NaN, 0, object, symbol]) {
const cmap = new CMap([[key, undefined]])
t.equal(cmap.has(key), true)
t.equal(cmap.get(key), undefined)
t.equal(cmap.delete(key), true)
t.equal(cmap.has(key), false)
}
t.end()
})
Loading