@ui5/builder 4.0.10 → 4.0.11

package/CHANGELOG.md

@@ -2,10 +2,16 @@
 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/v4.0.10...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v4.0.11...HEAD).
+
+<a name="v4.0.11"></a>
+## [v4.0.11] - 2025-09-11
+### Bug Fixes
+- Rename project to UI5 CLI [`2d0cb3a`](https://github.com/SAP/ui5-builder/commit/2d0cb3a222508facec0a4103d048f92c2fd0b41f)
+
 
 <a name="v4.0.10"></a>
-## [v4.0.10] - 2025-09-01
+## [v4.0.10] - 2025-09-03
 ### Bug Fixes
 - Downgrade cheerio to v1.0.0 to resolve Node compatibility issues [`4dc3a6e`](https://github.com/SAP/ui5-builder/commit/4dc3a6ef3029fca50d6b3ab45ed9667c206c6435)
 - **Bundler:** Include 'bundleInfo' section in multipart bundles [`e7ab31e`](https://github.com/SAP/ui5-builder/commit/e7ab31e859c5659612f0cc726e0410064f0b3174)
@@ -980,6 +986,7 @@ to load the custom bundle file instead.
 
 ### Features
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
+[v4.0.11]: https://github.com/SAP/ui5-builder/compare/v4.0.10...v4.0.11
 [v4.0.10]: https://github.com/SAP/ui5-builder/compare/v4.0.9...v4.0.10
 [v4.0.9]: https://github.com/SAP/ui5-builder/compare/v4.0.8...v4.0.9
 [v4.0.8]: https://github.com/SAP/ui5-builder/compare/v4.0.7...v4.0.8

package/CONTRIBUTING.md

@@ -1,3 +1,3 @@
-# Contributing to the UI5 Tooling
+# Contributing to the UI5 CLI
 
-See CONTRIBUTING.md in the [SAP/ui5-tooling](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md) repository.
+See CONTRIBUTING.md in the [UI5/cli](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md) repository.

package/README.md

@@ -1,8 +1,8 @@
-![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-tooling/main/docs/images/UI5_logo_wide.png)
+![UI5 icon](https://raw.githubusercontent.com/UI5/cli/main/docs/images/UI5_logo_wide.png)
 
 # ui5-builder
 > Modules for building UI5 projects  
-> Part of the [UI5 Tooling](https://github.com/SAP/ui5-tooling)
+> Part of the [UI5 CLI](https://github.com/UI5/cli)
 
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP/ui5-builder)](https://api.reuse.software/info/github.com/SAP/ui5-builder)
 [![Build Status](https://dev.azure.com/sap/opensource/_apis/build/status/SAP.ui5-builder?branchName=main)](https://dev.azure.com/sap/opensource/_build/latest?definitionId=26&branchName=main)
@@ -10,17 +10,17 @@
 [![Coverage Status](https://coveralls.io/repos/github/SAP/ui5-builder/badge.svg)](https://coveralls.io/github/SAP/ui5-builder)
 
 ## Documentation
-UI5 Builder documentation can be found here: [sap.github.io/ui5-tooling](https://sap.github.io/ui5-tooling/v4/pages/Builder/)
+UI5 Builder documentation can be found here: [ui5.github.io/cli](https://ui5.github.io/cli/v4/pages/Builder/)
 
-The UI5 Builder API Reference can be found here: [`@ui5/builder`](https://sap.github.io/ui5-tooling/v4/api/)
+The UI5 Builder API Reference can be found here: [`@ui5/builder`](https://ui5.github.io/cli/v4/api/)
 
 ## Contributing
-Please check our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md).
+Please check our [Contribution Guidelines](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md).
 
 ## Support
-Please follow our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md#report-an-issue) on how to report an issue.
+Please follow our [Contribution Guidelines](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md#report-an-issue) on how to report an issue.
 
-Please report issues in the main [UI5 Tooling](https://github.com/SAP/ui5-tooling) repository.
+Please report issues in the main [UI5 CLI](https://github.com/UI5/cli) repository.
 
 ## Release History
 See [CHANGELOG.md](CHANGELOG.md).

package/jsdoc.json

@@ -31,11 +31,11 @@
 		}
 	},
 	"openGraph": {
-		"title": "UI5 Tooling - API Reference",
+		"title": "UI5 CLI - API Reference",
 		"type": "website",
-		"image": "https://sap.github.io/ui5-tooling/v4/images/UI5_logo_wide.png",
-		"site_name": "UI5 Tooling - API Reference",
-		"url": "https://sap.github.io/ui5-tooling/"
+		"image": "https://ui5.github.io/cli/v4/images/UI5_logo_wide.png",
+		"site_name": "UI5 CLI - API Reference",
+		"url": "https://ui5.github.io/cli/"
 	},
 	"docdash": {
 		"sectionOrder": [
@@ -49,8 +49,8 @@
 			"Interfaces"
 		],
 		"meta": {
-			"title": "UI5 Tooling - API Reference - UI5 Builder",
-			"description": "UI5 Tooling - API Reference - UI5 Builder",
+			"title": "UI5 CLI - API Reference - UI5 Builder",
+			"description": "UI5 CLI - API Reference - UI5 Builder",
 			"keyword": "openui5 sapui5 ui5 build development tool api reference"
 		},
 		"search": true,

package/lib/lbt/analyzer/ComponentAnalyzer.js

@@ -182,7 +182,7 @@ class ComponentAnalyzer {
 					} else {
 						log.warn(`Provided OData version "${odataVersion}" in ` +
 							`dataSource "${options.dataSource}" for model "${model}" is unknown. ` +
-							`You might be using an outdated version of the UI5 Tooling.`);
+							`You might be using an outdated version of the UI5 CLI.`);
 						return;
 					}
 					break;

package/lib/lbt/bundle/Builder.js

@@ -546,8 +546,8 @@ class BundleBuilder {
 		log.error(
 			"Module " + moduleName + " requires top level scope and can only be embedded as a string " +
 			"(requires 'eval'), which is not supported with specVersion 4.0 and higher. " +
-			"For more information, see the UI5 Tooling documentation " +
-			"https://sap.github.io/ui5-tooling/stable/pages/Builder/#javascript-files-requiring-top-level-scope");
+			"For more information, see the UI5 CLI documentation " +
+			"https://ui5.github.io/cli/stable/pages/Builder/#javascript-files-requiring-top-level-scope");
 	}
 
 	async checkForStringBundling(moduleName) {

package/lib/processors/jsdoc/lib/transformApiJson.js

@@ -737,6 +737,14 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						oEvent.description = formatters.formatDescriptionSince(oEvent.description, oEvent.since);
 					}
 
+					if (oEvent.references) {
+						formatters.formatReferencesInDescription(oEvent);
+					}
+
+					if (oEvent.description) {
+						oEvent.description = formatters.formatDescription(oEvent.description);
+					}
+
 					// Deprecated
 					if (oEvent.deprecated) {
 						oEvent.deprecatedText = formatters.formatEventDeprecated(oEvent.deprecated.since,
@@ -757,6 +765,14 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 								oParameter.description = formatters.formatDescriptionSince(oParameter.description, oParameter.since);
 							}
 
+							if (oParameter.references) {
+								formatters.formatReferencesInDescription(oParameter);
+							}
+
+							if (oParameter.description) {
+								oParameter.description = formatters.formatDescription(oParameter.description);
+							}
+
 							// Deprecated
 							if (oParameter.deprecated) {
 								oParameter.deprecatedText = formatters.formatDeprecated(oParameter.deprecated.since,
@@ -997,7 +1013,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 	 */
 	function createApiRefApiJson(oChainObject) {
 		if (returnOutputFiles) {
-			// If requested, return data instead of writing to FS (required by UI5 Tooling/UI5 Builder)
+			// If requested, return data instead of writing to FS (required by UI5 CLI/UI5 Builder)
 			return JSON.stringify(oChainObject.parsedData);
 		}
 		const sOutputDir = path.dirname(oChainObject.outputFile);

package/lib/processors/jsdoc/lib/ui5/plugin.js

@@ -73,6 +73,7 @@ const path = require('jsdoc/path');
 const logger = require('jsdoc/util/logger');
 const pluginConfig = (env.conf && env.conf.templates && env.conf.templates.ui5) || env.opts.sapui5 || {};
 const escope = require("escope");
+const {isSemVer} = require("./template/utils/versionUtil");
 
 /* ---- logging ---- */
 
@@ -871,13 +872,13 @@ function resolveFullyQuantifiedName(node) {
 
 		const writeExprNode = writeExpr[0].writeExpr;
 
-		if ( writeExprNode.type === Syntax.MemberExpression && !writeExprNode.computed && writeExprNode.object.type === Syntax.Identifier ) {
-			leftMostName = writeExprNode.object.name;
-
-		} else if (writeExprNode.type === Syntax.MemberExpression && writeExprNode.object.type === Syntax.MemberExpression) { // Standalone variable without leading dot notation namespace
+		// determine from write expression how to replace the leftmost name
+		if (writeExprNode.type === Syntax.MemberExpression) {
+			// replacement is a qualified name (its leftmost part will be resolved in the next round)
 			leftMostName = getResolvedObjectName(writeExprNode);
 
 		} else if (writeExprNode.type === Syntax.Identifier) {
+			// leftMostName was an alias only
 			leftMostName = writeExprNode.name;
 
 		} else {
@@ -886,6 +887,8 @@ function resolveFullyQuantifiedName(node) {
 
 		if (leftMostName) {
 			originalName = leftMostName + "." + originalName;
+			// determine new leftMostName to resolve next
+			leftMostName = leftMostName.split(".")[0];
 		}
 	}
 
@@ -1187,6 +1190,30 @@ function collectVisibilityInfo(settings, doclet, className, n) {
 	return visibility;
 }
 
+function convertDefaultClass(settings, doclet, n) {
+	const node = settings.defaultClass?.value;
+	if ( node == null ) {
+		// check if a @default tag is given (e.g. sap.ui.core.Element#customData)
+		// This is only taken into accout when there is no defaultClass property in the metadata
+		if ( doclet?.defaultvalue != null ) {
+			if ( typeof doclet.defaultvalue === "string" ) {
+				return doclet.defaultvalue;
+			}
+			error(`could not derive defaultClass for aggregation ${n} from default tag ${doclet.defaultvalue}`);
+		}
+		return undefined;
+	}
+	if ( node.type === Syntax.Identifier ) {
+		if ( currentModule.localNames[node.name]?.module ) {
+			return currentModule.localNames[node.name].module;
+		}
+		error(`could not derive defaultClass for aggregation ${n} from identifier ${node.name}`);
+		return "unknown";
+	}
+	error(`could not derive defaultClass for aggregation ${n} from node of type ${node.type}`);
+	return "unknown";
+}
+
 function collectClassInfo(extendCall, classDoclet) {
 
 	let baseType;
@@ -1349,6 +1376,7 @@ function collectClassInfo(extendCall, classDoclet) {
 				singularName : settings.singularName ? settings.singularName.value.value : guessSingularName(n),
 				cardinality : (settings.multiple && !settings.multiple.value.value) ? "0..1" : "0..n",
 				bindable : settings.bindable ? !!convertValue(settings.bindable.value) : false,
+				defaultClass: convertDefaultClass(settings, doclet, n),
 				methods: (methods = {
 					"get": "get" + N,
 					"destroy": "destroy" + N
@@ -1772,6 +1800,31 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 //		return s.slice(s.lastIndexOf('.') + 1);
 //	}
 
+	/**
+	 * Creates all necessary tags to reflect the develpment state
+	 * (ui5-experimental-since/experimental, since and/or deprecated).
+	 *
+	 * If the experimental property of the info object contains only a SemVer,
+	 * it is assumed to stem from an @ui5-experimental-since tag, otherwise, if
+	 * it's not empty, it is assumed to stem from an experimental tag.
+	 * @returns {string[]} List of tags
+	 */
+	function createDevelopmentStateTags(info) {
+		const tags = [];
+		if (isSemVer(info.experimental)) {
+			tags.push(`@ui5-experimental-since ${info.experimental}`);
+		} else if (info.experimental) {
+			tags.push(`@experimental ${info.experimental}`);
+		}
+		if (info.since) {
+			tags.push(`@since ${info.since}`);
+		}
+		if (info.deprecation) {
+			tags.push(`@deprecated ${info.deprecation}`);
+		}
+		return tags;
+	}
+
 	function createVisibilityTags(access, stakeholders) {
 		if ( access === "restricted" ) {
 			return [
@@ -1986,6 +2039,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 		if ( info.visibility === 'hidden' ) {
 			continue;
 		}
+		const devStateTags = createDevelopmentStateTags(info);
 		const visibilityTags = createVisibilityTagsForSetting(info, classAccess);
 
 		// link = newStyle ? "{@link #setting:" + n + " " + n + "}" : "<code>" + n + "</code>";
@@ -1999,9 +2053,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				? "Default value is <code>" + (info.defaultValue.value === "" ? "empty string" : info.defaultValue.raw) + "</code>."
 				: "",
 			"@returns {" + info.type + "} Value of property <code>" + n + "</code>",
-			info.since ? "@since " + info.since : "",
-			info.deprecation ? "@deprecated " + info.deprecation : "",
-			info.experimental ? "@experimental " + info.experimental : "",
+			devStateTags,
 			visibilityTags,
 			"@name " + name("get", n),
 			"@function"
@@ -2018,9 +2070,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				: "",
 			generateParamTag(n, info.type, "New value for property <code>" + n + "</code>", info.defaultValue),
 			"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-			info.since ? "@since " + info.since : "",
-			info.deprecation ? "@deprecated " + info.deprecation : "",
-			info.experimental ? "@experimental " + info.experimental : "",
+			devStateTags,
 			visibilityTags,
 			"@name " + name("set", n),
 			"@function"
@@ -2033,9 +2083,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"detailed description of the possible properties of <code>oBindingInfo</code>",
 				"@param {sap.ui.base.ManagedObject.PropertyBindingInfo} oBindingInfo The binding information",
 				"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("bind", n),
 				"@function"
@@ -2043,9 +2091,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			newJSDoc([
 				"Unbinds property " + link + " from model data.",
 				"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("unbind", n),
 				"@function"
@@ -2058,6 +2104,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 		if ( info.visibility === 'hidden' ) {
 			continue;
 		}
+		const devStateTags = createDevelopmentStateTags(info);
 		const visibilityTags = createVisibilityTagsForSetting(info, classAccess);
 
 		// link = newStyle ? "{@link #setting:" + n + " " + n + "}" : "<code>" + n + "</code>";
@@ -2069,9 +2116,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			"",
 			n === info.defaultAggregation ? "<strong>Note</strong>: this is the default aggregation for " + n + "." : "",
 			"@returns {" + makeTypeString(info) + "}",
-			info.since ? "@since " + info.since : "",
-			info.deprecation ? "@deprecated " + info.deprecation : "",
-			info.experimental ? "@experimental " + info.experimental : "",
+			devStateTags,
 			visibilityTags,
 			"@name " + name("get", n),
 			"@function"
@@ -2089,9 +2134,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"             greater than the current size of the aggregation, the " + n1 + " is inserted at",
 				"             the last position",
 				"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("insert", n1),
 				"@function"
@@ -2102,9 +2145,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"@param {" + makeTypeString(info, true) + "}",
 				"           " + varname(n1, info.altTypes ? "variant" : info.type) + " The " + n1 + " to add; if empty, nothing is inserted",
 				"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("add", n1),
 				"@function"
@@ -2114,9 +2155,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"",
 				"@param {int | string | " + makeTypeString(info, true) + "} " + varname(n1, "variant") + " The " + n1 + " to remove or its index or id",
 				"@returns {" + makeTypeString(info, true) + "|null} The removed " + n1 + " or <code>null</code>",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("remove", n1),
 				"@function"
@@ -2126,9 +2165,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"",
 				"Additionally, it unregisters them from the hosting UIArea.",
 				"@returns {" + makeTypeString(info) + "} An array of the removed elements (might be empty)",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("removeAll", n),
 				"@function"
@@ -2139,9 +2176,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"@param {" + makeTypeString(info, true) + "}",
 				"          " + varname(n1, info.altTypes ? "variant" : info.type) + " The " + n1 + " whose index is looked for",
 				"@returns {int} The index of the provided control in the aggregation if found, or -1 otherwise",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("indexOf", n1),
 				"@function"
@@ -2151,9 +2186,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"Sets the aggregated " + link + ".",
 				"@param {" + makeTypeString(info) + "} " + varname(n, info.altTypes ? "variant" : info.type) + " The " + n + " to set",
 				"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("set", n),
 				"@function"
@@ -2162,9 +2195,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 		newJSDoc([
 			"Destroys " + (info.cardinality === "0..n" ? "all " : "") + "the " + n + " in the aggregation " + link + ".",
 			"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-			info.since ? "@since " + info.since : "",
-			info.deprecation ? "@deprecated " + info.deprecation : "",
-			info.experimental ? "@experimental " + info.experimental : "",
+			devStateTags,
 			visibilityTags,
 			"@name " + name("destroy", n),
 			"@function"
@@ -2177,9 +2208,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"detailed description of the possible properties of <code>oBindingInfo</code>.",
 				"@param {sap.ui.base.ManagedObject.AggregationBindingInfo} oBindingInfo The binding information",
 				"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("bind", n),
 				"@function"
@@ -2187,9 +2216,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			newJSDoc([
 				"Unbinds aggregation " + link + " from model data.",
 				"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("unbind", n),
 				"@function"
@@ -2202,6 +2229,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 		if ( info.visibility === 'hidden' ) {
 			continue;
 		}
+		const devStateTags = createDevelopmentStateTags(info);
 		const visibilityTags = createVisibilityTagsForSetting(info, classAccess);
 
 		// link = newStyle ? "{@link #setting:" + n + " " + n + "}" : "<code>" + n + "</code>";
@@ -2214,9 +2242,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			newStyle && info.doc ? info.doc : "",
 			"",
 			`@returns {${info.cardinality === "0..n" ? "sap.ui.core.ID[]" : "sap.ui.core.ID|null"}}`,
-			info.since ? "@since " + info.since : "",
-			info.deprecation ? "@deprecated " + info.deprecation : "",
-			info.experimental ? "@experimental " + info.experimental : "",
+			devStateTags,
 			visibilityTags,
 			"@name " + name("get", n),
 			"@function"
@@ -2228,9 +2254,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"",
 				"@param {sap.ui.core.ID | " + info.type + "} " + varname(n1, "variant") + " The " + n + " to add; if empty, nothing is inserted",
 				"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("add", n1),
 				"@function"
@@ -2239,9 +2263,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"Removes an " + n1 + " from the association named " + link + ".",
 				"@param {int | sap.ui.core.ID | " + info.type + "} " + varname(n1, "variant") + " The " + n1 + " to be removed or its index or ID",
 				"@returns {sap.ui.core.ID|null} The removed " + n1 + " or <code>null</code>",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("remove", n1),
 				"@function"
@@ -2249,9 +2271,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			newJSDoc([
 				"Removes all the controls in the association named " + link + ".",
 				"@returns {sap.ui.core.ID[]} An array of the removed elements (might be empty)",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("removeAll", n),
 				"@function"
@@ -2261,9 +2281,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"Sets the associated " + link + ".",
 				"@param {sap.ui.core.ID | " + info.type + "} " + varname(n, info.type) + " ID of an element which becomes the new target of this " + n + " association; alternatively, an element instance may be given",
 				"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-				info.since ? "@since " + info.since : "",
-				info.deprecation ? "@deprecated " + info.deprecation : "",
-				info.experimental ? "@experimental " + info.experimental : "",
+				devStateTags,
 				visibilityTags,
 				"@name " + name("set", n),
 				"@function"
@@ -2273,6 +2291,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 
 	for (const n in oClassInfo.events ) {
 		const info = oClassInfo.events[n];
+		const devStateTags = createDevelopmentStateTags(info);
 		const visibilityTags = createVisibilityTagsForSetting(info, classAccess);
 
 		//link = newStyle ? "{@link #event:" + n + " " + n + "}" : "<code>" + n + "</code>";
@@ -2287,9 +2306,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			"",
 			"@name " + oClassInfo.name + "#" + n,
 			"@event",
-			info.since ? "@since " + info.since : "",
-			info.deprecation ? "@deprecated " + info.deprecation : "",
-			info.experimental ? "@experimental " + info.experimental : "",
+			devStateTags,
 			"@param {sap.ui.base.Event} oControlEvent",
 			"@param {sap.ui.base.EventProvider} oControlEvent.getSource",
 			"@param {object} oControlEvent.getParameters"
@@ -2319,10 +2336,8 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			"           [oListener] Context object to call the event handler with. Defaults to this <code>" + oClassInfo.name + "</code> itself",
 			"",
 			"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
+			devStateTags,
 			visibilityTags,
-			info.since ? "@since " + info.since : "",
-			info.deprecation ? "@deprecated " + info.deprecation : "",
-			info.experimental ? "@experimental " + info.experimental : "",
 			"@name " + name("attach", n),
 			"@function"
 		]);
@@ -2336,9 +2351,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			"@param {object}",
 			"           [oListener] Context object on which the given function had to be called",
 			"@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining",
-			info.since ? "@since " + info.since : "",
-			info.deprecation ? "@deprecated " + info.deprecation : "",
-			info.experimental ? "@experimental " + info.experimental : "",
+			devStateTags,
 			visibilityTags,
 			"@name " + name("detach", n),
 			"@function"
@@ -2382,10 +2395,8 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 		}
 
 		lines.push(
+			devStateTags,
 			createVisibilityTags(vis, info.stakeholders),
-			info.since ? "@since " + info.since : "",
-			info.deprecation ? "@deprecated " + info.deprecation : "",
-			info.experimental ? "@experimental " + info.experimental : "",
 			"@name " + name("fire", n),
 			"@function"
 		);
@@ -2407,6 +2418,21 @@ function location(doclet) {
 	return " #" + ui5data(doclet).id + "@" + filename + (doclet.meta.lineno != null ? ":" + doclet.meta.lineno : "") + (doclet.synthetic ? "(synthetic)" : "");
 }
 
+/**
+ * Converts a JSDoc name to a UI5 runtime metadata name.
+ *
+ * Basically, global names in dot notation don't require a conversion. Only when the JSDoc name
+ * is a `module:*` name, the prefix is removed and slashes are converted to dots.
+ *
+ * Note: the conversion in the opposite direction is not well-defined as not every dot has to be
+ *       converted to a slash (e.g. not for named exports or subtypes in another module). This
+ *       also implies that two different JSDoc names might map to the same UI5 runtime metadata
+ *       name. API design should avoid such ambiguities.
+ */
+function toRuntimeMetadataName(longname) {
+	return longname?.startsWith("module:") ? longname.slice("module:".length).replace(/\//g, ".") : longname;
+}
+
 // ---- Comment handling ---------------------------------------------------------------------------
 
 // --- comment related functions that depend on the JSdoc version (e.g. on the used parser)
@@ -2602,7 +2628,23 @@ exports.defineTags = function(dictionary) {
 	};
 
 	/**
-	 * A sapui5 specific tag to add a disclaimer to a symbol
+	 * Override the built-in `since` tag (with the same configuration) to check that
+	 * `since` and `ui5-experimental-since` are not used both for the same entity.
+	 *
+	 * Also see the checks in experimental and ui5-experimental-since.
+	 */
+	dictionary.defineTag("since", {
+		mustHaveValue: true,
+		onTagged: function(doclet, tag) {
+			if (isSemVer(doclet.experimental)) {
+				error(`@since and @ui5-experimental-since must not be used both for the same API (${doclet.meta?.lineno})`);
+			}
+			doclet.since = tag.value;
+		}
+	});
+
+	/**
+	 * A UI5 custom tag to add a disclaimer to a symbol.
 	 */
 	dictionary.defineTag('disclaimer', {
 		// value is optional
@@ -2612,12 +2654,48 @@ exports.defineTags = function(dictionary) {
 	});
 
 	/**
-	 * A sapui5 specific tag to mark a symbol as experimental.
+	 * A UI5 custom tag to mark a symbol as experimental.
+	 *
+	 * Note: `experimental` and `ui5-experimental-since` must not used be used within the same doclet.
+	 *
+	 * @deprecated As of version 1.139, use @ui5-experimental-since
 	 */
 	dictionary.defineTag('experimental', {
 		// value is optional
 		onTagged: function(doclet, tag) {
-			doclet.experimental = tag.value || EMPTY;
+			future(`As of version 1.139, the experimental tag is deprecated and should no longer be used. Use the @ui5-experimental-since tag instead (${doclet.meta?.lineno})`);
+			if (isSemVer(doclet.experimental)) {
+				error(`@experimental and @ui5-experimental-since must not be used both for the same API (${doclet.meta?.lineno})`);
+			}
+			const value = tag.value?.trim();
+			if (isSemVer(value)) {
+				// In some places, @experimental was used with a version only.
+				// Prefix the value to avoid misinterpretation as @ui5-experimental-since
+				doclet.experimental = `As of version ${value}`;
+			} else {
+				doclet.experimental = value || EMPTY;
+			}
+		}
+	});
+
+	/**
+	 * A UI5 custom tag to mark a symbol as experimental.
+	 *
+	 * This tag only allows and expects a since version, no additional text.
+	 *
+	 * Note: `experimental` and `ui5-experimental-since` must not used be used within the same doclet.
+	 */
+	dictionary.defineTag('ui5-experimental-since', {
+		mustHaveValue: true,
+		onTagged: function(doclet, tag) {
+			if (doclet.since || doclet.experimental) {
+				error(`@experimental/@since and @ui5-experimental-since must not be used together for the same API (${doclet.meta?.lineno})`);
+			}
+			const version = tag.value?.trim() ?? "";
+			if (!isSemVer(version)) {
+				error(`@ui5-experimental-since must have a version and only a version, not '${version}' (${doclet.meta?.lineno})`);
+			}
+			doclet.experimental = version;
 		}
 	});
 
@@ -2680,6 +2758,9 @@ exports.defineTags = function(dictionary) {
 			}
 		}
 	});
+	/**
+	 * @deprecated Use `ui5-restricted` instead.
+	 */
 	dictionary.defineTag('sap-restricted', {
 		onTagged: function(doclet, tag) {
 			error("Tag @sap-restricted has been deprecated, use @ui5-restricted instead");
@@ -2939,15 +3020,19 @@ exports.handlers = {
 			const doclet = doclets[i];
 
 			// add metadata to class symbols
-			if ( classInfos[doclet.longname] ) {
+			let classInfo = classInfos[doclet.longname];
+			if (classInfo == null && doclet.longname?.startsWith("module:")) {
+				classInfo = classInfos[toRuntimeMetadataName(doclet.longname)];
+			}
+			if ( classInfo ) {
 				// debug("class data", doclet.longname, "'" + classInfos[doclet.longname].export + "'");
 				if ( doclet.__ui5.export === undefined ) {
-					doclet.__ui5.export = classInfos[doclet.longname].export;
+					doclet.__ui5.export = classInfo.export;
 				}
 
-				doclet.__ui5.metadata = classInfos[doclet.longname];
+				doclet.__ui5.metadata = classInfo;
 				// Push the stereotype to the main doclet.__ui5 object since that's where it's read.
-				doclet.__ui5.stereotype = classInfos[doclet.longname].stereotype;
+				doclet.__ui5.stereotype = classInfo.stereotype;
 
 				// add designtime infos, if configured
 				let designtimeModule = doclet.__ui5.metadata.designtime;
@@ -2971,11 +3056,18 @@ exports.handlers = {
 				// derive interface implementations from UI5 metadata
 				if ( doclet.__ui5.metadata.interfaces && doclet.__ui5.metadata.interfaces.length ) {
 					/* eslint-disable no-loop-func */
-					doclet.__ui5.metadata.interfaces.forEach((intf) => {
+					doclet.__ui5.metadata.interfaces.forEach((rtmIntf) => {
 						doclet.implements = doclet.implements || [];
-						if ( doclet.implements.indexOf(intf) < 0 ) {
-							info(`  @implements ${intf} derived from UI5 metadata (${doclet.longname})`);
-							doclet.implements.push(intf);
+						// add an interface only if no "matching" JSDoc interface is present already
+
+						// TODO if the JSDoc name and runtime metadata name of an interface differ,
+						// this today requires redundant documentation. Ideally, the JSDoc plugin
+						// should handle this and convert the runtime metadata name to the JSDoc name.
+						// Unfortunately, at this processing step here, the necessary information is
+						// not yet available (external APIs are loaded only later).
+						if ( doclet.implements.every((jsdocIntf) => toRuntimeMetadataName(jsdocIntf) !== rtmIntf)) {
+							info(`  @implements ${rtmIntf} derived from UI5 metadata (${doclet.longname})`);
+							doclet.implements.push(rtmIntf);
 						}
 					});
 					/* eslint-enable no-loop-func */
@@ -2983,12 +3075,16 @@ exports.handlers = {
 			}
 
 			// add DataType info to typedef symbols
-			if ( typeInfos[doclet.longname] ) {
+			let typeInfo = typeInfos[doclet.longname];
+			if (typeInfo == null && doclet.longname?.startsWith("module:")) {
+				typeInfo = typeInfos[toRuntimeMetadataName(doclet.longname)];
+			}
+			if ( typeInfo ) {
 				doclet.__ui5.stereotype = 'datatype';
 				doclet.__ui5.metadata = {
-					basetype: typeInfos[doclet.longname].base,
-					pattern: typeInfos[doclet.longname].pattern,
-					range: typeInfos[doclet.longname].range
+					basetype: typeInfo.base,
+					pattern: typeInfo.pattern,
+					range: typeInfo.range
 				};
 			}
 
@@ -3292,11 +3388,17 @@ exports.astNodeVisitor = {
 				typeString = 'function';
 				// #### BEGIN: MODIFIED BY SAP
 				paramTypes = [];
+				// add only one of 'new:' or 'this:' type, 'new:' is preferred as it implies a 'this:'
 				if (parsedType.new) {
-					paramTypes.push(toTypeString(parsedType.new));
+					paramTypes.push("new:" + toTypeString(parsedType.new));
+				} else if (parsedType.this) {
+					paramTypes.push("this:" + toTypeString(parsedType.this));
 				}
+
 				if (Array.isArray(parsedType.params)) {
-					paramTypes.push(...parsedType.params.map(toTypeString));
+					paramTypes.push(...parsedType.params.map((paramType) => {
+						return toTypeString(paramType) + (paramType.optional ? "=" : "");
+					}));
 				}
 				if (paramTypes.length || parsedType.result) {
 					typeString += `(${paramTypes.join(", ")})`;

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

@@ -730,10 +730,18 @@ class TypeStringBuilder {
 			str: 'Promise' + this.lt + this.safe(fulfillmentType) + this.gt
 		};
 	}
-	"function"(paramTypes, returnType) {
+	"function"(paramTypes, returnType, thisType, constructorType) {
+		paramTypes = paramTypes.map(
+			(type) => type.str + (type.optional ? "=" : "")
+		);
+		if (constructorType != null) {
+			paramTypes.unshift(`new:${constructorType.str}`);
+		} else if (thisType != null) {
+			paramTypes.unshift(`this:${thisType.str}`);
+		}
 		return {
 			simpleComponent: false,
-			str: "function(" + paramTypes.map((type) => type.str).join(',') + ")" + ( returnType ? " : " + this.safe(returnType) : "")
+			str: `function(${paramTypes.join(",")})${returnType ? " : " + this.safe(returnType) : ""}`
 		};
 	}
 	structure(structure) {
@@ -889,6 +897,13 @@ function normalizeWS(text) {
 
 }
 
+const rStartsWithValidPropertyName = /^(?:[^'"\s.][^\s.]*|'(?:[^'\\]|\\.)*'|"(?:[^"\\]|\\.)*")/;
+
+function isNestedPropertyName(name) {
+	const match = rStartsWithValidPropertyName.exec(name);
+	return match && match[0].length < name.length && name[match[0].length] === ".";
+}
+
 //---- add on: API JSON -----------------------------------------------------------------
 
 function createAPIJSON(symbols, filename) {
@@ -1270,6 +1285,9 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				if ( aggr.altTypes ) {
 					curr.altTypes = aggr.altTypes.slice();
 				}
+				if ( aggr.defaultClass ) {
+					attrib("defaultClass", aggr.defaultClass);
+				}
 				attrib("cardinality", aggr.cardinality, '0..n');
 				attrib("visibility", aggr.visibility, 'public');
 				if (aggr.stakeholders) {
@@ -1411,7 +1429,7 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				continue;
 			}
 
-			if ( name.indexOf('.') >= 0 ) {
+			if ( isNestedPropertyName(name) ) {
 				continue;
 			}
 
@@ -1927,9 +1945,8 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 	return obj[0];
 }
 
-function postProcessAPIJSON(api) {
+function addExportInfo(symbols) {
 	const modules = {};
-	const symbols = api.symbols;
 
 	// collect modules and the symbols that refer to them
 	for ( let i = 0; i < symbols.length; i++) {
@@ -2051,6 +2068,13 @@ function postProcessAPIJSON(api) {
 	for ( const n in modules ) {
 		guessExports(n, modules[n]);
 	}
+}
+
+function postProcessAPIJSON(api) {
+
+	const symbols = api.symbols;
+
+	addExportInfo(symbols);
 
 	function findSymbol(name) {
 		if ( name == null || name === '' ) {
@@ -2079,6 +2103,28 @@ function postProcessAPIJSON(api) {
 		return (m && m[1]) || "";
 	}
 
+	// create a 2-level map of symbol names, first keyed by the exporting module and then by export name
+	const modules = Object.create(null);
+	for (const symbol of Object.values(externalSymbols)) {
+		if ( symbol.module && symbol.export !== undefined ) {
+			modules[symbol.module] ??= Object.create(null);
+			modules[symbol.module][symbol.export] = symbol.name;
+		}
+	}
+	for (const symbol of symbols) {
+		if ( symbol.module && symbol.export !== undefined ) {
+			modules[symbol.module] ??= Object.create(null);
+			modules[symbol.module][symbol.export] = symbol.name;
+		}
+	}
+
+	function findSymbolByModule(module, exportName) {
+		if (module === "unknown") {
+			return "unknown";
+		}
+		return modules[module]?.[exportName] ?? "unknown";
+	}
+
 	symbols.forEach((symbol) => {
 		// add note for enums which are not exposed by their name
 		if (symbol.kind === "enum" && symbol.export) {
@@ -2147,6 +2193,16 @@ function postProcessAPIJSON(api) {
 				}
 			}
 		}
+		/*
+		 * Up to here, the defaultClass only contains a module name. Replace it with the corresponding API (type) name.
+		 */
+		if (Array.isArray(symbol["ui5-metadata"].aggregations)) {
+			for (const aggr of symbol["ui5-metadata"].aggregations) {
+				if (aggr.defaultClass != null) {
+					aggr.defaultClass = findSymbolByModule(aggr.defaultClass, "");
+				}
+			}
+		}
 	});
 
 }
@@ -2267,6 +2323,8 @@ function validateAPIJSON(api) {
 	const rValidNames = /^[$A-Z_a-z][$0-9A-Z_a-z]*$/i;
 	const rValidModuleNames = /^[$A-Z_a-z][$\-\.0-9A-Z_a-z]*$/i;
 
+	let currentTypeParameters = Object.create(null);
+
 	function checkName(name, hint) {
 		if ( !rValidNames.test(name) ) {
 			naming[name] = naming[name] || [];
@@ -2274,6 +2332,19 @@ function validateAPIJSON(api) {
 		}
 	}
 
+	/**
+	 * Checks the name of a property in an object-like structure.
+	 * As in JavaScript, the rules for such names are less strict than
+	 * for classes, interfaces or function declarations.
+	 */
+	function checkPropertyName(name, hint) {
+		const match = rStartsWithValidPropertyName.exec(name);
+		if ( match == null || match[0].length !== name.length ) {
+			naming[name] ??= [];
+			naming[name].push(hint);
+		}
+	}
+
 	function checkModuleName(name, hint) {
 		if ( !rValidModuleNames.test(name) ) {
 			naming[name] = naming[name] || [];
@@ -2311,6 +2382,9 @@ function validateAPIJSON(api) {
 	}
 
 	function checkSimpleType(typeName, hint) {
+		if (currentTypeParameters[typeName]) {
+			return;
+		}
 		if ( !defined[typeName] ) {
 			reportError(typeName, hint);
 		}
@@ -2373,8 +2447,20 @@ function validateAPIJSON(api) {
 		}
 	}
 
+	function checkTypeParameter(typeParam, hint) {
+		checkType(typeParam, `type constraint of ${hint}`);
+		if ( typeParam.default ) {
+			checkType({type: typeParam.default}, `default of ${hint}`);
+		}
+	}
+
 	function checkParam(param, prefix, hint) {
-		checkName(param.name, `name of param ${prefix}${param.name} of ${hint}`);
+		if (prefix) {
+			// nested parameter properties follow the naming conventions for object properties
+			checkPropertyName(param.name, `name of param ${prefix}${param.name} of ${hint}`);
+		} else {
+			checkName(param.name, `name of param ${prefix}${param.name} of ${hint}`);
+		}
 		checkType(param, `param ${prefix}${param.name} of ${hint}`);
 		if ( param.parameterProperties ) {
 			Object.keys(param.parameterProperties).forEach((sub) =>
@@ -2382,7 +2468,19 @@ function validateAPIJSON(api) {
 		}
 	}
 
-	function checkMethodSignature(method, hint) {
+	function checkMethodSignature(method, hint, isConstructor = false) {
+		const prevTypeParams = currentTypeParameters;
+		if ( !isConstructor && method.typeParameters ) {
+			// Note: type parameters of the constructor are handled on class level
+			currentTypeParameters = Object.create(currentTypeParameters);
+			for (const typeParam of method.typeParameters) {
+				currentTypeParameters[typeParam.name] = typeParam;
+			}
+			// check type parameters in a 2nd loop so that they can depend on each other
+			for (const typeParam of method.typeParameters) {
+				checkTypeParameter(typeParam, `type parameter ${typeParam.name} of ${hint}`);
+			}
+		}
 		if ( method.returnValue ) {
 			checkType(method.returnValue, `return value of ${hint}`);
 		}
@@ -2392,6 +2490,8 @@ function validateAPIJSON(api) {
 		if ( method.throws ) {
 			method.throws.forEach((ex) => checkType(ex, `exception of ${hint}`));
 		}
+		// restore type parameters of outer scope
+		currentTypeParameters = prevTypeParams;
 	}
 
 	function checkClassAgainstInterface(symbol, oIntfAPI) {
@@ -2451,6 +2551,19 @@ function validateAPIJSON(api) {
 	}
 
 	function checkClass(symbol) {
+		const prevTypeParams = currentTypeParameters;
+		if ( Object.hasOwn(symbol, "constructor") && symbol.constructor.typeParameters ) {
+			currentTypeParameters = Object.create(currentTypeParameters);
+			for (const typeParam of symbol.constructor.typeParameters) {
+				currentTypeParameters[typeParam.name] = typeParam;
+			}
+			// Check type parameters in a 2nd loop so that they can depend on each other.
+			// As of TypeScript 5.9.2, `class Foo<T1 extends T2, T2 = T1> {}´ is valid
+			for (const typeParam of symbol.constructor.typeParameters) {
+				checkTypeParameter(typeParam, `type parameter ${typeParam.name} of ${symbol.name}`);
+			}
+		}
+
 		checkCompoundName(symbol.name, `name of ${symbol.name}`);
 		if ( symbol.extends ) {
 			checkSimpleType(symbol.extends, `base class of ${symbol.name}`);
@@ -2465,12 +2578,12 @@ function validateAPIJSON(api) {
 			});
 		}
 		if ( Object.hasOwn(symbol, "constructor") ) {
-			checkMethodSignature(symbol.constructor, symbol.name + ".constructor");
+			checkMethodSignature(symbol.constructor, symbol.name + ".constructor", /* isConstructor */ true);
 		}
 		if ( symbol.properties ) {
 			symbol.properties.forEach((prop) => {
 				const qualifiedName = `${symbol.name}.${prop.name}`;
-				checkName(prop.name, `name of ${qualifiedName}`);
+				checkPropertyName(prop.name, `name of ${qualifiedName}`);
 				if ( prop.type ) {
 					checkType(prop, `type of ${qualifiedName}`);
 				}
@@ -2494,6 +2607,8 @@ function validateAPIJSON(api) {
 				}
 			});
 		}
+		// restore type parameters of outer scope
+		currentTypeParameters = prevTypeParams;
 	}
 
 	api.symbols.forEach((symbol) => {

package/lib/processors/jsdoc/lib/ui5/template/utils/typeParser.js

@@ -414,9 +414,19 @@ function TypeParser(defaultBuilder = new ASTBuilder()) {
 				case "function":
 					const aParamTemplates = [];
 					let aParamsimpleTypes = [];
+					if (Object.hasOwn(parsed, "constructor") && parsed.constructor) {
+						const types = findSimpleTypes(parsed.constructor);
+						aParamTemplates.push("new:" + types.template);
+						aParamsimpleTypes = aParamsimpleTypes.concat(types.simpleTypes);
+					}
+					if (parsed.this) {
+						const types = findSimpleTypes(parsed.this);
+						aParamTemplates.push("this:" + types.template);
+						aParamsimpleTypes = aParamsimpleTypes.concat(types.simpleTypes);
+					}
 					parsed.params.forEach(function(paramType) {
 						const types = findSimpleTypes(paramType);
-						aParamTemplates.push(types.template);
+						aParamTemplates.push(types.template + (paramType.optional ? "?" : ""));
 						aParamsimpleTypes = aParamsimpleTypes.concat(types.simpleTypes);
 					});
 					const returnType = parsed.return ? findSimpleTypes(parsed.return) : {simpleTypes: []};

package/lib/processors/jsdoc/lib/ui5/template/utils/versionUtil.js

@@ -1,5 +1,12 @@
 "use strict";
 
+//                [m][.minor][.patch ]   [pre-release][ build-info ]
+const rSemVer = /^\d+(?:\.\d+(?:\.\d+)?)?(?:-[\w\-]+)?(?:\+[\w\-]+)?$/;
+
+function isSemVer(str) {
+	return rSemVer.test(str);
+}
+
 const rSinceVersion = /^([0-9]+(?:\.[0-9]+(?:\.[0-9]+)?)?([-.][0-9A-Z]+)?)(\.$|\.\s+|[,:;]\s*|\s-\s*|\s|$)/i;
 function _parseVersion(value) {
 	const m = rSinceVersion.exec(value);
@@ -86,6 +93,14 @@ function extractSince(value) {
 		value = String(value);
 	}
 
+	if (isSemVer(value)) {
+		return {
+			since: value,
+			pos: value.length,
+			value: ""
+		};
+	}
+
 	const mSinceIndicator = rSinceIndicator.exec(value);
 	if (mSinceIndicator) {
 		const iSinceIndicatorLength = mSinceIndicator[0].length;
@@ -115,6 +130,7 @@ function extractSince(value) {
 }
 
 module.exports = {
+	isSemVer,
 	extractSince,
 	extractVersion
 };

package/lib/processors/minifier.js

@@ -228,7 +228,7 @@ export default async function({
 					if (sourceMapJson.sections) {
 						// TODO 5.0
 						// Module "@jridgewell/trace-mapping" (used by Terser) can't handle index map sections lacking
-						// a "names" array. Since this is a common occurrence for UI5 Tooling bundles, we search for
+						// a "names" array. Since this is a common occurrence for UI5 CLI bundles, we search for
 						// such cases here and fix them until https://github.com/jridgewell/trace-mapping/pull/29 is
 						// resolved and Terser upgraded the dependency
 

package/lib/tasks/jsdoc/generateJsdoc.js

@@ -130,7 +130,7 @@ const utils = {
 	createTmpDir: async function(projectName) {
 		const sanitizedProjectName = projectName.replace(/[^A-Za-z0-9]/g, "");
 
-		const tmpRootPath = path.join(os.tmpdir(), "ui5-tooling");
+		const tmpRootPath = path.join(os.tmpdir(), "ui5-cli");
 		await mkdirp(tmpRootPath);
 
 		// Appending minus sign also because node docs advise to "avoid trailing X characters in prefix"

package/lib/tasks/taskRepository.js

@@ -61,8 +61,8 @@ export async function getTask(taskName) {
 	if (!taskInfo) {
 		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/`);
+				`Standard task ${taskName} has been removed in UI5 CLI 3.0. ` +
+				`Please see the migration guide at https://ui5.github.io/cli/updates/migrate-v3/`);
 		}
 		throw new Error(`taskRepository: Unknown Task ${taskName}`);
 	}

package/package.json

@@ -1,7 +1,7 @@
 {
 	"name": "@ui5/builder",
-	"version": "4.0.10",
-	"description": "UI5 Tooling - Builder",
+	"version": "4.0.11",
+	"description": "UI5 CLI - Builder",
 	"author": {
 		"name": "SAP SE",
 		"email": "openui5@sap.com",
@@ -122,8 +122,8 @@
 	},
 	"dependencies": {
 		"@jridgewell/sourcemap-codec": "^1.5.5",
-		"@ui5/fs": "^4.0.1",
-		"@ui5/logger": "^4.0.1",
+		"@ui5/fs": "^4.0.2",
+		"@ui5/logger": "^4.0.2",
 		"cheerio": "1.0.0",
 		"escape-unicode": "^0.2.0",
 		"escope": "^4.0.0",
@@ -133,26 +133,26 @@
 		"less-openui5": "^0.11.6",
 		"pretty-data": "^0.40.0",
 		"semver": "^7.7.2",
-		"terser": "^5.43.1",
-		"workerpool": "^9.3.3",
+		"terser": "^5.44.0",
+		"workerpool": "^9.3.4",
 		"xml2js": "^0.6.2"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.14.0",
 		"@istanbuljs/esm-loader-hook": "^0.3.0",
-		"@jridgewell/trace-mapping": "^0.3.30",
+		"@jridgewell/trace-mapping": "^0.3.31",
 		"@ui5/project": "^4.0.4",
 		"ava": "^6.4.1",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.7",
 		"docdash": "^2.0.2",
-		"eslint": "^9.34.0",
+		"eslint": "^9.35.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^15.1.0",
 		"eslint-plugin-jsdoc": "^52.0.4",
-		"esmock": "^2.7.1",
-		"globals": "^16.3.0",
+		"esmock": "^2.7.2",
+		"globals": "^16.4.0",
 		"line-column": "^1.0.2",
 		"nyc": "^17.1.0",
 		"open-cli": "^8.0.0",