Merge pull request #2252 from demergent-labs/progressive_writing

Progressive writing
demergent-labs · Nov 1, 2024 · aad34cb · aad34cb
2 parents 9956d04 + afd17b0
commit aad34cb
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 29 deletions.
diff --git a/src/build/experimental/commands/compile/index.ts b/src/build/experimental/commands/compile/index.ts
@@ -1,7 +1,8 @@
 import { IOType } from 'child_process';
 import { rm } from 'fs/promises';
+import { outputFile } from 'fs-extra';
+import { join } from 'path';
 
-import { writeGeneratedFiles } from '../../../stable/commands/compile';
 import { execSyncPretty } from '../../../stable/utils/exec_sync_pretty';
 import { CanisterConfig } from '../../../stable/utils/types';
 import { logSuccess } from '../../utils/log_success';
@@ -32,6 +33,8 @@ export async function runCommand(
 
     const javaScript = await compileJavaScript(main, esmAliases, esmExternals);
 
+    await outputFile(join(canisterPath, 'main.js'), javaScript);
+
     const { candid, methodMeta } = await getCandidAndMethodMeta(
         canisterConfig.custom?.candid_gen,
         candidPath,
@@ -40,21 +43,16 @@ export async function runCommand(
         wasmData
     );
 
+    await outputFile(candidPath, candid);
+
     const wasmBinary = await getWasmBinary(
         ioType,
         javaScript,
         wasmData,
         methodMeta
     );
 
-    await writeGeneratedFiles(
-        canisterPath,
-        candidPath,
-        wasmBinaryPath,
-        candid,
-        javaScript,
-        wasmBinary
-    );
+    await outputFile(wasmBinaryPath, wasmBinary);
 
     buildAssets(canisterConfig, ioType);
 

diff --git a/src/build/stable/commands/compile/index.ts b/src/build/stable/commands/compile/index.ts
@@ -21,6 +21,8 @@ export async function runCommand(
 
     const javaScript = await compileJavaScript(main);
 
+    await outputFile(join(canisterPath, 'main.js'), javaScript);
+
     const { candid, methodMeta } = await getCandidAndMethodMeta(
         canisterConfig.custom?.candid_gen,
         candidPath,
@@ -29,32 +31,14 @@ export async function runCommand(
         wasmData
     );
 
+    await outputFile(candidPath, candid);
+
     const wasmBinary = await getWasmBinary(
         ioType,
         javaScript,
         wasmData,
         methodMeta
     );
 
-    await writeGeneratedFiles(
-        canisterPath,
-        candidPath,
-        wasmBinaryPath,
-        candid,
-        javaScript,
-        wasmBinary
-    );
-}
-
-export async function writeGeneratedFiles(
-    canisterPath: string,
-    candidPath: string,
-    wasmBinaryPath: string,
-    candid: string,
-    javaScript: string,
-    wasmBinary: Uint8Array
-): Promise<void> {
-    await outputFile(candidPath, candid);
-    await outputFile(join(canisterPath, 'main.js'), javaScript);
     await outputFile(wasmBinaryPath, wasmBinary);
 }