contensis-cli 1.0.12-beta.1 → 1.0.12-beta.3

package/src/shell.ts

@@ -143,6 +143,7 @@ class ContensisShell {
         'execute block action makelive',
         'execute block action rollback',
         'execute block action markasbroken',
+        'get assets',
         'get block',
         'get block logs',
         'get contenttype',
@@ -159,6 +160,7 @@ class ContensisShell {
         'import components',
         'import entries',
         'import models',
+        'import nodes',
         'list blocks',
         'list contenttypes',
         'list components',

package/src/util/console.printer.ts

@@ -1,5 +1,13 @@
+import { Node } from 'contensis-delivery-api/lib/models';
 import dayjs from 'dayjs';
-import { BlockVersion, MigrateModelsResult, MigrateStatus } from 'migratortron';
+import {
+  BlockVersion,
+  EntriesResult,
+  MigrateModelsResult,
+  MigrateStatus,
+  NodesResult,
+  ProjectNodesToMigrate,
+} from 'migratortron';
 import ContensisCli from '~/services/ContensisCliService';
 import { Logger } from './logger';
 
@@ -104,19 +112,19 @@ export const printBlockVersion = (
   console.log('');
 };
 
-export const printMigrateResult = (
+export const printEntriesMigrateResult = (
   { log, messages, currentProject }: ContensisCli,
-  migrateResult: any,
+  migrateResult: EntriesResult,
   {
     action = 'import',
     showDiff = false,
-    showAllEntries = false,
-    showChangedEntries = false,
+    showAll = false,
+    showChanged = false,
   }: {
     action?: 'import' | 'delete';
     showDiff?: boolean;
-    showAllEntries?: boolean;
-    showChangedEntries?: boolean;
+    showAll?: boolean;
+    showChanged?: boolean;
   } = {}
 ) => {
   console.log(``);
@@ -129,8 +137,8 @@ export const printMigrateResult = (
       any
     ][]) {
       if (
-        showAllEntries ||
-        (showChangedEntries &&
+        showAll ||
+        (showChanged &&
           (
             Object.entries(
               Object.entries(entryStatus[currentProject])[0]
@@ -173,7 +181,7 @@ export const printMigrateResult = (
       }
     }
   }
-  if (showAllEntries || showChangedEntries) console.log(``);
+  if (showAll || showChanged) console.log(``);
 
   for (const [projectId, contentTypeCounts] of Object.entries(
     migrateResult.entries || {}
@@ -250,10 +258,117 @@ export const printMigrateResult = (
       `  - ${log.errorText(`errors: ${migrateResult.errors.length}`)}\n`
     );
     for (const error of migrateResult.errors)
-      log.error(error.message || error, null, '');
+      log.error(error.message, null, '');
   }
 };
 
+export const printNodesMigrateResult = (
+  { log, messages, currentProject }: ContensisCli,
+  migrateResult: NodesResult,
+  {
+    action = 'import',
+    showDiff = false,
+    showAll = false,
+    showChanged = false,
+  }: {
+    action?: 'import' | 'delete';
+    showDiff?: boolean;
+    showAll?: boolean;
+    showChanged?: boolean;
+  } = {}
+) => {
+  console.log(``);
+
+  for (const [originalId, migrateNodeId] of Object.entries(
+    migrateResult.nodesToMigrate.nodeIds
+  )) {
+    if (showAll || (showChanged && migrateNodeId.status !== 'no change')) {
+      console.log(
+        log.infoText(
+          `${originalId} ${`${messages.migrate.status(migrateNodeId.status)(
+            `${migrateNodeId.status}`
+          )}${
+            migrateNodeId.id !== originalId ? `-> ${migrateNodeId.id}` : ''
+          }`}`
+        ) + ` ${log.helpText(migrateNodeId.path)} ${migrateNodeId.displayName}`
+      );
+
+      if (migrateNodeId.diff && showDiff)
+        console.log(
+          `    ${log.highlightText(`diff:`)} ${log.infoText(
+            highlightDiffText(migrateNodeId.diff)
+          )}\n`
+        );
+    }
+  }
+  if (showAll || showChanged) console.log(``);
+
+  for (const [projectId, counts] of Object.entries(migrateResult.nodes || {})) {
+    log.help(
+      `${action} from project ${
+        action === 'delete'
+          ? log.warningText(currentProject)
+          : `${log.highlightText(projectId)} to ${log.boldText(
+              log.warningText(currentProject)
+            )}`
+      }`
+    );
+
+    const migrateStatusAndCount = migrateResult.nodesToMigrate[
+      currentProject
+    ] as ProjectNodesToMigrate;
+
+    const existingCount =
+      migrateResult.existing?.[currentProject]?.totalCount || 0;
+    const existingPercent = ((existingCount / counts.totalCount) * 100).toFixed(
+      0
+    );
+    const noChangeOrTotalEntriesCount =
+      migrateStatusAndCount?.['no change'] || 0;
+    const changedPercentage = (
+      (noChangeOrTotalEntriesCount / counts.totalCount) *
+      100
+    ).toFixed(0);
+
+    const existingColor =
+      existingPercent === '0' || action === 'delete'
+        ? log.warningText
+        : log.infoText;
+
+    const changedColor =
+      changedPercentage === '100' ? log.successText : log.warningText;
+
+    console.log(
+      `  - ${log.highlightText(`totalCount: ${counts.totalCount}`)}${
+        changedPercentage === '100'
+          ? ''
+          : existingColor(` [existing: ${`${existingPercent}%`}]`)
+      }${
+        existingPercent === '0'
+          ? ''
+          : changedColor(
+              ` ${
+                changedPercentage === '100'
+                  ? 'up to date'
+                  : `[needs update: ${100 - Number(changedPercentage)}%]`
+              }`
+            )
+      }`
+    );
+  }
+  if (migrateResult.errors?.length) {
+    console.log(
+      `  - ${log.errorText(`errors: ${migrateResult.errors.length}`)}\n`
+    );
+    for (const error of migrateResult.errors) {
+      let inner = '';
+      if (error.data?.[0]) {
+        inner = `${error.data?.[0].Field}: ${error.data?.[0].Message}`;
+      }
+      log.error(`${error.message} ${inner}`, null, '');
+    }
+  }
+};
 const highlightDiffText = (str: string) => {
   const addedRegex = new RegExp(/<<\+>>(.*?)<<\/\+>>/, 'g');
   const removedRegex = new RegExp(/<<->>(.*?)<<\/->>/, 'g');
@@ -363,3 +478,43 @@ export const printModelMigrationResult = (
     }
   }
 };
+
+export const printNodeTreeOutput = (
+  { log }: ContensisCli,
+  root: Node | undefined
+) => {
+  log.object({ ...root, children: undefined });
+  log.raw('');
+  log.info(
+    `${log.highlightText('e')} = has entry; ${log.highlightText(
+      'c'
+    )} = canonical; ${log.highlightText('m')} = include in menu`
+  );
+  log.line();
+
+  const outputNode = (node: Node | any, spaces: string) =>
+    `${node.entry ? log.highlightText('e') : log.infoText('-')}${
+      node.isCanonical ? log.highlightText('c') : log.infoText('-')
+    }${
+      node.includeInMenu ? log.highlightText('m') : log.infoText('-')
+    }${spaces}${
+      node.isCanonical ? log.boldText(`/${node.slug}`) : `/${node.slug}`
+    }${node.entry ? ` ${log.helpText(node.entry.sys.contentTypeId)}` : ''}${
+      node.childCount ? ` +${node.childCount}` : ``
+    } ${log.infoText(node.displayName)}`;
+
+  const outputChildren = (root: Node | undefined, depth = 2) => {
+    let str = '';
+    for (const node of (root as any)?.children as Node[]) {
+      str += `${outputNode(node, Array(depth + 1).join('  '))}\n`;
+      if ('children' in node) str += outputChildren(node, depth + 1);
+    }
+    return str;
+  };
+
+  const children = outputChildren(root);
+  log.limits(
+    `${outputNode(root, '  ')}${children ? `\n${children}` : ''}`,
+    100
+  );
+};

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.0.12-beta.1";
+export const LIB_VERSION = "1.0.12-beta.3";