contentful-import 9.0.16 → 9.0.18

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

@@ -24,30 +24,60 @@ async function getAssetStreamForURL(url, assetsDirectory) {
     throw error;
   }
 }
+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;
+  }
+}
+
+// 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];
+}
 async function processAssets({
   assets,
   timeout,
   retryLimit,
   requestQueue
 }) {
-  const pendingProcessingAssets = assets.map(asset => {
-    return requestQueue.add(async () => {
-      _logging.logEmitter.emit('info', `Processing Asset ${(0, _getEntityName.default)(asset)}`);
-      const processingOptions = Object.assign({}, timeout && {
-        processingCheckWait: timeout
-      }, retryLimit && {
-        processingCheckRetry: retryLimit
-      });
-      try {
-        const processedAsset = await asset.processForAllLocales(processingOptions);
-        return processedAsset;
-      } catch (err) {
-        err.entity = asset;
-        _logging.logEmitter.emit('error', err);
-        return null;
-      }
-    });
+  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);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contentful-import",
-  "version": "9.0.16",
+  "version": "9.0.18",
   "description": "this tool allows you to import JSON dump exported by contentful-export",
   "main": "dist/index.js",
   "engines": {
@@ -59,7 +59,7 @@
     "date-fns": "^2.30.0",
     "eslint": "^8.49.0",
     "eslint-config-standard": "^17.1.0",
-    "joi": "^17.10.1",
+    "joi": "^17.10.2",
     "listr": "^0.14.1",
     "listr-update-renderer": "^0.5.0",
     "listr-verbose-renderer": "^0.6.0",
@@ -69,15 +69,15 @@
   },
   "devDependencies": {
     "@babel/cli": "^7.22.15",
-    "@babel/core": "^7.22.17",
+    "@babel/core": "^7.22.20",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
-    "@babel/preset-env": "^7.22.15",
+    "@babel/preset-env": "^7.22.20",
     "babel-jest": "^29.7.0",
     "babel-plugin-add-module-exports": "^1.0.2",
     "babel-preset-env": "^1.7.0",
     "cz-conventional-changelog": "^3.1.0",
     "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-jest": "^27.2.3",
+    "eslint-plugin-jest": "^27.4.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^6.1.1",
     "husky": "^8.0.3",