@sanity/export 2.21.10-shopify.5 → 2.21.12-purple-unicorn.1302

package/lib/tryParseJson.js

@@ -5,16 +5,16 @@ module.exports = line => {
     return JSON.parse(line);
   } catch (err) {
     // Catch half-done lines with an error at the end
-    var errorPosition = line.lastIndexOf('{"error":');
+    const errorPosition = line.lastIndexOf('{"error":');
 
     if (errorPosition === -1) {
       err.message = "".concat(err.message, " (").concat(line, ")");
       throw err;
     }
 
-    var errorJson = line.slice(errorPosition);
-    var errorLine = JSON.parse(errorJson);
-    var error = errorLine && errorLine.error;
+    const errorJson = line.slice(errorPosition);
+    const errorLine = JSON.parse(errorJson);
+    const error = errorLine && errorLine.error;
 
     if (error && error.description) {
       throw new Error("Error streaming dataset: ".concat(error.description, "\n\n").concat(errorJson, "\n"));

package/lib/validateOptions.js

@@ -1,10 +1,10 @@
 "use strict";
 
-var defaults = require('lodash/defaults');
+const defaults = require('lodash/defaults');
 
-var clientMethods = ['getUrl', 'config'];
-var booleanFlags = ['assets', 'raw', 'compress', 'drafts'];
-var exportDefaults = {
+const clientMethods = ['getUrl', 'config'];
+const booleanFlags = ['assets', 'raw', 'compress', 'drafts'];
+const exportDefaults = {
   compress: true,
   drafts: true,
   assets: true,
@@ -12,7 +12,7 @@ var exportDefaults = {
 };
 
 function validateOptions(opts) {
-  var options = defaults({}, opts, exportDefaults);
+  const options = defaults({}, opts, exportDefaults);
 
   if (typeof options.dataset !== 'string' || options.dataset.length < 1) {
     throw new Error("options.dataset must be a valid dataset name");
@@ -26,13 +26,13 @@ function validateOptions(opts) {
     throw new Error('`options.client` must be set to an instance of @sanity/client');
   }
 
-  var missing = clientMethods.find(key => typeof options.client[key] !== 'function');
+  const missing = clientMethods.find(key => typeof options.client[key] !== 'function');
 
   if (missing) {
     throw new Error("`options.client` is not a valid @sanity/client instance - no \"".concat(missing, "\" method found"));
   }
 
-  var clientConfig = options.client.config();
+  const clientConfig = options.client.config();
 
   if (!clientConfig.token) {
     throw new Error('Client is not instantiated with a `token`');

package/package.json

@@ -1,18 +1,20 @@
 {
   "name": "@sanity/export",
-  "version": "2.21.10-shopify.5+8e1b6afb9",
+  "version": "2.21.12-purple-unicorn.1302+847175b7f3",
   "description": "Export Sanity documents and assets",
-  "main": "lib/export.js",
+  "main": "./lib/export.js",
+  "types": "./lib/dts/src/export.d.ts",
   "engines": {
     "node": ">=12.0.0"
   },
   "author": "Sanity.io <hello@sanity.io>",
   "license": "MIT",
   "scripts": {
-    "build": "babel src --copy-files --out-dir lib",
-    "clean": "rimraf lib dest",
-    "prebuild": "npm run clean",
-    "test": "jest"
+    "build": "../../../bin/pkg-utils transpile --target node",
+    "clean": "rimraf lib",
+    "prebuild": "yarn clean",
+    "test": "jest",
+    "watch": "../../../bin/pkg-utils transpile --target node --watch"
   },
   "keywords": [
     "sanity",
@@ -24,18 +26,17 @@
     "ndjson"
   ],
   "dependencies": {
-    "agentkeepalive": "^4.1.0",
     "archiver": "^5.0.0",
     "debug": "^3.2.7",
     "fs-extra": "^7.0.0",
-    "lodash": "^4.17.15",
+    "get-it": "^5.2.1",
+    "lodash": "^4.17.21",
     "mississippi": "^4.0.0",
     "p-queue": "^2.3.0",
-    "simple-get": "^4.0.0",
     "split2": "^3.2.2"
   },
   "devDependencies": {
-    "rimraf": "^2.7.1",
+    "rimraf": "^3.0.2",
     "string-to-stream": "^1.1.0"
   },
   "publishConfig": {
@@ -50,5 +51,5 @@
     "url": "https://github.com/sanity-io/sanity/issues"
   },
   "homepage": "https://www.sanity.io/",
-  "gitHead": "8e1b6afb9ba5a3c78662e354cea66523ac456c6b"
+  "gitHead": "847175b7f3ddc82e4a956ab4e0dbb74a4dff41b8"
 }

package/src/export.js

@@ -48,8 +48,14 @@ function exportDataset(opts) {
 
   debug('Outputting assets (temporarily) to %s', tmpDir)
   debug('Outputting to %s', options.outputPath === '-' ? 'stdout' : options.outputPath)
-  const outputStream =
-    options.outputPath === '-' ? process.stdout : fse.createWriteStream(options.outputPath)
+
+  let outputStream
+  if (isWritableStream(options.outputPath)) {
+    outputStream = options.outputPath
+  } else {
+    outputStream =
+      options.outputPath === '-' ? process.stdout : fse.createWriteStream(options.outputPath)
+  }
 
   let assetStreamHandler = assetHandler.noop
   if (!options.raw) {
@@ -195,4 +201,14 @@ function exportDataset(opts) {
   })
 }
 
+function isWritableStream(val) {
+  return (
+    val !== null &&
+    typeof val === 'object' &&
+    typeof val.pipe === 'function' &&
+    typeof val._write === 'function' &&
+    typeof val._writableState === 'object'
+  )
+}
+
 module.exports = exportDataset

package/src/requestStream.js

@@ -1,53 +1,29 @@
-const simpleGet = require('simple-get')
-const HttpAgent = require('agentkeepalive')
+const getIt = require('get-it')
+const {keepAlive, promise} = require('get-it/middleware')
 const debug = require('./debug')
 
-const HttpsAgent = HttpAgent.HttpsAgent
-const httpAgent = new HttpAgent()
-const httpsAgent = new HttpsAgent()
+const request = getIt([keepAlive(), promise({onlyBody: true})])
 const socketsWithTimeout = new WeakSet()
 
 const CONNECTION_TIMEOUT = 15 * 1000 // 15 seconds
 const READ_TIMEOUT = 3 * 60 * 1000 // 3 minutes
 const MAX_RETRIES = 5
 
-// Just a promisified simpleGet
-function getStream(options) {
-  return new Promise((resolve, reject) => {
-    let rejected = false
-    const openTimeout = setTimeout(() => {
-      rejected = true
-      reject(new Error(`Connection timed out after ${CONNECTION_TIMEOUT} ms`))
-    }, CONNECTION_TIMEOUT)
-
-    simpleGet(options, (err, res) => {
-      clearTimeout(openTimeout)
-      if (rejected) {
-        return
-      }
-
-      if (err) {
-        reject(err)
-        return
-      }
-
-      resolve(res)
-    })
-  })
-}
-
 function delay(ms) {
   return new Promise((resolve) => setTimeout(resolve, ms))
 }
 
 /* eslint-disable no-await-in-loop, max-depth */
 module.exports = async (options) => {
-  const agent = options.url.startsWith('https:') ? httpsAgent : httpAgent
-  const reqOptions = {...options, followRedirects: false, agent}
   let error
   for (let i = 0; i < MAX_RETRIES; i++) {
     try {
-      const response = await getStream(reqOptions)
+      const response = await request({
+        ...options,
+        stream: true,
+        maxRedirects: 0,
+        timeout: {connect: CONNECTION_TIMEOUT, socket: READ_TIMEOUT},
+      })
 
       if (
         response.connection &&
@@ -66,7 +42,7 @@ module.exports = async (options) => {
     } catch (err) {
       error = err
 
-      if (err.statusCode && err.statusCode < 500) {
+      if (err.response && err.response.statusCode && err.response.statusCode < 500) {
         break
       }