feat(compilers): allow compiler factory to be async

live-codes · Mar 6, 2024 · d76b351 · d76b351
1 parent 7d8bbd0
commit d76b351
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/src/livecodes/compiler/compile.worker.ts b/src/livecodes/compiler/compile.worker.ts
@@ -10,7 +10,7 @@ let baseUrl: string | undefined;
 const worker: Worker = self as any;
 (self as any).window = self;
 
-const loadLanguageCompiler = (
+const loadLanguageCompiler = async (
   language: LanguageOrProcessor,
   config: Config,
   baseUrl: string | undefined,
@@ -29,22 +29,22 @@ const loadLanguageCompiler = (
   }
 
   if (languageCompiler.dependencies && languageCompiler.dependencies.length > 0) {
-    languageCompiler.dependencies.forEach((dependency) => {
-      loadLanguageCompiler(dependency, config, baseUrl);
-    });
+    for (const dependency of languageCompiler.dependencies) {
+      await loadLanguageCompiler(dependency, config, baseUrl);
+    }
   }
 
   if (typeof languageCompiler.fn !== 'function') {
     if (languageCompiler.aliasTo && typeof compilers[languageCompiler.aliasTo]?.fn === 'function') {
       languageCompiler.fn = compilers[languageCompiler.aliasTo].fn;
     } else {
       let tries = 3;
-      const load = () => {
+      const load = async () => {
         try {
           if (languageCompiler.url) {
             importScripts(languageCompiler.url);
           }
-          languageCompiler.fn = languageCompiler.factory(config, baseUrl);
+          languageCompiler.fn = await languageCompiler.factory(config, baseUrl);
           if (languageCompiler.aliasTo) {
             compilers[languageCompiler.aliasTo].fn = languageCompiler.fn;
           }
@@ -62,7 +62,7 @@ const loadLanguageCompiler = (
         }
       };
 
-      load();
+      await load();
     }
   }
 
@@ -109,7 +109,7 @@ worker.addEventListener(
 
     if (message.type === 'load' || message.type === 'compileInCompiler') {
       const { language, config } = message.payload;
-      loadLanguageCompiler(language, config, baseUrl);
+      await loadLanguageCompiler(language, config, baseUrl);
     }
 
     if (message.type === 'compile' || message.type === 'compileInCompiler') {

diff --git a/src/sdk/models.ts b/src/sdk/models.ts
@@ -509,7 +509,7 @@ export interface Compiler {
   dependencies?: Language[];
   url?: string;
   fn?: CompilerFunction;
-  factory: (config: Config, baseUrl: string) => CompilerFunction;
+  factory: (config: Config, baseUrl: string) => CompilerFunction | Promise<CompilerFunction>;
   runOutsideWorker?: CompilerFunction;
   editors?: EditorId[];
   styles?: