@ui5/builder 3.0.0-alpha.8 → 3.0.0-beta.1

package/lib/lbt/bundle/ResolvedBundleDefinition.js

@@ -1,8 +1,7 @@
-"use strict";
 
-const UI5ClientConstants = require("../UI5ClientConstants");
-const ModuleInfo = require("../resources/ModuleInfo");
-const {SectionType} = require("./BundleDefinition");
+import {MODULE__JQUERY_SAP_GLOBAL, MODULE__SAP_UI_CORE_CORE} from "../UI5ClientConstants.js";
+import ModuleInfo from "../resources/ModuleInfo.js";
+import {SectionType} from "./BundleDefinition.js";
 
 class ResolvedBundleDefinition {
 	constructor( bundleDefinition /* , vars*/) {
@@ -18,7 +17,7 @@ class ResolvedBundleDefinition {
 		return this.sections.some(
 			(section) =>
 				(section.mode === SectionType.Raw || section.mode === SectionType.Require) &&
-				section.modules.some((module) => module === UI5ClientConstants.MODULE__SAP_UI_CORE_CORE)
+				section.modules.some((module) => module === MODULE__SAP_UI_CORE_CORE)
 		);
 	}
 
@@ -26,7 +25,7 @@ class ResolvedBundleDefinition {
 		return this.sections.some(
 			(section) =>
 				section.mode === SectionType.Raw &&
-				section.modules.some((module) => module === UI5ClientConstants.MODULE__JQUERY_SAP_GLOBAL)
+				section.modules.some((module) => module === MODULE__JQUERY_SAP_GLOBAL)
 		);
 	}
 
@@ -108,4 +107,4 @@ class ResolvedSection {
 	}
 }
 
-module.exports = ResolvedBundleDefinition;
+export default ResolvedBundleDefinition;

package/lib/lbt/bundle/Resolver.js

@@ -1,15 +1,14 @@
 /**
  * Takes a bundle definition and resolves it against the given pool.
  */
-"use strict";
 
-const topologicalSort = require("../graph/topologicalSort");
-const UI5ClientConstants = require("../UI5ClientConstants");
-const ResourceFilterList = require("../resources/ResourceFilterList");
-
-const {SectionType} = require("./BundleDefinition");
-const ResolvedBundleDefinition = require("./ResolvedBundleDefinition");
-const log = require("@ui5/logger").getLogger("lbt:bundle:Resolver");
+import topologicalSort from "../graph/topologicalSort.js";
+import {getRendererName} from "../UI5ClientConstants.js";
+import ResourceFilterList from "../resources/ResourceFilterList.js";
+import {SectionType} from "./BundleDefinition.js";
+import ResolvedBundleDefinition from "./ResolvedBundleDefinition.js";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:bundle:Resolver");
 
 let dependencyTracker;
 
@@ -144,7 +143,7 @@ class BundleResolver {
 
 								// add renderer, if 'renderer' is configured and if it exists
 								if ( section.renderer ) {
-									const rendererModuleName = UI5ClientConstants.getRendererName( resourceName );
+									const rendererModuleName = getRendererName( resourceName );
 									promises.push( checkAndAddResource( rendererModuleName, depth + 1) );
 								}
 							}
@@ -292,12 +291,12 @@ class BundleResolver {
 						if ( section.mode == SectionType.Raw && section.sort !== false ) {
 							// sort the modules in topological order
 							return topologicalSort(pool, modules).then( (modules) => {
-								log.verbose("      resolved modules (sorted): %s", modules);
+								log.silly("      resolved modules (sorted): %s", modules);
 								return modules;
 							});
 						}
 
-						log.verbose("      resolved modules: %s", modules);
+						log.silly("      resolved modules: %s", modules);
 						return modules;
 					}).then( function(modules) {
 						resolvedSection.modules = modules;
@@ -324,5 +323,5 @@ class BundleResolver {
 }
 
 
-module.exports = BundleResolver;
+export default BundleResolver;
 

package/lib/lbt/calls/SapUiDefine.js

@@ -1,8 +1,7 @@
-"use strict";
 
-const {Syntax} = require("../utils/parseUtils");
-const ModuleName = require("../utils/ModuleName");
-const {isString, isBoolean} = require("../utils/ASTUtils");
+import {Syntax} from "../utils/parseUtils.js";
+import {resolveRelativeRequireJSName} from "../utils/ModuleName.js";
+import {isBoolean, getStringValue} from "../utils/ASTUtils.js";
 
 class SapUiDefineCall {
 	constructor(node, moduleName) {
@@ -11,6 +10,7 @@ class SapUiDefineCall {
 		this.dependencyArray = null;
 		this.factory = null;
 		this.exportAsGlobal = false;
+		this.paramNames = null;
 
 		const args = node.arguments;
 		if ( args == null ) {
@@ -27,28 +27,33 @@ class SapUiDefineCall {
 		let i = 0;
 		let params;
 
-		if ( i < args.length && isString(args[i]) ) {
+		const name = getStringValue(args[i]);
+		if ( i < args.length && name ) {
 			// assert(String)
-			this.name = args[i++].value;
+			this.name = name;
+			i++;
 		}
 
 		if ( i < args.length && args[i].type === Syntax.ArrayExpression ) {
 			this.dependencyArray = args[i++];
 			this.dependencies = this.dependencyArray.elements.map( (elem) => {
-				if ( !isString(elem) ) {
+				const value = getStringValue(elem);
+				if ( !value ) {
 					throw new TypeError();
 				}
-				return ModuleName.resolveRelativeRequireJSName(this.name, elem.value);
+				return resolveRelativeRequireJSName(this.name, value);
 			});
 			this.dependencyInsertionIdx = this.dependencyArray.elements.length;
 		}
 
-		if ( i < args.length && args[i].type === Syntax.FunctionExpression ) {
+		if ( i < args.length && (
+			args[i].type === Syntax.FunctionExpression || args[i].type === Syntax.ArrowFunctionExpression)
+		) {
 			this.factory = args[i++];
 			params = this.factory.params;
 			this.paramNames = params.map( (param) => {
 				if ( param.type !== Syntax.Identifier ) {
-					throw new TypeError();
+					return null;
 				}
 				return param.name;
 			});
@@ -88,4 +93,4 @@ class SapUiDefineCall {
 	}
 }
 
-module.exports = SapUiDefineCall;
+export default SapUiDefineCall;

package/lib/lbt/graph/dependencyGraph.js

@@ -1,6 +1,5 @@
-"use strict";
-
-const log = require("@ui5/logger").getLogger("lbt:graph:dependencyGraph");
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:graph:dependencyGraph");
 
 class Node {
 	constructor(name) {
@@ -64,7 +63,7 @@ async function createDependencyGraph(pool, roots, options) {
 	});
 }
 
-module.exports = createDependencyGraph;
+export default createDependencyGraph;
 
 // TODO introduce class Graph
 // TODO remove n0 here, only introduce it in dominator tree (using the Graph API)

package/lib/lbt/graph/dominatorTree.js

@@ -1,4 +1,5 @@
-"use strict";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:graph:dominatorTree");
 
 /**
  * Creates a dependency graph starting from the given set of root modules.
@@ -16,7 +17,6 @@
  * @private
  */
 function calculateDominatorTree({n0, nodes}) {
-	const log = require("@ui5/logger").getLogger("lbt:graph:dominatorTree");
 	// initialize set of dominators for each node
 	for ( const n of nodes.values() ) {
 		if ( n === n0 ) {
@@ -113,4 +113,4 @@ function calculateDominatorTree({n0, nodes}) {
 	return n0;
 }
 
-module.exports = calculateDominatorTree;
+export default calculateDominatorTree;

package/lib/lbt/graph/topologicalSort.js

@@ -1,6 +1,6 @@
-"use strict";
 
-const log = require("@ui5/logger").getLogger("lbt:graph:topologicalSort");
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:graph:topologicalSort");
 
 /**
  * Represents a module and its dependencies in a dependency graph.
@@ -186,4 +186,4 @@ function topologicalSort(pool, moduleNames) {
 		});
 }
 
-module.exports = topologicalSort;
+export default topologicalSort;

package/lib/lbt/resources/LibraryFileAnalyzer.js

@@ -1,11 +1,10 @@
 /**
- * Used by the ResourcePool to read raw module info as stored in the .liubrary files.
+ * Used by the ResourcePool to read raw module info as stored in the .library files.
  * It does not (yet) analyze dependencies of the library and therefore isn't part of the analyzer package (yet).
  */
-"use strict";
-
-const xml2js = require("xml2js");
-const log = require("@ui5/logger").getLogger("lbt:resources:LibraryFileAnalyzer");
+import xml2js from "xml2js";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:resources:LibraryFileAnalyzer");
 
 const parser = new xml2js.Parser({
 	// explicitChildren: true,
@@ -49,7 +48,7 @@ function createRawInfo(rawModule) {
 	}
 }
 
-function getDependencyInfos( name, content ) {
+export function getDependencyInfos( name, content ) {
 	const infos = {};
 	parser.parseString(content, (err, result) => {
 		if ( result &&
@@ -77,5 +76,3 @@ function getDependencyInfos( name, content ) {
 	// console.log("done", infos);
 	return infos;
 }
-
-module.exports.getDependencyInfos = getDependencyInfos;

package/lib/lbt/resources/LocatorResource.js

@@ -1,4 +1,4 @@
-const Resource = require("./Resource");
+import Resource from "./Resource.js";
 
 class LocatorResource extends Resource {
 	constructor(pool, resource, moduleName) {
@@ -19,4 +19,4 @@ class LocatorResource extends Resource {
 	}
 }
 
-module.exports = LocatorResource;
+export default LocatorResource;

package/lib/lbt/resources/LocatorResourcePool.js

@@ -1,5 +1,5 @@
-const ResourcePool = require("./ResourcePool");
-const LocatorResource = require("./LocatorResource");
+import ResourcePool from "./ResourcePool.js";
+import LocatorResource from "./LocatorResource.js";
 
 class LocatorResourcePool extends ResourcePool {
 	prepare(resources, moduleNameMapping) {
@@ -16,4 +16,4 @@ class LocatorResourcePool extends ResourcePool {
 	}
 }
 
-module.exports = LocatorResourcePool;
+export default LocatorResourcePool;

package/lib/lbt/resources/ModuleInfo.js

@@ -1,4 +1,3 @@
-"use strict";
 
 /**
  * A strict dependency always has to be fulfilled and is declared as part of the module's definition.
@@ -250,4 +249,4 @@ public class ModuleInfo {
 
 } */
 
-module.exports = ModuleInfo;
+export default ModuleInfo;

package/lib/lbt/resources/Resource.js

@@ -1,7 +1,6 @@
-"use strict";
 
-const {promisify} = require("util");
-const fs = require("graceful-fs");
+import {promisify} from "node:util";
+import fs from "graceful-fs";
 const readFile = promisify(fs.readFile);
 
 class Resource {
@@ -27,4 +26,4 @@ class Resource {
 	}
 }
 
-module.exports = Resource;
+export default Resource;

package/lib/lbt/resources/ResourceCollector.js

@@ -1,13 +1,12 @@
-const ResourceInfoList = require("./ResourceInfoList");
-const ResourceFilterList = require("./ResourceFilterList");
-const ResourceInfo = require("./ResourceInfo");
-
+import ResourceInfoList from "./ResourceInfoList.js";
+import ResourceFilterList from "./ResourceFilterList.js";
+import ResourceInfo from "./ResourceInfo.js";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:resources:ResourceCollector");
 
 const LOCALE = /^((?:[^/]+\/)*[^/]+?)_([A-Z]{2}(?:_[A-Z]{2}(?:_[A-Z0-9_]+)?)?)(\.properties|\.hdbtextbundle)$/i;
 const THEME = /^((?:[^/]+\/)*)themes\/([^/]+)\//;
 
-const log = require("@ui5/logger").getLogger("lbt:resources:ResourceCollector");
-
 /**
  * Collects all resources in a set of resource folders or from an archive
  * and writes a 'resources.json' file for each component or library
@@ -76,7 +75,7 @@ class ResourceCollector {
 	/**
 	 * Processes a resource
 	 *
-	 * @param {module:@ui5/fs.Resource} resource
+	 * @param {@ui5/fs/Resource} resource
 	 */
 	async visitResource(resource) {
 		const virPath = resource.getPath();
@@ -400,4 +399,4 @@ class ResourceCollector {
 	}
 }
 
-module.exports = ResourceCollector;
+export default ResourceCollector;

package/lib/lbt/resources/ResourceFilterList.js

@@ -1,6 +1,6 @@
-"use strict";
 
-const log = require("@ui5/logger").getLogger("lbt:resources:ResourceFilterList");
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:resources:ResourceFilterList");
 
 const FILTER_PREFIXES = /^[-!+]/;
 
@@ -95,7 +95,7 @@ function makeMatcher(globPattern, fileTypesPattern) {
  * @since 1.16.2
  * @private
  */
-class ResourceFilterList {
+export default class ResourceFilterList {
 	constructor(filters, fileTypes) {
 		this.matchers = [];
 		this.matchByDefault = true;
@@ -127,43 +127,43 @@ class ResourceFilterList {
 	toString() {
 		return this.matchers.map((matcher) => matcher.pattern).join(",");
 	}
-}
 
-/**
- * Each filter entry can be a comma separated list of simple filters. Each simple filter
- * can be a pattern in resource name pattern syntax: A double asterisk '&0x2a;&0x2a;/' denotes an arbitrary
- * number of resource name segments (folders) incl. a trailing slash, whereas a simple asterisk '*'
- * denotes an arbitrary number of resource name characters, but not the segment separator '/'.
- * A dot is interpreted as a dot, all other special regular expression characters keep their
- * special meaning. This is a mixture of ANT-style path patterns and regular expressions.
- *
- * Excludes can be denoted by a leading '-' or '!', includes optionally by a leading '+'.
- * Order of filters is significant, a later exclusion overrides an earlier inclusion
- * and vice versa.
- *
- * Example:
- * <pre>
- *	 !sap/ui/core/
- *	 +sap/ui/core/utils/
- * </pre>
- * excludes everything from sap/ui/core, but includes everything from the subpackage sap/ui/core/utils/.
- *
- * Note that the filter operates on the full name of each resource. If a resource name
- * <code>prefix</code> is configured for a resource set, the filter will be applied
- * to the combination of prefix and local file path and not only to the local file path.
- *
- * @param {string} filterStr comma separated list of simple filters
- * @returns {ResourceFilterList}
- */
-ResourceFilterList.fromString = function(filterStr) {
-	const result = new ResourceFilterList();
-	if ( filterStr != null ) {
-		result.addFilters( filterStr.trim().split(/\s*,\s*/).filter(Boolean) );
+	/**
+	 * Each filter entry can be a comma separated list of simple filters. Each simple filter
+	 * can be a pattern in resource name pattern syntax: A double asterisk '&0x2a;&0x2a;/' denotes an arbitrary
+	 * number of resource name segments (folders) incl. a trailing slash, whereas a simple asterisk '*'
+	 * denotes an arbitrary number of resource name characters, but not the segment separator '/'.
+	 * A dot is interpreted as a dot, all other special regular expression characters keep their
+	 * special meaning. This is a mixture of ANT-style path patterns and regular expressions.
+	 *
+	 * Excludes can be denoted by a leading '-' or '!', includes optionally by a leading '+'.
+	 * Order of filters is significant, a later exclusion overrides an earlier inclusion
+	 * and vice versa.
+	 *
+	 * Example:
+	 * <pre>
+	 *	 !sap/ui/core/
+	*	 +sap/ui/core/utils/
+	* </pre>
+	* excludes everything from sap/ui/core, but includes everything from the subpackage sap/ui/core/utils/.
+	*
+	* Note that the filter operates on the full name of each resource. If a resource name
+	* <code>prefix</code> is configured for a resource set, the filter will be applied
+	* to the combination of prefix and local file path and not only to the local file path.
+	*
+	* @param {string} filterStr comma separated list of simple filters
+	* @returns {ResourceFilterList}
+	*/
+	static fromString(filterStr) {
+		const result = new ResourceFilterList();
+		if ( filterStr != null ) {
+			result.addFilters( filterStr.trim().split(/\s*,\s*/).filter(Boolean) );
+		}
+		return result;
 	}
-	return result;
-};
+}
 
-ResourceFilterList.negateFilters = function(patterns) {
+export function negateFilters(patterns) {
 	return patterns.map((pattern) => {
 		let include = true;
 
@@ -181,6 +181,4 @@ ResourceFilterList.negateFilters = function(patterns) {
 			return "+" + pattern;
 		}
 	});
-};
-
-module.exports = ResourceFilterList;
+}

package/lib/lbt/resources/ResourceInfo.js

@@ -177,4 +177,4 @@ class ResourceInfo {
 	}
 }
 
-module.exports = ResourceInfo;
+export default ResourceInfo;

package/lib/lbt/resources/ResourceInfoList.js

@@ -1,4 +1,4 @@
-const ResourceInfo = require("./ResourceInfo");
+import ResourceInfo from "./ResourceInfo.js";
 
 const DEBUG_RESOURCES_PATTERN = /-dbg((?:\.view|\.fragment|\.controller|\.designtime|\.support)?\.js|\.css)$/;
 
@@ -24,7 +24,9 @@ class ResourceInfoList {
 
 		// --- transient state ---
 		/**
-		 * @type {string} name of the resource
+		 * The name of the resource
+		 *
+		 * @type {string}
 		 */
 		this.name = prefix;
 		/**
@@ -114,4 +116,4 @@ class ResourceInfoList {
 	}
 }
 
-module.exports = ResourceInfoList;
+export default ResourceInfoList;

package/lib/lbt/resources/ResourcePool.js

@@ -1,24 +1,18 @@
-"use strict";
-
-/*
-const fs = require("fs");
-const path = require("path");
-*/
-const {parseJS} = require("../utils/parseUtils");
-const ComponentAnalyzer = require("../analyzer/ComponentAnalyzer");
-const SmartTemplateAnalyzer = require("../analyzer/SmartTemplateAnalyzer");
-const FioriElementsAnalyzer = require("../analyzer/FioriElementsAnalyzer");
-const XMLCompositeAnalyzer = require("../analyzer/XMLCompositeAnalyzer");
-const JSModuleAnalyzer = require("../analyzer/JSModuleAnalyzer");
-const XMLTemplateAnalyzer = require("../analyzer/XMLTemplateAnalyzer");
-
-const LibraryFileAnalyzer = require("./LibraryFileAnalyzer");
-const ModuleInfo = require("./ModuleInfo");
-const ResourceFilterList = require("./ResourceFilterList");
+import {parseJS} from "../utils/parseUtils.js";
+import ComponentAnalyzer from "../analyzer/ComponentAnalyzer.js";
+import SmartTemplateAnalyzer from "../analyzer/SmartTemplateAnalyzer.js";
+import FioriElementsAnalyzer from "../analyzer/FioriElementsAnalyzer.js";
+import XMLCompositeAnalyzer from "../analyzer/XMLCompositeAnalyzer.js";
+import JSModuleAnalyzer from "../analyzer/JSModuleAnalyzer.js";
+import XMLTemplateAnalyzer from "../analyzer/XMLTemplateAnalyzer.js";
+import {getDependencyInfos} from "./LibraryFileAnalyzer.js";
+import ModuleInfo from "./ModuleInfo.js";
+import ResourceFilterList from "./ResourceFilterList.js";
+import logger from "@ui5/logger";
+const log = logger.getLogger("lbt:resources:ResourcePool");
 /*
-const Resource = require("./Resource");
+import Resource from "./Resource";
  */
-const log = require("@ui5/logger").getLogger("lbt:resources:ResourcePool");
 
 const jsAnalyzer = new JSModuleAnalyzer();
 
@@ -165,7 +159,7 @@ class ResourcePool {
 		if ( /\.library$/.test(resource.name) ) {
 			// read raw-module info from .library files
 			return resource.buffer().then( (buffer) => {
-				const infos = LibraryFileAnalyzer.getDependencyInfos( resource.name, buffer );
+				const infos = getDependencyInfos( resource.name, buffer );
 				for ( const name of Object.keys(infos) ) {
 					this._rawModuleInfos.set(name, infos[name]);
 				}
@@ -238,5 +232,5 @@ class ResourcePool {
 	}
 }
 
-module.exports = ResourcePool;
+export default ResourcePool;