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

package/dist/services/ContensisCliService.js

@@ -18,6 +18,10 @@ var __copyProps = (to2, from, except, desc) => {
   return to2;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -45,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");
@@ -88,9 +93,8 @@ class ContensisCli {
   get env() {
     const currentEnvironment = this.currentEnv;
     const environments = this.cache.environments || {};
-    if (!currentEnvironment)
-      return {};
-    else if (!!environments[currentEnvironment])
+    if (!currentEnvironment) return {};
+    else if (environments[currentEnvironment])
       return environments[currentEnvironment];
     else {
       return {
@@ -121,21 +125,16 @@ class ContensisCli {
     const environments = this.cache.environments || {};
     this.currentEnv = currentEnvironment;
     const env = this.env;
-    if (outputOpts == null ? void 0 : outputOpts.projectId)
-      env.currentProject = outputOpts.projectId;
-    if (outputOpts == null ? void 0 : outputOpts.user)
-      env.lastUserId = outputOpts.user;
-    if (outputOpts == null ? void 0 : outputOpts.password)
-      env.passwordFallback = outputOpts.password;
-    if (outputOpts == null ? void 0 : outputOpts.clientId)
-      env.lastUserId = outputOpts.clientId;
+    if (outputOpts == null ? void 0 : outputOpts.projectId) env.currentProject = outputOpts.projectId;
+    if (outputOpts == null ? void 0 : outputOpts.user) env.lastUserId = outputOpts.user;
+    if (outputOpts == null ? void 0 : outputOpts.password) env.passwordFallback = outputOpts.password;
+    if (outputOpts == null ? void 0 : outputOpts.clientId) env.lastUserId = outputOpts.clientId;
     if (outputOpts == null ? void 0 : outputOpts.sharedSecret)
       if (outputOpts.sharedSecret.startsWith("-"))
         throw new Error(
           `Shared secret option provided a value of ${outputOpts.sharedSecret}`
         );
-      else
-        env.passwordFallback = 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) {
@@ -144,7 +143,7 @@ class ContensisCli {
     this.command = {
       commandText,
       options: outputOpts,
-      createdDate: new Date().toISOString(),
+      createdDate: (/* @__PURE__ */ new Date()).toISOString(),
       invokedBy: env == null ? void 0 : env.lastUserId
     };
     if (currentEnvironment) {
@@ -162,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) {
@@ -173,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;
@@ -230,10 +253,8 @@ class ContensisCli {
           );
         }
       } else {
-        if (!currentEnv)
-          log.help(messages.connect.help());
-        if (!userId)
-          log.help(messages.connect.tip());
+        if (!currentEnv) log.help(messages.connect.help());
+        if (!userId) log.help(messages.connect.tip());
       }
     }
     return this.contensis;
@@ -241,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;
@@ -322,10 +344,8 @@ class ContensisCli {
         }
       }
     } else {
-      if (!currentEnv)
-        log.help(messages.connect.help());
-      if (!targetUserId)
-        log.help(messages.connect.tip());
+      if (!currentEnv) log.help(messages.connect.help());
+      if (!targetUserId) log.help(messages.connect.tip());
     }
     return this.contensis;
   };
@@ -367,7 +387,7 @@ class ContensisCli {
     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;
+    const { messages } = this;
     if (userId) {
       const { currentEnv, env } = this;
       if (currentEnv) {
@@ -401,10 +421,8 @@ class ContensisCli {
               env.lastUserId = userId;
               env.passwordFallback = credentials.remarks.secure !== true ? (_d = credentials.current) == null ? void 0 : _d.password : void 0;
               this.session.UpdateEnv(env);
-              if (inputPassword)
-                await credentials.Save(inputPassword);
-              if (sharedSecret)
-                await credentials.Save(sharedSecret);
+              if (inputPassword) await credentials.Save(inputPassword);
+              if (sharedSecret) await credentials.Save(sharedSecret);
               if (!silent) {
                 import_logger.Logger.success(messages.login.success(currentEnv, userId));
                 await this.PrintProjects();
@@ -460,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(
@@ -497,6 +515,7 @@ class ContensisCli {
             try {
               color = import_chalk.default.keyword(project.color);
             } catch (ex) {
+              import_logger.Logger.debug(`${ex}`);
               color = import_chalk.default.white;
             }
             console.log(
@@ -518,7 +537,7 @@ class ContensisCli {
     }
   };
   PrintProject = async (projectId = this.currentProject) => {
-    const { log, messages, session } = this;
+    const { log, messages } = this;
     const contensis = await this.ConnectContensis();
     if (contensis) {
       const [projectsErr, projects] = await (0, import_await_to_js.default)(
@@ -636,7 +655,7 @@ class ContensisCli {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis({ commit: true });
     if (contensis) {
-      const [err, key] = await contensis.apiKeys.RemoveKey(id);
+      const [err] = await contensis.apiKeys.RemoveKey(id);
       if (!err) {
         log.success(messages.keys.removed(currentEnv, id));
         console.log("");
@@ -652,8 +671,7 @@ class ContensisCli {
       const [rolesErr, roles] = await (0, import_await_to_js.default)(contensis.roles.GetRoles());
       if (Array.isArray(roles)) {
         log.success(messages.roles.list(currentEnv));
-        if (!roles.length)
-          log.help(messages.roles.noneExist());
+        if (!roles.length) log.help(messages.roles.noneExist());
         await this.HandleFormattingAndOutput(roles, () => {
           var _a, _b, _c, _d, _e;
           for (const {
@@ -666,8 +684,7 @@ class ContensisCli {
           } of roles) {
             const color = enabled ? (s) => s : log.infoText;
             console.log(color(`  - ${import_chalk.default.bold(name)} ${log.infoText(id)}`));
-            if (description)
-              console.log(log.infoText(`    ${description}`));
+            if (description) console.log(log.infoText(`    ${description}`));
             if (enabled === false)
               console.log(`      ${import_chalk.default.bold.grey("enabled")}: false`);
             if ((_a = assignments.groups) == null ? void 0 : _a.length)
@@ -722,10 +739,8 @@ class ContensisCli {
       if (Array.isArray(roles)) {
         log.success(messages.roles.list(currentEnv));
         const role = (0, import_find.findByIdOrName)(roles, roleNameOrId);
-        if (role)
-          await this.HandleFormattingAndOutput(role, log.object);
-        else
-          log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
+        if (role) await this.HandleFormattingAndOutput(role, log.object);
+        else log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
       }
       if (rolesErr) {
         log.error(messages.roles.noList(currentEnv));
@@ -798,8 +813,7 @@ class ContensisCli {
           const [deleteErr] = await contensis.roles.RemoveRole(existingRole.id);
           if (deleteErr)
             log.error(messages.roles.failedRemove(currentEnv, roleNameOrId));
-          else
-            log.success(messages.roles.removed(currentEnv, roleNameOrId));
+          else log.success(messages.roles.removed(currentEnv, roleNameOrId));
         } else {
           log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
         }
@@ -814,11 +828,10 @@ 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());
+        if (!workflows.length) log.help(messages.workflows.noneExist());
         const stringFromLanguageObject = (o) => {
           var _a;
           return (_a = Object.values(o || {})) == null ? void 0 : _a[0];
@@ -867,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);
@@ -1026,30 +1039,25 @@ 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);
+      if (migrateErr) (0, import_logger.logError)(migrateErr);
       else
         await this.HandleFormattingAndOutput(result, () => {
           if (!result.committed) {
             log.raw(log.boldText(`
 Content types:`));
-            if (!result.contentTypes)
-              log.info(`- None returned
+            if (!result.contentTypes) log.info(`- None returned
 `);
-            else
-              (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
+            else (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
             log.raw(log.boldText(`
 Components:`));
-            if (!result.components)
-              log.info(`- None returned
+            if (!result.components) log.info(`- None returned
 `);
-            else
-              (0, import_console.printModelMigrationAnalysis)(this, result.components);
+            else (0, import_console.printModelMigrationAnalysis)(this, result.components);
             if (result.defaults && Object.keys(result.defaults).length) {
               log.raw(log.boldText(`
 Defaults:`));
@@ -1156,6 +1164,7 @@ Nodes:`));
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: "user-input"
+      // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       const [err, result] = await contensis.DeleteContentTypes(contentTypeIds);
@@ -1187,8 +1196,7 @@ Nodes:`));
     let fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
     if (typeof fileData === "string")
       throw new Error(`Import file format must be of type JSON`);
-    if (!Array.isArray(fileData))
-      fileData = [fileData];
+    if (!Array.isArray(fileData)) fileData = [fileData];
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: fromFile ? "user-input" : void 0
@@ -1198,9 +1206,8 @@ Nodes:`));
         for (const contentType of fileData) {
           contentType.projectId = currentProject;
           delete contentType.uuid;
-          const [err, created, createStatus] = await contensis.models.targetRepos[currentProject].repo.UpsertContentType(false, contentType);
-          if (err)
-            log.error(err.message, err);
+          const [err, , createStatus] = await contensis.models.targets[currentProject].repo.UpsertContentType(false, contentType);
+          if (err) log.error(err.message, err);
           if (createStatus) {
             log.success(
               messages.contenttypes.created(
@@ -1229,8 +1236,7 @@ Nodes:`));
     let fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
     if (typeof fileData === "string")
       throw new Error(`Import file format must be of type JSON`);
-    if (!Array.isArray(fileData))
-      fileData = [fileData];
+    if (!Array.isArray(fileData)) fileData = [fileData];
     const contensis = await this.ConnectContensisImport({
       fromFile,
       importDataType: "models"
@@ -1239,8 +1245,7 @@ Nodes:`));
       const [err, result] = await (0, import_await_to_js.default)(
         contensis.models.Diff(fileData.length ? fileData : modelIds)
       );
-      if (err)
-        log.error(err.message, err);
+      if (err) log.error(err.message, err);
       if (result)
         await this.HandleFormattingAndOutput(result, () => {
           var _a;
@@ -1252,18 +1257,14 @@ Nodes:`));
           );
           if (result.committed === false) {
             log.raw(log.boldText(`Content types:`));
-            if (!result.contentTypes)
-              log.info(`- None returned
+            if (!result.contentTypes) log.info(`- None returned
 `);
-            else
-              (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
+            else (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
             log.raw(log.boldText(`
 Components:`));
-            if (!result.components)
-              log.info(`- None returned
+            if (!result.components) log.info(`- None returned
 `);
-            else
-              (0, import_console.printModelMigrationAnalysis)(this, result.components);
+            else (0, import_console.printModelMigrationAnalysis)(this, result.components);
           }
         });
     }
@@ -1310,6 +1311,7 @@ Components:`));
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: "user-input"
+      // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       const [err, result] = await contensis.DeleteContentTypes(
@@ -1344,8 +1346,7 @@ Components:`));
     let fileData = fromFile ? await (0, import_file_provider.readFileAsJSON)(fromFile) || [] : [];
     if (typeof fileData === "string")
       throw new Error(`Import file format must be of type JSON`);
-    if (!Array.isArray(fileData))
-      fileData = [fileData];
+    if (!Array.isArray(fileData)) fileData = [fileData];
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: fromFile ? "user-input" : void 0
@@ -1355,9 +1356,8 @@ Components:`));
         for (const component of fileData) {
           component.projectId = currentProject;
           delete component.uuid;
-          const [err, created, createStatus] = await contensis.models.targetRepos[currentProject].repo.UpsertComponent(false, component);
-          if (err)
-            log.error(err.message, err);
+          const [err, , createStatus] = await contensis.models.targets[currentProject].repo.UpsertComponent(false, component);
+          if (err) log.error(err.message, err);
           if (createStatus) {
             log.success(
               messages.components.created(
@@ -1385,6 +1385,7 @@ Components:`));
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: "user-input"
+      // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       if (contensis.isPreview) {
@@ -1421,17 +1422,22 @@ Components:`));
     if (contensis) {
       log.line();
       const entries = await contensis.GetEntries({ withDependents });
-      await this.HandleFormattingAndOutput(
-        entries,
-        () => {
-          var _a;
-          return (0, import_migratortron.logEntitiesTable)({
-            entries,
+      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: (_a = contensis.payload.query) == null ? void 0 : _a.fields
+            fields: (_b = contensis.payload.query) == null ? void 0 : _b.fields
           });
-        }
-      );
+      });
     } else {
       log.warning(messages.models.noList(currentProject));
       log.help(messages.connect.tip());
@@ -1441,35 +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);
+      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,
               {
@@ -1520,15 +1533,14 @@ 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()
       );
-      if (err)
-        (0, import_logger.logError)(err);
+      if (err) (0, import_logger.logError)(err);
       if (result) {
         const output = saveEntries ? (_a = contensis.content.copy.targets[currentProject].entries.migrate) == null ? void 0 : _a.map(
           (me) => me.toJSON()
@@ -1563,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();
@@ -1573,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 });
@@ -1600,16 +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(``);
+      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",
@@ -1624,8 +1692,8 @@ Components:`));
       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;
+          const created = typeof nodesCreated === "number" ? nodesCreated : 0;
+          const updated = typeof nodesUpdated === "number" ? nodesUpdated : 0;
           totalCount = created + updated;
         } else {
           totalCount = typeof nodesMigrateCount === "number" ? nodesMigrateCount : 0;
@@ -1640,8 +1708,7 @@ Components:`));
           log.help(messages.nodes.noChange(currentEnv));
         } else {
           log.error(messages.nodes.failedImport(currentEnv), err);
-          if (!nodesMigrateCount)
-            log.help(messages.nodes.notFound(currentEnv));
+          if (!nodesMigrateCount) log.help(messages.nodes.notFound(currentEnv));
         }
       }
     } else {
@@ -1655,6 +1722,7 @@ Components:`));
     const contensis = await this.ConnectContensisImport({
       commit,
       importDataType: "user-input"
+      // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       if (contensis.isPreview) {
@@ -1667,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
           );
         });
       }
@@ -1703,8 +1771,7 @@ Components:`));
       ) : webhooks;
       if (Array.isArray(filteredResults)) {
         log.success(messages.webhooks.list(currentEnv));
-        if (!(webhooks == null ? void 0 : webhooks.length))
-          log.warning(messages.webhooks.noneExist());
+        if (!(webhooks == null ? void 0 : webhooks.length)) log.warning(messages.webhooks.noneExist());
         else {
           await this.HandleFormattingAndOutput(filteredResults, () => {
             for (const {
@@ -1724,8 +1791,7 @@ Components:`));
                   `  ${import_chalk.default.bold.white`- ${name}`} ${id} [${(version.modified || version.created).toString().substring(0, 10)} ${version.modifiedBy || version.createdBy}]`
                 )
               );
-              if (description)
-                console.log(log.infoText`    ${description}`);
+              if (description) console.log(log.infoText`    ${description}`);
               console.log(`    ${log.infoText`[${method}]`} ${url2}`);
               if (headers && Object.keys(headers).length) {
                 console.log(`    ${log.infoText`headers`}:`);
@@ -1853,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(
@@ -1893,8 +1957,7 @@ Components:`));
       blockVersionNo = `${(_a = blockVersions == null ? void 0 : blockVersions[0]) == null ? void 0 : _a.version.versionNo}`;
       if (!Number.isNaN(blockVersionNo) && Number(blockVersionNo) > 0)
         return [null, blockVersionNo];
-      else
-        throw new Error(`'${blockVersionNo}' is not a valid version number`);
+      else throw new Error(`'${blockVersionNo}' is not a valid version number`);
     } catch (parseVersionEx) {
       log.info(
         `Request for blockId: ${blockId}, branch: ${branch}, version: latest`
@@ -1912,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(
@@ -1997,7 +2058,7 @@ Components:`));
           );
           stopFollowing();
         });
-        let delay = (0, import_timers.promiseDelay)(5 * 1e3, null);
+        const delay = (0, import_timers.promiseDelay)(5 * 1e3, null);
         const stopFollowing = () => {
           following = false;
           delay.cancel();
@@ -2078,6 +2139,7 @@ Components:`));
       }
     }
   };
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
   PrintRenderers = async (rendererId) => {
     const { currentEnv, env, log, messages } = this;
     const contensis = await this.ConnectContensis();
@@ -2126,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))));
@@ -2139,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