From 31ecc09b5ae38531cb63680cc40b89d01d8635df Mon Sep 17 00:00:00 2001 From: Asher Gomez Date: Wed, 4 Sep 2024 19:34:40 +1000 Subject: [PATCH] BREAKING(io): remove `Deno.read[Sync]()` (#25409) Towards #22079 Signed-off-by: Asher Gomez --- cli/bench/deno_common.js | 3 +- cli/tsc/dts/lib.deno.ns.d.ts | 64 ------------------------- runtime/js/90_deno_ns.js | 16 ------- runtime/js/99_main.js | 4 -- tests/specs/future/runtime_api/main.js | 2 - tests/specs/future/runtime_api/main.out | 2 - 6 files changed, 1 insertion(+), 90 deletions(-) diff --git a/cli/bench/deno_common.js b/cli/bench/deno_common.js index ba88c79ca4..3693333915 100644 --- a/cli/bench/deno_common.js +++ b/cli/bench/deno_common.js @@ -46,8 +46,7 @@ Deno.bench("b64_rt_short", { n: 1e6 }, () => { const buf = new Uint8Array(100); const file = Deno.openSync("/dev/zero"); Deno.bench("read_zero", { n: 5e5 }, () => { - // deno-lint-ignore no-deprecated-deno-api - Deno.readSync(file.rid, buf); + file.readSync(buf); }); } diff --git a/cli/tsc/dts/lib.deno.ns.d.ts b/cli/tsc/dts/lib.deno.ns.d.ts index bfdb80af22..495ece36db 100644 --- a/cli/tsc/dts/lib.deno.ns.d.ts +++ b/cli/tsc/dts/lib.deno.ns.d.ts @@ -1920,70 +1920,6 @@ declare namespace Deno { */ export function createSync(path: string | URL): FsFile; - /** Read from a resource ID (`rid`) into an array buffer (`buffer`). - * - * Resolves to either the number of bytes read during the operation or EOF - * (`null`) if there was nothing more to read. - * - * It is possible for a read to successfully return with `0` bytes. This does - * not indicate EOF. - * - * This function is one of the lowest level APIs and most users should not - * work with this directly, but rather use {@linkcode ReadableStream} and - * {@linkcode https://jsr.io/@std/streams/doc/to-array-buffer/~/toArrayBuffer | toArrayBuffer} - * instead. - * - * **It is not guaranteed that the full buffer will be read in a single call.** - * - * ```ts - * // if "/foo/bar.txt" contains the text "hello world": - * using file = await Deno.open("/foo/bar.txt"); - * const buf = new Uint8Array(100); - * const numberOfBytesRead = await Deno.read(file.rid, buf); // 11 bytes - * const text = new TextDecoder().decode(buf); // "hello world" - * ``` - * - * @deprecated This will be removed in Deno 2.0. See the - * {@link https://docs.deno.com/runtime/manual/advanced/migrate_deprecations | Deno 1.x to 2.x Migration Guide} - * for migration instructions. - * - * @category I/O - */ - export function read(rid: number, buffer: Uint8Array): Promise; - - /** Synchronously read from a resource ID (`rid`) into an array buffer - * (`buffer`). - * - * Returns either the number of bytes read during the operation or EOF - * (`null`) if there was nothing more to read. - * - * It is possible for a read to successfully return with `0` bytes. This does - * not indicate EOF. - * - * This function is one of the lowest level APIs and most users should not - * work with this directly, but rather use {@linkcode ReadableStream} and - * {@linkcode https://jsr.io/@std/streams/doc/to-array-buffer/~/toArrayBuffer | toArrayBuffer} - * instead. - * - * **It is not guaranteed that the full buffer will be read in a single - * call.** - * - * ```ts - * // if "/foo/bar.txt" contains the text "hello world": - * using file = Deno.openSync("/foo/bar.txt"); - * const buf = new Uint8Array(100); - * const numberOfBytesRead = Deno.readSync(file.rid, buf); // 11 bytes - * const text = new TextDecoder().decode(buf); // "hello world" - * ``` - * - * @deprecated This will be removed in Deno 2.0. See the - * {@link https://docs.deno.com/runtime/manual/advanced/migrate_deprecations | Deno 1.x to 2.x Migration Guide} - * for migration instructions. - * - * @category I/O - */ - export function readSync(rid: number, buffer: Uint8Array): number | null; - /** Seek a resource ID (`rid`) to the given `offset` under mode given by `whence`. * The call resolves to the new position within the resource (bytes from the start). * diff --git a/runtime/js/90_deno_ns.js b/runtime/js/90_deno_ns.js index 9432e0719b..6f5d85da2c 100644 --- a/runtime/js/90_deno_ns.js +++ b/runtime/js/90_deno_ns.js @@ -87,22 +87,6 @@ const denoNs = { readAllSync: buffer.readAllSync, copy: io.copy, SeekMode: io.SeekMode, - read(rid, buffer) { - internals.warnOnDeprecatedApi( - "Deno.read()", - new Error().stack, - "Use `reader.read()` instead.", - ); - return io.read(rid, buffer); - }, - readSync(rid, buffer) { - internals.warnOnDeprecatedApi( - "Deno.readSync()", - new Error().stack, - "Use `reader.readSync()` instead.", - ); - return io.readSync(rid, buffer); - }, File: fs.File, FsFile: fs.FsFile, open: fs.open, diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js index d771aec2ba..1ffb4f6e3e 100644 --- a/runtime/js/99_main.js +++ b/runtime/js/99_main.js @@ -805,8 +805,6 @@ function bootstrapMainRuntime(runtimeOptions, warmup = false) { delete Deno.FsFile.prototype.rid; delete Deno.funlock; delete Deno.funlockSync; - delete Deno.read; - delete Deno.readSync; delete Deno.seek; delete Deno.seekSync; } @@ -972,8 +970,6 @@ function bootstrapWorkerRuntime( delete Deno.FsFile.prototype.rid; delete Deno.funlock; delete Deno.funlockSync; - delete Deno.read; - delete Deno.readSync; delete Deno.seek; delete Deno.seekSync; } diff --git a/tests/specs/future/runtime_api/main.js b/tests/specs/future/runtime_api/main.js index a5ae5ec252..26a75373ea 100644 --- a/tests/specs/future/runtime_api/main.js +++ b/tests/specs/future/runtime_api/main.js @@ -7,8 +7,6 @@ console.log( ); console.log("Deno.funlock is", Deno.funlock); console.log("Deno.funlockSync is", Deno.funlockSync); -console.log("Deno.read is", Deno.read); -console.log("Deno.readSync is", Deno.readSync); console.log("Deno.seek is", Deno.seek); console.log("Deno.seekSync is", Deno.seekSync); diff --git a/tests/specs/future/runtime_api/main.out b/tests/specs/future/runtime_api/main.out index b5886ec289..0aa4e1f7c9 100644 --- a/tests/specs/future/runtime_api/main.out +++ b/tests/specs/future/runtime_api/main.out @@ -4,8 +4,6 @@ Deno.File is undefined Deno.FsFile.prototype.rid is undefined Deno.funlock is undefined Deno.funlockSync is undefined -Deno.read is undefined -Deno.readSync is undefined Deno.seek is undefined Deno.seekSync is undefined Deno.Listener.prototype.rid is undefined