Refactoring day1

node_modules/chokidar/README.md

@@ -253,9 +253,9 @@ Available events: `add`, `addDir`, `change`, `unlink`, `unlinkDir`, `ready`,
 `raw`, `error`.
 Additionally `all` is available which gets emitted with the underlying event
 name and path for every event other than `ready`, `raw`, and `error`.  `raw` is internal, use it carefully.
-* `.unwatch(path / paths)`: Stop watching files, directories, or glob patterns.
+* `.unwatch(path / paths)`: **async** Stop watching files, directories, or glob patterns.
 Takes an array of strings or just one string. Use with `await` to ensure bugs don't happen.
-* `.close()`: **async** Removes all listeners from watched files. Asynchronous, returns Promise.
+* `.close()`: Removes all listeners from watched files. Asynchronous, returns Promise.
 * `.getWatched()`: Returns an object representing all the paths on the file
 system being watched by this `FSWatcher` instance. The object's keys are all the
 directories (using absolute paths unless the `cwd` option was used), and the
@@ -295,12 +295,6 @@ For more detailed changelog, see [`full_changelog.md`](.github/full_changelog.md
 - **v1 (Apr 7, 2015):** Glob support, symlink support, tons of bugfixes. Node 0.8+ is supported
 - **v0.1 (Apr 20, 2012):** Initial release, extracted from [Brunch](https://github.com/brunch/brunch/blob/9847a065aea300da99bd0753f90354cde9de1261/src/helpers.coffee#L66)
 
-## Also
-
-Why was chokidar named this way? What's the meaning behind it?
-
->Chowkidar is a transliteration of a Hindi word meaning 'watchman, gatekeeper', चौकीदार. This ultimately comes from Sanskrit _ चतुष्क_ (crossway, quadrangle, consisting-of-four).
-
 ## License
 
 MIT (c) Paul Miller (<https://paulmillr.com>), see [LICENSE](LICENSE) file.

node_modules/chokidar/index.js

@@ -34,7 +34,6 @@ const {
   REPLACER_RE,
 
   SLASH,
-  SLASH_SLASH,
   BRACE_START,
   BANG,
   ONE_DOT,
@@ -97,20 +96,11 @@ const unifyPaths = (paths_) => {
   return paths.map(normalizePathToUnix);
 };
 
-// If SLASH_SLASH occurs at the beginning of path, it is not replaced
-//     because "//StoragePC/DrivePool/Movies" is a valid network path
 const toUnix = (string) => {
   let str = string.replace(BACK_SLASH_RE, SLASH);
-  let prepend = false;
-  if (str.startsWith(SLASH_SLASH)) {
-    prepend = true;
-  }
   while (str.match(DOUBLE_SLASH_RE)) {
     str = str.replace(DOUBLE_SLASH_RE, SLASH);
   }
-  if (prepend) {
-    str = SLASH + str;
-  }
   return str;
 };
 
@@ -886,24 +876,16 @@ _remove(directory, item, isDirectory) {
 }
 
 /**
- * Closes all watchers for a path
+ *
  * @param {Path} path
  */
 _closePath(path) {
-  this._closeFile(path)
-  const dir = sysPath.dirname(path);
-  this._getWatchedDir(dir).remove(sysPath.basename(path));
-}
-
-/**
- * Closes only file-specific watchers
- * @param {Path} path
- */
-_closeFile(path) {
   const closers = this._closers.get(path);
   if (!closers) return;
   closers.forEach(closer => closer());
   this._closers.delete(path);
+  const dir = sysPath.dirname(path);
+  this._getWatchedDir(dir).remove(sysPath.basename(path));
 }
 
 /**

node_modules/chokidar/lib/constants.js

@@ -41,7 +41,6 @@ exports.DOT_RE = /\..*\.(sw[px])$|~$|\.subl.*\.tmp/;
 exports.REPLACER_RE = /^\.[/\\]/;
 
 exports.SLASH = '/';
-exports.SLASH_SLASH = '//';
 exports.BRACE_START = '{';
 exports.BANG = '!';
 exports.ONE_DOT = '.';
@@ -60,4 +59,3 @@ exports.IDENTITY_FN = val => val;
 
 exports.isWindows = platform === 'win32';
 exports.isMacos = platform === 'darwin';
-exports.isLinux = platform === 'linux';

node_modules/chokidar/lib/fsevents-handler.js

@@ -103,7 +103,7 @@ const createFSEventsInstance = (path, callback) => {
  * @param {Function} rawEmitter - passes data to listeners of the 'raw' event
  * @returns {Function} closer
  */
-function setFSEventsListener(path, realPath, listener, rawEmitter) {
+function setFSEventsListener(path, realPath, listener, rawEmitter, fsw) {
   let watchPath = sysPath.extname(path) ? sysPath.dirname(path) : path;
   const parentPath = sysPath.dirname(watchPath);
   let cont = FSEventsWatchers.get(watchPath);
@@ -146,7 +146,7 @@ function setFSEventsListener(path, realPath, listener, rawEmitter) {
       listeners: new Set([filteredListener]),
       rawEmitter,
       watcher: createFSEventsInstance(watchPath, (fullPath, flags) => {
-        if (!cont.listeners.size) return;
+        if (fsw.closed) return;
         const info = fsevents.getInfo(fullPath, flags);
         cont.listeners.forEach(list => {
           list(fullPath, flags, info);
@@ -242,6 +242,7 @@ async checkExists(path, fullPath, realPath, parent, watchedDir, item, info, opts
   try {
     const stats = await stat(path)
     if (this.fsw.closed) return;
+    if (this.fsw.closed) return;
     if (sameTypes(info, stats)) {
       this.addOrChange(path, fullPath, realPath, parent, watchedDir, item, info, opts);
     } else {
@@ -352,7 +353,8 @@ _watchWithFsEvents(watchPath, realPath, transform, globFilter) {
     watchPath,
     realPath,
     watchCallback,
-    this.fsw._emitRaw
+    this.fsw._emitRaw,
+    this.fsw
   );
 
   this.fsw._emitReady();

node_modules/chokidar/lib/nodefs-handler.js

@@ -6,7 +6,6 @@ const { promisify } = require('util');
 const isBinaryPath = require('is-binary-path');
 const {
   isWindows,
-  isLinux,
   EMPTY_FN,
   EMPTY_STR,
   KEY_LISTENERS,
@@ -357,7 +356,8 @@ _handleFile(file, stats, initialAdd) {
   // if the file is already being watched, do nothing
   if (parent.has(basename)) return;
 
-  const listener = async (path, newStats) => {
+  // kick off the watcher
+  const closer = this._watchWithNodeFs(file, async (path, newStats) => {
     if (!this.fsw._throttle(THROTTLE_MODE_WATCH, file, 5)) return;
     if (!newStats || newStats.mtimeMs === 0) {
       try {
@@ -369,18 +369,12 @@ _handleFile(file, stats, initialAdd) {
         if (!at || at <= mt || mt !== prevStats.mtimeMs) {
           this.fsw._emit(EV_CHANGE, file, newStats);
         }
-        if (isLinux && prevStats.ino !== newStats.ino) {
-          this.fsw._closeFile(path)
-          prevStats = newStats;
-          this.fsw._addPathCloser(path, this._watchWithNodeFs(file, listener));
-        } else {
-          prevStats = newStats;
-        }
+        prevStats = newStats;
       } catch (error) {
         // Fix issues where mtime is null but file is still present
         this.fsw._remove(dirname, basename);
       }
-      // add is about to be emitted if file not already tracked in parent
+    // add is about to be emitted if file not already tracked in parent
     } else if (parent.has(basename)) {
       // Check that change event was not fired because of changed only accessTime.
       const at = newStats.atimeMs;
@@ -390,9 +384,7 @@ _handleFile(file, stats, initialAdd) {
       }
       prevStats = newStats;
     }
-  }
-  // kick off the watcher
-  const closer = this._watchWithNodeFs(file, listener);
+  });
 
   // emit an add event if we're supposed to
   if (!(initialAdd && this.fsw.options.ignoreInitial) && this.fsw._isntIgnored(file)) {

node_modules/chokidar/package.json

@@ -1,7 +1,7 @@
 {
   "name": "chokidar",
   "description": "A neat wrapper around node.js fs.watch / fs.watchFile / fsevents.",
-  "version": "3.4.2",
+  "version": "3.4.0",
   "homepage": "https://github.com/paulmillr/chokidar",
   "author": "Paul Miller (https://paulmillr.com)",
   "contributors": [
@@ -25,10 +25,10 @@
     "fsevents": "~2.1.2"
   },
   "devDependencies": {
-    "@types/node": "^14",
+    "@types/node": "^13",
     "chai": "^4.2",
     "dtslint": "^3.3.0",
-    "eslint": "^7.0.0",
+    "eslint": "^6.6.0",
     "mocha": "^7.0.0",
     "nyc": "^15.0.0",
     "rimraf": "^3.0.0",
@@ -125,4 +125,8 @@
       "text"
     ]
   }
-}
+
+,"_resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.4.0.tgz"
+,"_integrity": "sha512-aXAaho2VJtisB/1fg1+3nlLJqGOuewTzQpd/Tz0yTg2R0e4IGtshYvtjowyEumcBv2z+y4+kc75Mz7j5xJskcQ=="
+,"_from": "chokidar@3.4.0"
+}