From fdcc78500cc1aff8c87d76abd1692e79977ac9cc Mon Sep 17 00:00:00 2001
From: Kitson Kelly <me@kitsonkelly.com>
Date: Mon, 2 Nov 2020 13:51:56 +1100
Subject: refactor(cli): migrate runtime compile/bundle to new infrastructure
 (#8192)

Fixes #8060
---
 cli/rt/40_compiler_api.js | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'cli/rt')

diff --git a/cli/rt/40_compiler_api.js b/cli/rt/40_compiler_api.js
index ffe58559e..db12c857d 100644
--- a/cli/rt/40_compiler_api.js
+++ b/cli/rt/40_compiler_api.js
@@ -52,19 +52,14 @@
       sources: !!sources,
       options,
     });
+    /** @type {{ emittedFiles: Record<string, string>, diagnostics: any[] }} */
     const result = await opCompile(payload);
-    util.assert(result.emitMap);
+    util.assert(result.emittedFiles);
     const maybeDiagnostics = result.diagnostics.length === 0
       ? undefined
       : result.diagnostics;
 
-    const emitMap = {};
-
-    for (const [key, emittedSource] of Object.entries(result.emitMap)) {
-      emitMap[key] = emittedSource.contents;
-    }
-
-    return [maybeDiagnostics, emitMap];
+    return [maybeDiagnostics, result.emittedFiles];
   }
 
   // TODO(bartlomieju): change return type to interface?
@@ -84,12 +79,14 @@
       sources: !!sources,
       options,
     });
+    /** @type {{ emittedFiles: Record<string, string>, diagnostics: any[] }} */
     const result = await opCompile(payload);
-    util.assert(result.output);
+    let output = result.emittedFiles["deno:///bundle.js"];
+    util.assert(output);
     const maybeDiagnostics = result.diagnostics.length === 0
       ? undefined
       : result.diagnostics;
-    return [maybeDiagnostics, result.output];
+    return [maybeDiagnostics, output];
   }
 
   window.__bootstrap.compilerApi = {
-- 
cgit v1.2.3