contensis-cli 1.6.1-beta.3 → 1.6.1-beta.4

package/dist/services/ContensisCliService.js

@@ -1398,7 +1398,7 @@ class ContensisCli {
       if (migrateErr) (0, import_logger.logError)(migrateErr);
       else
         await this.HandleFormattingAndOutput(result, () => {
-          if (!result.committed) {
+          if (result && !(result == null ? void 0 : result.committed)) {
             log.raw(log.boldText(`
 Content types:`));
             if (!result.contentTypes) log.info(`- None returned
@@ -1430,7 +1430,7 @@ Errors:`));
               log.object(result.errors);
             }
           } else {
-            const { modelsResult = {} } = result;
+            const { modelsResult = {} } = result || {};
             log.raw(log.boldText(`
 Content types:`));
             (0, import_console.printModelMigrationResult)(
@@ -1762,7 +1762,7 @@ Components:`));
             showAll: true
           });
         });
-      if (!err && (!commit && result.entriesToMigrate[currentProject].totalCount || commit && ((_a = result.migrateResult) == null ? void 0 : _a.deleted))) {
+      if (!err && (!commit && (result == null ? void 0 : result.entriesToMigrate[currentProject].totalCount) || commit && ((_a = result == null ? void 0 : result.migrateResult) == null ? void 0 : _a.deleted))) {
         log.success(messages.entries.removed(currentEnv, commit));
         if (!commit) {
           log.raw(``);
@@ -1829,7 +1829,7 @@ Components:`));
       }
       const [err, result] = await contensis.MigrateEntries();
       if (err) (0, import_logger.logError)(err);
-      else {
+      else if (result) {
         const { entries, nodes, tags } = contensis.content.targets[currentProject];
         const output = saveEntries ? (
           // include entries and dependent nodes (or tags) when saving entries
@@ -1858,12 +1858,12 @@ Components:`));
             );
         });
       }
-      if (!err && !((_b = result.errors) == null ? void 0 : _b.length) && (!commit && result.entriesToMigrate[currentProject].totalCount || commit && (((_c = result.migrateResult) == null ? void 0 : _c.created) || ((_d = result.migrateResult) == null ? void 0 : _d.updated)))) {
+      if (!err && !((_b = result == null ? void 0 : result.errors) == null ? void 0 : _b.length) && (!commit && (result == null ? void 0 : result.entriesToMigrate[currentProject].totalCount) || commit && (((_c = result == null ? void 0 : result.migrateResult) == null ? void 0 : _c.created) || ((_d = result == null ? void 0 : result.migrateResult) == null ? void 0 : _d.updated)))) {
         log.success(
           messages.entries.imported(
             currentEnv,
             commit,
-            commit ? (((_e = result.migrateResult) == null ? void 0 : _e.created) || 0) + (((_f = result.migrateResult) == null ? void 0 : _f.updated) || 0) : result.entriesToMigrate[currentProject].totalCount,
+            commit ? (((_e = result == null ? void 0 : result.migrateResult) == null ? void 0 : _e.created) || 0) + (((_f = result == null ? void 0 : result.migrateResult) == null ? void 0 : _f.updated) || 0) : result == null ? void 0 : result.entriesToMigrate[currentProject].totalCount,
             commit ? (((_g = result.nodesResult) == null ? void 0 : _g.created) || 0) + (((_h = result.nodesResult) == null ? void 0 : _h.updated) || 0) : ((_i = result.nodesToMigrate) == null ? void 0 : _i[currentProject].totalCount) || 0,
             commit ? (((_j = result.tagsResult) == null ? void 0 : _j.created) || 0) + (((_k = result.tagsResult) == null ? void 0 : _k.updated) || 0) : ((_l = result.tagsToMigrate) == null ? void 0 : _l[currentProject].totalCount) || 0
           )
@@ -2044,7 +2044,7 @@ Components:`));
       }
       const [err, result] = await contensis.MigrateNodes();
       if (err) log.raw(``);
-      else
+      else if (result)
         await this.HandleFormattingAndOutput(result, () => {
           const migrateTree = contensis.nodes.targets[currentProject].nodes.migrateNodesTreeView;
           (0, import_console.printNodeTreeOutput)(this, migrateTree, logOutput, logLimit);
@@ -2058,7 +2058,7 @@ Components:`));
       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)))) {
+      if (!err && (!((_f = result == null ? void 0 : result.errors) == null ? void 0 : _f.length) || this.contensisOpts.ignoreErrors) && (!commit && nodesMigrateCount || commit && (nodesCreated || nodesUpdated || ((_g = result == null ? void 0 : result.errors) == null ? void 0 : _g.length)))) {
         let totalCount;
         if (commit) {
           const created = typeof nodesCreated === "number" ? nodesCreated : 0;
@@ -2107,7 +2107,7 @@ Components:`));
           );
         });
       }
-      if (!err && (!commit && result.nodesToMigrate[currentProject].totalCount || commit && ((_a = result.nodesResult) == null ? void 0 : _a.deleted))) {
+      if (!err && (!commit && (result == null ? void 0 : result.nodesToMigrate[currentProject].totalCount) || commit && ((_a = result == null ? void 0 : result.nodesResult) == null ? void 0 : _a.deleted))) {
         log.success(
           messages.nodes.removed(currentEnv, commit, contensis.nodes.rootPath)
         );
@@ -2156,10 +2156,13 @@ Components:`));
             } of filteredResults) {
               console.log(
                 log.infoText(
-                  `  ${import_chalk.default.bold.white`- ${name}`} ${id} [${(version.modified || version.created).toString().substring(0, 10)} ${version.modifiedBy || version.createdBy}]`
+                  `${import_chalk.default.bold.white`${enabled ? "\u{1F7E2}" : "\u{1F534}"}  ${name}`} ${id} [${(version.modified || version.created).toString().substring(0, 10)} ${version.modifiedBy || version.createdBy}]`
                 )
               );
               if (description) console.log(log.infoText`    ${description}`);
+              console.log(
+                `    ${log.infoText`enabled`}: ${import_chalk.default[enabled ? "green" : "red"](enabled)}`
+              );
               console.log(`    ${log.infoText`[${method}]`} ${url2}`);
               if (headers && Object.keys(headers).length) {
                 console.log(`    ${log.infoText`headers`}:`);
@@ -2183,8 +2186,6 @@ Components:`));
                     templates
                   ).join(" ")}`
                 );
-              if (enabled === false)
-                console.log(`    ${log.infoText`enabled`}: ${enabled}`);
             }
           });
         }
@@ -2195,6 +2196,68 @@ Components:`));
       }
     }
   };
+  ImportWebhooks = async ({
+    commit,
+    fromFile,
+    logOutput,
+    enabled = false,
+    disabled = false
+  }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+    const { currentEnv, currentProject, log, messages } = this;
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      fromFile
+    });
+    if (contensis) {
+      log.line();
+      if (contensis.isPreview) {
+        log.success(messages.migrate.preview());
+      } else {
+        log.warning(messages.migrate.commit());
+      }
+      const [err, result] = await (0, import_await_to_js.default)(
+        contensis.webhooks.MigrateWebhooks({
+          // trying to simulate XOR logic, setting enabled arg from
+          // enabled or disabled option only if one of them is set
+          enabled: enabled !== disabled ? enabled || !disabled : void 0
+        })
+      );
+      if (err) (0, import_logger.logError)(err);
+      else if (result) {
+        await this.HandleFormattingAndOutput(result, () => {
+          (0, import_console.printWebhooksMigrateResult)(this, result, {
+            showAll: logOutput === "all",
+            showDiff: logOutput === "all" || logOutput === "changes",
+            showChanged: logOutput === "changes"
+          });
+        });
+      }
+      if (!err && !((_a = result.errors) == null ? void 0 : _a.length) && (!commit && result.webhooksToMigrate[currentProject].totalCount || commit && (((_b = result.webhooksResult) == null ? void 0 : _b.created) || ((_c = result.webhooksResult) == null ? void 0 : _c.updated)))) {
+        log.success(
+          messages.webhooks.imported(
+            currentEnv,
+            commit,
+            commit ? (((_d = result.webhooksResult) == null ? void 0 : _d.created) || 0) + (((_e = result.webhooksResult) == null ? void 0 : _e.updated) || 0) : result.webhooksToMigrate[currentProject].totalCount
+          )
+        );
+        if (!commit) {
+          log.raw(``);
+          log.help(messages.migrate.commitTip());
+        }
+      } else {
+        const noChanges = ((_g = (_f = result == null ? void 0 : result.webhooksToMigrate) == null ? void 0 : _f[currentProject]) == null ? void 0 : _g["no change"]) && ((_h = result == null ? void 0 : result.webhooksToMigrate) == null ? void 0 : _h[currentProject].totalCount) === 0;
+        if (noChanges && !err && !((_i = result.errors) == null ? void 0 : _i.length)) {
+          log.help(messages.webhooks.noChange(currentEnv));
+        } else {
+          log.error(messages.webhooks.failedCreate(currentEnv), err);
+        }
+      }
+    } else {
+      log.warning(messages.models.noList(currentProject));
+      log.help(messages.connect.tip());
+    }
+  };
   PrintBlocks = async () => {
     const { currentEnv, env, log, messages } = this;
     const contensis = await this.ConnectContensis();