Treat all non alphanumeric characters as delimiters (#11)

* Better capitalization regex

* Better camelCase regex

* Better toDelimiter regex

* Updated tests with breaking change

Author: gewfy

src/__snapshots__/generate.spec.ts.snap

@@ -345,7 +345,7 @@ export interface KitchenSink_TypedList_type3Object {
   file: string;
 }
 
-export interface KitchenSink_TypedList_type_4_object {
+export interface KitchenSink_TypedList_type4Object {
   type: \\"type_4_object\\";
   name: string;
 }
@@ -380,7 +380,7 @@ export interface KitchenSink {
   hidden: any;
   object: KitchenSink_Object;
   list: KitchenSink_List[];
-  typed_list: (KitchenSink_TypedList_Type1Object | KitchenSink_TypedList_Type2Object | KitchenSink_TypedList_type3Object | KitchenSink_TypedList_type_4_object)[];
+  typed_list: (KitchenSink_TypedList_Type1Object | KitchenSink_TypedList_Type2Object | KitchenSink_TypedList_type3Object | KitchenSink_TypedList_type4Object)[];
   code: KitchenSink_CodeBlock;
   code_alt: KitchenSink_CodeAltBlock;
   snippet: string;

src/widget/transform.spec.ts

@@ -7,6 +7,8 @@ import {
   sortTypes,
   TransformState,
   toCapitalized,
+  toCamelCase,
+  toDelimiter,
 } from "./transform";
 
 describe("Widget transformation", () => {
@@ -661,10 +663,10 @@ describe("Widget transformation", () => {
         { prefix: "parent", label: true },
       ),
     ).toEqual([
-      ["list: (parent_my_list_typeOne | parent_my_list_type_two)[];"],
+      ["list: (parent_myList_typeOne | parent_myList_typeTwo)[];"],
       [
-        `interface parent_my_list_typeOne { __typename: "type_one"; key: string; }`,
-        `interface parent_my_list_type_two { __typename: "two"; id: number; }`,
+        `interface parent_myList_typeOne { __typename: "type_one"; key: string; }`,
+        `interface parent_myList_typeTwo { __typename: "two"; id: number; }`,
       ],
     ]);
   });
@@ -723,24 +725,23 @@ describe("Pull typename", () => {
   });
 });
 
-describe("Capitalization", () => {
-  it("should capitalize words separated by spaces", () => {
-    const str = "space separated string";
-    expect(toCapitalized(str)).toBe("Space Separated String");
-  });
-
-  it("should capitalize words separated by dashes", () => {
-    const str = "dash-separated-string";
-    expect(toCapitalized(str)).toBe("Dash-Separated-String");
+describe("toCamelCase", () => {
+  it("should camelCase words separated by any non-alphanumeric characters", () => {
+    const str = "this is  a_string.with!non-alphanumeric#delimiters";
+    expect(toCamelCase(str)).toBe("thisIsAStringWithNonAlphanumericDelimiters");
   });
+});
 
-  it("should capitalize words separated by underscores", () => {
-    const str = "underscore_separated_string";
-    expect(toCapitalized(str)).toBe("Underscore_Separated_String");
+describe("toCapitalized", () => {
+  it("should capitalize words separated by any non-alphanumeric characters", () => {
+    const str = "this is  a_string.with!non-alphanumeric#delimiters";
+    expect(toCapitalized(str)).toBe("This Is  A_String.With!Non-Alphanumeric#Delimiters");
   });
+});
 
-  it("should handle mixed separators", () => {
-    const str = "string with-mixed_separators";
-    expect(toCapitalized(str)).toBe("String With-Mixed_Separators");
+describe("toDelimiter", () => {
+  it("replace any non-alphanumeric character with custom delimiter", () => {
+    const str = "this is  a_string.with!non-alphanumeric#delimiters";
+    expect(toDelimiter(str, "_")).toBe("this_is_a_string_with_non_alphanumeric_delimiters");
   });
 });

src/widget/transform.ts

@@ -11,19 +11,22 @@ export const getWidgetName = (
   delimiter: string,
 ): string =>
   getName(
-    useLabel
-      ? (widget.singularLabel || widget.label || widget.name).replace(/\s./gi, toCamelCase)
-      : widget.name,
+    useLabel ? toCamelCase(widget.singularLabel || widget.label || widget.name) : widget.name,
     capitalize,
     delimiter,
   );
 
-export const toCamelCase = (str: string): string => str.slice(1).toUpperCase();
+export const toCamelCase = (str: string): string =>
+  str.replace(/([^a-z\d]+)([a-z\d])/gi, (match, delimiter, char) => char.toUpperCase());
 
 export const toCapitalized = (str: string) =>
-  str.replace(/(^|[\s-_])(\w)/g, (match, separator, char) => `${separator}${char.toUpperCase()}`);
+  str.replace(
+    /(^|[^a-z\d])([a-z\d])/gi,
+    (match, delimiter, char) => `${delimiter}${char.toUpperCase()}`,
+  );
 
-export const toDelimiter = (str: string, delimiter: string) => str.replace(/[\s-_]/g, delimiter);
+export const toDelimiter = (str: string, delimiter: string) =>
+  str.replace(/[^a-z\d]+/gi, delimiter);
 
 export const wrapEnum = (item: number | string): string =>
   typeof item === "number" ? `${item}` : `"${item}"`;