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

package/dist/services/ContensisCliService.js

@@ -49,6 +49,7 @@ var import_util = require("../util");
 var import_api_ids = require("../util/api-ids");
 var import_console = require("../util/console.printer");
 var import_csv = require("../util/csv.formatter");
+var import_html = require("../util/html.formatter");
 var import_json = require("../util/json.formatter");
 var import_xml = require("../util/xml.formatter");
 var import_debug = require("../util/debug");
@@ -93,7 +94,7 @@ class ContensisCli {
     const currentEnvironment = this.currentEnv;
     const environments = this.cache.environments || {};
     if (!currentEnvironment) return {};
-    else if (!!environments[currentEnvironment])
+    else if (environments[currentEnvironment])
       return environments[currentEnvironment];
     else {
       return {
@@ -160,7 +161,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, () => {
       for (const env of envKeys) {
@@ -171,6 +172,30 @@ class ContensisCli {
       log.help(messages.envs.tip());
     }
   };
+  RemoveEnvironment = async (env) => {
+    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]) {
+      session.RemoveEnv(env);
+      const lastUserId = environments[env].lastUserId;
+      if (lastUserId) {
+        const [err, credentials] = await new import_CredentialProvider.default({
+          userId: environments[env].lastUserId,
+          alias: env
+        }).Init();
+        if (!err && credentials) await credentials.Delete();
+      }
+      log.success(messages.envs.removed(env));
+      await this.HandleFormattingAndOutput(environments[env], () => log.line());
+    } else {
+      log.warning(messages.envs.notFound(env));
+    }
+    const nextCurrentEnv = currentEnvironment === env ? void 0 : currentEnvironment;
+    if (envKeys.length === 0 || !nextCurrentEnv) log.help(messages.envs.tip());
+    return nextCurrentEnv;
+  };
   Connect = async (environment) => {
     var _a;
     const { log, messages, session } = this;
@@ -237,11 +262,12 @@ class ContensisCli {
   ConnectContensisImport = async ({
     commit = false,
     fromFile,
-    importDataType
+    importDataType,
+    importData
   }) => {
     var _a, _b, _c, _d, _e, _f;
-    const source = fromFile ? "file" : "contensis";
-    const fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
+    const source = fromFile || importData ? "file" : "contensis";
+    const fileData = importData || (fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : []);
     if (typeof fileData === "string")
       throw new Error(`Import file format must be of type JSON`);
     const { contensisOpts, currentEnv, env, log, messages, sourceAlias } = this;
@@ -452,7 +478,7 @@ class ContensisCli {
     const contensis = await this.ConnectContensis();
     if (contensis) {
       const [error, token] = await (0, import_await_to_js.default)(
-        contensis.content.sourceRepo.repo.BearerToken()
+        contensis.content.source.repo.BearerToken()
       );
       if (token) {
         await this.HandleFormattingAndOutput(
@@ -802,7 +828,7 @@ class ContensisCli {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
     if (contensis) {
-      const [workflowsErr, workflows] = await contensis.content.sourceRepo.workflows.GetWorkflows();
+      const [workflowsErr, workflows] = await contensis.content.source.workflows.GetWorkflows();
       if (Array.isArray(workflows)) {
         log.success(messages.workflows.list(currentEnv));
         if (!workflows.length) log.help(messages.workflows.noneExist());
@@ -854,7 +880,7 @@ class ContensisCli {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
     if (contensis) {
-      const [workflowsErr, workflows] = await contensis.content.sourceRepo.workflows.GetWorkflows();
+      const [workflowsErr, workflows] = await contensis.content.source.workflows.GetWorkflows();
       if (Array.isArray(workflows)) {
         log.success(messages.workflows.list(currentEnv));
         const workflow = (0, import_find.findByIdOrName)(workflows, workflowNameOrId);
@@ -1013,9 +1039,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();
       if (migrateErr) (0, import_logger.logError)(migrateErr);
@@ -1180,7 +1206,7 @@ Nodes:`));
         for (const contentType of fileData) {
           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) {
             log.success(
@@ -1330,7 +1356,7 @@ Components:`));
         for (const component of fileData) {
           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) {
             log.success(
@@ -1396,20 +1422,22 @@ Components:`));
     if (contensis) {
       log.line();
       const entries = await contensis.GetEntries({ withDependents });
-      await this.HandleFormattingAndOutput(
-        entries,
-        () => {
-          var _a;
-          return (
-            // print the entries to console
-            (0, import_migratortron.logEntitiesTable)({
-              entries,
-              projectId: currentProject,
-              fields: (_a = contensis.payload.query) == null ? void 0 : _a.fields
-            })
-          );
-        }
-      );
+      const nodes = contensis.content.source.nodes.raw;
+      const combinedOutput = [...entries, ...nodes];
+      await this.HandleFormattingAndOutput(combinedOutput, () => {
+        var _a, _b;
+        (0, import_migratortron.logEntitiesTable)({
+          entries,
+          projectId: currentProject,
+          fields: (_a = contensis.payload.query) == null ? void 0 : _a.fields
+        });
+        if (nodes.length)
+          (0, import_migratortron.logEntitiesTable)({
+            nodes,
+            projectId: currentProject,
+            fields: (_b = contensis.payload.query) == null ? void 0 : _b.fields
+          });
+      });
     } else {
       log.warning(messages.models.noList(currentProject));
       log.help(messages.connect.tip());
@@ -1419,34 +1447,42 @@ Components:`));
     commit,
     fromFile,
     logOutput,
-    saveEntries
+    saveEntries,
+    data
   }) => {
     var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
       fromFile,
-      importDataType: "entries"
+      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();
       if (err) (0, import_logger.logError)(err);
       else {
         const { entries, nodes } = contensis.content.targets[currentProject];
-        const output = saveEntries ? (_a = entries.migrate) == null ? void 0 : _a.map((me) => me.toJSON()) : result;
+        const output = saveEntries ? (
+          // include entries and dependent nodes when saving entries
+          [
+            ((_a = entries.migrate) == null ? void 0 : _a.map((me) => me.toJSON())) || [],
+            nodes.migrateNodes.map((mn) => mn.node)
+          ].flat()
+        ) : result;
         await this.HandleFormattingAndOutput(output, () => {
           (0, import_console.printEntriesMigrateResult)(this, result, {
             showAll: logOutput === "all",
             showDiff: logOutput === "all" || logOutput === "changes",
             showChanged: logOutput === "changes"
           });
-          if (["all", "changes"].includes(logOutput))
+          if (["all", "changes"].includes(logOutput) && nodes.migrateNodes.length)
             (0, import_console.printNodeTreeOutput)(
               this,
               {
@@ -1497,9 +1533,9 @@ Components:`));
     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 (0, import_await_to_js.default)(
         contensis.content.copy.MigrateFieldContent()
@@ -1539,6 +1575,63 @@ Components:`));
       log.help(messages.connect.tip());
     }
   };
+  UpdateEntryField = async ({
+    commit,
+    fromFile,
+    logOutput,
+    saveEntries
+  }) => {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
+    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 (0, import_await_to_js.default)(
+        contensis.content.update.UpdateFieldContent()
+      );
+      if (err) (0, import_logger.logError)(err);
+      if (result) {
+        const output = saveEntries ? (_a = contensis.content.update.targets[currentProject].entries.migrate) == null ? void 0 : _a.map((me) => me.toJSON()) : result;
+        await this.HandleFormattingAndOutput(output, () => {
+          (0, import_console.printEntriesMigrateResult)(this, result, {
+            action: "update",
+            showAll: logOutput === "all",
+            showDiff: logOutput === "all" || logOutput === "changes",
+            showChanged: logOutput === "changes"
+          });
+        });
+      }
+      if (result && !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)))) {
+        log.success(
+          messages.entries.update.success(
+            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
+          )
+        );
+        if (!commit) {
+          log.raw(``);
+          log.help(messages.entries.commitTip());
+        }
+      } else {
+        log.error(messages.entries.update.failed(currentEnv), err);
+        if (!((_h = (_g = result == null ? void 0 : result.entriesToMigrate) == null ? void 0 : _g[currentProject]) == null ? void 0 : _h.totalCount))
+          log.help(messages.entries.notFound(currentEnv));
+      }
+    } else {
+      log.warning(messages.models.noList(currentProject));
+      log.help(messages.connect.tip());
+    }
+  };
   GetNodes = async (rootPath, depth = 0) => {
     const { currentProject, log, messages } = this;
     const contensis = await this.ConnectContensis();
@@ -1549,7 +1642,7 @@ Components:`));
         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));
       await this.HandleFormattingAndOutput(nodes, () => {
         log.object({ ...root, children: void 0, language: void 0 });
@@ -1576,15 +1669,15 @@ Components:`));
     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();
       if (err) log.raw(``);
       else
         await this.HandleFormattingAndOutput(result, () => {
-          const migrateTree = contensis.nodes.targetRepos[currentProject].nodes.migrateNodesTreeView;
+          const migrateTree = contensis.nodes.targets[currentProject].nodes.migrateNodesTreeView;
           (0, import_console.printNodeTreeOutput)(this, migrateTree, logOutput, logLimit);
           (0, import_console.printNodesMigrateResult)(this, result, {
             showAll: logOutput === "all",
@@ -1642,7 +1735,7 @@ Components:`));
         await this.HandleFormattingAndOutput(result, () => {
           (0, import_console.printNodeTreeOutput)(
             this,
-            contensis.nodes.targetRepos[currentProject].nodes.migrateNodesTreeView
+            contensis.nodes.targets[currentProject].nodes.migrateNodesTreeView
           );
         });
       }
@@ -1826,9 +1919,7 @@ Components:`));
     console.log((0, import_json.jsonFormatter)(block));
     const contensis = await this.ConnectContensis();
     if (contensis) {
-      const [err, blockVersion] = await contensis.blocks.PushBlockVersion(
-        block
-      );
+      const [err, blockVersion] = await contensis.blocks.PushBlockVersion(block);
       if (!err) {
         log.success(
           messages.blocks.pushed(
@@ -1884,9 +1975,7 @@ Components:`));
     if (contensis) {
       let actionOnBlockVersion = version;
       if (action === "release" && version === "latest") {
-        const [getErr, blockVersion2] = await this.GetLatestBlockVersion(
-          blockId
-        );
+        const [getErr, blockVersion2] = await this.GetLatestBlockVersion(blockId);
         if (getErr) {
           throw new Error(
             `${messages.blocks.noList(
@@ -2099,6 +2188,9 @@ Components:`));
     } else if (format === "csv") {
       log.raw("");
       log.raw(log.infoText(await (0, import_csv.csvFormatter)((0, import_json.limitFields)(obj, fields))));
+    } else if (format === "html") {
+      log.raw("");
+      log.raw(log.infoText((0, import_html.htmlFormatter)((0, import_json.limitFields)(obj, fields))));
     } else if (format === "xml") {
       log.raw("");
       log.raw(log.infoText((0, import_xml.xmlFormatter)((0, import_json.limitFields)(obj, fields))));
@@ -2112,6 +2204,8 @@ Components:`));
       const isText = !(0, import_util.tryParse)(obj) && typeof obj === "string";
       if (format === "csv") {
         writeString = await (0, import_csv.csvFormatter)((0, import_json.limitFields)(obj, fields));
+      } else if (format === "html") {
+        writeString = (0, import_html.htmlFormatter)((0, import_json.limitFields)(obj, fields));
       } else if (format === "xml") {
         writeString = (0, import_xml.xmlFormatter)((0, import_json.limitFields)(obj, fields));
       } else