Fixes #1362 - Handle AggregateError

prisma · Jan 27, 2020 · 25400fe · 25400fe
1 parent 454b56d
commit 25400fe
Showing 1 changed file with 28 additions and 11 deletions.
diff --git a/cli/prisma2/src/bin.ts b/cli/prisma2/src/bin.ts
@@ -120,21 +120,38 @@ if (require.main === module) {
         process.exit(code)
       }
     })
-    .catch(err => {
-      if (err.rustStack) {
-        handlePanic(err, packageJson.name, packageJson.version).catch(e => {
+    .catch((err) => {
+      let shouldExit = false
+
+      function handleIndividualError(err) {
+        if (err.rustStack) {
+          handlePanic(err, packageJson.name, packageJson.version).catch(e => {
+            if (debugLib.enabled('prisma')) {
+              console.error(chalk.redBright.bold('Error: ') + e.stack)
+            } else {
+              console.error(chalk.redBright.bold('Error: ') + e.message)
+            }
+          })
+        } else {
+          shouldExit = true
           if (debugLib.enabled('prisma')) {
-            console.error(chalk.redBright.bold('Error: ') + e.stack)
+            console.error(chalk.redBright.bold('Error: ') + err.stack)
           } else {
-            console.error(chalk.redBright.bold('Error: ') + e.message)
+            console.error(chalk.redBright.bold('Error: ') + err.message)
           }
-        })
-      } else {
-        if (debugLib.enabled('prisma')) {
-          console.error(chalk.redBright.bold('Error: ') + err.stack)
-        } else {
-          console.error(chalk.redBright.bold('Error: ') + err.message)
         }
+      }
+
+      // Sindre's pkg p-map & co are using AggregateError, it is an iterator.
+      if (typeof err[Symbol.iterator] === 'function') {
+        for (const individualError of err) {
+          handleIndividualError(individualError)
+        }
+      } else {
+        handleIndividualError(err)
+      }
+
+      if (shouldExit) {
         process.exit(1)
       }
     })