@jungvonmatt/contentful-migrations 5.1.0 → 5.1.1

package/lib/backend.js

@@ -352,26 +352,45 @@ const getLatestVersion = async (config) => {
   return getMigrationVersionFromTag(config);
 };
 
+const getVersionFromFile = file => {
+  const name = path.basename(file);
+  const [, num] = /^(\d+)-/.exec(name);
+  return parseInt(num,10);
+}
+
 /**
  * Get all unexecuted migration files
  * @param {Object} config The config object including all required data
  */
 const getNewMigrations = async (config) => {
-  const { directory, storage } = config || {};
+  const { directory, storage, migrationContentTypeId } = config || {};
   const {globby} = await import('globby');
-  const migrations = await globby([`${directory}/*.js`,`${directory}/*.cjs`]);
+  const migrations = (await globby([`${directory}/*.js`,`${directory}/*.cjs`])).sort((a,b) => {
+    const numA = getVersionFromFile(a);
+    const numB = getVersionFromFile(b);
+    return numA-numB;
+  });
 
   if (storage === STORAGE_CONTENT) {
     try {
       const versions = await getMigrationVersions(config);
 
-      return migrations.filter((file) => {
-        const name = path.basename(file);
-        const [, num] = /^(\d+)-/.exec(name);
-
-        return !(versions || []).includes(parseInt(num, 10));
+      const result = migrations.filter((file) => {
+        const num = getVersionFromFile(file);
+        return !(versions || []).includes(num);
       });
+
+      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));
+
+      if (initial) {
+        return migrations;
+      }
       console.error(chalk.red('\nError:'), `Missing migration content type. Run ${chalk.cyan('npx migrations init')}`);
       process.exit(1);
     }

package/package.json

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