Only load theme once

Author: pomber

.changeset/great-donkeys-wash.md

@@ -0,0 +1,5 @@
+---
+"@code-hike/lighter": patch
+---
+
+Better theme cache

lib/dist/index.cjs.js

@@ -628,33 +628,29 @@ function loadTheme(theme) {
         });
     });
 }
-// TODO map names to promises, to avoid loading the same theme twice
 var themeCache = new Map();
 function loadThemeByName(name) {
+    if (!ALL_NAMES.includes(name)) {
+        return Promise.resolve(undefined);
+    }
+    if (!themeCache.has(name)) {
+        themeCache.set(name, reallyLoadThemeByName(name));
+    }
+    return themeCache.get(name);
+}
+function reallyLoadThemeByName(name) {
     return __awaiter(this, void 0, void 0, function () {
-        var rawTheme;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
-                    if (!ALL_NAMES.includes(name)) {
-                        return [2 /*return*/, Promise.resolve(undefined)];
-                    }
-                    if (themeCache.has(name)) {
-                        return [2 /*return*/, themeCache.get(name)];
-                    }
-                    _a.label = 1;
-                case 1:
-                    _a.trys.push([1, 3, , 5]);
+                    _a.trys.push([0, 2, , 4]);
                     return [4 /*yield*/, readJSON("themes", name + ".json")];
+                case 1: return [2 /*return*/, _a.sent()];
                 case 2:
-                    rawTheme = _a.sent();
-                    themeCache.set(name, rawTheme);
-                    return [2 /*return*/, rawTheme];
-                case 3:
                     _a.sent();
                     return [4 /*yield*/, fetchJSON("theme?name=".concat(name))];
-                case 4: return [2 /*return*/, _a.sent()];
-                case 5: return [2 /*return*/];
+                case 3: return [2 /*return*/, _a.sent()];
+                case 4: return [2 /*return*/];
             }
         });
     });
@@ -2478,15 +2474,10 @@ function loadGrammarByScope(scope) {
 }
 function loadGrammarFromFile(path) {
     return __awaiter(this, void 0, void 0, function () {
-        var grammar;
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, readJSON("grammars", path)];
-                case 1:
-                    grammar = _a.sent();
-                    // grammar.names = [language.id, ...(language.aliases || [])];
-                    // grammar.embeddedLangs = language.embeddedLangs || [];
-                    return [2 /*return*/, grammar];
+                case 1: return [2 /*return*/, (_a.sent())];
             }
         });
     });

lib/dist/index.esm.mjs

@@ -63,8 +63,5 @@ export async function loadGrammarByScope(
 }
 
 export async function loadGrammarFromFile(path: string) {
-  const grammar = await readJSON("grammars", path);
-  // grammar.names = [language.id, ...(language.aliases || [])];
-  // grammar.embeddedLangs = language.embeddedLangs || [];
-  return grammar as IRawGrammar;
+  return (await readJSON("grammars", path)) as IRawGrammar;
 }

lib/src/grammars.ts

@@ -8,22 +8,22 @@ export async function loadTheme(theme: Theme) {
   return toFinalTheme(rawTheme);
 }
 
-// TODO map names to promises, to avoid loading the same theme twice
-const themeCache = new Map<StringTheme, RawTheme>();
-async function loadThemeByName(
-  name: StringTheme
-): Promise<RawTheme | undefined> {
+const themeCache = new Map<StringTheme, Promise<RawTheme>>();
+function loadThemeByName(name: StringTheme): Promise<RawTheme | undefined> {
   if (!ALL_NAMES.includes(name)) {
     return Promise.resolve(undefined);
   }
 
-  if (themeCache.has(name)) {
-    return themeCache.get(name)!;
+  if (!themeCache.has(name)) {
+    themeCache.set(name, reallyLoadThemeByName(name));
   }
+
+  return themeCache.get(name)!;
+}
+
+async function reallyLoadThemeByName(name: StringTheme): Promise<RawTheme> {
   try {
-    const rawTheme = await readJSON("themes", name + ".json");
-    themeCache.set(name, rawTheme);
-    return rawTheme;
+    return await readJSON("themes", name + ".json");
   } catch (e) {
     return await fetchJSON(`theme?name=${name}`);
   }