fix(types): avoid generating empty identifiers

concerns #22
nfroidure · May 24, 2022 · 2b5d554 · 2b5d554
1 parent f174dd8
commit 2b5d554
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/fixtures/openapi/diagrams.json b/fixtures/openapi/diagrams.json
@@ -696,7 +696,7 @@
                       "title": "token_type",
                       "description": "See https://tools.ietf.org/html/rfc6749#section-7.1",
                       "type": "string",
-                      "enum": ["bearer", "mac"]
+                      "enum": ["bearer", "mac", "💕-✅"]
                     },
                     "expires_in": {
                       "description": "The lifetime in seconds of the access token",

diff --git a/src/__snapshots__/index.test.ts.snap b/src/__snapshots__/index.test.ts.snap
@@ -752,7 +752,8 @@ declare namespace Enums {
     }
     export enum TokenType {
         Bearer = \\"bearer\\",
-        Mac = \\"mac\\"
+        Mac = \\"mac\\",
+        Unknown = \\"\\\\uD83D\\\\uDC95-\\\\u2705\\"
     }
     export enum Error {
         InvalidRequest = \\"invalid_request\\",
@@ -1524,7 +1525,8 @@ declare namespace Enums {
     }
     export enum TokenType {
         Bearer = \\"bearer\\",
-        Mac = \\"mac\\"
+        Mac = \\"mac\\",
+        Unknown = \\"\\\\uD83D\\\\uDC95-\\\\u2705\\"
     }
     export enum Role {
         Admin = \\"admin\\",
@@ -2390,7 +2392,8 @@ declare namespace Enums {
     }
     export enum TokenType {
         Bearer = \\"bearer\\",
-        Mac = \\"mac\\"
+        Mac = \\"mac\\",
+        Unknown = \\"\\\\uD83D\\\\uDC95-\\\\u2705\\"
     }
     export enum Error {
         InvalidRequest = \\"invalid_request\\",
@@ -2654,7 +2657,7 @@ declare namespace Components {
         export type UserArray = Components.Schemas.RequestBodiesUserArrayBody0;
         export type Pet = Components.Schemas.Pet | Components.Schemas.Pet;
         export type UpdatePetWithFormRequestBody = Components.Schemas.Body;
-        export type UploadFileRequestBody = Components.Schemas.Body_1;
+        export type UploadFileRequestBody = Components.Schemas.Body1;
         export type PlaceOrderRequestBody = Components.Schemas.Order;
         export type CreateUserRequestBody = Components.Schemas.User;
         export type UpdateUserRequestBody = Components.Schemas.User;
@@ -2942,7 +2945,7 @@ declare namespace Components {
             name?: NonNullable<string>;
             status?: NonNullable<string>;
         }>;
-        export type Body_1 = NonNullable<{
+        export type Body1 = NonNullable<{
             additionalMetadata?: NonNullable<string>;
             file?: NonNullable<string>;
         }>;
@@ -3205,7 +3208,7 @@ declare namespace Components {
         export type UserArray = Components.Schemas.RequestBodiesUserArrayBody0;
         export type Pet = Components.Schemas.Pet | Components.Schemas.Pet;
         export type UpdatePetWithFormRequestBody = Components.Schemas.Body;
-        export type UploadFileRequestBody = Components.Schemas.Body_1;
+        export type UploadFileRequestBody = Components.Schemas.Body1;
         export type PlaceOrderRequestBody = Components.Schemas.Order;
         export type CreateUserRequestBody = Components.Schemas.User;
         export type UpdateUserRequestBody = Components.Schemas.User;
@@ -3311,7 +3314,7 @@ declare namespace Components {
             name?: NonNullable<string>;
             status?: NonNullable<string>;
         }>;
-        export type Body_1 = NonNullable<{
+        export type Body1 = NonNullable<{
             additionalMetadata?: NonNullable<string>;
             file?: NonNullable<string>;
         }>;
@@ -3622,7 +3625,7 @@ declare namespace Components {
         export type UserArray = Components.Schemas.RequestBodiesUserArrayBody0;
         export type Pet = Components.Schemas.Pet | Components.Schemas.Pet;
         export type UpdatePetWithFormRequestBody = Components.Schemas.Body;
-        export type UploadFileRequestBody = Components.Schemas.Body_1;
+        export type UploadFileRequestBody = Components.Schemas.Body1;
         export type PlaceOrderRequestBody = Components.Schemas.Order;
         export type CreateUserRequestBody = Components.Schemas.User;
         export type UpdateUserRequestBody = Components.Schemas.User;
@@ -3940,7 +3943,7 @@ declare namespace Components {
             name?: NonNullable<string>;
             status?: NonNullable<string>;
         }>;
-        export type Body_1 = NonNullable<{
+        export type Body1 = NonNullable<{
             additionalMetadata?: NonNullable<string>;
             file?: NonNullable<string>;
         }>;

diff --git a/src/index.ts b/src/index.ts
@@ -42,9 +42,14 @@ export function splitRef(ref: string): string[] {
 }
 
 export function buildIdentifier(part: string): string {
-  return part.replace(/(?:^|[^a-z0-9]+)([a-z])/gi, (_: unknown, $1: string) =>
-    $1.toUpperCase(),
-  );
+  const identifier = part
+    .replace(/[^a-z0-9-_ ]/gi, '')
+    .replace(/(?:^|[^a-z0-9]+)([a-z])/gi, (_: unknown, $1: string) =>
+      $1.toUpperCase(),
+    )
+    .replace(/[^a-z0-9]/gi, '');
+
+  return identifier || 'Unknown';
 }
 
 async function resolve<T, U>(root: T, namespaceParts: string[]): Promise<U> {