fix: definition name util (#1865)

* fix: definition name util * update snapshot
Redocly · Jan 19, 2022 · 95a7347 · 95a7347
1 parent 3e47932
commit 95a7347
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 7 deletions.
diff --git a/src/components/__tests__/__snapshots__/DiscriminatorDropdown.test.tsx.snap b/src/components/__tests__/__snapshots__/DiscriminatorDropdown.test.tsx.snap
@@ -752,7 +752,7 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
               "required": Array [
                 "type",
               ],
-              "title": "schemas",
+              "title": "Dog",
               "type": "object",
             },
             "title": "Dog",
@@ -1488,7 +1488,7 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
               "required": Array [
                 "type",
               ],
-              "title": "schemas",
+              "title": "Cat",
               "type": "object",
             },
             "title": "Cat",
@@ -2454,7 +2454,7 @@ exports[`Components SchemaView discriminator should correctly render SchemaView
         "required": Array [
           "type",
         ],
-        "title": "schemas",
+        "title": "Dog",
         "type": "object",
       },
       "title": "Dog",

diff --git a/src/utils/__tests__/openapi.test.ts b/src/utils/__tests__/openapi.test.ts
@@ -12,6 +12,7 @@ import {
   sortByRequired,
   humanizeNumberRange,
   getContentWithLegacyExamples,
+  getDefinitionName,
 } from '../';
 
 import { FieldModel, OpenAPIParser, RedocNormalizedOptions } from '../../services';
@@ -1269,4 +1270,14 @@ describe('Utils', () => {
       expect(content['text/plain']).toStrictEqual(info.content['text/plain']);
     });
   });
+
+  describe('getDefinitionName', () => {
+    test('should return the name if pointer match regex', () => {
+      expect(getDefinitionName('#/components/schemas/Call')).toEqual('Call');
+    });
+    test("should return the `undefined` if pointer not match regex or it's absent", () => {
+      expect(getDefinitionName('#/test/path/Call')).toBeUndefined();
+      expect(getDefinitionName()).toBeUndefined();
+    });
+  });
 });
diff --git a/src/utils/openapi.ts b/src/utils/openapi.ts
@@ -384,14 +384,15 @@ export function langFromMime(contentType: string): string {
   return 'clike';
 }
 
+const DEFINITION_NAME_REGEX = /^#\/components\/(schemas|pathItems)\/([^/]+)$/;
+
 export function isNamedDefinition(pointer?: string): boolean {
-  return /^#\/components\/(schemas|pathItems)\/[^\/]+$/.test(pointer || '');
+  return DEFINITION_NAME_REGEX.test(pointer || '');
 }
 
 export function getDefinitionName(pointer?: string): string | undefined {
-  if (!pointer) return undefined;
-  const match = pointer.match(/^#\/components\/(schemas|pathItems)\/([^\/]+)$/);
-  return match === null ? undefined : match[1];
+  const [name] = pointer?.match(DEFINITION_NAME_REGEX)?.reverse() || [];
+  return name;
 }
 
 function humanizeMultipleOfConstraint(multipleOf: number | undefined): string | undefined {