refactor: updated toPascalCase()

Author: webdeveric

src/toPascalCase.ts

@@ -5,11 +5,14 @@ import type { PascalCase } from './types/strings.js';
 import type { KeyValueTuple } from './types/tuples.js';
 
 export function toPascalCase<Type extends string>(text: Type, customWords?: StringRecord): PascalCase<Type> {
-  const words = String(text).match(/[A-Z][a-z']*|[a-z']+|\d+|[A-Z]+(?![a-z])/g);
+  let words: string[] = String(text)
+    .replaceAll(/['.]/g, '')
+    .replaceAll(/[^a-z0-9]/gi, ' ')
+    .split(/(\s+)|(?<=\d)(?=[a-z])|(?<=[a-z])(?=\d)/i)
+    .filter((word: string | undefined) => word?.trim().length)
+    .map(capitalize);
 
-  let fixedWords = words?.map<string>((word) => capitalize(word.replace(/'/g, '')));
-
-  if (fixedWords && customWords && typeof customWords === 'object') {
+  if (words && customWords && typeof customWords === 'object') {
     const replacements = new Map(
       Object.entries(customWords).map<KeyValueTuple<string, string>>(([key, value]) => [key.toLowerCase(), value]),
     );
@@ -18,9 +21,9 @@ export function toPascalCase<Type extends string>(text: Type, customWords?: Stri
       // This takes a single word and returns the first matching replacement, if any.
       const replaceCustomWords = (word: string): string => replacements.get(word.toLowerCase()) ?? word;
 
-      fixedWords = fixedWords.map(replaceCustomWords);
+      words = words.map(replaceCustomWords);
     }
   }
 
-  return (fixedWords ? fixedWords.join('') : '') as PascalCase<Type>;
+  return words.join('') as PascalCase<Type>;
 }

test/toPascalCase.test.ts

@@ -3,42 +3,65 @@ import { describe, it, expect } from 'vitest';
 import { toPascalCase } from '../src/toPascalCase.js';
 
 describe('toPascalCase()', () => {
-  it('Removes non alphanumeric', () => {
-    expect(toPascalCase('!@#$%^&*()')).toBe('');
+  it.each([
+    ['!@#$%^&*()', ''],
+    ['This is important!!!', 'ThisIsImportant'],
+  ])('Removes non alphanumeric: "%s" => "%s"', (input, expected) => {
+    expect(toPascalCase(input)).toBe(expected);
   });
 
-  it('Handles one lowercase word', () => {
-    expect(toPascalCase('a')).toBe('A');
-    expect(toPascalCase('word')).toBe('Word');
+  it.each([
+    ['abc', 'Abc'],
+    ['abc def', 'AbcDef'],
+  ])('Handles one lowercase word: "%s" => "%s"', (input, expected) => {
+    expect(toPascalCase(input)).toBe(expected);
   });
 
-  it('Handles uppercase words', () => {
-    expect(toPascalCase('SomeDLQ')).toBe('SomeDLQ');
-    expect(toPascalCase('some UPPERCASE words')).toBe('SomeUPPERCASEWords');
-    expect(toPascalCase('abc123DEF456')).toBe('Abc123DEF456');
+  it.each([
+    ['SomeDLQ', 'SomeDLQ'],
+    ['some UPPERCASE words', 'SomeUPPERCASEWords'],
+    ['abc123DEF456', 'Abc123DEF456'],
+  ])('Handles uppercase words: "%s" => "%s"', (input, expected) => {
+    expect(toPascalCase(input)).toBe(expected);
   });
 
-  it('Handles snake case', () => {
-    expect(toPascalCase('do_something_cool')).toBe('DoSomethingCool');
+  it.each([
+    ['something_happens_at_1200', 'SomethingHappensAt1200'],
+    ['do_something_cool', 'DoSomethingCool'],
+  ])('Handles snake case: "%s" => "%s"', (input, expected) => {
+    expect(toPascalCase(input)).toBe(expected);
   });
 
-  it('Handles camel case', () => {
-    expect(toPascalCase('doSomethingCool')).toBe('DoSomethingCool');
+  it.each([
+    ['Bender: do a flip!', 'BenderDoAFlip'],
+    ['doSomethingCool', 'DoSomethingCool'],
+  ])('Handles camel case: "%s" => "%s"', (input, expected) => {
+    expect(toPascalCase(input)).toBe(expected);
   });
 
-  it('Handles complex sentences', () => {
-    expect(toPascalCase('Hello world! How are you today?')).toBe('HelloWorldHowAreYouToday');
+  it.each([
+    ['The quick brown fox jumps over the lazy dog.', 'TheQuickBrownFoxJumpsOverTheLazyDog'],
+    ['Hello world! How are you today?', 'HelloWorldHowAreYouToday'],
+  ])('Handles complex sentences: "%s" => "%s"', (input, expected) => {
+    expect(toPascalCase(input)).toBe(expected);
   });
 
-  it('Handles numbers', () => {
-    expect(toPascalCase('abc123def')).toBe('Abc123Def');
+  it.each([
+    ['abc123def', 'Abc123Def'],
+    ['123abc456def', '123Abc456Def'],
+  ])('Handles numbers: "%s" => "%s"', (input, expected) => {
+    expect(toPascalCase(input)).toBe(expected);
   });
 
-  it('Handles apostrophe', () => {
+  it.each([
     // cspell:disable-next-line
-    expect(toPascalCase("Didn't can't isn't would've")).toBe('DidntCantIsntWouldve');
+    ["Didn't can't isn't would've", 'DidntCantIsntWouldve'],
     // cSpell:ignore TwasntShouldntve
-    expect(toPascalCase("'twasn't shouldn't've")).toBe('TwasntShouldntve');
+    ["'twasn't shouldn't've", 'TwasntShouldntve'],
+    // cSpell:ignore Twasnt123Shouldntve456
+    ["'twasn't123shouldn't've!456", 'Twasnt123Shouldntve456'],
+  ])('Handles apostrophe: "%s" => "%s"', (input, expected) => {
+    expect(toPascalCase(input)).toBe(expected);
   });
 
   it('Supports custom word mapping', () => {