Merge pull request #67 from adobe/issue/modelpath

fix: fix html extension regex
adobe · Jul 14, 2021 · 63a5098 · 63a5098
2 parents 052be87 + e8eec9f
commit 63a5098
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/PathUtils.ts b/src/PathUtils.ts
@@ -284,7 +284,7 @@ export class PathUtils {
         const selectors = slingElementsWithoutResource[0].split('.');
         let currentExtension = selectors.pop();
 
-        currentExtension = currentExtension ? currentExtension.replace(/\.htm(l)?/, '') : '';
+        currentExtension = currentExtension ? currentExtension.replace(/htm(l)?/, '') : '';
 
         let path = selectors.join('.') + '.' + currentExtension + extension;
 

diff --git a/test/PathUtils.test.ts b/test/PathUtils.test.ts
@@ -403,6 +403,7 @@ describe('PathUtils ->', () => {
         assert.equal(PathUtils.addExtension('/foobar.json', 'json'), '/foobar.json');
         assert.equal(PathUtils.addExtension('/foobar', 'json'), '/foobar.json');
         assert.equal(PathUtils.addExtension('/foobar#test123fragment', 'model.json'), '/foobar.model.json');
+        assert.equal(PathUtils.addExtension('/foobar.model.html', 'json'), '/foobar.model.json');
     });
 
     it('addSelector', () => {