@ui5/builder 2.11.5 → 2.11.7

package/CHANGELOG.md

@@ -2,7 +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/v2.11.5...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v2.11.7...HEAD).
+
+<a name="v2.11.7"></a>
+## [v2.11.7] - 2022-10-16
+### Dependency Updates
+- Bump escope from 3.6.0 to 4.0.0 [`852b37f`](https://github.com/SAP/ui5-builder/commit/852b37f549f3927decbc1b40cc6055325472d625)
+
+### Reverts
+- [FIX] package.json: Downgrade es5-ext dependency ([#798](https://github.com/SAP/ui5-builder/issues/798))
+
+
+<a name="v2.11.6"></a>
+## [v2.11.6] - 2022-10-12
+### Bug Fixes
+- **package.json:** Downgrade es5-ext dependency ([#798](https://github.com/SAP/ui5-builder/issues/798)) [`0e18008`](https://github.com/SAP/ui5-builder/commit/0e18008d86da93c5c8743b17ac0091afc3064d78)
+
 
 <a name="v2.11.5"></a>
 ## [v2.11.5] - 2022-05-04
@@ -648,6 +663,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)
 
 
+[v2.11.7]: https://github.com/SAP/ui5-builder/compare/v2.11.6...v2.11.7
+[v2.11.6]: https://github.com/SAP/ui5-builder/compare/v2.11.5...v2.11.6
 [v2.11.5]: https://github.com/SAP/ui5-builder/compare/v2.11.4...v2.11.5
 [v2.11.4]: https://github.com/SAP/ui5-builder/compare/v2.11.3...v2.11.4
 [v2.11.3]: https://github.com/SAP/ui5-builder/compare/v2.11.2...v2.11.3

package/lib/processors/jsdoc/lib/createIndexFiles.js

@@ -1,7 +1,7 @@
 /*
  * Node script to create cross-library API index files for use in the UI5 SDKs.
  *
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 

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

@@ -1,7 +1,7 @@
 /*
  * Node script to preprocess api.json files for use in the UI5 SDKs.
  *
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -25,6 +25,11 @@ const log = (function() {
 	}
 }());
 
+function replaceLastPathSegment(p, replacement) {
+	// Note: path.join also correctly normalizes any POSIX paths on Windows
+	return path.join(path.dirname(p), replacement);
+}
+
 /*
  * Transforms the api.json as created by the JSDoc build into a pre-processed api.json file suitable for the SDK.
  *
@@ -698,7 +703,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 							oMethod.returnValue.types.forEach(oType => {
 
 								// Link Enabled
-								if (!isBuiltInType(oType.value)) {
+								if (!isBuiltInType(oType.value) && possibleUI5Symbol(oType.value)) {
 									oType.href = "api/" + oType.value.replace("[]", "");
 									oType.linkEnabled = true;
 								}
@@ -981,6 +986,57 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			// Normalize path to resolve relative path
 			sPath = path.normalize(sPath);
 
+			const {sources} = options;
+			let {librarySrcDir, libraryTestDir} = options;
+
+			// Using path.join to normalize POSIX paths to Windows paths on Windows
+			librarySrcDir = path.join(librarySrcDir);
+			libraryTestDir = path.join(libraryTestDir);
+
+			if (Array.isArray(sources) && typeof librarySrcDir === "string" && typeof libraryTestDir === "string") {
+				/**
+				 * Calculate prefix to check
+				 *
+				 * Example 1:
+				 * - sSource: /path/to/project/src
+				 * - sLibrarySrcDir: src
+				 *
+				 * Prefix: /path/to/project/test-resources
+				 *
+				 * Example 2:
+				 * - sSource: /path/to/project/src/main/js
+				 * - sLibrarySrcDir: src/main/js
+				 *
+				 * Prefix: /path/to/project/src/main/test-resources
+				 */
+				const librarySrcDirWithTestResources = replaceLastPathSegment(librarySrcDir, "test-resources");
+
+				for (const sourcePath of sources) {
+					/**
+					 * Replace prefix with file system path
+					 *
+					 * Example 1:
+					 * - sPath: /path/to/project/test-resources/sap/test/demokit/docuindex.json
+					 *
+					 * New sPath: /path/to/project/test/sap/test/demokit/docuindex.json
+					 *
+					 * Example 2:
+					 * - sPath: /path/to/project/src/main/test-resources/sap/test/demokit/docuindex.json
+					 *
+					 * New sPath: /path/to/project/src/main/test/sap/test/demokit/docuindex.json
+					 */
+					if (!sourcePath.endsWith(librarySrcDir)) {
+						continue;
+					}
+					const libraryDir = sourcePath.substring(0, sourcePath.lastIndexOf(librarySrcDir) - 1);
+					const prefix = path.join(libraryDir, librarySrcDirWithTestResources);
+					if (sPath.startsWith(prefix)) {
+						sPath = path.join(libraryDir, libraryTestDir, sPath.substring(prefix.length));
+						break;
+					}
+				}
+			}
+
 			fs.readFile(sPath, 'utf8', (oError, oFileData) => {
 				if (!oError) {
 					oFileData = JSON.parse(oFileData);
@@ -991,7 +1047,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						});
 					}
 				}
-				// We aways resolve as this data is not mandatory
+				// We always resolve as this data is not mandatory
 				oResolve(oChainObject);
 			});
 
@@ -1154,7 +1210,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		},
 
 		formatMethodCode: function (sName, aParams, aReturnValue) {
-			var result = '<pre class="prettyprint">' + sName + '(';
+			var result = '<pre>' + sName + '(';
 
 			if (aParams && aParams.length > 0) {
 				/* We consider only root level parameters so we get rid of all that are not on the root level */
@@ -1258,7 +1314,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		 * @returns string - The code needed to create an object of that class
 		 */
 		formatConstructor: function (name, params) {
-			var result = '<pre class="prettyprint">new ';
+			var result = '<pre>new ';
 
 			if (name) {
 				result += name + '(';
@@ -1508,8 +1564,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						name: oResult.static ? [self.name, oResult.name].join(".") : oResult.name,
 						type: "methods",
 						className: className,
-						text: text,
-						local: true
+						text: text
 					});
 				}
 			}
@@ -1549,7 +1604,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		 * @param {string} [hrefAppend=""]
 		 * @returns {string} link
 		 */
-		createLink: function ({name, type, className, text=name, local=false, hrefAppend=""}) {
+		createLink: function ({name, type, className, text=name, hrefAppend=""}) {
 			let sLink;
 
 			// handling module's
@@ -1564,12 +1619,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 				sLink += hrefAppend;
 			}
 
-			if (local) {
-			  	let sScrollClass = "scrollTo" + type[0].toUpperCase() + type.slice(1, -1);
-				return `<a target="_self" class="jsdoclink ${sScrollClass}" data-target="${name}" href="api/${sLink}">${text}</a>`;
-			}
-
-			return `<a target="_self" class="jsdoclink" href="api/${sLink}">${text}</a>`;
+			return `<a target="_self" href="api/${sLink}">${text}</a>`;
 		},
 
 		/**
@@ -1597,7 +1647,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						}
 
 						// topic:xxx Topic
-						aMatch = sTarget.match(/^topic:(\w{32})$/);
+						aMatch = sTarget.match(/^topic:(\w{32}(?:#\w*)?(?:\/\w*)?)$/);
 						if (aMatch) {
 							return '<a target="_self" href="topic/' + aMatch[1] + '">' + sText + '</a>';
 						}
@@ -1665,7 +1715,6 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 								name: aMatch[1] ? `${oSelf.name}.${aMatch[2]}` : aMatch[2],
 								type: "methods",
 								className: oSelf.name,
-								local: true,
 								text: sText
 							});
 						}
@@ -1677,7 +1726,6 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 								name: aMatch[1],
 								type: "annotations",
 								className: oSelf.name,
-								local: true,
 								text: sText
 							});
 						}
@@ -1704,7 +1752,6 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 								name: aMatch[1],
 								type: "events",
 								className: oSelf.name,
-								local: true,
 								text: sText
 							});
 						}

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

@@ -1,7 +1,7 @@
 /*
  * JSDoc3 plugin for UI5 documentation generation.
  *
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -288,10 +288,11 @@ function collectShortcuts(body) {
 		} else if ( valueNode.type === Syntax.MemberExpression ) {
 			const _import = getLeftmostName(valueNode);
 			const local = _import && currentModule.localNames[_import];
-			if ( typeof local === 'object' && local.module ) {
+			const objectName = getObjectName(valueNode);
+			if ( objectName && typeof local === 'object' && local.module ) {
 				currentModule.localNames[name] = {
 					module: local.module,
-					path: getObjectName(valueNode).split('.').slice(1).join('.') // TODO chaining if local has path
+					path: objectName.split('.').slice(1).join('.') // TODO chaining if local has path
 				};
 				debug(`  found local shortcut: ${name} ${currentModule.localNames[name]}`);
 			}
@@ -1617,7 +1618,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 				"Removes a " + n1 + " from the aggregation " + link + ".",
 				"",
 				"@param {int | string | " + makeTypeString(info, true) + "} " + varname(n1, "variant") + " The " + n1 + " to remove or its index or id",
-				"@returns {" + makeTypeString(info, true) + "} The removed " + n1 + " or <code>null</code>",
+				"@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 : "",
@@ -1740,7 +1741,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			newJSDoc([
 				"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} The removed " + n1 + " or <code>null</code>",
+				"@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 : "",
@@ -1812,7 +1813,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			"",
 			"@param {object}",
 			"           [oData] An application-specific payload object that will be passed to the event handler along with the event object when firing the event",
-			"@param {function}",
+			"@param {function(sap.ui.base.Event):void}",
 			"           fnFunction The function to be called when the event occurs",
 			"@param {object}",
 			"           [oListener] Context object to call the event handler with. Defaults to this <code>" + oClassInfo.name + "</code> itself",
@@ -1830,7 +1831,7 @@ function createAutoDoc(oClassInfo, classComment, doclet, node, parser, filename,
 			"",
 			"The passed function and listener object must match the ones used for event registration.",
 			"",
-			"@param {function}",
+			"@param {function(sap.ui.base.Event):void}",
 			"           fnFunction The function to be called, when the event occurs",
 			"@param {object}",
 			"           [oListener] Context object on which the given function had to be called",
@@ -2677,3 +2678,132 @@ exports.astNodeVisitor = {
 	}
 
 };
+
+(function() {
+	const jsdocType = require("jsdoc/lib/jsdoc/tag/type");
+	const catharsis = require('catharsis');
+	const TYPES = catharsis.Types;
+
+	const toTypeString = (type) => getTypeStrings(type).join("|");
+
+	/*
+	 * This function has been copied from jsdoc/lib/jsdoc/tag/type (version 3.6.7)
+	 * The copy has been enhanced with the changes from https://github.com/jsdoc/jsdoc/pull/1735
+	 * to retain the full function signature for function types and with a further change
+	 * to retain the full record type structure.
+	 *
+	 * JSDoc is copyright (c) 2011-present Michael Mathews micmath@gmail.com and the contributors to JSDoc.
+	 */ 
+	function getTypeStrings(parsedType, isOutermostType) {
+		let applications;
+		let typeString;
+		let types = [];
+		switch (parsedType.type) {
+			case TYPES.AllLiteral:
+				types.push('*');
+				break;
+			case TYPES.FunctionType:
+				typeString = 'function';
+				// #### BEGIN: MODIFIED BY SAP
+				const paramTypes = [];
+				if (parsedType.new) {
+					paramTypes.push(toTypeString(parsedType.new));
+				}
+				if (Array.isArray(parsedType.params)) {
+					paramTypes.push(...parsedType.params.map(toTypeString));
+				}
+				if (paramTypes.length || parsedType.result) {
+					typeString += `(${paramTypes.join(", ")})`;
+				}
+				if (parsedType.result) {
+					typeString += `:${toTypeString(parsedType.result)}`;
+				}
+				types.push(typeString);
+				// #### END: MODIFIED BY SAP
+				break;
+			 case TYPES.NameExpression:
+				 types.push(parsedType.name);
+				break;
+			case TYPES.NullLiteral:
+				types.push('null');
+				break;
+			case TYPES.RecordType:
+				// #### BEGIN: MODIFIED BY SAP
+				// types.push('Object');
+				if (Array.isArray(parsedType.fields)) {
+					typeString = `{${parsedType.fields.map(
+						({key,value}) => {
+							const keyString = catharsis.stringify(key);
+							if (value) {
+								var propertyPlusType = `${keyString}: ${toTypeString(value)}`;
+								return propertyPlusType;
+							} else {
+								let pos;
+								if (keyString && (pos = keyString.indexOf(":")) > -1) {
+									// When no space is present between colon and type (e.g. the structure looks like "{x:number}" with no space after
+									// the colon), then Catharsis parses this as property name "x:number" with no type given.
+									// In this case give a clear hint that this space is needed and throw an error to prevent such issues from being merged
+									const realName = keyString.substring(0, pos);
+									const realValue = keyString.substring(pos + 1, keyString.length);
+									let message = `Cannot parse the "${keyString}" part of "${parsedType.typeExpression}" in RecordType (log output above may give a hint in which file).\n`;
+									message += `Did you mean to specify a property "${realName}" of type "${realValue}"? Then insert a space after the colon and write "${realName}: ${realValue}".`
+									error(message);
+									return "x: any"; // unparseable property set to "any" - but the JSDoc run will fail now, anyway
+								} else {
+									// only property given without type; this will be turned into type "any" further downstream
+									return keyString;
+								}
+							}
+						}
+					).join(', ')}}`;
+					types.push(typeString);
+				} else {
+					types.push('Object');
+				}
+				// #### END: MODIFIED BY SAP
+				break;
+			case TYPES.TypeApplication:
+				// if this is the outermost type, we strip the modifiers; otherwise, we keep them
+				if (isOutermostType) {
+					applications = parsedType.applications.map(application =>
+						catharsis.stringify(application)).join(', ');
+					typeString = `${getTypeStrings(parsedType.expression)[0]}.<${applications}>`;
+					types.push(typeString);
+				}
+				else {
+					types.push( catharsis.stringify(parsedType) );
+				}
+				break;
+			case TYPES.TypeUnion:
+				parsedType.elements.forEach(element => {
+					types = types.concat( getTypeStrings(element) );
+				});
+				break;
+			case TYPES.UndefinedLiteral:
+				types.push('undefined');
+				break;
+			case TYPES.UnknownLiteral:
+				types.push('?');
+				break;
+			default:
+				// this shouldn't happen
+				throw new Error(`unrecognized type ${parsedType.type} in parsed type: ${parsedType}`);
+		}
+		return types;
+	}
+
+	const origParse = jsdocType.parse;
+	jsdocType.parse = function() {
+		const tagInfo = origParse.apply(this, arguments);
+		// #### BEGIN: MODIFIED BY SAP
+		if ( tagInfo && (/function/.test(tagInfo.typeExpression) || /\{.*\}/.test(tagInfo.typeExpression)) && tagInfo.parsedType ) {
+			// #### END: MODIFIED BY SAP
+			// console.info("old typeExpression", tagInfo.typeExpression); 
+			// console.info("old parse tree", tagInfo.parsedType); 
+			// console.info("old parse result", tagInfo.type); 
+			tagInfo.type = getTypeStrings(tagInfo.parsedType);
+			// console.info("new parse result", tagInfo.type); 
+		}
+		return tagInfo;
+	}
+}());

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

@@ -1,7 +1,7 @@
 /*
  * JSDoc3 template for UI5 documentation generation.
  *
- * (c) Copyright 2009-2021 SAP SE or an SAP affiliate company.
+ * (c) Copyright 2009-2022 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
@@ -1660,59 +1660,59 @@ function makeLinkList(aSymbols) {
 class ASTBuilder {
 	literal(str) {
 		return {
-			type: 'literal',
+			type: "literal",
 			value: str
 		};
 	}
 	simpleType(type) {
 		return {
-			type: 'simpleType',
+			type: "simpleType",
 			name: type
 		};
 	}
 	array(componentType) {
 		return {
-			type: 'array',
+			type: "array",
 			component: componentType
 		};
 	}
 	object(keyType, valueType) {
 		return {
-			type: 'object',
+			type: "object",
 			key: keyType,
 			value: valueType
 		};
 	}
 	set(elementType) {
 		return {
-			type: 'set',
+			type: "set",
 			element: elementType
 		};
 	}
 	promise(fulfillmentType) {
 		return {
-			type: 'promise',
+			type: "promise",
 			fulfill: fulfillmentType
 		};
 	}
 	"function"(paramTypes, returnType, thisType, constructorType) {
 		return {
-			type: 'function',
-			params: paramTypes,
+			"type": "function",
+			"params": paramTypes,
 			"return": returnType,
 			"this": thisType,
-			constructor: constructorType
+			"constructor": constructorType
 		};
 	}
 	structure(structure) {
 		return {
-			type: 'structure',
+			type: "structure",
 			fields: structure
 		};
 	}
 	union(types) {
 		return {
-			type: 'union',
+			type: "union",
 			types: types
 		};
 	}
@@ -1737,7 +1737,7 @@ class ASTBuilder {
 	}
 	typeApplication(type, templateTypes) {
 		return {
-			type: 'typeApplication',
+			type: "typeApplication",
 			baseType: type,
 			templateTypes: templateTypes
 		};
@@ -1855,28 +1855,26 @@ 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;
 
-	/* TODO
-	 * - function(this:) // type of this
-	 * - function(new:) // constructor
-	 */
-	const rLexer = /\s*(Array\.?<|Object\.?<|Set\.?<|Promise\.?<|function\(|\{|:|\(|\||\}|\.?<|>|\)|,|\[\]|\*|\?|!|=|\.\.\.)|\s*(false|true|(?:\+|-)?(?:\d+(?:\.\d+)?|NaN|Infinity)|'[^']*'|"[^"]*"|null|undefined)|\s*((?:module:)?\w+(?:[\/.#~]\w+)*)|./g;
-
-	let input,
-		builder,
-		token,
-		tokenStr;
+	let input;
+	let builder;
+	let token;
+	let tokenStr;
 
 	function next(expected) {
 		if ( expected !== undefined && token !== expected ) {
-			throw new SyntaxError(`TypeParser: expected '${expected}', but found '${tokenStr}' (pos: ${rLexer.lastIndex}, input='${input}')`);
+			throw new SyntaxError(
+				`TypeParser: expected '${expected}', but found '${tokenStr}' ` +
+				`(pos: ${rLexer.lastIndex}, input='${input}')`
+			);
 		}
 		const match = rLexer.exec(input);
 		if ( match ) {
 			tokenStr = match[1] || match[2] || match[3];
-			token = match[1] || (match[2] && 'literal') || (match[3] && 'symbol');
+			token = match[1] || (match[2] && "literal") || (match[3] && "symbol");
 			if ( !token ) {
-				throw new SyntaxError(`TypeParser: unexpected '${tokenStr}' (pos: ${match.index}, input='${input}')`);
+				throw new SyntaxError(`TypeParser: unexpected '${match[0]}' (pos: ${match.index}, input='${input}')`);
 			}
 		} else {
 			tokenStr = token = null;
@@ -1886,147 +1884,166 @@ function TypeParser(defaultBuilder = new ASTBuilder()) {
 	function parseType() {
 		let nullable = false;
 		let mandatory = false;
-		if ( token === '?' ) {
+		if ( token === "?" ) {
 			next();
 			nullable = true;
-		} else if ( token === '!' ) {
+		} else if ( token === "!" ) {
 			next();
 			mandatory = true;
 		}
 
 		let type;
 
-		if ( token === 'literal' ) {
+		if ( token === "literal" ) {
 			type = builder.literal(tokenStr);
 			next();
-		} else if ( token === 'Array.<' || token === 'Array<' ) {
+		} else if ( token === "Array.<" || token === "Array<" ) {
 			next();
-			const componentType = parseType();
-			next('>');
+			const componentType = parseTypes();
+			next(">");
 			type = builder.array(componentType);
-		} else if ( token === 'Object.<' || token === 'Object<' ) {
+		} else if ( token === "Object.<" || token === "Object<" ) {
 			next();
 			let keyType;
-			let valueType = parseType();
-			if ( token === ',' ) {
+			let valueType = parseTypes();
+			if ( token === "," ) {
 				next();
 				keyType = valueType;
-				valueType = parseType();
+				valueType = parseTypes();
 			} else {
-				keyType = builder.synthetic(builder.simpleType('string'));
+				keyType = builder.synthetic(builder.simpleType("string"));
 			}
-			next('>');
+			next(">");
 			type = builder.object(keyType, valueType);
-		} else if ( token === 'Set.<' || token === 'Set<' ) {
+		} else if ( token === "Set.<" || token === "Set<" ) {
 			next();
-			const elementType = parseType();
-			next('>');
+			const elementType = parseTypes();
+			next(">");
 			type = builder.set(elementType);
-		} else if ( token === 'Promise.<' || token === 'Promise<' ) {
+		} else if ( token === "Promise.<" || token === "Promise<" ) {
 			next();
-			const resultType = parseType();
-			next('>');
+			const resultType = parseTypes();
+			next(">");
 			type = builder.promise(resultType);
-		} else if ( token === 'function(' ) {
+		} else if ( token === "function(" ) {
 			next();
-			let thisType, constructorType, paramTypes = [], returnType;
-			if ( tokenStr === 'this' ) {
+			let thisType;
+			let constructorType;
+			const paramTypes = [];
+			let returnType;
+			if ( tokenStr === "this" ) {
 				next();
-				next(':');
+				next(":");
 				thisType = parseType();
-				if ( token === ',' ) {
-					next();
+				if ( token !== ")" ) {
+					next(",");
 				}
-			} else if ( tokenStr === 'new' ) {
+			} else if ( tokenStr === "new" ) {
 				next();
-				next(':');
+				next(":");
 				constructorType = parseType();
-				if ( token === ',' ) {
-					next();
+				if ( token !== ")" ) {
+					next(",");
 				}
 			}
-			while ( token === 'symbol' || token === '...' ) {
-				const repeatable = token === '...';
-				if ( repeatable) {
+			while ( token !== ")" ) {
+				const repeatable = token === "...";
+				if ( repeatable ) {
 					next();
 				}
-				let paramType = parseType();
+				let paramType = parseTypes();
 				if ( repeatable ) {
 					paramType = builder.repeatable(paramType);
 				}
-				const optional = token === '=';
+				const optional = token === "=";
 				if ( optional ) {
 					builder.optional(paramType);
 					next();
 				}
 				paramTypes.push(paramType);
-				if ( token === ',' ) {
-					if ( repeatable ) {
-						throw new SyntaxError(`TypeParser: only the last parameter of a function can be repeatable (pos: ${rLexer.lastIndex}, input='${input}')`);
-					}
-					next();
+
+				// exit if there are no more parameters
+				if ( token !== "," ) {
+					break;
 				}
+
+				if ( repeatable ) {
+					throw new SyntaxError(
+						`TypeParser: only the last parameter of a function can be repeatable ` +
+						`(pos: ${rLexer.lastIndex}, input='${input}')`
+					);
+				}
+
+				// consume the comma
+				next();
 			}
-			next(')');
-			if ( token === ':' ) {
-				next(':');
+			next(")");
+			if ( token === ":" ) {
+				next(":");
 				returnType = parseType();
 			}
 			type = builder.function(paramTypes, returnType, thisType, constructorType);
-		} else if ( token === '{' ) {
+		} else if ( token === "{" ) {
 			const structure = Object.create(null);
 			next();
 			do {
 				const propName = tokenStr;
 				if ( !/^\w+$/.test(propName) ) {
-					throw new SyntaxError(`TypeParser: structure field must have a simple name (pos: ${rLexer.lastIndex}, input='${input}', field:'${propName}')`);
+					throw new SyntaxError(
+						`TypeParser: structure field must have a simple name ` +
+						`(pos: ${rLexer.lastIndex}, input='${input}', field:'${propName}')`
+					);
 				}
-				next('symbol');
+				next("symbol");
 				let propType;
-				if ( token === ':' ) {
+				if ( token === ":" ) {
 					next();
-					propType = parseType();
+					propType = parseTypes();
 				} else {
-					propType = builder.synthetic(builder.simpleType('any'));
+					propType = builder.synthetic(builder.simpleType("any"));
 				}
 				structure[propName] = propType;
-				if ( token === '}' ) {
+				if ( token === "}" ) {
 					break;
 				}
-				next(',');
+				next(",");
 			} while (token);
-			next('}');
+			next("}");
 			type = builder.structure(structure);
-		} else if ( token === '(' ) {
+		} else if ( token === "(" ) {
 			next();
 			type = parseTypes();
-			next(')');
-		} else if ( token === '*' ) {
+			next(")");
+		} else if ( token === "*" ) {
 			next();
-			type = builder.simpleType('*');
+			type = builder.simpleType("*");
 		} else {
 			type = builder.simpleType(tokenStr);
-			next('symbol');
+			next("symbol");
 			// check for suffix operators: either 'type application' (generics) or 'array', but not both of them
 			if ( token === "<" || token === ".<" ) {
 				next();
 				const templateTypes = [];
-				while ( token !== ">" ) {
-					const templateType = parseType();
+				do {
+					const templateType = parseTypes();
 					templateTypes.push(templateType);
-					if ( token === ',' ) {
-						next();
+					if ( token === ">" ) {
+						break;
 					}
-				}
+					next(",");
+				} while (token);
 				next(">");
 				type = builder.typeApplication(type, templateTypes);
 			} else {
-				while ( token === '[]' ) {
+				while ( token === "[]" ) {
 					next();
 					type = builder.array(type);
 				}
 			}
 		}
+		if ( builder.normalizeType ) {
+			type = builder.normalizeType(type);
+		}
 		if ( nullable ) {
 			type = builder.nullable(type);
 		}
@@ -2040,7 +2057,7 @@ function TypeParser(defaultBuilder = new ASTBuilder()) {
 		const types = [];
 		do {
 			types.push(parseType());
-			if ( token !== '|' ) {
+			if ( token !== "|" ) {
 				break;
 			}
 			next();
@@ -2065,7 +2082,6 @@ function TypeParser(defaultBuilder = new ASTBuilder()) {
 		next(null);
 		return type;
 	};
-
 }
 
 class TypeLinkBuilder extends TypeStringBuilder {
@@ -3428,17 +3444,22 @@ const builtinTypes = {
 	WeakMap: true,
 
 	// Web APIs
+	Attr:true,
 	Blob:true,
+	DataTransfer:true,
 	Document:true,
 	Element:true,
 	Event:true,
 	File:true,
-	HTMLElement: true,
+	FileList:true,
+	HTMLDocument:true,
+	HTMLElement:true,
 	Node:true,
 	Storage:true,
 	Touch:true,
 	TouchList:true,
-	Window: true
+	Window:true,
+	XMLDocument:true
 
 };
 

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

@@ -1,6 +1,6 @@
 
 
-const rSinceVersion = /^([0-9]+(?:\.[0-9]+(?:\.[0-9]+)?)?([-.][0-9A-Z]+)?)(\.$|\.\s+|[,:]\s*|\s-\s*|\s|$)/i;
+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);
 	if (m) {

package/lib/tasks/generateResourcesJson.js

@@ -43,7 +43,7 @@ function getCreatorOptions(projectName) {
  *
  * <p>
  * The detailed structure can be found in the documentation:
- * {@link https://openui5.hana.ondemand.com/#topic/adcbcf8b50924556ab3f321fcd9353ea}
+ * {@link https://sdk.openui5.org/topic/adcbcf8b50924556ab3f321fcd9353ea}
  * </p>
  *
  * <p>

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "2.11.5",
+	"version": "2.11.7",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -40,7 +40,7 @@
 		"version": "git-chglog --next-tag v$npm_package_version -o CHANGELOG.md && git add CHANGELOG.md",
 		"postversion": "git push --follow-tags",
 		"release-note": "git-chglog -c .chglog/release-config.yml v$npm_package_version",
-		"depcheck": "depcheck --ignores docdash"
+		"depcheck": "depcheck --ignores docdash --ignore-patterns lib/processors/jsdoc/lib/ui5"
 	},
 	"files": [
 		"index.js",
@@ -108,19 +108,19 @@
 		"@ui5/logger": "^2.0.1",
 		"cheerio": "1.0.0-rc.9",
 		"escape-unicode": "^0.2.0",
-		"escope": "^3.6.0",
+		"escope": "^4.0.0",
 		"espree": "^6.2.1",
 		"globby": "^11.1.0",
 		"graceful-fs": "^4.2.10",
-		"jsdoc": "^3.6.10",
+		"jsdoc": "^3.6.11",
 		"less-openui5": "^0.11.2",
 		"make-dir": "^3.1.0",
 		"pretty-data": "^0.40.0",
 		"pretty-hrtime": "^1.0.3",
 		"replacestream": "^4.0.3",
 		"rimraf": "^3.0.2",
-		"semver": "^7.3.7",
-		"terser": "^5.13.1",
+		"semver": "^7.3.8",
+		"terser": "^5.15.1",
 		"xml2js": "^0.4.23",
 		"yazl": "^2.5.1"
 	},