contensis-cli 1.5.1-beta.9 → 1.6.0

package/dist/version.js

@@ -21,7 +21,7 @@ __export(version_exports, {
   LIB_VERSION: () => LIB_VERSION
 });
 module.exports = __toCommonJS(version_exports);
-const LIB_VERSION = "1.5.1-beta.9";
+const LIB_VERSION = "1.5.1-beta.21";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LIB_VERSION

package/dist/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/version.ts"],
-  "sourcesContent": ["export const LIB_VERSION = \"1.5.1-beta.9\";\n"],
+  "sourcesContent": ["export const LIB_VERSION = \"1.5.1-beta.21\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contensis-cli",
-  "version": "1.5.1-beta.9",
+  "version": "1.6.0",
   "description": "A fully featured Contensis command line interface with a shell UI provides simple and intuitive ways to manage or profile your content in any NodeJS terminal.",
   "repository": "https://github.com/contensis/cli",
   "homepage": "https://github.com/contensis/cli/tree/main/packages/contensis-cli#readme",
@@ -39,7 +39,7 @@
     "inquirer-command-prompt": "^0.1.0",
     "keytar": "^7.9.0",
     "lodash": "^4.17.21",
-    "migratortron": "^1.0.0-beta.79",
+    "migratortron": "^1.0.0-beta.84",
     "nanospinner": "^1.2.0",
     "node-fetch": "^2.6.7",
     "parse-git-config": "^3.0.0",

package/src/localisation/en-GB.ts

@@ -124,8 +124,11 @@ export const LogMessages = {
       entities: { [noun: string]: number }
     ) =>
       `${commit ? `Imported` : `Will import`} ${Object.entries(entities)
-        .map(([noun, count]) => pl(noun, count, true))
-        .join(' and ')} into ${env} environment`,
+        .map(
+          ([noun, count], i, arr) =>
+            `${i > 0 ? (i === arr.length - 1 ? ' and ' : ', ') : ''}${pl(noun, count, true)}`
+        )
+        .join('')} into ${env} environment`,
 
     models: {
       result: (
@@ -242,7 +245,7 @@ export const LogMessages = {
     failedImport: (env: string) => `[${env}] Unable to import entries`,
     update: {
       preview: () => LogMessages.migrate.preview('UPDATE FIELD'),
-      commit: () => LogMessages.migrate.preview('FIELD UPDATES'),
+      commit: () => LogMessages.migrate.commit('FIELD UPDATES'),
       success: (env: string, commit: boolean, entries: number, nodes = 0) =>
         `${commit ? `Updated` : `Will update`} ${pl('entry', entries, true)}${
           nodes > 0 ? ` and ${pl('node', nodes, true)}` : ''

package/src/services/ContensisCliService.ts

@@ -1440,8 +1440,8 @@ class ContensisCli {
       } else {
         const noChanges =
           result?.tagsToMigrate?.[currentProject]?.['no change'] &&
-          result.tagsToMigrate[currentProject].totalCount === 0 &&
-          result.groupsToMigrate[currentProject].totalCount === 0;
+          result?.tagsToMigrate?.[currentProject].totalCount === 0 &&
+          result?.groupsToMigrate?.[currentProject].totalCount === 0;
 
         if (noChanges && !err && !result.errors?.length) {
           log.help(messages.tags.noChange(currentEnv));
@@ -2425,10 +2425,10 @@ class ContensisCli {
         }
       } else {
         const noChanges =
-          Object.values(result?.entriesToMigrate?.[currentProject]).every(
+          Object.values(result?.entriesToMigrate?.[currentProject] || {}).every(
             status =>
               typeof status === 'number' || (status['no change'] || 0) > 0
-          ) && result.entriesToMigrate[currentProject].totalCount === 0;
+          ) && result?.entriesToMigrate?.[currentProject].totalCount === 0;
 
         if (
           noChanges &&

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.5.1-beta.9";
+export const LIB_VERSION = "1.5.1-beta.21";