Passing a directory path implicitly watches directory contents, undoes accidental breaking change and fixes #229

index.js

@@ -38,20 +38,22 @@ module.exports = function (globs, opts, cb) {
 	opts = opts || {};
 	cb = cb || function () {};
 
+	function resolveFilepath(filepath) {
+		if (pathIsAbsolute(filepath)) {
+			return filepath;
+		}
+		return path.resolve(opts.cwd || process.cwd(), filepath);
+	}
+
 	function resolveGlob(glob) {
 		var mod = '';
-		var resolveFn = path.resolve;
 
 		if (glob[0] === '!') {
 			mod = glob[0];
 			glob = glob.slice(1);
 		}
 
-		if (opts.cwd) {
-			resolveFn = path.normalize;
-		}
-
-		return mod + resolveFn(glob);
+		return mod + resolveFilepath(glob);
 	}
 	globs = globs.map(resolveGlob);
 
@@ -74,8 +76,11 @@ module.exports = function (globs, opts, cb) {
 
 	outputStream._read = function _read() { };
 
-	var watcher = chokidar.watch(globs, opts)
-		.on('all', processEvent);
+	var watcher = chokidar.watch(globs, opts);
+
+	opts.events.forEach(function (ev) {
+		watcher.on(ev, processEvent.bind(undefined, ev));
+	});
 
 	['add', 'change', 'unlink', 'addDir', 'unlinkDir', 'error', 'ready', 'raw']
 		.forEach(function (ev) {
@@ -95,24 +100,30 @@ module.exports = function (globs, opts, cb) {
 	};
 
 	function processEvent(event, filepath) {
-		var glob = globs[anymatch(globs, filepath, true)];
+		filepath = resolveFilepath(filepath);
+
+		var glob;
+		var currentFilepath = filepath;
+		while (!(glob = globs[anymatch(globs, currentFilepath, true)]) && currentFilepath !== (currentFilepath = path.resolve(currentFilepath, '..'))) {} // eslint-disable-line no-empty-blocks/no-empty-blocks
 
 		if (!glob) {
+			util.log(
+				util.colors.cyan('[gulp-watch]'),
+				util.colors.yellow('wut? This shouldn\'t happen. Please open this link to report the issue:\n') +
+				'https://github.com/floatdrop/gulp-watch/issues/new?title=' +
+				encodeURIComponent('Watched unexpected filepath') + '&body=' +
+				encodeURIComponent('Globs: `' + JSON.stringify(globs) + '`\nFilepath: `' + filepath + '`\nOptions:\n```js\n' + JSON.stringify(opts, null, 2) + '\n```')
+			);
 			return;
 		}
 
 		if (!baseForced) {
 			opts.base = glob2base(new Glob(glob));
 		}
 
-		// React only on opts.events
-		if (opts.events.indexOf(event) === -1) {
-			return;
-		}
-
 		// Do not stat deleted files
 		if (event === 'unlink' || event === 'unlinkDir') {
-			opts.path = pathIsAbsolute(filepath) ? filepath : path.join(opts.cwd || process.cwd(), filepath);
+			opts.path = filepath;
 
 			write(event, null, new File(opts));
 			return;

package.json

@@ -40,8 +40,8 @@
   },
   "dependencies": {
     "anymatch": "^1.3.0",
-    "chokidar": "^1.0.3",
-    "glob": "^5.0.13",
+    "chokidar": "^1.5.2",
+    "glob": "^7.0.3",
     "glob2base": "0.0.12",
     "gulp-util": "^3.0.6",
     "path-is-absolute": "^1.0.0",

test/test-cwd.js

@@ -21,8 +21,24 @@ describe('cwd', function () {
 
 	it('should respect opts.cwd', function (done) {
 		w = watch('index.js', {cwd: fixtures('')}, function (file) {
-			file.relative.should.eql(path.normalize('test/fixtures/index.js'));
+			file.relative.should.eql('index.js');
 			done();
 		}).on('ready', touch(fixtures('index.js')));
 	});
+
+	it('should emit file outside opts.cwd using relative glob', function (done) {
+		w = watch('../index.js', {cwd: fixtures('folder')}, function (file) {
+			file.relative.should.eql('index.js');
+			file.contents.toString().should.equal('fixtures index');
+			done();
+		}).on('ready', touch(fixtures('index.js'), 'fixtures index'));
+	});
+
+	it('should emit file outside opts.cwd using absolute glob', function (done) {
+		w = watch(fixtures('index.js'), {cwd: fixtures('folder')}, function (file) {
+			file.relative.should.eql('index.js');
+			file.contents.toString().should.equal('fixtures index');
+			done();
+		}).on('ready', touch(fixtures('index.js'), 'fixtures index'));
+	});
 });

test/test-dir.js

@@ -20,14 +20,14 @@ describe('dir', function () {
 		w.close();
 	});
 
-	it('should not watch files inside directory', function (done) {
+	it('should watch files inside directory', function (done) {
 		fs.mkdirSync(fixtures('newDir'));
 		touch(fixtures('newDir/index.js'))();
-		w = watch(fixtures('newDir'), function () {
-			done('Watched unexpected file.');
+		w = watch(fixtures('newDir'), function (file) {
+			file.relative.should.eql(path.normalize('newDir/index.js'));
+			done();
 		}).on('ready', function () {
 			touch(fixtures('newDir/index.js'))('new content');
-			setTimeout(done, 200);
 		});
 	});