@jungvonmatt/contentful-migrations 5.2.3 → 5.2.4

package/lib/backend.js

@@ -2,7 +2,7 @@ const path = require('path');
 const fs = require('fs/promises');
 const chalk = require('chalk');
 const cliProgress = require('cli-progress');
-const { getEnvironment, getDefaultLocale } = require('./contentful');
+const { getEnvironment, getDefaultLocale, getMigrationItems } = require('./contentful');
 const { STORAGE_TAG, STORAGE_CONTENT, STATE_SUCCESS, STATE_FAILURE } = require('./config');
 
 /**
@@ -193,8 +193,8 @@ const migrateToContentStorage = async (config) => {
   const client = await getEnvironment(config);
   const version = await getMigrationVersionFromTag(config);
 
-  const {globby} = await import('globby');
-  const migrations = await globby([`${directory}/*.js`,`${directory}/*.cjs`]);
+  const { globby } = await import('globby');
+  const migrations = await globby([`${directory}/*.js`, `${directory}/*.cjs`]);
   const environmentId = client.sys.id;
   const filtered = migrations.filter((file) => {
     const name = path.basename(file);
@@ -292,9 +292,7 @@ const migrateToTagStorage = async (config) => {
  * @returns {number[]}
  */
 const getMigrationVersions = async (config) => {
-  const { migrationContentTypeId } = config;
-  const client = await getEnvironment(config);
-  const { items } = await client.getEntries({ content_type: migrationContentTypeId, limit: 1000 });
+  const items = await getMigrationItems(config);
 
   return (items || []).map((item) => parseInt(item.sys.id, 10));
 };
@@ -353,11 +351,11 @@ const getLatestVersion = async (config) => {
   return getMigrationVersionFromTag(config);
 };
 
-const getVersionFromFile = file => {
+const getVersionFromFile = (file) => {
   const name = path.basename(file);
   const [, num] = /^(\d+)-/.exec(name);
-  return parseInt(num,10);
-}
+  return parseInt(num, 10);
+};
 
 /**
  * Get all unexecuted migration files
@@ -365,17 +363,16 @@ const getVersionFromFile = file => {
  */
 const getNewMigrations = async (config) => {
   const { directory, storage, migrationContentTypeId } = config || {};
-  const {globby} = await import('globby');
-  const migrations = (await globby([`${directory}/*.js`,`${directory}/*.cjs`])).sort((a,b) => {
+  const { globby } = await import('globby');
+  const migrations = (await globby([`${directory}/*.js`, `${directory}/*.cjs`])).sort((a, b) => {
     const numA = getVersionFromFile(a);
     const numB = getVersionFromFile(b);
-    return numA-numB;
+    return numA - numB;
   });
 
   if (storage === STORAGE_CONTENT) {
     try {
       const versions = await getMigrationVersions(config);
-
       const result = migrations.filter((file) => {
         const num = getVersionFromFile(file);
         return !(versions || []).includes(num);
@@ -384,10 +381,14 @@ const getNewMigrations = async (config) => {
       return result;
     } catch (error) {
       // check if we have a migration scheduled which adds the initial content-type
-      const regexp = new RegExp(`createContentType\\(['"]${migrationContentTypeId}['"]\\)`,'mg');
-      const initial = (await Promise.all(migrations.map(async file => {
-        return fs.readFile(file, 'utf8');
-      }))).some(content => regexp.test(content));
+      const regexp = new RegExp(`createContentType\\(['"]${migrationContentTypeId}['"]\\)`, 'mg');
+      const initial = (
+        await Promise.all(
+          migrations.map(async (file) => {
+            return fs.readFile(file, 'utf8');
+          })
+        )
+      ).some((content) => regexp.test(content));
 
       if (initial) {
         return migrations;

package/lib/contentful.js

@@ -215,11 +215,9 @@ const pagedGet = async (environment, { method, skip = 0, aggregatedResponse = nu
   } else {
     aggregatedResponse.items = aggregatedResponse.items.concat(response.items);
   }
-  // const page = Math.ceil(skip / MAX_ALLOWED_LIMIT) + 1;
-  // const pages = Math.ceil(response.total / MAX_ALLOWED_LIMIT);
 
-  if (skip + MAX_ALLOWED_LIMIT <= response.total) {
-    return pagedGet(environment, { method, skip: skip + MAX_ALLOWED_LIMIT, aggregatedResponse, query });
+  if (skip + fullQuery.limit <= response.total) {
+    return pagedGet(environment, { method, skip: skip + fullQuery.limit, aggregatedResponse, query });
   }
   return aggregatedResponse;
 };
@@ -316,6 +314,17 @@ const getContent = async (options) => {
   return { entries, assets, contentTypes };
 };
 
+const getMigrationItems = async (options) => {
+  const { migrationContentTypeId } = options;
+  const environment = await getEnvironment(options);
+  const { items } = await pagedGet(environment, {
+    method: 'getEntries',
+    query: { content_type: migrationContentTypeId },
+  });
+
+  return items;
+};
+
 const getContentTypes = async (options) => {
   const { contentType } = options;
   const environment = await getEnvironment(options);
@@ -354,6 +363,7 @@ exports.getNodeName = getNodeName;
 exports.getEnvironmentId = getEnvironmentId;
 exports.getEditorInterfaces = getEditorInterfaces;
 exports.getApiKeys = getApiKeys;
+exports.getMigrationItems = getMigrationItems;
 
 // Constants
 exports.TYPE_SYMBOL = TYPE_SYMBOL;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jungvonmatt/contentful-migrations",
-  "version": "5.2.3",
+  "version": "5.2.4",
   "description": "Helper to handle migrations in contentful",
   "main": "index.js",
   "files": [