@ui5/builder 4.0.3 → 4.0.5

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

@@ -1,15 +1,14 @@
-/*
+/**
  * Node script to preprocess api.json files for use in the UI5 SDKs.
  *
  * (c) Copyright 2009-2024 SAP SE or an SAP affiliate company.
  * Licensed under the Apache License, Version 2.0 - see LICENSE.txt.
  */
 
-/* eslint-disable */
-
 "use strict";
 const cheerio = require("cheerio");
 const path = require('path');
+const {TypeParser} = require("./ui5/template/utils/typeParser");
 const log = (function() {
 	try {
 		return require("@ui5/logger").getLogger("builder:processors:jsdoc:transformApiJson");
@@ -36,13 +35,9 @@ function normalizeToUI5GlobalNotation(sModuleName){
 	return sModuleName.replace(/\//g, ".");
 }
 
-function fnCreateTypesArr(sTypes) {
-	return sTypes.split("|").map(function (sType) {
-		return { value: sType }
-	});
-}
+const typeParser = new TypeParser();
 
-/*
+/**
  * Transforms the api.json as created by the JSDoc build into a pre-processed api.json file suitable for the SDK.
  *
  * The pre-processing includes formatting of type references, rewriting of links and other time consuming calculations.
@@ -69,72 +64,208 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		log.info("Using custom fs.");
 	}
 	if (returnOutputFiles) {
-		log.info("Returning output files instead of writing to fs.")
+		log.info("Returning output files instead of writing to fs.");
 	}
 	log.info("");
 
 	function resolveTypeParameters(func) {
-		if ( func.typeParameters ) {
-			const replacements = Object.create(null);
-			let regex;
-			const _resolve = (str) =>
-				str && regex ? str.replace(regex, (_,prefix,token,suffix) => prefix + replacements[token] + suffix) : str;
-
-			func.typeParameters.forEach((typeParam) => {
-				typeParam.type = _resolve(typeParam.type);
-				replacements[typeParam.name] = typeParam.type || "any";
-				regex = new RegExp("(^|\\W)(" + Object.keys(replacements).join("|") + ")(\\W|$)");
-				typeParam.default = _resolve(typeParam.default);
-			});
-
-			function _resolveParamProperties(param) {
-				if ( param.parameterProperties ) {
-					Object.keys(param.parameterProperties).forEach((key) => {
-						const prop = param.parameterProperties[key];
-						prop.type = _resolve(prop.type);
-						_resolveParamProperties(prop);
-					});
-				}
-			}
+		if ( !func.typeParameters ) {
+			return func;
+		}
+		const replacements = Object.create(null);
+		let regex;
+		const _resolve = (str) =>
+			(str && regex ? str.replace(regex, (_,prefix,token,suffix) => prefix + replacements[token] + suffix) : str);
+
+		func.typeParameters.forEach((typeParam) => {
+			typeParam.type = _resolve(typeParam.type);
+			replacements[typeParam.name] = typeParam.type || "any";
+			regex = new RegExp("(^|\\W)(" + Object.keys(replacements).join("|") + ")(\\W|$)");
+			typeParam.default = _resolve(typeParam.default);
+		});
 
-			if ( func.returnValue ) {
-				func.returnValue.type = _resolve(func.returnValue.type);
-			}
-			if ( func.parameters ) {
-				func.parameters.forEach((param) => {
-					param.type = _resolve(param.type);
-					_resolveParamProperties(param);
-				});
-			}
-			if ( func.throws ) {
-				func.throws.forEach((ex) => {
-					ex.type = _resolve(ex.type);
+		function _resolveParamProperties(param) {
+			if ( param.parameterProperties ) {
+				Object.keys(param.parameterProperties).forEach((key) => {
+					const prop = param.parameterProperties[key];
+					prop.type = _resolve(prop.type);
+					_resolveParamProperties(prop);
 				});
 			}
-			console.log(func);
+		}
+
+		if ( func.returnValue ) {
+			func.returnValue.type = _resolve(func.returnValue.type);
+		}
+		if ( func.parameters ) {
+			func.parameters.forEach((param) => {
+				param.type = _resolve(param.type);
+				_resolveParamProperties(param);
+			});
+		}
+		if ( func.throws ) {
+			func.throws.forEach((ex) => {
+				ex.type = _resolve(ex.type);
+			});
 		}
 		return func;
 	}
 
+	function isUI5Type(sType) {
+		return !isBuiltInType(sType) && possibleUI5Symbol(sType);
+	}
+
 	/**
-	 * Transforms api.json file
-	 * @param {object} oChainObject chain object
+	 * Returns an object with the parsed custom-type information, namely:
+	 * - types: array of the parsed UI5 types inside the given complex type
+	 * - template: the template string with placeholders for the parsed UI5 types
+	 *
+	 * Examples:
+	 *
+	 * - parseUI5Types("sap.ui.core.ID | sap.ui.core.Control") returns
+	 *   {
+	 *     template: "${0} | ${1}",
+	 *     UI5Types: ["sap.ui.core.ID", "sap.ui.core.Control"]
+	 *   }
+	 *
+	 * - parseUI5Types("Array<sap.ui.core.Control>") returns
+	 *    {
+	 *      template: "Array<${0}>",
+	 *      UI5Types: ["sap.ui.core.Control"]
+	 *    }
+	 *
+	 * - parseUI5Types("Array<sap.ui.core.ID|string>") returns
+	 *    {
+	 *      template: "Array<${0} | string>", // built-in types remain unchanged in the template
+	 *      UI5Types: ["sap.ui.core.ID"]
+	 *    }
+	 *
+	 * - parseUI5Types("Object<string, sap.ui.core.Control>") returns
+	 *    {
+	 *      template: "Object<string, ${0}>", // built-in types remain unchanged in the template
+	 *      UI5Types: ["sap.ui.core.Control"]
+	 *    }
+	 *
+	 * - parseUI5Types("string") returns
+	 *    {
+	 *      template: "string" // skip the types array if empty
+	 *    }
+	 *
+	 * - parseUI5Types("sap.ui.core.Control") returns
+	 *    {
+	 *      UI5Types: ["sap.ui.core.Control"] // skip template if its value is "${0}" (default value)
+	 *    }
+	 * @param {string} sComplexType
+	 * @returns {{template=: string, UI5Types=: string[]}}
 	 */
-	let transformApiJson = function (oChainObject) {
-		function isBuiltInType(type) {
-			return formatters._baseTypes.indexOf(type) >= 0;
+	function parseUI5Types(sComplexType) {
+		let oParsed;
+		try {
+			oParsed = typeParser.parseSimpleTypes(sComplexType, isUI5Type);
+		} catch (e) {
+			log.error("Error parsing type: " + sComplexType);
+			log.error(e);
+			oParsed = { template: sComplexType };
 		}
 
-		/**
-		 * Heuristically determining if there is a possibility the given input string
-		 * to be a UI5 symbol
-		 * @param {string} sName
-		 * @returns {boolean}
-		 */
-		function possibleUI5Symbol(sName) {
-			return /^[a-zA-Z][a-zA-Z0-9.]*[a-zA-Z0-9]$/.test(sName);
+		const result = {};
+
+		if (oParsed.template !== '${0}') { // default is '${0}', so omit if not required
+			result.template = oParsed.template;
+		}
+
+		if (oParsed.simpleTypes?.length) { // it can be empty if none of the included simple types satisfied the filter function
+			result.UI5Types = oParsed.simpleTypes;
+		}
+
+		return result;
+	}
+
+	function includesIgnoreCase(array, string) {
+		return array.some((item) => item.toLowerCase() === string.toLowerCase());
+	}
+
+	/**
+	 * Check if a type is a built-in type, handling both simple
+	 * and compound types gracefully.
+	 *
+	 * @param {string} type A type to check
+	 * @returns {boolean} true if the type is built-in, otherwise false
+	 */
+	function isBuiltInType(type) {
+		const builtInTypes = formatters._baseTypes;
+
+		// Early return if the type is directly in baseTypes
+		if (includesIgnoreCase(builtInTypes, type)) {
+			return true;
+		}
+
+		// Check if the type is a union type
+		if (type.includes("|")) {
+			const unionParts = type.split("|").map((part) => part.trim());
+			return unionParts.every((part) => isBuiltInType(part));
+		}
+
+		// Handle array notation directly
+		if (type.endsWith("[]")) {
+			return builtInTypes.includes(type.slice(0, -2));
+		}
+
+		// Predefined regex patterns for reuse
+		const arrayRegex = /Array<(.+)>/;
+		const arrayDotRegex = /Array\.<(.+)>/;
+		const objectRegex = /Object<([^,]+),([^>]+)>/;
+		const objectDotRegex = /Object\.<([^,]+),([^>]+)>/;
+
+		// Check if the type is a generic Array type
+		const arrayMatch = arrayRegex.exec(type);
+		if (arrayMatch) {
+			const innerType = arrayMatch[1];
+			return isBuiltInType(innerType);
+		}
+
+		const arrayDotMatch = arrayDotRegex.exec(type);
+		if (arrayDotMatch) {
+			const innerType = arrayDotMatch[1];
+			return isBuiltInType(innerType);
 		}
 
+		// Check if the type is a generic Object type
+		const objectMatch = objectRegex.exec(type);
+		if (objectMatch) {
+			const innerTypes = [objectMatch[1], objectMatch[2]].map((t) => t.trim());
+			return innerTypes.every((innerType) => isBuiltInType(innerType));
+		}
+
+		const objectDotMatch = objectDotRegex.exec(type);
+		if (objectDotMatch) {
+			const innerTypes = [objectDotMatch[1], objectDotMatch[2]].map((t) => t.trim());
+			return innerTypes.every((innerType) => isBuiltInType(innerType));
+		}
+
+		// Fallback case: if none of the above matched, return false
+		return false;
+	}
+
+	/**
+	 * Heuristically determining if there is a possibility the given input string
+	 * to be a UI5 symbol
+	 * Examples of UI5 symbols:
+	 * -"sap.ui.core.date.UI5Date"
+	 * -"module:sap/ui/core/date/UI5Date"
+	 * @param {string} sName
+	 * @returns {boolean}
+	 */
+	function possibleUI5Symbol(sName) {
+		const ui5SymbolRegex = /^(module:)?sap[/.][a-zA-Z][a-zA-Z0-9/.$]*[a-zA-Z0-9]$/;
+		return ui5SymbolRegex.test(sName);
+	}
+
+	/**
+	 * Transforms api.json file
+	 * @param {object} oChainObject chain object
+	 */
+	const transformApiJson = function (oChainObject) {
 		// Function is a copy from: LibraryInfo.js => LibraryInfo.prototype._getActualComponent => "match" inline method
 		function matchComponent(sModuleName, sPattern) {
 			sModuleName = sModuleName.toLowerCase();
@@ -153,18 +284,18 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		 */
 		function preProcessSymbols(symbols) {
 			// Create treeName and modify module names
-			symbols.forEach(oSymbol => {
-				let sModuleClearName = oSymbol.name.replace(/^module:/, "");
+			symbols.forEach((oSymbol) => {
+				const sModuleClearName = oSymbol.name.replace(/^module:/, "");
 				oSymbol.displayName = sModuleClearName;
 				oSymbol.treeName = normalizeToUI5GlobalNotation(sModuleClearName);
 			});
 
 			// Create missing - virtual namespaces
-			symbols.forEach(oSymbol => {
+			symbols.forEach((oSymbol) => {
 				oSymbol.treeName.split(".").forEach((sPart, i, a) => {
-					let sName = a.slice(0, (i + 1)).join(".");
+					const sName = a.slice(0, (i + 1)).join(".");
 
-					if (!symbols.find(o => o.treeName === sName)) {
+					if (!symbols.find((o) => o.treeName === sName)) {
 						symbols.push({
 							name: sName,
 							displayName: sName,
@@ -177,13 +308,12 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			});
 
 			// Discover parents
-			symbols.forEach(oSymbol => {
-				let aParent = oSymbol.treeName.split("."),
-					sParent;
+			symbols.forEach((oSymbol) => {
+				const aParent = oSymbol.treeName.split(".");
 
 				// Extract parent name
 				aParent.pop();
-				sParent = aParent.join(".");
+				const sParent = aParent.join(".");
 
 				// Mark parent
 				if (symbols.find(({treeName}) => treeName === sParent)) {
@@ -192,14 +322,13 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			});
 
 			// Attach children info
-			symbols.forEach(oSymbol => {
+			symbols.forEach((oSymbol) => {
 				if (oSymbol.parent) {
-					let oParent = symbols.find(({treeName}) => treeName === oSymbol.parent),
-						oNode;
+					const oParent = symbols.find(({treeName}) => treeName === oSymbol.parent);
 
-					if (!oParent.nodes) oParent.nodes = [];
+					if (!oParent.nodes) {oParent.nodes = [];}
 
-					oNode = {
+					const oNode = {
 						name: oSymbol.displayName,
 						description: formatters._preProcessLinksInTextBlock(
 							extractFirstSentence(oSymbol.description)
@@ -216,14 +345,14 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			});
 
 			// Clean list - keep file size down
-			symbols.forEach(o => {
+			symbols.forEach((o) => {
 				delete o.treeName;
 				delete o.parent;
 			});
 		}
 
 		// Transform to object
-		let oData = oChainObject.fileData;
+		const oData = oChainObject.fileData;
 
 		// Attach default component for the library if available
 		if (oChainObject.defaultComponent) {
@@ -246,7 +375,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			// Attach symbol specific component if available (special cases)
 			// Note: Last hit wins as there may be a more specific component pattern
 			if (oChainObject.customSymbolComponents) {
-				Object.keys(oChainObject.customSymbolComponents).forEach(sComponent => {
+				Object.keys(oChainObject.customSymbolComponents).forEach((sComponent) => {
 					if (matchComponent(normalizeToUI5GlobalNotation(oSymbol.displayName), sComponent)) {
 						oSymbol.component = oChainObject.customSymbolComponents[sComponent];
 					}
@@ -268,7 +397,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 			// Constructor
 			if (oSymbol.constructor) {
-				let oConstructor = resolveTypeParameters(oSymbol.constructor);
+				const oConstructor = resolveTypeParameters(oSymbol.constructor);
 
 				// Description
 				if (oConstructor.description) {
@@ -300,21 +429,13 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 				if (oConstructor.parameters) {
 					oConstructor.parameters = methods.buildConstructorParameters(oConstructor.parameters);
 
-					let aParameters = oConstructor.parameters;
-					aParameters.forEach(oParameter => {
+					const aParameters = oConstructor.parameters;
+					aParameters.forEach((oParameter) => {
 
 						// Types
 						oParameter.types = [];
 						if (oParameter.type) {
-							let aTypes = oParameter.type.split("|");
-
-							for (let i = 0; i < aTypes.length; i++) {
-								oParameter.types.push({
-									name: aTypes[i],
-									linkEnabled: !isBuiltInType(aTypes[i])
-								});
-							}
-
+							oParameter.typeInfo = parseUI5Types(oParameter.type);
 							// Keep file size in check
 							delete oParameter.type;
 						}
@@ -327,12 +448,12 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 							oParameter.description = formatters.formatDescription(oParameter.description);
 						}
 
-					})
+					});
 				}
 
 				// Throws
 				if (oConstructor.throws) {
-					oConstructor.throws.forEach(oThrows => {
+					oConstructor.throws.forEach((oThrows) => {
 
 						// Description
 						if (oThrows.description) {
@@ -399,17 +520,9 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 					// Type
 					if (oSymbol.kind !== "enum") { // enum properties don't have an own type
 						if (oProperty.type) {
-							oProperty.types = oProperty.type.split("|").map((sType) => {
-								const oType = {
-									value: sType
-								};
-								// Link Enabled
-								if (!isBuiltInType(oType.value) && possibleUI5Symbol(oType.value)) {
-									oType.linkEnabled = true;
-									oType.href = "api/" + oType.value.replace("[]", "");
-								}
-								return oType;
-							});
+							oProperty.typeInfo = parseUI5Types(oProperty.type);
+							// Keep file size in check
+							delete oProperty.type;
 						}
 					}
 
@@ -425,7 +538,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 			// UI5 Metadata
 			if (oSymbol["ui5-metadata"]) {
-				let oMeta = oSymbol["ui5-metadata"];
+				const oMeta = oSymbol["ui5-metadata"];
 
 				// Properties
 				if (oMeta.properties) {
@@ -447,17 +560,14 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 						// Type
 						if (oProperty.type) {
-							oProperty.types = fnCreateTypesArr(oProperty.type);
+							oProperty.typeInfo = parseUI5Types(oProperty.type);
+							// Keep file size in check
+							delete oProperty.type;
 						}
 
 						// Description
 						oProperty.description = formatters.formatDescriptionSince(oProperty.description, oProperty.since);
 
-						// Link Enabled
-						if (!isBuiltInType(oProperty.type)) {
-							oProperty.linkEnabled = true;
-						}
-
 						// Default value
 						oProperty.defaultValue = formatters.formatDefaultValue(oProperty.defaultValue);
 
@@ -540,29 +650,31 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 				// Events
 				if (oMeta.events) {
 
-					oMeta.events.forEach(oEvent => {
-						let aParams = oEvent.parameters;
-
-						aParams && Object.keys(aParams).forEach(sParam => {
-							let sSince = aParams[sParam].since;
-							let oDeprecated = aParams[sParam].deprecated;
-							let oEvtInSymbol = oSymbol.events.find(e => e.name === oEvent.name);
-							let oParamInSymbol = oEvtInSymbol && oEvtInSymbol.parameters[0] &&
-													oEvtInSymbol.parameters[0].parameterProperties &&
-													oEvtInSymbol.parameters[0].parameterProperties.getParameters &&
-													oEvtInSymbol.parameters[0].parameterProperties.getParameters.parameterProperties &&
-													oEvtInSymbol.parameters[0].parameterProperties.getParameters.parameterProperties[sParam];
-
-							if (typeof oParamInSymbol === 'object' && oParamInSymbol !== null) {
-								if (sSince) {
-									oParamInSymbol.since = sSince;
-								}
+					oMeta.events.forEach((oEvent) => {
+						const aParams = oEvent.parameters;
+
+						if (aParams) {
+							Object.keys(aParams).forEach((sParam) => {
+								const sSince = aParams[sParam].since;
+								const oDeprecated = aParams[sParam].deprecated;
+								const oEvtInSymbol = oSymbol.events.find((e) => e.name === oEvent.name);
+								const oParamInSymbol = oEvtInSymbol && oEvtInSymbol.parameters[0] &&
+														oEvtInSymbol.parameters[0].parameterProperties &&
+														oEvtInSymbol.parameters[0].parameterProperties.getParameters &&
+														oEvtInSymbol.parameters[0].parameterProperties.getParameters.parameterProperties &&
+														oEvtInSymbol.parameters[0].parameterProperties.getParameters.parameterProperties[sParam];
+
+								if (typeof oParamInSymbol === 'object' && oParamInSymbol !== null) {
+									if (sSince) {
+										oParamInSymbol.since = sSince;
+									}
 
-								if (oDeprecated) {
-									oParamInSymbol.deprecated = oDeprecated;
+									if (oDeprecated) {
+										oParamInSymbol.deprecated = oDeprecated;
+									}
 								}
-							}
-						})
+							});
+						}
 					});
 
 					// We don't need event's data from the UI5-metadata for now. Keep file size in check
@@ -571,11 +683,12 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 				// Special Settings
 				if (oMeta.specialSettings) {
-					oMeta.specialSettings.forEach(oSetting => {
+					oMeta.specialSettings.forEach((oSetting) => {
 
 						// Link Enabled
-						if (!isBuiltInType(oSetting.type)) {
-							oSetting.linkEnabled = true;
+						if (oSetting.type) {
+							oSetting.typeInfo = parseUI5Types(oSetting.type);
+							delete oSetting.type; // Keep file size in check
 						}
 
 						// Description
@@ -591,7 +704,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 				// Annotations
 				if (oMeta.annotations) {
-					oMeta.annotations.forEach(oAnnotation => {
+					oMeta.annotations.forEach((oAnnotation) => {
 
 						// Description
 						oAnnotation.description = formatters.formatAnnotationDescription(oAnnotation.description,
@@ -617,7 +730,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 				// Pre-process events
 				methods.buildEventsModel(oSymbol.events);
 
-				oSymbol.events.forEach(oEvent => {
+				oSymbol.events.forEach((oEvent) => {
 
 					// Description
 					if (oEvent.description) {
@@ -632,11 +745,11 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 					// Parameters
 					if (oEvent.parameters && Array.isArray(oEvent.parameters)) {
-						oEvent.parameters.forEach(oParameter => {
+						oEvent.parameters.forEach((oParameter) => {
 
-							// Link Enabled
-							if (!isBuiltInType(oParameter.type)) {
-								oParameter.linkEnabled = true;
+							if (oParameter.type) {
+								oParameter.typeInfo = parseUI5Types(oParameter.type);
+								delete oParameter.type; // Keep file size in check
 							}
 
 							// Description
@@ -662,7 +775,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 				// Pre-process methods
 				methods.buildMethodsModel(oSymbol.methods);
 
-				oSymbol.methods.forEach(oMethod => {
+				oSymbol.methods.forEach((oMethod) => {
 
 					// Name and link
 					if (oMethod.name) {
@@ -681,7 +794,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 					}
 
 					// Examples
-					oMethod.examples && oMethod.examples.forEach(oExample => {
+					oMethod.examples?.forEach((oExample) => {
 						oExample = formatters.formatExample(oExample.caption, oExample.text);
 					});
 
@@ -696,20 +809,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 					// Parameters
 					if (oMethod.parameters) {
-						oMethod.parameters.forEach(oParameter => {
-
-							// Types
-							if (oParameter.types) {
-								oParameter.types.forEach(oType => {
-
-									// Link Enabled
-									if (!isBuiltInType(oType.value) && possibleUI5Symbol(oType.value)) {
-										oType.linkEnabled = true;
-										oType.href = "api/" + oType.value.replace("[]", "");
-									}
-
-								});
-							}
+						oMethod.parameters?.forEach((oParameter) => {
 
 							// Default value
 							oParameter.defaultValue = formatters.formatDefaultValue(oParameter.defaultValue);
@@ -731,24 +831,11 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						// Description
 						oMethod.returnValue.description = formatters.formatDescription(oMethod.returnValue.description);
 
-						// Types
-						if (oMethod.returnValue.types) {
-							oMethod.returnValue.types.forEach(oType => {
-
-								// Link Enabled
-								if (!isBuiltInType(oType.value) && possibleUI5Symbol(oType.value)) {
-									oType.href = "api/" + oType.value.replace("[]", "");
-									oType.linkEnabled = true;
-								}
-
-							});
-						}
-
 					}
 
 					// Throws
 					if (oMethod.throws) {
-						oMethod.throws.forEach(oThrows => {
+						oMethod.throws.forEach((oThrows) => {
 
 							// Description
 							if (oThrows.description) {
@@ -832,11 +919,11 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		}
 
 		// otherwise, it names a directory that has to be scanned for the files
-		return new Promise(oResolve => {
+		return new Promise((oResolve) => {
 			fs.readdir(vDependencyAPIFiles, function (oError, aItems) {
 				if (!oError && aItems && aItems.length) {
-					let aFiles = [];
-					aItems.forEach(sItem => {
+					const aFiles = [];
+					aItems.forEach((sItem) => {
 						aFiles.push(path.join(vDependencyAPIFiles, sItem));
 					});
 					oChainObject.aDependentLibraryFiles = aFiles;
@@ -850,18 +937,18 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		if (!oChainObject.aDependentLibraryFiles) {
 			return oChainObject;
 		}
-		let aPromises = [];
-		oChainObject.aDependentLibraryFiles.forEach(sFile => {
-			aPromises.push(new Promise(oResolve => {
+		const aPromises = [];
+		oChainObject.aDependentLibraryFiles.forEach((sFile) => {
+			aPromises.push(new Promise((oResolve) => {
 				fs.readFile(sFile, 'utf8', (oError, oData) => {
 					oResolve(oError ? false : oData);
 				});
 			}));
 		});
-		return Promise.all(aPromises).then(aValues => {
-			let oDependentAPIs = {};
+		return Promise.all(aPromises).then((aValues) => {
+			const oDependentAPIs = {};
 
-			aValues.forEach(sData => {
+			aValues.forEach((sData) => {
 				let oData;
 
 				try {
@@ -880,7 +967,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 			oChainObject.oDependentAPIs = oDependentAPIs;
 			return oChainObject;
-		})
+		});
 	}
 
 	/**
@@ -894,9 +981,9 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		if (!sFAQDir) {
 			return oChainObject;
 		}
-		let slibName = oChainObject.fileData.library;
+		const slibName = oChainObject.fileData.library;
 		oChainObject.fileData.symbols.forEach(function(symbol) {
-			let sfile = symbol.name.replace(slibName, "").replace(/[.]/g, "/") + ".md";
+			const sfile = symbol.name.replace(slibName, "").replace(/[.]/g, "/") + ".md";
 			if (fs.existsSync(path.join(sFAQDir, sfile))) {
 				symbol.hasFAQ = true;
 			}
@@ -913,7 +1000,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			// If requested, return data instead of writing to FS (required by UI5 Tooling/UI5 Builder)
 			return JSON.stringify(oChainObject.parsedData);
 		}
-		let sOutputDir = path.dirname(oChainObject.outputFile);
+		const sOutputDir = path.dirname(oChainObject.outputFile);
 
 		// Create dir if it does not exist
 		if (!fs.existsSync(sOutputDir)) {
@@ -947,7 +1034,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		oChainObject.modules = [];
 
 		if (oChainObject.libraryFileData) {
-			let $ = cheerio.load(oChainObject.libraryFileData, {
+			const $ = cheerio.load(oChainObject.libraryFileData, {
 				ignoreWhitespace: true,
 				xmlMode: true,
 				lowerCaseTags: false
@@ -963,8 +1050,8 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 					if (oComponent.children.length === 1) {
 						oChainObject.defaultComponent = $(oComponent).text();
 					} else {
-						let sCurrentComponentName = $(oComponent).find("name").text();
-						let aCurrentModules = [];
+						const sCurrentComponentName = $(oComponent).find("name").text();
+						const aCurrentModules = [];
 						$(oComponent).find("module").each((a, oC) => {
 							aCurrentModules.push($(oC).text().replace(/\//g, "."));
 						});
@@ -992,9 +1079,9 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 	function flattenComponents(oChainObject) {
 		if (oChainObject.modules && oChainObject.modules.length > 0) {
 			oChainObject.customSymbolComponents = {};
-			oChainObject.modules.forEach(oComponent => {
-				let sCurrentComponent = oComponent.componentName;
-				oComponent.modules.forEach(sModule => {
+			oChainObject.modules.forEach((oComponent) => {
+				const sCurrentComponent = oComponent.componentName;
+				oComponent.modules.forEach((sModule) => {
 					oChainObject.customSymbolComponents[sModule] = sCurrentComponent;
 				});
 			});
@@ -1076,7 +1163,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 					oFileData = JSON.parse(oFileData);
 					if (oFileData.explored && oFileData.explored.entities && oFileData.explored.entities.length > 0) {
 						oChainObject.entitiesWithSamples = [];
-						oFileData.explored.entities.forEach(oEntity => {
+						oFileData.explored.entities.forEach((oEntity) => {
 							oChainObject.entitiesWithSamples.push(oEntity.id);
 						});
 					}
@@ -1106,22 +1193,20 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		});
 	}
 
-	/*
+	/**
 	 * =====================================================================================================================
 	 * IMPORTANT NOTE: Formatter code is a copy from APIDetail.controller.js with a very little modification and mocking and
 	 * code can be significantly improved
 	 * =====================================================================================================================
 	 */
-	let formatters = {
-
+	const formatters = {
 		_sTopicId: "",
 		_oTopicData: {},
 		_baseTypes: [
-			// TODO this list URGENTLY needs to be replaced by the Type parser and a much smaller list
 			"sap.ui.core.any",
 			"sap.ui.core.object",
 			"sap.ui.core.function",
-			"sap.ui.core.number", // TODO discuss with Thomas, type does not exist
+			"sap.ui.core.number",
 			"sap.ui.core.float",
 			"sap.ui.core.int",
 			"sap.ui.core.boolean",
@@ -1129,31 +1214,26 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			"sap.ui.core.void",
 			"null",
 			"any",
-			"any[]",
 			"Error",
-			"Error[]",
 			"array",
 			"element",
 			"Element",
+			"HTMLElement",
+			"Node",
+			"Attr",
 			"Date",
 			"DomRef",
+			"jQuery",
 			"jQuery.promise",
+			"jQuery.event",
 			"QUnit.Assert",
 			"object",
 			"Object",
-			"object[]",
-			"object|object[]",
-			"[object Object][]",
-			"Array<[object Object]>",
-			"Array.<[object Object]>",
-			"Object<string,string>",
-			"Object.<string,string>",
 			"function",
 			"float",
 			"int",
 			"boolean",
 			"string",
-			"string[]",
 			"number",
 			"map",
 			"promise",
@@ -1163,7 +1243,12 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			"Touch",
 			"TouchList",
 			"undefined",
-			"this"
+			"this",
+			"Blob",
+			"RegExp",
+			"void",
+			"ArrayBuffer",
+			"[object Object]"
 		],
 		ANNOTATIONS_LINK: 'http://docs.oasis-open.org/odata/odata/v4.0/odata-v4.0-part3-csdl.html',
 		ANNOTATIONS_NAMESPACE_LINK: 'http://docs.oasis-open.org/odata/odata/v4.0/errata02/os/complete/vocabularies/',
@@ -1251,7 +1336,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 			if (aParams && aParams.length > 0) {
 				/* We consider only root level parameters so we get rid of all that are not on the root level */
-				aParams = aParams.filter(oElem => {
+				aParams = aParams.filter((oElem) => {
 					return oElem.depth === undefined;
 				});
 				aParams.forEach(function (element, index, array) {
@@ -1487,7 +1572,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 		handleExternalUrl: function (sTarget, sText) {
 			// Check if the external domain is SAP hosted
-			let bSAPHosted = /^https?:\/\/([\w.]*\.)?(?:sap|hana\.ondemand|sapfioritrial)\.com/.test(sTarget);
+			const bSAPHosted = /^https?:\/\/([\w.]*\.)?(?:sap|hana\.ondemand|sapfioritrial)\.com/.test(sTarget);
 			return this.formatUrlToLink(sTarget, sText, bSAPHosted);
 		},
 
@@ -1540,7 +1625,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 					return true;
 				}
 				if (oSymbol.name === className) {
-					let oProperty = findProperty(oSymbol, methodName, target);
+					const oProperty = findProperty(oSymbol, methodName, target);
 					if (oProperty) {
 						sResult = this.createLink({
 							name: className,
@@ -1548,7 +1633,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						});
 						return true;
 					}
-					let oMethod = findMethod(oSymbol, methodName, target);
+					const oMethod = findMethod(oSymbol, methodName, target);
 					if (oMethod) {
 						sResult = this.createLink({
 							name: oMethod.static ? target : oMethod.name,
@@ -1559,7 +1644,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						return true;
 					}
 
-					let oEvent = findEvent(oSymbol, methodName);
+					const oEvent = findEvent(oSymbol, methodName);
 					if (oEvent) {
 						sResult = this.createLink({
 							name: oEvent.name,
@@ -1570,7 +1655,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						return true;
 					}
 
-					let oAnnotation = findAnnotation(oSymbol, methodName);
+					const oAnnotation = findAnnotation(oSymbol, methodName);
 					if (oAnnotation) {
 						sResult = this.createLink({
 							name: oAnnotation.name,
@@ -1595,7 +1680,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 			// Own methods search
 			if (self.name === className && self.methods) {
-				let oResult = self.methods.find(({name}) => name === methodName);
+				const oResult = self.methods.find(({name}) => name === methodName);
 				if (oResult) {
 					return this.createLink({
 						name: oResult.static ? [self.name, oResult.name].join(".") : oResult.name,
@@ -1607,26 +1692,28 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			}
 
 			// Local library symbols
-			ownLibrary.symbols.find(oSymbol => {
+			ownLibrary.symbols.find((oSymbol) => {
 				return searchInSymbol.call(this, oSymbol);
 			});
 
-			if (sResult) return sResult;
+			if (sResult) {return sResult;}
 
 			// Dependent library symbols
-			dependencyLibs && Object.keys(dependencyLibs).find(sLib => {
-				if (sLib === target) {
-					sResult = this.createLink({
-						name: sLib,
-						text: text
+			if (dependencyLibs) {
+				Object.keys(dependencyLibs).find((sLib) => {
+					if (sLib === target) {
+						sResult = this.createLink({
+							name: sLib,
+							text: text
+						});
+						return true;
+					}
+					const oLib = dependencyLibs[sLib];
+					return oLib && oLib.find((oSymbol) => {
+						return searchInSymbol.call(this, oSymbol);
 					});
-					return true;
-				}
-				let oLib = dependencyLibs[sLib];
-				return oLib && oLib.find(oSymbol => {
-					return searchInSymbol.call(this, oSymbol);
 				});
-			});
+			}
 
 			return sResult;
 		},
@@ -1641,7 +1728,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		 * @param {string} [hrefAppend=""]
 		 * @returns {string} link
 		 */
-		createLink: function ({name, type, className, text=name, hrefAppend=""}) {
+		createLink: function ({name, type, className, text = name, hrefAppend = ""}) {
 			let sLink;
 
 			// handling module's
@@ -1667,13 +1754,12 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		 * @private
 		 */
 		_preProcessLinksInTextBlock: function (sText, bSkipParagraphs) {
-			let oSelf = this._oTopicData,
+			const oSelf = this._oTopicData,
 				oOwnLibrary = this._oOwnLibrary,
 				oDependencyLibs = oChainObject.oDependentAPIs,
 				oOptions = {
 					linkFormatter: function (sTarget, sText) {
-						let aMatch,
-							aTarget;
+						let aMatch;
 
 						// keep the full target in the fallback text
 						sText = sText || sTarget;
@@ -1711,7 +1797,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						// module:sap/x/Xxx.extend
 						aMatch = sTarget.match(/^(module:)?([a-zA-Z0-9.$_\/]+?)\.extend$/);
 						if (aMatch) {
-							let [, sModule, sClass] = aMatch;
+							const [, sModule, sClass] = aMatch;
 							return this.createLink({
 								name: sTarget.replace(/^module:/, ""),
 								type: "methods",
@@ -1727,13 +1813,13 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						// #constructor
 						aMatch = sTarget.match(/^(module:)?([a-zA-Z0-9.$_\/]+?)?[\.#]constructor$/i);
 						if (aMatch) {
-							let [, sModule, sClass] = aMatch,
-								sName;
+							const [, sModule, sClass] = aMatch;
 
+							let sName;
 							if (sClass) {
 								sName = (sModule ? sModule : "") + sClass;
 							} else {
-								sName = oSelf.name
+								sName = oSelf.name;
 							}
 
 							return this.createLink({
@@ -1773,7 +1859,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						// module:sap/ui/comp/smartfield/SmartField#annotation:TextArrangement
 						aMatch = sTarget.match(/^(module:)?([a-zA-Z0-9.$_\/]+?)[.#]annotation:([a-zA-Z0-9$_]+)$/);
 						if (aMatch) {
-							let [, sModule, sClass, sAnnotation] = aMatch;
+							const [, sModule, sClass, sAnnotation] = aMatch;
 							return this.createLink({
 								name: sAnnotation,
 								type: "annotations",
@@ -1799,7 +1885,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						// module:sap/m/Button#event:press
 						aMatch = sTarget.match(/^(module:)?([a-zA-Z0-9.$_\/]+?)[.#]event:([a-zA-Z0-9$_]+)$/);
 						if (aMatch) {
-							let [, sModule, sClass, sEvent] = aMatch;
+							const [, sModule, sClass, sEvent] = aMatch;
 							return this.createLink({
 								name: sEvent,
 								type: "events",
@@ -1812,7 +1898,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						// module:sap/m/Button#setText
 						aMatch = sTarget.match(/^(module:)?([a-zA-Z0-9.$_\/]+)#([a-zA-Z0-9.$_]+)$/);
 						if (aMatch) {
-							let [, sModule, sClass, sMethod] = aMatch;
+							const [, sModule, sClass, sMethod] = aMatch;
 							return this.createLink({
 								name: sMethod,
 								type: "methods",
@@ -1825,8 +1911,8 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						// sap.x.Xxx.xxx
 						// module:sap/x/Xxx.xxx
 						if (/^(?:module:)?([a-zA-Z0-9.$_\/]+?)\.([a-zA-Z0-9$_]+)$/.test(sTarget)) {
-							let [,sClass, sName] = sTarget.match(/^((?:module:)?[a-zA-Z0-9.$_\/]+?)\.([a-zA-Z0-9$_]+)$/),
-								sResult = this.createLinkFromTargetType({
+							const [,sClass, sName] = sTarget.match(/^((?:module:)?[a-zA-Z0-9.$_\/]+?)\.([a-zA-Z0-9$_]+)$/);
+							const sResult = this.createLinkFromTargetType({
 									className: sClass,
 									methodName: sName,
 									target: sTarget,
@@ -1841,9 +1927,9 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 						}
 
 						// Possible nested functions discovery - currently we do this only for regular symbols
-						aTarget = sTarget.split(".");
+						const aTarget = sTarget.split(".");
 						if (aTarget.length >= 3) {
-							let sResult = this.createLinkFromTargetType({
+							const sResult = this.createLinkFromTargetType({
 								methodName: aTarget.splice(-2).join("."),
 								className: aTarget.join("."),
 								target: sTarget,
@@ -1972,7 +2058,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			var bHeaderDocuLinkFound = false,
 				bUXGuidelinesLinkFound = false,
 				aReferences = [],
-				entity = bCalledOnConstructor? oSymbol.constructor.references : oSymbol.references;
+				entity = bCalledOnConstructor ? oSymbol.constructor.references : oSymbol.references;
 
 			const UX_GUIDELINES_BASE_URL = "https://experience.sap.com/fiori-design-web/";
 
@@ -2016,7 +2102,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 					aParts = sReference.match(/^(?:{@link\s)?fiori:(?:https:\/\/experience\.sap\.com\/fiori-design-web\/)?\/?(\S+\b)\/?\s?(.*[^\s}])?}?$/);
 
 					if (aParts) {
-						let [, sTarget, sTargetName] = aParts;
+						const [, sTarget, sTargetName] = aParts;
 
 						if (bCalledOnConstructor && !bUXGuidelinesLinkFound) {
 							// Extract first found UX Guidelines link as primary
@@ -2032,9 +2118,11 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 					aReferences.push(sReference);
 				});
-				bCalledOnConstructor? oSymbol.constructor.references = aReferences : oSymbol.references = aReferences;
+			}
+			if (bCalledOnConstructor) {
+				oSymbol.constructor.references = aReferences;
 			} else {
-				bCalledOnConstructor? oSymbol.constructor.references = [] : oSymbol.references = [];
+				oSymbol.references = aReferences;
 			}
 		},
 
@@ -2045,13 +2133,13 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		 */
 		formatReferencesInDescription: function(oEntity) {
 			if (oEntity.references && Array.isArray(oEntity.references)) {
-				oEntity.references = oEntity.references.map(sReference => {
+				oEntity.references = oEntity.references.map((sReference) => {
 					if (/{@link.*}/.test(sReference)) {
 						return "<li>" + sReference + "</li>";
 					} else {
 						return "<li>{@link " + sReference + "}</li>";
 
-					};
+					}
 				});
 				if (!oEntity.description) {
 					// If there is no method description - references should be the first line of it
@@ -2065,7 +2153,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 	};
 
 	/* Methods direct copy from API Detail */
-	let methods = {
+	const methods = {
 
 		/**
 		 * Adjusts methods info so that it can be easily displayed in a table
@@ -2081,7 +2169,9 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 						// Handle types
 						if (oProperty.type) {
-							oProperty.types = fnCreateTypesArr(oProperty.type);
+							oProperty.typeInfo = parseUI5Types(oProperty.type);
+							// Keep file size in check
+							delete oProperty.type;
 						}
 
 						// Phone name - available only for parameters
@@ -2111,12 +2201,11 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 				if (oMethod.parameters) {
 					oMethod.parameters.forEach(function (oParameter) {
 						if (oParameter.type) {
-							oParameter.types = fnCreateTypesArr(oParameter.type);
+							oParameter.typeInfo = parseUI5Types(oParameter.type);
+							// Keep file size in check
+							delete oParameter.type;
 						}
 
-						// Keep file size in check
-						delete oParameter.type;
-
 						// Add the parameter before the properties
 						aParameters.push(oParameter);
 
@@ -2133,7 +2222,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 				// Handle return values
 				if (oMethod.returnValue && oMethod.returnValue.type) {
 					// Handle types
-					oMethod.returnValue.types = fnCreateTypesArr(oMethod.returnValue.type);
+					oMethod.returnValue.typeInfo = parseUI5Types(oMethod.returnValue.type);
 				}
 
 			});
@@ -2266,7 +2355,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 	};
 
 	// Create the chain object
-	let oChainObject = {
+	const oChainObject = {
 		inputFile: sInputFile,
 		outputFile: sOutputFile,
 		libraryFile: sLibraryFile,
@@ -2274,7 +2363,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 	};
 
 	// Start the work here
-	let p = getLibraryPromise(oChainObject)
+	const p = getLibraryPromise(oChainObject)
 		.then(extractComponentAndDocuindexUrl)
 		.then(flattenComponents)
 		.then(extractSamplesFromDocuIndex)
@@ -2286,7 +2375,7 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 		.then(createApiRefApiJson);
 	return p;
 
-};
+}
 
 module.exports = transformer;