contensis-cli 1.0.12-beta.2 → 1.0.12-beta.21

package/src/providers/file-provider.ts

@@ -11,7 +11,8 @@ export const appRootDir =
     : path.join(userHomeDir, '.contensis/');
 
 export const readJsonFile = <T>(filePath: string) => {
-  const file = readFile(filePath);
+  const directoryPath = cwdPath(filePath);
+  const file = readFile(directoryPath);
   if (file) return tryParse(file) as T | string;
   return undefined;
 };
@@ -81,3 +82,6 @@ export const checkDir = (filePath: string) => {
 
 export const localPath = (filePath: string) =>
   path.isAbsolute(filePath) ? filePath : path.join(appRootDir, filePath);
+
+export const cwdPath = (filePath: string) =>
+  path.isAbsolute(filePath) ? filePath : path.join(process.cwd(), filePath);

package/src/services/ContensisAuthService.ts

@@ -59,7 +59,7 @@ class ContensisAuthService {
     });
   }
 
-  ClassicToken = async () => {
+  ClassicToken = async (): Promise<string | null | undefined> => {
     // make sure our token isn't expried.
     await this.client.ensureBearerToken();
     return (this.client as any).contensisClassicToken;

package/src/services/ContensisCliService.ts

@@ -46,7 +46,7 @@ import {
 } from '~/util/console.printer';
 import { csvFormatter } from '~/util/csv.formatter';
 import { xmlFormatter } from '~/util/xml.formatter';
-import { jsonFormatter } from '~/util/json.formatter';
+import { jsonFormatter, limitFields } from '~/util/json.formatter';
 import { diffLogStrings } from '~/util/diff';
 import { logError, Logger } from '~/util/logger';
 import { promiseDelay } from '~/util/timers';
@@ -63,23 +63,16 @@ class ContensisCli {
     process.exit(exitCode);
   };
 
-  private command: CliCommand;
   private format?: OutputFormat;
   private output?: string;
   private session: SessionCacheProvider;
 
+  auth?: ContensisAuthService;
+  command: CliCommand;
   contensis?: ContensisMigrationService;
   contensisOpts: Partial<MigrateRequest>;
   currentProject: string;
 
-  devinit!: {
-    invokedBy: string;
-    credentials: {
-      clientId: string;
-      clientSecret: string;
-    };
-  };
-
   sourceAlias?: string;
   targetEnv?: string;
   urls:
@@ -99,10 +92,6 @@ class ContensisCli {
   noun: string;
   thirdArg: string;
 
-  get invokedBy() {
-    return this.command.createdUserId;
-  }
-
   get cache() {
     return this.session.Get();
   }
@@ -132,11 +121,6 @@ class ContensisCli {
     }
   }
 
-  constructor(
-    args: string[],
-    outputOpts?: OutputOptionsConstructorArg,
-    contensisOpts?: Partial<MigrateRequest>
-  );
   constructor(
     args: string[],
     outputOpts?: OutputOptionsConstructorArg,
@@ -164,15 +148,19 @@ class ContensisCli {
     const environments = this.cache.environments || {};
     this.currentEnv = currentEnvironment;
 
+    // Set env from command options
     const env = this.env;
-
     if (outputOpts?.projectId) env.currentProject = outputOpts.projectId;
     if (outputOpts?.user) env.lastUserId = outputOpts.user;
     // setting this in env means passwordFallback is written to environments.json
     if (outputOpts?.password) env.passwordFallback = outputOpts.password;
     if (outputOpts?.clientId) env.lastUserId = outputOpts.clientId;
     if (outputOpts?.sharedSecret)
-      env.passwordFallback = outputOpts.sharedSecret;
+      if (outputOpts.sharedSecret.startsWith('-'))
+        throw new Error(
+          `Shared secret option provided a value of ${outputOpts.sharedSecret}`
+        );
+      else env.passwordFallback = outputOpts.sharedSecret;
 
     this.currentProject = env?.currentProject || 'null';
     this.sourceAlias = outputOpts?.sourceAlias || currentEnvironment;
@@ -183,8 +171,9 @@ class ContensisCli {
 
     this.command = {
       commandText,
+      options: outputOpts as any,
       createdDate: new Date().toISOString(),
-      createdUserId: env?.lastUserId,
+      invokedBy: env?.lastUserId,
     };
 
     if (currentEnvironment) {
@@ -424,7 +413,10 @@ class ContensisCli {
 
       if (credentialError && !credentials.current) {
         // Log problem with Credential Provider
-        log.error(credentialError as any);
+        log.error(
+          `Unable to find credentials for user ${userId} at ${currentEnv}`,
+          credentialError as any
+        );
         return;
       }
 
@@ -492,7 +484,7 @@ class ContensisCli {
           }
 
           if (inputPassword || cachedPassword || cachedSecret) {
-            const authService = new ContensisAuthService({
+            this.auth = new ContensisAuthService({
               username: userId,
               password: inputPassword || cachedPassword,
               projectId: env?.currentProject || 'website',
@@ -501,9 +493,7 @@ class ContensisCli {
               clientSecret: sharedSecret || cachedSecret,
             });
 
-            const [authError, bearerToken] = await to(
-              authService.BearerToken()
-            );
+            const [authError, bearerToken] = await to(this.auth.BearerToken());
 
             // Login successful
             if (bearerToken) {
@@ -784,7 +774,7 @@ class ContensisCli {
     }
   };
 
-  CreateApiKey = async (name: string, description?: string) => {
+  CreateApiKey = async (name: string, description = '') => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
 
@@ -1038,6 +1028,98 @@ class ContensisCli {
     }
   };
 
+  PrintWorkflows = async () => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+
+    if (contensis) {
+      // Retrieve workflows list for env
+      const [workflowsErr, workflows] =
+        await contensis.content.sourceRepo.workflows.GetWorkflows();
+
+      if (Array.isArray(workflows)) {
+        log.success(messages.workflows.list(currentEnv));
+
+        if (!workflows.length) log.help(messages.workflows.noneExist());
+
+        const stringFromLanguageObject = (o: { [lang: string]: string }) =>
+          Object.values(o || {})?.[0];
+
+        this.HandleFormattingAndOutput(workflows, () => {
+          // print the workflows to console
+          // log.object(workflows);
+          for (const {
+            id,
+            name,
+            description,
+            states,
+            eventGroups,
+            isSystem,
+          } of workflows as any) {
+            const color = isSystem ? (s: string) => s : log.infoText;
+
+            console.log(
+              color(
+                `  - ${chalk.bold(
+                  stringFromLanguageObject(name)
+                )} ${log.infoText(id)}`
+              )
+            );
+            if (description)
+              console.log(
+                log.infoText(`    ${stringFromLanguageObject(description)}`)
+              );
+            if (isSystem === false)
+              console.log(`      ${chalk.bold.grey('isSystem')}: false`);
+            if (states?.length)
+              console.log(
+                `      ${chalk.bold.grey('states')}: ${states
+                  .map((state: any) => state.id)
+                  .join(', ')}`
+              );
+            if (eventGroups?.length)
+              console.log(
+                `      ${chalk.bold.grey('eventGroups')}: ${eventGroups
+                  .map((evtGrp: any) => evtGrp.id)
+                  .join(', ')}`
+              );
+          }
+        });
+      }
+
+      if (workflowsErr) {
+        log.error(messages.workflows.noList(currentEnv));
+        log.error(jsonFormatter(workflowsErr));
+      }
+    }
+  };
+
+  PrintWorkflow = async (workflowNameOrId: string) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+
+    if (contensis) {
+      // Retrieve workflows list for env
+      const [workflowsErr, workflows] =
+        await contensis.content.sourceRepo.workflows.GetWorkflows();
+
+      if (Array.isArray(workflows)) {
+        log.success(messages.workflows.list(currentEnv));
+
+        const workflow = findByIdOrName(workflows, workflowNameOrId);
+
+        if (workflow) this.HandleFormattingAndOutput(workflow, log.object);
+        else
+          log.error(messages.workflows.failedGet(currentEnv, workflowNameOrId));
+      }
+
+      if (workflowsErr) {
+        log.error(messages.workflows.noList(currentEnv));
+        log.error(jsonFormatter(workflowsErr));
+      }
+    }
+  };
+
   CreateProject = async (project: Project) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
@@ -1305,7 +1387,7 @@ class ContensisCli {
     const { currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: 'user-input',
+      importDataType: 'user-input', // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       const [err, result] = await contensis.DeleteContentTypes(contentTypeIds);
@@ -1482,7 +1564,7 @@ class ContensisCli {
     const { currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: 'user-input',
+      importDataType: 'user-input', // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       const [err, result] = await contensis.DeleteContentTypes(
@@ -1568,7 +1650,7 @@ class ContensisCli {
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: 'user-input',
+      importDataType: 'user-input', // 'user-input' import type does not require a source cms
     });
 
     if (contensis) {
@@ -1598,7 +1680,7 @@ class ContensisCli {
         }
       } else {
         log.error(messages.entries.failedRemove(currentEnv), err);
-        if (!result.entriesToMigrate[currentProject].totalCount)
+        if (!result?.entriesToMigrate?.[currentProject]?.totalCount)
           log.help(messages.entries.notFound(currentEnv));
       }
     }
@@ -1689,7 +1771,7 @@ class ContensisCli {
         }
       } else {
         log.error(messages.entries.failedImport(currentEnv), err);
-        if (!result.entriesToMigrate[currentProject].totalCount)
+        if (!result?.entriesToMigrate?.[currentProject]?.totalCount)
           log.help(messages.entries.notFound(currentEnv));
       }
     } else {
@@ -1704,19 +1786,18 @@ class ContensisCli {
 
     if (contensis) {
       log.line();
-      const [err] = await to(
-        contensis.content.sourceRepo.nodes.GetNodes(rootPath, depth)
-      );
+      const [err, nodes] = await to(contensis.nodes.GetNodes(rootPath, depth));
       if (err) {
         log.error(messages.nodes.failedGet(currentProject), err);
         return;
       }
-      const root = contensis.content.sourceRepo.nodes.tree;
+      const root = contensis.nodes.sourceRepo.nodes.tree;
 
       log.success(messages.nodes.get(currentProject, rootPath, depth));
 
-      this.HandleFormattingAndOutput(root, () => {
+      this.HandleFormattingAndOutput(nodes, () => {
         // print the nodes to console
+        log.object({ ...root, children: undefined, language: undefined });
         printNodeTreeOutput(this, root);
       });
     } else {
@@ -1729,10 +1810,12 @@ class ContensisCli {
     commit,
     fromFile,
     logOutput,
+    logLimit,
   }: {
     commit: boolean;
     fromFile: string;
     logOutput: string;
+    logLimit: number;
   }) => {
     const { currentEnv, currentProject, log, messages } = this;
 
@@ -1751,28 +1834,34 @@ class ContensisCli {
       }
 
       const [err, result] = await contensis.MigrateNodes();
+      const migrateTree =
+        contensis.nodes.targetRepos[currentProject].nodes.migrateNodesTreeView;
 
-      if (err) logError(err);
+      if (err) log.raw(``);
       else
         this.HandleFormattingAndOutput(result, () => {
           // print the migrateResult to console
-          // TODO: fix
+          printNodeTreeOutput(this, migrateTree, logOutput, logLimit);
           printNodesMigrateResult(this, result, {
             showAll: logOutput === 'all',
             showChanged: logOutput === 'changes',
           });
         });
 
-      const nodesTotalCount = result?.nodesToMigrate[currentProject].totalCount;
+      const nodesMigrateCount =
+        result?.nodesToMigrate?.[currentProject].totalCount;
       const nodesCreated = result?.nodesResult?.['created'] || 0;
       const nodesUpdated = result?.nodesResult?.['updated'] || 0;
-      const noChange = result.nodesToMigrate[currentProject]['no change'] !== 0;
+      const nodesErrored = result?.nodesResult?.['errors'] || 0;
+      const noChanges =
+        result?.nodesToMigrate?.[currentProject]['no change'] &&
+        nodesMigrateCount === 0;
 
       if (
         !err &&
-        !result.errors?.length &&
-        ((!commit && nodesTotalCount) ||
-          (commit && (nodesCreated || nodesUpdated)))
+        (!result.errors?.length || this.contensisOpts.ignoreErrors) &&
+        ((!commit && nodesMigrateCount) ||
+          (commit && (nodesCreated || nodesUpdated || result.errors?.length)))
       ) {
         let totalCount: number;
         if (commit) {
@@ -1782,20 +1871,20 @@ class ContensisCli {
           totalCount = created + updated;
         } else {
           totalCount =
-            typeof nodesTotalCount === 'number' ? nodesTotalCount : 0;
+            typeof nodesMigrateCount === 'number' ? nodesMigrateCount : 0;
         }
 
         log.success(messages.nodes.imported(currentEnv, commit, totalCount));
+        log.raw(``);
         if (!commit) {
-          log.raw(``);
           log.help(messages.nodes.commitTip());
         }
       } else {
-        if (noChange) {
+        if (noChanges && !err && !nodesErrored) {
           log.help(messages.nodes.noChange(currentEnv));
         } else {
           log.error(messages.nodes.failedImport(currentEnv), err);
-          if (!nodesTotalCount) log.help(messages.nodes.notFound(currentEnv));
+          if (!nodesMigrateCount) log.help(messages.nodes.notFound(currentEnv));
         }
       }
     } else {
@@ -1804,6 +1893,54 @@ class ContensisCli {
     }
   };
 
+  RemoveNodes = async (commit = false) => {
+    const { currentEnv, currentProject, log, messages } = this;
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      importDataType: 'user-input', // 'user-input' import type does not require a source cms
+    });
+
+    if (contensis) {
+      if (contensis.isPreview) {
+        console.log(log.successText(` -- PREVIEW -- `));
+      } else {
+        console.log(log.warningText(` *** COMMITTING DELETE *** `));
+      }
+      const [err, result] = await contensis.DeleteNodes();
+      if (result) {
+        this.HandleFormattingAndOutput(result, () => {
+          // print the migrateResult to console
+          printNodeTreeOutput(
+            this,
+            contensis.nodes.targetRepos[currentProject].nodes
+              .migrateNodesTreeView
+          );
+          // printNodesMigrateResult(this, result, {
+          //   action: 'delete',
+          //   showAll: true,
+          // });
+        });
+      }
+      if (
+        !err &&
+        ((!commit && result.nodesToMigrate[currentProject].totalCount) ||
+          (commit && result.nodesResult?.deleted))
+      ) {
+        log.success(
+          messages.nodes.removed(currentEnv, commit, contensis.nodes.rootPath)
+        );
+        log.raw(``);
+        if (!commit) {
+          log.help(messages.nodes.commitTip());
+        }
+      } else {
+        log.error(messages.nodes.failedRemove(currentEnv), err);
+        if (!result?.nodesToMigrate?.[currentProject]?.totalCount)
+          log.help(messages.nodes.notFound(currentEnv));
+      }
+    }
+  };
+
   PrintWebhookSubscriptions = async (subscriptionIdsOrNames?: string[]) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
@@ -2354,18 +2491,20 @@ class ContensisCli {
   };
   HandleFormattingAndOutput = <T>(obj: T, logFn: (obj: T) => void) => {
     const { format, log, messages, output } = this;
+    const fields = this.contensis?.payload.query?.fields;
+
     if (!format) {
       // print the object to console
       logFn(obj);
     } else if (format === 'csv') {
       log.raw('');
-      log.raw(log.infoText(csvFormatter(obj)));
+      log.raw(log.infoText(csvFormatter(limitFields(obj, fields))));
     } else if (format === 'xml') {
       log.raw('');
-      log.raw(log.infoText(xmlFormatter(obj)));
+      log.raw(log.infoText(xmlFormatter(limitFields(obj, fields))));
     } else if (format === 'json') {
       log.raw('');
-      log.raw(log.infoText(jsonFormatter(obj)));
+      log.raw(log.infoText(jsonFormatter(obj, fields)));
     }
     log.raw('');
 
@@ -2373,10 +2512,11 @@ class ContensisCli {
       let writeString = '';
       const isText = !tryParse(obj) && typeof obj === 'string';
       if (format === 'csv') {
-        writeString = csvFormatter(obj as any);
+        writeString = csvFormatter(limitFields(obj, fields));
       } else if (format === 'xml') {
-        writeString = xmlFormatter(obj as any);
-      } else writeString = isText ? (obj as string) : jsonFormatter(obj);
+        writeString = xmlFormatter(limitFields(obj, fields));
+      } else
+        writeString = isText ? (obj as string) : jsonFormatter(obj, fields);
       // write output to file
       if (writeString) {
         fs.writeFileSync(output, writeString);