build with relative paths #173
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| // Returns the relative path from "/file/path/to/a" to "/file/path/of/b". To | ||
| // make relative imports work, paths to the same directory are prefixed with | ||
| // "./", and paths that start without a slash are considered from the root. | ||
| export function relativeUrl(source, target) { | ||
| if (/^\w+:/.test(target)) return target; | ||
| const from = `/${source}`.split(/[/]+/g).slice(0, -1); | ||
| const to = `/${target}`.split(/[/]+/g); | ||
| const f = to.pop()!; | ||
| const m = from.length; | ||
| const n = Math.min(m, to.length); | ||
| let i = 0; | ||
| while (i < n && from[i] === to[i]) ++i; | ||
| const k = m - i; | ||
| return (k ? "../".repeat(k) : "./") + to.slice(i).concat(f).join("/"); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| define({id: "0", outputs: ["foo"], body: async () => { | ||
| const foo = await import("./_import/noent.js"); | ||
| return {foo}; | ||
| }}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| define({id: "0", outputs: ["foo"], body: async () => { | ||
| const foo = await import("./_import/bar.js"); | ||
| return {foo}; | ||
| }}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| define({id: "0", outputs: ["foo"], body: async () => { | ||
| const foo = await import("./_import/other/foo.js"); | ||
| return {foo}; | ||
| }}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| define({id: "0", outputs: ["foo"], body: async () => { | ||
| const {foo} = await import("./_import/other/foo.js"); | ||
| return {foo}; | ||
| }}); |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,40 @@ | ||
| import assert from "node:assert"; | ||
| import {relativeUrl} from "../src/url.js"; | ||
|
|
||
| describe("relativeUrls", () => { | ||
| it("respects absolute links", () => { | ||
| assert.strictEqual(relativeUrl("/", "https://whatever"), "https://whatever"); | ||
| assert.strictEqual(relativeUrl("/", "http://example.org"), "http://example.org"); | ||
| assert.strictEqual(relativeUrl("/", "https://example.org/"), "https://example.org/"); | ||
mbostock marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| assert.strictEqual(relativeUrl("/", "mailto:hello@example.org"), "mailto:hello@example.org"); | ||
| }); | ||
| it("return the expected result", () => { | ||
Fil marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| assert.strictEqual(relativeUrl("/", "/"), "./"); | ||
| assert.strictEqual(relativeUrl("/foo", "/"), "./"); | ||
| assert.strictEqual(relativeUrl("/foo.html", "/"), "./"); | ||
| assert.strictEqual(relativeUrl("/", "/foo"), "./foo"); | ||
| assert.strictEqual(relativeUrl("/", "/foo.html"), "./foo.html"); | ||
| assert.strictEqual(relativeUrl("/", "/foo/bar/baz"), "./foo/bar/baz"); | ||
| assert.strictEqual(relativeUrl("/foo", "/foo"), "./foo"); | ||
| assert.strictEqual(relativeUrl("/foo/", "/foo/"), "./"); | ||
| assert.strictEqual(relativeUrl("/foo", "/foo/"), "./foo/"); | ||
|
Comment on lines
+19
to
+20
There was a problem hiding this comment.
There was a problem hiding this comment. I don't know if we should make the differentiation between "/foo" vs "/foo/". What is the use case for There was a problem hiding this comment. You get |
||
| assert.strictEqual(relativeUrl("/foo/", "/foo"), "../foo"); | ||
| assert.strictEqual(relativeUrl("/foo/bar", "/foo/bar"), "./bar"); | ||
| assert.strictEqual(relativeUrl("/foo/bar/", "/foo/bar/"), "./"); | ||
| assert.strictEqual(relativeUrl("/foo/bar", "/foo/bar/"), "./bar/"); | ||
| assert.strictEqual(relativeUrl("/foo/bar/", "/foo/bar"), "../bar"); | ||
| assert.strictEqual(relativeUrl("/foo", "/bar"), "./bar"); | ||
| assert.strictEqual(relativeUrl("/foo/bar", "/baz"), "../baz"); | ||
| assert.strictEqual(relativeUrl("/foo/bar", "/foo"), "../foo"); | ||
| assert.strictEqual(relativeUrl("/foo/bar", "/foo.csv"), "../foo.csv"); | ||
| assert.strictEqual(relativeUrl("/foo/bar", "/foo/"), "./"); | ||
| assert.strictEqual(relativeUrl("/foo/bar", "/baz/bar"), "../baz/bar"); | ||
| assert.strictEqual(relativeUrl("foo", "bar"), "./bar"); | ||
| assert.strictEqual(relativeUrl("foo/bar", "baz"), "../baz"); | ||
| assert.strictEqual(relativeUrl("foo/bar", "foo"), "../foo"); | ||
| assert.strictEqual(relativeUrl("foo/bar", "foo.csv"), "../foo.csv"); | ||
| assert.strictEqual(relativeUrl("foo/bar", "foo/"), "./"); | ||
| assert.strictEqual(relativeUrl("foo/bar", "baz/bar"), "../baz/bar"); | ||
Fil marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| assert.strictEqual(relativeUrl("foo////baz", "baz//bar"), "../baz/bar"); | ||
| }); | ||
| }); | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It’s worth mentioning that
relativeUrlcan be called with two different types of paths with different characteristics: serving paths and source paths.Serving paths, such as during
render, start with a slash and don’t end with an extension. For example/javascript/displays.Source paths, such as during
rewriteImports, don’t start with a slash and do end with an extension. For example,javascript/displays.md. Source paths are typically relative to the source root, or to a subdirectory in source root (such as when computing transitive imports).It looks like the code already handles both of these correctly, but I think it’s worth calling it out in the tests, and having explicit tests for each type of path. I think we also want more tests for the source path case.