npm provider: Improve error message for unresolved modules

RandomByte · RandomByte · commit 820d6c0f2511 · 2021-02-18T11:51:41.000+01:00
diff --git a/lib/graph/providers/npm.js b/lib/graph/providers/npm.js
@@ -69,15 +69,20 @@ class Npm {
 
 	async _resolveModulePath(baseDir, moduleName) {
 		log.verbose(`Resolving module path for '${moduleName}'...`);
-		let packageJsonPath = await resolveModulePath(moduleName + "/package.json", {
-			basedir: baseDir,
-			preserveSymlinks: false
-		});
-		packageJsonPath = await realpath(packageJsonPath);
+		try {
+			let packageJsonPath = await resolveModulePath(moduleName + "/package.json", {
+				basedir: baseDir,
+				preserveSymlinks: false
+			});
+			packageJsonPath = await realpath(packageJsonPath);
 
-		const modulePath = path.dirname(packageJsonPath);
-		log.verbose(`Resolved module ${moduleName} to path ${modulePath}`);
-		return modulePath;
+			const modulePath = path.dirname(packageJsonPath);
+			log.verbose(`Resolved module ${moduleName} to path ${modulePath}`);
+			return modulePath;
+		} catch (err) {
+			throw new Error(
+				`Unable to locate module ${moduleName} via resolve logic: ${err.message}`);
+		}
 	}
 
 	async _getNode(modulePath, optional) {
diff --git a/test/fixtures/err.application.a/ui5.yaml b/test/fixtures/err.application.a/ui5.yaml
@@ -0,0 +1,5 @@
+---
+specVersion: "2.3"
+type: application
+metadata:
+  name: err.app.a
diff --git a/test/fixtures/err.application.a/webapp/index.html b/test/fixtures/err.application.a/webapp/index.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<title>Error Application A</title>
+</head>
+<body>
+
+</body>
+</html>
diff --git a/test/fixtures/err.application.a/webapp/manifest.json b/test/fixtures/err.application.a/webapp/manifest.json
@@ -0,0 +1,13 @@
+{
+    "_version": "1.1.0",
+    "sap.app": {
+        "_version": "1.1.0",
+        "id": "id1",
+        "type": "application",
+        "applicationVersion": {
+            "version": "1.2.2"
+        },
+        "embeds": ["embedded"],
+        "title": "{{title}}"
+    }
+}
diff --git a/test/fixtures/err.application.a/webapp/test.js b/test/fixtures/err.application.a/webapp/test.js
@@ -0,0 +1,5 @@
+function test(paramA) {
+	var variableA = paramA;
+	console.log(variableA);
+}
+test();
diff --git a/test/lib/graph/providers/npm.integration.js b/test/lib/graph/providers/npm.integration.js
@@ -209,12 +209,12 @@ test("Error: missing package.json", async (t) => {
 	t.is(error.message, `Failed to locate package.json for directory ${dir}`);
 });
 
-test.skip("Error: missing dependency", async (t) => {
+test("Error: missing dependency", async (t) => {
 	const npmProvider = new NpmProvider({
 		cwd: errApplicationAPath
 	});
 	const error = await t.throwsAsync(testGraphCreationDfs(t, npmProvider, []));
-	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");
+	t.is(error.message,
+		`Unable to locate module library.xx via resolve logic: Cannot find module 'library.xx/package.json' from ` +
+		`'${errApplicationAPath}'`);
 });

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
 +<!DOCTYPE html>
 +<html>
 +<head>
 +	<title>Error Application A</title>
 +</head>
 +<body>
++
 +</body>
 +</html>