@ui5/builder 2.11.7 → 2.11.9

package/CHANGELOG.md

@@ -2,10 +2,26 @@
 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.7...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v2.11.9...HEAD).
+
+<a name="v2.11.9"></a>
+## [v2.11.9] - 2022-11-30
+### Bug Fixes
+- **transformApiJson:** Fix regression in UI5 Tooling scenario [`819c808`](https://github.com/SAP/ui5-builder/commit/819c808010963b84bfe33e109a7b2a5412096f78)
+
+### Dependency Updates
+- Bump less-openui5 from 0.11.2 to 0.11.3 [`1bbe5f5`](https://github.com/SAP/ui5-builder/commit/1bbe5f561fb35c646a27cbe4d03050101ff68d7c)
+
+
+<a name="v2.11.8"></a>
+## [v2.11.8] - 2022-10-28
+### Bug Fixes
+- **ComponentAnalyzer:** Fix detection of rootView [`acb3d9f`](https://github.com/SAP/ui5-builder/commit/acb3d9fd7fc60ad61ac88d68cb0fd5296b795e9f)
+- **XMLTemplateAnalyzer:** Fix detection of nested views [`1cbfd82`](https://github.com/SAP/ui5-builder/commit/1cbfd82396e5fa78455e0a696e9229a2e8a337fc)
+
 
 <a name="v2.11.7"></a>
-## [v2.11.7] - 2022-10-16
+## [v2.11.7] - 2022-10-20
 ### Dependency Updates
 - Bump escope from 3.6.0 to 4.0.0 [`852b37f`](https://github.com/SAP/ui5-builder/commit/852b37f549f3927decbc1b40cc6055325472d625)
 
@@ -663,6 +679,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.9]: https://github.com/SAP/ui5-builder/compare/v2.11.8...v2.11.9
+[v2.11.8]: https://github.com/SAP/ui5-builder/compare/v2.11.7...v2.11.8
 [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

package/lib/lbt/analyzer/ComponentAnalyzer.js

@@ -66,6 +66,53 @@ class ComponentAnalyzer {
 		return info;
 	}
 
+	_getRootViewModule(rootView) {
+		// For runtime logic see sap/ui/core/UIComponent#createContent and sap/ui/core/mvc/View#_getModuleName
+
+		if (typeof rootView === "string") {
+			rootView = {
+				viewName: rootView
+			};
+		}
+		if (!rootView.type) {
+			rootView.type = "XML";
+		}
+
+		if (!rootView.viewName) {
+			log.warn(`Unable to analyze sap.ui5/rootView: Missing viewName`);
+			return null;
+		}
+
+		if (rootView.viewName.startsWith("module:")) {
+			return rootView.viewName.slice("module:".length) + ".js";
+		}
+
+		let viewTypeExtension;
+
+		switch (rootView.type) {
+		case "JS":
+			viewTypeExtension = ".view.js";
+			break;
+		case "JSON":
+			viewTypeExtension = ".view.json";
+			break;
+		case "Template":
+			viewTypeExtension = ".view.tmpl";
+			break;
+		case "XML":
+			viewTypeExtension = ".view.xml";
+			break;
+		case "HTML":
+			viewTypeExtension = ".view.html";
+			break;
+		default:
+			log.warn(`Unable to analyze sap.ui5/rootView: Unknown type '${rootView.type}'`);
+			return null;
+		}
+
+		return ModuleName.fromUI5LegacyName(rootView.viewName, viewTypeExtension);
+	}
+
 	/**
 	 * Evaluates a manifest after it has been read and parsed
 	 * and adds any newly found dependencies to the given info object.
@@ -88,20 +135,11 @@ class ComponentAnalyzer {
 		}
 
 		if ( ui5.rootView ) {
-			let rootView;
-			if ( typeof ui5.rootView === "string" ) {
-				rootView = {
-					viewName: ui5.rootView,
-					type: "XML"
-				};
-			} else {
-				rootView = ui5.rootView;
+			const module = this._getRootViewModule(ui5.rootView);
+			if (module) {
+				log.verbose("adding root view dependency ", module);
+				info.addDependency( module );
 			}
-			const module = ModuleName.fromUI5LegacyName(
-				rootView.viewName,
-				".view." + rootView.type.toLowerCase() );
-			log.verbose("adding root view dependency ", module);
-			info.addDependency( module );
 		}
 
 		each( ui5.dependencies && ui5.dependencies.libs, (options, lib) => {

package/lib/lbt/analyzer/XMLTemplateAnalyzer.js

@@ -37,10 +37,12 @@ const FRAGMENT_FRAGMENTNAME_ATTRIBUTE = "fragmentName";
 const FRAGMENT_TYPE_ATTRIBUTE = "type";
 
 // different view types
+const VIEW_MODULE = "sap/ui/core/mvc/View.js";
 const HTMLVIEW_MODULE = "sap/ui/core/mvc/HTMLView.js";
 const JSVIEW_MODULE = "sap/ui/core/mvc/JSView.js";
 const JSONVIEW_MODULE = "sap/ui/core/mvc/JSONView.js";
 const XMLVIEW_MODULE = "sap/ui/core/mvc/XMLView.js";
+const TEMPLATEVIEW_MODULE = "sap/ui/core/mvc/TemplateView.js";
 const ANYVIEW_VIEWNAME_ATTRIBUTE = "viewName";
 const XMLVIEW_CONTROLLERNAME_ATTRIBUTE = "controllerName";
 const XMLVIEW_RESBUNDLENAME_ATTRIBUTE = "resourceBundleName";
@@ -48,6 +50,7 @@ const XMLVIEW_CORE_REQUIRE_ATTRIBUTE_NS = {
 	uri: "sap.ui.core",
 	local: "require"
 };
+const VIEW_TYPE_ATTRIBUTE = "type";
 
 /*
  * Helper to simplify access to node attributes.
@@ -347,6 +350,54 @@ class XMLTemplateAnalyzer {
 					// console.log("child view detected %s", childViewModuleName);
 					this._addDependency(childViewModuleName, conditional);
 				}
+			} else if ( moduleName === TEMPLATEVIEW_MODULE ) {
+				const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
+				if ( viewName ) {
+					const childViewModuleName = ModuleName.fromUI5LegacyName( viewName, ".view.tmpl" );
+					// console.log("child view detected %s", childViewModuleName);
+					this._addDependency(childViewModuleName, conditional);
+				}
+			} else if ( moduleName === VIEW_MODULE ) {
+				const viewName = getAttribute(node, ANYVIEW_VIEWNAME_ATTRIBUTE);
+				if ( viewName ) {
+					let childViewModuleName;
+
+					if (viewName.startsWith("module:")) {
+						childViewModuleName = viewName.slice("module:".length) + ".js";
+					} else {
+						const viewType = getAttribute(node, VIEW_TYPE_ATTRIBUTE);
+
+						let viewTypeExtension;
+
+						switch (viewType) {
+						case "JS":
+							viewTypeExtension = ".view.js";
+							break;
+						case "JSON":
+							viewTypeExtension = ".view.json";
+							break;
+						case "Template":
+							viewTypeExtension = ".view.tmpl";
+							break;
+						case "XML":
+							viewTypeExtension = ".view.xml";
+							break;
+						case "HTML":
+							viewTypeExtension = ".view.html";
+							break;
+						default:
+							log.warn(`Unable to analyze sap.ui5/rootView: Unknown type '${viewType}'`);
+						}
+
+						if (viewTypeExtension) {
+							childViewModuleName = ModuleName.fromUI5LegacyName(viewName, viewTypeExtension);
+						}
+					}
+					if (childViewModuleName) {
+						// console.log("child view detected %s", childViewModuleName);
+						this._addDependency(childViewModuleName, conditional);
+					}
+				}
 			}
 		} catch (err) {
 			// ignore missing resources

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

@@ -989,11 +989,12 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 			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") {
+
+				// Using path.join to normalize POSIX paths to Windows paths on Windows
+				librarySrcDir = path.join(librarySrcDir);
+				libraryTestDir = path.join(libraryTestDir);
+
 				/**
 				 * Calculate prefix to check
 				 *

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "2.11.7",
+	"version": "2.11.9",
 	"description": "UI5 Tooling - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -113,7 +113,7 @@
 		"globby": "^11.1.0",
 		"graceful-fs": "^4.2.10",
 		"jsdoc": "^3.6.11",
-		"less-openui5": "^0.11.2",
+		"less-openui5": "^0.11.3",
 		"make-dir": "^3.1.0",
 		"pretty-data": "^0.40.0",
 		"pretty-hrtime": "^1.0.3",
@@ -139,7 +139,7 @@
 		"mock-require": "^3.0.3",
 		"nyc": "^15.1.0",
 		"open-cli": "^6.0.1",
-		"recursive-readdir": "^2.1.1",
+		"recursive-readdir": "^2.2.3",
 		"sinon": "^11.1.2",
 		"tap-nyan": "^1.1.0",
 		"tap-xunit": "^2.4.1"