Add test cases & refine getSchemaName.

fern-api · Nov 22, 2024 · 31b7b46 · 31b7b46
1 parent 3c7babe
commit 31b7b46
Show file tree

Hide file tree

Showing 11 changed files with 43,239 additions and 16 deletions.
diff --git a/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getSchemaName.ts b/packages/cli/api-importers/openapi/openapi-ir-parser/src/schema/utils/getSchemaName.ts
@@ -1,21 +1,17 @@
-import { camelCase, upperFirst, lowerFirst } from "lodash-es";
+import { camelCase, upperFirst } from "lodash-es";
 import { replaceStartingNumber } from "./replaceStartingNumber";
 
-function customCamelCase(input: string): string {
-    const tokens = input.split("_");
-    const processedTokens = tokens.map((token, index) => {
-        if (/^[a-zA-Z0-9]+$/.test(token)) {
-            return index === 0 ? lowerFirst(token) : upperFirst(token);
+export function getGeneratedTypeName(breadcrumbs: string[], useOriginalSchemaIds: boolean): string {
+    const processedTokens = breadcrumbs.map((token) => {
+        if (/^[^a-zA-Z0-9]+$/.test(token)) {
+            return token;
+        } else {
+            return upperFirst(camelCase(token));
         }
-        return token;
     });
-    return processedTokens.join("");
-}
 
-export function getGeneratedTypeName(breadcrumbs: string[], useOriginalSchemaIds: boolean): string {
-    const camelCaseFn = useOriginalSchemaIds ? customCamelCase : camelCase;
-    const underscoreDelimited = breadcrumbs.join("_");
-    const name = upperFirst(camelCaseFn(underscoreDelimited));
+    const name = processedTokens.join("");
+
     if (/^\d/.test(name)) {
         return replaceStartingNumber(name) ?? name;
     }