@sanity/export 3.43.0 → 3.44.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sanity/export",
-  "version": "3.43.0",
+  "version": "3.44.0",
   "description": "Export Sanity documents and assets",
   "keywords": [
     "sanity",

package/src/export.js

@@ -9,9 +9,7 @@ const JsonStreamStringify = require('json-stream-stringify')
 const AssetHandler = require('./AssetHandler')
 const debug = require('./debug')
 const pipeAsync = require('./util/pipeAsync')
-const filterDocumentTypes = require('./filterDocumentTypes')
-const filterDrafts = require('./filterDrafts')
-const filterSystemDocuments = require('./filterSystemDocuments')
+const filterDocuments = require('./filterDocuments')
 const getDocumentsStream = require('./getDocumentsStream')
 const getDocumentCursorStream = require('./getDocumentCursorStream')
 const logFirstChunk = require('./logFirstChunk')
@@ -156,10 +154,8 @@ async function exportDataset(opts) {
     logFirstChunk(),
     split(tryParseJson),
     rejectOnApiError(),
-    filterSystemDocuments(),
+    filterDocuments(options.drafts),
     assetStreamHandler,
-    filterDocumentTypes(options.types),
-    options.drafts ? miss.through.obj() : filterDrafts(),
     miss.through.obj((doc, _enc, callback) => {
       if (options.filterDocument(doc)) {
         return callback(null, doc)

package/src/{filterSystemDocuments.js → filterDocuments.js}

@@ -1,19 +1,34 @@
 const miss = require('mississippi')
 const debug = require('./debug')
 
+const isDraftOrVersion = (doc) => doc && doc._id && (
+  doc._id.indexOf('drafts.') === 0 ||
+  doc._id.indexOf('versions.') === 0
+)
+
 const isSystemDocument = (doc) => doc && doc._id && doc._id.indexOf('_.') === 0
+const isRelease = (doc) => doc && doc._id && doc._id.indexOf('_.releases.') === 0
 const isCursor = (doc) => doc && !doc._id && doc.nextCursor !== undefined
 
-module.exports = () =>
+module.exports = (drafts) =>
   miss.through.obj((doc, enc, callback) => {
-    if (isSystemDocument(doc)) {
-      debug('%s is a system document, skipping', doc && doc._id)
-      return callback()
-    }
     if (isCursor(doc)) {
       debug('%o is a cursor, skipping', doc)
       return callback()
     }
 
+    if (!drafts && isDraftOrVersion(doc)) {
+      debug('%s is a draft or version, skipping', doc && doc._id)
+      return callback()
+    }
+
+    if (isSystemDocument(doc)) {
+      if (!drafts && isRelease(doc)) {
+        return callback(null, doc)
+      }
+      debug('%s is a system document, skipping', doc && doc._id)
+      return callback()
+    }
+
     return callback(null, doc)
-  })
+  }) 

package/src/filterDrafts.js

@@ -1,12 +0,0 @@
-const miss = require('mississippi')
-
-const isDraft = (doc) => doc && doc._id && doc._id.indexOf('drafts.') === 0
-
-module.exports = () =>
-  miss.through.obj((doc, enc, callback) => {
-    if (isDraft(doc)) {
-      return callback()
-    }
-
-    return callback(null, doc)
-  })