@sanity/export 2.33.1-performance-opts.1 → 3.0.0-definetype.62

package/lib/AssetHandler.js

@@ -1,105 +1,69 @@
 "use strict";
 
-var _excluded = ["asset"];
-
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
-
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-var path = require('path');
+const path = require('path');
 
-var crypto = require('crypto');
+const crypto = require('crypto');
 
-var _require = require('url'),
-    parseUrl = _require.parse,
-    formatUrl = _require.format;
+const {
+  parse: parseUrl,
+  format: formatUrl
+} = require('url');
 
-var fse = require('fs-extra');
+const {
+  mkdirSync,
+  createWriteStream
+} = require('fs');
 
-var miss = require('mississippi');
+const miss = require('mississippi');
 
-var PQueue = require('p-queue');
+const PQueue = require('p-queue');
 
-var _require2 = require('lodash'),
-    omit = _require2.omit,
-    noop = _require2.noop;
+const {
+  omit,
+  noop
+} = require('lodash');
 
-var pkg = require('../package.json');
+const pkg = require('../package.json');
 
-var requestStream = require('./requestStream');
+const requestStream = require('./requestStream');
 
-var debug = require('./debug');
+const debug = require('./debug');
 
-var EXCLUDE_PROPS = ['_id', '_type', 'assetId', 'extension', 'mimeType', 'path', 'url'];
-var ACTION_REMOVE = 'remove';
-var ACTION_REWRITE = 'rewrite';
-var ASSET_DOWNLOAD_CONCURRENCY = 8;
+const rimraf = require('./util/rimraf');
+
+const EXCLUDE_PROPS = ['_id', '_type', 'assetId', 'extension', 'mimeType', 'path', 'url'];
+const ACTION_REMOVE = 'remove';
+const ACTION_REWRITE = 'rewrite';
+const ASSET_DOWNLOAD_CONCURRENCY = 8;
 
 class AssetHandler {
   constructor(options) {
-    var _this = this;
-
-    _defineProperty(this, "rewriteAssets", miss.through.obj( /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator(function* (doc, enc, callback) {
-        if (['sanity.imageAsset', 'sanity.fileAsset'].includes(doc._type)) {
-          var type = doc._type === 'sanity.imageAsset' ? 'image' : 'file';
-          var filePath = "".concat(type, "s/").concat(generateFilename(doc._id));
-
-          _this.assetsSeen.set(doc._id, type);
-
-          _this.queueAssetDownload(doc, filePath, type);
-
-          callback();
-          return;
-        }
-
-        callback(null, _this.findAndModify(doc, ACTION_REWRITE));
-      });
-
-      return function (_x, _x2, _x3) {
-        return _ref.apply(this, arguments);
-      };
-    }()));
+    _defineProperty(this, "rewriteAssets", miss.through.obj(async (doc, enc, callback) => {
+      if (['sanity.imageAsset', 'sanity.fileAsset'].includes(doc._type)) {
+        const type = doc._type === 'sanity.imageAsset' ? 'image' : 'file';
+        const filePath = "".concat(type, "s/").concat(generateFilename(doc._id));
+        this.assetsSeen.set(doc._id, type);
+        this.queueAssetDownload(doc, filePath, type);
+        callback();
+        return;
+      }
 
-    _defineProperty(this, "stripAssets", miss.through.obj( /*#__PURE__*/function () {
-      var _ref2 = _asyncToGenerator(function* (doc, enc, callback) {
-        if (['sanity.imageAsset', 'sanity.fileAsset'].includes(doc._type)) {
-          callback();
-          return;
-        }
+      callback(null, this.findAndModify(doc, ACTION_REWRITE));
+    }));
 
-        callback(null, _this.findAndModify(doc, ACTION_REMOVE));
-      });
+    _defineProperty(this, "stripAssets", miss.through.obj(async (doc, enc, callback) => {
+      if (['sanity.imageAsset', 'sanity.fileAsset'].includes(doc._type)) {
+        callback();
+        return;
+      }
 
-      return function (_x4, _x5, _x6) {
-        return _ref2.apply(this, arguments);
-      };
-    }()));
+      callback(null, this.findAndModify(doc, ACTION_REMOVE));
+    }));
 
     _defineProperty(this, "skipAssets", miss.through.obj((doc, enc, callback) => {
-      var isAsset = ['sanity.imageAsset', 'sanity.fileAsset'].includes(doc._type);
+      const isAsset = ['sanity.imageAsset', 'sanity.fileAsset'].includes(doc._type);
 
       if (isAsset) {
         callback();
@@ -113,7 +77,7 @@ class AssetHandler {
 
     _defineProperty(this, "findAndModify", (item, action) => {
       if (Array.isArray(item)) {
-        var children = item.map(child => this.findAndModify(child, action));
+        const children = item.map(child => this.findAndModify(child, action));
         return children.filter(Boolean);
       }
 
@@ -121,30 +85,32 @@ class AssetHandler {
         return item;
       }
 
-      var isAsset = isAssetField(item);
+      const isAsset = isAssetField(item);
 
       if (isAsset && action === ACTION_REMOVE) {
         return undefined;
       }
 
       if (isAsset && action === ACTION_REWRITE) {
-        var asset = item.asset,
-            other = _objectWithoutProperties(item, _excluded);
-
-        var assetId = asset._ref;
-        var assetType = getAssetType(item);
-        var filePath = "".concat(assetType, "s/").concat(generateFilename(assetId));
-        return _objectSpread({
-          _sanityAsset: "".concat(assetType, "@file://./").concat(filePath)
-        }, this.findAndModify(other, action));
+        const {
+          asset,
+          ...other
+        } = item;
+        const assetId = asset._ref;
+        const assetType = getAssetType(item);
+        const filePath = "".concat(assetType, "s/").concat(generateFilename(assetId));
+        return {
+          _sanityAsset: "".concat(assetType, "@file://./").concat(filePath),
+          ...this.findAndModify(other, action)
+        };
       }
 
-      var newItem = {};
-      var keys = Object.keys(item);
+      const newItem = {};
+      const keys = Object.keys(item);
 
-      for (var i = 0; i < keys.length; i++) {
-        var key = keys[i];
-        var value = item[key];
+      for (let i = 0; i < keys.length; i++) {
+        const key = keys[i];
+        const value = item[key];
         newItem[key] = this.findAndModify(value, action);
 
         if (typeof newItem[key] === 'undefined') {
@@ -155,7 +121,7 @@ class AssetHandler {
       return newItem;
     });
 
-    var concurrency = options.concurrency || ASSET_DOWNLOAD_CONCURRENCY;
+    const concurrency = options.concurrency || ASSET_DOWNLOAD_CONCURRENCY;
     debug('Using asset download concurrency of %d', concurrency);
     this.client = options.client;
     this.tmpDir = options.tmpDir;
@@ -214,26 +180,30 @@ class AssetHandler {
     /* eslint-disable no-sync */
 
 
-    fse.ensureDirSync(path.join(this.tmpDir, 'files'));
-    fse.ensureDirSync(path.join(this.tmpDir, 'images'));
+    mkdirSync(path.join(this.tmpDir, 'files'), {
+      recursive: true
+    });
+    mkdirSync(path.join(this.tmpDir, 'images'), {
+      recursive: true
+    });
     /* eslint-enable no-sync */
 
     this.assetDirsCreated = true;
   }
 
   getAssetRequestOptions(assetDoc) {
-    var token = this.client.config().token;
-    var headers = {
+    const token = this.client.config().token;
+    const headers = {
       'User-Agent': "".concat(pkg.name, "@").concat(pkg.version)
     };
-    var isImage = assetDoc._type === 'sanity.imageAsset';
-    var url = parseUrl(assetDoc.url, true);
+    const isImage = assetDoc._type === 'sanity.imageAsset';
+    const url = parseUrl(assetDoc.url, true);
 
     if (isImage && ['cdn.sanity.io', 'cdn.sanity.work'].includes(url.hostname) && token) {
       headers.Authorization = "Bearer ".concat(token);
-      url.query = _objectSpread(_objectSpread({}, url.query || {}), {}, {
+      url.query = { ...(url.query || {}),
         dlRaw: 'true'
-      });
+      };
     }
 
     return {
@@ -242,95 +212,80 @@ class AssetHandler {
     };
   }
 
-  downloadAsset(assetDoc, dstPath) {
-    var _arguments = arguments,
-        _this2 = this;
-
-    return _asyncToGenerator(function* () {
-      var attemptNum = _arguments.length > 2 && _arguments[2] !== undefined ? _arguments[2] : 0;
-      var url = assetDoc.url;
-
-      var options = _this2.getAssetRequestOptions(assetDoc);
-
-      var stream;
-
-      try {
-        stream = yield requestStream(options);
-      } catch (err) {
-        _this2.reject(err);
-
-        return false;
-      }
-
-      if (stream.statusCode !== 200) {
-        _this2.queue.clear();
-
-        var err = yield tryGetErrorFromStream(stream);
-        var errMsg = "Referenced asset URL \"".concat(url, "\" returned HTTP ").concat(stream.statusCode);
-
-        if (err) {
-          errMsg = "".concat(errMsg, ":\n\n").concat(err);
-        }
+  async downloadAsset(assetDoc, dstPath) {
+    let attemptNum = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    const {
+      url
+    } = assetDoc;
+    const options = this.getAssetRequestOptions(assetDoc);
+    let stream;
+
+    try {
+      stream = await requestStream(options);
+    } catch (err) {
+      this.reject(err);
+      return false;
+    }
 
-        _this2.reject(new Error(errMsg));
+    if (stream.statusCode !== 200) {
+      this.queue.clear();
+      const err = await tryGetErrorFromStream(stream);
+      let errMsg = "Referenced asset URL \"".concat(url, "\" returned HTTP ").concat(stream.statusCode);
 
-        return false;
+      if (err) {
+        errMsg = "".concat(errMsg, ":\n\n").concat(err);
       }
 
-      _this2.maybeCreateAssetDirs();
-
-      debug('Asset stream ready, writing to filesystem at %s', dstPath);
-      var tmpPath = path.join(_this2.tmpDir, dstPath);
-
-      var _yield$writeHashedStr = yield writeHashedStream(tmpPath, stream),
-          sha1 = _yield$writeHashedStr.sha1,
-          md5 = _yield$writeHashedStr.md5,
-          size = _yield$writeHashedStr.size; // Verify it against our downloaded stream to make sure we have the same copy
-
-
-      var contentLength = stream.headers['content-length'];
-      var remoteSha1 = stream.headers['x-sanity-sha1'];
-      var remoteMd5 = stream.headers['x-sanity-md5'];
-      var hasHash = Boolean(remoteSha1 || remoteMd5);
-      var method = sha1 ? 'sha1' : 'md5'; // Asset validity is primarily determined by the sha1 hash. However, the sha1 hash is computed
-      // before certain processes (i.e. svg sanitization) which can result in a different hash.
-      // When the sha1 hashes don't match, fallback to using the md5 hash.
-
-      var sha1Differs = remoteSha1 && sha1 !== remoteSha1;
-      var md5Differs = remoteMd5 && md5 !== remoteMd5;
-      var differs = sha1Differs && md5Differs;
-
-      if (differs && attemptNum < 3) {
-        debug('%s does not match downloaded asset, retrying (#%d) [%s]', method, attemptNum + 1, url);
-        return _this2.downloadAsset(assetDoc, dstPath, attemptNum + 1);
-      } else if (differs) {
-        var details = [hasHash && (method === 'md5' ? "md5 should be ".concat(remoteMd5, ", got ").concat(md5) : "sha1 should be ".concat(remoteSha1, ", got ").concat(sha1)), contentLength && parseInt(contentLength, 10) !== size && "Asset should be ".concat(contentLength, " bytes, got ").concat(size), "Did not succeed after ".concat(attemptNum, " attempts.")];
-        var detailsString = "Details:\n - ".concat(details.filter(Boolean).join('\n - '));
-        yield fse.unlink(tmpPath);
-
-        _this2.queue.clear();
-
-        var error = new Error("Failed to download asset at ".concat(assetDoc.url, ", giving up. ").concat(detailsString));
-
-        _this2.reject(error);
-
-        return false;
-      }
+      this.reject(new Error(errMsg));
+      return false;
+    }
 
-      var isImage = assetDoc._type === 'sanity.imageAsset';
-      var type = isImage ? 'image' : 'file';
-      var id = "".concat(type, "-").concat(sha1);
-      var metaProps = omit(assetDoc, EXCLUDE_PROPS);
+    this.maybeCreateAssetDirs();
+    debug('Asset stream ready, writing to filesystem at %s', dstPath);
+    const tmpPath = path.join(this.tmpDir, dstPath);
+    const {
+      sha1,
+      md5,
+      size
+    } = await writeHashedStream(tmpPath, stream); // Verify it against our downloaded stream to make sure we have the same copy
+
+    const contentLength = stream.headers['content-length'];
+    const remoteSha1 = stream.headers['x-sanity-sha1'];
+    const remoteMd5 = stream.headers['x-sanity-md5'];
+    const hasHash = Boolean(remoteSha1 || remoteMd5);
+    const method = sha1 ? 'sha1' : 'md5'; // Asset validity is primarily determined by the sha1 hash. However, the sha1 hash is computed
+    // before certain processes (i.e. svg sanitization) which can result in a different hash.
+    // When the sha1 hashes don't match, fallback to using the md5 hash.
+
+    const sha1Differs = remoteSha1 && sha1 !== remoteSha1;
+    const md5Differs = remoteMd5 && md5 !== remoteMd5;
+    const differs = sha1Differs && md5Differs;
+
+    if (differs && attemptNum < 3) {
+      debug('%s does not match downloaded asset, retrying (#%d) [%s]', method, attemptNum + 1, url);
+      return this.downloadAsset(assetDoc, dstPath, attemptNum + 1);
+    } else if (differs) {
+      const details = [hasHash && (method === 'md5' ? "md5 should be ".concat(remoteMd5, ", got ").concat(md5) : "sha1 should be ".concat(remoteSha1, ", got ").concat(sha1)), contentLength && parseInt(contentLength, 10) !== size && "Asset should be ".concat(contentLength, " bytes, got ").concat(size), "Did not succeed after ".concat(attemptNum, " attempts.")];
+      const detailsString = "Details:\n - ".concat(details.filter(Boolean).join('\n - '));
+      await rimraf(tmpPath);
+      this.queue.clear();
+      const error = new Error("Failed to download asset at ".concat(assetDoc.url, ", giving up. ").concat(detailsString));
+      this.reject(error);
+      return false;
+    }
 
-      if (Object.keys(metaProps).length > 0) {
-        _this2.assetMap[id] = metaProps;
-      }
+    const isImage = assetDoc._type === 'sanity.imageAsset';
+    const type = isImage ? 'image' : 'file';
+    const id = "".concat(type, "-").concat(sha1);
+    const metaProps = omit(assetDoc, EXCLUDE_PROPS);
 
-      _this2.downloading.splice(_this2.downloading.findIndex(datUrl => datUrl === url), 1);
+    if (Object.keys(metaProps).length > 0) {
+      this.assetMap[id] = metaProps;
+    }
 
-      _this2.filesWritten++;
-      return true;
-    })();
+    this.downloading.splice(this.downloading.findIndex(datUrl => datUrl === url), 1);
+    this.filesWritten++;
+    return true;
   }
 
 }
@@ -344,10 +299,7 @@ function getAssetType(item) {
     return null;
   }
 
-  var _ref3 = item.asset._ref.match(/^(image|file)-/) || [],
-      _ref4 = _slicedToArray(_ref3, 2),
-      type = _ref4[1];
-
+  const [, type] = item.asset._ref.match(/^(image|file)-/) || [];
   return type || null;
 }
 
@@ -356,26 +308,22 @@ function isSanityAsset(assetId) {
 }
 
 function generateFilename(assetId) {
-  var _ref5 = assetId.match(/^(image|file)-(.*?)(-[a-z]+)?$/) || [],
-      _ref6 = _slicedToArray(_ref5, 4),
-      asset = _ref6[2],
-      ext = _ref6[3];
-
-  var extension = (ext || 'bin').replace(/^-/, '');
+  const [,, asset, ext] = assetId.match(/^(image|file)-(.*?)(-[a-z]+)?$/) || [];
+  const extension = (ext || 'bin').replace(/^-/, '');
   return asset ? "".concat(asset, ".").concat(extension) : "".concat(assetId, ".bin");
 }
 
 function writeHashedStream(filePath, stream) {
-  var size = 0;
-  var md5 = crypto.createHash('md5');
-  var sha1 = crypto.createHash('sha1');
-  var hasher = miss.through((chunk, enc, cb) => {
+  let size = 0;
+  const md5 = crypto.createHash('md5');
+  const sha1 = crypto.createHash('sha1');
+  const hasher = miss.through((chunk, enc, cb) => {
     size += chunk.length;
     md5.update(chunk);
     sha1.update(chunk);
     cb(null, chunk);
   });
-  return new Promise((resolve, reject) => miss.pipe(stream, hasher, fse.createWriteStream(filePath), err => {
+  return new Promise((resolve, reject) => miss.pipe(stream, hasher, createWriteStream(filePath), err => {
     if (err) {
       reject(err);
       return;
@@ -395,7 +343,7 @@ function tryGetErrorFromStream(stream) {
 
     function parse(body) {
       try {
-        var parsed = JSON.parse(body.toString('utf8'));
+        const parsed = JSON.parse(body.toString('utf8'));
         resolve(parsed.message || parsed.error || null);
       } catch (err) {
         resolve(body.toString('utf8').slice(0, 16000));