contentful-import 9.0.21 → 9.1.0

package/dist/tasks/get-destination-data.js

@@ -1,81 +1,57 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = getDestinationData;
-var _bluebird = _interopRequireDefault(require("bluebird"));
-var _logging = require("contentful-batch-libs/dist/logging");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const bluebird_1 = __importDefault(require("bluebird"));
+const logging_1 = require("contentful-batch-libs/dist/logging");
 const BATCH_CHAR_LIMIT = 1990;
 const BATCH_SIZE_LIMIT = 100;
 const METHODS = {
-  contentTypes: {
-    name: 'content types',
-    method: 'getContentTypes'
-  },
-  locales: {
-    name: 'locales',
-    method: 'getLocales'
-  },
-  entries: {
-    name: 'entries',
-    method: 'getEntries'
-  },
-  assets: {
-    name: 'assets',
-    method: 'getAssets'
-  }
+    contentTypes: { name: 'content types', method: 'getContentTypes' },
+    locales: { name: 'locales', method: 'getLocales' },
+    entries: { name: 'entries', method: 'getEntries' },
+    assets: { name: 'assets', method: 'getAssets' }
 };
-async function batchedIdQuery({
-  environment,
-  type,
-  ids,
-  requestQueue
-}) {
-  const method = METHODS[type].method;
-  const entityTypeName = METHODS[type].name;
-  const batches = getIdBatches(ids);
-  let totalFetched = 0;
-  const allPendingResponses = batches.map(idBatch => {
-    // TODO: add batch count to indicate that it's running
-    return requestQueue.add(async () => {
-      const response = await environment[method]({
-        'sys.id[in]': idBatch,
-        limit: idBatch.split(',').length
-      });
-      totalFetched = totalFetched + response.items.length;
-      _logging.logEmitter.emit('info', `Fetched ${totalFetched} of ${response.total} ${entityTypeName}`);
-      return response.items;
+async function batchedIdQuery({ environment, type, ids, requestQueue }) {
+    const method = METHODS[type].method;
+    const entityTypeName = METHODS[type].name;
+    const batches = getIdBatches(ids);
+    let totalFetched = 0;
+    const allPendingResponses = batches.map((idBatch) => {
+        // TODO: add batch count to indicate that it's running
+        return requestQueue.add(async () => {
+            const response = await environment[method]({
+                'sys.id[in]': idBatch,
+                limit: idBatch.split(',').length
+            });
+            totalFetched = totalFetched + response.items.length;
+            logging_1.logEmitter.emit('info', `Fetched ${totalFetched} of ${response.total} ${entityTypeName}`);
+            return response.items;
+        });
     });
-  });
-  const responses = await _bluebird.default.all(allPendingResponses);
-  return responses.flat();
+    const responses = await bluebird_1.default.all(allPendingResponses);
+    return responses.flat();
 }
 function getIdBatches(ids) {
-  const batches = [];
-  let currentBatch = '';
-  let currentSize = 0;
-  while (ids.length > 0) {
-    const id = ids.splice(0, 1);
-    currentBatch += id;
-    currentSize = currentSize + 1;
-    if (currentSize === BATCH_SIZE_LIMIT || currentBatch.length > BATCH_CHAR_LIMIT || ids.length === 0) {
-      batches.push(currentBatch);
-      currentBatch = '';
-      currentSize = 0;
-    } else {
-      currentBatch += ',';
+    const batches = [];
+    let currentBatch = '';
+    let currentSize = 0;
+    while (ids.length > 0) {
+        const id = ids.splice(0, 1);
+        currentBatch += id;
+        currentSize = currentSize + 1;
+        if (currentSize === BATCH_SIZE_LIMIT || currentBatch.length > BATCH_CHAR_LIMIT || ids.length === 0) {
+            batches.push(currentBatch);
+            currentBatch = '';
+            currentSize = 0;
+        }
+        else {
+            currentBatch += ',';
+        }
     }
-  }
-  return batches;
+    return batches;
 }
-
 /**
  * Gets content from a space which will have content copied to it, based on a
  * collection of existing content.
@@ -84,72 +60,63 @@ function getIdBatches(ids) {
  * All tags will be retrieved.
  *
  */
-
-async function getDestinationData({
-  client,
-  spaceId,
-  environmentId,
-  sourceData,
-  contentModelOnly,
-  skipLocales,
-  skipContentModel,
-  requestQueue
-}) {
-  const space = await client.getSpace(spaceId);
-  const environment = await space.getEnvironment(environmentId);
-  const result = {
-    contentTypes: [],
-    tags: [],
-    locales: [],
-    entries: [],
-    assets: []
-  };
-
-  // Make sure all required properties are available and at least an empty array
-  sourceData = _objectSpread(_objectSpread({}, result), sourceData);
-  if (!skipContentModel) {
-    const contentTypeIds = sourceData.contentTypes.map(e => e.sys.id);
-    result.contentTypes = batchedIdQuery({
-      environment,
-      type: 'contentTypes',
-      ids: contentTypeIds,
-      requestQueue
+async function getDestinationData({ client, spaceId, environmentId, sourceData, contentModelOnly, skipLocales, skipContentModel, requestQueue }) {
+    const space = await client.getSpace(spaceId);
+    const environment = await space.getEnvironment(environmentId);
+    const result = {
+        contentTypes: [],
+        tags: [],
+        locales: [],
+        entries: [],
+        assets: []
+    };
+    // Make sure all required properties are available and at least an empty array
+    sourceData = {
+        ...result,
+        ...sourceData
+    };
+    if (!skipContentModel) {
+        const contentTypeIds = sourceData.contentTypes.map((e) => e.sys.id);
+        result.contentTypes = batchedIdQuery({
+            environment,
+            type: 'contentTypes',
+            ids: contentTypeIds,
+            requestQueue
+        });
+        if (!skipLocales) {
+            const localeIds = sourceData.locales.map((e) => e.sys.id);
+            result.locales = batchedIdQuery({
+                environment,
+                type: 'locales',
+                ids: localeIds,
+                requestQueue
+            });
+        }
+    }
+    // include tags even if contentModelOnly = true
+    result.tags = environment.getTags().then(response => response.items).catch((e) => {
+        // users without access to Tags will get 404
+        // if they dont have access, remove tags array so they're not handled in future steps
+        delete result.tags;
     });
-    if (!skipLocales) {
-      const localeIds = sourceData.locales.map(e => e.sys.id);
-      result.locales = batchedIdQuery({
+    if (contentModelOnly) {
+        return bluebird_1.default.props(result);
+    }
+    const entryIds = sourceData.entries.map((e) => e.sys.id);
+    const assetIds = sourceData.assets.map((e) => e.sys.id);
+    result.entries = batchedIdQuery({
         environment,
-        type: 'locales',
-        ids: localeIds,
+        type: 'entries',
+        ids: entryIds,
         requestQueue
-      });
-    }
-  }
-
-  // include tags even if contentModelOnly = true
-  result.tags = environment.getTags().then(response => response.items).catch(e => {
-    // users without access to Tags will get 404
-    // if they dont have access, remove tags array so they're not handled in future steps
-    delete result.tags;
-  });
-  if (contentModelOnly) {
-    return _bluebird.default.props(result);
-  }
-  const entryIds = sourceData.entries.map(e => e.sys.id);
-  const assetIds = sourceData.assets.map(e => e.sys.id);
-  result.entries = batchedIdQuery({
-    environment,
-    type: 'entries',
-    ids: entryIds,
-    requestQueue
-  });
-  result.assets = batchedIdQuery({
-    environment,
-    type: 'assets',
-    ids: assetIds,
-    requestQueue
-  });
-  result.webhooks = [];
-  return _bluebird.default.props(result);
+    });
+    result.assets = batchedIdQuery({
+        environment,
+        type: 'assets',
+        ids: assetIds,
+        requestQueue
+    });
+    result.webhooks = [];
+    return bluebird_1.default.props(result);
 }
-module.exports = exports.default;
+exports.default = getDestinationData;

package/dist/tasks/init-client.js

@@ -1,25 +1,19 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = initClient;
-var _contentfulManagement = require("contentful-management");
-var _logging = require("contentful-batch-libs/dist/logging");
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
-function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+Object.defineProperty(exports, "__esModule", { value: true });
+const contentful_management_1 = require("contentful-management");
+const logging_1 = require("contentful-batch-libs/dist/logging");
 function logHandler(level, data) {
-  _logging.logEmitter.emit(level, data);
+    logging_1.logEmitter.emit(level, data);
 }
 function initClient(opts) {
-  const defaultOpts = {
-    timeout: 30000,
-    logHandler
-  };
-  const config = _objectSpread(_objectSpread({}, defaultOpts), opts);
-  return (0, _contentfulManagement.createClient)(config);
+    const defaultOpts = {
+        timeout: 30000,
+        logHandler
+    };
+    const config = {
+        ...defaultOpts,
+        ...opts
+    };
+    return (0, contentful_management_1.createClient)(config);
 }
-module.exports = exports.default;
+exports.default = initClient;

package/dist/tasks/push-to-space/assets.js

@@ -1,83 +1,75 @@
 "use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.getAssetStreamForURL = getAssetStreamForURL;
-exports.processAssets = processAssets;
-var _fs = _interopRequireDefault(require("fs"));
-var _path = require("path");
-var _util = require("util");
-var _getEntityName = _interopRequireDefault(require("contentful-batch-libs/dist/get-entity-name"));
-var _logging = require("contentful-batch-libs/dist/logging");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const stat = (0, _util.promisify)(_fs.default.stat);
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.processAssets = exports.getAssetStreamForURL = void 0;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = require("path");
+const util_1 = require("util");
+const get_entity_name_1 = __importDefault(require("contentful-batch-libs/dist/get-entity-name"));
+const logging_1 = require("contentful-batch-libs/dist/logging");
+const stat = (0, util_1.promisify)(fs_1.default.stat);
 async function getAssetStreamForURL(url, assetsDirectory) {
-  const [, assetPath] = url.split('//');
-  const filePath = (0, _path.join)(assetsDirectory, assetPath);
-  try {
-    await stat(filePath);
-    return _fs.default.createReadStream(filePath);
-  } catch (err) {
-    const error = new Error('Cannot open asset from filesystem');
-    error.filePath = filePath;
-    throw error;
-  }
+    const [, assetPath] = url.split('//');
+    const filePath = (0, path_1.join)(assetsDirectory, assetPath);
+    try {
+        await stat(filePath);
+        return fs_1.default.createReadStream(filePath);
+    }
+    catch (err) {
+        const error = new Error('Cannot open asset from filesystem');
+        error.filePath = filePath;
+        throw error;
+    }
 }
+exports.getAssetStreamForURL = getAssetStreamForURL;
 async function processAssetForLocale(locale, asset, processingOptions) {
-  try {
-    return await asset.processForLocale(locale, processingOptions);
-  } catch (err) {
-    err.entity = asset;
-    _logging.logEmitter.emit('error', err);
-    throw err;
-  }
+    try {
+        return await asset.processForLocale(locale, processingOptions);
+    }
+    catch (err) {
+        err.entity = asset;
+        logging_1.logEmitter.emit('error', err);
+        throw err;
+    }
 }
-
 // From
 // https://stackoverflow.com/questions/67339630/how-to-get-last-resolved-promise-from-a-list-of-resolved-promises-in-javascript
 async function lastResult(promises) {
-  if (!promises.length) throw new RangeError('No last result from no promises');
-  const results = [];
-  await Promise.all(promises.map(p => p.then(v => {
-    results.push(v);
-  })));
-  return results[results.length - 1];
+    if (!promises.length)
+        throw new RangeError('No last result from no promises');
+    const results = [];
+    await Promise.all(promises.map((p) => p.then((v) => {
+        results.push(v);
+    })));
+    return results[results.length - 1];
 }
-async function processAssets({
-  assets,
-  timeout,
-  retryLimit,
-  requestQueue
-}) {
-  const processingOptions = Object.assign({}, timeout && {
-    processingCheckWait: timeout
-  }, retryLimit && {
-    processingCheckRetry: retryLimit
-  });
-  const pendingProcessingAssets = assets.map(async asset => {
-    _logging.logEmitter.emit('info', `Processing Asset ${(0, _getEntityName.default)(asset)}`);
-
-    // We want to do what processForAllLocale does, but as the rate
-    // limit is only enforced if we have a dedicated requestQueue item
-    // for every processForLocale call, we need to duplicate the logic
-    // here
-    const locales = Object.keys(asset.fields.file || {});
-    let latestAssetVersion = asset;
-    try {
-      // The last resolved promise will return the most up to date asset
-      // version which we need for next import steps (e.g. publishing)
-      latestAssetVersion = await lastResult(locales.map(locale => {
-        return requestQueue.add(() => processAssetForLocale(locale, asset, processingOptions));
-      }));
-    } catch (err) {
-      // Handle any error that arises during the processing of any locale
-      return null;
-    }
-    return latestAssetVersion;
-  });
-  const potentiallyProcessedAssets = await Promise.all(pendingProcessingAssets);
-
-  // This filters out all process attempts which failed
-  return potentiallyProcessedAssets.filter(asset => asset);
-}
+async function processAssets({ assets, timeout, retryLimit, requestQueue }) {
+    const processingOptions = Object.assign({}, timeout && { processingCheckWait: timeout }, retryLimit && { processingCheckRetry: retryLimit });
+    const pendingProcessingAssets = assets.map(async (asset) => {
+        logging_1.logEmitter.emit('info', `Processing Asset ${(0, get_entity_name_1.default)(asset)}`);
+        // We want to do what processForAllLocale does, but as the rate
+        // limit is only enforced if we have a dedicated requestQueue item
+        // for every processForLocale call, we need to duplicate the logic
+        // here
+        const locales = Object.keys(asset.fields.file || {});
+        let latestAssetVersion = asset;
+        try {
+            // The last resolved promise will return the most up to date asset
+            // version which we need for next import steps (e.g. publishing)
+            latestAssetVersion = await lastResult(locales.map((locale) => {
+                return requestQueue.add(() => processAssetForLocale(locale, asset, processingOptions));
+            }));
+        }
+        catch (err) {
+            // Handle any error that arises during the processing of any locale
+            return null;
+        }
+        return latestAssetVersion;
+    });
+    const potentiallyProcessedAssets = await Promise.all(pendingProcessingAssets);
+    // This filters out all process attempts which failed
+    return potentiallyProcessedAssets.filter((asset) => asset);
+}
+exports.processAssets = processAssets;