foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-11-25 15:29:32 -05:00
Code Issues Packages 1 Wiki Activity

fix(ext/node): use primordials in ext/node/polyfills/_fs/_fs_dir.ts (#24319)

Browse source 
Towards #24236

---------

Signed-off-by: Asher Gomez <ashersaupingomez@gmail.com>
Co-authored-by: Satya Rohith <me@satyarohith.com>
This commit is contained in:
Asher Gomez 2024-06-24 16:22:55 +10:00 committed by GitHub
parent 0833a1617c
commit ff53506107
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
ext/node/polyfills/_fs/_fs_dir.ts
View file

@ -1,13 +1,22 @@
// Copyright 2018-2024 the Deno authors. All rights reserved. MIT license.
// TODO(petamoriken): enable prefer-primordials for node polyfills
// deno-lint-ignore-file prefer-primordials
import { primordials } from "ext:core/mod.js";
import Dirent from "ext:deno_node/_fs/_fs_dirent.ts";
import { assert } from "ext:deno_node/_util/asserts.ts";
import { ERR_MISSING_ARGS } from "ext:deno_node/internal/errors.ts";
import { TextDecoder } from "ext:deno_web/08_text_encoding.js";
const {
Promise,
ObjectPrototypeIsPrototypeOf,
Uint8ArrayPrototype,
PromisePrototypeThen,
SymbolAsyncIterator,
ArrayIteratorPrototypeNext,
AsyncGeneratorPrototypeNext,
SymbolIterator,
} = primordials;
export default class Dir {
#dirPath: string | Uint8Array;
#syncIterator!: Iterator<Deno.DirEntry, undefined> | null;
@ -21,7 +30,7 @@ export default class Dir {
}
get path(): string {
if (this.#dirPath instanceof Uint8Array) {
if (ObjectPrototypeIsPrototypeOf(Uint8ArrayPrototype, this.#dirPath)) {
return new TextDecoder().decode(this.#dirPath);
}
return this.#dirPath;
@ -31,12 +40,12 @@ export default class Dir {
read(callback?: (...args: any[]) => void): Promise<Dirent | null> {
return new Promise((resolve, reject) => {
if (!this.#asyncIterator) {
this.#asyncIterator = Deno.readDir(this.path)[Symbol.asyncIterator]();
this.#asyncIterator = Deno.readDir(this.path)[SymbolAsyncIterator]();
}
assert(this.#asyncIterator);
this.#asyncIterator
.next()
.then((iteratorResult) => {
PromisePrototypeThen(
AsyncGeneratorPrototypeNext(this.#asyncIterator),
(iteratorResult) => {
resolve(
iteratorResult.done ? null : new Dirent(iteratorResult.value),
);
@ -46,21 +55,23 @@ export default class Dir {
iteratorResult.done ? null : new Dirent(iteratorResult.value),
);
}
}, (err) => {
},
(err) => {
if (callback) {
callback(err);
}
reject(err);
});
},
);
});
}
readSync(): Dirent | null {
if (!this.#syncIterator) {
this.#syncIterator = Deno.readDirSync(this.path)![Symbol.iterator]();
this.#syncIterator = Deno.readDirSync(this.path)![SymbolIterator]();
}
const iteratorResult = this.#syncIterator.next();
const iteratorResult = ArrayIteratorPrototypeNext(this.#syncIterator);
if (iteratorResult.done) {
return null;
} else {
@ -92,7 +103,7 @@ export default class Dir {
//No op
}
async *[Symbol.asyncIterator](): AsyncIterableIterator<Dirent> {
async *[SymbolAsyncIterator](): AsyncIterableIterator<Dirent> {
try {
while (true) {
const dirent: Dirent | null = await this.read();