[INTERNAL] Workspace: Log resolved versions

SAP · Jan 30, 2023 · 8a5c1b8 · 8a5c1b8
1 parent 649107e
commit 8a5c1b8
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 4 deletions.
diff --git a/lib/graph/helpers/ui5Framework.js b/lib/graph/helpers/ui5Framework.js
@@ -56,7 +56,10 @@ class ProjectProcessor {
 		if (this._workspace) {
 			ui5Module = await this._workspace.getModuleByProjectName(libName);
 			if (ui5Module) {
-				log.info(`Resolved project ${libName} via ${this._workspace.getName()} workspace`);
+				log.info(`Resolved project ${libName} via ${this._workspace.getName()} workspace ` +
+					`to version ${ui5Module.getVersion()}`);
+				log.verbose(`  Resolved module ${libName} to path ${ui5Module.getPath()}`);
+				log.verbose(`  Requested version was: ${depMetadata.version}`);
 				projectIsFromWorkspace = true;
 			}
 		}

diff --git a/lib/graph/providers/NodePackageDependencies.js b/lib/graph/providers/NodePackageDependencies.js
@@ -76,8 +76,9 @@ class NodePackageDependencies {
 			// If yes, replace the node from NodeProvider with the one from Workspace
 			const workspaceNode = await workspace.getModuleByNodeId(moduleName);
 			if (workspaceNode) {
-				log.info(`Resolved module ${moduleName} via ${workspace.getName()} workspace`);
-				log.verbose(`Resolved module ${moduleName} to path ${workspaceNode.getPath()}`);
+				log.info(`Resolved module ${moduleName} via ${workspace.getName()} workspace ` +
+					`to version ${workspaceNode.getVersion()}`);
+				log.verbose(`  Resolved module ${moduleName} to path ${workspaceNode.getPath()}`);
 				return workspaceNode.getPath();
 			}
 		}

diff --git a/test/lib/graph/helpers/ui5Framework.js b/test/lib/graph/helpers/ui5Framework.js
@@ -1107,6 +1107,8 @@ test.serial("ProjectProcessor: Resolve project via workspace", async (t) => {
 		getFrameworkDependencies: sinon.stub().returns([])
 	};
 	const moduleMock = {
+		getVersion: () => "1.0.0",
+		getPath: () => path.join("module", "path"),
 		getSpecifications: sinon.stub()
 			.onFirstCall().resolves({
 				project: libraryDProjectMock
@@ -1173,6 +1175,8 @@ test.serial("ProjectProcessor: Resolve project via workspace with additional dep
 		getFrameworkDependencies: sinon.stub().returns([])
 	};
 	const moduleMock = {
+		getVersion: () => "1.0.0",
+		getPath: () => path.join("module", "path"),
 		getSpecifications: sinon.stub()
 			.onFirstCall().resolves({
 				project: libraryEProjectMock
@@ -1239,6 +1243,8 @@ test.serial("ProjectProcessor: Resolve project via workspace with additional, un
 		getFrameworkDependencies: sinon.stub().returns([])
 	};
 	const moduleMock = {
+		getVersion: () => "1.0.0",
+		getPath: () => path.join("module", "path"),
 		getSpecifications: sinon.stub()
 			.onFirstCall().resolves({
 				project: libraryEProjectMock
@@ -1301,6 +1307,8 @@ test.serial("ProjectProcessor: Resolve project via workspace with cyclic depende
 		}])
 	};
 	const moduleMock = {
+		getVersion: () => "1.0.0",
+		getPath: () => path.join("module", "path"),
 		getSpecifications: sinon.stub()
 			.onFirstCall().resolves({
 				project: libraryEProjectMock
@@ -1368,6 +1376,8 @@ test.serial("ProjectProcessor: Resolve project via workspace with distant cyclic
 		}])
 	};
 	const moduleMock = {
+		getVersion: () => "1.0.0",
+		getPath: () => path.join("module", "path"),
 		getSpecifications: sinon.stub()
 			.onFirstCall().resolves({
 				project: libraryEProjectMock

diff --git a/test/lib/graph/providers/NodePackageDependencies.integration.js b/test/lib/graph/providers/NodePackageDependencies.integration.js
@@ -74,7 +74,8 @@ test("AppA: project with workspace overrides", async (t) => {
 		getModuleByNodeId: t.context.sinon.stub().resolves(undefined).onFirstCall().resolves({
 			// This version of library.d has an additional dependency to library.f,
 			// which in turn has a dependency to library.g
-			getPath: () => libraryDOverridePath
+			getPath: () => libraryDOverridePath,
+			getVersion: () => "1.0.0",
 		})
 	};
 	const npmProvider = new NodePackageDependenciesProvider({