fixup! fs: use private fields instead of symbols for Dir

Author: pluris

lib/internal/fs/dir.js

@@ -34,72 +34,72 @@ const {
 } = require('internal/validators');
 
 class Dir {
-  #dirHandle;
-  #dirPath;
-  #dirBufferedEntries;
-  #dirClosed;
-  #dirOptions;
-  #dirReadPromisified;
-  #dirClosePromisified;
-  #dirOperationQueue;
+  #handle;
+  #path;
+  #bufferedEntries;
+  #closed;
+  #options;
+  #readPromisified;
+  #closePromisified;
+  #operationQueue;
 
   constructor(handle, path, options) {
     if (handle == null) throw new ERR_MISSING_ARGS('handle');
-    this.#dirHandle = handle;
-    this.#dirBufferedEntries = [];
-    this.#dirPath = path;
-    this.#dirClosed = false;
+    this.#handle = handle;
+    this.#bufferedEntries = [];
+    this.#path = path;
+    this.#closed = false;
 
     // Either `null` or an Array of pending operations (= functions to be called
     // once the current operation is done).
-    this.#dirOperationQueue = null;
+    this.#operationQueue = null;
 
-    this.#dirOptions = {
+    this.#options = {
       bufferSize: 32,
       ...getOptions(options, {
         encoding: 'utf8',
       }),
     };
 
-    validateUint32(this.#dirOptions.bufferSize, 'options.bufferSize', true);
+    validateUint32(this.#options.bufferSize, 'options.bufferSize', true);
 
-    this.#dirReadPromisified = FunctionPrototypeBind(
+    this.#readPromisified = FunctionPrototypeBind(
       internalUtil.promisify(this.#dirReadImpl), this, false);
-    this.#dirClosePromisified = FunctionPrototypeBind(
+    this.#closePromisified = FunctionPrototypeBind(
       internalUtil.promisify(this.close), this);
   }
 
   get path() {
-    return this.#dirPath;
+    return this.#path;
   }
 
   read(callback) {
     return this.#dirReadImpl(true, callback);
   }
 
   #dirReadImpl(maybeSync, callback) {
-    if (this.#dirClosed === true) {
+    if (this.#closed === true) {
       throw new ERR_DIR_CLOSED();
     }
 
     if (callback === undefined) {
-      return this.#dirReadPromisified();
+      return this.#readPromisified();
     }
 
     validateFunction(callback, 'callback');
 
-    if (this.#dirOperationQueue !== null) {
-      ArrayPrototypePush(this.#dirOperationQueue, () => {
+    if (this.#operationQueue !== null) {
+      ArrayPrototypePush(this.#operationQueue, () => {
         this.#dirReadImpl(maybeSync, callback);
       });
       return;
     }
 
-    if (this.#dirBufferedEntries.length > 0) {
+    if (this.#bufferedEntries.length > 0) {
       try {
-        const dirent = ArrayPrototypeShift(this.#dirBufferedEntries);
+        const dirent = ArrayPrototypeShift(this.#bufferedEntries);
 
-        if (this.#dirOptions.recursive && dirent.isDirectory()) {
+        if (this.#options.recursive && dirent.isDirectory()) {
           this.readSyncRecursive(dirent);
         }
 
@@ -116,8 +116,8 @@ class Dir {
     const req = new FSReqCallback();
     req.oncomplete = (err, result) => {
       process.nextTick(() => {
-        const queue = this.#dirOperationQueue;
-        this.#dirOperationQueue = null;
+        const queue = this.#operationQueue;
+        this.#operationQueue = null;
         for (const op of queue) op();
       });
 
@@ -126,9 +126,9 @@ class Dir {
       }
 
       try {
-        this.processReadResult(this.#dirPath, result);
-        const dirent = ArrayPrototypeShift(this.#dirBufferedEntries);
-        if (this.#dirOptions.recursive && dirent.isDirectory()) {
+        this.processReadResult(this.#path, result);
+        const dirent = ArrayPrototypeShift(this.#bufferedEntries);
+        if (this.#options.recursive && dirent.isDirectory()) {
           this.readSyncRecursive(dirent);
         }
         callback(null, dirent);
@@ -137,18 +137,18 @@ class Dir {
       }
     };
 
-    this.#dirOperationQueue = [];
-    this.#dirHandle.read(
-      this.#dirOptions.encoding,
-      this.#dirOptions.bufferSize,
+    this.#operationQueue = [];
+    this.#handle.read(
+      this.#options.encoding,
+      this.#options.bufferSize,
       req,
     );
   }
 
   processReadResult(path, result) {
     for (let i = 0; i < result.length; i += 2) {
       ArrayPrototypePush(
-        this.#dirBufferedEntries,
+        this.#bufferedEntries,
         getDirent(
           path,
           result[i],
@@ -163,14 +163,14 @@ class Dir {
     const ctx = { path };
     const handle = dirBinding.opendir(
       pathModule.toNamespacedPath(path),
-      this.#dirOptions.encoding,
+      this.#options.encoding,
       undefined,
       ctx,
     );
     handleErrorFromBinding(ctx);
     const result = handle.read(
-      this.#dirOptions.encoding,
-      this.#dirOptions.bufferSize,
+      this.#options.encoding,
+      this.#options.bufferSize,
       undefined,
       ctx,
     );
@@ -184,26 +184,26 @@ class Dir {
   }
 
   readSync() {
-    if (this.#dirClosed === true) {
+    if (this.#closed === true) {
       throw new ERR_DIR_CLOSED();
     }
 
-    if (this.#dirOperationQueue !== null) {
+    if (this.#operationQueue !== null) {
       throw new ERR_DIR_CONCURRENT_OPERATION();
     }
 
-    if (this.#dirBufferedEntries.length > 0) {
-      const dirent = ArrayPrototypeShift(this.#dirBufferedEntries);
-      if (this.#dirOptions.recursive && dirent.isDirectory()) {
+    if (this.#bufferedEntries.length > 0) {
+      const dirent = ArrayPrototypeShift(this.#bufferedEntries);
+      if (this.#options.recursive && dirent.isDirectory()) {
         this.readSyncRecursive(dirent);
       }
       return dirent;
     }
 
-    const ctx = { path: this.#dirPath };
-    const result = this.#dirHandle.read(
-      this.#dirOptions.encoding,
-      this.#dirOptions.bufferSize,
+    const ctx = { path: this.#path };
+    const result = this.#handle.read(
+      this.#options.encoding,
+      this.#options.bufferSize,
       undefined,
       ctx,
     );
@@ -213,10 +213,10 @@ class Dir {
       return result;
     }
 
-    this.processReadResult(this.#dirPath, result);
+    this.processReadResult(this.#path, result);
 
-    const dirent = ArrayPrototypeShift(this.#dirBufferedEntries);
-    if (this.#dirOptions.recursive && dirent.isDirectory()) {
+    const dirent = ArrayPrototypeShift(this.#bufferedEntries);
+    if (this.#options.recursive && dirent.isDirectory()) {
       this.readSyncRecursive(dirent);
     }
     return dirent;
@@ -225,60 +225,60 @@ class Dir {
   close(callback) {
     // Promise
     if (callback === undefined) {
-      if (this.#dirClosed === true) {
+      if (this.#closed === true) {
         return PromiseReject(new ERR_DIR_CLOSED());
       }
-      return this.#dirClosePromisified();
+      return this.#closePromisified();
     }
 
     // callback
     validateFunction(callback, 'callback');
 
-    if (this.#dirClosed === true) {
+    if (this.#closed === true) {
       process.nextTick(callback, new ERR_DIR_CLOSED());
       return;
     }
 
-    if (this.#dirOperationQueue !== null) {
-      ArrayPrototypePush(this.#dirOperationQueue, () => {
+    if (this.#operationQueue !== null) {
+      ArrayPrototypePush(this.#operationQueue, () => {
         this.close(callback);
       });
       return;
     }
 
-    this.#dirClosed = true;
+    this.#closed = true;
     const req = new FSReqCallback();
     req.oncomplete = callback;
-    this.#dirHandle.close(req);
+    this.#handle.close(req);
   }
 
   closeSync() {
-    if (this.#dirClosed === true) {
+    if (this.#closed === true) {
       throw new ERR_DIR_CLOSED();
     }
 
-    if (this.#dirOperationQueue !== null) {
+    if (this.#operationQueue !== null) {
       throw new ERR_DIR_CONCURRENT_OPERATION();
     }
 
-    this.#dirClosed = true;
-    const ctx = { path: this.#dirPath };
-    const result = this.#dirHandle.close(undefined, ctx);
+    this.#closed = true;
+    const ctx = { path: this.#path };
+    const result = this.#handle.close(undefined, ctx);
     handleErrorFromBinding(ctx);
     return result;
   }
 
   async* entries() {
     try {
       while (true) {
-        const result = await this.#dirReadPromisified();
+        const result = await this.#readPromisified();
         if (result === null) {
           break;
         }
         yield result;
       }
     } finally {
-      await this.#dirClosePromisified();
+      await this.#closePromisified();
     }
   }
 }