@ui5/builder 3.4.1 → 3.5.1

package/CHANGELOG.md

@@ -2,10 +2,22 @@
 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.4.1...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.5.1...HEAD).
+
+<a name="v3.5.1"></a>
+## [v3.5.1] - 2024-07-22
+### Bug Fixes
+- **generateThemeDesignerResources:** Allow core .theming in sources ([#1062](https://github.com/SAP/ui5-builder/issues/1062)) [`dda3011`](https://github.com/SAP/ui5-builder/commit/dda30114461314e81da43bd739e709186744f592)
+
+
+<a name="v3.5.0"></a>
+## [v3.5.0] - 2024-06-24
+### Features
+- ES2023 Support [`097049d`](https://github.com/SAP/ui5-builder/commit/097049daeec5c54c2d5e858b12e0c54c826ff663)
+
 
 <a name="v3.4.1"></a>
-## [v3.4.1] - 2024-05-10
+## [v3.4.1] - 2024-05-13
 ### Bug Fixes
 - **bundle/Builder:** Correct bundling of resources with empty source map [`1228db7`](https://github.com/SAP/ui5-builder/commit/1228db78e7e655cea58c20517662b08dd09db87b)
 
@@ -872,6 +884,8 @@ 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)
+[v3.5.1]: https://github.com/SAP/ui5-builder/compare/v3.5.0...v3.5.1
+[v3.5.0]: https://github.com/SAP/ui5-builder/compare/v3.4.1...v3.5.0
 [v3.4.1]: https://github.com/SAP/ui5-builder/compare/v3.4.0...v3.4.1
 [v3.4.0]: https://github.com/SAP/ui5-builder/compare/v3.3.1...v3.4.0
 [v3.3.1]: https://github.com/SAP/ui5-builder/compare/v3.3.0...v3.3.1

package/lib/lbt/bundle/Builder.js

@@ -36,6 +36,10 @@ function makeStringLiteral(str) {
 	}) + "'";
 }
 
+function removeHashbang(str) {
+	return str.replace(/^#!(.*)/, "");
+}
+
 function isEmptyBundle(resolvedBundle) {
 	return resolvedBundle.sections.every((section) => section.modules.length === 0);
 }
@@ -278,6 +282,7 @@ class BundleBuilder {
 	async writeRawModule(moduleName, resource) {
 		this.outW.ensureNewLine();
 		let moduleContent = (await resource.buffer()).toString();
+		moduleContent = removeHashbang(moduleContent);
 		if (this.options.sourceMap) {
 			let moduleSourceMap;
 			({moduleContent, moduleSourceMap} =
@@ -384,6 +389,7 @@ class BundleBuilder {
 					// console.log("Processing " + moduleName);
 					const resource = await this.pool.findResourceWithInfo(moduleName);
 					let moduleContent = (await resource.buffer()).toString();
+					moduleContent = removeHashbang(moduleContent);
 					let moduleSourceMap;
 					if (this.options.sourceMap) {
 						({moduleContent, moduleSourceMap} =
@@ -444,6 +450,7 @@ class BundleBuilder {
 			// The module should be written to a new line in order for dev-tools to map breakpoints to it
 			outW.ensureNewLine();
 			let moduleContent = (await resource.buffer()).toString();
+			moduleContent = removeHashbang(moduleContent);
 			if (this.options.sourceMap) {
 				let moduleSourceMap;
 				({moduleContent, moduleSourceMap} =
@@ -463,6 +470,7 @@ class BundleBuilder {
 			log.warn(
 				`Module ${moduleName} requires top level scope and can only be embedded as a string (requires 'eval')`);
 			let moduleContent = (await resource.buffer()).toString();
+			moduleContent = removeHashbang(moduleContent);
 			if (this.options.sourceMap) {
 				// We are actually not interested in the source map this module might contain,
 				// but we should make sure to remove any "sourceMappingURL" from the module content before

package/lib/lbt/utils/parseUtils.js

@@ -9,7 +9,7 @@ const hasOwn = Function.prototype.call.bind(Object.prototype.hasOwnProperty);
  * - Adjust the JSModuleAnalyzer test "Check for consistency between VisitorKeys and EnrichedVisitorKeys"
  *   (See comments in test for details)
 */
-export const ecmaVersion = 2022;
+export const ecmaVersion = 2023;
 
 export function parseJS(code, userOptions = {}) {
 	// allowed options and their defaults

package/lib/processors/jsdoc/lib/transformApiJson.cjs

@@ -36,6 +36,12 @@ function normalizeToUI5GlobalNotation(sModuleName){
 	return sModuleName.replace(/\//g, ".");
 }
 
+function fnCreateTypesArr(sTypes) {
+	return sTypes.split("|").map(function (sType) {
+		return { value: sType }
+	});
+}
+
 /*
  * Transforms the api.json as created by the JSDoc build into a pre-processed api.json file suitable for the SDK.
  *
@@ -126,7 +132,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		 * @returns {boolean}
 		 */
 		function possibleUI5Symbol(sName) {
-			return /^[a-zA-Z][a-zA-Z.]*[a-zA-Z]$/.test(sName);
+			return /^[a-zA-Z][a-zA-Z0-9.]*[a-zA-Z0-9]$/.test(sName);
 		}
 
 		// Function is a copy from: LibraryInfo.js => LibraryInfo.prototype._getActualComponent => "match" inline method
@@ -439,6 +445,11 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						// Name
 						oProperty.name = formatters.formatEntityName(oProperty.name, oSymbol.name, oProperty.static);
 
+						// Type
+						if (oProperty.type) {
+							oProperty.types = fnCreateTypesArr(oProperty.type);
+						}
+
 						// Description
 						oProperty.description = formatters.formatDescriptionSince(oProperty.description, oProperty.since);
 
@@ -2061,11 +2072,6 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		 * @param aMethods - the methods array initially coming from the server
 		 */
 		buildMethodsModel: function (aMethods) {
-			var fnCreateTypesArr = function (sTypes) {
-				return sTypes.split("|").map(function (sType) {
-					return {value: sType}
-				});
-			};
 			var fnExtractParameterProperties = function (oParameter, aParameters, iDepth, aPhoneName) {
 				if (oParameter.parameterProperties) {
 					Object.keys(oParameter.parameterProperties).forEach(function (sProperty) {

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

@@ -1138,6 +1138,46 @@ function convertDragDropValue(node, cardinality) {
 	return Object.assign(mDefaults, mDragDropValue);
 }
 
+function collectVisibilityInfo(settings, doclet, className, n) {
+	const validVisibilities = new Set(['public', 'hidden']);
+	const validAccesses = new Set(['public', 'protected', 'restricted', 'private']);
+
+	let visibility = (settings.visibility && settings.visibility.value.value) || "public";
+
+	if (!validVisibilities.has(visibility)) {
+		error(`${className}: Invalid visibility '${visibility}' in runtime metadata defined for managed setting '${n}. Valid options are ${Array.from(validVisibilities).join(', ')}.`);
+	}
+
+	if (doclet?.access) {
+		let access = doclet.access;
+
+		if (!validAccesses.has(access)) {
+			error(`${className}: Invalid JSDoc visibility '${access}' defined for managed setting '${n}'. Valid options are ${Array.from(validAccesses).join(', ')}.`);
+		}
+
+		if (visibility === 'hidden' && (access === 'public' || access === 'protected' || access === 'restricted')) {
+			// force access to private to avoid inconsistencies in libraries that ignore JSDoc errors
+			error(`${className}: Inconsistent visibility settings detected. Runtime metadata sets visibility to '${visibility}', while JSDoc defines it as '${access}' for the managed setting '${n}'. Forcing visibility to 'hidden'.`);
+			access = "private";
+		}
+		if (visibility === 'public' && access === 'private') {
+			// force access to 'restricted' to avoid inconsistencies in libraries that ignore JSDoc errors
+			ui5data(doclet).stakeholders ??= [];
+			if ( !doclet.__ui5.stakeholders.includes(className) ) {
+				doclet.__ui5.stakeholders.push(className);
+			}
+			error(`${className}: Inconsistent visibility settings detected. Runtime metadata sets visibility to '${visibility}', while JSDoc defines it as '${access}' for the managed setting '${n}'. Forcing visibility to 'restricted'.`);
+			access = "restricted";
+		}
+
+		if (visibility == "public" && (access === "restricted" || access === "protected")) {
+			visibility = access;
+		}
+	}
+
+	return visibility;
+}
+
 function collectClassInfo(extendCall, classDoclet) {
 
 	let baseType;
@@ -1238,7 +1278,8 @@ function collectClassInfo(extendCall, classDoclet) {
 				since : doclet && doclet.since,
 				deprecation : doclet && doclet.deprecated,
 				experimental : doclet && doclet.experimental,
-				visibility : (settings.visibility && settings.visibility.value.value) || "public",
+				visibility: collectVisibilityInfo(settings, doclet, oClassInfo.name, n),
+				stakeholders: doclet && doclet.__ui5 && doclet.__ui5.stakeholders,
 				type : settings.type ? settings.type.value.value : "any"
 			};
 		});
@@ -1246,32 +1287,38 @@ function collectClassInfo(extendCall, classDoclet) {
 		oClassInfo.defaultProperty = (metadata.defaultProperty && metadata.defaultProperty.value.value) || undefined;
 
 		each(metadata.properties, "type", (n, settings, doclet) => {
-			let type;
 			const N = upper(n);
 			let methods;
+			const dataType = settings.type ? settings.type.value.value : "string";
 			oClassInfo.properties[n] = {
-				name : n,
-				doc : doclet && doclet.description,
-				since : doclet && doclet.since,
-				deprecation : doclet && doclet.deprecated,
-				experimental : doclet && doclet.experimental,
-				visibility : (settings.visibility && settings.visibility.value.value) || "public",
-				type : (type = settings.type ? settings.type.value.value : "string"),
-				defaultValue : settings.defaultValue ? convertValueWithRaw(settings.defaultValue.value, type, n) : null,
-				group : settings.group ? settings.group.value.value : 'Misc',
-				bindable : settings.bindable ? !!convertValue(settings.bindable.value) : false,
+				name: n,
+				doc: doclet && doclet.description,
+				since: doclet && doclet.since,
+				deprecation: doclet && doclet.deprecated,
+				experimental: doclet && doclet.experimental,
+				visibility: collectVisibilityInfo(settings, doclet, oClassInfo.name, n),
+				stakeholders: doclet && doclet.__ui5 && doclet.__ui5.stakeholders,
+				type: dataType,
+				defaultValue: settings.defaultValue ? convertValueWithRaw(settings.defaultValue.value, dataType, n) : null,
+				group: settings.group ? settings.group.value.value : 'Misc',
+				bindable: settings.bindable ? !!convertValue(settings.bindable.value) : false,
 				methods: (methods = {
 					"get": "get" + N,
 					"set": "set" + N
 				})
 			};
-			if ( oClassInfo.properties[n].bindable ) {
+			if (oClassInfo.properties[n].bindable) {
 				methods["bind"] = "bind" + N;
 				methods["unbind"] = "unbind" + N;
 			}
-			// if ( !settings.defaultValue ) {
-			//	console.log("property without defaultValue: " + oClassInfo.name + "." + n);
-			//}
+			// Check for @type definition
+			if (doclet?.type?.names) {
+				oClassInfo.properties[n].type = doclet?.type?.names.join('|');
+
+				if (oClassInfo.properties[n].type !== dataType) {
+					oClassInfo.properties[n].dataType = dataType;
+				}
+			}
 		});
 
 		oClassInfo.defaultAggregation = (metadata.defaultAggregation && metadata.defaultAggregation.value.value) || undefined;
@@ -1279,13 +1326,15 @@ function collectClassInfo(extendCall, classDoclet) {
 		each(metadata.aggregations, "type", (n, settings, doclet) => {
 			const N = upper(n);
 			let methods;
+
 			const aggr = oClassInfo.aggregations[n] = {
 				name: n,
 				doc : doclet && doclet.description,
 				deprecation : doclet && doclet.deprecated,
 				since : doclet && doclet.since,
 				experimental : doclet && doclet.experimental,
-				visibility : (settings.visibility && settings.visibility.value.value) || "public",
+				visibility: collectVisibilityInfo(settings, doclet, oClassInfo.name, n),
+				stakeholders: doclet && doclet.__ui5 && doclet.__ui5.stakeholders,
 				type : settings.type ? settings.type.value.value : "sap.ui.core.Control",
 				altTypes: settings.altTypes ? convertStringArray(settings.altTypes.value) : undefined,
 				singularName : settings.singularName ? settings.singularName.value.value : guessSingularName(n),
@@ -1318,13 +1367,15 @@ function collectClassInfo(extendCall, classDoclet) {
 		each(metadata.associations, "type", (n, settings, doclet) => {
 			const N = upper(n);
 			let methods;
+
 			oClassInfo.associations[n] = {
 				name: n,
 				doc : doclet && doclet.description,
 				deprecation : doclet && doclet.deprecated,
 				since : doclet && doclet.since,
 				experimental : doclet && doclet.experimental,
-				visibility : (settings.visibility && settings.visibility.value.value) || "public",
+				visibility: collectVisibilityInfo(settings, doclet, oClassInfo.name, n),
+				stakeholders: doclet && doclet.__ui5 && doclet.__ui5.stakeholders,
 				type : settings.type ? settings.type.value.value : "sap.ui.core.Control",
 				singularName : settings.singularName ? settings.singularName.value.value : guessSingularName(n),
 				cardinality : (settings.multiple && settings.multiple.value.value) ? "0..n" : "0..1",
@@ -1344,13 +1395,15 @@ function collectClassInfo(extendCall, classDoclet) {
 
 		each(metadata.events, null, (n, settings, doclet) => {
 			const N = upper(n);
+
 			const info = oClassInfo.events[n] = {
 				name: n,
 				doc : doclet && doclet.description,
 				deprecation : doclet && doclet.deprecated,
 				since : doclet && doclet.since,
 				experimental : doclet && doclet.experimental,
-				visibility : /* (settings.visibility && settings.visibility.value.value) || */ "public",
+				visibility: collectVisibilityInfo(settings, doclet, oClassInfo.name, n),
+				stakeholders: doclet && doclet.__ui5 && doclet.__ui5.stakeholders,
 				allowPreventDefault : !!(settings.allowPreventDefault && settings.allowPreventDefault.value.value),
 				enableEventBubbling : !!(settings.enableEventBubbling && settings.enableEventBubbling.value.value),
 				parameters : {},
@@ -1710,17 +1763,24 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 //		return s.slice(s.lastIndexOf('.') + 1);
 //	}
 
-	function createVisibilityTags(doclet) {
-		const access = (doclet && doclet.access) || "public";
+	function createVisibilityTags(access, stakeholders) {
 		if ( access === "restricted" ) {
 			return [
 				"@private",
-				"@ui5-restricted" + (doclet.__ui5 && Array.isArray(doclet.__ui5.stakeholders) ? " " + doclet.__ui5.stakeholders.join(", ") : "")
+				"@ui5-restricted" + (Array.isArray(stakeholders) ? " " + stakeholders.join(", ") : "")
 			];
 		}
 		return "@" + access;
 	}
 
+	function createVisibilityTagsForSetting(settingInfo, classAccess) {
+		let access = settingInfo.visibility ?? "public";
+		if ( classAccess === "restricted" && (access === "public" || access === "protected")) {
+			access = "restricted";
+		}
+		return createVisibilityTags(access, settingInfo.stakeholders);
+	}
+
 	const HUNGARIAN_PREFIXES = {
 		'int' : 'i',
 		'boolean' : 'b',
@@ -1761,7 +1821,8 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 	const m = /(?:^|\r\n|\n|\r)[ \t]*\**[ \t]*@[a-zA-Z]/.exec(rawClassComment);
 	const p = m ? m.index : -1;
 	const hasSettingsDocs = rawClassComment.indexOf("The supported settings are:") >= 0;
-	const visibility = createVisibilityTags(doclet);
+	const classAccess = doclet?.access ?? "public";
+	const visibility = createVisibilityTags(classAccess, doclet?.__ui5?.stakeholders);
 	const thisClass = 'this'; // oClassInfo.name
 
 	// heuristic to recognize a ManagedObject
@@ -1916,6 +1977,8 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 		if ( info.visibility === 'hidden' ) {
 			continue;
 		}
+		const visibilityTags = createVisibilityTagsForSetting(info, classAccess);
+
 		// link = newStyle ? "{@link #setting:" + n + " " + n + "}" : "<code>" + n + "</code>";
 		link = "{@link " + (newStyle ? "#setting:" + n : rname("get", n))  + " " + n + "}";
 		newJSDoc([
@@ -1930,7 +1993,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			info.since ? "@since " + info.since : "",
 			info.deprecation ? "@deprecated " + info.deprecation : "",
 			info.experimental ? "@experimental " + info.experimental : "",
-			visibility,
+			visibilityTags,
 			"@name " + name("get", n),
 			"@function"
 		]);
@@ -1949,7 +2012,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			info.since ? "@since " + info.since : "",
 			info.deprecation ? "@deprecated " + info.deprecation : "",
 			info.experimental ? "@experimental " + info.experimental : "",
-			visibility,
+			visibilityTags,
 			"@name " + name("set", n),
 			"@function"
 		]);
@@ -1964,7 +2027,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("bind", n),
 				"@function"
 			]);
@@ -1974,7 +2037,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("unbind", n),
 				"@function"
 			]);
@@ -1986,6 +2049,8 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 		if ( info.visibility === 'hidden' ) {
 			continue;
 		}
+		const visibilityTags = createVisibilityTagsForSetting(info, classAccess);
+
 		// link = newStyle ? "{@link #setting:" + n + " " + n + "}" : "<code>" + n + "</code>";
 		link = "{@link " + (newStyle ? "#setting:" + n : rname("get", n))  + " " + n + "}";
 		newJSDoc([
@@ -1998,7 +2063,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			info.since ? "@since " + info.since : "",
 			info.deprecation ? "@deprecated " + info.deprecation : "",
 			info.experimental ? "@experimental " + info.experimental : "",
-			visibility,
+			visibilityTags,
 			"@name " + name("get", n),
 			"@function"
 		]);
@@ -2018,7 +2083,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("insert", n1),
 				"@function"
 			]);
@@ -2031,7 +2096,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("add", n1),
 				"@function"
 			]);
@@ -2043,7 +2108,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("remove", n1),
 				"@function"
 			]);
@@ -2055,7 +2120,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("removeAll", n),
 				"@function"
 			]);
@@ -2068,7 +2133,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("indexOf", n1),
 				"@function"
 			]);
@@ -2080,7 +2145,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("set", n),
 				"@function"
 			]);
@@ -2091,7 +2156,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			info.since ? "@since " + info.since : "",
 			info.deprecation ? "@deprecated " + info.deprecation : "",
 			info.experimental ? "@experimental " + info.experimental : "",
-			visibility,
+			visibilityTags,
 			"@name " + name("destroy", n),
 			"@function"
 		]);
@@ -2106,7 +2171,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("bind", n),
 				"@function"
 			]);
@@ -2116,7 +2181,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("unbind", n),
 				"@function"
 			]);
@@ -2128,6 +2193,8 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 		if ( info.visibility === 'hidden' ) {
 			continue;
 		}
+		const visibilityTags = createVisibilityTagsForSetting(info, classAccess);
+
 		// link = newStyle ? "{@link #setting:" + n + " " + n + "}" : "<code>" + n + "</code>";
 		link = "{@link " + (newStyle ? "#setting:" + n : rname("get", n))  + " " + n + "}";
 		newJSDoc([
@@ -2141,7 +2208,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			info.since ? "@since " + info.since : "",
 			info.deprecation ? "@deprecated " + info.deprecation : "",
 			info.experimental ? "@experimental " + info.experimental : "",
-			visibility,
+			visibilityTags,
 			"@name " + name("get", n),
 			"@function"
 		]);
@@ -2155,7 +2222,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("add", n1),
 				"@function"
 			]);
@@ -2166,7 +2233,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("remove", n1),
 				"@function"
 			]);
@@ -2176,7 +2243,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("removeAll", n),
 				"@function"
 			]);
@@ -2188,7 +2255,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				info.since ? "@since " + info.since : "",
 				info.deprecation ? "@deprecated " + info.deprecation : "",
 				info.experimental ? "@experimental " + info.experimental : "",
-				visibility,
+				visibilityTags,
 				"@name " + name("set", n),
 				"@function"
 			]);
@@ -2197,6 +2264,8 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 
 	for (let n in oClassInfo.events ) {
 		const info = oClassInfo.events[n];
+		const visibilityTags = createVisibilityTagsForSetting(info, classAccess);
+
 		//link = newStyle ? "{@link #event:" + n + " " + n + "}" : "<code>" + n + "</code>";
 		link = "{@link #event:" + n + " " + n + "}";
 
@@ -2221,7 +2290,8 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"@param {" + (info.parameters[pName].type || "") + "} oControlEvent.getParameters." + pName + " " + (info.parameters[pName].doc || "")
 			);
 		}
-		lines.push(visibility);
+		lines.push(visibilityTags);
+
 		newJSDoc(lines);
 
 		newJSDoc([
@@ -2240,7 +2310,7 @@ 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",
-			visibility,
+			visibilityTags,
 			info.since ? "@since " + info.since : "",
 			info.deprecation ? "@deprecated " + info.deprecation : "",
 			info.experimental ? "@experimental " + info.experimental : "",
@@ -2260,7 +2330,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			info.since ? "@since " + info.since : "",
 			info.deprecation ? "@deprecated " + info.deprecation : "",
 			info.experimental ? "@experimental " + info.experimental : "",
-			visibility,
+			visibilityTags,
 			"@name " + name("detach", n),
 			"@function"
 		]);
@@ -2293,8 +2363,17 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 		} else {
 			lines.push("@returns {" + thisClass + "} Reference to <code>this</code> in order to allow method chaining");
 		}
+
+		let vis = "protected"; // default, when event and class are public
+		if (info.visibility !== "public") {
+			vis = info.visibility; // reduced JSDoc visibility of event
+		}
+		if (classAccess === "restricted") {
+			vis = "restricted"; // reduced visibility of class
+		}
+
 		lines.push(
-			visibility === "@public" ? "@protected" : visibility,
+			createVisibilityTags(vis, info.stakeholders),
 			info.since ? "@since " + info.since : "",
 			info.deprecation ? "@deprecated " + info.deprecation : "",
 			info.experimental ? "@experimental " + info.experimental : "",
@@ -2607,7 +2686,14 @@ exports.defineTags = function(dictionary) {
 			}
 		}
 	});
-
+	dictionary.defineTag('ui5-module-override', {
+		onTagged: function(doclet, tag) {
+			if ( tag.value ) {
+				const args = tag.value.trim().split(/\s+/);
+				ui5data(doclet).moduleOverride = [ args[0], args[1] ?? ""];
+			}
+		}
+	});
 	/**
 	 * Mark a doclet as synthetic.
 	 *
@@ -2786,6 +2872,11 @@ exports.handlers = {
 				debug("found matching local declaration", e.doclet.longname, "'" + localDecl.export + "'", currentModule.defaultExport);
 				_ui5data.export = localDecl.export;
 			}
+			if ( _ui5data.moduleOverride ) {
+				_ui5data.resource = _ui5data.moduleOverride[0] + ".js";
+				_ui5data.module = _ui5data.moduleOverride[0];
+				_ui5data.export = _ui5data.moduleOverride[1];
+			}
 		}
 
 

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

@@ -1610,6 +1610,9 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				attrib("name", special.name);
 				attrib("type", special.type);
 				attrib("visibility", special.visibility, 'public');
+				if (special.stakeholders) {
+					stakeholderList("allowedFor", special.stakeholders);
+				}
 				attribSince(special.since);
 				tag("description", normalizeWS(special.doc), true);
 				tagWithSince("experimental", special.experimental);
@@ -1632,9 +1635,18 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				tag("property");
 				attrib("name", prop.name);
 				attrib("type", prop.type, 'string');
+
+				if (prop.dataType) {
+					attrib("dataType", prop.dataType, 'string');
+				}
+
 				attrib("defaultValue", defaultValue, null, /* raw = */true);
 				attrib("group", prop.group, 'Misc');
 				attrib("visibility", prop.visibility, 'public');
+				if (prop.stakeholders) {
+					stakeholderList("allowedFor", prop.stakeholders);
+				}
+
 				attribSince(prop.since);
 				if ( prop.bindable ) {
 					attrib("bindable", prop.bindable, false, /* raw = */true);
@@ -1669,6 +1681,10 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				}
 				attrib("cardinality", aggr.cardinality, '0..n');
 				attrib("visibility", aggr.visibility, 'public');
+				if (aggr.stakeholders) {
+					stakeholderList("allowedFor", aggr.stakeholders);
+				}
+
 				attribSince(aggr.since);
 				if ( aggr.bindable ) {
 					attrib("bindable", aggr.bindable, false, /* raw = */true);
@@ -1699,6 +1715,10 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				attrib("type", assoc.type, 'sap.ui.core.Control');
 				attrib("cardinality", assoc.cardinality, '0..1');
 				attrib("visibility", assoc.visibility, 'public');
+				if (assoc.stakeholders) {
+					stakeholderList("allowedFor", assoc.stakeholders);
+				}
+
 				attribSince(assoc.since);
 				tag("description", normalizeWS(assoc.doc), true);
 				tagWithSince("experimental", assoc.experimental);
@@ -1716,6 +1736,9 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 				tag("event");
 				attrib("name", event.name);
 				attrib("visibility", event.visibility, 'public');
+				if (event.stakeholders) {
+					stakeholderList("allowedFor", event.stakeholders);
+				}
 				if ( event.allowPreventDefault ) {
 					attrib("allowPreventDefault", event.allowPreventDefault, false, /* raw = */true);
 				}
@@ -2285,7 +2308,7 @@ function createAPIJSON4Symbol(symbol, omitDefaults) {
 		if ( symbol.__ui5.stereotype !== 'xmlmacro' && ownMethods.length > 0 ) {
 			collection("methods");
 			ownMethods.forEach(function(member) {
-				writeMethod(member, undefined, symbol.kind === 'interface');
+				writeMethod(member, undefined, symbol.kind === 'interface' || symbol.kind === 'class');
 				if ( member.__ui5.members ) {
 					// HACK: export nested static functions as siblings of the current function
 					// A correct representation has to be discussed with the SDK / WebIDE

package/lib/tasks/generateThemeDesignerResources.js

@@ -2,6 +2,7 @@ import posixPath from "node:path/posix";
 import {getLogger} from "@ui5/logger";
 const log = getLogger("builder:tasks:generateThemeDesignerResources");
 import libraryLessGenerator from "../processors/libraryLessGenerator.js";
+import {updateLibraryDotTheming} from "./utils/dotTheming.js";
 import ReaderCollectionPrioritized from "@ui5/fs/ReaderCollectionPrioritized";
 import Resource from "@ui5/fs/Resource";
 import fsInterface from "@ui5/fs/fsInterface";
@@ -44,6 +45,10 @@ function generateLibraryDotTheming({namespace, version, hasThemes}) {
 		sVersion: version
 	};
 
+	// Note that with sap.ui.core version 1.127.0 the .theming file has been put into
+	// the library sources so that "aFiles" can be maintained from there.
+	// The below configuration is still needed for older versions of sap.ui.core which do not
+	// contain the file.
 	if (namespace === "sap/ui/core") {
 		dotTheming.aFiles = [
 			"library",
@@ -241,12 +246,33 @@ export default async function({workspace, dependencies, options}) {
 	// Only for type "library". Type "theme-library" does not provide a namespace
 	// Also needs to be created in case a library does not have any themes (see bIgnore flag)
 	if (namespace) {
-		log.verbose(`Generating .theming for namespace ${namespace}`);
-		const libraryDotThemingResource = generateLibraryDotTheming({
-			namespace,
-			version,
-			hasThemes
-		});
+		let libraryDotThemingResource;
+
+		// Do not generate a .theming file for the sap.ui.core library
+		if (namespace === "sap/ui/core") {
+			// Check if the .theming file already exists
+			libraryDotThemingResource = await workspace.byPath(`/resources/${namespace}/.theming`);
+			if (libraryDotThemingResource) {
+				// Update the existing .theming resource
+				log.verbose(`Updating .theming for namespace ${namespace}`);
+				await updateLibraryDotTheming({
+					resource: libraryDotThemingResource,
+					namespace,
+					version,
+					hasThemes
+				});
+			}
+		}
+
+		if (!libraryDotThemingResource) {
+			log.verbose(`Generating .theming for namespace ${namespace}`);
+			libraryDotThemingResource = generateLibraryDotTheming({
+				namespace,
+				version,
+				hasThemes
+			});
+		}
+
 		await workspace.write(libraryDotThemingResource);
 	}
 

package/lib/tasks/utils/dotTheming.js

@@ -0,0 +1,33 @@
+export async function updateLibraryDotTheming({resource, namespace, version, hasThemes}) {
+	const dotTheming = JSON.parse(await resource.getString());
+
+	if (!dotTheming.sEntity) {
+		throw new Error(`Missing 'sEntity' property in ${resource.getPath()}`);
+	}
+
+	if (dotTheming.sEntity !== "Library") {
+		throw new Error(
+			`Incorrect 'sEntity' value '${dotTheming.sEntity}' in ${resource.getPath()}: ` +
+			`Expected 'Library'`
+		);
+	}
+
+	if (!dotTheming.sId) {
+		throw new Error(`Missing 'sId' property in ${resource.getPath()}`);
+	}
+
+	if (dotTheming.sId !== namespace) {
+		throw new Error(`Incorrect 'sId' value '${dotTheming.sId}' in ${resource.getPath()}: Expected '${namespace}'`);
+	}
+
+	dotTheming.sVersion = version;
+
+	if (!hasThemes) {
+		// Set ignore flag when there are no themes at all
+		// This is important in case a library used to contain themes that have been removed
+		// in a later version of the library.
+		dotTheming.bIgnore = true;
+	}
+
+	resource.setString(JSON.stringify(dotTheming, null, 2));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "3.4.1",
+	"version": "3.5.1",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -22,6 +22,7 @@
 		"./processors/jsdoc/lib/*": null,
 		"./tasks/*": "./lib/tasks/*.js",
 		"./tasks/taskRepository": null,
+		"./tasks/utils/*": null,
 		"./tasks/bundlers/utils/*": null,
 		"./package.json": "./package.json",
 		"./internal/taskRepository": "./lib/tasks/taskRepository.js",
@@ -118,7 +119,7 @@
 		"url": "git@github.com:SAP/ui5-builder.git"
 	},
 	"dependencies": {
-		"@jridgewell/sourcemap-codec": "^1.4.15",
+		"@jridgewell/sourcemap-codec": "^1.5.0",
 		"@ui5/fs": "^3.0.5",
 		"@ui5/logger": "^3.0.0",
 		"cheerio": "1.0.0-rc.12",
@@ -129,16 +130,16 @@
 		"jsdoc": "^4.0.3",
 		"less-openui5": "^0.11.6",
 		"pretty-data": "^0.40.0",
-		"rimraf": "^5.0.6",
-		"semver": "^7.6.2",
-		"terser": "^5.31.0",
+		"rimraf": "^5.0.9",
+		"semver": "^7.6.3",
+		"terser": "^5.31.3",
 		"workerpool": "^6.5.1",
 		"xml2js": "^0.6.2"
 	},
 	"devDependencies": {
 		"@istanbuljs/esm-loader-hook": "^0.2.0",
 		"@jridgewell/trace-mapping": "^0.3.25",
-		"@ui5/project": "^3.9.1",
+		"@ui5/project": "^3.9.2",
 		"ava": "^5.3.1",
 		"chai": "^4.4.1",
 		"chai-fs": "^2.0.0",
@@ -150,7 +151,7 @@
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^14.0.0",
 		"eslint-plugin-jsdoc": "^46.10.1",
-		"esmock": "^2.6.5",
+		"esmock": "^2.6.7",
 		"line-column": "^1.0.2",
 		"nyc": "^15.1.0",
 		"open-cli": "^7.2.0",