From bdd2bcf23610eb22f30e06e1c2478cbea8d2692b Mon Sep 17 00:00:00 2001 From: Jaco Date: Wed, 1 Dec 2021 08:21:31 +0100 Subject: [PATCH] camelCase with mixed uppercase/numbers (#1260) * camelCase with mixed uppercase/numbers * consequtive capitals * CHANGELOG * CHANGELOG --- CHANGELOG.md | 11 +++++++++++ packages/util/src/string/camelCase.spec.ts | 22 ++++++++++++++++++++-- packages/util/src/string/camelCase.ts | 17 +++++++++-------- 3 files changed, 40 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 1ce187b25..e2d7b6c9d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # CHANGELOG +## master + +Contributed: + +- Add Picasso genesisHash (Thanks to https://github.com/hussein-aitlahcen) + +Changes: + +- Ensure consequtive capitals in `stringCamelCase` are lowercased + + ## 8.0.5 Dec 1, 2021 Changes: diff --git a/packages/util/src/string/camelCase.spec.ts b/packages/util/src/string/camelCase.spec.ts index 783527599..10dd9ae81 100644 --- a/packages/util/src/string/camelCase.spec.ts +++ b/packages/util/src/string/camelCase.spec.ts @@ -33,8 +33,8 @@ const randomWords = arrayRange(256).map((): [string] => { describe('stringCamelCase', (): void => { it('works correctly', (): void => { expect( - stringCamelCase('Snake_case-...Something spaced') - ).toBe('snakeCaseSomethingSpaced'); + stringCamelCase('Snake_case-...SomethingSomething spaced') + ).toBe('snakeCaseSomethingSomethingSpaced'); }); it('works correctly for String (class', (): void => { @@ -47,6 +47,24 @@ describe('stringCamelCase', (): void => { expect( stringCamelCase('DEDUP_KEY_PREFIX') ).toEqual('dedupKeyPrefix'); + expect( + stringCamelCase('SOMETHING') + ).toEqual('something'); + }); + + it('adjusts all-uppercase + digits', (): void => { + expect( + stringCamelCase('SS58 PreFIX') + ).toEqual('ss58Prefix'); + expect( + stringCamelCase('SS58Prefix') + ).toEqual('ss58Prefix'); + expect( + stringCamelCase('UUID64') + ).toEqual('uuid64'); + expect( + stringCamelCase('BLAKE2B') + ).toEqual('blake2B'); }); it('adjusts with leading _', (): void => { diff --git a/packages/util/src/string/camelCase.ts b/packages/util/src/string/camelCase.ts index 8aa190e9c..b146a1765 100644 --- a/packages/util/src/string/camelCase.ts +++ b/packages/util/src/string/camelCase.ts @@ -10,23 +10,24 @@ import type { AnyString } from '../types'; // a 10+x improvement over the original camelcase npm package (at running) // // original: 20.88 μs/op -// this: 1.75 μs/op +// this: 1.91 μs/op // // Caveat of this: only Ascii, but acceptable for the intended usecase function converter (fn: (w: string, i: number) => string): (value: AnyString) => string { return (value: AnyString): string => value .toString() + // replace all seperators (including consequtive) with spaces .replace(/[-_., ]+/g, ' ') + // we don't want leading or trailing spaces .trim() + // all consequtive capitals are changed to lowercase + .replace(/[A-Z]{2,}/g, (w) => w.toLowerCase()) + // split into words .split(' ') - .map((w, i) => - fn(w[0], i) + ( - w.toUpperCase() === w - ? w.slice(1).toLowerCase() - : w.slice(1) - ) - ) + // apply the function to the first letter, the rest as-is + .map((w, i) => fn(w[0], i) + w.slice(1)) + // combine into a single word .join(''); }