[INTERNAL] Allow framework dependency resolution for framework projects

Author: RandomByte

lib/graph/helpers/ui5Framework.js

@@ -69,7 +69,7 @@ const utils = {
 		const ui5Dependencies = [];
 		const rootProject = projectGraph.getRoot();
 		await projectGraph.traverseBreadthFirst(async ({project}) => {
-			if (project.isFrameworkProject()) {
+			if (project !== rootProject && project.isFrameworkProject()) {
 				// Ignoring UI5 Framework libraries in dependencies
 				return;
 			}
@@ -93,7 +93,7 @@ const utils = {
 	async declareFrameworkDependenciesInGraph(projectGraph) {
 		const rootProject = projectGraph.getRoot();
 		await projectGraph.traverseBreadthFirst(async ({project}) => {
-			if (project.isFrameworkProject()) {
+			if (project !== rootProject && project.isFrameworkProject()) {
 				// Ignoring UI5 Framework libraries in dependencies
 				return;
 			}
@@ -136,20 +136,25 @@ export default {
 	 */
 	enrichProjectGraph: async function(projectGraph, options = {}) {
 		const rootProject = projectGraph.getRoot();
-
-		// if (rootProject.isFrameworkProject()) {
-		// 	rootProject.getFrameworkDependencies().forEach((dep) => {
-		// 		if (utils.shouldIncludeDependency(dep) && !projectGraph.getProject(dep.name)) {
-		// 			throw new Error(
-		// 				`Missing framework dependency ${dep.name} for project ${rootProject.getName()}`);
-		// 		}
-		// 	});
-		// 	// Ignoring UI5 Framework libraries in dependencies
-		// 	return projectGraph;
-		// }
-
 		const frameworkName = rootProject.getFrameworkName();
 		const frameworkVersion = rootProject.getFrameworkVersion();
+
+		// It is allowed to not define a framework version in ui5.yaml but provide one via the override
+		let version = options.versionOverride || frameworkVersion;
+
+		if (rootProject.isFrameworkProject() && (!version || !version.endsWith("-SNAPSHOT"))) {
+			// If the root project is a framework project, and the framework version is not a
+			// snapshot version, all framework dependencies need to be part of the graph already
+			rootProject.getFrameworkDependencies().forEach((dep) => {
+				if (utils.shouldIncludeDependency(dep) && !projectGraph.getProject(dep.name)) {
+					throw new Error(
+						`Missing framework dependency ${dep.name} for framework project ${rootProject.getName()}`);
+				}
+			});
+			// All framework dependencies are already present in the graph
+			return projectGraph;
+		}
+
 		if (!frameworkName && !frameworkVersion) {
 			log.verbose(`Root project ${rootProject.getName()} has no framework configuration. Nothing to do here`);
 			return projectGraph;
@@ -162,9 +167,6 @@ export default {
 			);
 		}
 
-		// It is allowed to not define a framework version in ui5.yaml but provide one via the override
-		let version = options.versionOverride || frameworkVersion;
-
 		if (!version) {
 			throw new Error(
 				`No framework version defined for root project ${rootProject.getName()}`
@@ -176,7 +178,7 @@ export default {
 			Resolver = (await import("../../ui5Framework/Openui5Resolver.js")).default;
 		} else if (frameworkName === "SAPUI5") {
 			if (version.endsWith("-SNAPSHOT")) {
-				Resolver = (await import("../../ui5Framework/Sapui5SnapshotResolver.js")).default;
+				Resolver = (await import("../../ui5Framework/Sapui5MavenSnapshotResolver.js")).default;
 			} else {
 				Resolver = (await import("../../ui5Framework/Sapui5Resolver.js")).default;
 			}

test/lib/graph/helpers/ui5Framework.js

@@ -293,7 +293,7 @@ test.serial("generateDependencyTree should throw for framework project with depe
 	const projectGraph = await projectGraphBuilder(provider);
 
 	const err = await t.throwsAsync(ui5Framework.enrichProjectGraph(projectGraph));
-	t.is(err.message, `Missing framework dependency lib1 for project application.a`,
+	t.is(err.message, `Missing framework dependency lib1 for framework project application.a`,
 		"Threw with expected error message");
 });
 
@@ -419,7 +419,7 @@ test.serial("utils.getFrameworkLibrariesFromTree: Framework project", async (t)
 	const projectGraph = await projectGraphBuilder(provider);
 
 	const ui5Dependencies = await utils.getFrameworkLibrariesFromGraph(projectGraph);
-	t.deepEqual(ui5Dependencies, []);
+	t.deepEqual(ui5Dependencies, ["lib1"]);
 });