enhanced-resolve - npm Package Compare versions

Comparing version 0.7.0 to 0.7.1

lib/DirectoryDefaultFilePlugin.js

@@ -5,3 +5,3 @@ /*
 */
-var createLoggingCallback = require("./createLoggingCallback");
+var createInnerCallback = require("./createInnerCallback");
 
@@ -17,3 +17,3 @@ function DirectoryDefaultFilePlugin(files) {
 		var fs = this.fileSystem;
-		var log = callback.log;
+		var topLevelCallback = callback;
 		var directory = this.join(request.path, request.request);
@@ -34,6 +34,6 @@ fs.stat(directory, function(err, stat) {
 					request: file
-				}, createLoggingCallback(function(err, result) {
+				}, createInnerCallback(function(err, result) {
 					if(!err && result) return callback(result);
 					return callback();
-				}, log, "directory default file " + file));
+				}, topLevelCallback, "directory default file " + file));
 			}.bind(this), function(result) {
@@ -40,0 +40,0 @@ if(!result) return callback();

lib/DirectoryDescriptionFileFieldAliasPlugin.js

@@ -5,3 +5,3 @@ /*
 */
-var createLoggingCallback = require("./createLoggingCallback");
+var createInnerCallback = require("./createInnerCallback");
 
@@ -73,2 +73,3 @@ function DirectoryDescriptionFileFieldAliasPlugin(filename, field) {
 			var data = fieldData[moduleName];
+			if(data === moduleName) return callback();
 			if(data === false) return callback(null, {
@@ -86,3 +87,3 @@ path: false,
 			};
-			var newCallback = createLoggingCallback(callback, callback.log, "aliased from directory description file " + this.join(directory, filename) + " with mapping " + JSON.stringify(moduleName));
+			var newCallback = createInnerCallback(callback, callback, "aliased from directory description file " + this.join(directory, filename) + " with mapping " + JSON.stringify(moduleName));
 			if(newRequest.module) return this.doResolve("module", obj, newCallback);
@@ -103,2 +104,3 @@ if(newRequest.directory) return this.doResolve("directory", obj, newCallback);
 				var data = fieldData["./" + relative];
+			if(data === relative || data === "./" + relative) return callback();
 			if(data === false) return callback(null, {
@@ -116,3 +118,3 @@ path: false,
 			};
-			var newCallback = createLoggingCallback(callback, callback.log, "aliased from directory description file " + this.join(directory, filename) + " with mapping " + JSON.stringify(relative));
+			var newCallback = createInnerCallback(callback, callback, "aliased from directory description file " + this.join(directory, filename) + " with mapping " + JSON.stringify(relative));
 			if(newRequest.module) return this.doResolve("module", obj, newCallback);
@@ -119,0 +121,0 @@ if(newRequest.directory) return this.doResolve("directory", obj, newCallback);

lib/DirectoryDescriptionFilePlugin.js

@@ -5,3 +5,3 @@ /*
 */
-var createLoggingCallback = require("./createLoggingCallback");
+var createInnerCallback = require("./createInnerCallback");
 
@@ -66,6 +66,6 @@ function DirectoryDescriptionFilePlugin(filename, fields) {
 					request: mainModule
-				}, createLoggingCallback(function(err, result) {
+				}, createInnerCallback(function(err, result) {
 					if(!err && result) return callback(null, result);
 					return next.call(this);
-				}.bind(this), callback.log, "use " + mainModule + " from " + filename));
+				}.bind(this), callback, "use " + mainModule + " from " + filename));
 			}.call(this))
@@ -72,0 +72,0 @@ }.bind(this));

lib/ModuleAliasPlugin.js

@@ -5,3 +5,3 @@ /*
 */
-var createLoggingCallback = require("./createLoggingCallback");
+var createInnerCallback = require("./createInnerCallback");
 
@@ -35,3 +35,3 @@ function ModuleAliasPlugin(aliasMap) {
 						};
-						var newCallback = createLoggingCallback(callback, callback.log, "aliased with mapping " + JSON.stringify(aliasName) + ": " + JSON.stringify(aliasValue) + " to " + newRequestStr);
+						var newCallback = createInnerCallback(callback, callback, "aliased with mapping " + JSON.stringify(aliasName) + ": " + JSON.stringify(aliasValue) + " to " + newRequestStr);
 						if(newRequest.module) return this.doResolve("module", obj, newCallback);
@@ -38,0 +38,0 @@ if(newRequest.directory) return this.doResolve("directory", obj, newCallback);

lib/ModuleAsDirectoryPlugin.js

@@ -5,4 +5,2 @@ /*
 */
-var createLoggingCallback = require("./createLoggingCallback");
-
 function ModuleAsDirectoryPlugin(moduleType) {
@@ -9,0 +7,0 @@ this.moduleType = moduleType;

lib/ModulesInDirectoriesPlugin.js

@@ -5,3 +5,3 @@ /*
 */
-var createLoggingCallback = require("./createLoggingCallback");
+var createInnerCallback = require("./createInnerCallback");
 
@@ -23,3 +23,3 @@ function ModulesInDirectoriesPlugin(moduleType, directories) {
 		var limit = -1;
-		var log = callback.log;
+		var topLevelCallback = callback;
 		while(pathSeqment) {
@@ -48,7 +48,7 @@ paths.push(addr[0]);
 						directory: request.directory
-					}, createLoggingCallback(function(err, result) {
+					}, createInnerCallback(function(err, result) {
 						if(err) return callback(err);
 						if(!result) return callback();
 						return callback(null, result);
-					}, log, "looking for modules in " + addr));
+					}, topLevelCallback, "looking for modules in " + addr));
 					return;
@@ -55,0 +55,0 @@ }

lib/ModulesInRootPlugin.js

@@ -5,3 +5,3 @@ /*
 */
-var createLoggingCallback = require("./createLoggingCallback");
+var createInnerCallback = require("./createInnerCallback");
 
@@ -23,8 +23,8 @@ function ModulesInRootPlugin(moduleType, path) {
 			directory: request.directory
-		}, createLoggingCallback(function loggingCallback(err, result) {
+		}, createInnerCallback(function innerCallback(err, result) {
 			if(err) return callback(err);
 			if(!result) return callback();
 			return callback(null, result);
-		}, callback.log, "looking for modules in " + path));
+		}, callback, "looking for modules in " + path));
 	});
 };

lib/ModuleTemplatesPlugin.js

@@ -5,3 +5,3 @@ /*
 */
-var createLoggingCallback = require("./createLoggingCallback");
+var createInnerCallback = require("./createInnerCallback");
 
@@ -20,3 +20,3 @@ function ModuleTemplatesPlugin(moduleType, templates, targetModuleType) {
 		var fs = this.fileSystem;
-		var log = callback.log;
+		var topLevelCallback = callback;
 		var i = request.request.indexOf("/"),
@@ -40,9 +40,9 @@ j = request.request.indexOf("\\");
 				directory: request.directory
-			}, createLoggingCallback(function(err, result) {
+			}, createInnerCallback(function(err, result) {
 				if(err) return callback(err);
 				if(!result) return callback();
 				return callback(null, result);
-			}, log, "module variation " + moduleFinalName));
+			}, topLevelCallback, "module variation " + moduleFinalName));
 		}.bind(this), callback);
 	});
 };

lib/Resolver.js

@@ -6,3 +6,3 @@ /*
 var Tapable = require("tapable");
-var createLoggingCallback = require("./createLoggingCallback");
+var createInnerCallback = require("./createInnerCallback");
 
@@ -50,2 +50,14 @@ function Resolver(fileSystem) {
 	if(!Array.isArray(types)) types = [types];
+	var stackLine = types.join(",") + ": " + request.path + " " + request.request + request.query + " " + request.directory + " " + request.module;
+	var newStack = [stackLine];
+	if(callback.stack) {
+		newStack = callback.stack.concat(newStack);
+		if(callback.stack.indexOf(stackLine) >= 0) {
+			// Prevent recursion
+			var recursionError = new Error("Recursion in resolving\n" + callback.stack.join("\n"));
+			recursionError.recursion = true;
+			if(callback.log) callback.log("abort resolving because of recursion");
+			return callback(recursionError);
+		}
+	}
 	this.applyPlugins("resolve-step", types, request);
@@ -59,9 +71,9 @@ var log = [];
 	}
+	var currentRequestString = request.request ? request.request + " in " + request.path : request.path;
 	if(types.length == 1 && !noError) {
 		// If only one type, we can pass the error.
-		function loggingCallback(err, result) {
+		return this.applyPluginsParallelBailResult(types[0], request, createInnerCallback(function innerCallback(err, result) {
 			if(callback.log) {
-				callback.log("resolve " + types[0] + " " + request.request + " in " + request.path);
 				for(var i = 0; i < log.length; i++)
-					callback.log("  " + log[i]);
+					callback.log(log[i]);
 			}
@@ -74,15 +86,19 @@ if(err) return callback(err);
 			return callback(error);
-		}
-		loggingCallback.log = writeLog;
-		return this.applyPluginsParallelBailResult(types[0], request, loggingCallback);
+		}, {
+			log: writeLog,
+			stack: newStack
+		}, "resolve " + types[0] + " " + currentRequestString));
 	}
 	// For multiple type we have to ignore the error
 	this.forEachBail(types, function(type, callback) {
-		this.applyPluginsParallelBailResult(type, request, createLoggingCallback(function(err, result) {
+		this.applyPluginsParallelBailResult(type, request, createInnerCallback(function(err, result) {
 			if(!err && result) return callback(result);
 			callback();
-		}, writeLog, "resolve " + type));
+		}, {
+			log: writeLog,
+			stack: newStack
+		}, "resolve " + type));
 	}.bind(this), function(result) {
 		if(callback.log) {
-			callback.log("resolve " + types.join(" or ") + " " + request.request + " in " + request.path);
+			callback.log("resolve " + types.join(" or ") + " " + currentRequestString);
 			for(var i = 0; i < log.length; i++)
@@ -93,3 +109,3 @@ callback.log("  " + log[i]);
 		if(result) return callback(null, result);
-		var error = new Error("Cannot resolve " + types.join(" or ") + " " + request.request + " in " + request.path);
+		var error = new Error("Cannot resolve " + types.join(" or ") + " " + currentRequestString);
 		error.details = logAsString();
@@ -96,0 +112,0 @@ return callback(error);

package.json

 {
 	"name": "enhanced-resolve",
-	"version": "0.7.0",
+	"version": "0.7.1",
 	"author": "Tobias Koppers @sokra",
@@ -5,0 +5,0 @@ "description": "Offers a async require.resolve function. It's highly configurable.",

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

60798

increased by1.59%

Lines of code

1643

increased by1.67%

No dependency changes