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

package/src/services/ContensisCliService.ts

@@ -50,6 +50,7 @@ import {
   printNodesMigrateResult,
 } from '~/util/console.printer';
 import { csvFormatter } from '~/util/csv.formatter';
+import { htmlFormatter } from '~/util/html.formatter';
 import { jsonFormatter, limitFields } from '~/util/json.formatter';
 import { xmlFormatter } from '~/util/xml.formatter';
 import { isDebug } from '~/util/debug';
@@ -107,7 +108,7 @@ class ContensisCli {
     const environments = this.cache.environments || {};
 
     if (!currentEnvironment) return {} as EnvironmentCache;
-    else if (!!environments[currentEnvironment])
+    else if (environments[currentEnvironment])
       return environments[currentEnvironment];
     else {
       return {
@@ -132,8 +133,9 @@ class ContensisCli {
     this.noun = noun?.toLowerCase();
     this.thirdArg = restArgs?.[0];
 
-    const commandText = `${this.verb} ${this.noun} ${restArgs ? restArgs.join(' ') : ''
-      }`.trim();
+    const commandText = `${this.verb} ${this.noun} ${
+      restArgs ? restArgs.join(' ') : ''
+    }`.trim();
 
     this.session = new SessionCacheProvider();
 
@@ -198,7 +200,7 @@ class ContensisCli {
   PrintEnvironments = async () => {
     const { log, messages } = this;
     const { currentEnvironment, environments = {} } = this.cache;
-    const envKeys = Object.keys(environments);
+    const envKeys = Object.keys(environments).sort();
     log.success(messages.envs.found(envKeys.length));
     await this.HandleFormattingAndOutput(envKeys, () => {
       // print the envKeys to console
@@ -211,6 +213,38 @@ class ContensisCli {
     }
   };
 
+  RemoveEnvironment = async (env: string) => {
+    const { log, messages, session } = this;
+    const { currentEnvironment, environments = {} } = this.cache;
+    const envKeys = Object.keys(environments);
+    log.success(messages.envs.found(envKeys.length));
+    if (environments[env]) {
+      // remove env from cache
+      session.RemoveEnv(env);
+      // remove credentials
+      const lastUserId = environments[env].lastUserId;
+      if (lastUserId) {
+        const [err, credentials] = await new CredentialProvider({
+          userId: environments[env].lastUserId,
+          alias: env,
+        }).Init();
+        if (!err && credentials) await credentials.Delete();
+      }
+      log.success(messages.envs.removed(env));
+      // support the output and format options - exporting the history for the
+      // removed alias
+      await this.HandleFormattingAndOutput(environments[env], () => log.line());
+    } else {
+      log.warning(messages.envs.notFound(env));
+    }
+
+    const nextCurrentEnv =
+      currentEnvironment === env ? undefined : currentEnvironment;
+    if (envKeys.length === 0 || !nextCurrentEnv) log.help(messages.envs.tip());
+
+    return nextCurrentEnv;
+  };
+
   Connect = async (environment: string) => {
     const { log, messages, session } = this;
 
@@ -291,20 +325,24 @@ class ContensisCli {
     commit = false,
     fromFile,
     importDataType,
+    importData,
   }: {
     commit?: boolean;
     fromFile?: string;
     importDataType?:
-    | 'entries'
-    | 'contentTypes'
-    | 'components'
-    | 'models'
-    | 'nodes'
-    | 'user-input';
+      | 'entries'
+      | 'contentTypes'
+      | 'components'
+      | 'models'
+      | 'nodes'
+      | 'user-input';
+    importData?: any[];
   }) => {
-    const source: 'contensis' | 'file' = fromFile ? 'file' : 'contensis';
+    const source: 'contensis' | 'file' =
+      fromFile || importData ? 'file' : 'contensis';
 
-    const fileData = fromFile ? (await readFileAsJSON(fromFile)) || [] : [];
+    const fileData =
+      importData || (fromFile ? (await readFileAsJSON(fromFile)) || [] : []);
 
     if (typeof fileData === 'string')
       throw new Error(`Import file format must be of type JSON`);
@@ -589,7 +627,7 @@ class ContensisCli {
     if (contensis) {
       // Retrieve token for env
       const [error, token] = await to(
-        contensis.content.sourceRepo.repo.BearerToken()
+        contensis.content.source.repo.BearerToken()
       );
       if (token) {
         // Print bearer token to console
@@ -645,9 +683,10 @@ class ContensisCli {
               color = chalk.white;
             }
             console.log(
-              `${nextCurrentProject === project.id
-                ? `>> ${log.boldText(color(project.id))}`
-                : `    ${color(project.id)}`
+              `${
+                nextCurrentProject === project.id
+                  ? `>> ${log.boldText(color(project.id))}`
+                  : `    ${color(project.id)}`
               } ${log.infoText(
                 `[${project.supportedLanguages
                   .map(l =>
@@ -762,7 +801,8 @@ class ContensisCli {
             modifiedBy,
           } of apiKeys) {
             console.log(
-              `  - ${name}${description ? ` (${description})` : ''
+              `  - ${name}${
+                description ? ` (${description})` : ''
               } [${dateModified.toString().substring(0, 10)} ${modifiedBy}]`
             );
             console.log(`      ${id}`);
@@ -1039,7 +1079,7 @@ class ContensisCli {
     if (contensis) {
       // Retrieve workflows list for env
       const [workflowsErr, workflows] =
-        await contensis.content.sourceRepo.workflows.GetWorkflows();
+        await contensis.content.source.workflows.GetWorkflows();
 
       if (Array.isArray(workflows)) {
         log.success(messages.workflows.list(currentEnv));
@@ -1105,7 +1145,7 @@ class ContensisCli {
     if (contensis) {
       // Retrieve workflows list for env
       const [workflowsErr, workflows] =
-        await contensis.content.sourceRepo.workflows.GetWorkflows();
+        await contensis.content.source.workflows.GetWorkflows();
 
       if (Array.isArray(workflows)) {
         log.success(messages.workflows.list(currentEnv));
@@ -1191,8 +1231,8 @@ class ContensisCli {
       // Models to output to console
       const returnModels = modelIds?.length
         ? models?.filter((m: Model) =>
-          modelIds.some(id => id.toLowerCase() === m.id.toLowerCase())
-        )
+            modelIds.some(id => id.toLowerCase() === m.id.toLowerCase())
+          )
         : undefined;
       const exportResources: (ContentType | Component)[] = [];
 
@@ -1278,17 +1318,22 @@ class ContensisCli {
                 const hasAny =
                   components + contentTypes + dependencies + dependencyOf;
                 log.raw(
-                  `  - ${log.highlightText(log.boldText(model.id))} ${hasAny
-                    ? log.infoText(
-                      `{ ${components ? `components: ${components}, ` : ''
-                      }${contentTypes
-                        ? `contentTypes: ${contentTypes}, `
-                        : ''
-                      }${defaults ? `defaults: ${defaults}, ` : ''}${dependencies ? `references: ${dependencies}, ` : ''
-                      }${dependencyOf ? `required by: ${dependencyOf}` : ''
-                      } }`
-                    )
-                    : ''
+                  `  - ${log.highlightText(log.boldText(model.id))} ${
+                    hasAny
+                      ? log.infoText(
+                          `{ ${
+                            components ? `components: ${components}, ` : ''
+                          }${
+                            contentTypes
+                              ? `contentTypes: ${contentTypes}, `
+                              : ''
+                          }${defaults ? `defaults: ${defaults}, ` : ''}${
+                            dependencies ? `references: ${dependencies}, ` : ''
+                          }${
+                            dependencyOf ? `required by: ${dependencyOf}` : ''
+                          } }`
+                        )
+                      : ''
                   }`
                 );
               }
@@ -1324,9 +1369,9 @@ class ContensisCli {
     if (contensis) {
       log.line();
       if (contensis.isPreview) {
-        console.log(log.successText(` -- IMPORT PREVIEW -- `));
+        log.success(messages.migrate.preview());
       } else {
-        console.log(log.warningText(` *** COMMITTING IMPORT *** `));
+        log.warning(messages.migrate.commit());
       }
 
       const [migrateErr, result] = await contensis.MigrateContentModels();
@@ -1419,7 +1464,8 @@ class ContensisCli {
           for (const contentType of contentTypes) {
             const fieldsLength = contentType.fields?.length || 0;
             console.log(
-              `  - ${contentType.id} [${fieldsLength} field${fieldsLength !== 1 ? 's' : ''
+              `  - ${contentType.id} [${fieldsLength} field${
+                fieldsLength !== 1 ? 's' : ''
               }]`
             );
           }
@@ -1518,10 +1564,9 @@ class ContensisCli {
           contentType.projectId = currentProject;
           delete contentType.uuid;
 
-          const [err, , createStatus] =
-            await contensis.models.targetRepos[
-              currentProject
-            ].repo.UpsertContentType(false, contentType);
+          const [err, , createStatus] = await contensis.models.targets[
+            currentProject
+          ].repo.UpsertContentType(false, contentType);
 
           if (err) log.error(err.message, err);
           if (createStatus) {
@@ -1533,7 +1578,7 @@ class ContensisCli {
               )
             );
             // print the content type to console
-            await this.HandleFormattingAndOutput(contentType, () => { });
+            await this.HandleFormattingAndOutput(contentType, () => {});
           }
         }
       else {
@@ -1611,7 +1656,8 @@ class ContensisCli {
           for (const component of components) {
             const fieldsLength = component.fields?.length || 0;
             console.log(
-              `  - ${component.id} [${fieldsLength} field${fieldsLength !== 1 ? 's' : ''
+              `  - ${component.id} [${fieldsLength} field${
+                fieldsLength !== 1 ? 's' : ''
               }]`
             );
           }
@@ -1709,10 +1755,9 @@ class ContensisCli {
           component.projectId = currentProject;
           delete component.uuid;
 
-          const [err, , createStatus] =
-            await contensis.models.targetRepos[
-              currentProject
-            ].repo.UpsertComponent(false, component);
+          const [err, , createStatus] = await contensis.models.targets[
+            currentProject
+          ].repo.UpsertComponent(false, component);
 
           if (err) log.error(err.message, err);
           if (createStatus) {
@@ -1724,7 +1769,7 @@ class ContensisCli {
               )
             );
             // print the component to console
-            await this.HandleFormattingAndOutput(component, () => { });
+            await this.HandleFormattingAndOutput(component, () => {});
           }
         }
       else {
@@ -1793,15 +1838,23 @@ class ContensisCli {
       // Add a full sys.uri to asset entries
       // Add sys.metadata.exportCms
       // Add sys.metadata.exportProjectId
+      const nodes = contensis.content.source.nodes.raw;
+      const combinedOutput = [...entries, ...nodes];
 
-      await this.HandleFormattingAndOutput(entries, () =>
+      await this.HandleFormattingAndOutput(combinedOutput, () => {
         // print the entries to console
         logEntitiesTable({
           entries,
           projectId: currentProject,
           fields: contensis.payload.query?.fields,
-        })
-      );
+        });
+        if (nodes.length)
+          logEntitiesTable({
+            nodes,
+            projectId: currentProject,
+            fields: contensis.payload.query?.fields,
+          });
+      });
     } else {
       log.warning(messages.models.noList(currentProject));
       log.help(messages.connect.tip());
@@ -1813,11 +1866,13 @@ class ContensisCli {
     fromFile,
     logOutput,
     saveEntries,
+    data,
   }: {
     commit: boolean;
-    fromFile: string;
+    fromFile?: string;
     logOutput: string;
     saveEntries: boolean;
+    data?: any[];
   }) => {
     const { currentEnv, currentProject, log, messages } = this;
 
@@ -1825,14 +1880,15 @@ class ContensisCli {
       commit,
       fromFile,
       importDataType: 'entries',
+      importData: data,
     });
 
     if (contensis) {
       log.line();
       if (contensis.isPreview) {
-        console.log(log.successText(` -- IMPORT PREVIEW -- `));
+        log.success(messages.migrate.preview());
       } else {
-        console.log(log.warningText(` *** COMMITTING IMPORT *** `));
+        log.warning(messages.migrate.commit());
       }
 
       const [err, result] = await contensis.MigrateEntries();
@@ -1842,7 +1898,11 @@ class ContensisCli {
         const { entries, nodes } = contensis.content.targets[currentProject];
 
         const output = saveEntries
-          ? entries.migrate?.map(me => me.toJSON())
+          ? // include entries and dependent nodes when saving entries
+            [
+              entries.migrate?.map(me => me.toJSON()) || [],
+              nodes.migrateNodes.map(mn => mn.node),
+            ].flat()
           : result;
         await this.HandleFormattingAndOutput(output, () => {
           // print the migrateResult to console
@@ -1851,7 +1911,10 @@ class ContensisCli {
             showDiff: logOutput === 'all' || logOutput === 'changes',
             showChanged: logOutput === 'changes',
           });
-          if (['all', 'changes'].includes(logOutput))
+          if (
+            ['all', 'changes'].includes(logOutput) &&
+            nodes.migrateNodes.length
+          )
             printNodeTreeOutput(
               this,
               {
@@ -1876,13 +1939,13 @@ class ContensisCli {
             commit,
             commit
               ? (result.migrateResult?.created || 0) +
-              (result.migrateResult?.updated || 0)
+                  (result.migrateResult?.updated || 0)
               : result.entriesToMigrate[currentProject].totalCount,
             commit
               ? (result.nodesResult?.created || 0) +
-              (result.nodesResult?.updated || 0)
+                  (result.nodesResult?.updated || 0)
               : (result.nodesToMigrate?.[currentProject]
-                .totalCount as number) || 0
+                  .totalCount as number) || 0
           )
         );
         if (!commit) {
@@ -1922,9 +1985,9 @@ class ContensisCli {
     if (contensis) {
       log.line();
       if (contensis.isPreview) {
-        console.log(log.successText(` -- IMPORT PREVIEW -- `));
+        log.success(messages.migrate.preview());
       } else {
-        console.log(log.warningText(` *** COMMITTING IMPORT *** `));
+        log.warning(messages.migrate.commit());
       }
 
       const [err, result] = await to(
@@ -1935,8 +1998,8 @@ class ContensisCli {
       if (result) {
         const output = saveEntries
           ? contensis.content.copy.targets[currentProject].entries.migrate?.map(
-            me => me.toJSON()
-          )
+              me => me.toJSON()
+            )
           : result;
         await this.HandleFormattingAndOutput(output, () => {
           // print the migrateResult to console
@@ -1962,7 +2025,7 @@ class ContensisCli {
             commit,
             commit
               ? (result.migrateResult?.created || 0) +
-              (result.migrateResult?.updated || 0)
+                  (result.migrateResult?.updated || 0)
               : result.entriesToMigrate[currentProject].totalCount
           )
         );
@@ -1981,6 +2044,87 @@ class ContensisCli {
     }
   };
 
+  UpdateEntryField = async ({
+    commit,
+    fromFile,
+    logOutput,
+    saveEntries,
+  }: {
+    commit: boolean;
+    fromFile: string;
+    logOutput: string;
+    saveEntries: boolean;
+  }) => {
+    const { currentEnv, currentProject, log, messages } = this;
+
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      fromFile,
+      importDataType: 'entries',
+    });
+
+    if (contensis) {
+      log.line();
+      if (contensis.isPreview) {
+        log.success(messages.entries.update.preview());
+      } else {
+        log.warning(messages.entries.update.commit());
+      }
+
+      const [err, result] = await to(
+        contensis.content.update.UpdateFieldContent()
+      );
+
+      if (err) logError(err);
+      if (result) {
+        const output = saveEntries
+          ? contensis.content.update.targets[
+              currentProject
+            ].entries.migrate?.map(me => me.toJSON())
+          : result;
+        await this.HandleFormattingAndOutput(output, () => {
+          // print the migrateResult to console
+          printEntriesMigrateResult(this, result, {
+            action: 'update',
+            showAll: logOutput === 'all',
+            showDiff: logOutput === 'all' || logOutput === 'changes',
+            showChanged: logOutput === 'changes',
+          });
+        });
+      }
+
+      if (
+        result &&
+        !err &&
+        !result.errors?.length &&
+        ((!commit && result.entriesToMigrate[currentProject].totalCount) ||
+          (commit &&
+            (result.migrateResult?.created || result.migrateResult?.updated)))
+      ) {
+        log.success(
+          messages.entries.update.success(
+            currentEnv,
+            commit,
+            commit
+              ? (result.migrateResult?.created || 0) +
+                  (result.migrateResult?.updated || 0)
+              : result.entriesToMigrate[currentProject].totalCount
+          )
+        );
+        if (!commit) {
+          log.raw(``);
+          log.help(messages.entries.commitTip());
+        }
+      } else {
+        log.error(messages.entries.update.failed(currentEnv), err);
+        if (!result?.entriesToMigrate?.[currentProject]?.totalCount)
+          log.help(messages.entries.notFound(currentEnv));
+      }
+    } else {
+      log.warning(messages.models.noList(currentProject));
+      log.help(messages.connect.tip());
+    }
+  };
   GetNodes = async (rootPath: string, depth = 0) => {
     const { currentProject, log, messages } = this;
     const contensis = await this.ConnectContensis();
@@ -1992,7 +2136,7 @@ class ContensisCli {
         log.error(messages.nodes.failedGet(currentProject), err);
         return;
       }
-      const root = contensis.nodes.sourceRepo.nodes.tree;
+      const root = contensis.nodes.source.nodes.tree;
 
       log.success(messages.nodes.get(currentProject, rootPath, depth));
 
@@ -2029,9 +2173,9 @@ class ContensisCli {
     if (contensis) {
       log.line();
       if (contensis.isPreview) {
-        console.log(log.successText(` -- IMPORT PREVIEW -- `));
+        log.success(messages.migrate.preview());
       } else {
-        console.log(log.warningText(` *** COMMITTING IMPORT *** `));
+        log.warning(messages.migrate.commit());
       }
 
       const [err, result] = await contensis.MigrateNodes();
@@ -2041,8 +2185,7 @@ class ContensisCli {
         await this.HandleFormattingAndOutput(result, () => {
           // print the migrateResult to console
           const migrateTree =
-            contensis.nodes.targetRepos[currentProject].nodes
-              .migrateNodesTreeView;
+            contensis.nodes.targets[currentProject].nodes.migrateNodesTreeView;
           printNodeTreeOutput(this, migrateTree, logOutput, logLimit);
           printNodesMigrateResult(this, result, {
             showAll: logOutput === 'all',
@@ -2114,8 +2257,7 @@ class ContensisCli {
           // print the migrateResult to console
           printNodeTreeOutput(
             this,
-            contensis.nodes.targetRepos[currentProject].nodes
-              .migrateNodesTreeView
+            contensis.nodes.targets[currentProject].nodes.migrateNodesTreeView
           );
           // printNodesMigrateResult(this, result, {
           //   action: 'delete',
@@ -2153,14 +2295,14 @@ class ContensisCli {
 
       const filteredResults = subscriptionIdsOrNames?.length
         ? webhooks?.filter(
-          w =>
-            subscriptionIdsOrNames?.some(idname =>
-              w.name?.toLowerCase().includes(idname.toLowerCase())
-            ) ||
-            subscriptionIdsOrNames?.some(
-              id => id.toLowerCase() === w.id.toLowerCase()
-            )
-        )
+            w =>
+              subscriptionIdsOrNames?.some(idname =>
+                w.name?.toLowerCase().includes(idname.toLowerCase())
+              ) ||
+              subscriptionIdsOrNames?.some(
+                id => id.toLowerCase() === w.id.toLowerCase()
+              )
+          )
         : webhooks;
 
       if (Array.isArray(filteredResults)) {
@@ -2187,7 +2329,8 @@ class ContensisCli {
                     version.modified || version.created
                   )
                     .toString()
-                    .substring(0, 10)} ${version.modifiedBy || version.createdBy
+                    .substring(0, 10)} ${
+                    version.modifiedBy || version.createdBy
                   }]`
                 )
               );
@@ -2256,12 +2399,14 @@ class ContensisCli {
             versionsSinceLive,
           } of blocks) {
             console.log(
-              `  - ${id}${description ? ` (${description})` : ''}${madeLive
-                ? ` [${madeLive.toString().substring(0, 10)} v${liveVersion}]`
-                : ''
-              }${versionsSinceLive
-                ? log.warningText(` +${versionsSinceLive}`)
-                : ''
+              `  - ${id}${description ? ` (${description})` : ''}${
+                madeLive
+                  ? ` [${madeLive.toString().substring(0, 10)} v${liveVersion}]`
+                  : ''
+              }${
+                versionsSinceLive
+                  ? log.warningText(` +${versionsSinceLive}`)
+                  : ''
               }`
             );
             for (const branch of branches)
@@ -2326,11 +2471,11 @@ class ContensisCli {
               block,
               !version
                 ? {
-                  showImage: false,
-                  showSource: true,
-                  showStaticPaths: false,
-                  showStatus: false,
-                }
+                    showImage: false,
+                    showSource: true,
+                    showStaticPaths: false,
+                    showStatus: false,
+                  }
                 : undefined
             );
         });
@@ -2357,9 +2502,8 @@ class ContensisCli {
     const contensis = await this.ConnectContensis();
     if (contensis) {
       // Push new block version
-      const [err, blockVersion] = await contensis.blocks.PushBlockVersion(
-        block
-      );
+      const [err, blockVersion] =
+        await contensis.blocks.PushBlockVersion(block);
       if (!err) {
         log.success(
           messages.blocks.pushed(
@@ -2436,9 +2580,8 @@ class ContensisCli {
 
       // If action is release and version is latest, find the latest version number
       if (action === 'release' && version === 'latest') {
-        const [getErr, blockVersion] = await this.GetLatestBlockVersion(
-          blockId
-        );
+        const [getErr, blockVersion] =
+          await this.GetLatestBlockVersion(blockId);
 
         if (getErr) {
           // Log error getting latest block version no
@@ -2525,7 +2668,8 @@ class ContensisCli {
         await this.HandleFormattingAndOutput(renderLogs, () => {
           // print the logs to console
           console.log(
-            `  - ${blockId} ${branch} ${Number(version) ? `v${version}` : version
+            `  - ${blockId} ${branch} ${
+              Number(version) ? `v${version}` : version
             } ${dataCenter ? `[${dataCenter}]` : ''}`
           );
           log.line();
@@ -2578,11 +2722,11 @@ class ContensisCli {
 
           const [lastErr, lastLogs] = following
             ? await contensis.blocks.GetBlockLogs({
-              blockId,
-              branchId: branch,
-              version,
-              dataCenter,
-            })
+                blockId,
+                branchId: branch,
+                version,
+                dataCenter,
+              })
             : [null, null];
 
           if (lastLogs) {
@@ -2630,7 +2774,8 @@ class ContensisCli {
           log.success(messages.proxies.list(currentEnv, env.currentProject));
           for (const { id, name, description, endpoints, version } of proxies) {
             console.log(
-              `  - ${name} [${version.versionNo
+              `  - ${name} [${
+                version.versionNo
               }] ${id} ${log.infoText`${description}`}`
             );
             for (const [language, endpoint] of Object.entries(
@@ -2684,8 +2829,9 @@ class ContensisCli {
             for (const rule of rules)
               if (rule.return)
                 console.log(
-                  log.infoText`      ${rule.return.endpointId ? 'endpointId' : 'blockId'
-                    }: ${rule.return.endpointId || rule.return.blockId}`
+                  log.infoText`      ${
+                    rule.return.endpointId ? 'endpointId' : 'blockId'
+                  }: ${rule.return.endpointId || rule.return.blockId}`
                 );
           }
         });
@@ -2709,6 +2855,9 @@ class ContensisCli {
     } else if (format === 'csv') {
       log.raw('');
       log.raw(log.infoText(await csvFormatter(limitFields(obj, fields))));
+    } else if (format === 'html') {
+      log.raw('');
+      log.raw(log.infoText(htmlFormatter(limitFields(obj, fields))));
     } else if (format === 'xml') {
       log.raw('');
       log.raw(log.infoText(xmlFormatter(limitFields(obj, fields))));
@@ -2723,6 +2872,8 @@ class ContensisCli {
       const isText = !tryParse(obj) && typeof obj === 'string';
       if (format === 'csv') {
         writeString = await csvFormatter(limitFields(obj, fields));
+      } else if (format === 'html') {
+        writeString = htmlFormatter(limitFields(obj, fields));
       } else if (format === 'xml') {
         writeString = xmlFormatter(limitFields(obj, fields));
       } else