Skip to content
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

Jump to bottom

fix: respect fragment in trailing slash utils #175

Merged
merged 16 commits into from
Nov 15, 2023
Merged

fix: respect fragment in trailing slash utils #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
b8ed256
fix: respect fragment if existing
manniL Sep 6, 2023
0f27680
chore: apply automated lint fixes
autofix-ci[bot] Sep 6, 2023
1245a84
refactor: consider fragment handling part of query param
manniL Sep 6, 2023
d9be4a6
fix: protocol handling
manniL Sep 20, 2023
808cc5b
chore: apply automated lint fixes
autofix-ci[bot] Sep 20, 2023
3842a38
perf: handle fragment only if exists
manniL Sep 20, 2023
193b0d5
chore: apply automated lint fixes
autofix-ci[bot] Sep 20, 2023
91e09b6
chore: protocol option
manniL Sep 20, 2023
ae85ee9
chore: apply automated lint fixes
autofix-ci[bot] Sep 20, 2023
21bc5bd
wip
manniL Sep 27, 2023
29cb8b8
chore: apply automated lint fixes
autofix-ci[bot] Sep 27, 2023
f90cfdd
Merge branch 'main' into fix/trailing-slash-fragment
pi0 Nov 15, 2023
8edb24d
refactor impl
pi0 Nov 15, 2023
ac97486
chore: apply automated lint fixes
autofix-ci[bot] Nov 15, 2023
a0b628c
simplify
pi0 Nov 15, 2023
1ab878f
lint
pi0 Nov 15, 2023
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
49 changes: 38 additions & 11 deletions src/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,38 +49,65 @@ export function isScriptProtocol(protocol?: string) {
return !!protocol && PROTOCOL_SCRIPT_RE.test(protocol);
}

const TRAILING_SLASH_RE = /\/$|\/\?/;
const TRAILING_SLASH_RE = /\/$|\/\?|\/#/;

export function hasTrailingSlash(input = "", queryParameters = false): boolean {
if (!queryParameters) {
export function hasTrailingSlash(
input = "",
respectQueryAndFragment?: boolean
): boolean {
if (!respectQueryAndFragment) {
return input.endsWith("/");
}
return TRAILING_SLASH_RE.test(input);
}

export function withoutTrailingSlash(
input = "",
queryParameters = false
respectQueryAndFragment?: boolean
): string {
if (!queryParameters) {
if (!respectQueryAndFragment) {
return (hasTrailingSlash(input) ? input.slice(0, -1) : input) || "/";
}
if (!hasTrailingSlash(input, true)) {
return input || "/";
}
const [s0, ...s] = input.split("?");
return (s0.slice(0, -1) || "/") + (s.length > 0 ? `?${s.join("?")}` : "");
let path = input;
let fragment = "";
const fragmentIndex = input.indexOf("#");
if (fragmentIndex >= 0) {
path = input.slice(0, fragmentIndex);
fragment = input.slice(fragmentIndex);
}
const [s0, ...s] = path.split("?");
return (
(s0.slice(0, -1) || "/") +
(s.length > 0 ? `?${s.join("?")}` : "") +
fragment
);
}

export function withTrailingSlash(input = "", queryParameters = false): string {
if (!queryParameters) {
export function withTrailingSlash(
input = "",
respectQueryAndFragment?: boolean
): string {
if (!respectQueryAndFragment) {
return input.endsWith("/") ? input : input + "/";
}
if (hasTrailingSlash(input, true)) {
return input || "/";
}
const [s0, ...s] = input.split("?");
return s0 + "/" + (s.length > 0 ? `?${s.join("?")}` : "");
let path = input;
let fragment = "";
const fragmentIndex = input.indexOf("#");
if (fragmentIndex >= 0) {
path = input.slice(0, fragmentIndex);
fragment = input.slice(fragmentIndex);
if (!path) {
return fragment;
}
}
const [s0, ...s] = path.split("?");
return s0 + "/" + (s.length > 0 ? `?${s.join("?")}` : "") + fragment;
}

export function hasLeadingSlash(input = ""): boolean {
Expand Down
15 changes: 14 additions & 1 deletion test/trailing-slash.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@ describe("withTrailingSlash, queryParams: false", () => {
const tests = {
"": "/",
bar: "bar/",
"bar#abc": "bar#abc/",
"bar/": "bar/",
"foo?123": "foo?123/",
"foo/?123": "foo/?123/",
"foo/?123#abc": "foo/?123#abc/",
};

for (const input in tests) {
Expand All @@ -28,6 +30,10 @@ describe("withTrailingSlash, queryParams: true", () => {
"bar/": "bar/",
"foo?123": "foo/?123",
"foo/?123": "foo/?123",
"foo?123#abc": "foo/?123#abc",
"/#abc": "/#abc",
"#abc": "#abc",
"#": "#",
};

for (const input in tests) {
Expand All @@ -46,9 +52,11 @@ describe("withoutTrailingSlash, queryParams: false", () => {
"": "/",
"/": "/",
bar: "bar",
"bar/": "bar",
"bar#abc": "bar#abc",
"bar/#abc": "bar/#abc",
"foo?123": "foo?123",
"foo/?123": "foo/?123",
"foo/?123#abc": "foo/?123#abc",
};

for (const input in tests) {
Expand All @@ -68,8 +76,13 @@ describe("withoutTrailingSlash, queryParams: true", () => {
"/": "/",
bar: "bar",
"bar/": "bar",
"bar#abc": "bar#abc",
"bar/#abc": "bar#abc",
"foo?123": "foo?123",
"foo/?123": "foo?123",
"foo/?123#abc": "foo?123#abc",
"/a/#abc": "/a#abc",
"/#abc": "/#abc",
};

for (const input in tests) {
Expand Down