test: integ tests for fs.watch with gitIgnore exclusions support

Author: abose

dist/phoenix-fs.js

@@ -309,8 +309,6 @@ function _unlink(ws, metadata) {
 const watchersMap = {};
 function _watch(ws, metadata) {
     const fullPathToWatch = metadata.data.path,
-        // array of anymatch compatible path definition. Eg. ["**/{node_modules,bower_components}/**"]. full path is checked
-        ignoredPaths = metadata.data.ignoredPaths,
         // contents of a gitIgnore file as text. The given path is used as the base path for gitIgnore
         gitIgnorePaths = metadata.data.gitIgnorePaths,
         persistent = metadata.data.persistent || true,
@@ -335,10 +333,6 @@ function _watch(ws, metadata) {
                 return true;
             }
             const relativePath = path.relative(fullPathToWatch, pathToFilter);
-            if(anymatch(ignoredPaths, pathToFilter)){
-                debugMode && console.log("PhoenixFS: anymatch ignored watch path: ", pathToFilter, "rel: ", relativePath);
-                return true;
-            }
             if(relativePath && gitignore.ignores(relativePath)){
                 debugMode && console.log("PhoenixFS: gitignore ignored watch gitIgnore path: ", pathToFilter, "rel: ",relativePath);
                 return true;
@@ -351,6 +345,7 @@ function _watch(ws, metadata) {
         const watcher = chokidar.watch(fullPathToWatch, {
             persistent,
             ignoreInitial,
+            depth: 99,
             ignorePermissionErrors: true,
             ignored: path => isIgnored(path)
         });

dist/virtualfs.js

@@ -309,8 +309,6 @@ function _unlink(ws, metadata) {
 const watchersMap = {};
 function _watch(ws, metadata) {
     const fullPathToWatch = metadata.data.path,
-        // array of anymatch compatible path definition. Eg. ["**/{node_modules,bower_components}/**"]. full path is checked
-        ignoredPaths = metadata.data.ignoredPaths,
         // contents of a gitIgnore file as text. The given path is used as the base path for gitIgnore
         gitIgnorePaths = metadata.data.gitIgnorePaths,
         persistent = metadata.data.persistent || true,
@@ -335,10 +333,6 @@ function _watch(ws, metadata) {
                 return true;
             }
             const relativePath = path.relative(fullPathToWatch, pathToFilter);
-            if(anymatch(ignoredPaths, pathToFilter)){
-                debugMode && console.log("PhoenixFS: anymatch ignored watch path: ", pathToFilter, "rel: ", relativePath);
-                return true;
-            }
             if(relativePath && gitignore.ignores(relativePath)){
                 debugMode && console.log("PhoenixFS: gitignore ignored watch gitIgnore path: ", pathToFilter, "rel: ",relativePath);
                 return true;
@@ -351,6 +345,7 @@ function _watch(ws, metadata) {
         const watcher = chokidar.watch(fullPathToWatch, {
             persistent,
             ignoreInitial,
+            depth: 99,
             ignorePermissionErrors: true,
             ignored: path => isIgnored(path)
         });

dist/virtualfs.js.map

@@ -23,7 +23,7 @@
                     {
                         "name": "node",
                         "cmd": "node",
-                        "args": [{ "validator": "\\S+" }]
+                        "args": ["--inspect", { "validator": "\\S+" }]
                     }
                 ]
             },

src-tauri/node-src/phoenix-fs.js

@@ -279,13 +279,13 @@ const fileSystemLib = {
         }
         throw new Errors.ENOSYS('Phoenix fs showSaveDialog function not yet supported.');
     },
-    watchAsync: function (path, ignoredPaths=[], gitIgnorePaths="") {
+    watchAsync: function (path, gitIgnorePaths="") {
         if(TauriFS.isTauriPath(path)) {
             throw new Errors.EPERM('Cannot watch root directory!', path);
         } else if(TauriFS.isTauriSubPath(path)) {
-            return NodeTauriFS.watchAsync(path, ignoredPaths, gitIgnorePaths);
+            return NodeTauriFS.watchAsync(path, gitIgnorePaths);
         }
-        return FsWatch.watchAsync(path, ignoredPaths, gitIgnorePaths);
+        return FsWatch.watchAsync(path, gitIgnorePaths);
     },
     unwatchAsync: function (eventEmitter) {
         if(eventEmitter.eventEmitterID) {

src-tauri/tauri.conf.json

@@ -493,14 +493,13 @@ function unlink(path, callback) {
 /**
  *
  * @param {string} path
- * @param {Array<string>} ignoredPaths - array of anymatch compatible path definition. Eg. ["/home/user/{node_modules,bower_components}/**"]. full path is checked
  * @param {string} gitIgnorePaths The contents of the gitIgnore file as text. The watcher will ignore all files matching git ignore.
  * @returns {Promise<EventEmitter>} That will be resolved with a watcher once the watcher is ready.
  */
-async function watchAsync(path, ignoredPaths=[], gitIgnorePaths="") {
+async function watchAsync(path, gitIgnorePaths="") {
     return new Promise((resolve, reject)=>{
         const platformPath = Utils.getTauriPlatformPath(path);
-        _execCommand(WS_COMMAND.WATCH, {path: platformPath, ignoredPaths, gitIgnorePaths})
+        _execCommand(WS_COMMAND.WATCH, {path: platformPath, gitIgnorePaths})
             .then(({metadata})=>{
                 const eventEmitter = getNodeEventListener(metadata.data.eventEmitterID);
                 eventEmitter.watchPath = path;

src/fslib.js

@@ -128,7 +128,7 @@ function unwatchAll(callback) {
     callback();
 }
 
-function watchAsync(path/*, _ignoredPaths=[], _gitIgnorePaths=""*/) {
+function watchAsync(path/* _gitIgnorePaths=""*/) {
     throw new Errors.EPERM('Watch async not yet supported at path!', path);
 }
 

src/fslib_node_ws.js

@@ -32,7 +32,7 @@
         let commandId = 0, pendingCommands = {};
         if(window.__TAURI__){
             window.__TAURI__.path.resolveResource("node-src/index.js").then(async nodeSrcPath=>{
-                command = new window.__TAURI__.shell.Command('node', nodeSrcPath);
+                command = new window.__TAURI__.shell.Command('node', ['--inspect', nodeSrcPath]);
                 command.on('close', data => {
                     window.isNodeTerminated = true;
                     console.log(`Node: command finished with code ${data.code} and signal ${data.signal}`)
@@ -86,12 +86,12 @@
 
     <script src="testInit.js"></script>
     <script src="test-node.browser.js"></script>
-    <script src="test-watcher.browser.js"></script>
     <script src="test-dir.browser.js"></script>
     <script src="test-file.browser.js"></script>
     <script src="test-copy.browser.js"></script>
     <script src="test.worker.js"></script>
     <script src="test-getPlatformPath-api.browser.js"></script>
+    <script src="test-watcher.browser.js"></script>
     <script class="mocha-exec">
         window.virtualTestPath = '/test-phoenix-fs';