[INTERNAL] ui5Framework: Fix handling of optional dependencies on roo…

…t project
SAP · Mar 24, 2020 · 6b717fd · 6b717fd
1 parent 69fcb17
commit 6b717fd
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 7 deletions.
diff --git a/lib/translators/ui5Framework.js b/lib/translators/ui5Framework.js
@@ -232,14 +232,12 @@ module.exports = {
 			if (project.specVersion === "2.0" && project.framework && project.framework.libraries) {
 				const frameworkDeps = project.framework.libraries
 					.filter((dependency) => {
-						// Filter out development and unresolved optional dependencies
-						if (dependency.development) {
-							return false;
+						if (dependency.optional && frameworkLibs[dependency.name]) {
+							// Resolved optional dependencies shall be used
+							return true;
 						}
-						if (!frameworkLibs[dependency.name] && dependency.optional) {
-							return false;
-						}
-						return true;
+						// Filter out development and unresolved optional dependencies for non-root projects
+						return utils.shouldIncludeDependency(dependency, project._level === 0);
 					})
 					.map((dependency) => {
 						if (!frameworkLibs[dependency.name]) {

diff --git a/test/lib/translators/ui5Framework.integration.js b/test/lib/translators/ui5Framework.integration.js
@@ -84,6 +84,12 @@ function defineTest(testName, {
 					"sap.ui.lib1"
 				],
 				optionalDependencies: []
+			},
+			"sap.ui.lib8": {
+				npmPackageName: "@sapui5/sap.ui.lib8",
+				version: "1.75.8",
+				dependencies: [],
+				optionalDependencies: []
 			}
 		}
 	};
@@ -189,6 +195,10 @@ function defineTest(testName, {
 						{
 							name: "sap.ui.lib4",
 							optional: true
+						},
+						{
+							name: "sap.ui.lib8",
+							development: true
 						}
 					]
 				}
@@ -216,6 +226,10 @@ function defineTest(testName, {
 						{
 							name: "sap.ui.lib6",
 							development: true
+						},
+						{
+							name: "sap.ui.lib8",
+							optional: true // optional dependency gets resolved by dev-dependency of root project
 						}
 					]
 				}
@@ -286,6 +300,17 @@ function defineTest(testName, {
 					name: "sap.ui.lib4"
 				},
 				framework: {libraries: []}
+			}])
+			.withArgs(path.join(ui5PackagesBaseDir, npmScope, "sap.ui.lib8",
+				frameworkName === "SAPUI5" ? "1.75.8" : "1.75.0", "ui5.yaml"
+			))
+			.resolves([{
+				specVersion: "1.0",
+				type: "library",
+				metadata: {
+					name: "sap.ui.lib8"
+				},
+				framework: {libraries: []}
 			}]);
 
 		// Prevent applying types as this would require a lot of mocking
@@ -327,6 +352,12 @@ function defineTest(testName, {
 					dependencies: {
 						"@openui5/sap.ui.lib1": "1.75.0"
 					}
+				})
+				.withArgs("@openui5/sap.ui.lib8@1.75.0")
+				.resolves({
+					name: "@openui5/sap.ui.lib8",
+					version: "1.75.0",
+					dependencies: {}
 				});
 		} else if (frameworkName === "SAPUI5") {
 			sinon.stub(Installer.prototype, "readJson")
@@ -355,6 +386,10 @@ function defineTest(testName, {
 					{
 						name: "sap.ui.lib4",
 						optional: true
+					},
+					{
+						name: "sap.ui.lib8",
+						development: true
 					}
 				]
 			},
@@ -380,6 +415,10 @@ function defineTest(testName, {
 							{
 								name: "sap.ui.lib6",
 								development: true
+							},
+							{
+								name: "sap.ui.lib8",
+								optional: true
 							}
 						]
 					},
@@ -409,6 +448,10 @@ function defineTest(testName, {
 									]
 								})
 							]
+						}),
+						frameworkProject({
+							_level: 1,
+							name: "sap.ui.lib8",
 						})
 					]
 				}),
@@ -445,6 +488,10 @@ function defineTest(testName, {
 							name: "sap.ui.lib1"
 						})
 					]
+				}),
+				frameworkProject({
+					_level: 1,
+					name: "sap.ui.lib8",
 				})
 			]
 		});