Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions index.js
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,7 @@ function globStream(globs, opt) {
var stream = new Readable({
highWaterMark: ourOpt.highWaterMark,
read: read,
open: open,
predestroy: predestroy,
});

Expand All @@ -277,19 +278,23 @@ function globStream(globs, opt) {
walker.on('path', onPath);
walker.once('end', onEnd);
walker.once('error', onError);
ourGlobs.forEach(function (glob) {
if (isGlob(glob)) {
// We only want to walk the glob-parent directories of any positive glob
// to reduce the amount of files have to check.
if (isPositiveGlob(glob)) {
var base = globParent(glob);
walker.walk(base);

function open(cb) {
ourGlobs.forEach(function (glob) {
if (isGlob(glob)) {
// We only want to walk the glob-parent directories of any positive glob
// to reduce the amount of files have to check.
if (isPositiveGlob(glob)) {
var base = globParent(glob);
walker.walk(base);
}
} else {
// If the string is not a glob, we just check for the existence of it.
walker.exists(glob);
}
} else {
// If the strig is not a glob, we just check for the existence of it.
walker.exists(glob);
}
});
});
cb();
}

function read(cb) {
walker.resume();
Expand Down
25 changes: 25 additions & 0 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,31 @@ function suite(moduleName) {
done
);
});

it('does not end prematurely', function (done) {
var gs = globStream(['./fixtures/*.js'], { cwd: dir });

function delayed() {
stream.pipeline(
[
gs,
new stream.Transform({
objectMode: true,
transform: function(data, enc, cb) {
if (typeof enc === 'function') {
cb = enc;
}
cb(null, data);
}
}),
concat(),
],
done
);
}

setTimeout(delayed, 10);
});
});

describe('options', function () {
Expand Down
Loading