@jungvonmatt/contentful-migrations 6.2.4 → 6.2.6

package/lib/backend.js

@@ -112,14 +112,14 @@ const addMigrationEntry = async (data, config) => {
 
   let entry;
   try {
-    entry = await client.getEntry(version);
+    entry = await client.getEntry(`${version}`);
   } catch {}
 
   if (!entry) {
-    entry = await client.createEntryWithId(migrationContentTypeId, version, {
+    entry = await client.createEntryWithId(migrationContentTypeId, `${version}`, {
       fields: {
         version: {
-          [defaultLocale]: version,
+          [defaultLocale]: `${version}`,
         },
         name: {
           [defaultLocale]: name,
@@ -358,8 +358,11 @@ const getLatestVersion = async (config) => {
 
 const getVersionFromFile = (file) => {
   const name = path.basename(file);
-  const [, num] = /^(\d+)-/.exec(name);
-  return parseInt(num, 10);
+  const versionMatch = /^\d+/.exec(name);
+  if (!versionMatch) {
+    return undefined;
+  }
+  return Number.parseInt(versionMatch[0], 10);
 };
 
 /**
@@ -372,7 +375,7 @@ const getNewMigrations = async (config) => {
   const migrations = (await globby([`${directory}/*.js`, `${directory}/*.cjs`])).sort((a, b) => {
     const numA = getVersionFromFile(a);
     const numB = getVersionFromFile(b);
-    return numA - numB;
+    return (numA || 0) - (numB || 0);
   });
 
   if (storage === STORAGE_CONTENT) {
@@ -380,7 +383,7 @@ const getNewMigrations = async (config) => {
       const versions = await getMigrationVersions(config);
       const result = migrations.filter((file) => {
         const num = getVersionFromFile(file);
-        return !(versions || []).includes(num);
+        return !!num && !(versions || []).includes(num);
       });
 
       return result;
@@ -420,3 +423,4 @@ module.exports.getMigrationVersionFromTag = getMigrationVersionFromTag;
 module.exports.getLatestVersion = getLatestVersion;
 module.exports.storeMigration = storeMigration;
 module.exports.getNewMigrations = getNewMigrations;
+module.exports.getVersionFromFile = getVersionFromFile;

package/lib/migration.js

@@ -8,11 +8,11 @@ const {
   generateMigrationScript,
 } = require('contentful-cli/dist/lib/cmds/space_cmds/generate_cmds/migration');
 const pc = require('picocolors');
-const { getEnvironment } = require('./contentful');
+const { getEnvironment, getOrganizationId } = require('./contentful');
 
 const { confirm, STATE_SUCCESS, STATE_FAILURE } = require('./config');
 
-const { storeMigration, getNewMigrations } = require('./backend');
+const { storeMigration, getNewMigrations, getVersionFromFile } = require('./backend');
 
 const migrationHeader = stripIndent`/* eslint-env node */
   const { withHelpers } = require('@jungvonmatt/contentful-migrations');
@@ -143,7 +143,11 @@ const executeMigration = async (file, config) => {
   const environmentId = client.sys.id;
   const organizationId = await getOrganizationId(config);
   const name = path.basename(file);
-  const [, version] = /^(\d+)-/.exec(name);
+  const version = getVersionFromFile(file);
+  if (!version) {
+    console.error(`Invalid migration file name "${name}". Must start with a timestamp.`);
+    process.exit(1);
+  }
 
   const options = {
     filePath: path.resolve(file),

package/package.json

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