Merge pull request #201 from webpack/bugfix/purge-readdir

fix purging of filesystem for readdir

Author: sokra

lib/CachedInputFileSystem.js

@@ -4,6 +4,18 @@
 */
 "use strict";
 
+const dirname = path => {
+	let idx = path.length - 1;
+	while (idx >= 0) {
+		const c = path.charCodeAt(idx);
+		// slash or backslash
+		if (c === 47 || c === 92) break;
+		idx--;
+	}
+	if (idx < 0) return "";
+	return path.slice(0, idx);
+};
+
 class Storage {
 	constructor(duration) {
 		this.duration = duration;
@@ -175,6 +187,27 @@ class Storage {
 			}
 		}
 	}
+
+	purgeParent(what) {
+		if (!what) {
+			this.count = 0;
+			clearInterval(this.interval);
+			this.nextTick = null;
+			this.data.clear();
+			this.levels.forEach(level => {
+				level.clear();
+			});
+		} else if (typeof what === "string") {
+			what = dirname(what);
+			for (let key of this.data.keys()) {
+				if (key.startsWith(what)) this.data.delete(key);
+			}
+		} else {
+			for (let i = what.length - 1; i >= 0; i--) {
+				this.purgeParent(what[i]);
+			}
+		}
+	}
 }
 
 module.exports = class CachedInputFileSystem {
@@ -299,7 +332,7 @@ module.exports = class CachedInputFileSystem {
 
 	purge(what) {
 		this._statStorage.purge(what);
-		this._readdirStorage.purge(what);
+		this._readdirStorage.purgeParent(what);
 		this._readFileStorage.purge(what);
 		this._readlinkStorage.purge(what);
 		this._readJsonStorage.purge(what);

test/CachedInputFileSystem.js

@@ -6,6 +6,7 @@ describe("CachedInputFileSystem", function() {
 	var fs;
 
 	beforeEach(function() {
+		let counter = 0;
 		fs = new CachedInputFileSystem(
 			{
 				stat: function(path, callback) {
@@ -15,6 +16,9 @@ describe("CachedInputFileSystem", function() {
 						}),
 						100
 					);
+				},
+				readdir: function(path, callback) {
+					callback(null, [`${counter++}`]);
 				}
 			},
 			1000
@@ -114,4 +118,23 @@ describe("CachedInputFileSystem", function() {
 			done();
 		});
 	});
+
+	it("should purge readdir correctly", function(done) {
+		fs.readdir("/test/path", (err, r) => {
+			r[0].should.be.eql("0");
+			fs.purge(["/test/path/sub/path"]);
+			fs.readdir("/test/path", (err, r) => {
+				r[0].should.be.eql("0");
+				fs.purge(["/test/path/sub"]);
+				fs.readdir("/test/path", (err, r) => {
+					r[0].should.be.eql("1");
+					fs.purge(["/test/path"]);
+					fs.readdir("/test/path", (err, r) => {
+						r[0].should.be.eql("2");
+						done();
+					});
+				});
+			});
+		});
+	});
 });