From 3afbe1148e9fffa5837eb26c81a21b8c90047037 Mon Sep 17 00:00:00 2001
From: RMidhunSuresh <hi@midhun.dev>
Date: Thu, 26 May 2022 23:35:09 +0530
Subject: [PATCH] Use the new built-asset format in ThemeLoader

---
 src/platform/web/ThemeLoader.ts | 46 ++++++++++++++++++++++++++++-----
 1 file changed, 40 insertions(+), 6 deletions(-)

diff --git a/src/platform/web/ThemeLoader.ts b/src/platform/web/ThemeLoader.ts
index 2aa79bb5..1f010fb2 100644
--- a/src/platform/web/ThemeLoader.ts
+++ b/src/platform/web/ThemeLoader.ts
@@ -17,15 +17,35 @@ limitations under the License.
 import type {ILogItem} from "../../logging/types.js";
 import type {Platform} from "./Platform.js";
 
+type NormalVariant = {
+    id: string;
+    cssLocation: string;
+};
+
+type DefaultVariant = {
+    dark: {
+        id: string;
+        cssLocation: string;
+        themeDisplayName: string;
+    };
+    light: {
+        id: string;
+        cssLocation: string;
+        themeDisplayName: string;
+    };
+}
+type ThemeInformation = NormalVariant | DefaultVariant; 
+
 export class ThemeLoader {
     private _platform: Platform;
-    private _themeMapping: Record<string, string> = {};
+    private _themeMapping: Record<string, ThemeInformation>;
 
     constructor(platform: Platform) {
         this._platform = platform;
     }
 
     async init(manifestLocations: string[]): Promise<void> {
+        this._themeMapping = {};
         for (const manifestLocation of manifestLocations) {
             const { body } = await this._platform
                 .request(manifestLocation, {
@@ -36,8 +56,8 @@ export class ThemeLoader {
                 .response();
             /*
             After build has finished, the source section of each theme manifest
-            contains `built-assets` which is a mapping from the theme-name to the
-            location of the css file in build.
+            contains `built-assets` which is a mapping from the theme-name to theme
+            details which includes the location of the CSS file.
             */
             Object.assign(this._themeMapping, body["source"]["built-assets"]);
         }
@@ -45,7 +65,7 @@ export class ThemeLoader {
 
     setTheme(themeName: string, log?: ILogItem) {
         this._platform.logger.wrapOrRun(log, {l: "change theme", id: themeName}, () => {
-            const themeLocation = this._themeMapping[themeName];
+            const themeLocation = this._findThemeLocationFromId(themeName);
             if (!themeLocation) {
                 throw new Error( `Cannot find theme location for theme "${themeName}"!`);
             }
@@ -54,8 +74,8 @@ export class ThemeLoader {
          });
     }
 
-    get themes(): string[] {
-        return Object.keys(this._themeMapping);
+    get themeMapping(): Record<string, ThemeInformation> {
+        return this._themeMapping;
     }
 
     async getActiveTheme(): Promise<string> {
@@ -72,4 +92,18 @@ export class ThemeLoader {
         }
         throw new Error("Cannot find active theme!");
     }
+
+    private _findThemeLocationFromId(themeId: string) {
+        for (const themeData of Object.values(this._themeMapping)) {
+            if ("id" in themeData && themeData.id === themeId) {
+                return themeData.cssLocation;
+            }
+            else if ("light" in themeData && themeData.light?.id === themeId) {
+                return themeData.light.cssLocation;
+            }
+            else if ("dark" in themeData && themeData.dark?.id === themeId) {
+                return themeData.dark.cssLocation;
+            }
+        }
+    }
 }