Merge pull request #43 from webpack/bugfix/no-fragment

add support for escaping in requests

Author: sokra

lib/LoaderRunner.js

@@ -15,7 +15,7 @@ function utf8BufferToString(buf) {
 	}
 }
 
-var PATH_QUERY_FRAGMENT_REGEXP = /^([^?#]*)(\?[^#]*)?(#.*)?$/;
+const PATH_QUERY_FRAGMENT_REGEXP = /^((?:\0.|[^?#\0])*)(\?(?:\0.|[^#\0])*)?(#.*)?$/;
 
 /**
  * @param {string} str the path with query and fragment
@@ -24,8 +24,8 @@ var PATH_QUERY_FRAGMENT_REGEXP = /^([^?#]*)(\?[^#]*)?(#.*)?$/;
 function parsePathQueryFragment(str) {
 	var match = PATH_QUERY_FRAGMENT_REGEXP.exec(str);
 	return {
-		path: match[1],
-		query: match[2] || "",
+		path: match[1].replace(/\0(.)/g, "$1"),
+		query: match[2] ? match[2].replace(/\0(.)/g, "$1") : "",
 		fragment: match[3] || ""
 	};
 }
@@ -60,7 +60,7 @@ function createLoaderObject(loader) {
 	Object.defineProperty(obj, "request", {
 		enumerable: true,
 		get: function() {
-			return obj.path + obj.query;
+			return obj.path.replace(/#/g, "\0#") + obj.query.replace(/#/g, "\0#") + obj.fragment;
 		},
 		set: function(value) {
 			if(typeof value === "string") {
@@ -326,7 +326,7 @@ exports.runLoaders = function runLoaders(options, callback) {
 		get: function() {
 			if(loaderContext.resourcePath === undefined)
 				return undefined;
-			return loaderContext.resourcePath + loaderContext.resourceQuery + loaderContext.resourceFragment;
+			return loaderContext.resourcePath.replace(/#/g, "\0#") + loaderContext.resourceQuery.replace(/#/g, "\0#") + loaderContext.resourceFragment;
 		},
 		set: function(value) {
 			var splittedResource = value && parsePathQueryFragment(value);

test/fixtures/res#ource.bin

@@ -0,0 +1 @@
+resource

test/runLoaders.js

@@ -629,16 +629,79 @@ describe("runLoaders", function() {
 			});
 		});
 	}
+	it("should support escaping in resource", function(done) {
+		runLoaders({
+			resource: path.resolve(fixtures, "res\0#ource.bin")
+		}, function(err, result) {
+			if(err) return done(err);
+			result.result.should.be.eql([Buffer.from("resource", "utf-8")]);
+			result.cacheable.should.be.eql(true);
+			result.fileDependencies.should.be.eql([
+				path.resolve(fixtures, "res#ource.bin")
+			]);
+			result.contextDependencies.should.be.eql([]);
+			done();
+		});
+	});
+	it("should have to correct keys in context when using escaping", function(done) {
+		runLoaders({
+			resource: path.resolve(fixtures, "res\0#ource.bin") + "?query\0#frag",
+			loaders: [
+				path.resolve(fixtures, "keys-loader.js") + "?loader\0#query"
+			]
+		}, function(err, result) {
+			if(err) return done(err);
+			try {
+				JSON.parse(result.result[0]).should.be.eql({
+					context: fixtures,
+					resource: path.resolve(fixtures, "res\0#ource.bin") + "?query\0#frag",
+					resourcePath: path.resolve(fixtures, "res#ource.bin"),
+					resourceQuery: "?query#frag",
+					resourceFragment: "",
+					loaderIndex: 0,
+					query: "?loader#query",
+					currentRequest: path.resolve(fixtures, "keys-loader.js") + "?loader\0#query!" +
+						path.resolve(fixtures, "res\0#ource.bin") + "?query\0#frag",
+					remainingRequest: path.resolve(fixtures, "res\0#ource.bin") + "?query\0#frag",
+					previousRequest: "",
+					request: path.resolve(fixtures, "keys-loader.js") + "?loader\0#query!" +
+						path.resolve(fixtures, "res\0#ource.bin") + "?query\0#frag",
+					data: null,
+					loaders: [{
+						request: path.resolve(fixtures, "keys-loader.js") + "?loader\0#query",
+						path: path.resolve(fixtures, "keys-loader.js"),
+						query: "?loader#query",
+						fragment: "",
+						data: null,
+						pitchExecuted: true,
+						normalExecuted: true
+					}]
+				});
+			} catch(e) {
+				return done(e);
+			}
+			done();
+		});
+	});
+
 	describe("getContext", function() {
 		var TESTS = [
 			["/", "/"],
 			["/path/file.js", "/path"],
+			["/path/file.js#fragment", "/path"],
+			["/path/file.js?query", "/path"],
+			["/path/file.js?query#fragment", "/path"],
+			["/path/\0#/file.js", "/path/#"],
 			["/some/longer/path/file.js", "/some/longer/path"],
 			["/file.js", "/"],
 			["C:\\", "C:\\"],
 			["C:\\file.js", "C:\\"],
 			["C:\\some\\path\\file.js", "C:\\some\\path"],
 			["C:\\path\\file.js", "C:\\path"],
+			["C:\\path\\file.js#fragment", "C:\\path"],
+			["C:\\path\\file.js?query", "C:\\path"],
+			["C:\\path\\file.js?query#fragment", "C:\\path"],
+			["C:\\path\\\0#\\file.js", "C:\\path\\#"],
 		];
 		TESTS.forEach(function(testCase) {
 			it("should get the context of '" + testCase[0] + "'", function() {