From 6d6316742095784bacca037622624d90cb5f3e46 Mon Sep 17 00:00:00 2001 From: Luca Casonato Date: Mon, 17 May 2021 15:26:07 +0200 Subject: [PATCH] Revert "feat(runtime): support urls for `Deno.realPath` and `Deno.realPathSync` (#10626)" This reverts commit 910935c07125e4710830be0df32a16c3ef278ba6. --- cli/dts/lib.deno.ns.d.ts | 4 ++-- cli/tests/unit/real_path_test.ts | 17 ----------------- runtime/js/30_fs.js | 4 ++-- 3 files changed, 4 insertions(+), 21 deletions(-) diff --git a/cli/dts/lib.deno.ns.d.ts b/cli/dts/lib.deno.ns.d.ts index ddbb890b7e..6b4e75bfa6 100644 --- a/cli/dts/lib.deno.ns.d.ts +++ b/cli/dts/lib.deno.ns.d.ts @@ -1467,7 +1467,7 @@ declare namespace Deno { * Requires `allow-read` permission for the target path. * Also requires `allow-read` permission for the CWD if the target path is * relative.*/ - export function realPathSync(path: string | URL): string; + export function realPathSync(path: string): string; /** Resolves to the absolute normalized path, with symbolic links resolved. * @@ -1483,7 +1483,7 @@ declare namespace Deno { * Requires `allow-read` permission for the target path. * Also requires `allow-read` permission for the CWD if the target path is * relative.*/ - export function realPath(path: string | URL): Promise; + export function realPath(path: string): Promise; export interface DirEntry { name: string; diff --git a/cli/tests/unit/real_path_test.ts b/cli/tests/unit/real_path_test.ts index 10e060578c..fce28d80b5 100644 --- a/cli/tests/unit/real_path_test.ts +++ b/cli/tests/unit/real_path_test.ts @@ -1,11 +1,9 @@ // Copyright 2018-2021 the Deno authors. All rights reserved. MIT license. import { assert, - assertEquals, assertMatch, assertThrows, assertThrowsAsync, - pathToAbsoluteFileUrl, unitTest, } from "./test_util.ts"; @@ -21,12 +19,6 @@ unitTest({ perms: { read: true } }, function realPathSyncSuccess(): void { } }); -unitTest({ perms: { read: true } }, function realPathSyncUrl(): void { - const relative = "cli/tests/fixture.json"; - const url = pathToAbsoluteFileUrl(relative); - assertEquals(Deno.realPathSync(relative), Deno.realPathSync(url)); -}); - unitTest( { perms: { read: true, write: true }, @@ -74,15 +66,6 @@ unitTest({ perms: { read: true } }, async function realPathSuccess(): Promise< } }); -unitTest( - { perms: { read: true } }, - async function realPathUrl(): Promise { - const relative = "cli/tests/fixture.json"; - const url = pathToAbsoluteFileUrl(relative); - assertEquals(await Deno.realPath(relative), await Deno.realPath(url)); - }, -); - unitTest( { perms: { read: true, write: true }, diff --git a/runtime/js/30_fs.js b/runtime/js/30_fs.js index 67c3d4a1fc..72126e6bbb 100644 --- a/runtime/js/30_fs.js +++ b/runtime/js/30_fs.js @@ -128,11 +128,11 @@ } function realPathSync(path) { - return core.opSync("op_realpath_sync", pathFromURL(path)); + return core.opSync("op_realpath_sync", path); } function realPath(path) { - return core.opAsync("op_realpath_async", pathFromURL(path)); + return core.opAsync("op_realpath_async", path); } function removeSync(