diff --git a/README.md b/README.md index 52c69799..2d6add5f 100644 --- a/README.md +++ b/README.md @@ -4,13 +4,13 @@

- + donation badge - + contributions are welcome
- + Language grade: JavaScript/TypeScript - + Maintainability
- + Unit tests status - + Integration tests status - + E2E tests status
- + Quality checks status - + Security checks status - + Build checks status
- + Git release status - + Site release status - + Desktop application release status
- + Auto-versioned by bump-everywhere = { + target: '_blank', + rel: 'noopener noreferrer', +}; + function openUrlsInNewTab(md: MarkdownIt) { // https://github.com/markdown-it/markdown-it/blob/12.2.0/docs/architecture.md#renderer - const defaultRender = getDefaultRenderer(md, 'link_open'); + const defaultRender = getOrDefaultRenderer(md, 'link_open'); md.renderer.rules.link_open = (tokens, idx, options, env, self) => { const token = tokens[idx]; - if (!getTokenAttributeValue(token, 'target')) { - token.attrPush(['target', '_blank']); - } + + Object.entries(ExternalAnchorElementAttributes).forEach(([name, value]) => { + const currentValue = getAttribute(token, name); + if (!currentValue) { + token.attrPush([name, value]); + } else if (currentValue !== value) { + setAttribute(token, name, value); + } + }); return defaultRender(tokens, idx, options, env, self); }; } -function getDefaultRenderer(md: MarkdownIt, ruleName: string): Renderer.RenderRule { +function getOrDefaultRenderer(md: MarkdownIt, ruleName: string): Renderer.RenderRule { const renderer = md.renderer.rules[ruleName]; - if (renderer) { - return renderer; - } - return (tokens, idx, options, _env, self) => { + return renderer || defaultRenderer; + function defaultRenderer(tokens, idx, options, _env, self) { return self.renderToken(tokens, idx, options); - }; + } } -function getTokenAttributeValue(token: Token, attributeName: string): string | undefined { - const attributeIndex = token.attrIndex(attributeName); +function getAttribute(token: Token, name: string): string | undefined { + const attributeIndex = token.attrIndex(name); if (attributeIndex < 0) { return undefined; } const value = token.attrs[attributeIndex][1]; return value; } + +function setAttribute(token: Token, name: string, value: string): void { + const attributeIndex = token.attrIndex(name); + if (attributeIndex < 0) { + throw new Error('Attribute does not exist'); + } + token.attrs[attributeIndex][1] = value; +} diff --git a/src/presentation/components/Scripts/View/TheScriptsView.vue b/src/presentation/components/Scripts/View/TheScriptsView.vue index de0dfb94..9d77ec9a 100644 --- a/src/presentation/components/Scripts/View/TheScriptsView.vue +++ b/src/presentation/components/Scripts/View/TheScriptsView.vue @@ -20,7 +20,7 @@

Sorry, no matches for "{{this.searchQuery | threeDotsTrim }}" 😞
Feel free to extend the scripts - here ✨ + here ✨
diff --git a/src/presentation/components/TheFooter/PrivacyPolicy.vue b/src/presentation/components/TheFooter/PrivacyPolicy.vue index d0dff64d..d135358f 100644 --- a/src/presentation/components/TheFooter/PrivacyPolicy.vue +++ b/src/presentation/components/TheFooter/PrivacyPolicy.vue @@ -19,13 +19,13 @@
🤖
All transparent: Deployed automatically from the master branch - of the source code with no changes. + of the source code with no changes.
📈
- Basic CDN statistics + Basic CDN statistics are collected by AWS but they cannot be traced to you or your behavior. You can download the offline version if you don't want any CDN data collection.
@@ -35,7 +35,7 @@
As almost no data is collected, the application gets better only with your active feedback. - Feel free to create an issue 😊
+ Feel free to create an issue 😊
diff --git a/src/presentation/components/TheFooter/TheFooter.vue b/src/presentation/components/TheFooter/TheFooter.vue index dba656f8..29c4fde7 100644 --- a/src/presentation/components/TheFooter/TheFooter.vue +++ b/src/presentation/components/TheFooter/TheFooter.vue @@ -5,7 +5,7 @@ - Online version at {{ homepageUrl }} + Online version at {{ homepageUrl }} @@ -14,19 +14,19 @@
- + Feedback
- + Source Code
- + v{{ version }} diff --git a/tests/unit/presentation/components/Scripts/View/Tree/SelectableTree/Node/Documentation/MarkdownRenderer.spec.ts b/tests/unit/presentation/components/Scripts/View/Tree/SelectableTree/Node/Documentation/MarkdownRenderer.spec.ts index d6169c44..c2eba9b0 100644 --- a/tests/unit/presentation/components/Scripts/View/Tree/SelectableTree/Node/Documentation/MarkdownRenderer.spec.ts +++ b/tests/unit/presentation/components/Scripts/View/Tree/SelectableTree/Node/Documentation/MarkdownRenderer.spec.ts @@ -10,17 +10,53 @@ describe('MarkdownRenderer', () => { // assert expect(renderer !== undefined); }); - it('opens URLs in new tab', () => { - // arrange - const renderer = createRenderer(); - const markdown = '[undergroundwires.dev](https://undergroundwires.dev)'; - // act - const htmlString = renderer.render(markdown); - // assert - const html = parseHtml(htmlString); - const aElement = html.getElementsByTagName('a')[0]; - const href = aElement.getAttribute('target'); - expect(href).to.equal('_blank'); + describe('sets expected anchor attributes', () => { + const attributes: ReadonlyArray<{ + readonly name: string, + readonly expectedValue: string, + readonly invalidMarkdown: string + }> = [ + { + name: 'target', + expectedValue: '_blank', + invalidMarkdown: 'example', + }, + { + name: 'rel', + expectedValue: 'noopener noreferrer', + invalidMarkdown: 'example', + }, + ]; + for (const attribute of attributes) { + const { name, expectedValue, invalidMarkdown } = attribute; + + it(`adds "${name}" attribute to anchor elements`, () => { + // arrange + const renderer = createRenderer(); + const markdown = '[undergroundwires.dev](https://undergroundwires.dev)'; + + // act + const htmlString = renderer.render(markdown); + + // assert + const html = parseHtml(htmlString); + const aElement = html.getElementsByTagName('a')[0]; + expect(aElement.getAttribute(name)).to.equal(expectedValue); + }); + + it(`overrides existing "${name}" attribute`, () => { + // arrange + const renderer = createRenderer(); + + // act + const htmlString = renderer.render(invalidMarkdown); + + // assert + const html = parseHtml(htmlString); + const aElement = html.getElementsByTagName('a')[0]; + expect(aElement.getAttribute(name)).to.equal(expectedValue); + }); + } }); it('does not convert single linebreak to
', () => { // arrange