Fix enum key generation for values like ENUM_123_VALUE_456 (#1260)

* fix: keep underscores in enum names with numbers

* chore: add more use cases

* chore: add changeset

* Update .changeset/big-sheep-see.md

---------

Co-authored-by: Sora Morimoto <[email protected]>

Author: parsaghk

.changeset/big-sheep-see.md

@@ -0,0 +1,5 @@
+---
+"swagger-typescript-api": patch
+---
+
+Fix enum key generation for values like `ENUM_123_VALUE_456`.

src/type-name-formatter.ts

@@ -32,7 +32,7 @@ export class TypeNameFormatter {
     }
 
     // constant names like LEFT_ARROW, RIGHT_FORWARD, ETC_KEY, _KEY_NUM_
-    if (/^([A-Z_]{1,})$/g.test(name)) {
+    if (/^(?!\d)([A-Z0-9_]{1,})$/g.test(name)) {
       return lodash.compact([typePrefix, name, typeSuffix]).join("_");
     }
 

tests/spec/enumIncludesNumber/__snapshots__/basic.test.ts.snap

@@ -0,0 +1,26 @@
+// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
+
+exports[`basic > use x-enumNames as the key for enum 1`] = `
+"/* eslint-disable */
+/* tslint:disable */
+// @ts-nocheck
+/*
+ * ---------------------------------------------------------------
+ * ## THIS FILE WAS GENERATED VIA SWAGGER-TYPESCRIPT-API        ##
+ * ##                                                           ##
+ * ## AUTHOR: acacode                                           ##
+ * ## SOURCE: https://github.com/acacode/swagger-typescript-api ##
+ * ---------------------------------------------------------------
+ */
+
+export enum StringEnumIncludesNumbersAndUnderscore {
+  VAL_1 = "VAL_1",
+  VAL_2 = "VAL_2",
+  VAL_3 = "VAL_3",
+  _1_VAL = "_1_VAL",
+  A_1_B_2_C_3 = "A_1_B_2_C_3",
+  _A_1_B_2_C_3 = "_A_1_B_2_C_3",
+  _1_A_2_B_3_C = "_1_A_2_B_3_C",
+}
+"
+`;

tests/spec/enumIncludesNumber/basic.test.ts

@@ -0,0 +1,37 @@
+import * as fs from "node:fs/promises";
+import * as os from "node:os";
+import * as path from "node:path";
+
+import { afterAll, beforeAll, describe, expect, test } from "vitest";
+
+import { generateApi } from "../../../src/index.js";
+
+describe("basic", async () => {
+  let tmpdir = "";
+
+  beforeAll(async () => {
+    tmpdir = await fs.mkdtemp(path.join(os.tmpdir(), "swagger-typescript-api"));
+  });
+
+  afterAll(async () => {
+    await fs.rm(tmpdir, { recursive: true });
+  });
+
+  test("use x-enumNames as the key for enum", async () => {
+    await generateApi({
+      fileName: "schema",
+      input: path.resolve(import.meta.dirname, "schema.json"),
+      output: tmpdir,
+      silent: true,
+      enumNamesAsValues: false,
+      generateClient: false,
+    });
+
+    const content = await fs.readFile(path.join(tmpdir, "schema.ts"), {
+      encoding: "utf8",
+    });
+    console.log(path.join(tmpdir, "schema.ts"));
+
+    expect(content).toMatchSnapshot();
+  });
+});

tests/spec/enumIncludesNumber/schema.json

@@ -0,0 +1,21 @@
+{
+  "openapi": "3.0.0",
+  "tags": [],
+  "servers": [],
+  "components": {
+    "schemas": {
+      "StringEnumIncludesNumbersAndUnderscore": {
+        "type": "string",
+        "enum": [
+          "VAL_1",
+          "VAL_2",
+          "VAL_3",
+          "_1_VAL",
+          "A_1_B_2_C_3",
+          "_A_1_B_2_C_3",
+          "_1_A_2_B_3_C"
+        ]
+      }
+    }
+  }
+}