contensis-cli 1.3.1-beta.1 → 1.3.1-beta.10

package/src/shell.ts

@@ -14,6 +14,7 @@ import { LIB_VERSION } from './version';
 class ContensisShell {
   private currentEnvironment!: string;
   private emptyInputCounter: number = 0;
+  private cache!: SessionCache;
   private env!: EnvironmentCache;
   private firstStart = true;
   private userId: string = '';
@@ -22,12 +23,12 @@ class ContensisShell {
 
   private refreshEnvironment = () => {
     // Reload any persisted changes from the disk cache
-    const {
-      cache: { currentEnvironment = '', environments = {} },
-    } = new ContensisCli([]);
+    const { cache } = new ContensisCli([]);
+    this.cache = cache; // read the cache to pre-load suggestions
     // console.log(`refreshing env w/${currentEnvironment}`);
-    this.currentEnvironment = currentEnvironment;
-    this.env = environments[currentEnvironment];
+    this.currentEnvironment = cache.currentEnvironment || '';
+    const environments = cache.environments || {};
+    this.env = environments[this.currentEnvironment];
 
     // Reload logging here to support changing language
     Logging('en-GB').then(({ messages, Log }) => {
@@ -128,12 +129,21 @@ class ContensisShell {
         },
       },
       'connect',
+      ...Object.keys(this.cache.environments || {}).map(
+        alias => `connect ${alias}`
+      ),
       'list envs',
+      'remove env',
       'quit',
     ];
 
     if (currentEnvironment)
-      availableCommands.push('login', 'list projects', 'set project');
+      availableCommands.push(
+        'login',
+        'list projects',
+        'set project',
+        ...(this.env?.projects || []).map(project => `set project ${project}`)
+      );
     if (userId)
       availableCommands.push(
         'copy field',
@@ -176,6 +186,7 @@ class ContensisShell {
         'list roles',
         'list webhooks',
         'list workflows',
+        'push asset',
         'push block',
         'remove components',
         'remove contenttypes',
@@ -189,7 +200,8 @@ class ContensisShell {
         'set role description',
         'set role assignments',
         'set role enabled',
-        'set role permissions'
+        'set role permissions',
+        'update field'
       );
 
     const prompt = inquirer.createPromptModule();
@@ -243,9 +255,8 @@ class ContensisShell {
                     : JSON.stringify(ex, null, 2)
                 }`
               );
-          } finally {
-            return this.contensisPrompt();
           }
+          return this.contensisPrompt();
         }
       })
       .catch((err: Error) => {

package/src/util/console.printer.ts

@@ -125,7 +125,7 @@ export const printEntriesMigrateResult = (
     showAll = false,
     showChanged = false,
   }: {
-    action?: 'import' | 'delete';
+    action?: 'import' | 'update' | 'delete';
     showDiff?: boolean;
     showAll?: boolean;
     showChanged?: boolean;
@@ -138,7 +138,7 @@ export const printEntriesMigrateResult = (
   ) as [string, any]) {
     for (const [originalId, entryStatus] of Object.entries(entryRes) as [
       string,
-      any
+      any,
     ][]) {
       if (
         showAll ||
@@ -191,17 +191,21 @@ export const printEntriesMigrateResult = (
     migrateResult.entries || {}
   ) as [string, any][]) {
     log.help(
-      `${action} from project ${
-        action === 'delete'
-          ? log.warningText(currentProject)
-          : `${log.highlightText(projectId)} to ${log.boldText(
-              log.warningText(currentProject)
-            )}`
-      }`
+      action === 'update'
+        ? `update entries in project ${log.boldText(
+            log.warningText(currentProject)
+          )}`
+        : `${action}${
+            action === 'delete'
+              ? ` from project ${log.warningText(currentProject)}`
+              : `${projectId ? ` from project ${log.highlightText(projectId)}` : ''} to ${log.boldText(
+                  log.warningText(currentProject)
+                )}`
+          }`
     );
     for (const [contentTypeId, count] of Object.entries(contentTypeCounts) as [
       string,
-      number
+      number,
     ][]) {
       const isTotalCountRow = contentTypeId === 'totalCount';
       const migrateStatusAndCount =
@@ -227,8 +231,8 @@ export const printEntriesMigrateResult = (
       const changedColor = isTotalCountRow
         ? log.helpText
         : changedPercentage === '100'
-        ? log.successText
-        : log.warningText;
+          ? log.successText
+          : log.warningText;
 
       if (isTotalCountRow && 'nodes' in migrateResult) {
         printNodesMigrateResult(service, migrateResult, {
@@ -257,8 +261,8 @@ export const printEntriesMigrateResult = (
                   isTotalCountRow
                     ? `[to ${action}: ${noChangeOrTotalEntriesCount}]`
                     : changedPercentage === '100'
-                    ? 'up to date'
-                    : `[needs update: ${100 - Number(changedPercentage)}%]`
+                      ? 'up to date'
+                      : `[needs update: ${100 - Number(changedPercentage)}%]`
                 }`
               )
         }`
@@ -391,7 +395,7 @@ export const printModelMigrationAnalysis = (
 ) => {
   for (const [contentTypeId, model] of Object.entries(result) as [
     string,
-    any
+    any,
   ][]) {
     let mainOutput = log.standardText(
       `  - ${contentTypeId}${
@@ -415,7 +419,7 @@ export const printModelMigrationAnalysis = (
       if (key === 'projects') {
         for (const [projectId, projectDetails] of Object.entries(details) as [
           string,
-          any
+          any,
         ][]) {
           mainOutput += log.infoText(
             ` [${messages.migrate.status(projectDetails.status)(
@@ -460,7 +464,7 @@ export const printModelMigrationResult = (
 ) => {
   for (const [status, ids] of Object.entries(result) as [
     MigrateResultStatus,
-    string[]
+    string[],
   ][]) {
     if (ids?.length) {
       if (status === 'errors') {
@@ -555,8 +559,8 @@ export const printNodeTreeOutput = (
             fullOutput || isRoot || !node.slug ? node.path : `/${node.slug}`
           )
         : fullOutput || isRoot || !node.slug
-        ? node.path
-        : `/${node.slug}`
+          ? node.path
+          : `/${node.slug}`
     )}${node.entry ? ` ${log.helpText(node.entry.sys.contentTypeId)}` : ''}${
       node.childCount ? ` +${node.childCount}` : ``
     } ${'displayName' in node ? log.infoText(node.displayName) : ''}${

package/src/util/html.formatter.ts

@@ -0,0 +1,52 @@
+import { flattenObject } from './json.formatter';
+
+export const htmlFormatter = <T>(entries: T | T[], isDoc = true) => {
+  // Flatten the passed in object
+  const flatEntries = [] as any[];
+  if (Array.isArray(entries))
+    for (const entry of entries) {
+      flatEntries.push(flattenObject(entry));
+    }
+  else flatEntries.push(flattenObject(entries));
+
+  // Parse the flattened object to csv
+  // const csv = stringify(flatEntries, { header: true });
+  // Create an exhaustive list of columns from the entries array
+  const columns = new Set<string>(flatEntries.map(e => Object.keys(e)).flat());
+
+  let table = `<table id="contensis-cli-table"><thead><tr>`;
+  for (const column of columns) {
+    table += `<td>${column}</td>`;
+  }
+  table += `</tr></thead><tbody>`;
+  for (const row of flatEntries) {
+    table += `<tr>`;
+    for (const column of columns) {
+      const val = row[column];
+      table += `<td>${typeof val === 'undefined' ? '' : val}</td>`;
+    }
+    table += `</tr>`;
+  }
+  table += `</tbody></table>`;
+
+  if (isDoc)
+    table = `<html><head>${headTag()}</head><body>${table}${scriptTag()}</body></html>`;
+  return table;
+};
+
+const headTag = () => {
+  return `<link rel="stylesheet" href="https://cdn.datatables.net/2.1.8/css/dataTables.dataTables.css" />
+<script
+  src="https://code.jquery.com/jquery-3.7.1.slim.min.js"
+  integrity="sha256-kmHvs0B+OpCW5GVHUNjv9rOmY0IvSIRcf7zGUDTDQM8="
+  crossorigin="anonymous"></script>
+<script src="https://cdn.datatables.net/2.1.8/js/dataTables.js"></script>`;
+};
+
+const scriptTag = () => {
+  return `<script>
+let table = new DataTable('#contensis-cli-table', {
+  pageLength: 50
+});
+</script>`;
+};

package/src/util/logger.ts

@@ -55,10 +55,10 @@ export class Logger {
     if (progress.active) progress.current.interrupt(message);
     else console.log(message);
   };
-  static warning: LogMethod = content => {
+  static warning: LogMethod = (content, newline = '\n') => {
     const message = `${Logger.getPrefix()} ${Logger.warningText(
       `${Logger.isUserTerminal ? '⚠️ ' : '[WARN]'} ${content}`
-    )}\n`;
+    )}${newline}`;
     if (progress.active) progress.current.interrupt(message);
     else console.log(message);
     // }

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.3.1-beta.1";
+export const LIB_VERSION = "1.3.1-beta.10";