properly await asc.compile()

Author: YaroShkvorets

packages/cli/src/compiler/asc.ts

@@ -34,7 +34,7 @@ export interface CompileOptions {
 // it requires an asynchronous wait. Whenever you call this function,
 // it doesn't matter how many times, just make sure you call `ready`
 // once before everything..
-export const compile = ({ inputFile, global, baseDir, libs, outputFile }: CompileOptions) => {
+export const compile = async ({ inputFile, global, baseDir, libs, outputFile }: CompileOptions) => {
   const exitHandler = createExitHandler(inputFile);
 
   setupExitHandler(exitHandler);
@@ -55,7 +55,7 @@ export const compile = ({ inputFile, global, baseDir, libs, outputFile }: Compil
     '--debug',
   ];
 
-  assemblyScriptCompiler(compilerArgs, compilerDefaults);
+  await assemblyScriptCompiler(compilerArgs, compilerDefaults);
 
   // only if compiler succeeded, that is, when the line above doesn't throw
   removeExitHandler(exitHandler);

packages/cli/src/compiler/index.ts

@@ -246,30 +246,41 @@ export default class Compiler {
         // Cache compiled files so identical input files are only compiled once
         const compiledFiles = new Map();
 
-        subgraph = subgraph.update('dataSources', (dataSources: any[]) =>
-          dataSources.map((dataSource: any) =>
-            dataSource.updateIn(['mapping', 'file'], (mappingPath: string) =>
-              this._compileDataSourceMapping(
-                this.protocol,
-                dataSource,
+        // Handle data sources
+        const dataSources = subgraph.get('dataSources');
+        const compiledDataSources = await Promise.all(
+          dataSources.map(async (dataSource: any) => {
+            const mappingPath = dataSource.getIn(['mapping', 'file']);
+            const compiledPath = await this._compileDataSourceMapping(
+              this.protocol,
+              dataSource,
+              mappingPath,
+              compiledFiles,
+              spinner,
+              validate,
+            );
+            return dataSource.setIn(['mapping', 'file'], compiledPath);
+          }),
+        );
+        subgraph = subgraph.set('dataSources', compiledDataSources);
+
+        // Handle templates if they exist
+        const templates = subgraph.get('templates');
+        if (templates !== undefined) {
+          const compiledTemplates = await Promise.all(
+            templates.map(async (template: any) => {
+              const mappingPath = template.getIn(['mapping', 'file']);
+              const compiledPath = await this._compileTemplateMapping(
+                template,
                 mappingPath,
                 compiledFiles,
                 spinner,
-                validate,
-              ),
-            ),
-          ),
-        );
-
-        subgraph = subgraph.update('templates', (templates: any) =>
-          templates === undefined
-            ? templates
-            : templates.map((template: any) =>
-                template.updateIn(['mapping', 'file'], (mappingPath: string) =>
-                  this._compileTemplateMapping(template, mappingPath, compiledFiles, spinner),
-                ),
-              ),
-        );
+              );
+              return template.setIn(['mapping', 'file'], compiledPath);
+            }),
+          );
+          subgraph = subgraph.set('templates', compiledTemplates);
+        }
 
         return subgraph;
       },
@@ -332,7 +343,7 @@ export default class Compiler {
     return missingHandlers;
   }
 
-  _compileDataSourceMapping(
+  async _compileDataSourceMapping(
     protocol: Protocol,
     dataSource: immutable.Map<any, any>,
     mappingPath: string,
@@ -386,7 +397,7 @@ export default class Compiler {
       }
       const global = path.relative(baseDir, this.globalsFile);
 
-      asc.compile({
+      await asc.compile({
         inputFile,
         global,
         baseDir,
@@ -413,7 +424,7 @@ export default class Compiler {
     }
   }
 
-  _compileTemplateMapping(
+  async _compileTemplateMapping(
     template: immutable.Collection<any, any>,
     mappingPath: string,
     compiledFiles: Map<any, any>,
@@ -467,7 +478,7 @@ export default class Compiler {
       }
       const global = path.relative(baseDir, this.globalsFile);
 
-      asc.compile({
+      await asc.compile({
         inputFile,
         global,
         baseDir,