contentful-export 7.17.2 → 7.17.5

package/dist/index.js

@@ -27,9 +27,7 @@ var _differenceInSeconds = _interopRequireDefault(require("date-fns/differenceIn
 
 var _formatDistance = _interopRequireDefault(require("date-fns/formatDistance"));
 
-var _listr2 = require("contentful-batch-libs/dist/listr");
-
-var _logging = require("contentful-batch-libs/dist/logging");
+var _contentfulBatchLibs = require("contentful-batch-libs");
 
 var _downloadAssets = _interopRequireDefault(require("./tasks/download-assets"));
 
@@ -61,10 +59,10 @@ function runContentfulExport(params) {
   const options = (0, _parseOptions.default)(params);
   const listrOptions = createListrOptions(options); // Setup custom error listener to store errors for later
 
-  (0, _logging.setupLogging)(log);
+  (0, _contentfulBatchLibs.setupLogging)(log);
   const tasks = new _listr.default([{
     title: 'Initialize client',
-    task: (0, _listr2.wrapTask)(ctx => {
+    task: (0, _contentfulBatchLibs.wrapTask)(ctx => {
       try {
         // CMA client
         ctx.client = (0, _initClient.default)(options);
@@ -102,7 +100,7 @@ function runContentfulExport(params) {
     }
   }, {
     title: 'Download assets',
-    task: (0, _listr2.wrapTask)((0, _downloadAssets.default)(options)),
+    task: (0, _contentfulBatchLibs.wrapTask)((0, _downloadAssets.default)(options)),
     skip: ctx => !options.downloadAssets || !Object.prototype.hasOwnProperty.call(ctx.data, 'assets')
   }, {
     title: 'Write export log file',
@@ -185,10 +183,10 @@ function runContentfulExport(params) {
     // @todo this should live in batch libs
     const errorLog = log.filter(logMessage => logMessage.level !== 'info' && logMessage.level !== 'warning');
     const displayLog = log.filter(logMessage => logMessage.level !== 'info');
-    (0, _logging.displayErrorLog)(displayLog);
+    (0, _contentfulBatchLibs.displayErrorLog)(displayLog);
 
     if (errorLog.length) {
-      return (0, _logging.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
+      return (0, _contentfulBatchLibs.writeErrorLogFile)(options.errorLogFile, errorLog).then(() => {
         const multiError = new Error('Errors occured');
         multiError.name = 'ContentfulMultiError';
         multiError.errors = errorLog;

package/dist/parseOptions.js

@@ -5,19 +5,17 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = parseOptions;
 
-var _path = require("path");
+var _contentfulBatchLibs = require("contentful-batch-libs");
 
 var _format = _interopRequireDefault(require("date-fns/format"));
 
-var _headers = require("./utils/headers");
-
-var _proxy = require("contentful-batch-libs/dist/proxy");
+var _path = require("path");
 
-var _addSequenceHeader = _interopRequireDefault(require("contentful-batch-libs/dist/add-sequence-header"));
+var _querystring = _interopRequireDefault(require("querystring"));
 
 var _package = require("../package");
 
-var _querystring = _interopRequireDefault(require("querystring"));
+var _headers = require("./utils/headers");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
@@ -46,7 +44,7 @@ function parseOptions(params) {
   const configFile = params.config ? require((0, _path.resolve)(process.cwd(), params.config)) : {};
 
   const options = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultOptions), configFile), params), {}, {
-    headers: (0, _addSequenceHeader.default)(params.headers || (0, _headers.getHeadersConfig)(params.header))
+    headers: (0, _contentfulBatchLibs.addSequenceHeader)(params.headers || (0, _headers.getHeadersConfig)(params.header))
   }); // Validation
 
 
@@ -79,11 +77,11 @@ function parseOptions(params) {
   options.accessToken = options.managementToken;
 
   if (typeof options.proxy === 'string') {
-    options.proxy = (0, _proxy.proxyStringToObject)(options.proxy);
+    options.proxy = (0, _contentfulBatchLibs.proxyStringToObject)(options.proxy);
   }
 
   if (!options.rawProxy && options.proxy) {
-    options.httpsAgent = (0, _proxy.agentFromProxy)(options.proxy);
+    options.httpsAgent = (0, _contentfulBatchLibs.agentFromProxy)(options.proxy);
     delete options.proxy;
   }
 

package/dist/tasks/download-assets.js

@@ -5,24 +5,24 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = downloadAssets;
 
-var _path = _interopRequireDefault(require("path"));
-
 var _bluebird = _interopRequireDefault(require("bluebird"));
 
+var _contentfulBatchLibs = require("contentful-batch-libs");
+
 var _figures = _interopRequireDefault(require("figures"));
 
 var _fs = require("fs");
 
 var _nodeFetch = _interopRequireDefault(require("node-fetch"));
 
+var _path = _interopRequireDefault(require("path"));
+
 var _stream = require("stream");
 
 var _util = require("util");
 
 var _embargoedAssets = require("../utils/embargoedAssets");
 
-var _getEntityName = _interopRequireDefault(require("contentful-batch-libs/dist/get-entity-name"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const streamPipeline = (0, _util.promisify)(_stream.pipeline);
@@ -65,7 +65,7 @@ function downloadAssets(options) {
     let errorCount = 0;
     return _bluebird.default.map(ctx.data.assets, asset => {
       if (!asset.fields.file) {
-        task.output = `${_figures.default.warning} asset ${(0, _getEntityName.default)(asset)} has no file(s)`;
+        task.output = `${_figures.default.warning} asset ${(0, _contentfulBatchLibs.getEntityName)(asset)} has no file(s)`;
         warningCount++;
         return;
       }
@@ -75,7 +75,7 @@ function downloadAssets(options) {
         const url = asset.fields.file[locale].url;
 
         if (!url) {
-          task.output = `${_figures.default.cross} asset '${(0, _getEntityName.default)(asset)}' doesn't contain an url in path asset.fields.file[${locale}].url`;
+          task.output = `${_figures.default.cross} asset '${(0, _contentfulBatchLibs.getEntityName)(asset)}' doesn't contain an url in path asset.fields.file[${locale}].url`;
           errorCount++;
           return _bluebird.default.resolve();
         }
@@ -100,7 +100,7 @@ function downloadAssets(options) {
         }
 
         return startingPromise.then(downloadAsset).then(downLoadedFile => {
-          task.output = `${_figures.default.tick} downloaded ${(0, _getEntityName.default)(downLoadedFile)} (${url})`;
+          task.output = `${_figures.default.tick} downloaded ${(0, _contentfulBatchLibs.getEntityName)(downLoadedFile)} (${url})`;
           successCount++;
         }).catch(error => {
           task.output = `${_figures.default.cross} error downloading ${url}: ${error.message}`;

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

@@ -7,14 +7,12 @@ exports.default = getFullSourceSpace;
 
 var _bluebird = _interopRequireDefault(require("bluebird"));
 
+var _contentfulBatchLibs = require("contentful-batch-libs");
+
 var _listr = _interopRequireDefault(require("listr"));
 
 var _listrVerboseRenderer = _interopRequireDefault(require("listr-verbose-renderer"));
 
-var _listr2 = require("contentful-batch-libs/dist/listr");
-
-var _logging = require("contentful-batch-libs/dist/logging");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const MAX_ALLOWED_LIMIT = 1000;
@@ -47,7 +45,7 @@ function getFullSourceSpace({
   };
   return new _listr.default([{
     title: 'Connecting to space',
-    task: (0, _listr2.wrapTask)(ctx => {
+    task: (0, _contentfulBatchLibs.wrapTask)(ctx => {
       return client.getSpace(spaceId).then(space => {
         ctx.space = space;
         return space.getEnvironment(environmentId);
@@ -57,7 +55,7 @@ function getFullSourceSpace({
     })
   }, {
     title: 'Fetching content types data',
-    task: (0, _listr2.wrapTask)(ctx => {
+    task: (0, _contentfulBatchLibs.wrapTask)(ctx => {
       return pagedGet({
         source: ctx.environment,
         method: 'getContentTypes'
@@ -68,7 +66,7 @@ function getFullSourceSpace({
     skip: () => skipContentModel
   }, {
     title: 'Fetching tags data',
-    task: (0, _listr2.wrapTask)(ctx => {
+    task: (0, _contentfulBatchLibs.wrapTask)(ctx => {
       return pagedGet({
         source: ctx.environment,
         method: 'getTags'
@@ -81,7 +79,7 @@ function getFullSourceSpace({
     skip: () => cdaClient
   }, {
     title: 'Fetching editor interfaces data',
-    task: (0, _listr2.wrapTask)(ctx => {
+    task: (0, _contentfulBatchLibs.wrapTask)(ctx => {
       return getEditorInterfaces(ctx.data.contentTypes).then(editorInterfaces => {
         ctx.data.editorInterfaces = editorInterfaces.filter(editorInterface => {
           return editorInterface !== null;
@@ -91,7 +89,7 @@ function getFullSourceSpace({
     skip: ctx => skipContentModel || skipEditorInterfaces || ctx.data.contentTypes.length === 0 && 'Skipped since no content types downloaded'
   }, {
     title: 'Fetching content entries data',
-    task: (0, _listr2.wrapTask)(ctx => {
+    task: (0, _contentfulBatchLibs.wrapTask)(ctx => {
       const source = cdaClient || ctx.environment;
 
       if (cdaClient) {
@@ -112,7 +110,7 @@ function getFullSourceSpace({
     skip: () => skipContent
   }, {
     title: 'Fetching assets data',
-    task: (0, _listr2.wrapTask)(ctx => {
+    task: (0, _contentfulBatchLibs.wrapTask)(ctx => {
       const source = cdaClient || ctx.environment;
       queryAssets = queryAssets || {};
       queryAssets.locale = '*';
@@ -127,7 +125,7 @@ function getFullSourceSpace({
     skip: () => skipContent
   }, {
     title: 'Fetching locales data',
-    task: (0, _listr2.wrapTask)(ctx => {
+    task: (0, _contentfulBatchLibs.wrapTask)(ctx => {
       return pagedGet({
         source: ctx.environment,
         method: 'getLocales'
@@ -138,7 +136,7 @@ function getFullSourceSpace({
     skip: () => skipContentModel
   }, {
     title: 'Fetching webhooks data',
-    task: (0, _listr2.wrapTask)(ctx => {
+    task: (0, _contentfulBatchLibs.wrapTask)(ctx => {
       return pagedGet({
         source: ctx.space,
         method: 'getWebhooks'
@@ -149,7 +147,7 @@ function getFullSourceSpace({
     skip: () => skipWebhooks || environmentId !== 'master' && 'Webhooks can only be exported from master environment'
   }, {
     title: 'Fetching roles data',
-    task: (0, _listr2.wrapTask)(ctx => {
+    task: (0, _contentfulBatchLibs.wrapTask)(ctx => {
       return pagedGet({
         source: ctx.space,
         method: 'getRoles'
@@ -164,13 +162,13 @@ function getFullSourceSpace({
 function getEditorInterfaces(contentTypes) {
   return _bluebird.default.map(contentTypes, contentType => {
     return contentType.getEditorInterface().then(editorInterface => {
-      _logging.logEmitter.emit('info', `Fetched editor interface for ${contentType.name}`);
+      _contentfulBatchLibs.logEmitter.emit('info', `Fetched editor interface for ${contentType.name}`);
 
       return editorInterface;
     }).catch(() => {
       // old contentTypes may not have an editor interface but we'll handle in a later stage
       // but it should not stop getting the data process
-      _logging.logEmitter.emit('warning', `No editor interface found for ${contentType}`);
+      _contentfulBatchLibs.logEmitter.emit('warning', `No editor interface found for ${contentType}`);
 
       return _bluebird.default.resolve(null);
     });
@@ -218,7 +216,7 @@ function pagedGet({
     const page = Math.ceil(skip / pageLimit) + 1;
     const pages = Math.ceil(total / pageLimit);
 
-    _logging.logEmitter.emit('info', `Fetched ${aggregatedResponse.items.length} of ${total} items (Page ${page}/${pages})`);
+    _contentfulBatchLibs.logEmitter.emit('info', `Fetched ${aggregatedResponse.items.length} of ${total} items (Page ${page}/${pages})`);
 
     if (skip + pageLimit < total) {
       return pagedGet({

package/dist/tasks/init-client.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = initClient;
 
-var _contentfulManagement = require("contentful-management");
-
 var _contentful = require("contentful");
 
-var _logging = require("contentful-batch-libs/dist/logging");
+var _contentfulBatchLibs = require("contentful-batch-libs");
+
+var _contentfulManagement = require("contentful-management");
 
 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; }
 
@@ -18,7 +18,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 function logHandler(level, data) {
-  _logging.logEmitter.emit(level, data);
+  _contentfulBatchLibs.logEmitter.emit(level, data);
 }
 
 function initClient(opts, useCda = false) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentful-export",
-  "version": "7.17.2",
+  "version": "7.17.5",
   "description": "this tool allows you to export a space to a JSON dump",
   "main": "dist/index.js",
   "types": "types.d.ts",
@@ -47,7 +47,7 @@
     "bluebird": "^3.3.3",
     "cli-table3": "^0.6.0",
     "contentful": "^9.0.0",
-    "contentful-batch-libs": "^9.2.1",
+    "contentful-batch-libs": "^9.3.0",
     "contentful-management": "^10.0.0",
     "date-fns": "^2.28.0",
     "figures": "^3.2.0",