@ui5/builder 3.0.0-beta.5 → 3.0.0-rc.0

package/CHANGELOG.md

@@ -2,7 +2,13 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.5...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.0.0-rc.0...HEAD).
+
+<a name="v3.0.0-rc.0"></a>
+## [v3.0.0-rc.0] - 2022-12-23
+
+<a name="v3.0.0-beta.6"></a>
+## [v3.0.0-beta.6] - 2022-12-13
 
 <a name="v3.0.0-beta.5"></a>
 ## [v3.0.0-beta.5] - 2022-12-12
@@ -825,6 +831,8 @@ to load the custom bundle file instead.
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
 
 
+[v3.0.0-rc.0]: https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.6...v3.0.0-rc.0
+[v3.0.0-beta.6]: https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.5...v3.0.0-beta.6
 [v3.0.0-beta.5]: https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.4...v3.0.0-beta.5
 [v3.0.0-beta.4]: https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.3...v3.0.0-beta.4
 [v3.0.0-beta.3]: https://github.com/SAP/ui5-builder/compare/v3.0.0-beta.2...v3.0.0-beta.3

package/jsdoc.json

@@ -28,7 +28,7 @@
 	"openGraph": {
 		"title": "UI5 Tooling - API Reference",
 		"type": "website",
-		"image": "https://sap.github.io/ui5-tooling/docs/images/UI5_logo_wide.png",
+		"image": "https://sap.github.io/ui5-tooling/v3/images/UI5_logo_wide.png",
 		"site_name": "UI5 Tooling - API Reference",
 		"url": "https://sap.github.io/ui5-tooling/"
 	},

package/lib/lbt/analyzer/ComponentAnalyzer.js

@@ -57,10 +57,11 @@ class ComponentAnalyzer {
 				const fileContent = await manifestResource.buffer();
 				this._analyzeManifest( JSON.parse(fileContent.toString()), info );
 			} else {
-				log.verbose("No manifest found for '%s', skipping analysis", resource.name);
+				log.verbose(`No manifest found for '${resource.name}', skipping analysis`);
 			}
 		} catch (err) {
-			log.error("an error occurred while analyzing component %s (ignored)", resource.name, err.stack);
+			log.error(`An error occurred while analyzing component ${resource.name} (ignored): ${err.message}`);
+			log.verbose(err.stack);
 		}
 
 		return info;
@@ -137,20 +138,20 @@ class ComponentAnalyzer {
 		if ( ui5.rootView ) {
 			const module = this._getRootViewModule(ui5.rootView);
 			if (module) {
-				log.verbose("adding root view dependency ", module);
+				log.verbose(`Adding root view dependency ${module}`);
 				info.addDependency( module );
 			}
 		}
 
 		each( ui5.dependencies && ui5.dependencies.libs, (options, lib) => {
 			const module = fromUI5LegacyName(lib, "/library.js");
-			log.verbose("adding library dependency ", module, options.lazy || false);
+			log.verbose(`Adding library dependency ${module} - lazy: ${options.lazy || false}`);
 			info.addDependency( module, options.lazy ); // lazy -> conditional dependency
 		});
 
 		each( ui5.dependencies && ui5.dependencies.components, (options, component) => {
 			const module = fromUI5LegacyName(component, "/Component.js");
-			log.verbose("adding component dependency ", module, options.lazy || false);
+			log.verbose(`Adding component dependency ${module} - lazy: ${options.lazy || false}`);
 			info.addDependency( module, options.lazy ); // lazy -> conditional dependency
 		});
 
@@ -202,7 +203,7 @@ class ComponentAnalyzer {
 				return;
 			}
 			const module = fromUI5LegacyName( modelType );
-			log.verbose("derived model implementation dependency ", module);
+			log.verbose(`Derived model implementation dependency ${module}`);
 			info.addDependency(module);
 		});
 
@@ -214,15 +215,15 @@ class ComponentAnalyzer {
 			if (routing.routes) {
 				const routerClassName = routingConfig.routerClass || "sap.ui.core.routing.Router";
 				const routerClassModule = fromUI5LegacyName(routerClassName);
-				log.verbose(`adding router dependency '${routerClassModule}'`);
+				log.verbose(`Adding router dependency '${routerClassModule}'`);
 				info.addDependency(routerClassModule);
 			} else if (routing.targets) {
 				const targetsModule = routingConfig.targetsClass || "sap/ui/core/routing/Targets.js";
-				log.verbose(`adding routing targets dependency '${targetsModule}'`);
+				log.verbose(`Adding routing targets dependency '${targetsModule}'`);
 				info.addDependency(targetsModule);
 
 				const viewsModule = "sap/ui/core/routing/Views.js";
-				log.verbose(`adding routing views dependency '${viewsModule}'`);
+				log.verbose(`Adding routing views dependency '${viewsModule}'`);
 				info.addDependency(viewsModule);
 			}
 
@@ -235,7 +236,7 @@ class ComponentAnalyzer {
 						const module = fromUI5LegacyName(
 							(config.viewPath ? config.viewPath + "." : "") +
 							config.viewName, ".view." + config.viewType.toLowerCase() );
-						log.verbose("converting routing target '%s' to view dependency '%s'", targetName, module);
+						log.verbose(`Converting routing target '${targetName}' to view dependency '${module}'`);
 						// TODO make this a conditional dependency, depending on the route pattern?
 						info.addDependency(module);
 					}

package/lib/lbt/analyzer/FioriElementsAnalyzer.js

@@ -100,10 +100,11 @@ class FioriElementsAnalyzer {
 				const fileContent = await manifestResource.buffer();
 				await this._analyzeManifest( JSON.parse(fileContent.toString()), info );
 			} else {
-				log.verbose("No manifest found for '%s', skipping analysis", resource.name);
+				log.verbose(`No manifest found for '${resource.name}', skipping analysis`);
 			}
 		} catch (err) {
-			log.error("an error occurred while analyzing template app %s (ignored)", resource.name, err);
+			log.error(`An error occurred while analyzing template app ${resource.name} (ignored): ${err.message}`);
+			log.verbose(err.stack);
 		}
 
 		return info;
@@ -131,7 +132,7 @@ class FioriElementsAnalyzer {
 					if ( actionCfg.template ) {
 						const module = fromUI5LegacyName( "sap.fe.templates." +
 										actionCfg.template + ".Component" );
-						log.verbose("template app: add dependency to template component %s", module);
+						log.verbose(`Template app: Add dependency to template component ${module}`);
 						info.addDependency(module);
 						promises.push( this._analyzeTemplateComponent(module, actionCfg, info) );
 					}
@@ -152,7 +153,7 @@ class FioriElementsAnalyzer {
 								pageConfig.component.settings.templateName) || defaultTemplateName;
 		if ( templateName ) {
 			const templateModuleName = fromUI5LegacyName( templateName, ".view.xml" );
-			log.verbose("template app: add dependency to template view %s", templateModuleName);
+			log.verbose(`Template app: Add dependency to template view ${templateModuleName}`);
 			appInfo.addDependency(templateModuleName);
 		}
 	}

package/lib/lbt/analyzer/JSModuleAnalyzer.js

@@ -178,7 +178,7 @@ export const EnrichedVisitorKeys = (function() {
 	// check for unknown keys in our configuration
 	for ( const type in TempKeys ) {
 		if ( VisitorKeys[type] === undefined ) {
-			throw new Error("configuration contains unknown node type '" + type + "'");
+			throw new Error(`Configuration contains unknown node type '${type}'`);
 		}
 	}
 
@@ -190,7 +190,7 @@ export const EnrichedVisitorKeys = (function() {
 			// check configured keys against visitor keys
 			condKeys.forEach( (key) => {
 				if ( !visitorKeys.includes(key) ) {
-					throw new Error(`configuration for type '${type}' contains unknown key '${key}'`);
+					throw new Error(`Configuration for type '${type}' contains unknown key '${key}'`);
 				}
 			});
 			TempKeys[type] = visitorKeys.map( (key) => ({
@@ -301,7 +301,7 @@ class JSModuleAnalyzer {
 					if ( comment.value.startsWith("@ui5-bundle-raw-include ") ) {
 						const subModule = comment.value.slice("@ui5-bundle-raw-include ".length);
 						info.addSubModule(subModule);
-						log.verbose(`bundle include directive ${subModule}`);
+						log.verbose(`Bundle include directive ${subModule}`);
 					} else if ( comment.value.startsWith("@ui5-bundle ") ) {
 						const bundleName = comment.value.slice("@ui5-bundle ".length);
 						if (comment.start === 0) {
@@ -310,9 +310,9 @@ class JSModuleAnalyzer {
 						} else {
 							setMainModuleInfo(bundleName, null);
 						}
-						log.verbose(`bundle name directive ${bundleName}`);
+						log.verbose(`Bundle name directive ${bundleName}`);
 					} else {
-						log.warn(`unrecognized bundle directive ${comment.value}`);
+						log.warn(`Unrecognized bundle directive ${comment.value}`);
 					}
 				}
 			});
@@ -363,7 +363,7 @@ class JSModuleAnalyzer {
 		// hoisted functions
 		function setMainModuleInfo(name, description) {
 			if ( mainModuleFound ) {
-				throw new Error("conflicting main modules found (unnamed + named)");
+				throw new Error("Conflicting main modules found (unnamed + named)");
 			}
 			mainModuleFound = true;
 			info.name = name;
@@ -524,7 +524,7 @@ class JSModuleAnalyzer {
 
 			default:
 				if ( condKeys == null ) {
-					log.error("Unhandled AST node type " + node.type, node);
+					log.error(`Unhandled AST node type ${node.type}`, node);
 					throw new Error(`Unhandled AST node type ${node.type}`);
 				}
 				// default visit
@@ -547,17 +547,18 @@ class JSModuleAnalyzer {
 						setMainModuleInfo(name, getDocumentation(node));
 					} else if ( nModuleDeclarations > 1 && name === info.name ) {
 						// ignore duplicate declarations (e.g. in behavior file of design time controls)
-						log.warn(`duplicate declaration of module name at ${getLocation(args)} in ${name}`);
+						log.warn(`Duplicate declaration of module name at ${getLocation(args)} in ${name}`);
 					} else {
 						// otherwise it is just a submodule declaration
 						info.addSubModule(name);
 					}
 					return;
 				} else {
-					log.error("jQuery.sap.declare: module name could not be determined from first argument:", args[0]);
+					log.error(
+						`jQuery.sap.declare: Module name could not be determined from first argument: ${args[0]}`);
 				}
 			} else {
-				log.error("jQuery.sap.declare: module name could not be determined, no arguments are given");
+				log.error("jQuery.sap.declare: Module name could not be determined, no arguments are given");
 			}
 		}
 
@@ -594,11 +595,11 @@ class JSModuleAnalyzer {
 				nUnnamedDefines++;
 				if ( nUnnamedDefines > 1 ) {
 					throw new Error(
-						"if multiple modules are contained in a file, only one of them may omit the module ID " +
+						"If multiple modules are contained in a file, only one of them may omit the module ID " +
 						name + " " + nUnnamedDefines);
 				}
 				if ( defaultName == null ) {
-					throw new Error("unnamed module found, but no default name given");
+					throw new Error("Unnamed module found, but no default name given");
 				}
 				name = defaultName;
 				// the first unnamed module definition qualifies as main module
@@ -617,7 +618,7 @@ class JSModuleAnalyzer {
 			const nArgs = args.length;
 
 			if ( nArgs > 0 && args[0].type == Syntax.OBJECT ) {
-				log.verbose("jQuery.sap.require: cannot evaluate complex require (view/controller)");
+				log.verbose("jQuery.sap.require: Cannot evaluate complex require (view/controller)");
 			} else {
 				// UI5 signature with one or many required modules
 				for (let i = 0; i < nArgs; i++) {
@@ -638,11 +639,11 @@ class JSModuleAnalyzer {
 							info.addDependency(requiredModuleName2, true);
 						}
 						if ( consequentValue === undefined || alternateValue === undefined ) {
-							log.verbose("jQuery.sap.require: cannot evaluate dynamic arguments: ", arg && arg.type);
+							log.verbose(`jQuery.sap.require: Cannot evaluate dynamic arguments: ${arg && arg.type}`);
 							info.dynamicDependencies = true;
 						}
 					} else {
-						log.verbose("jQuery.sap.require: cannot evaluate dynamic arguments: ", arg && arg.type);
+						log.verbose(`jQuery.sap.require: Cannot evaluate dynamic arguments: ${arg && arg.type}`);
 						info.dynamicDependencies = true;
 					}
 				}
@@ -661,7 +662,7 @@ class JSModuleAnalyzer {
 					const moduleName = fromRequireJSName( value );
 					info.addDependency(moduleName, conditional);
 				} else {
-					log.verbose("sap.ui.requireSync: cannot evaluate dynamic arguments: ", args[i] && args[i].type);
+					log.verbose(`sap.ui.requireSync: Cannot evaluate dynamic arguments: ${args[i] && args[i].type}`);
 					info.dynamicDependencies = true;
 				}
 			}
@@ -726,7 +727,7 @@ class JSModuleAnalyzer {
 					info.addSubModule(moduleName);
 				});
 			} else {
-				log.verbose("Cannot evaluate registerPreloadedModules: '%s'", modules && modules.type);
+				log.verbose(`Cannot evaluate registerPreloadedModules: ${modules && modules.type}`);
 			}
 		}
 
@@ -747,7 +748,7 @@ class JSModuleAnalyzer {
 					}
 					info.addDependency( requiredModule, conditional );
 				} else {
-					log.verbose("sap.ui.require/sap.ui.define: cannot evaluate dynamic argument: ", item && item.type);
+					log.verbose(`sap.ui.require/sap.ui.define: Cannot evaluate dynamic argument: ${item && item.type}`);
 					info.dynamicDependencies = true;
 				}
 			});

package/lib/lbt/analyzer/SmartTemplateAnalyzer.js

@@ -59,11 +59,11 @@ class TemplateComponentAnalyzer {
 				const fileContent = await manifestResource.buffer();
 				await this._analyzeManifest( JSON.parse(fileContent.toString()), info );
 			} else {
-				log.verbose("No manifest found for '%s', skipping analysis", resource.name);
+				log.verbose(`No manifest found for '${resource.name}', skipping analysis`);
 			}
 		} catch (err) {
-			log.error("an error occurred while analyzing template app %s (ignored):", resource.name);
-			log.error(err.stack);
+			log.error(`An error occurred while analyzing template app ${resource.name} (ignored): ${err.message}`);
+			log.verbose(err.stack);
 		}
 
 		return info;
@@ -85,7 +85,7 @@ class TemplateComponentAnalyzer {
 		function recursePage(page) {
 			if ( page.component && page.component.name ) {
 				const module = fromUI5LegacyName( page.component.name + ".Component" );
-				log.verbose("template app: add dependency to template component %s", module);
+				log.verbose(`Template app: Add dependency to template component ${module}`);
 				info.addDependency(module);
 				promises.push( that._analyzeTemplateComponent(module, page, info) );
 			}
@@ -114,12 +114,12 @@ class TemplateComponentAnalyzer {
 									pageConfig.component.settings.templateName) || defaultTemplateName;
 			if ( templateName ) {
 				const templateModuleName = fromUI5LegacyName( templateName, ".view.xml" );
-				log.verbose("template app: add dependency to template view %s", templateModuleName);
+				log.verbose(`Template app: Add dependency to template view ${templateModuleName}`);
 				appInfo.addDependency(templateModuleName);
 			}
 		} catch (err) {
 			if (this._pool.getIgnoreMissingModules() && err.message.startsWith("resource not found in pool")) {
-				log.verbose("Ignoring missing module as per ResourcePool configuration: " + err.message);
+				log.verbose(`Ignoring missing module as per ResourcePool configuration: ${err.message}`);
 			} else {
 				throw err;
 			}

package/lib/lbt/analyzer/XMLCompositeAnalyzer.js

@@ -43,7 +43,7 @@ class XMLCompositeAnalyzer {
 				}
 				if (fragmentName) {
 					const fragmentModule = fromUI5LegacyName(fragmentName, ".control.xml");
-					log.verbose("fragment control: add dependency to template fragment %s", fragmentModule);
+					log.verbose(`Fragment control: Add dependency to template fragment ${fragmentModule}`);
 					info.addDependency(fragmentModule);
 				}
 			}

package/lib/lbt/analyzer/XMLTemplateAnalyzer.js

@@ -206,7 +206,7 @@ class XMLTemplateAnalyzer {
 		const resourceBundleName = getAttribute(node, XMLVIEW_RESBUNDLENAME_ATTRIBUTE);
 		if ( resourceBundleName ) {
 			const resourceBundleModuleName = fromUI5LegacyName(resourceBundleName, ".properties");
-			log.verbose("found dependency to resource bundle %s", resourceBundleModuleName);
+			log.verbose(`Found dependency to resource bundle ${resourceBundleModuleName}`);
 			// TODO locale dependent dependencies: this._addDependency(resourceBundleModuleName);
 			this._addDependency( resourceBundleModuleName, this.conditional );
 		}
@@ -269,9 +269,8 @@ class XMLTemplateAnalyzer {
 			// e.g. "{= '{Handler: \'' + ${myActions > handlerModule} + '\'}'}"
 			if ((coreRequire.startsWith("{=") || coreRequire.startsWith("{:=")) && this.templateTag) {
 				log.verbose(
-					`Ignoring core:require: '%s' on Node %s:%s contains ` +
-					`an expression binding and is within a 'template' Node`,
-					coreRequire, node.$ns.uri, node.$ns.local
+					`Ignoring core:require: '${coreRequire}' on Node ${node.$ns.uri}:${node.$ns.local} contains ` +
+					`an expression binding and is within a 'template' Node`
 				);
 				return;
 			}
@@ -280,9 +279,10 @@ class XMLTemplateAnalyzer {
 				requireContext = JSTokenizer.parseJS(coreRequire);
 			} catch (e) {
 				log.error(
-					"Ignoring core:require: '%s' can't be parsed on Node %s:%s",
-					coreRequire, node.$ns.uri, node.$ns.local
+					`Ignoring core:require: '${coreRequire}' can't be parsed on Node ` +
+					`${node.$ns.uri}:${node.$ns.local}: ${e.message}`
 				);
+				log.verbose(e.stack);
 			}
 			if ( requireContext ) {
 				Object.keys(requireContext).forEach((key) => {

package/lib/lbt/bundle/AutoSplitter.js

@@ -82,8 +82,9 @@ class AutoSplitter {
 		await Promise.all(promises);
 
 		const partSize = Math.floor(totalSize / numberOfParts);
-		log.verbose("total size of modules %d (chars), target size for each of the %d parts: %d (chars)",
-			totalSize, numberOfParts, partSize);
+		log.verbose(
+			`Total size of modules ${totalSize} (chars), target size for each ` +
+			`of the ${numberOfParts} parts: ${partSize} (chars)`);
 
 		// ---- create a separate module definition for each part
 		const splittedModules = [];
@@ -184,7 +185,7 @@ class AutoSplitter {
 			}
 		});
 
-		log.verbose("splitted modules: %s", splittedModules);
+		log.verbose(`Splitted modules: ${splittedModules}`);
 		return splittedModules;
 	}
 

package/lib/lbt/bundle/Builder.js

@@ -98,10 +98,10 @@ class BundleBuilder {
 	async _createBundle(module, options) {
 		const resolvedModule = await this.resolver.resolve(module);
 		if ( options.skipIfEmpty && isEmptyBundle(resolvedModule) ) {
-			log.verbose("  skipping empty bundle " + module.name);
+			log.verbose("  Skipping empty bundle " + module.name);
 			return undefined;
 		}
-		log.verbose("  create '%s'", resolvedModule.name);
+		log.verbose(`  Create '${resolvedModule.name}'`);
 
 		this.options = options || {};
 		this.optimize = !!this.options.optimize;
@@ -131,8 +131,7 @@ class BundleBuilder {
 		let bundleInfos = [];
 		// create all sections in sequence
 		for ( const section of resolvedModule.sections ) {
-			log.verbose("    adding section%s of type %s",
-				section.name ? " '" + section.name + "'" : "", section.mode);
+			log.verbose(`    Adding section${section.name ? " '" + section.name + "'" : ""} of type ${section.mode}`);
 			if ( section.mode === SectionType.BundleInfo ) {
 				bundleInfos.push(section);
 			} else {
@@ -253,8 +252,7 @@ class BundleBuilder {
 				this.outW.writeln("//@ui5-bundle-raw-include " + moduleName);
 				await this.writeRawModule(moduleName, resource);
 				const compressedSize = this.outW.endSegment();
-				log.verbose("    %s (%d,%d)", moduleName,
-					resource.info != null ? resource.info.size : -1, compressedSize);
+				log.verbose(`    ${moduleName} (${resource.info != null ? resource.info.size : -1},${compressedSize})`);
 				if ( section.declareRawModules ) {
 					this.missingRawDeclarations.push(moduleName);
 				}
@@ -262,7 +260,7 @@ class BundleBuilder {
 					this.jqglobalAvailable = true;
 				}
 			} else {
-				log.error("    couldn't find %s", moduleName);
+				log.error(`    Could not find module ${moduleName}`);
 			}
 		}
 	}
@@ -308,11 +306,10 @@ class BundleBuilder {
 					outW.startSegment(module);
 					await this.writePreloadModule(module, resource.info, resource);
 					const compressedSize = outW.endSegment();
-					log.verbose("    %s (%d,%d)", module,
-						resource.info != null ? resource.info.size : -1, compressedSize);
+					log.verbose(`    ${module} (${resource.info != null ? resource.info.size : -1},${compressedSize})`);
 					i++;
 				} else {
-					log.error("    couldn't find %s", module);
+					log.error(`    Could not find module ${module}`);
 				}
 			}
 
@@ -387,8 +384,8 @@ class BundleBuilder {
 						outW.write(moduleContent);
 						outW.ensureNewLine();
 						const compressedSize = outW.endSegment();
-						log.verbose("    %s (%d,%d)", moduleName,
-							resource.info != null ? resource.info.size : -1, compressedSize);
+						log.verbose(
+							`    ${moduleName} (${resource.info != null ? resource.info.size : -1},${compressedSize})`);
 					} else {
 						// keep unprocessed modules
 						remaining.push(moduleName);
@@ -440,8 +437,8 @@ class BundleBuilder {
 			outW.ensureNewLine();
 			outW.write(`}`);
 		} else if ( /\.js$/.test(moduleName) /* implicitly: && info != null && info.requiresTopLevelScope */ ) {
-			log.warn("**** warning: module %s requires top level scope" +
-					" and can only be embedded as a string (requires 'eval')", moduleName);
+			log.warn(
+				`Module ${moduleName} requires top level scope and can only be embedded as a string (requires 'eval')`);
 			outW.write( makeStringLiteral( (await resource.buffer()).toString() ) );
 		} else if ( /\.html$/.test(moduleName) ) {
 			const fileContent = (await resource.buffer()).toString();
@@ -452,7 +449,7 @@ class BundleBuilder {
 				try {
 					fileContent = JSON.stringify( JSON.parse( fileContent) );
 				} catch (e) {
-					log.verbose("Failed to parse JSON file %s. Ignoring error, skipping compression.", moduleName);
+					log.verbose(`Failed to parse JSON file ${moduleName}. Ignoring error, skipping compression.`);
 					log.verbose(e);
 				}
 			}
@@ -475,7 +472,7 @@ class BundleBuilder {
 
 			outW.write( makeStringLiteral( fileContent ) );
 		} else {
-			log.error("don't know how to embed module " + moduleName); // TODO throw?
+			log.error("Don't know how to embed module " + moduleName); // TODO throw?
 		}
 
 		return true;
@@ -512,7 +509,7 @@ class BundleBuilder {
 					throw new Error(`A 'bundleInfo' section is missing the mandatory 'name' property.` );
 				}
 				if (!path.extname(section.name)) {
-					log.warn(`bundleInfo section name '${section.name}' is missing a file extension. ` +
+					log.warn(`BundleInfo section name '${section.name}' is missing a file extension. ` +
 						`The info might not work as expected. ` +
 						`The name must match the bundle filename (incl. extension such as '.js')`);
 				}
@@ -636,7 +633,8 @@ async function rewriteDefine({moduleName, moduleContent, moduleSourceMap}) {
 	try {
 		ast = parseJS(moduleContent, {range: true});
 	} catch (e) {
-		log.error("error while parsing %s: %s", moduleName, e.message);
+		log.error(`Error while parsing ${moduleName}: ${e.message}`);
+		log.verbose(e.stack);
 		return {};
 	}
 

package/lib/lbt/bundle/Resolver.js

@@ -272,7 +272,7 @@ class BundleResolver {
 
 		// NODE-TODO placeholderValues = vars;
 
-		log.verbose("  resolving bundle definition %s", bundle.name);
+		log.verbose(`  Resolving bundle definition ${bundle.name}`);
 
 		const resolved = new ResolvedBundleDefinition(bundle /* , vars*/);
 
@@ -280,8 +280,8 @@ class BundleResolver {
 
 		bundle.sections.forEach(function(section, index) {
 			previous = previous.then( function() {
-				log.verbose("    resolving section%s of type %s",
-					section.name ? " '" + section.name + "'" : "", section.mode);
+				log.verbose(
+					`    Resolving section${section.name ? " '" + section.name + "'" : ""} of type ${section.mode}`);
 
 				// NODE-TODO long t0=System.nanoTime();
 				const resolvedSection = resolved.sections[index];
@@ -291,12 +291,12 @@ class BundleResolver {
 						if ( section.mode == SectionType.Raw && section.sort !== false ) {
 							// sort the modules in topological order
 							return topologicalSort(pool, modules).then( (modules) => {
-								log.silly("      resolved modules (sorted): %s", modules);
+								log.silly(`      Resolved modules (sorted): ${modules}`);
 								return modules;
 							});
 						}
 
-						log.silly("      resolved modules: %s", modules);
+						log.silly(`      Resolved modules: ${modules}`);
 						return modules;
 					}).then( function(modules) {
 						resolvedSection.modules = modules;
@@ -315,7 +315,7 @@ class BundleResolver {
 		// NODE-TODO if ( PerfMeasurement.ACTIVE ) PerfMeasurement.stop(PerfKeys.RESOLVE_MODULE);
 
 		return previous.then( function() {
-			log.verbose("  resolving bundle done");
+			log.verbose("  Resolving bundle done");
 
 			return resolved;
 		});

package/lib/lbt/graph/dependencyGraph.js

@@ -43,7 +43,7 @@ async function createDependencyGraph(pool, roots, options) {
 			});
 			return Promise.all(p);
 		}, (err) => {
-			log.error("module %s not found in pool:", name, err);
+			log.error(`Module ${name} not found in pool: ${err.message}`);
 		}).then( () => node );
 	}
 

package/lib/lbt/graph/dominatorTree.js

@@ -28,7 +28,7 @@ function calculateDominatorTree({n0, nodes}) {
 		}
 	}
 
-	log.verbose("%d modules found, starting dominator tree calculation", nodes.size - 1);
+	log.verbose(`${nodes.size - 1} modules found, starting dominator tree calculation`);
 
 	function countEdges(nodes) {
 		let count = 0;
@@ -43,7 +43,9 @@ function calculateDominatorTree({n0, nodes}) {
 	do {
 		// while changes in any Dom(n)
 
-		log.verbose("%d remaining edges", countEdges(nodes));
+		if (log.isLevelEnabled("verbose")) {
+			log.verbose(`${countEdges(nodes)} remaining edges`);
+		}
 
 		modified = false;
 		for ( const n of nodes.values() ) {
@@ -81,7 +83,7 @@ function calculateDominatorTree({n0, nodes}) {
 		n.visited = false;
 	}
 
-	log.verbose("reduce dominator graph to immediate dominator tree");
+	log.verbose("Reduce dominator graph to immediate dominator tree");
 
 	// use DFS to reduce the dominator graph to the (immediate) dominator tree
 	//
@@ -108,7 +110,7 @@ function calculateDominatorTree({n0, nodes}) {
 	}
 	dfs(n0);
 
-	log.verbose("calculation of dominator tree done");
+	log.verbose("Calculation of dominator tree done");
 
 	return n0;
 }

package/lib/lbt/graph/topologicalSort.js

@@ -70,7 +70,7 @@ function createDependencyGraph(pool, moduleNames, indegreeOnly) {
 				});
 				return Promise.all(p);
 			}, (err) => {
-				log.error("module %s not found in pool", moduleName);
+				log.error(`Module ${moduleName} not found in pool`);
 			});
 	});
 
@@ -119,7 +119,7 @@ function topologicalSort(pool, moduleNames) {
 									dependent.outgoing.splice(index, 1);
 								// console.log("removing outgoing %s in %s", node.name, dependent.name);
 								} else {
-									log.error("**** could not find node %s in %s", node.name, dependent.name);
+									log.error(`**** Could not find node ${node.name} in ${dependent.name}`);
 								}
 							});
 						}
@@ -177,7 +177,7 @@ function topologicalSort(pool, moduleNames) {
 					Object.keys(graph)
 						.filter((name) => moduleNames.indexOf(name) < l)
 						.map((name) => graph[name].toString()));
-				throw new Error("failed to resolve cyclic dependencies: " + moduleNames.slice(0, l) );
+				throw new Error("Failed to resolve cyclic dependencies: " + moduleNames.slice(0, l).join(", ") );
 				// NODE-TODO use new CycleFinder(graph).toString() for easier to understand output
 			}
 

package/lib/lbt/resources/LibraryFileAnalyzer.js

@@ -64,7 +64,7 @@ export function getDependencyInfos( name, content ) {
 						moduleInfos["raw-module"] && moduleInfos["raw-module"].forEach( (rawModule) => {
 							const rawInfo = createRawInfo(rawModule);
 							if ( rawInfo ) {
-								log.verbose(name + " rawInfo:", JSON.stringify(rawInfo));
+								log.verbose(name + " rawInfo: " + JSON.stringify(rawInfo));
 								infos[rawInfo.name] = rawInfo;
 							}
 						});

package/lib/lbt/resources/ResourceCollector.js

@@ -80,7 +80,7 @@ class ResourceCollector {
 	async visitResource(resource) {
 		const virPath = resource.getPath();
 		if ( !virPath.startsWith("/resources/") ) {
-			log.warn(`non-runtime resource ${virPath} ignored`);
+			log.warn(`Non-runtime resource ${virPath} ignored`);
 			return;
 		}
 		const name = virPath.slice("/resources/".length);
@@ -102,7 +102,7 @@ class ResourceCollector {
 			// .theming files are not always present therefore this check is relevant for the library.source.less
 			if ( name.match("(?:[^/]+/)*themes/[^/]+/(?:\\.theming|library\\.source\\.less)") &&
 					!this._themePackages.has(prefix) ) {
-				// log.info("found new theme package %s", prefix);
+				// log.info("Found new theme package %s", prefix);
 				this._themePackages.set(prefix, new ResourceInfoList(prefix));
 			}
 		}
@@ -141,7 +141,7 @@ class ResourceCollector {
 					try {
 						subModuleInfo = await this._pool.getModuleInfo(subModule);
 					} catch (err) {
-						log.verbose(`	missing submodule ${subModule} included by ${moduleInfo.name}`);
+						log.verbose(`	Missing submodule ${subModule} included by ${moduleInfo.name}`);
 					}
 					if (subModuleInfo) {
 						// Inherit subModule dependencies
@@ -207,14 +207,14 @@ class ResourceCollector {
 		for (const [name, info] of this._resources.entries()) {
 			if ( debugFilter.matches(name) ) {
 				info.isDebug = true;
-				log.verbose(`  found potential debug resource '${name}'`);
+				log.verbose(`  Found potential debug resource '${name}'`);
 			}
 
 			// log.verbose(`  checking ${name}`);
 			let m;
 			if ( m = LOCALE.exec(name) ) {
 				const baseName = m[1] + m[3];
-				log.verbose(`  found potential i18n resource '${name}', base name is '${baseName}', locale is ${m[2]}`);
+				log.verbose(`  Found potential i18n resource '${name}', base name is '${baseName}', locale is ${m[2]}`);
 				info.i18nName = baseName; // e.g. "i18n.properties"
 				info.i18nLocale = m[2]; // e.g. "de"
 				baseNames.add(baseName);
@@ -225,7 +225,7 @@ class ResourceCollector {
 				if ( this._themePackages.has(m[0]) ) {
 					const theme = m[2];
 					info.theme = theme;
-					log.verbose(`  found potential theme resource '${name}', theme ${theme}`);
+					log.verbose(`  Found potential theme resource '${name}', theme ${theme}`);
 				}
 			}
 
@@ -255,17 +255,17 @@ class ResourceCollector {
 
 			if ( mergeFilter.matches(name) ) {
 				info.merged = true;
-				log.verbose(`  found potential merged resource '${name}'`);
+				log.verbose(`  Found potential merged resource '${name}'`);
 			}
 
 			if ( designtimeFilter.matches(name) ) {
 				info.designtime = true;
-				log.verbose(`  found potential designtime resource '${name}'`);
+				log.verbose(`  Found potential designtime resource '${name}'`);
 			}
 
 			if ( supportFilter.matches(name) ) {
 				info.support = true;
-				log.verbose(`  found potential support resource '${name}'`);
+				log.verbose(`  Found potential support resource '${name}'`);
 			}
 		}
 
@@ -320,7 +320,7 @@ class ResourceCollector {
 
 	createOrphanFilters() {
 		log.verbose(
-			`  configured external resources filters (resources outside the namespace): ` +
+			`  Configured external resources filters (resources outside the namespace): ` +
 			`${this._externalResources == null ? "(none)" : this._externalResources}`);
 
 		const filtersByComponent = new Map();
@@ -333,7 +333,7 @@ class ResourceCollector {
 				} else if ( !component.endsWith("/") ) {
 					component += "/";
 				}
-				log.verbose(`	resulting filter list for '${component}': '${packageFilters}'`);
+				log.verbose(`	Resulting filter list for '${component}': '${packageFilters}'`);
 				filtersByComponent.set(component, packageFilters);
 			}
 		}

package/lib/lbt/resources/ResourceFilterList.js

@@ -100,7 +100,7 @@ export default class ResourceFilterList {
 		this.matchers = [];
 		this.matchByDefault = true;
 		this.fileTypes = makeFileTypePattern(fileTypes);
-		log.verbose(`filetypes: ${fileTypes}`);
+		log.verbose(`Filetypes: ${fileTypes}`);
 		this.addFilters(filters);
 	}
 

package/lib/lbt/resources/ResourcePool.js

@@ -63,14 +63,16 @@ async function determineDependencyInfo(resource, rawInfo, pool) {
 		try {
 			ast = parseJS(code, {comment: true});
 		} catch (err) {
-			log.error("failed to parse %s: %s", resource.name, err.message);
+			log.error(`Failed to parse ${resource.name}: ${err.message}`);
+			log.verbose(err.stack);
 		}
 		if (ast) {
 			try {
 				jsAnalyzer.analyze(ast, resource.name, info);
 				new XMLCompositeAnalyzer(pool).analyze(ast, resource.name, info);
 			} catch (error) {
-				log.error("failed to analyze %s: %s", resource.name, error.stack);
+				log.error(`Failed to analyze ${resource.name}: ${error.message}`);
+				log.verbose(error.stack);
 			}
 		}
 		if ( rawInfo ) {
@@ -149,7 +151,7 @@ class ResourcePool {
 	 */
 	addResource( resource ) {
 		if ( this._resourcesByName.has(resource.name) ) {
-			log.warn("duplicate resource " + resource.name);
+			log.warn("Duplicate resource " + resource.name);
 			// TODO return and let the first one always win?
 		}
 

package/lib/processors/jsdoc/lib/ui5/template/publish.cjs

@@ -1855,7 +1855,7 @@ class TypeStringBuilder {
 }
 
 function TypeParser(defaultBuilder = new ASTBuilder()) {
-	const rLexer = /\s*(Array\.?<|Object\.?<|Set\.?<|Promise\.?<|function\(|\{|:|\(|\||\}|\.?<|>|\)|,|\[\]|\*|\?|!|=|\.\.\.)|\s*(false|true|(?:\+|-)?(?:\d+(?:\.\d+)?|NaN|Infinity)|'[^']*'|"[^"]*"|null|undefined)|\s*((?:module:)?\w+(?:[/.#~]\w+)*)|./g;
+	const rLexer = /\s*(Array\.?<|Object\.?<|Set\.?<|Promise\.?<|function\(|\{|:|\(|\||\}|\.?<|>|\)|,|\[\]|\*|\?|!|=|\.\.\.)|\s*(false|true|(?:\+|-)?(?:\d+(?:\.\d+)?|NaN|Infinity)|'[^']*'|"[^"]*"|null|undefined)|\s*((?:module:)?\w+(?:[/.#~][$\w_]+)*)|./g;
 
 	let input;
 	let builder;
@@ -2392,6 +2392,24 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 
 	}
 
+	function writeModuleInfo(member, symbol) {
+		// write out resource, module and export only when the module is different from the module of the parent entity
+		// and when the member was not cloned (e.g. because it is borrowed)
+		var isBorrowed = member.__ui5.initialLongname !== member.longname;
+
+		if ( member.__ui5.resource
+			&& member.__ui5.resource !== symbol.__ui5.resource
+			&& !isBorrowed ) {
+			attrib("resource", member.__ui5.resource);
+		}
+		if ( member.__ui5.module
+			 && member.__ui5.module !== symbol.__ui5.module
+			 && !isBorrowed ) {
+			attrib("module", member.__ui5.module);
+			attrib("export", member.__ui5.globalOnly ? GLOBAL_ONLY : member.__ui5.export, '', true);
+		}
+	}
+
 	function examples(symbol) {
 		if ( symbol.examples && symbol.examples.length ) {
 			collection("examples");
@@ -2877,14 +2895,7 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 		}
 		tag("method");
 		attrib("name", name || member.name);
-		// write out module and export only when the module is different from the module of the parent entity
-		// and when the member was not cloned (e.g. because it is borrowed)
-		if ( member.__ui5.module
-			 && member.__ui5.module !== symbol.__ui5.module
-			 && member.__ui5.initialLongname === member.longname ) {
-			attrib("module", member.__ui5.module);
-			attrib("export", member.__ui5.globalOnly ? GLOBAL_ONLY : member.__ui5.export, '', true);
-		}
+		writeModuleInfo(member, symbol);
 		attrib("visibility", visibility(member), 'public');
 		if ( stakeholders(member) ) {
 			stakeholderList("allowedFor", stakeholders(member));
@@ -2911,9 +2922,6 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 			attrib("tsSkip", true, false, /* raw = */true);
 		}
 		//secTags(member);
-		if ( member.__ui5.resource && member.__ui5.resource !== symbol.__ui5.resource ) {
-			attrib("resource", member.__ui5.resource);
-		}
 		closeTag("method");
 
 	}
@@ -3067,6 +3075,12 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 		if ( symbol.params || symbol.returns || symbol.exceptions ) {
 			methodSignature(symbol);
 		} else if ( symbol.properties && symbol.properties.length > 0 ) {
+			if ( symbol.type ) { // "type" of a typedef defines its inheritance base
+				const type = listTypes(symbol.type);
+				if ( type.toLowerCase() !== "object" ) {
+					attrib("extends", type);
+				}
+			}
 			collection("properties");
 			symbol.properties.forEach((prop) => {
 				if ( prop.name.indexOf('.') >= 0 ) {
@@ -3108,10 +3122,7 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				const member = ownProperties[i];
 				tag("property");
 				attrib("name", member.name);
-				if ( member.__ui5.module && member.__ui5.module !== symbol.__ui5.module ) {
-					attrib("module", member.__ui5.module);
-					attrib("export", member.__ui5.globalOnly ? GLOBAL_ONLY : member.__ui5.export, '', true);
-				}
+				writeModuleInfo(member, symbol);
 				if ( kind === 'enum' && !standardEnum && member.__ui5.value !== undefined ) {
 					attrib("value", member.__ui5.value, undefined, /* raw = */true);
 				}
@@ -3132,9 +3143,6 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				if ( member.__ui5.tsSkip ) {
 					attrib("tsSkip", true, false, /* raw = */true);
 				}
-				if ( member.__ui5.resource && member.__ui5.resource !== symbol.__ui5.resource ) {
-					attrib("resource", member.__ui5.resource);
-				}
 				closeTag("property");
 			}
 			endCollection("properties");
@@ -3147,10 +3155,7 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				const member = ownEvents[i];
 				tag("event");
 				attrib("name", member.name);
-				if ( member.__ui5.module && member.__ui5.module !== symbol.__ui5.module ) {
-					attrib("module", member.__ui5.module);
-					attrib("export", member.__ui5.globalOnly ? GLOBAL_ONLY : member.__ui5.export, '', true);
-				}
+				writeModuleInfo(member, symbol);
 				attrib("visibility", visibility(member), 'public');
 				if ( stakeholders(member) ) {
 					stakeholderList("allowedFor", stakeholders(member));
@@ -3188,9 +3193,6 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				examples(member);
 				referencesList(member);
 				//secTags(member);
-				if ( member.__ui5.resource && member.__ui5.resource !== symbol.__ui5.resource ) {
-					attrib("resource", member.__ui5.resource);
-				}
 				closeTag("event");
 			}
 			endCollection("events");
@@ -3341,6 +3343,11 @@ function postProcessAPIJSON(api) {
 					debug(`could not identify export name of ${symbol.symbol.kind} '${symbol.name}', contained in module '${moduleName}'`);
 				}
 			}
+			if ( symbol.symbol.kind === "namespace" && symbol.symbol.export === undefined ) {
+				// if no export could be identified for a namespace, don't annotate the namespace with a module
+				symbol.symbol.resource =
+				symbol.symbol.module = undefined;
+			}
 		});
 
 	}

package/lib/processors/manifestCreator.js

@@ -193,7 +193,7 @@ async function createManifest(
 
 			const manifestResource = libBundle.findResource(manifestPath.substring(libraryPathPrefix.length));
 			if ( manifestResource == null ) {
-				log.verbose("  component has no accompanying manifest.json, don't list it as 'embedded'");
+				log.verbose("  Component has no accompanying manifest.json, don't list it as 'embedded'");
 				return false;
 			}
 			return true;
@@ -204,19 +204,19 @@ async function createManifest(
 			const components = libBundle.getResources(/^\/(?:[^/]+\/)*Component\.js$/);
 			for (const comp of components) {
 				const componentPath = posixPath.dirname(comp.getPath());
-				log.verbose("checking component at %s", componentPath);
+				log.verbose(`Checking component at ${componentPath}`);
 				if ( componentPath.startsWith(libraryPathPrefix) && hasManifest(componentPath) ) {
 					result.push( componentPath.substring(libraryPathPrefix.length) );
 				} else if ( libraryPathPrefix === "/resources/sap/apf/" ) {
-					log.verbose("Package %s contains both '*.library' and 'Component.js'. " +
-						"This is a known issue but can't be solved due to backward compatibility.", componentPath);
+					log.verbose(`Package ${componentPath} contains both '*.library' and 'Component.js'. ` +
+						`This is a known issue but can't be solved due to backward compatibility.`);
 				} else if (
 					libraryPathPrefix === (componentPath + "/") &&
 					libraryPathPrefix !== "/resources/sap/ui/core/"
 				) {
-					log.error("Package %s contains both '*.library' and 'Component.js'. " +
-						"This is not supported by manifests, therefore the component won't be " +
-						"listed in the library's manifest.", componentPath);
+					log.error(`Package ${componentPath} contains both '*.library' and 'Component.js'. ` +
+						`This is not supported by manifests, therefore the component won't be ` +
+						`listed in the library's manifest.`);
 				}
 			}
 			return result.sort();
@@ -308,7 +308,7 @@ async function createManifest(
 		let i18n;
 		if (typeof i18nText === "string") {
 			i18n = createI18nSection(i18nText, i18nToSupportedLocales);
-			log.verbose(`sap.app/i18n taken from .library appData: '%s'`, i18nText);
+			log.verbose(`sap.app/i18n taken from .library appData: '${i18nText}'`);
 		}
 		const sapApp = {
 			_version: sectionVersion(APP_DESCRIPTOR_V3_SECTION_SAP_APP),
@@ -328,10 +328,10 @@ async function createManifest(
 			openSourceComponents: openSourceComponents()
 		};
 
-		log.verbose("  sap.app/id taken from .library: '%s'", sapApp.id);
-		log.verbose("  sap.app/embeds determined from resources: '%s'", sapApp.embeds);
-		log.verbose("  sap.app/i18n taken from .library appData: '%s'", sapApp.i18n);
-		log.verbose("  sap.app/ach taken from .library appData/ownership: '%s'", sapApp.ach);
+		log.verbose(`  sap.app/id taken from .library: '${sapApp.id}'`);
+		log.verbose(`  sap.app/embeds determined from resources:`, sapApp.embeds);
+		log.verbose(`  sap.app/i18n taken from .library appData:`, sapApp.i18n);
+		log.verbose(`  sap.app/ach taken from .library appData/ownership: '${sapApp.ach}'`);
 
 		return sapApp;
 	}
@@ -382,7 +382,7 @@ async function createManifest(
 			supportedThemes: collectThemes()
 		};
 
-		log.verbose("  sap.ui/supportedThemes determined from resources: '%s'", sapUi.supportedThemes);
+		log.verbose(`  sap.ui/supportedThemes determined from resources: '${sapUi.supportedThemes.join(", ")}'`);
 
 		return sapUi;
 	}
@@ -406,7 +406,7 @@ async function createManifest(
 					};
 				}
 			}
-			log.verbose("  sap.ui5/dependencies/libs determined from .library dependencies: '%s'", dependencies.libs);
+			log.verbose(`  sap.ui5/dependencies/libs determined from .library dependencies:`, dependencies.libs);
 			return dependencies;
 		}
 
@@ -417,18 +417,17 @@ async function createManifest(
 					cozy: getBooleanAttribute(contentDensitiesElement, "cozy"),
 					compact: getBooleanAttribute(contentDensitiesElement, "compact")
 				};
-				log.verbose("  sap.ui5/contentDensities property taken from .library appData: '%s'", contentDensities);
+				log.verbose(`  sap.ui5/contentDensities property taken from .library appData:`, contentDensities);
 				return contentDensities;
 			}
 		}
 
 		function createLibraryMetadata() {
 			if ( descriptorVersion.compare(APP_DESCRIPTOR_V10) < 0 ) {
-				log.verbose("  target descriptor version %s: skipping sap.ui5/library information",
-					descriptorVersion);
+				log.verbose(`  Target descriptor version ${descriptorVersion}: skipping sap.ui5/library information`);
 			}
 
-			log.verbose("  target descriptor version %s: include sap.ui5/library information", descriptorVersion);
+			log.verbose(`  Target descriptor version ${descriptorVersion}: include sap.ui5/library information`);
 
 			const sapUi5AppData = findChild(manifestAppData, "sap.ui5");
 			const libraryAppData = findChild(sapUi5AppData, "library");
@@ -465,11 +464,11 @@ async function createManifest(
 				if ( cssElement != null ) {
 					const css = cssElement._;
 					if ( css === "false" ) {
-						log.verbose("  sap.ui5/library/css property taken from .library appData: '%s'", false);
+						log.verbose(`  sap.ui5/library/css property taken from .library appData: 'false'`);
 						return false;
 					}
 				} else if ( libraryJSInfo.noLibraryCSS ) {
-					log.verbose("  sap.ui5/library/css property extracted from library.js: '%s'", false);
+					log.verbose(`  sap.ui5/library/css property extracted from library.js: 'false'`);
 					return false;
 				}
 			}
@@ -624,7 +623,7 @@ async function createManifest(
 export default function({libraryResource, resources, getProjectVersion, options}) {
 	// merge options with defaults
 	options = Object.assign({
-		descriptorVersion: APP_DESCRIPTOR_V22, // TODO 3.0: change this to type string instead of a semver object
+		descriptorVersion: APP_DESCRIPTOR_V22.toString(),
 		include3rdParty: true,
 		prettyPrint: true,
 		omitMinVersions: false
@@ -636,11 +635,11 @@ export default function({libraryResource, resources, getProjectVersion, options}
 	// check whether a manifest exists already
 	const manifestResource = libBundle.findResource("manifest.json");
 	if ( manifestResource != null ) {
-		log.verbose("Library manifest already exists at '%s', skipping generation", manifestResource.getPath());
+		log.verbose(`Library manifest already exists at '${manifestResource.getPath()}', skipping generation`);
 		return Promise.resolve(null); // a fulfillment of null indicates that no manifest has been created
 	}
 
-	return createManifest(libraryResource, libBundle, options.descriptorVersion, options.include3rdParty,
+	return createManifest(libraryResource, libBundle, new Version(options.descriptorVersion), options.include3rdParty,
 		options.omitMinVersions, getProjectVersion)
 		.then((manifest) => {
 			return new Resource({

package/lib/processors/resourceListCreator.js

@@ -138,7 +138,7 @@ export default async function({resources, dependencyResources = [], options}) {
 	const visitPromises = resources.map((resource) => collector.visitResource(resource));
 
 	await Promise.all(visitPromises);
-	log.verbose(`	found ${collector.resources.size} resources`);
+	log.verbose(`	Found ${collector.resources.size} resources`);
 
 	// determine additional information for the found resources
 	if ( options && options.externalResources ) {
@@ -159,7 +159,7 @@ export default async function({resources, dependencyResources = [], options}) {
 
 	// write out resources.json files
 	for (const [prefix, list] of collector.components.entries()) {
-		log.verbose(`	writing '${prefix}resources.json'`);
+		log.verbose(`	Writing '${prefix}resources.json'`);
 
 		const contentString = makeResourcesJSON(list, prefix);
 
@@ -169,7 +169,7 @@ export default async function({resources, dependencyResources = [], options}) {
 		}));
 	}
 	for (const [prefix, list] of collector.themePackages.entries()) {
-		log.verbose(`	writing '${prefix}resources.json'`);
+		log.verbose(`	Writing '${prefix}resources.json'`);
 
 		const contentString = makeResourcesJSON(list, prefix);
 

package/lib/processors/themeBuilder.js

@@ -45,7 +45,7 @@ export class ThemeBuilder {
 		const files = [];
 
 		const compile = (resource) => {
-			log.verbose("Compiling %s", resource.getPath());
+			log.verbose(`Compiling ${resource.getPath()}`);
 
 			let libraryName;
 			const libraryMatch = libraryMatchPattern.exec(resource.getPath());

package/lib/processors/versionInfoGenerator.js

@@ -101,20 +101,19 @@ const processManifest = async (manifestResource) => {
  */
 const isBundledWithLibrary = (embeddedBy, componentPath, libraryPathPrefix) => {
 	if (typeof embeddedBy === "undefined") {
-		log.verbose("  component doesn't declare 'sap.app/embeddedBy', don't list it as 'embedded'");
+		log.verbose("  Component doesn't declare 'sap.app/embeddedBy', don't list it as 'embedded'");
 		return false;
 	}
 	if (typeof embeddedBy !== "string") {
 		log.error(
-			"  component '%s': property 'sap.app/embeddedBy' is of type '%s' (expected 'string'), " +
-			"it won't be listed as 'embedded'", componentPath, typeof embeddedBy
-		);
+			`  Component '${componentPath}': property 'sap.app/embeddedBy' is of type '${typeof embeddedBy}' ` +
+			`(expected 'string'), it won't be listed as 'embedded'`);
 		return false;
 	}
 	if ( !embeddedBy.length ) {
 		log.error(
-			"  component '%s': property 'sap.app/embeddedBy' has an empty string value (which is invalid), " +
-			"it won't be listed as 'embedded'", componentPath
+			`  Component '${componentPath}': property 'sap.app/embeddedBy' has an empty string value ` +
+			`(which is invalid), it won't be listed as 'embedded'`
 		);
 		return false;
 	}
@@ -123,12 +122,11 @@ const isBundledWithLibrary = (embeddedBy, componentPath, libraryPathPrefix) => {
 		resolvedEmbeddedBy = resolvedEmbeddedBy + "/";
 	}
 	if ( libraryPathPrefix === resolvedEmbeddedBy ) {
-		log.verbose("  component's 'sap.app/embeddedBy' property points to library, list it as 'embedded'");
+		log.verbose("  Component's 'sap.app/embeddedBy' property points to library, list it as 'embedded'");
 		return true;
 	} else {
 		log.verbose(
-			"  component's 'sap.app/embeddedBy' points to '%s', don't list it as 'embedded'", resolvedEmbeddedBy
-		);
+			`  Component's 'sap.app/embeddedBy' points to '${resolvedEmbeddedBy}', don't list it as 'embedded'`);
 		return false;
 	}
 };

package/lib/tasks/taskRepository.js

@@ -1,3 +1,18 @@
+import {createRequire} from "node:module";
+
+/**
+ * Repository providing access to all UI5 Builder tasks and various metadata required by the build process.
+ * This module is designed to be imported by @ui5/project or to be passed as a private parameter
+ * to the <code>build</code> function of a [@ui5/project/graph/ProjectGraph]{@link @ui5/project/graph/ProjectGraph}.
+ *
+ * For other use cases, it is recommended to import the required tasks directly.
+ *
+ * Therefore, all API of this module is private.
+ *
+ * @private
+ * @module @ui5/builder/tasks/taskRepository
+ */
+
 const taskInfos = {
 	replaceCopyright: {path: "./replaceCopyright.js"},
 	replaceVersion: {path: "./replaceVersion.js"},
@@ -21,11 +36,29 @@ const taskInfos = {
 	generateCachebusterInfo: {path: "./generateCachebusterInfo.js"}
 };
 
+
+/**
+ * TaskInfo object returned by the getTask function
+ *
+ * @private
+ * @typedef {object} @ui5/builder/tasks/taskRepository~TaskInfo
+ * @property {Function} task Task function
+ */
+
+/**
+ * Returns the module for a given task name
+ *
+ * @private
+ * @static
+ * @param {string} taskName Name of the task to retrieve
+ * @throws {Error} In case the specified task does not exist
+ * @returns {Promise<@ui5/builder/tasks/taskRepository~TaskInfo>} Object containing the task module
+ */
 export async function getTask(taskName) {
 	const taskInfo = taskInfos[taskName];
 
 	if (!taskInfo) {
-		if (["createDebugFiles", "uglify", "generateManifestBundle"].includes(taskName)) {
+		if (getRemovedTaskNames().includes(taskName)) {
 			throw new Error(
 				`Standard task ${taskName} has been removed in UI5 Tooling 3.0. ` +
 				`Please see the migration guide at https://sap.github.io/ui5-tooling/updates/migrate-v3/`);
@@ -42,6 +75,54 @@ export async function getTask(taskName) {
 	}
 }
 
+/**
+ * Returns a list of the names of all available tasks
+ *
+ * @private
+ * @static
+ * @returns {string[]} Array containing the names of all available tasks
+ */
 export function getAllTaskNames() {
 	return Object.keys(taskInfos);
 }
+
+/**
+ * Returns a list of the names of all tasks that have been removed
+ * in this or previous versions of ui5-builder.
+ *
+ * @private
+ * @static
+ * @returns {string[]} Array containing the names of all removed tasks
+ */
+export function getRemovedTaskNames() {
+	return ["createDebugFiles", "uglify", "generateManifestBundle"];
+}
+
+// Using CommonsJS require as importing json files causes an ExperimentalWarning
+const require = createRequire(import.meta.url);
+function getVersion(pkg) {
+	return require(`${pkg}/package.json`).version;
+}
+
+/**
+ * Object containing the versions of the ui5-builder module and relevant dependencies
+ *
+ * @private
+ * @typedef {object} @ui5/builder/tasks/taskRepository~Versions
+ * @property {string} builderVersion Version of the ui5-builder module
+ * @property {string} fsVersion Version of the ui5-fs module in use
+ */
+
+/**
+ * Provides version information on all relevant modules, used by ui5-builder
+ *
+ * @private
+ * @static
+ * @returns {@ui5/builder/tasks/taskRepository~Versions} Object containing version information
+ */
+export async function getVersions() {
+	return {
+		builderVersion: getVersion("@ui5/builder"),
+		fsVersion: getVersion("@ui5/fs"),
+	};
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "3.0.0-beta.5",
+	"version": "3.0.0-rc.0",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -119,8 +119,8 @@
 	},
 	"dependencies": {
 		"@jridgewell/sourcemap-codec": "^1.4.14",
-		"@ui5/fs": "^3.0.0-beta.4",
-		"@ui5/logger": "^3.0.1-beta.1",
+		"@ui5/fs": "^3.0.0-rc.0",
+		"@ui5/logger": "^3.0.1-rc.0",
 		"cheerio": "1.0.0-rc.12",
 		"escape-unicode": "^0.2.0",
 		"escope": "^4.0.0",
@@ -137,7 +137,7 @@
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
-		"@ui5/project": "^3.0.0-beta.4",
+		"@ui5/project": "^3.0.0-beta.5",
 		"ava": "^5.1.0",
 		"chai": "^4.3.7",
 		"chai-fs": "^2.0.0",
@@ -145,7 +145,7 @@
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.3",
 		"docdash": "^2.0.0",
-		"eslint": "^8.29.0",
+		"eslint": "^8.30.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^13.2.0",
 		"eslint-plugin-jsdoc": "^39.6.4",
@@ -153,7 +153,7 @@
 		"nyc": "^15.1.0",
 		"open-cli": "^7.1.0",
 		"recursive-readdir": "^2.2.3",
-		"sinon": "^15.0.0",
+		"sinon": "^15.0.1",
 		"tap-nyan": "^1.1.0",
 		"tap-xunit": "^2.4.1"
 	}