[INTERNAL] Adopt ui5-project changes II

Author: RandomByte

lib/tasks/TaskUtil.js

@@ -1,3 +1,5 @@
+const ProjectResource = require("@ui5/fs").ProjectResource;
+
 /**
  * Convenience functions for UI5 Builder tasks.
  * An instance of this class is passed to every standard UI5 Builder task that requires it.
@@ -51,14 +53,26 @@ class TaskUtil {
 	 * This method is only available to custom task extensions defining
 	 * <b>Specification Version 2.2 and above</b>.
 	 *
-	 * @param {string|module:@ui5/fs.Resource} resourcePath Path or resource-instance the tag should be stored for
+	 * @param {module:@ui5/fs.ProjectResource} resource Resource-instance the tag should be stored for
 	 * @param {string} tag Name of the tag.
 	 * 		Currently only the [STANDARD_TAGS]{@link module:@ui5/builder.tasks.TaskUtil#STANDARD_TAGS} are allowed
 	 * @param {string|boolean|integer} [value=true] Tag value. Must be primitive
 	 * @public
 	 */
-	setTag(resourcePath, tag, value) {
-		return this._projectBuildContext.getResourceTagCollection().setTag(resourcePath, tag, value);
+	setTag(resource, tag, value) {
+		if (typeof resource === "string") {
+			throw new Error("TODO 3.0: Deprecated");
+		}
+		if (!(resource instanceof ProjectResource)) {
+			throw new Error("Resource must be an instance of ProjectResource");
+		}
+		const project = resource.getProject();
+		if (project !== this._projectBuildContext.getProject()) {
+			throw new Error(
+				`Unable to set tag for project ${project.getName()} ` +
+				`while building project ${this._projectBuildContext.getProject().getName()}`);
+		}
+		return project.setTag(resource.getPath(), tag, value);
 	}
 
 	/**
@@ -68,14 +82,20 @@ class TaskUtil {
 	 * This method is only available to custom task extensions defining
 	 * <b>Specification Version 2.2 and above</b>.
 	 *
-	 * @param {string|module:@ui5/fs.Resource} resourcePath Path or resource-instance the tag should be retrieved for
+	 * @param {module:@ui5/fs.ProjectResource} resource Resource-instance the tag should be retrieved for
 	 * @param {string} tag Name of the tag
 	 * @returns {string|boolean|integer|undefined} Tag value for the given resource.
 	 * 										<code>undefined</code> if no value is available
 	 * @public
 	 */
-	getTag(resourcePath, tag) {
-		return this._projectBuildContext.getResourceTagCollection().getTag(resourcePath, tag);
+	getTag(resource, tag) {
+		if (typeof resource === "string") {
+			throw new Error("TODO 3.0: Deprecated");
+		}
+		if (!(resource instanceof ProjectResource)) {
+			throw new Error("Resource must be an instance of ProjectResource");
+		}
+		return resource.getProject().getTag(resource.getPath(), tag);
 	}
 
 	/**
@@ -86,12 +106,18 @@ class TaskUtil {
 	 * This method is only available to custom task extensions defining
 	 * <b>Specification Version 2.2 and above</b>.
 	 *
-	 * @param {string|module:@ui5/fs.Resource} resourcePath Path or resource-instance the tag should be cleared for
+	 * @param {module:@ui5/fs.ProjectResource} resource Resource-instance the tag should be cleared for
 	 * @param {string} tag Tag
 	 * @public
 	 */
-	clearTag(resourcePath, tag) {
-		return this._projectBuildContext.getResourceTagCollection().clearTag(resourcePath, tag);
+	clearTag(resource, tag) {
+		if (typeof resource === "string") {
+			throw new Error("TODO 3.0: Deprecated");
+		}
+		if (!(resource instanceof ProjectResource)) {
+			throw new Error("Resource must be an instance of ProjectResource");
+		}
+		return resource.getProject().clearTag(resource.getPath(), tag);
 	}
 
 	/**
@@ -162,23 +188,42 @@ class TaskUtil {
 
 		const baseInterface = {
 			STANDARD_TAGS: this.STANDARD_TAGS,
-			setTag: this.setTag.bind(this),
-			clearTag: this.clearTag.bind(this),
-			getTag: this.getTag.bind(this),
-			isRootProject: this.isRootProject.bind(this),
-			registerCleanupTask: this.registerCleanupTask.bind(this)
 		};
+		bindFunctions(this, baseInterface, [
+			"setTag", "clearTag", "getTag", "isRootProject", "registerCleanupTask"
+		]);
 		switch (specVersion) {
 		case "2.2":
 		case "2.3":
 		case "2.4":
 		case "2.5":
 		case "2.6":
 			return baseInterface;
+		case "3.0":
+			baseInterface.getProject = (projectName) => {
+				const project = this.getProject(projectName);
+				const baseProjectInterface = {};
+				bindFunctions(project, baseProjectInterface, [
+					"getName", "getVersion", "getNamespace"
+				]);
+				switch (specVersion) {
+				case "3.0":
+					return baseProjectInterface;
+				default:
+					throw new Error(`TaskUtil: Unknown or unsupported Specification Version ${specVersion}`);
+				}
+			};
+			return baseInterface;
 		default:
 			throw new Error(`TaskUtil: Unknown or unsupported Specification Version ${specVersion}`);
 		}
 	}
 }
 
+function bindFunctions(sourceObject, targetObject, funcNames) {
+	funcNames.forEach((funcName) => {
+		targetObject[funcName] = sourceObject[funcName].bind(sourceObject);
+	});
+}
+
 module.exports = TaskUtil;

lib/tasks/bundlers/generateLibraryPreload.js

@@ -267,7 +267,6 @@ function getSapUiCoreBunDef(name, filters, preload) {
  * @param {module:@ui5/fs.DuplexCollection} parameters.workspace DuplexCollection to read and write files
  * @param {module:@ui5/builder.tasks.TaskUtil|object} [parameters.taskUtil] TaskUtil
  * @param {object} parameters.options Options
- * @param {module:@ui5/project.specifications.Project} parameters.options.project
  * @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.
  * A pattern ending with a slash '/' will, similarly to the use of a single '*' or double '**' asterisk,