@ui5/builder 3.0.0-alpha.6 → 3.0.0-alpha.9

package/CHANGELOG.md

@@ -2,7 +2,36 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.6...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.9...HEAD).
+
+<a name="v3.0.0-alpha.9"></a>
+## [v3.0.0-alpha.9] - 2022-07-27
+### Bug Fixes
+- **minify:** Change default to not omit source map resources [`6d75a49`](https://github.com/SAP/ui5-builder/commit/6d75a495224590097332fc061c66cfe0e8f4c151)
+
+
+<a name="v3.0.0-alpha.8"></a>
+## [v3.0.0-alpha.8] - 2022-07-15
+
+<a name="v3.0.0-alpha.7"></a>
+## [v3.0.0-alpha.7] - 2022-06-14
+### Breaking Changes
+- Remove build execution ([#740](https://github.com/SAP/ui5-builder/issues/740)) [`af2e956`](https://github.com/SAP/ui5-builder/commit/af2e956f6cba1275669160328e32df3fffa782d0)
+
+### Bug Fixes
+- Avoid redundant bundle creation ([#741](https://github.com/SAP/ui5-builder/issues/741)) [`13c8405`](https://github.com/SAP/ui5-builder/commit/13c840585946401d238936dfa38a6f70a73e9ed0)
+
+### Features
+- Enable modern preload bundles without dependencies ([#739](https://github.com/SAP/ui5-builder/issues/739)) [`97cfa6c`](https://github.com/SAP/ui5-builder/commit/97cfa6cd3eadff57bcc18816534c7751551ebdb8)
+
+### BREAKING CHANGE
+
+* builder.js has been removed. Use ui5-project builder instead
+* Tasks now rely on Project instances being available on Resources (see https://github.com/SAP/ui5-fs/pull/381)
+* TaskRepository#addTask has been removed. Custom tasks need to be added to the project graph instead
+* TaskUtil#get/set/clearTag now requires a Project instance to be provided. Path strings are no longer sufficient
+  and will cause an exception to be thrown
+
 
 <a name="v3.0.0-alpha.6"></a>
 ## [v3.0.0-alpha.6] - 2022-04-26
@@ -721,6 +750,9 @@ to load the custom bundle file instead.
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
 
 
+[v3.0.0-alpha.9]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.8...v3.0.0-alpha.9
+[v3.0.0-alpha.8]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.7...v3.0.0-alpha.8
+[v3.0.0-alpha.7]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.6...v3.0.0-alpha.7
 [v3.0.0-alpha.6]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.5...v3.0.0-alpha.6
 [v3.0.0-alpha.5]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.4...v3.0.0-alpha.5
 [v3.0.0-alpha.4]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.3...v3.0.0-alpha.4

package/index.js

@@ -3,10 +3,6 @@
  * @public
  */
 module.exports = {
-	/**
-	 * @type {import('./lib/builder/builder')}
-	 */
-	builder: "./lib/builder/builder",
 	/**
 	 * @public
 	 * @alias module:@ui5/builder.processors
@@ -156,45 +152,6 @@ module.exports = {
 		 * @type {import('./lib/tasks/taskRepository')}
 		 */
 		taskRepository: "./lib/tasks/taskRepository",
-		/**
-		 * @type {import('./lib/tasks/TaskUtil')}
-		 */
-		TaskUtil: "./lib/tasks/TaskUtil"
-	},
-	/**
-	 * @private
-	 * @alias module:@ui5/builder.types
-	 * @namespace
-	 */
-	types: {
-		/**
-		 * @type {typeof import('./lib/types/AbstractBuilder')}
-		 */
-		AbstractBuilder: "./lib/types/AbstractBuilder",
-		/**
-		 * @type {typeof import('./lib/types/AbstractFormatter')}
-		 */
-		AbstractFormatter: "./lib/types/AbstractFormatter",
-		/**
-		 * @type {import('./lib/types/application/applicationType')}
-		 */
-		application: "./lib/types/application/applicationType",
-		/**
-		 * @type {import('./lib/types/library/libraryType')}
-		 */
-		library: "./lib/types/library/libraryType",
-		/**
-		 * @type {import('./lib/types/themeLibrary/themeLibraryType')}
-		 */
-		themeLibrary: "./lib/types/themeLibrary/themeLibraryType",
-		/**
-		 * @type {import('./lib/types/module/moduleType')}
-		 */
-		module: "./lib/types/module/moduleType",
-		/**
-		 * @type {import('./lib/types/typeRepository')}
-		 */
-		typeRepository: "./lib/types/typeRepository"
 	}
 };
 

package/lib/lbt/bundle/Builder.js

@@ -5,7 +5,7 @@
 const path = require("path");
 const {pd} = require("pretty-data");
 const {parseJS, Syntax} = require("../utils/parseUtils");
-const {encode: encodeMappings, decode: decodeMappings} = require("sourcemap-codec");
+const {encode: encodeMappings, decode: decodeMappings} = require("@jridgewell/sourcemap-codec");
 
 const {isMethodCall} = require("../utils/ASTUtils");
 const ModuleName = require("../utils/ModuleName");
@@ -40,38 +40,6 @@ function isEmptyBundle(resolvedBundle) {
 	return resolvedBundle.sections.every((section) => section.modules.length === 0);
 }
 
-const UI5BundleFormat = {
-	beforePreloads(section) {
-		let str = `jQuery.sap.registerPreloadedModules({\n`;
-		if ( section.name ) {
-			str += `"name":"${section.name}",\n`;
-		}
-		str += `"version":"2.0",\n`;
-		str += `"modules":{\n`;
-		return str;
-	},
-
-	afterPreloads(section) {
-		return `}});\n`;
-	},
-
-	beforeBundleInfo() {
-		return `"unsupported"; /* 'bundleInfo' section mode not supported (requires ui5loader)\n`;
-	},
-
-	afterBundleInfo() {
-		return "*/\n";
-	},
-
-	requireSync(moduleName) {
-		return `sap.ui.requireSync("${ModuleName.toRequireJSName(moduleName)}");\n`;
-	},
-
-	shouldDecorate(resolvedModule) {
-		return resolvedModule.executes(UI5ClientConstants.MODULE__JQUERY_SAP_GLOBAL);
-	}
-};
-
 const EVOBundleFormat = {
 	beforePreloads(section) {
 		return `sap.ui.require.preload({\n`;
@@ -115,7 +83,6 @@ class BundleBuilder {
 	}
 
 	async createBundle(module, options) {
-		await this._prepare();
 		if ( options.numberOfParts > 1 ) {
 			const bundleInfos = [];
 			const submodules = await this.splitter.run( module, options );
@@ -128,17 +95,6 @@ class BundleBuilder {
 		}
 	}
 
-	_prepare() {
-		return Promise.all([
-			// check whether the resource pool contains debug and optimized sources
-			this.pool.findResource( ModuleName.getDebugName(UI5ClientConstants.MODULE__JQUERY_SAP_GLOBAL) ).
-				then( () => this.optimizedSources = true, () => this.optimizedSources = false ),
-			// check whether EVO modules are available. If so, use EVO APIs, else use old UI5 APIs.
-			this.pool.findResource(UI5ClientConstants.EVO_MARKER_RESOURCE).
-				then( () => this.targetBundleFormat = EVOBundleFormat, () => this.targetBundleFormat = UI5BundleFormat )
-		]);
-	}
-
 	async _createBundle(module, options) {
 		const resolvedModule = await this.resolver.resolve(module);
 		if ( options.skipIfEmpty && isEmptyBundle(resolvedModule) ) {
@@ -153,11 +109,13 @@ class BundleBuilder {
 			this.options.sourceMap = true;
 		}
 
-		// when decorateBootstrapModule is set to false, we don't write the optimized flag
-		// and don't write the try catch wrapper
+		// Since UI5 Tooling 3.0: Always use modern API
+		this.targetBundleFormat = EVOBundleFormat;
+
+		// when decorateBootstrapModule is false,
+		// we don't write the optimized flag and don't write the try catch wrapper
 		this.shouldDecorate = this.options.decorateBootstrapModule &&
-			(((this.optimizedSources && !this.options.debugMode) || this.optimize) &&
-				this.targetBundleFormat.shouldDecorate(resolvedModule));
+				this.targetBundleFormat.shouldDecorate(resolvedModule);
 		// TODO is the following condition ok or should the availability of jquery.sap.global.js be configurable?
 		this.jqglobalAvailable = !resolvedModule.containsGlobal;
 		this.openModule(resolvedModule.name);
@@ -636,6 +594,18 @@ class BundleBuilder {
 
 		if (moduleSourceMap) {
 			moduleSourceMap = JSON.parse(moduleSourceMap);
+
+			// Check for index map, which is currently not supported
+			if (Array.isArray(moduleSourceMap.sections)) {
+				log.warn(
+					`Module ${moduleName} references an index source map which is currently not supported. ` +
+					`A transient source map will be created instead...`
+				);
+				moduleSourceMap = createTransientSourceMap({
+					moduleName: path.posix.basename(resourcePath),
+					moduleContent
+				});
+			}
 		} else {
 			log.verbose(`No source map available for module ${moduleName}. Creating transient source map...`);
 			moduleSourceMap = createTransientSourceMap({

package/lib/lbt/resources/LocatorResource.js

@@ -11,7 +11,7 @@ class LocatorResource extends Resource {
 	}
 
 	getProject() {
-		return this.resource._project;
+		return this.resource.getProject();
 	}
 
 	getPath() {

package/lib/lbt/utils/escapePropertiesFile.js

@@ -4,7 +4,7 @@ const nonAsciiEscaper = require("../../processors/nonAsciiEscaper");
  * Can be used to escape *.properties files.
  *
  * Input encoding is read from project configuration.
- * In case the resource belongs to no project (e.g. bundler is used standalone) the default is "ISO-8859-1".
+ * In case the resource belongs to no project (e.g. bundler is used standalone) the default is "UTF-8".
  *
  * @private
  * @param {Resource} resource the resource for which the content will be escaped
@@ -12,13 +12,10 @@ const nonAsciiEscaper = require("../../processors/nonAsciiEscaper");
  */
 module.exports = async function(resource) {
 	const project = resource.getProject();
-	let propertiesFileSourceEncoding = project &&
-			project.resources &&
-			project.resources.configuration &&
-			project.resources.configuration.propertiesFileSourceEncoding;
+	let propertiesFileSourceEncoding = project && project.getPropertiesFileSourceEncoding();
 
 	if (!propertiesFileSourceEncoding) {
-		if (project && ["0.1", "1.0", "1.1"].includes(project.specVersion)) {
+		if (project && ["0.1", "1.0", "1.1"].includes(project.getSpecVersion())) {
 			// default encoding to "ISO-8859-1" for old specVersions
 			propertiesFileSourceEncoding = "ISO-8859-1";
 		} else {

package/lib/processors/bundlers/moduleBundler.js

@@ -91,9 +91,9 @@ const log = require("@ui5/logger").getLogger("builder:processors:bundlers:module
  * @typedef {object} ModuleBundleOptions
  * @property {boolean} [optimize=true] Whether the module bundle gets minified
  * @property {boolean} [sourceMap=true] Whether to generate a source map file for the bundle
- * @property {boolean} [decorateBootstrapModule=false] If set to 'false', the module won't be decorated
+ * @property {boolean} [decorateBootstrapModule=false] If set to 'false', bootable bundles won't be decorated
  *   with an optimization marker
- * @property {boolean} [addTryCatchRestartWrapper=false] Whether to wrap bootable module bundles with
+ * @property {boolean} [addTryCatchRestartWrapper=false] Whether to wrap bootable bundles with
  *   a try/catch to filter out "Restart" errors
  * @property {boolean} [usePredefineCalls=false] If set to 'true', sap.ui.predefine is used for UI5 modules
  * @property {number} [numberOfParts=1] The number of parts the module bundle should be splitted
@@ -148,7 +148,6 @@ module.exports = function({resources, options: {bundleDefinition, bundleOptions,
 		log.verbose(`bundleDefinition: ${JSON.stringify(bundleDefinition, null, 2)}`);
 		log.verbose(`bundleOptions: ${JSON.stringify(bundleOptions, null, 2)}`);
 	}
-
 	return pool.prepare( resources, moduleNameMapping ).
 		then( () => builder.createBundle(bundleDefinition, bundleOptions) ).
 		then( (results) => {

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.
  */
 
@@ -1154,7 +1154,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 +1258,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 + '(';
@@ -1386,13 +1386,16 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 		},
 
+		formatUrlToLink: function(sTarget, sText, bSAPHosted){
+			return `<a target="_blank" rel="noopener noreferrer" href="${sTarget}">${sText}</a>
+			<img src="./resources/sap/ui/documentation/sdk/images/${bSAPHosted ? 'link-sap' : 'link-external'}.png"
+			title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapUISDKExternalLink"/>`;
+		},
+
 		handleExternalUrl: function (sTarget, sText) {
 			// Check if the external domain is SAP hosted
 			let bSAPHosted = /^https?:\/\/([\w.]*\.)?(?:sap|hana\.ondemand|sapfioritrial)\.com/.test(sTarget);
-
-			return `<a target="_blank" rel="noopener noreferrer" href="${sTarget}">${sText}</a>
-<img src="./resources/sap/ui/documentation/sdk/images/${bSAPHosted ? 'link-sap' : 'link-external'}.png"
-title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapUISDKExternalLink"/>`;
+			return this.formatUrlToLink(sTarget, sText, bSAPHosted);
 		},
 
 		/**
@@ -1505,8 +1508,7 @@ title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapU
 						name: oResult.static ? [self.name, oResult.name].join(".") : oResult.name,
 						type: "methods",
 						className: className,
-						text: text,
-						local: true
+						text: text
 					});
 				}
 			}
@@ -1546,7 +1548,7 @@ title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapU
 		 * @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
@@ -1561,12 +1563,7 @@ title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapU
 				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>`;
 		},
 
 		/**
@@ -1594,11 +1591,17 @@ title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapU
 						}
 
 						// 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>';
 						}
 
+						// demo:xxx Demo, open the demonstration page in a new window
+						aMatch = sTarget.match(/^demo:([a-zA-Z0-9\/.]*)$/);
+						if (aMatch) {
+							return this.formatUrlToLink("test-resources/" + aMatch[1], sText, true);
+						}
+
 						// sap.x.Xxx.prototype.xxx - In case of prototype we have a link to method
 						aMatch = sTarget.match(/([a-zA-Z0-9.$_]+?)\.prototype\.([a-zA-Z0-9.$_]+)$/);
 						if (aMatch) {
@@ -1656,7 +1659,6 @@ title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapU
 								name: aMatch[1] ? `${oSelf.name}.${aMatch[2]}` : aMatch[2],
 								type: "methods",
 								className: oSelf.name,
-								local: true,
 								text: sText
 							});
 						}
@@ -1668,7 +1670,6 @@ title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapU
 								name: aMatch[1],
 								type: "annotations",
 								className: oSelf.name,
-								local: true,
 								text: sText
 							});
 						}
@@ -1695,7 +1696,6 @@ title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapU
 								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 : "",
@@ -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,107 @@ 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.
+	 *
+	 * 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}) => `${catharsis.stringify(key)}: ${toTypeString(value)}`
+					).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);
+		if ( tagInfo && /function/.test(tagInfo.typeExpression) && tagInfo.parsedType ) {
+			// 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;
+	}
+}());