@ui5/builder 3.0.0-alpha.1 → 3.0.0-alpha.10

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/analyzer/JSModuleAnalyzer.js

@@ -175,12 +175,11 @@ const EnrichedVisitorKeys = (function() {
 
 	// merge with 'official' visitor keys
 	Object.keys(VisitorKeys).forEach( (type) => {
-		// Check if the visitor-key exists in the available Syntax because
-		// the list of visitor-keys does not match the available Syntax.
-		if (!Syntax[type]) {
-			// Deprecated / removed:
-			// ExperimentalRestProperty
-			// ExperimentalSpreadProperty
+		// Ignore deprecated keys:
+		// - ExperimentalSpreadProperty => SpreadElement
+		// - ExperimentalRestProperty => RestElement
+		// They are about to be removed, see: https://github.com/eslint/eslint-visitor-keys/pull/36
+		if (type === "ExperimentalSpreadProperty" || type === "ExperimentalRestProperty") {
 			return;
 		}
 		// Ignore JSX visitor-keys because they aren't used.
@@ -188,6 +187,15 @@ const EnrichedVisitorKeys = (function() {
 			return;
 		}
 
+		// Ignore new ES2022 syntax as we currently use ES2021 (see parseUtils.js)
+		if (
+			type === "PrivateIdentifier" ||
+			type === "PropertyDefinition" ||
+			type === "StaticBlock"
+		) {
+			return;
+		}
+
 		const visitorKeys = VisitorKeys[type];
 		const condKeys = TempKeys[type];
 		if ( condKeys === undefined ) {
@@ -293,6 +301,9 @@ class JSModuleAnalyzer {
 		 */
 		let bIsUi5Module = false;
 
+		// Module name via @ui5-bundle comment in first line. Overrides all other main module candidates.
+		let firstLineBundleName;
+
 		// first analyze the whole AST...
 		visit(ast, false);
 
@@ -306,7 +317,12 @@ class JSModuleAnalyzer {
 						log.verbose(`bundle include directive ${subModule}`);
 					} else if ( comment.value.startsWith("@ui5-bundle ") ) {
 						const bundleName = comment.value.slice("@ui5-bundle ".length);
-						setMainModuleInfo(bundleName, null);
+						if (comment.start === 0) {
+							// Remember the name from the first line to use it as final name
+							firstLineBundleName = bundleName;
+						} else {
+							setMainModuleInfo(bundleName, null);
+						}
 						log.verbose(`bundle name directive ${bundleName}`);
 					} else {
 						log.warn(`unrecognized bundle directive ${comment.value}`);
@@ -316,7 +332,10 @@ class JSModuleAnalyzer {
 		}
 
 		// ...and finally take conclusions about the file's content
-		if ( !mainModuleFound ) {
+		if ( firstLineBundleName ) {
+			// If the first line has a bundle name, use it and override all other found names
+			info.name = firstLineBundleName;
+		} else if ( !mainModuleFound ) {
 			// if there's exactly one module definition in this file but it didn't
 			// immediately qualify as main module, make it now the main module
 			if ( candidateName != null && nModuleDeclarations == 1 ) {

package/lib/lbt/analyzer/XMLTemplateAnalyzer.js

@@ -231,9 +231,10 @@ class XMLTemplateAnalyzer {
 			// looks like a UI5 library or package name
 			const moduleName = ModuleName.fromUI5LegacyName( (namespace ? namespace + "." : "") + localName );
 
+			this._analyzeCoreRequire(node);
+
 			// ignore FragmentDefinition (also skipped by runtime XMLTemplateProcessor)
 			if ( FRAGMENTDEFINITION_MODULE !== moduleName ) {
-				this._analyzeCoreRequire(node);
 				this.promises.push(this._analyzeModuleDependency(node, moduleName, this.conditional));
 			}
 		}