-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix: replace camelcase with a version that works across node and brow…
…ser (#723)
- Loading branch information
1 parent
98e939e
commit 654681d
Showing
4 changed files
with
41 additions
and
119 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
--- | ||
"@headstartwp/core": patch | ||
--- | ||
|
||
Fix: replace camelcase underlying implementation as the previous one only worked in node |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,29 @@ | ||
import camelcase from '../camelcase'; | ||
|
||
describe('camecase', () => { | ||
it('works with general strings', () => { | ||
expect(camelcase('foo-bar')).toBe('fooBar'); | ||
expect(camelcase('foo-bar-baz')).toBe('fooBarBaz'); | ||
expect(camelcase('foo--bar')).toBe('fooBar'); | ||
expect(camelcase('--foo-bar')).toBe('fooBar'); | ||
expect(camelcase('--foo--bar')).toBe('fooBar'); | ||
expect(camelcase('FOO-BAR')).toBe('fooBar'); | ||
expect(camelcase('FOÈ-BAR')).toBe('foèBar'); | ||
expect(camelcase('-foo-bar-')).toBe('fooBar'); | ||
expect(camelcase('--foo--bar--')).toBe('fooBar'); | ||
expect(camelcase('foo.bar')).toBe('fooBar'); | ||
expect(camelcase('foo..bar')).toBe('fooBar'); | ||
expect(camelcase('..foo..bar..')).toBe('fooBar'); | ||
expect(camelcase('foo_bar')).toBe('fooBar'); | ||
expect(camelcase('__foo__bar__')).toBe('fooBar'); | ||
expect(camelcase('foo bar')).toBe('fooBar'); | ||
expect(camelcase(' foo bar ')).toBe('fooBar'); | ||
expect(camelcase('-')).toBe(''); | ||
expect(camelcase(' - ')).toBe(''); | ||
expect(camelcase('margin-top')).toBe('marginTop'); | ||
expect(camelcase('height')).toBe('height'); | ||
expect(camelcase('padding-top')).toBe('paddingTop'); | ||
expect(camelcase('border-block-end-color')).toBe('borderBlockEndColor'); | ||
expect(camelcase('@font-feature-values')).toBe('@fontFeatureValues'); | ||
}); | ||
}); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,118 +1,6 @@ | ||
// https://github.com/sindresorhus/camelcase/blob/main/index.js | ||
/* eslint-disable no-param-reassign */ | ||
function camelcase(text: string) { | ||
const a = text.toLowerCase().replace(/[-_\s.]+(.)?/g, (_, c) => (c ? c.toUpperCase() : '')); | ||
return a.substring(0, 1).toLowerCase() + a.substring(1); | ||
} | ||
|
||
const UPPERCASE = /[\p{Lu}]/u; | ||
const LOWERCASE = /[\p{Ll}]/u; | ||
const LEADING_CAPITAL = /^[\p{Lu}](?![\p{Lu}])/gu; | ||
const IDENTIFIER = /([\p{Alpha}\p{N}_]|$)/u; | ||
const SEPARATORS = /[_.\- ]+/; | ||
|
||
const LEADING_SEPARATORS = new RegExp(`^${SEPARATORS.source}`); | ||
const SEPARATORS_AND_IDENTIFIER = new RegExp(SEPARATORS.source + IDENTIFIER.source, 'gu'); | ||
const NUMBERS_AND_IDENTIFIER = new RegExp(`\\d+${IDENTIFIER.source}`, 'gu'); | ||
|
||
const preserveCamelCase = (string, toLowerCase, toUpperCase) => { | ||
let isLastCharLower = false; | ||
let isLastCharUpper = false; | ||
let isLastLastCharUpper = false; | ||
|
||
for (let i = 0; i < string.length; i++) { | ||
const character = string[i]; | ||
|
||
if (isLastCharLower && UPPERCASE.test(character)) { | ||
string = `${string.slice(0, i)}-${string.slice(i)}`; | ||
isLastCharLower = false; | ||
isLastLastCharUpper = isLastCharUpper; | ||
isLastCharUpper = true; | ||
i++; | ||
} else if (isLastCharUpper && isLastLastCharUpper && LOWERCASE.test(character)) { | ||
string = `${string.slice(0, i - 1)}-${string.slice(i - 1)}`; | ||
isLastLastCharUpper = isLastCharUpper; | ||
isLastCharUpper = false; | ||
isLastCharLower = true; | ||
} else { | ||
isLastCharLower = | ||
toLowerCase(character) === character && toUpperCase(character) !== character; | ||
isLastLastCharUpper = isLastCharUpper; | ||
isLastCharUpper = | ||
toUpperCase(character) === character && toLowerCase(character) !== character; | ||
} | ||
} | ||
|
||
return string; | ||
}; | ||
|
||
const preserveConsecutiveUppercase = (input, toLowerCase) => { | ||
LEADING_CAPITAL.lastIndex = 0; | ||
|
||
return input.replace(LEADING_CAPITAL, (m1) => toLowerCase(m1)); | ||
}; | ||
|
||
const postProcess = (input, toUpperCase) => { | ||
SEPARATORS_AND_IDENTIFIER.lastIndex = 0; | ||
NUMBERS_AND_IDENTIFIER.lastIndex = 0; | ||
|
||
return input | ||
.replace(SEPARATORS_AND_IDENTIFIER, (_, identifier) => toUpperCase(identifier)) | ||
.replace(NUMBERS_AND_IDENTIFIER, (m) => toUpperCase(m)); | ||
}; | ||
|
||
const camelCase = (input, options) => { | ||
if (!(typeof input === 'string' || Array.isArray(input))) { | ||
throw new TypeError('Expected the input to be `string | string[]`'); | ||
} | ||
|
||
options = { | ||
pascalCase: false, | ||
preserveConsecutiveUppercase: false, | ||
...options, | ||
}; | ||
|
||
if (Array.isArray(input)) { | ||
input = input | ||
.map((x) => x.trim()) | ||
.filter((x) => x.length) | ||
.join('-'); | ||
} else { | ||
input = input.trim(); | ||
} | ||
|
||
if (input.length === 0) { | ||
return ''; | ||
} | ||
|
||
const toLowerCase = | ||
options.locale === false | ||
? (string) => string.toLowerCase() | ||
: (string) => string.toLocaleLowerCase(options.locale); | ||
const toUpperCase = | ||
options.locale === false | ||
? (string) => string.toUpperCase() | ||
: (string) => string.toLocaleUpperCase(options.locale); | ||
|
||
if (input.length === 1) { | ||
return options.pascalCase ? toUpperCase(input) : toLowerCase(input); | ||
} | ||
|
||
const hasUpperCase = input !== toLowerCase(input); | ||
|
||
if (hasUpperCase) { | ||
input = preserveCamelCase(input, toLowerCase, toUpperCase); | ||
} | ||
|
||
input = input.replace(LEADING_SEPARATORS, ''); | ||
|
||
if (options.preserveConsecutiveUppercase) { | ||
input = preserveConsecutiveUppercase(input, toLowerCase); | ||
} else { | ||
input = toLowerCase(input); | ||
} | ||
|
||
if (options.pascalCase) { | ||
input = toUpperCase(input.charAt(0)) + input.slice(1); | ||
} | ||
|
||
return postProcess(input, toUpperCase); | ||
}; | ||
|
||
export default camelCase; | ||
export default camelcase; |