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

package/dist/services/ContensisCliService.js

@@ -56,14 +56,14 @@ class ContensisCli {
     const exitCode = error ? 1 : 0;
     process.exit(exitCode);
   };
-  command;
   format;
   output;
   session;
+  auth;
+  command;
   contensis;
   contensisOpts;
   currentProject;
-  devinit;
   sourceAlias;
   targetEnv;
   urls;
@@ -72,9 +72,6 @@ class ContensisCli {
   verb;
   noun;
   thirdArg;
-  get invokedBy() {
-    return this.command.createdUserId;
-  }
   get cache() {
     return this.session.Get();
   }
@@ -123,7 +120,12 @@ class ContensisCli {
     if (outputOpts == null ? void 0 : outputOpts.clientId)
       env.lastUserId = outputOpts.clientId;
     if (outputOpts == null ? void 0 : 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 == null ? void 0 : env.currentProject) || "null";
     this.sourceAlias = (outputOpts == null ? void 0 : outputOpts.sourceAlias) || currentEnvironment;
     if (currentEnvironment) {
@@ -132,7 +134,7 @@ class ContensisCli {
     this.command = {
       commandText,
       createdDate: new Date().toISOString(),
-      createdUserId: env == null ? void 0 : env.lastUserId
+      invokedBy: env == null ? void 0 : env.lastUserId
     };
     if (currentEnvironment) {
       env.history = [this.command];
@@ -324,7 +326,10 @@ class ContensisCli {
         password
       ).Init();
       if (credentialError && !credentials.current) {
-        log.error(credentialError);
+        log.error(
+          `Unable to find credentials for user ${userId} at ${currentEnv}`,
+          credentialError
+        );
         return;
       }
       if (credentials.remarks.secure !== true) {
@@ -341,14 +346,16 @@ class ContensisCli {
     }
   };
   Login = async (userId, {
-    password = (0, import_util.isPassword)(this.env.passwordFallback),
+    password = "",
     promptPassword = true,
-    sharedSecret = (0, import_util.isSharedSecret)(this.env.passwordFallback),
+    sharedSecret = "",
     silent = false,
     attempt = 1
   } = {}) => {
     var _a, _b, _c, _d;
     let inputPassword = password || sharedSecret;
+    if (!inputPassword)
+      inputPassword = (0, import_util.isSharedSecret)(this.env.passwordFallback) || (0, import_util.isPassword)(this.env.passwordFallback) || "";
     const { log, messages } = this;
     if (userId) {
       const { currentEnv, env } = this;
@@ -369,7 +376,7 @@ class ContensisCli {
             ]));
           }
           if (inputPassword || cachedPassword || cachedSecret) {
-            const authService = new import_ContensisAuthService.default({
+            this.auth = new import_ContensisAuthService.default({
               username: userId,
               password: inputPassword || cachedPassword,
               projectId: (env == null ? void 0 : env.currentProject) || "website",
@@ -377,9 +384,7 @@ class ContensisCli {
               clientId: userId,
               clientSecret: sharedSecret || cachedSecret
             });
-            const [authError, bearerToken] = await (0, import_await_to_js.default)(
-              authService.BearerToken()
-            );
+            const [authError, bearerToken] = await (0, import_await_to_js.default)(this.auth.BearerToken());
             if (bearerToken) {
               env.authToken = bearerToken;
               env.lastUserId = userId;
@@ -592,7 +597,7 @@ class ContensisCli {
       }
     }
   };
-  CreateApiKey = async (name, description) => {
+  CreateApiKey = async (name, description = "") => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
     if (contensis) {
@@ -686,9 +691,7 @@ class ContensisCli {
                 `      ${import_chalk.default.bold.grey(
                   "contentTypes"
                 )}: ${permissions.contentTypes.map(
-                  (p) => `${p.id} [${p.actions.join(",")}] ${p.languages.join(
-                    " "
-                  )}`
+                  (p) => `${p.id} [${p.actions.join(",")}] ${p.languages.join(" ")}`
                 ).join(", ")}`
               );
           }
@@ -796,6 +799,78 @@ class ContensisCli {
       }
     }
   };
+  PrintWorkflows = async () => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      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) => {
+          var _a;
+          return (_a = Object.values(o || {})) == null ? void 0 : _a[0];
+        };
+        this.HandleFormattingAndOutput(workflows, () => {
+          for (const {
+            id,
+            name,
+            description,
+            states,
+            eventGroups,
+            isSystem
+          } of workflows) {
+            const color = isSystem ? (s) => s : log.infoText;
+            console.log(
+              color(
+                `  - ${import_chalk.default.bold(
+                  stringFromLanguageObject(name)
+                )} ${log.infoText(id)}`
+              )
+            );
+            if (description)
+              console.log(
+                log.infoText(`    ${stringFromLanguageObject(description)}`)
+              );
+            if (isSystem === false)
+              console.log(`      ${import_chalk.default.bold.grey("isSystem")}: false`);
+            if (states == null ? void 0 : states.length)
+              console.log(
+                `      ${import_chalk.default.bold.grey("states")}: ${states.map((state) => state.id).join(", ")}`
+              );
+            if (eventGroups == null ? void 0 : eventGroups.length)
+              console.log(
+                `      ${import_chalk.default.bold.grey("eventGroups")}: ${eventGroups.map((evtGrp) => evtGrp.id).join(", ")}`
+              );
+          }
+        });
+      }
+      if (workflowsErr) {
+        log.error(messages.workflows.noList(currentEnv));
+        log.error((0, import_json.jsonFormatter)(workflowsErr));
+      }
+    }
+  };
+  PrintWorkflow = async (workflowNameOrId) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [workflowsErr, workflows] = await contensis.content.sourceRepo.workflows.GetWorkflows();
+      if (Array.isArray(workflows)) {
+        log.success(messages.workflows.list(currentEnv));
+        const workflow = (0, import_find.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((0, import_json.jsonFormatter)(workflowsErr));
+      }
+    }
+  };
   CreateProject = async (project) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
@@ -1223,7 +1298,7 @@ Components:`));
     }
   };
   RemoveEntries = async (commit = false) => {
-    var _a;
+    var _a, _b, _c;
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
@@ -1238,9 +1313,9 @@ Components:`));
       const [err, result] = await contensis.DeleteEntries();
       if (result)
         this.HandleFormattingAndOutput(result, () => {
-          (0, import_console.printMigrateResult)(this, result, {
+          (0, import_console.printEntriesMigrateResult)(this, result, {
             action: "delete",
-            showAllEntries: true
+            showAll: true
           });
         });
       if (!err && (!commit && result.entriesToMigrate[currentProject].totalCount || commit && ((_a = result.migrateResult) == null ? void 0 : _a.deleted))) {
@@ -1251,7 +1326,7 @@ Components:`));
         }
       } else {
         log.error(messages.entries.failedRemove(currentEnv), err);
-        if (!result.entriesToMigrate[currentProject].totalCount)
+        if (!((_c = (_b = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _b[currentProject]) == null ? void 0 : _c.totalCount))
           log.help(messages.entries.notFound(currentEnv));
       }
     }
@@ -1268,11 +1343,11 @@ Components:`));
         entries,
         () => {
           var _a;
-          return (0, import_migratortron.logEntriesTable)(
+          return (0, import_migratortron.logEntitiesTable)({
             entries,
-            currentProject,
-            (_a = contensis.payload.query) == null ? void 0 : _a.fields
-          );
+            projectId: currentProject,
+            fields: (_a = contensis.payload.query) == null ? void 0 : _a.fields
+          });
         }
       );
     } else {
@@ -1285,7 +1360,7 @@ Components:`));
     fromFile,
     logOutput
   }) => {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
@@ -1304,9 +1379,9 @@ Components:`));
         (0, import_logger.logError)(err);
       else
         this.HandleFormattingAndOutput(result, () => {
-          (0, import_console.printMigrateResult)(this, result, {
-            showAllEntries: logOutput === "all",
-            showChangedEntries: logOutput === "changes"
+          (0, import_console.printEntriesMigrateResult)(this, result, {
+            showAll: logOutput === "all",
+            showChanged: logOutput === "changes"
           });
         });
       if (!err && !((_a = result.errors) == null ? void 0 : _a.length) && (!commit && result.entriesToMigrate[currentProject].totalCount || commit && (((_b = result.migrateResult) == null ? void 0 : _b.created) || ((_c = result.migrateResult) == null ? void 0 : _c.updated)))) {
@@ -1323,7 +1398,7 @@ Components:`));
         }
       } else {
         log.error(messages.entries.failedImport(currentEnv), err);
-        if (!result.entriesToMigrate[currentProject].totalCount)
+        if (!((_g = (_f = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _f[currentProject]) == null ? void 0 : _g.totalCount))
           log.help(messages.entries.notFound(currentEnv));
       }
     } else {
@@ -1336,41 +1411,16 @@ Components:`));
     const contensis = await this.ConnectContensis();
     if (contensis) {
       log.line();
-      const [err] = await (0, import_await_to_js.default)(
-        contensis.content.sourceRepo.nodes.GetNodes(rootPath, depth)
-      );
+      const [err, nodes] = await (0, import_await_to_js.default)(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));
-      const outputNode = (node, spaces) => `${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)}`;
-      this.HandleFormattingAndOutput(root, () => {
-        log.object({ ...root, children: void 0 });
-        log.raw("");
-        log.info(
-          `${log.highlightText("e")} = has entry; ${log.highlightText(
-            "c"
-          )} = canonical; ${log.highlightText("m")} = include in menu`
-        );
-        log.line();
-        const outputChildren = (root2, depth2 = 2) => {
-          let str = "";
-          for (const node of root2 == null ? void 0 : root2.children) {
-            str += `${outputNode(node, Array(depth2 + 1).join("  "))}
-`;
-            if ("children" in node)
-              str += outputChildren(node, depth2 + 1);
-          }
-          return str;
-        };
-        const children = outputChildren(root);
-        log.limits(
-          `${outputNode(root, "  ")}${children ? `
-${children}` : ""}`,
-          100
-        );
+      this.HandleFormattingAndOutput(nodes, () => {
+        log.object({ ...root, children: void 0, language: void 0 });
+        (0, import_console.printNodeTreeOutput)(this, root);
       });
     } else {
       log.warning(messages.models.noList(currentProject));
@@ -1380,9 +1430,10 @@ ${children}` : ""}`,
   ImportNodes = async ({
     commit,
     fromFile,
-    logOutput
+    logOutput,
+    logLimit
   }) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g;
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
@@ -1397,39 +1448,42 @@ ${children}` : ""}`,
         console.log(log.warningText(` *** COMMITTING IMPORT *** `));
       }
       const [err, result] = await contensis.MigrateNodes();
+      const migrateTree = contensis.nodes.targetRepos[currentProject].nodes.migrateNodesTreeView;
       if (err)
-        (0, import_logger.logError)(err);
+        log.raw(``);
       else
         this.HandleFormattingAndOutput(result, () => {
-          (0, import_console.printMigrateResult)(this, result, {
-            showAllEntries: logOutput === "all",
-            showChangedEntries: logOutput === "changes"
+          (0, import_console.printNodeTreeOutput)(this, migrateTree, logOutput, logLimit);
+          (0, import_console.printNodesMigrateResult)(this, result, {
+            showAll: logOutput === "all",
+            showChanged: logOutput === "changes"
           });
         });
-      const nodesTotalCount = result == null ? void 0 : result.nodesToMigrate[currentProject].totalCount;
-      const nodesCreated = ((_a = result == null ? void 0 : result.nodesResult) == null ? void 0 : _a["created"]) || 0;
-      const nodesUpdated = ((_b = result == null ? void 0 : result.nodesResult) == null ? void 0 : _b["updated"]) || 0;
-      const noChange = result.nodesToMigrate[currentProject]["no change"] !== 0;
-      if (!err && !((_c = result.errors) == null ? void 0 : _c.length) && (!commit && nodesTotalCount || commit && (nodesCreated || nodesUpdated))) {
+      const nodesMigrateCount = (_a = result == null ? void 0 : result.nodesToMigrate) == null ? void 0 : _a[currentProject].totalCount;
+      const nodesCreated = ((_b = result == null ? void 0 : result.nodesResult) == null ? void 0 : _b["created"]) || 0;
+      const nodesUpdated = ((_c = result == null ? void 0 : result.nodesResult) == null ? void 0 : _c["updated"]) || 0;
+      const nodesErrored = ((_d = result == null ? void 0 : result.nodesResult) == null ? void 0 : _d["errors"]) || 0;
+      const noChanges = ((_e = result == null ? void 0 : result.nodesToMigrate) == null ? void 0 : _e[currentProject]["no change"]) && nodesMigrateCount === 0;
+      if (!err && (!((_f = result.errors) == null ? void 0 : _f.length) || this.contensisOpts.ignoreErrors) && (!commit && nodesMigrateCount || commit && (nodesCreated || nodesUpdated || ((_g = result.errors) == null ? void 0 : _g.length)))) {
         let totalCount;
         if (commit) {
           let created = typeof nodesCreated === "number" ? nodesCreated : 0;
           let updated = typeof nodesUpdated === "number" ? nodesUpdated : 0;
           totalCount = created + updated;
         } else {
-          totalCount = typeof nodesTotalCount === "number" ? nodesTotalCount : 0;
+          totalCount = 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) {
-          log.help(messages.nodes.noChange(currentEnv), err);
+        if (noChanges && !err && !nodesErrored) {
+          log.help(messages.nodes.noChange(currentEnv));
         } else {
           log.error(messages.nodes.failedImport(currentEnv), err);
-          if (!nodesTotalCount)
+          if (!nodesMigrateCount)
             log.help(messages.nodes.notFound(currentEnv));
         }
       }
@@ -1438,6 +1492,43 @@ ${children}` : ""}`,
       log.help(messages.connect.tip());
     }
   };
+  RemoveNodes = async (commit = false) => {
+    var _a, _b, _c;
+    const { currentEnv, currentProject, log, messages } = this;
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      importDataType: "user-input"
+    });
+    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, () => {
+          (0, import_console.printNodeTreeOutput)(
+            this,
+            contensis.nodes.targetRepos[currentProject].nodes.migrateNodesTreeView
+          );
+        });
+      }
+      if (!err && (!commit && result.nodesToMigrate[currentProject].totalCount || commit && ((_a = result.nodesResult) == null ? void 0 : _a.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 (!((_c = (_b = result == null ? void 0 : result.nodesToMigrate) == null ? void 0 : _b[currentProject]) == null ? void 0 : _c.totalCount))
+          log.help(messages.nodes.notFound(currentEnv));
+      }
+    }
+  };
   PrintWebhookSubscriptions = async (subscriptionIdsOrNames) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();