[FEATURE] manifestCreator: i18n section v22

fix recursive logic such that lazy
property correctly gets interpreted:
* dependencies of lazy dependency are also lazy
* having the same dependency lazy and non-lazy
results in a non-lazy dependency

Author: tobiasso85

lib/processors/versionInfoGenerator.js

@@ -127,7 +127,7 @@ const resolveTransitiveDependencies = (libraryInfosMap) => {
 class DependencyInfoObject {
 	/**
 	 *
-	 * @param {string} name
+	 * @param {string} name name of the dependency, e.g. sap.ui.documentation
 	 * @param {boolean} lazy
 	 */
 	constructor(name, lazy) {
@@ -140,9 +140,11 @@ class DependencyInfo {
 	/**
 	 *
 	 * @param {DependencyInfoObject[]} libs
+	 * @param {string} name
 	 */
-	constructor(libs) {
+	constructor(libs, name) {
 		this.libs = libs;
+		this.name = name;
 
 		/**
 		 *
@@ -158,67 +160,60 @@ class DependencyInfo {
 	}
 
 	isResolved(libName) {
-		return this.libsResolved.some((libResolved) => {
+		return this.libsResolved.find((libResolved) => {
 			return libResolved.name === libName;
 		});
 	}
 
+	/**
+	 *
+	 * @param {string} libName
+	 * @param {boolean} lazy
+	 * @returns {DependencyInfoObject}
+	 */
 	addResolvedLibDependency(libName, lazy) {
-		if (!this.isResolved(libName) || !lazy) {
-			this.libsResolved.push(new DependencyInfoObject(libName, lazy));
+		if (log.isLevelEnabled("verbose")) {
+			log.verbose(`${this.name} add: ${libName}${lazy?" (lazy)":""}`);
+		}
+		let alreadyResolved = this.isResolved(libName);
+		if (!alreadyResolved) {
+			alreadyResolved = new DependencyInfoObject(libName, lazy);
+			this.libsResolved.push(alreadyResolved);
+		} else {
+			if (!alreadyResolved.lazy || !lazy) {
+				delete alreadyResolved.lazy;
+			}
 		}
+		return alreadyResolved;
 	}
 
 	/**
 	 *
 	 * @param {Map<string,DependencyInfo>} dependencyInfoMap
+	 * @param {boolean} [lazy]
 	 */
-	resolve(dependencyInfoMap) {
-		if (!this.wasResolved) {
+	resolve(dependencyInfoMap, lazy) {
+		if (!this.wasResolved || lazy) {
+			log.verbose(`resolving ${this.name}`);
 			this.libs.forEach((depInfoObject) => {
-				this.addResolvedLibDependency(depInfoObject.name, depInfoObject.lazy);
+				const dependencyInfoObjectAdded = this.addResolvedLibDependency(depInfoObject.name, depInfoObject.lazy);
 				const dependencyInfo = dependencyInfoMap.get(depInfoObject.name);
-				dependencyInfo.resolve(dependencyInfoMap);
+				dependencyInfo.resolve(dependencyInfoMap, dependencyInfoObjectAdded.lazy);
 
 				dependencyInfo.libsResolved.forEach((resolvedLib) => {
-					this.addResolvedLibDependency(resolvedLib.name, resolvedLib.lazy);
+					this.addResolvedLibDependency(resolvedLib.name, resolvedLib.lazy || dependencyInfoObjectAdded.lazy);
 				});
 			});
 			this.wasResolved = true;
+			if (log.isLevelEnabled("verbose")) {
+				log.verbose(`resolved ${this.name}: ${this.libsResolved.map((lib) => {
+					return `${this.name}: ${lib.name}${lib.lazy ? " (lazy)" : ""}`;
+				}).join(", ")}`);
+			}
 		}
 	}
 }
 
-// TODO add childResolved to resolved
-// TODO check cacles
-
-
-// TODO lib a (lazy) --> all its dependencies must be lazy
-// input
-// a -> b (lazy) -> c
-// output
-// a -> b (lazy), c (lazy)
-
-
-// a -> c, b (lazy)
-// b -> c (lazy)
-
-
-// a -> c, b (lazy)
-
-
-// a -> c (lazy), b (lazy)
-// b -> c
-
-// kette gewinnt lazy --> alle dependencies von einer lazy dep sind auch lazy
-// merge gewinnt eager
-
-
-// TODO put this into a classes to better structure the code
-// TODO instead of using a "global" map, have a Dependency as a class with a name
-// and the functionality to resolve its dependencies
-// ManifestHints -> resolve
-
 
 /**
  * Sorts the keys of a given object
@@ -239,13 +234,13 @@ const sortObjectKeys = (obj) => {
 /**
  *
  * @param {object} result
- * @param {DependencyInfo} libs
+ * @param {DependencyInfo} dependencyInfo
  */
-const addManifestHints = (result, libs) => {
-	if (libs.libs.length) {
+const addManifestHints = (result, dependencyInfo) => {
+	if (dependencyInfo && dependencyInfo.libs.length) {
 		// const sortedLibs = sortObjectKeys(libs.libs);
 		const libsObject = {};
-		libs.libs.forEach((sortedLib) => {
+		dependencyInfo.libsResolved.forEach((sortedLib) => {
 			libsObject[sortedLib.name] = {};
 			if (sortedLib.lazy) {
 				libsObject[sortedLib.name].lazy = true;
@@ -267,10 +262,14 @@ const convertToDependencyInfoObjects = (libs) => {
 };
 
 const processLibraryInfo = async (libraryInfo, dependencyInfoMap, embeddedInfoMap) => {
+	if (!libraryInfo.mainManifest) {
+		log.error(`library manifest not found for ${libraryInfo.name}`);
+		return;
+	}
 	const manifestInfo = await processManifest(libraryInfo.mainManifest);
 	// gather shallow library information
 	const dependencyInfoObjects = convertToDependencyInfoObjects(manifestInfo.libs);
-	dependencyInfoMap.set(libraryInfo.name, new DependencyInfo(dependencyInfoObjects));
+	dependencyInfoMap.set(libraryInfo.name, new DependencyInfo(dependencyInfoObjects, libraryInfo.name));
 	const embeds = manifestInfo.embeds; // sdk
 	// filter
 	const embeddedPaths = embeds.map((embed) => {
@@ -285,7 +284,7 @@ const processLibraryInfo = async (libraryInfo, dependencyInfoMap, embeddedInfoMa
 	const embeddedManifestPromises = relevantManifests.map(async (relevantManifest) => {
 		const result = await processManifest(relevantManifest);
 		const dependencyInfoObjects = convertToDependencyInfoObjects(result.libs);
-		dependencyInfoMap.set(result.id, new DependencyInfo(dependencyInfoObjects));
+		dependencyInfoMap.set(result.id, new DependencyInfo(dependencyInfoObjects, result.id));
 		embeddedInfoMap.set(result.id, {
 			library: libraryInfo.name
 		});
@@ -382,9 +381,11 @@ module.exports = async function({options}) {
 		buildTimestamp: buildTimestamp,
 		scmRevision: "", // TODO: insert current application scm revision here
 		// gav: "", // TODO: insert current application id + version here
-		libraries,
-		components: sortedComponents
+		libraries
 	};
+	if (Object.keys(sortedComponents).length) {
+		versionJson.components = sortedComponents;
+	}
 
 	return [resourceFactory.createResource({
 		path: "/resources/sap-ui-version.json",