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

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/csv.formatter.ts

@@ -89,7 +89,7 @@ const determineMost = (chunk: string, items: string[]) => {
   items.forEach(item => {
     itemCount[item] = 0;
   });
-  for (var i = 0; i < chunk.length; i++) {
+  for (let i = 0; i < chunk.length; i++) {
     if (chunk[i] === '"') ignoreString = !ignoreString;
     else if (!ignoreString && chunk[i] in itemCount) {
       currValue = ++itemCount[chunk[i]];

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/index.ts

@@ -58,7 +58,7 @@ export const Logging = async (language = 'en-GB') => {
   // const { LogMessages: defaultMessages } = await import(
   //   `../localisation/en-GB.js`
   // );
-  let localisedMessages = defaultMessages;
+  const localisedMessages = defaultMessages;
 
   if (language === 'en-GB') {
     // Using a variable import e.g. `import(`../localisation/${language}.js`);`

package/src/util/logger.ts

@@ -1,4 +1,3 @@
-/* eslint-disable no-console */
 import chalk from 'chalk';
 import dateFormat from 'dateformat';
 import deepCleaner from 'deep-cleaner';
@@ -56,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);
     // }
@@ -120,9 +119,9 @@ export class Logger {
                 field.id === content.entryTitleField
                   ? '**'
                   : field.validations.minCount?.value ||
-                    typeof field.validations.required?.message !== 'undefined'
-                  ? '*'
-                  : ''
+                      typeof field.validations.required?.message !== 'undefined'
+                    ? '*'
+                    : ''
               }: ${chalk.grey(
                 `${field.dataType}${
                   field.dataFormat
@@ -203,16 +202,17 @@ export class Logger {
             if (item.length)
               Logger.raw(chalk.grey(`${indent}  [${item.join(', ')}]`));
             else Logger.objectRecurse(item, depth + 1, `${indent}  `);
-          else
-            Array.isArray(item)
-              ? Logger.raw(
-                  `${indent}${chalk.grey(`[`)}${item.join(', ')}${chalk.grey(
-                    `]`
-                  )}`
-                )
-              : typeof item === 'object' && item
-              ? Logger.objectRecurse(item, depth + 1, `${indent}  `)
-              : Logger.raw(`${indent}${item}`);
+          else {
+            if (Array.isArray(item))
+              Logger.raw(
+                `${indent}${chalk.grey(`[`)}${item.join(', ')}${chalk.grey(
+                  `]`
+                )}`
+              );
+            else if (typeof item === 'object' && item)
+              Logger.objectRecurse(item, depth + 1, `${indent}  `);
+            else Logger.raw(`${indent}${item}`);
+          }
         } else Logger.raw(`${indent}${item}`);
       }
     } else {
@@ -253,6 +253,7 @@ export class Logger {
     content: string,
     displayLength = 30,
     consoleWidth = process.stdout.columns,
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
     logMethod: Function = console.info
   ) => {
     if (consoleWidth) {

package/src/version.ts

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

package/tsconfig.json

@@ -1,6 +1,6 @@
 {
   "compilerOptions": {
-    "allowJs": true,
+    "allowJs": false,
     "module": "CommonJS",
     "esModuleInterop": true,
     "target": "esnext",