Move legacy OpenUI5 theme library handling to graph.Module

Author: RandomByte

lib/graph/Module.js

@@ -9,7 +9,8 @@ const {validate} = require("../validation/validator");
 
 const log = require("@ui5/logger").getLogger("graph:Module");
 
-const defaultConfigPath = "ui5.yaml";
+const DEFAULT_CONFIG_PATH = "ui5.yaml";
+const SAP_THEMES_NS_EXEMPTIONS = ["themelib_sap_fiori_3", "themelib_sap_bluecrystal", "themelib_sap_belize"];
 
 function clone(obj) {
 	return JSON.parse(JSON.stringify(obj));
@@ -36,7 +37,7 @@ class Module {
 	 * @param {@ui5/project.graph.ShimCollection} [parameters.shimCollection]
 	 *						Collection of shims that might be relevant for this module
 	 */
-	constructor({id, version, modulePath, configPath = defaultConfigPath, configuration = [], shimCollection}) {
+	constructor({id, version, modulePath, configPath = DEFAULT_CONFIG_PATH, configuration = [], shimCollection}) {
 		if (!id) {
 			throw new Error(`Could not create Module: Missing or empty parameter 'id'`);
 		}
@@ -127,6 +128,14 @@ class Module {
 			});
 		}
 
+		configs.forEach((configuration) => {
+			if (configuration.kind === "project" && configuration.type === "library" &&
+				configuration.metadata && configuration.metadata.name &&
+				SAP_THEMES_NS_EXEMPTIONS.includes(configuration.metadata.name)) {
+				configuration.type = "theme-library";
+			}
+		});
+
 		const specs = await Promise.all(configs.map(async (configuration) => {
 			const spec = await Specification.create({
 				id: this.getId(),
@@ -258,7 +267,7 @@ class Module {
 						`${this.getId()} at "${configPath}". Error: ${err.message}`);
 			}
 			if (!configResource) {
-				if (configPath !== defaultConfigPath) {
+				if (configPath !== DEFAULT_CONFIG_PATH) {
 					throw new Error("Failed to read configuration for module " +
 							`${this.getId()}: Could not find configuration file in module at path '${configPath}'`);
 				}

lib/specifications/types/Library.js

@@ -4,9 +4,6 @@ const {promisify} = require("util");
 const resourceFactory = require("@ui5/fs").resourceFactory;
 const ComponentProject = require("../ComponentProject");
 
-const SAP_THEMES_NS_EXEMPTIONS = ["themelib_sap_fiori_3", "themelib_sap_bluecrystal", "themelib_sap_belize"];
-
-
 class Library extends ComponentProject {
 	constructor(parameters) {
 		super(parameters);
@@ -131,20 +128,7 @@ class Library extends ComponentProject {
 	async _parseConfiguration(config) {
 		await super._parseConfiguration(config);
 
-		try {
-			this._namespace = await this.getNamespace();
-		} catch (err) {
-			if (SAP_THEMES_NS_EXEMPTIONS.includes(this.getName())) {
-				// Exceptional handling for SAP theme libraries which used to be of type "library"
-				//	(today they use "theme-library").
-				// To allow use of OpenUI5 theme libraries in versions lower than 1.75 we must ignore
-				//	namespace detection errors.
-				this._log.verbose(`Ignoring failed namespace detection for exempted SAP theme library ` +
-					`${this.getName()}: ${err.message}`);
-			} else {
-				throw err;
-			}
-		}
+		this._namespace = await this.getNamespace();
 
 		if (!config.metadata.copyright) {
 			try {