Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support micromatch patterns in watchman #147

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Support micromatch patterns in watchman #147

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 24 additions & 2 deletions src/watchman_watcher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

const fs = require('fs');
const path = require('path');
const micromatch = require('micromatch');
const common = require('./common');
const watchmanClient = require('./watchman_client');
const EventEmitter = require('events').EventEmitter;
Expand All @@ -16,6 +17,9 @@ const DELETE_EVENT = common.DELETE_EVENT;
const ADD_EVENT = common.ADD_EVENT;
const ALL_EVENT = common.ALL_EVENT;

// These are the types associated with extglobs
const UNSUPPORTED_TOKEN_TYPES = ['qmark', 'negate', 'star', 'plus', 'at'];

/**
* Export `WatchmanWatcher` class.
*/
Expand All @@ -33,6 +37,24 @@ module.exports = WatchmanWatcher;

function WatchmanWatcher(dir, opts) {
common.assignOptions(this, opts);

this.globsSupported = true;

let expandedGlobs = [];
for (let i in this.globs) {
const globs = micromatch.parse(this.globs[i], { expand: true });
for (let glob in globs) {
expandedGlobs.push(glob.consumed);
this.globsSupported =
this.globsSupported &&
!glob.negated &&
!glob.tokens.find(function(token) {
return UNSUPPORTED_TOKEN_TYPES.includes(token.type);
});
}
};
this.globs = expandedGlobs;

this.root = path.resolve(dir);
this._init();
}
Expand Down Expand Up @@ -81,7 +103,7 @@ WatchmanWatcher.prototype.createOptions = function() {
// to the watchman server. This saves both on data size to be
// communicated back to us and compute for evaluating the globs
// in our node process.
if (this._client.wildmatch) {
if (this.globsSupported && this._client.wildmatch) {
if (this.globs.length === 0) {
if (!this.dot) {
// Make sure we honor the dot option if even we're not using globs.
Expand Down Expand Up @@ -150,7 +172,7 @@ WatchmanWatcher.prototype.handleFileChange = function(changeDescriptor) {
absPath = path.join(this.root, relativePath);

if (
!(this._client.wildmatch && !this.hasIgnore) &&
(!this._client.wildmatch || !this.globsSupported || this.hasIgnore) &&
!common.isFileIncluded(this.globs, this.dot, this.doIgnore, relativePath)
) {
return;
Expand Down