[INTERNAL] npm t8r: Prevent re-throwing own errors

Author: matz3

lib/translators/npm.js

@@ -221,15 +221,16 @@ class NpmTranslator {
 							log.verbose("Found module %s in that collection", moduleName);
 							return modulePath;
 						}
-						throw new Error(`Could not find module ${moduleName} in collection ${pkg.name}`);
+						throw new Error(`[npm translator] Could not find module ${moduleName} in collection ${pkg.name}`);
 					}
 				}
-				throw new Error(`Could not locate module ${moduleName} via resolve logic ` +
+
+				throw new Error(`[npm translator] Could not locate module ${moduleName} via resolve logic ` +
 					`(error: ${err.message}) or in a collection`);
+			}, (err) => {
+				throw new Error(
+					`[npm translator] Failed to locate module ${moduleName} from ${basePath} - Error: ${err.message}`);
 			});
-		}).catch((err) => {
-			throw new Error(
-				`[npm translator] Failed to locate module ${moduleName} from ${basePath} - Error: ${err.message}`);
 		});
 	}
 

test/lib/translators/npm.js

@@ -63,8 +63,7 @@ test("Error: missing package.json", async (t) => {
 
 test("Error: missing dependency", async (t) => {
 	const error = await t.throws(npmTranslator.generateDependencyTree(errApplicationAPath));
-	t.is(error.message, "[npm translator] Failed to locate module library.xx from " +
-		errApplicationAPath + " - Error: Could not locate " +
+	t.is(error.message, "[npm translator] Could not locate " +
 		"module library.xx via resolve logic (error: Cannot find module 'library.xx/package.json' from '" +
 		errApplicationAPath + "') or in a collection");
 });