feat: improved efficiency further

Author: Simon Milfred

utils/extractThemeConfigurationsFromAppConfig.js

@@ -1,18 +1,25 @@
 export default function extractThemeConfigurationsFromAppConfig(appConfig = {}) {
 	const { themeConfiguration } = appConfig;
+	if (!themeConfiguration?.themes || !Array.isArray(themeConfiguration.themes)) {
+		return {};
+	}
 
 	const configGlobs = {};
-
-	if (themeConfiguration?.themes && Array.isArray(themeConfiguration.themes)) {
-		for (let configPath of themeConfiguration.themes) {
-			let name;
-			if (typeof configPath === 'object') {
-				name = configPath.name || configPath.path;
-				configPath = configPath.path;
-			}
-
-			// Use standard dynamic import
+	for (const configPath of themeConfiguration.themes) {
+		if (typeof configPath === 'object') {
+			const name = configPath.name || configPath.path;
+			const {path} = configPath;
 			configGlobs[name] = async () => {
+				try {
+					const module = await import(/* @vite-ignore */ path);
+					return module?.default || module;
+				} catch (error) {
+					console.warn(`Failed to import theme configuration from "${path}": ${error?.message || String(error)}`);
+					return undefined;
+				}
+			};
+		} else {
+			configGlobs[configPath] = async () => {
 				try {
 					const module = await import(/* @vite-ignore */ configPath);
 					return module?.default || module;

utils/getThemeConfiguration.js

@@ -5,7 +5,8 @@ export default function getThemeConfiguration(theme, subset) {
 	if (typeof theme === 'string') {
 		config = $themeConfigurations[theme];
 		if (!config) {
-			console.warn(`Theme "${theme}" not found. Available themes:`, $themeConfigurations.$getAvailableThemes?.() || []);
+			const availableThemes = $themeConfigurations.$getAvailableThemes?.();
+			console.warn(`Theme "${theme}" not found. Available themes:`, availableThemes || []);
 			return undefined;
 		}
 	} else if (typeof theme === 'object') {

utils/getThemeConfigurationAsync.js

@@ -5,7 +5,8 @@ export default async function getThemeConfigurationAsync(theme, subset) {
 	if (typeof theme === 'string') {
 		config = $themeConfigurations[theme] || await $themeConfigurations.$loadTheme?.(theme);
 		if (!config) {
-			console.warn(`Theme "${theme}" not found. Available themes:`, $themeConfigurations.$getAvailableThemes?.() || []);
+			const availableThemes = $themeConfigurations.$getAvailableThemes?.();
+			console.warn(`Theme "${theme}" not found. Available themes:`, availableThemes || []);
 			return undefined;
 		}
 	} else if (typeof theme === 'object') {

utils/getThemeConfigurationSubset.js

@@ -6,23 +6,29 @@ export default function getThemeConfigurationSubset(obj, subset) {
 	}
 
 	if (Array.isArray(subset)) {
-		const result = {};
+		let result;
 		for (const key of subset) {
-			if (obj[key] !== undefined) result[key] = obj[key];
+			if (obj[key] !== undefined) {
+				if (!result) result = {};
+				result[key] = obj[key];
+			}
 		}
-		return Object.keys(result).length ? result : undefined;
+		return result;
 	}
 
 	if (subset instanceof RegExp) {
-		const result = {};
+		let result;
 		for (const key in obj) {
-			if (subset.test(key)) result[key] = obj[key];
+			if (subset.test(key)) {
+				if (!result) result = {};
+				result[key] = obj[key];
+			}
 		}
-		return Object.keys(result).length ? result : undefined;
+		return result;
 	}
 
 	if (typeof subset === 'object') {
-		const result = {};
+		let result;
 		for (const key in subset) {
 			if (!subset[key]) continue;
 
@@ -31,26 +37,26 @@ export default function getThemeConfigurationSubset(obj, subset) {
 				const regex = new RegExp(regexMatch[1], regexMatch[2]);
 				for (const objKey in obj) {
 					if (regex.test(objKey)) {
-						result[objKey] = typeof subset[key] === 'boolean'
+						const value = typeof subset[key] === 'boolean'
 							? obj[objKey]
 							: getThemeConfigurationSubset(obj[objKey], subset[key]);
+						if (value !== undefined) {
+							if (!result) result = {};
+							result[objKey] = value;
+						}
 					}
 				}
 			} else if (obj[key] !== undefined) {
-				result[key] = typeof subset[key] === 'boolean'
+				const value = typeof subset[key] === 'boolean'
 					? obj[key]
 					: getThemeConfigurationSubset(obj[key], subset[key]);
+				if (value !== undefined) {
+					if (!result) result = {};
+					result[key] = value;
+				}
 			}
 		}
-
-		// Filter undefined values
-		for (const key in result) {
-			if (result[key] === undefined || (typeof result[key] === 'object' && Object.keys(result[key] || {}).length === 0)) {
-				delete result[key];
-			}
-		}
-
-		return Object.keys(result).length ? result : undefined;
+		return result;
 	}
 
 	return undefined;

utils/getThemeConfigurationsAsync.js

@@ -1,11 +1,13 @@
 export default async function getThemeConfigurationsAsync() {
-	const appConfig = useAppConfig();
 	const configGlobs = import.meta.glob('~/assets/js/theme-configuration.*.(js|cjs|mjs)');
+	const extracted = extractThemeConfigurationsFromAppConfig(useAppConfig());
 
-	Object.assign(configGlobs, extractThemeConfigurationsFromAppConfig(appConfig));
+	if (Object.keys(extracted).length > 0) {
+		Object.assign(configGlobs, extracted);
+	}
 
 	const themeLoaders = {};
-	for (const key of Object.keys(configGlobs)) {
+	for (const key in configGlobs) {
 		const match = key.match(/theme-configuration\.([a-zA-Z0-9_-]+)\./);
 		themeLoaders[match ? match[1] : key] = configGlobs[key];
 	}