From d32287d2111ec7b845e09c7cfe6a5d779c5f3bd1 Mon Sep 17 00:00:00 2001 From: Ryan Clements Date: Fri, 16 Jun 2023 06:43:59 -0400 Subject: fix(ext/node): remove fromFileUrl from "node:path" (#19504) --- ext/node/polyfills/path/_posix.ts | 20 -------------------- ext/node/polyfills/path/_win32.ts | 28 ---------------------------- ext/node/polyfills/path/mod.ts | 1 - ext/node/polyfills/path/posix.ts | 1 - ext/node/polyfills/path/win32.ts | 1 - 5 files changed, 51 deletions(-) (limited to 'ext/node/polyfills/path') diff --git a/ext/node/polyfills/path/_posix.ts b/ext/node/polyfills/path/_posix.ts index 3f42bbe86..7190795a3 100644 --- a/ext/node/polyfills/path/_posix.ts +++ b/ext/node/polyfills/path/_posix.ts @@ -477,24 +477,6 @@ export function parse(path: string): ParsedPath { return ret; } -/** - * Converts a file URL to a path string. - * - * ```ts - * fromFileUrl("file:///home/foo"); // "/home/foo" - * ``` - * @param url of a file URL - */ -export function fromFileUrl(url: string | URL): string { - url = url instanceof URL ? url : new URL(url); - if (url.protocol != "file:") { - throw new TypeError("Must be a file URL."); - } - return decodeURIComponent( - url.pathname.replace(/%(?![0-9A-Fa-f]{2})/g, "%25"), - ); -} - /** * Converts a path string to a file URL. * @@ -513,14 +495,12 @@ export function toFileUrl(path: string): URL { ); return url; } - export default { basename, delimiter, dirname, extname, format, - fromFileUrl, isAbsolute, join, normalize, diff --git a/ext/node/polyfills/path/_win32.ts b/ext/node/polyfills/path/_win32.ts index 73321e709..856ffdff5 100644 --- a/ext/node/polyfills/path/_win32.ts +++ b/ext/node/polyfills/path/_win32.ts @@ -951,33 +951,6 @@ export function parse(path: string): ParsedPath { return ret; } -/** - * Converts a file URL to a path string. - * - * ```ts - * fromFileUrl("file:///home/foo"); // "\\home\\foo" - * fromFileUrl("file:///C:/Users/foo"); // "C:\\Users\\foo" - * fromFileUrl("file://localhost/home/foo"); // "\\\\localhost\\home\\foo" - * ``` - * @param url of a file URL - */ -export function fromFileUrl(url: string | URL): string { - url = url instanceof URL ? url : new URL(url); - if (url.protocol != "file:") { - throw new TypeError("Must be a file URL."); - } - let path = decodeURIComponent( - url.pathname.replace(/\//g, "\\").replace(/%(?![0-9A-Fa-f]{2})/g, "%25"), - ).replace(/^\\*([A-Za-z]:)(\\|$)/, "$1\\"); - if (url.hostname != "") { - // Note: The `URL` implementation guarantees that the drive letter and - // hostname are mutually exclusive. Otherwise it would not have been valid - // to append the hostname and path like this. - path = `\\\\${url.hostname}${path}`; - } - return path; -} - /** * Converts a path string to a file URL. * @@ -1012,7 +985,6 @@ export default { dirname, extname, format, - fromFileUrl, isAbsolute, join, normalize, diff --git a/ext/node/polyfills/path/mod.ts b/ext/node/polyfills/path/mod.ts index ee231e17d..92611d502 100644 --- a/ext/node/polyfills/path/mod.ts +++ b/ext/node/polyfills/path/mod.ts @@ -28,7 +28,6 @@ export const { dirname, extname, format, - fromFileUrl, isAbsolute, join, normalize, diff --git a/ext/node/polyfills/path/posix.ts b/ext/node/polyfills/path/posix.ts index 40e291f27..17e890085 100644 --- a/ext/node/polyfills/path/posix.ts +++ b/ext/node/polyfills/path/posix.ts @@ -10,7 +10,6 @@ export const { dirname, extname, format, - fromFileUrl, isAbsolute, join, normalize, diff --git a/ext/node/polyfills/path/win32.ts b/ext/node/polyfills/path/win32.ts index e847b0a3b..b015c0eba 100644 --- a/ext/node/polyfills/path/win32.ts +++ b/ext/node/polyfills/path/win32.ts @@ -10,7 +10,6 @@ export const { dirname, extname, format, - fromFileUrl, isAbsolute, join, normalize, -- cgit v1.2.3