early return when signal is aborted

Author: mabaasit

packages/compass-import-export/src/export/export-json.spec.ts

@@ -274,16 +274,12 @@ describe('exportJSON', function () {
     expect(result.docsWritten).to.equal(0);
     expect(result.aborted).to.be.true;
 
-    let resultText;
     try {
-      resultText = await fs.promises.readFile(resultPath, 'utf8');
+      await fs.promises.readFile(resultPath, 'utf8');
+      expect.fail('Expected file to not exist');
     } catch (err) {
-      console.log(resultPath);
-      throw err;
+      // noop
     }
-
-    const expectedText = '';
-    expect(resultText).to.deep.equal(expectedText);
   });
 
   it('exports aggregations', async function () {

packages/compass-import-export/src/export/export-json.ts

@@ -52,10 +52,15 @@ export async function exportJSON({
 
   const ejsonOptions = getEJSONOptionsForVariant(variant);
 
-  if (!abortSignal?.aborted) {
-    output.write('[');
+  if (abortSignal?.aborted) {
+    return {
+      docsWritten,
+      aborted: true,
+    };
   }
 
+  output.write('[');
+
   const docStream = new Transform({
     objectMode: true,
     transform: function (chunk: any, encoding, callback) {
@@ -88,21 +93,17 @@ export async function exportJSON({
       [inputStream, docStream, output],
       ...(abortSignal ? [{ signal: abortSignal }] : [])
     );
-    output.write(']\n', 'utf8');
   } catch (err: any) {
     if (err.code === 'ABORT_ERR') {
-      // Finish the JSON file as the `final` of the docs stream didn't run.
-      output.write(']\n', 'utf8');
-
       return {
         docsWritten,
         aborted: true,
       };
     }
-    output.write(']\n', 'utf8');
-
     throw err;
   } finally {
+    // Finish the array output
+    output.write(']\n');
     void input.close();
   }