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: trim root folder / when calculating relative paths #142

Merged
merged 8 commits into from
Dec 12, 2023
Merged

fix: trim root folder / when calculating relative paths #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7cfc45e
fix: `relative when pass root path`
peterroe Oct 20, 2023
482fc47
chore: add test
peterroe Oct 20, 2023
f992d7a
chore: code readability improve
peterroe Oct 21, 2023
82c03d3
chore: avoid calling `resolve` twice
peterroe Oct 22, 2023
2558007
Merge remote-tracking branch 'origin/main' into peterroe/main
danielroe Nov 14, 2023
aefd909
refactor: simplify to single regexp
danielroe Nov 14, 2023
55aaa86
chore: add back line
danielroe Nov 14, 2023
a596657
style: lint
danielroe Nov 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/path.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { normalizeWindowsPath } from "./_internal";
const _UNC_REGEX = /^[/\\]{2}/;
const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/;
const _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
const _ROOT_FOLDER_RE = /^\/([A-Za-z]:)?$/;

// Force POSIX contants
export const sep = "/";
Expand Down Expand Up @@ -211,8 +212,9 @@ export const extname: typeof path.extname = function (p) {

// relative
export const relative: typeof path.relative = function (from, to) {
const _from = resolve(from).split("/");
const _to = resolve(to).split("/");
const _from = resolve(from).replace(_ROOT_FOLDER_RE, "$1").split("/");
const _to = resolve(to).replace(_ROOT_FOLDER_RE, "$1").split("/");

const _fromCopy = [..._from];
for (const segment of _fromCopy) {
if (_to[0] !== segment) {
Expand Down
4 changes: 4 additions & 0 deletions test/index.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,8 @@ it("parse", () => {
runTest("relative", relative, [
// POSIX
["/data/orandea/test/aaa", "/data/orandea/impl/bbb", "../../impl/bbb"],
["/", "/foo/bar", "foo/bar"],
["/foo", "/", ".."],
[
() => process.cwd(),
"./dist/client/b-scroll.d.ts",
Expand All @@ -243,6 +245,8 @@ runTest("relative", relative, [

// Windows
["C:\\orandea\\test\\aaa", "C:\\orandea\\impl\\bbb", "../../impl/bbb"],
["C:\\", "C:\\foo\\bar", "foo/bar"],
["C:\\foo", "C:\\", ".."],
[
() => process.cwd().replace(/\\/g, "/"),
"./dist/client/b-scroll.d.ts",
Expand Down