Skip to content

fix(joinRelativeURL): handle base with protocol #222

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Mar 15, 2024
Merged

fix(joinRelativeURL): handle base with protocol #222

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0db387d
fix(joinRelativeURL): split segments with single `/` only
pi0 Mar 15, 2024
82bd43a
Merge branch 'main' into fix/relative-join
pi0 Mar 15, 2024
6ee23b9
Update test/join.test.ts
pi0 Mar 15, 2024
07c4c63
refactor new relative case
pi0 Mar 15, 2024
5b31f47
fix
pi0 Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ const PROTOCOL_RELATIVE_REGEX = /^([/\\]\s*){2,}[^/\\]/;
const PROTOCOL_SCRIPT_RE = /^[\s\0]*(blob|data|javascript|vbscript):$/i;
const TRAILING_SLASH_RE = /\/$|\/\?|\/#/;
const JOIN_LEADING_SLASH_RE = /^\.?\//;
const JOIN_SEGMENT_SPLIT_RE = /(?<!\/)\/(?!\/)/;

/**
* Check if a path starts with `./` or `../`.
Expand Down Expand Up @@ -355,11 +356,14 @@ export function joinRelativeURL(..._input: string[]): string {
if (!i || i === "/") {
continue;
}
for (const s of i.split("/")) {
for (const s of i.split(JOIN_SEGMENT_SPLIT_RE)) {
if (!s || s === ".") {
continue;
}
if (s === "..") {
if (segments.length === 1 && hasProtocol(segments[0])) {
continue;
}
segments.pop();
segmentsDepth--;
continue;
Expand Down
8 changes: 8 additions & 0 deletions test/join.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,10 @@ const joinURLTests = [
{ input: ["/", "./foo"], out: "/foo" },
{ input: ["/", "./foo/"], out: "/foo/" },
{ input: ["/", "./foo", "bar"], out: "/foo/bar" },
{
input: ["https://google.com/", "./foo", "/bar"],
out: "https://google.com/foo/bar",
},
] as const;

describe("joinURL", () => {
Expand All @@ -42,6 +46,10 @@ describe("joinRelativeURL", () => {
{ input: ["../a", "../../../b"], out: "../../b" },
{ input: ["../a", "../../../../b"], out: "../../../b" },
{ input: ["../a/", "../b"], out: "b" },
{
input: ["https://google.com/", "../foo"],
out: "https://google.com/foo",
},
];

for (const t of relativeTests) {
Expand Down