From bfbe780a0b10cde7f638c3a84f9dcd6953152dad Mon Sep 17 00:00:00 2001 From: sverweij Date: Sat, 28 Mar 2020 15:16:11 +0100 Subject: [PATCH 1/9] Handle unicode character casing --- .travis.yml | 3 +-- index.js | 27 ++++++++++++++------------- package.json | 2 +- test.js | 11 +++++++++++ 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index e155464..d8572bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: node_js node_js: + - stable - '12' - '10' - - '8' - - '6' diff --git a/index.js b/index.js index 579f99b..dd2c490 100644 --- a/index.js +++ b/index.js @@ -8,21 +8,21 @@ const preserveCamelCase = string => { for (let i = 0; i < string.length; i++) { const character = string[i]; - if (isLastCharLower && /[a-zA-Z]/.test(character) && character.toUpperCase() === character) { + if (isLastCharLower && /[\p{Lu}]/u.test(character)) { string = string.slice(0, i) + '-' + string.slice(i); isLastCharLower = false; isLastLastCharUpper = isLastCharUpper; isLastCharUpper = true; i++; - } else if (isLastCharUpper && isLastLastCharUpper && /[a-zA-Z]/.test(character) && character.toLowerCase() === character) { + } else if (isLastCharUpper && isLastLastCharUpper && /[\p{Ll}]/u.test(character)) { string = string.slice(0, i - 1) + '-' + string.slice(i - 1); isLastLastCharUpper = isLastCharUpper; isLastCharUpper = false; isLastCharLower = true; } else { - isLastCharLower = character.toLowerCase() === character && character.toUpperCase() !== character; + isLastCharLower = character.toLocaleLowerCase() === character && character.toLocaleUpperCase() !== character; isLastLastCharUpper = isLastCharUpper; - isLastCharUpper = character.toUpperCase() === character && character.toLowerCase() !== character; + isLastCharUpper = character.toLocaleUpperCase() === character && character.toLocaleLowerCase() !== character; } } @@ -34,11 +34,12 @@ const camelCase = (input, options) => { throw new TypeError('Expected the input to be `string | string[]`'); } - options = Object.assign({ - pascalCase: false - }, options); + options = { + ...{pascalCase: false}, + ...options + }; - const postProcess = x => options.pascalCase ? x.charAt(0).toUpperCase() + x.slice(1) : x; + const postProcess = x => options.pascalCase ? x.charAt(0).toLocaleUpperCase() + x.slice(1) : x; if (Array.isArray(input)) { input = input.map(x => x.trim()) @@ -53,10 +54,10 @@ const camelCase = (input, options) => { } if (input.length === 1) { - return options.pascalCase ? input.toUpperCase() : input.toLowerCase(); + return options.pascalCase ? input.toLocaleUpperCase() : input.toLocaleLowerCase(); } - const hasUpperCase = input !== input.toLowerCase(); + const hasUpperCase = input !== input.toLocaleLowerCase(); if (hasUpperCase) { input = preserveCamelCase(input); @@ -64,9 +65,9 @@ const camelCase = (input, options) => { input = input .replace(/^[_.\- ]+/, '') - .toLowerCase() - .replace(/[_.\- ]+(\w|$)/g, (_, p1) => p1.toUpperCase()) - .replace(/\d+(\w|$)/g, m => m.toUpperCase()); + .toLocaleLowerCase() + .replace(/[_.\- ]+([\p{Alpha}\p{N}_]|$)/gu, (_, p1) => p1.toLocaleUpperCase()) + .replace(/\d+([\p{Alpha}\p{N}_]|$)/gu, m => m.toLocaleUpperCase()); return postProcess(input); }; diff --git a/package.json b/package.json index fbdbaaa..028c2e2 100644 --- a/package.json +++ b/package.json @@ -10,7 +10,7 @@ "url": "sindresorhus.com" }, "engines": { - "node": ">=6" + "node": ">=10" }, "scripts": { "test": "xo && ava && tsd" diff --git a/test.js b/test.js index 7ca00e7..4dea4be 100644 --- a/test.js +++ b/test.js @@ -58,6 +58,12 @@ test('camelCase', t => { t.is(camelCase('1Hello'), '1Hello'); t.is(camelCase('1hello'), '1Hello'); t.is(camelCase('h2w'), 'h2W'); + t.is(camelCase('розовый_пушистый-единороги'), 'розовыйПушистыйЕдинороги'); + t.is(camelCase('розовый_пушистый-единороги'), 'розовыйПушистыйЕдинороги'); + t.is(camelCase('РОЗОВЫЙ_ПУШИСТЫЙ-ЕДИНОРОГИ'), 'розовыйПушистыйЕдинороги'); + t.is(camelCase('桑德在这里。'), '桑德在这里。'); + t.is(camelCase('桑德在这里。'), '桑德在这里。'); + t.is(camelCase('桑德_在这里。'), '桑德在这里。'); }); test('camelCase with pascalCase option', t => { @@ -117,6 +123,11 @@ test('camelCase with pascalCase option', t => { t.is(camelCase('1hello', {pascalCase: true}), '1Hello'); t.is(camelCase('1Hello', {pascalCase: true}), '1Hello'); t.is(camelCase('h1W', {pascalCase: true}), 'H1W'); + t.is(camelCase('РозовыйПушистыйЕдинороги', {pascalCase: true}), 'РозовыйПушистыйЕдинороги'); + t.is(camelCase('розовый_пушистый-единороги', {pascalCase: true}), 'РозовыйПушистыйЕдинороги'); + t.is(camelCase('РОЗОВЫЙ_ПУШИСТЫЙ-ЕДИНОРОГИ', {pascalCase: true}), 'РозовыйПушистыйЕдинороги'); + t.is(camelCase('桑德在这里。', {pascalCase: true}), '桑德在这里。'); + t.is(camelCase('桑德_在这里。', {pascalCase: true}), '桑德在这里。'); }); test('invalid input', t => { From 6fc707c57f0b7d3732d01e5aa1def215bb97cb2f Mon Sep 17 00:00:00 2001 From: sverweij Date: Mon, 6 Apr 2020 18:36:32 +0200 Subject: [PATCH 2/9] Adds a Unicode sample to readme and types.d.ts and in both mention camelcase now correctly handles Unicode --- index.d.ts | 4 ++++ readme.md | 9 ++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/index.d.ts b/index.d.ts index 58f2069..ce29b0d 100644 --- a/index.d.ts +++ b/index.d.ts @@ -12,6 +12,7 @@ declare namespace camelcase { declare const camelcase: { /** Convert a dash/dot/underscore/space separated string to camelCase or PascalCase: `foo-bar` → `fooBar`. + Correctly handles Unicode strings. @param input - String to convert to camel case. @@ -22,6 +23,9 @@ declare const camelcase: { camelCase('foo-bar'); //=> 'fooBar' + camelCase('розовый_пушистый_единороги'); + //=> 'розовыйПушистыйЕдинороги' + camelCase('foo_bar'); //=> 'fooBar' diff --git a/readme.md b/readme.md index 5476a1c..a2bf1cf 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # camelcase [![Build Status](https://travis-ci.org/sindresorhus/camelcase.svg?branch=master)](https://travis-ci.org/sindresorhus/camelcase) -> Convert a dash/dot/underscore/space separated string to camelCase or PascalCase: `foo-bar` → `fooBar` +> Convert a dash/dot/underscore/space separated string to camelCase or PascalCase: `foo-bar` → `fooBar`. Corectly handles Unicode. ## Install @@ -21,6 +21,9 @@ camelCase('foo-bar'); camelCase('foo_bar'); //=> 'fooBar' +camelCase('розовый_пушистый_единороги'); +//=> 'розовыйПушистыйЕдинороги' + camelCase('Foo-Bar'); //=> 'fooBar' @@ -30,6 +33,9 @@ camelCase('Foo-Bar', {pascalCase: true}); camelCase('--foo.bar', {pascalCase: false}); //=> 'fooBar' +camelCase('--foo.bar', {pascalCase: false}); +//=> 'fooBar' + camelCase('foo bar'); //=> 'fooBar' @@ -43,6 +49,7 @@ camelCase(['foo', 'bar']); camelCase(['__foo__', '--bar'], {pascalCase: true}); //=> 'FooBar' + ``` From b3d14058df9a4ca316b1dcbc63fc1fdb971536fa Mon Sep 17 00:00:00 2001 From: sverweij Date: Mon, 6 Apr 2020 18:39:14 +0200 Subject: [PATCH 3/9] Adds a Unicode case to the types test --- index.test-d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/index.test-d.ts b/index.test-d.ts index ed6c78e..cc565d9 100644 --- a/index.test-d.ts +++ b/index.test-d.ts @@ -2,6 +2,7 @@ import {expectType} from 'tsd'; import camelCase = require('.'); expectType(camelCase('foo-bar')); +expectType(camelCase('розовый_пушистый_единороги')); expectType(camelCase('Foo-Bar', {pascalCase: true})); expectType(camelCase(['foo', 'bar'])); expectType(camelCase(['__foo__', '--bar'], {pascalCase: true})); From dcdee65d1f8d3c3a48d11e8401d1620985c4462f Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Tue, 7 Apr 2020 10:59:32 +0800 Subject: [PATCH 4/9] Update readme.md --- readme.md | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/readme.md b/readme.md index a2bf1cf..8a8c4ea 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,8 @@ # camelcase [![Build Status](https://travis-ci.org/sindresorhus/camelcase.svg?branch=master)](https://travis-ci.org/sindresorhus/camelcase) -> Convert a dash/dot/underscore/space separated string to camelCase or PascalCase: `foo-bar` → `fooBar`. Corectly handles Unicode. +> Convert a dash/dot/underscore/space separated string to camelCase or PascalCase: `foo-bar` → `fooBar`. + +Corectly handles Unicode. ## Install @@ -21,12 +23,12 @@ camelCase('foo-bar'); camelCase('foo_bar'); //=> 'fooBar' -camelCase('розовый_пушистый_единороги'); -//=> 'розовыйПушистыйЕдинороги' - camelCase('Foo-Bar'); //=> 'fooBar' +camelCase('розовый_пушистый_единороги'); +//=> 'розовыйПушистыйЕдинороги' + camelCase('Foo-Bar', {pascalCase: true}); //=> 'FooBar' From a668300688fa82a57dabf22e19d1e66b84bf841f Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Tue, 7 Apr 2020 10:59:53 +0800 Subject: [PATCH 5/9] Update readme.md --- readme.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/readme.md b/readme.md index 8a8c4ea..3bae12d 100644 --- a/readme.md +++ b/readme.md @@ -35,9 +35,6 @@ camelCase('Foo-Bar', {pascalCase: true}); camelCase('--foo.bar', {pascalCase: false}); //=> 'fooBar' -camelCase('--foo.bar', {pascalCase: false}); -//=> 'fooBar' - camelCase('foo bar'); //=> 'fooBar' From 718899ce2763f327d6816d39f7bcd12f119d18cb Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Tue, 7 Apr 2020 11:00:09 +0800 Subject: [PATCH 6/9] Update readme.md --- readme.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 3bae12d..c56a76f 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # camelcase [![Build Status](https://travis-ci.org/sindresorhus/camelcase.svg?branch=master)](https://travis-ci.org/sindresorhus/camelcase) -> Convert a dash/dot/underscore/space separated string to camelCase or PascalCase: `foo-bar` → `fooBar`. +> Convert a dash/dot/underscore/space separated string to camelCase or PascalCase: `foo-bar` → `fooBar` Corectly handles Unicode. @@ -48,7 +48,6 @@ camelCase(['foo', 'bar']); camelCase(['__foo__', '--bar'], {pascalCase: true}); //=> 'FooBar' - ``` From e3cca4aeadaf743a9bc92630fe636b737d222d3b Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Tue, 7 Apr 2020 11:00:35 +0800 Subject: [PATCH 7/9] Update .travis.yml --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d8572bb..94ab01f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,4 @@ language: node_js node_js: - - stable - '12' - '10' From c79b24c6f4629a2d8d33287cd325d89dc5f28a53 Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Tue, 7 Apr 2020 11:01:02 +0800 Subject: [PATCH 8/9] Update index.d.ts --- index.d.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/index.d.ts b/index.d.ts index ce29b0d..0d4aeed 100644 --- a/index.d.ts +++ b/index.d.ts @@ -12,6 +12,7 @@ declare namespace camelcase { declare const camelcase: { /** Convert a dash/dot/underscore/space separated string to camelCase or PascalCase: `foo-bar` → `fooBar`. + Correctly handles Unicode strings. @param input - String to convert to camel case. @@ -23,14 +24,14 @@ declare const camelcase: { camelCase('foo-bar'); //=> 'fooBar' - camelCase('розовый_пушистый_единороги'); - //=> 'розовыйПушистыйЕдинороги' - camelCase('foo_bar'); //=> 'fooBar' camelCase('Foo-Bar'); //=> 'fooBar' + + camelCase('розовый_пушистый_единороги'); + //=> 'розовыйПушистыйЕдинороги' camelCase('Foo-Bar', {pascalCase: true}); //=> 'FooBar' From 50599d9ef974f075318b301ce4144a4f40db8278 Mon Sep 17 00:00:00 2001 From: Sindre Sorhus Date: Tue, 7 Apr 2020 11:02:35 +0800 Subject: [PATCH 9/9] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index c56a76f..38eda30 100644 --- a/readme.md +++ b/readme.md @@ -2,7 +2,7 @@ > Convert a dash/dot/underscore/space separated string to camelCase or PascalCase: `foo-bar` → `fooBar` -Corectly handles Unicode. +Correctly handles Unicode strings. ## Install