[import] Fix JSON parse errors not being emitted (#703)

sanity-io · Mar 27, 2018 · 7b7efe2 · 7b7efe2
1 parent 561fca9
commit 7b7efe2
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/packages/@sanity/import/src/importFromStream.js b/packages/@sanity/import/src/importFromStream.js
@@ -15,18 +15,19 @@ module.exports = (stream, options, importers) =>
     debug('Importing from stream')
 
     let isTarStream = false
+    let jsonDocuments
 
     miss.pipe(stream, gunzipMaybe(), untarMaybe(), err => {
       if (err) {
         reject(err)
         return
       }
 
-      if (!isTarStream) {
-        return // Will be resolved by concatenation
+      if (isTarStream) {
+        findAndImport()
+      } else {
+        resolve(importers.fromArray(jsonDocuments, options))
       }
-
-      findAndImport()
     })
 
     function untarMaybe() {
@@ -38,13 +39,15 @@ module.exports = (stream, options, importers) =>
         }
 
         debug('Stream is an ndjson file, streaming JSON')
-        return swap(null, miss.pipeline(getJsonStreamer(), miss.concat(resolveNdjsonStream)))
+        const ndjsonStream = miss.pipeline(getJsonStreamer(), miss.concat(resolveNdjsonStream))
+        ndjsonStream.on('error', reject)
+        return swap(null, ndjsonStream)
       })
     }
 
     function resolveNdjsonStream(documents) {
       debug('Finished reading ndjson stream')
-      resolve(importers.fromArray(documents, options))
+      jsonDocuments = documents
     }
 
     async function findAndImport() {

diff --git a/packages/@sanity/import/src/util/getJsonStreamer.js b/packages/@sanity/import/src/util/getJsonStreamer.js
@@ -21,9 +21,16 @@ module.exports = function getJsonStreamer() {
 
       return doc
     } catch (err) {
-      this.emit('error', new Error(`Failed to parse line #${lineNumber}: ${err.message}`))
+      this.emit('error', new Error(getErrorMessage(err)))
     }
 
     return undefined
   }
+
+  function getErrorMessage(err) {
+    const suffix =
+      lineNumber === 1 ? '\n\nMake sure this is valid ndjson (one JSON-document *per line*)' : ''
+
+    return `Failed to parse line #${lineNumber}: ${err.message}${suffix}`
+  }
 }