update camelToSnake to use case-anything to fix bug containing upperc…

…ase words
stephenh · May 25, 2024 · 80a2886 · 80a2886
1 parent 159c984
commit 80a2886
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/src/case.ts b/src/case.ts
@@ -1,4 +1,4 @@
-import { camelCase as camelCaseAnything } from "case-anything";
+import { camelCase as camelCaseAnything, snakeCase as snakeCaseAnything } from "case-anything";
 
 import { Options } from "./options";
 
@@ -24,7 +24,7 @@ export function snakeToCamel(s: string): string {
 }
 
 export function camelToSnake(s: string): string {
-  return s.replace(/\w([A-Z])/g, (m) => m[0] + "_" + m[1]).toUpperCase();
+  return snakeCaseAnything(s).toUpperCase();
 }
 
 export function capitalize(s: string): string {

diff --git a/tests/case-test.ts b/tests/case-test.ts
@@ -1,4 +1,4 @@
-import { maybeSnakeToCamel, camelCaseGrpc } from "../src/case";
+import { maybeSnakeToCamel, camelCaseGrpc, camelToSnake } from "../src/case";
 import { Options, optionsFromParameter } from "../src/options";
 import { getFieldJsonName } from "../src/utils";
 
@@ -51,6 +51,14 @@ describe("case", () => {
     expect(camelCaseGrpc("GetAPIValue")).toEqual("getApiValue");
   });
 
+  it("converts simple string to snake case, getApiValue === GET_API_VALUE", () => {
+    expect(camelToSnake("GetApiValue")).toEqual("GET_API_VALUE");
+  });
+
+  it("converts string to snake case respecting word separation, getAPIValue === GET_API_VALUE", () => {
+    expect(camelToSnake("getAPIValue")).toEqual("GET_API_VALUE");
+  });
+
   describe("getFieldJsonName", () => {
     it("keeps snake case when jsonName is probably not set", () => {
       expect(getFieldJsonName({ name: "foo_bar", jsonName: "fooBar" }, { snakeToCamel: [], useJsonName: false })).toBe(