Fix tests I

Author: RandomByte

lib/lbt/utils/escapePropertiesFile.js

@@ -4,15 +4,15 @@ 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
  * @returns {Promise<string>} resolves with the escaped string content of the given Resource
  */
 module.exports = async function(resource) {
 	const project = resource.getProject();
-	let propertiesFileSourceEncoding = project.getPropertiesFileSourceEncoding();
+	let propertiesFileSourceEncoding = project && project.getPropertiesFileSourceEncoding();
 
 	if (!propertiesFileSourceEncoding) {
 		if (project && ["0.1", "1.0", "1.1"].includes(project.getSpecVersion())) {

lib/tasks/bundlers/generateLibraryPreload.js

@@ -223,8 +223,9 @@ function getSapUiCoreBunDef(name, filters, preload) {
  * @alias module:@ui5/builder.tasks.generateLibraryPreload
  * @param {object} parameters Parameters
  * @param {module:@ui5/fs.DuplexCollection} parameters.workspace DuplexCollection to read and write files
- * @param {module:@ui5/builder.tasks.TaskUtil|object} [parameters.taskUtil] TaskUtil
+ * @param {module:@ui5/builder.tasks.TaskUtil} [parameters.taskUtil] TaskUtil
  * @param {object} parameters.options Options
+ * @param {string} parameters.options.projectName Project name
  * @param {string[]} [parameters.options.skipBundles] Names of bundles that should not be created
  * @param {string[]} [parameters.options.excludes=[]] List of modules declared as glob patterns (resource name patterns)
  * that should be excluded from the library-preload.js bundle.
@@ -234,7 +235,7 @@ function getSapUiCoreBunDef(name, filters, preload) {
  * inclusion overrides an earlier exclusion, and vice versa.
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = function({workspace, taskUtil, options: {skipBundles = [], excludes = []}}) {
+module.exports = function({workspace, taskUtil, options: {skipBundles = [], excludes = [], projectName}}) {
 	let nonDbgWorkspace = workspace;
 	if (taskUtil) {
 		nonDbgWorkspace = workspace.filter(function(resource) {
@@ -255,17 +256,16 @@ module.exports = function({workspace, taskUtil, options: {skipBundles = [], excl
 		// Find all libraries and create a library-preload.js bundle
 
 		let p = Promise.resolve();
-		const project = taskUtil.getProject();
 
 		// Create core bundles for older versions (<1.97.0) which don't define bundle configuration in the ui5.yaml
 		// See: https://github.com/SAP/openui5/commit/ff127fd2d009162ea43ad312dec99d759ebc23a0
-		if (project.getName() === "sap.ui.core") {
+		if (projectName === "sap.ui.core") {
 			// Instead of checking the sap.ui.core library version, the specVersion is checked against all versions
 			// that have been defined for sap.ui.core before the bundle configuration has been introduced.
 			// This is mainly to have an easier check without version parsing or using semver.
 			// If no project/specVersion is available, the bundles should also be created to not break potential
 			// existing use cases without a properly formed/formatted project tree.
-			if (["0.1", "1.1", "2.0"].includes(project.getSpecVersion())) {
+			if (!taskUtil || ["0.1", "1.1", "2.0"].includes(taskUtil.getProject().getSpecVersion())) {
 				const isEvo = resources.find((resource) => {
 					return resource.getPath() === "/resources/ui5loader.js";
 				});
@@ -343,15 +343,15 @@ module.exports = function({workspace, taskUtil, options: {skipBundles = [], excl
 				} else {
 					// Fallback to "library.js" as library indicator
 					log.verbose(
-						`Could not find a ".library" file for project ${project.getName()}, ` +
+						`Could not find a ".library" file for project ${projectName}, ` +
 						`falling back to "library.js".`);
 					return workspace.byGlob("/resources/**/library.js");
 				}
 			}).then((libraryIndicatorResources) => {
 				if (libraryIndicatorResources.length < 1) {
 					// No library found - nothing to do
 					log.verbose(
-						`Could not find a ".library" or "library.js" file for project ${project.getName()}. ` +
+						`Could not find a ".library" or "library.js" file for project ${projectName}. ` +
 						`Skipping library preload bundling.`);
 					return;
 				}
@@ -427,7 +427,7 @@ module.exports = function({workspace, taskUtil, options: {skipBundles = [], excl
 					} else {
 						log.verbose(
 							`Could not determine library namespace from file "${libraryIndicatorPath}" ` +
-							`for project ${project.getName()}. Skipping library preload bundling.`);
+							`for project ${projectName}. Skipping library preload bundling.`);
 						return Promise.resolve();
 					}
 				}));

lib/tasks/bundlers/generateManifestBundle.js

@@ -4,26 +4,24 @@ const DESCRIPTOR = "manifest.json";
 const PROPERTIES_EXT = ".properties";
 const BUNDLE_NAME = "manifest-bundle.zip";
 
-/**
- *
- * @public
- * @typedef {object} ManifestBundlerOptions
- * @property {string} projectName Project Name
- * @property {string} namespace Namespace
- */
-
+/* eslint "jsdoc/check-param-names": ["error", {"disableExtraPropertyReporting":true}] */
 /**
  * Task for manifestBundler.
  *
  * @public
  * @alias module:@ui5/builder.tasks.generateManifestBundle
  * @param {object} parameters Parameters
  * @param {module:@ui5/fs.DuplexCollection} parameters.workspace DuplexCollection to read and write files
- * @param {ManifestBundlerOptions} parameters.options Options
+ * @param {object} parameters.options Options
+ * @param {string} parameters.options.projectName Project name
+ * @param {string} parameters.options.projectNamespace Project namespace
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
 module.exports = async function({workspace, options = {}}) {
-	const {projectName, namespace} = options;
+	const {projectName} = options;
+	// Backward compatibility: "namespace" option got renamed to "projectNamespace"
+	const namespace = options.projectNamespace || options.namespace;
+
 	if (!projectName || !namespace) {
 		throw new Error("[generateManifestBundle]: One or more mandatory options not provided");
 	}

lib/tasks/bundlers/generateStandaloneAppBundle.js

@@ -58,6 +58,7 @@ function getBundleDefinition(config) {
 	return bundleDefinition;
 }
 
+/* eslint "jsdoc/check-param-names": ["error", {"disableExtraPropertyReporting":true}] */
 /**
  * Task for bundling standalone applications.
  *
@@ -69,10 +70,14 @@ function getBundleDefinition(config) {
  * @param {module:@ui5/builder.tasks.TaskUtil|object} [parameters.taskUtil] TaskUtil
  * @param {object} parameters.options Options
  * @param {string} parameters.options.projectName Project name
- * @param {string} [parameters.options.namespace] Project namespace
+ * @param {string} [parameters.options.projectNamespace] Project namespace
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = async function({workspace, dependencies, taskUtil, options: {projectName, namespace}}) {
+module.exports = async function({workspace, dependencies, taskUtil, options}) {
+	const {projectName} = options;
+	// Backward compatibility: "namespace" option got renamed to "projectNamespace"
+	const namespace = options.projectNamespace || options.namespace;
+
 	if (!namespace) {
 		log.warn(`Namespace of project ${projectName} is not known. Self contained bundling is currently ` +
 			`unable to generate complete bundles for such projects.`);

test/expected/build/application.b/standalone/resources/sap-ui-custom-dbg.js.map

@@ -871,7 +871,7 @@ test.serial("Build library.ø", async (t) => {
 	t.pass();
 });
 
-test.serial("Build library.coreBuildtime (legacy-library): replaceBuildtime", async (t) => {
+test.serial("Build library.coreBuildtime: replaceBuildtime", async (t) => {
 	const destPath = path.join("test", "tmp", "build", "sap.ui.core-buildtime", "dest");
 	const expectedPath = path.join("test", "expected", "build", "sap.ui.core-buildtime", "dest");
 
@@ -1833,7 +1833,7 @@ const libraryCoreBuildtimeTree = {
 	"dependencies": [],
 	"configuration": {
 		"specVersion": "2.6",
-		"type": "legacy-library",
+		"type": "library",
 		"metadata": {
 			"name": "library.coreBuildtime",
 			"copyright": "Some fancy copyright"

test/expected/build/application.b/standalone/resources/sap-ui-custom.js

@@ -20,11 +20,7 @@ function createMockPool(dependencies) {
 				buffer: async () => Buffer.from(name.padStart(2048, "*")),
 				getProject: () => {
 					return {
-						"resources": {
-							"configuration": {
-								"propertiesFileSourceEncoding": "ISO-8859-1"
-							}
-						}
+						getPropertiesFileSourceEncoding: () => "ISO-8859-1"
 					};
 				},
 				resource: {
@@ -211,11 +207,7 @@ test("_calcMinSize: properties resource", async (t) => {
 				},
 				getProject: () => {
 					return {
-						"resources": {
-							"configuration": {
-								"propertiesFileSourceEncoding": "ISO-8859-1"
-							}
-						}
+						getPropertiesFileSourceEncoding: () => "ISO-8859-1"
 					};
 				}
 			};

test/expected/build/application.b/standalone/resources/sap-ui-custom.js.map

@@ -21,11 +21,7 @@ test.serial("propertiesFileSourceEncoding UTF-8", async (t) => {
 	const lbtResource = {
 		getProject: () => {
 			return {
-				resources: {
-					configuration: {
-						propertiesFileSourceEncoding: "UTF-8"
-					}
-				}
+				getPropertiesFileSourceEncoding: () => "UTF-8"
 			};
 		},
 		resource: "actual resource",
@@ -52,11 +48,7 @@ test.serial("propertiesFileSourceEncoding ISO-8859-1", async (t) => {
 	const lbtResource = {
 		getProject: () => {
 			return {
-				resources: {
-					configuration: {
-						propertiesFileSourceEncoding: "ISO-8859-1"
-					}
-				}
+				getPropertiesFileSourceEncoding: () => "ISO-8859-1"
 			};
 		},
 		resource: "actual resource",
@@ -81,12 +73,7 @@ test.serial("propertiesFileSourceEncoding ISO-8859-1", async (t) => {
 test.serial("propertiesFileSourceEncoding not set", async (t) => {
 	const lbtResource = {
 		getProject: () => {
-			return {
-				resources: {
-					configuration: {
-					}
-				}
-			};
+			return undefined;
 		},
 		resource: "actual resource",
 		buffer: async () => {
@@ -111,7 +98,8 @@ test.serial("propertiesFileSourceEncoding not set - specVersion 0.1", async (t)
 	const lbtResource = {
 		getProject: () => {
 			return {
-				specVersion: "0.1"
+				getSpecVersion: () => "0.1",
+				getPropertiesFileSourceEncoding: () => ""
 			};
 		},
 		resource: "actual resource",
@@ -137,7 +125,8 @@ test.serial("propertiesFileSourceEncoding not set - specVersion 1.0", async (t)
 	const lbtResource = {
 		getProject: () => {
 			return {
-				specVersion: "1.0"
+				getSpecVersion: () => "1.0",
+				getPropertiesFileSourceEncoding: () => ""
 			};
 		},
 		resource: "actual resource",
@@ -163,7 +152,8 @@ test.serial("propertiesFileSourceEncoding not set - specVersion 1.1", async (t)
 	const lbtResource = {
 		getProject: () => {
 			return {
-				specVersion: "1.1"
+				getSpecVersion: () => "1.1",
+				getPropertiesFileSourceEncoding: () => ""
 			};
 		},
 		resource: "actual resource",
@@ -189,7 +179,8 @@ test.serial("propertiesFileSourceEncoding not set - specVersion 2.0", async (t)
 	const lbtResource = {
 		getProject: () => {
 			return {
-				specVersion: "2.0"
+				getSpecVersion: () => "2.0",
+				getPropertiesFileSourceEncoding: () => ""
 			};
 		},
 		resource: "actual resource",