From 0c46e67f8882c8dc7198d3e06edb7ab4884b238d Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Thu, 4 Apr 2024 22:24:53 +0200 Subject: [PATCH] Handle absolute markdown links with leading slash This commit also handles relative linking when there is no path yet. Aka not having `/tree/..` in the URL. --- src/components/InlineMarkdown.svelte | 5 ++++- src/components/Markdown.svelte | 9 ++++---- src/lib/markdown.ts | 30 ++++++++++++++++---------- src/lib/utils.ts | 20 ++++++++++------- src/views/projects/Issue.svelte | 1 - src/views/projects/Source.svelte | 4 +--- src/views/projects/Source/Blob.svelte | 30 +------------------------- tests/e2e/project.spec.ts | 27 +++++++++++++++++++++++ tests/fixtures/repos/markdown.tar.bz2 | Bin 4959 -> 5222 bytes tests/unit/utils.test.ts | 6 ++++++ 10 files changed, 75 insertions(+), 57 deletions(-) diff --git a/src/components/InlineMarkdown.svelte b/src/components/InlineMarkdown.svelte index 878bd005b..5ea4b5b0b 100644 --- a/src/components/InlineMarkdown.svelte +++ b/src/components/InlineMarkdown.svelte @@ -3,6 +3,7 @@ import markdown from "@app/lib/markdown"; import { twemoji } from "@app/lib/utils"; + import { activeUnloadedRouteStore } from "@app/lib/router"; import { Renderer } from "@app/lib/markdown"; export let content: string; @@ -13,7 +14,9 @@ const render = (content: string): string => dompurify.sanitize( markdown.parseInline(content, { - renderer: new Renderer(undefined, stripEmphasizedStyling), + renderer: new Renderer($activeUnloadedRouteStore, { + stripEmphasizedStyling, + }), }) as string, ); diff --git a/src/components/Markdown.svelte b/src/components/Markdown.svelte index 75fd61345..b6c1e7d1a 100644 --- a/src/components/Markdown.svelte +++ b/src/components/Markdown.svelte @@ -11,6 +11,7 @@ import ErrorModal from "@app/modals/ErrorModal.svelte"; import markdown from "@app/lib/markdown"; import { Renderer } from "@app/lib/markdown"; + import { activeUnloadedRouteStore } from "@app/lib/router"; import { highlight } from "@app/lib/syntax"; import { isUrl, @@ -22,8 +23,6 @@ import { mimes } from "@app/lib/file"; export let content: string; - // If present, resolve all relative links with respect to this URL - export let linkBaseUrl: string | undefined = undefined; export let path: string = "/"; export let rawPath: string; // If present, means we are in a preview context, @@ -63,7 +62,7 @@ } /** - * Do internal navigation on for clicks on anchor elements if possible + * Do internal navigation for clicks on anchor elements if possible */ function navigateInternalOnAnchor(event: MouseEvent) { if (router.useDefaultNavigation(event)) { @@ -94,7 +93,9 @@ function render(content: string): string { return dompurify.sanitize( markdown.parse(content, { - renderer: new Renderer(linkBaseUrl, false), + renderer: new Renderer($activeUnloadedRouteStore, { + stripEmphasizedStyling: false, + }), breaks, }) as string, ); diff --git a/src/lib/markdown.ts b/src/lib/markdown.ts index a7c13b103..874d6c3f4 100644 --- a/src/lib/markdown.ts +++ b/src/lib/markdown.ts @@ -1,4 +1,5 @@ import type { Tokens } from "marked"; +import type { Route } from "@app/lib/router"; import dompurify from "dompurify"; import katexMarkedExtension from "marked-katex-extension"; @@ -6,6 +7,8 @@ import markedLinkifyIt from "marked-linkify-it"; import { Marked, Renderer as BaseRenderer } from "marked"; import emojis from "@app/lib/emojis"; +import { routeToPath } from "@app/lib/router"; +import { canonicalize, isUrl } from "@app/lib/utils"; dompurify.setConfig({ // eslint-disable-next-line @typescript-eslint/naming-convention @@ -101,16 +104,19 @@ const anchorMarkedExtension = { }; export class Renderer extends BaseRenderer { - #baseUrl: string | undefined; + #route: Route; #stripEmphasizedStyling: boolean | undefined; /** * If `baseUrl` is provided, all hrefs attributes in anchor tags, except those * starting with `#`, are resolved with respect to `baseUrl` */ - constructor(baseUrl: string | undefined, stripEmphasizedStyling: boolean) { + constructor( + activeUnloadedRoute: Route, + { stripEmphasizedStyling }: { stripEmphasizedStyling: boolean }, + ) { super(); - this.#baseUrl = baseUrl; + this.#route = activeUnloadedRoute; this.#stripEmphasizedStyling = stripEmphasizedStyling; } // Overwrites the rendering of heading tokens. @@ -139,15 +145,17 @@ export class Renderer extends BaseRenderer { if (href.startsWith("#")) { // By lowercasing we avoid casing mismatches, between headings and links. return `${text}`; - } else { - try { - href = new URL(href, this.#baseUrl).href; - } catch { - // Use original href value - } - - return `${text}`; } + + if ("path" in this.#route && !isUrl(href)) { + href = routeToPath({ + ...this.#route, + path: canonicalize(href, this.#route.path || "README.md"), + route: undefined, + }); + } + + return `${text}`; } } diff --git a/src/lib/utils.ts b/src/lib/utils.ts index e77fdda98..8ed5d8bd1 100644 --- a/src/lib/utils.ts +++ b/src/lib/utils.ts @@ -115,19 +115,23 @@ export function formatPublicExplorer( .replace("$path", fullPath.replace(`/nodes/${host}/${rid}`, "")); } -// Takes a path, eg. "../images/image.png", and a base from where to start resolving, e.g. "static/images/index.html". -// Returns the resolved path. +// Takes a path, eg. "../images/image.png", and a base from where to start +// resolving, e.g. "static/images/index.html". Returns the resolved path. export function canonicalize( path: string, base: string, origin = document.location.origin, ): string { - path = path.replace(/^\//, ""); // Remove leading slash - const finalPath = base - .split("/") - .slice(0, -1) // Remove file name. - .concat([path]) // Add image file path. - .join("/"); + let finalPath: string | undefined; + if (path.startsWith("/")) { + finalPath = new URL(path, origin).pathname; + } else { + finalPath = base + .split("/") + .slice(0, -1) // Remove file name. + .concat([path]) // Add image file path. + .join("/"); + } // URL is used to resolve relative paths, eg. `../../assets/image.png`. const url = new URL(finalPath, origin); diff --git a/src/views/projects/Issue.svelte b/src/views/projects/Issue.svelte index b2e62b050..d2923de7a 100644 --- a/src/views/projects/Issue.svelte +++ b/src/views/projects/Issue.svelte @@ -171,7 +171,6 @@ authors: Comment["reactions"][0]["authors"], reaction: string, ) { - console.log(session.publicKey, authors); try { await api.project.updateIssue( project.id, diff --git a/src/views/projects/Source.svelte b/src/views/projects/Source.svelte index 810d4909d..750a2fd21 100644 --- a/src/views/projects/Source.svelte +++ b/src/views/projects/Source.svelte @@ -179,11 +179,9 @@
{#if blobResult.ok} diff --git a/src/views/projects/Source/Blob.svelte b/src/views/projects/Source/Blob.svelte index 71aefb473..8eb6868c0 100644 --- a/src/views/projects/Source/Blob.svelte +++ b/src/views/projects/Source/Blob.svelte @@ -7,7 +7,6 @@ import * as Syntax from "@app/lib/syntax"; import { isImagePath, isMarkdownPath, isSvgPath } from "@app/lib/utils"; import { lineNumbersGutter } from "@app/lib/syntax"; - import { routeToPath } from "@app/lib/router"; import Button from "@app/components/Button.svelte"; import CommitButton from "@app/views/projects/components/CommitButton.svelte"; @@ -20,8 +19,6 @@ export let baseUrl: BaseUrl; export let projectId: string; - export let peer: string | undefined; - export let revision: string | undefined; export let path: string; export let blob: Blob; export let highlighted: Syntax.Root | undefined; @@ -53,31 +50,6 @@ $: enablePreview = isMarkdown || isSvg; $: preview = enablePreview && selectedLineId === undefined; - let linkBaseUrl: string | undefined; - - $: { - if (!path || path === "/") { - // For the default root path, the `tree/` portion is omitted - // from the URL. This means that links cannot be resolved with respect - // to the current location. To work around this we provide path that - // results a fully expanded URL with which we can resolve all links in the - // Markdown. - linkBaseUrl = new URL( - routeToPath({ - resource: "project.source", - project: projectId, - node: baseUrl, - peer, - revision, - path: "README.md", - }), - window.origin, - ).href; - } else { - linkBaseUrl = undefined; - } - } - afterUpdate(() => { for (const item of document.getElementsByClassName("highlight")) { item.classList.remove("highlight"); @@ -217,7 +189,7 @@ {:else if preview && blob.content} {#if isMarkdown}
- +
{:else if isSvg}
diff --git a/tests/e2e/project.spec.ts b/tests/e2e/project.spec.ts index 4f88eb7b2..cd12a625a 100644 --- a/tests/e2e/project.spec.ts +++ b/tests/e2e/project.spec.ts @@ -468,6 +468,33 @@ test("external markdown link", async ({ context, page }) => { await expect(newPage).toHaveURL("https://example.com"); }); +test("absolute markdown link", async ({ page }) => { + await page.goto(markdownUrl); + await page.getByRole("link", { name: "Nested Linked File" }).click(); + await expect(page).toHaveURL( + `${markdownUrl}/tree/relative-files/linked-file.md`, + ); + await page.goBack(); + await expect(page).toHaveURL(markdownUrl); + await page.getByRole("link", { name: "Link Files" }).click(); + await page.getByRole("link", { name: "Absolute Link" }).click(); + await expect(page).toHaveURL( + `${markdownUrl}/tree/relative-files/linked-file.md`, + ); + await page.getByRole("link", { name: "nested file", exact: true }).click(); + await expect(page).toHaveURL( + `${markdownUrl}/tree/relative-files/nested-file.md`, + ); + await page.goBack(); + await page.getByRole("link", { name: "nested file with" }).click(); + await expect(page).toHaveURL( + `${markdownUrl}/tree/relative-files/nested-file.md`, + ); + await page.goBack(); + await page.getByRole("link", { name: "Back to link-files with" }).click(); + await expect(page).toHaveURL(`${markdownUrl}/tree/link-files.md`); +}); + test("internal file markdown link", async ({ page }) => { await page.goto(`${markdownUrl}/tree/main/link-files.md`); await page.getByRole("link", { name: "Markdown Cheatsheet" }).click(); diff --git a/tests/fixtures/repos/markdown.tar.bz2 b/tests/fixtures/repos/markdown.tar.bz2 index b04bd373950011e04a8b7194f8040465fc913c24..fd43e620c054076033addd2ece017f0aa688f0f5 100644 GIT binary patch literal 5222 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 diff --git a/tests/unit/utils.test.ts b/tests/unit/utils.test.ts index aed88f67e..5365c7aaf 100644 --- a/tests/unit/utils.test.ts +++ b/tests/unit/utils.test.ts @@ -166,6 +166,12 @@ describe("Path Manipulation", () => { origin: "https://app.radicle.xyz", expected: "assets/images/tux.png", }, + { + imagePath: "/tux.md", + base: "/components/assets/README.md", + origin: "http://localhost:3000", + expected: "tux.md", + }, { imagePath: "assets/images/tux.png", base: "/",