Merge pull request #10 from stoplightio/fix/srn-ext

casserni · web-flow · commit ed5c8b07faa1 · 2019-09-05T19:46:47.000-05:00
fix: srn extensions
diff --git a/src/__tests__/srn.spec.ts b/src/__tests__/srn.spec.ts
@@ -1,22 +1,22 @@
 import { deserializeSrn, serializeSrn } from '../srn';
 
 describe('deserializeSrn', () => {
-  it('should work deserialize org srns', () => {
+  it('should work deserialize org srn', () => {
     expect(deserializeSrn('sl/org')).toEqual({
       shortcode: 'sl',
       orgSlug: 'org',
     });
   });
 
-  it('should work deserialize project srns', () => {
+  it('should work deserialize project srn', () => {
     expect(deserializeSrn('sl/org/project')).toEqual({
       shortcode: 'sl',
       orgSlug: 'org',
       projectSlug: 'project',
     });
   });
 
-  it('should work deserialize node srns', () => {
+  it('should work deserialize node srn', () => {
     expect(deserializeSrn('sl/org/project/reference/todos/openapi.yml')).toEqual({
       shortcode: 'sl',
       orgSlug: 'org',
@@ -26,6 +26,39 @@ describe('deserializeSrn', () => {
       ext: '.yml',
     });
   });
+
+  it('should work deserialize node srn two dots in file', () => {
+    expect(deserializeSrn('sl/org/project/reference/todos/openapi.v1.yml')).toEqual({
+      shortcode: 'sl',
+      orgSlug: 'org',
+      projectSlug: 'project',
+      uri: '/reference/todos/openapi.v1.yml',
+      file: 'openapi.v1.yml',
+      ext: '.yml',
+    });
+  });
+
+  it('should work deserialize node srn with extended uri parts', () => {
+    expect(deserializeSrn('sl/org/project/reference/todos/openapi.yml/components/schemas/pet')).toEqual({
+      shortcode: 'sl',
+      orgSlug: 'org',
+      projectSlug: 'project',
+      uri: '/reference/todos/openapi.yml/components/schemas/pet',
+      file: 'openapi.yml',
+      ext: '.yml',
+    });
+  });
+
+  it('should work deserialize node srn with dot in uri path', () => {
+    expect(deserializeSrn('sl/org/project/reference/stoplight/openapi.v1.yaml/paths/~1nodes.get/get')).toEqual({
+      shortcode: 'sl',
+      orgSlug: 'org',
+      projectSlug: 'project',
+      uri: '/reference/stoplight/openapi.v1.yaml/paths/~1nodes.get/get',
+      file: 'openapi.v1.yaml',
+      ext: '.yaml',
+    });
+  });
 });
 
 describe('serializeSrn', () => {
diff --git a/src/srn.ts b/src/srn.ts
@@ -1,5 +1,4 @@
-import { basename } from './basename';
-import { extname } from './extname';
+import { parseBase } from './parseBase';
 
 export interface IDeserializedSrn {
   shortcode: string;
@@ -18,8 +17,11 @@ export function deserializeSrn(srn: string): IDeserializedSrn {
   let file;
   let ext;
   if (uri) {
-    ext = extname(uri);
-    file = basename(uri);
+    file = uriParts.find(part => part.includes('.'));
+
+    if (file) {
+      ext = parseBase(file).ext;
+    }
   }
 
   return {
