Better parallelism

Author: pomber

.changeset/nervous-fishes-scream.md

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

lib/dist/index.cjs.js

@@ -1194,6 +1194,7 @@ const lighter = {
   registry: null,
   aliasToScope: new Map(),
   scopeToGrammar: new Map(),
+  scopeToPromise: new Map(),
 };
 
 function newRegistry() {
@@ -1208,8 +1209,9 @@ async function loadGrammars(alias) {
     lighter.registry = newRegistry();
   }
 
-  // if alias is registered, return
   if (lighter.aliasToScope.has(alias)) {
+    const scope = lighter.aliasToScope.get(alias);
+    await lighter.scopeToPromise.get(scope);
     return;
   }
 
@@ -1227,7 +1229,11 @@ async function loadGrammars(alias) {
   });
 
   await Promise.all(
-    newGrammars.map((g) => lighter.registry.loadGrammar(g.scopeName))
+    newGrammars.map((g) => {
+      const promise = lighter.registry.loadGrammar(g.scopeName);
+      lighter.scopeToPromise.set(g.scopeName, promise);
+      return promise;
+    })
   );
 }
 

lib/dist/index.esm.mjs

@@ -10,6 +10,7 @@ const lighter = {
   registry: null,
   aliasToScope: new Map(),
   scopeToGrammar: new Map(),
+  scopeToPromise: new Map(),
 };
 
 export function newRegistry() {
@@ -24,8 +25,9 @@ export async function loadGrammars(alias) {
     lighter.registry = newRegistry();
   }
 
-  // if alias is registered, return
   if (lighter.aliasToScope.has(alias)) {
+    const scope = lighter.aliasToScope.get(alias);
+    await lighter.scopeToPromise.get(scope);
     return;
   }
 
@@ -43,7 +45,11 @@ export async function loadGrammars(alias) {
   });
 
   await Promise.all(
-    newGrammars.map((g) => lighter.registry.loadGrammar(g.scopeName))
+    newGrammars.map((g) => {
+      const promise = lighter.registry.loadGrammar(g.scopeName);
+      lighter.scopeToPromise.set(g.scopeName, promise);
+      return promise;
+    })
   );
 }