contensis-cli 1.0.0-beta.8 → 1.0.0-beta.81

package/dist/services/ContensisCliService.js

@@ -33,6 +33,7 @@ var import_path = __toESM(require("path"));
 var import_node_fetch = __toESM(require("node-fetch"));
 var import_inquirer = __toESM(require("inquirer"));
 var import_await_to_js = __toESM(require("await-to-js"));
+var import_chalk = __toESM(require("chalk"));
 var import_util = require("../util");
 var import_SessionCacheProvider = __toESM(require("../providers/SessionCacheProvider"));
 var import_ContensisAuthService = __toESM(require("./ContensisAuthService"));
@@ -43,37 +44,57 @@ var import_migratortron = require("migratortron");
 var import_csv = require("../util/csv.formatter");
 var import_xml = require("../util/xml.formatter");
 var import_json = require("../util/json.formatter");
+var import_diff = require("../util/diff");
+var import_timers = require("../util/timers");
 var import_console = require("../util/console.printer");
 var import_file_provider = require("../providers/file-provider");
+let insecurePasswordWarningShown = false;
 class ContensisCli {
   static quit = (error) => {
     process.removeAllListeners("exit");
     const exitCode = error ? 1 : 0;
-    console.info(`
-Exiting contensis-cli with exit code: ${exitCode}
-`);
     process.exit(exitCode);
   };
-  cache;
+  command;
+  format;
+  output;
+  session;
   contensis;
   contensisOpts;
-  contentTypes;
-  components;
-  currentEnv;
   currentProject;
-  env;
-  sourceEnv;
+  sourceAlias;
   targetEnv;
   urls;
-  command;
-  format;
-  output;
   log = import_logger.Logger;
   messages = import_en_GB.LogMessages;
-  session;
   verb;
   noun;
   thirdArg;
+  get cache() {
+    return this.session.Get();
+  }
+  get currentEnv() {
+    return this.cache.currentEnvironment || "";
+  }
+  set currentEnv(currentEnvironment) {
+    this.session.Update({ currentEnvironment });
+  }
+  get env() {
+    const currentEnvironment = this.currentEnv;
+    const environments = this.cache.environments || {};
+    if (!currentEnvironment)
+      return {};
+    else if (!!environments[currentEnvironment])
+      return environments[currentEnvironment];
+    else {
+      return {
+        history: [],
+        lastUserId: "",
+        projects: [],
+        versionStatus: "latest"
+      };
+    }
+  }
   constructor(args, outputOpts, contensisOpts = {}) {
     const [exe, script, verb = "", noun = "", ...restArgs] = args;
     this.verb = verb == null ? void 0 : verb.toLowerCase();
@@ -81,24 +102,12 @@ Exiting contensis-cli with exit code: ${exitCode}
     this.thirdArg = restArgs == null ? void 0 : restArgs[0];
     const commandText = `${this.verb} ${this.noun} ${restArgs ? restArgs.join(" ") : ""}`.trim();
     this.session = new import_SessionCacheProvider.default();
-    this.cache = this.session.Get();
     this.contensisOpts = contensisOpts;
     this.format = outputOpts == null ? void 0 : outputOpts.format;
     this.output = (outputOpts == null ? void 0 : outputOpts.output) && import_path.default.join(process.cwd(), outputOpts.output);
-    const currentEnvironment = (outputOpts == null ? void 0 : outputOpts.alias) || this.cache.currentEnvironment || "";
+    const currentEnvironment = (outputOpts == null ? void 0 : outputOpts.alias) || this.currentEnv;
     const environments = this.cache.environments || {};
-    if (!currentEnvironment)
-      this.env = {};
-    else if (!!environments[currentEnvironment])
-      this.env = environments[currentEnvironment];
-    else {
-      this.env = {
-        history: [],
-        lastUserId: "",
-        projects: [],
-        versionStatus: "latest"
-      };
-    }
+    this.currentEnv = currentEnvironment;
     const env = this.env;
     if (outputOpts == null ? void 0 : outputOpts.projectId)
       env.currentProject = outputOpts.projectId;
@@ -110,9 +119,8 @@ Exiting contensis-cli with exit code: ${exitCode}
       env.lastUserId = outputOpts.clientId;
     if (outputOpts == null ? void 0 : outputOpts.sharedSecret)
       env.passwordFallback = outputOpts.sharedSecret;
-    this.currentEnv = currentEnvironment;
     this.currentProject = (env == null ? void 0 : env.currentProject) || "null";
-    this.sourceEnv = (outputOpts == null ? void 0 : outputOpts.sourceEnv) || currentEnvironment;
+    this.sourceAlias = (outputOpts == null ? void 0 : outputOpts.sourceAlias) || currentEnvironment;
     if (currentEnvironment) {
       this.urls = (0, import_util.url)(currentEnvironment, (env == null ? void 0 : env.currentProject) || "website");
     }
@@ -124,7 +132,7 @@ Exiting contensis-cli with exit code: ${exitCode}
     if (currentEnvironment) {
       env.history = [this.command];
       if (commandText) {
-        environments[currentEnvironment] = this.env;
+        environments[currentEnvironment] = env;
         this.session.Update({
           currentEnvironment,
           environments,
@@ -149,34 +157,20 @@ Exiting contensis-cli with exit code: ${exitCode}
   };
   Connect = async (environment) => {
     var _a;
-    const { cache, log, messages, session } = this;
+    const { log, messages, session } = this;
     if (environment) {
-      const envCache = cache.environments[environment];
-      if (!envCache)
-        cache.environments[environment] = {
-          versionStatus: "published",
-          history: [],
-          lastUserId: "",
-          projects: [],
-          ...!this.currentEnv ? this.env : {}
-        };
-      this.env = cache.environments[environment];
       this.currentEnv = environment;
       this.urls = (0, import_util.url)(environment, "website");
       const [fetchErr, response] = await (0, import_await_to_js.default)((0, import_node_fetch.default)(this.urls.cms));
       if (response && (response == null ? void 0 : response.status) < 400) {
         log.success(messages.connect.connected(environment));
+        session.UpdateEnv(this.env, environment);
         if ((_a = this.env) == null ? void 0 : _a.lastUserId) {
-          await this.ConnectContensis();
           await this.PrintProjects();
         } else {
           log.warning(messages.projects.noList());
           log.help(messages.connect.tip());
         }
-        session.Update({
-          currentEnvironment: environment,
-          environments: cache.environments
-        });
       } else {
         log.error(
           messages.connect.unreachable(this.urls.cms, (response == null ? void 0 : response.status) || 0)
@@ -188,93 +182,80 @@ Exiting contensis-cli with exit code: ${exitCode}
   };
   ConnectContensis = async ({ commit = false } = {}) => {
     var _a, _b, _c;
-    const { contensisOpts, currentEnv, env, log, messages } = this;
-    const userId = env == null ? void 0 : env.lastUserId;
-    const isGuidId = userId && (0, import_util.isUuid)(userId);
-    if (currentEnv && userId) {
-      const [credentialError, credentials] = await new import_CredentialProvider.default(
-        {
+    if (!this.contensis) {
+      const { contensisOpts, currentEnv, env, log, messages } = this;
+      const userId = env == null ? void 0 : env.lastUserId;
+      const isGuidId = userId && (0, import_util.isUuid)(userId);
+      if (currentEnv && userId) {
+        const credentials = await this.GetCredentials(
           userId,
-          alias: currentEnv
-        },
-        env.passwordFallback
-      ).Init();
-      if (credentialError && !credentials.current) {
-        log.error(credentialError);
-        return;
-      }
-      const cachedPassword = (_a = credentials == null ? void 0 : credentials.current) == null ? void 0 : _a.password;
-      if (cachedPassword) {
-        this.contensis = new import_migratortron.ContensisMigrationService(
-          {
-            ...contensisOpts,
-            source: {
-              url: ((_b = this.urls) == null ? void 0 : _b.cms) || "",
-              username: !isGuidId ? userId : void 0,
-              password: !isGuidId ? cachedPassword : void 0,
-              clientId: isGuidId ? userId : void 0,
-              sharedSecret: isGuidId ? cachedPassword : void 0,
-              project: (env == null ? void 0 : env.currentProject) || "",
-              assetHostname: (_c = this.urls) == null ? void 0 : _c.previewWeb
-            },
-            concurrency: typeof contensisOpts.concurrency !== "undefined" ? contensisOpts.concurrency : 3,
-            outputProgress: true
-          },
-          !commit
+          env.passwordFallback
         );
+        const cachedPassword = (_a = credentials == null ? void 0 : credentials.current) == null ? void 0 : _a.password;
+        if (cachedPassword) {
+          this.contensis = new import_migratortron.ContensisMigrationService(
+            {
+              ...contensisOpts,
+              source: {
+                url: ((_b = this.urls) == null ? void 0 : _b.cms) || "",
+                username: !isGuidId ? userId : void 0,
+                password: !isGuidId ? cachedPassword : void 0,
+                clientId: isGuidId ? userId : void 0,
+                sharedSecret: isGuidId ? cachedPassword : void 0,
+                project: (env == null ? void 0 : env.currentProject) || "",
+                assetHostname: (_c = this.urls) == null ? void 0 : _c.previewWeb
+              },
+              concurrency: typeof contensisOpts.concurrency !== "undefined" ? contensisOpts.concurrency : 3,
+              outputProgress: true
+            },
+            !commit
+          );
+        }
+      } else {
+        if (!currentEnv)
+          log.help(messages.connect.help());
+        if (!userId)
+          log.help(messages.connect.tip());
       }
-    } else {
-      if (!currentEnv)
-        log.help(messages.connect.help());
-      if (!userId)
-        log.help(messages.connect.tip());
     }
+    return this.contensis;
   };
   ConnectContensisImport = async ({
-    commit,
-    source,
-    fileData,
-    fileDataType
+    commit = false,
+    fromFile,
+    importDataType
   }) => {
     var _a, _b, _c, _d, _e, _f;
-    const { contensisOpts, currentEnv, env, log, messages, sourceEnv } = this;
+    const source = fromFile ? "file" : "contensis";
+    const fileData = fromFile ? (0, import_file_provider.readJsonFile)(fromFile) || [] : [];
+    if (typeof fileData === "string")
+      throw new Error(`Import file format must be of type JSON`);
+    const { contensisOpts, currentEnv, env, log, messages, sourceAlias } = this;
     const environments = this.cache.environments || {};
-    const sourceEnvironment = environments[sourceEnv || ""] || {};
+    const sourceEnvironment = environments[sourceAlias || ""] || {};
     const sourceCms = "source" in contensisOpts && contensisOpts.source || {};
     const sourceUserId = sourceCms.clientId || sourceCms.username || sourceEnvironment.lastUserId;
     const sourceProjectId = sourceCms.project || sourceEnvironment.currentProject || "website";
     const isSourceGuidId = sourceUserId && (0, import_util.isUuid)(sourceUserId);
-    const sourceUrls = (0, import_util.url)(sourceEnv || "", sourceProjectId);
+    const sourceUrls = (0, import_util.url)(sourceAlias || "", sourceProjectId);
     const sourcePassword = sourceCms.sharedSecret || sourceCms.password || sourceEnvironment.passwordFallback;
     const targetUserId = env == null ? void 0 : env.lastUserId;
     const isTargetGuidId = targetUserId && (0, import_util.isUuid)(targetUserId);
     if (sourceUserId && currentEnv && targetUserId) {
-      const [sourceCredentialError, sourceCredentials] = await new import_CredentialProvider.default(
-        {
-          userId: sourceUserId,
-          alias: currentEnv
-        },
-        sourcePassword
-      ).Init();
-      if (sourceCredentialError && !sourceCredentials.current) {
-        (0, import_logger.logError)(sourceCredentialError);
-        return;
-      }
+      const sourceCredentials = await this.GetCredentials(
+        sourceUserId,
+        sourcePassword,
+        sourceAlias,
+        false
+      );
       const cachedSourcePassword = (_a = sourceCredentials == null ? void 0 : sourceCredentials.current) == null ? void 0 : _a.password;
-      const [targetCredentialError, targetCredentials] = await new import_CredentialProvider.default(
-        {
-          userId: targetUserId,
-          alias: currentEnv
-        },
+      const targetCredentials = await this.GetCredentials(
+        targetUserId,
         env.passwordFallback
-      ).Init();
-      if (targetCredentialError && !targetCredentials.current) {
-        log.error(targetCredentialError);
-        return;
-      }
+      );
       const cachedTargetPassword = (_b = targetCredentials == null ? void 0 : targetCredentials.current) == null ? void 0 : _b.password;
       if (cachedSourcePassword && cachedTargetPassword) {
-        if (source === "file" || source === "input") {
+        if (source === "file" || importDataType === "user-input") {
           this.contensis = new import_migratortron.ContensisMigrationService(
             {
               concurrency: 3,
@@ -289,12 +270,11 @@ Exiting contensis-cli with exit code: ${exitCode}
                 targetProjects: [env.currentProject || ""],
                 assetHostname: (_d = this.urls) == null ? void 0 : _d.previewWeb
               },
-              ...fileDataType ? { [fileDataType]: fileData } : {}
+              ...importDataType ? { [importDataType]: fileData } : {}
             },
             !commit
           );
-        }
-        if (source === "contensis") {
+        } else if (source === "contensis") {
           this.contensis = new import_migratortron.ContensisMigrationService(
             {
               concurrency: 3,
@@ -329,82 +309,104 @@ Exiting contensis-cli with exit code: ${exitCode}
       if (!targetUserId)
         log.help(messages.connect.tip());
     }
+    return this.contensis;
+  };
+  GetCredentials = async (userId, password, currentEnv = this.currentEnv, saveCurrentEnv = true) => {
+    const { log, messages } = this;
+    if (userId) {
+      const [credentialError, credentials] = await new import_CredentialProvider.default(
+        { userId, alias: currentEnv },
+        password
+      ).Init();
+      if (credentialError && !credentials.current) {
+        log.error(credentialError);
+        return;
+      }
+      if (credentials.remarks.secure !== true) {
+        if (!insecurePasswordWarningShown) {
+          log.warning(messages.login.insecurePassword());
+          insecurePasswordWarningShown = true;
+        }
+      } else {
+        const env = this.cache.environments[currentEnv];
+        env.passwordFallback = void 0;
+        this.session.UpdateEnv(env, currentEnv, saveCurrentEnv);
+      }
+      return credentials;
+    }
   };
   Login = async (userId, {
     password = (0, import_util.isPassword)(this.env.passwordFallback),
     promptPassword = true,
     sharedSecret = (0, import_util.isSharedSecret)(this.env.passwordFallback),
-    silent = false
-  }) => {
+    silent = false,
+    attempt = 1
+  } = {}) => {
     var _a, _b, _c, _d;
-    let inputPassword = password;
+    let inputPassword = password || sharedSecret;
     const { log, messages } = this;
     if (userId) {
-      const { cache, currentEnv, env } = this;
+      const { currentEnv, env } = this;
       if (currentEnv) {
-        const [credentialError, credentials] = await new import_CredentialProvider.default(
-          { userId, alias: currentEnv },
-          inputPassword || sharedSecret
-        ).Init();
-        if (credentialError && !credentials.current) {
-          log.error(credentialError);
-          return;
-        }
-        if (credentials.remarks.secure !== true)
-          log.warning(messages.login.insecurePassword());
-        const cachedPassword = (0, import_util.isPassword)((_a = credentials == null ? void 0 : credentials.current) == null ? void 0 : _a.password);
-        const cachedSecret = (0, import_util.isSharedSecret)((_b = credentials == null ? void 0 : credentials.current) == null ? void 0 : _b.password);
-        if (!sharedSecret && !inputPassword && !cachedPassword && !cachedSecret && promptPassword) {
-          ({ inputPassword } = await import_inquirer.default.prompt([
-            {
-              type: "password",
-              message: messages.login.passwordPrompt(currentEnv, userId),
-              name: "inputPassword",
-              mask: "*",
-              prefix: void 0
-            }
-          ]));
-        }
-        if (sharedSecret || cachedSecret || inputPassword || cachedPassword) {
-          const authService = new import_ContensisAuthService.default({
-            username: userId,
-            password: inputPassword || cachedPassword,
-            projectId: (env == null ? void 0 : env.currentProject) || "website",
-            rootUrl: ((_c = this.urls) == null ? void 0 : _c.cms) || "",
-            clientId: userId,
-            clientSecret: sharedSecret || cachedSecret
-          });
-          const [authError, bearerToken] = await (0, import_await_to_js.default)(authService.BearerToken());
-          if (bearerToken) {
-            env.authToken = bearerToken;
-            env.lastUserId = userId;
-            env.passwordFallback = credentials.remarks.secure !== true ? (_d = credentials.current) == null ? void 0 : _d.password : void 0;
-            if (!silent) {
-              import_logger.Logger.success(messages.login.success(currentEnv, userId));
-              await this.PrintProjects();
-            }
-            if (inputPassword)
-              await credentials.Save(inputPassword);
-            if (sharedSecret)
-              await credentials.Save(sharedSecret);
-          } else if (authError) {
-            import_logger.Logger.error(authError.toString());
-            env.authToken = "";
-            env.lastUserId = "";
-            env.passwordFallback = void 0;
-            if ((cachedPassword || cachedSecret) && credentials.remarks.secure) {
-              await credentials.Delete();
-              return await this.Login(userId, { password, sharedSecret });
-            } else {
-              throw new Error(messages.login.failed(currentEnv, userId));
+        const credentials = await this.GetCredentials(userId, inputPassword);
+        if (credentials) {
+          const cachedPassword = (0, import_util.isPassword)((_a = credentials.current) == null ? void 0 : _a.password);
+          const cachedSecret = (0, import_util.isSharedSecret)((_b = credentials.current) == null ? void 0 : _b.password);
+          if (!cachedPassword && !cachedSecret && promptPassword) {
+            ({ inputPassword } = await import_inquirer.default.prompt([
+              {
+                type: "password",
+                message: messages.login.passwordPrompt(currentEnv, userId),
+                name: "inputPassword",
+                mask: "*",
+                prefix: void 0
+              }
+            ]));
+          }
+          if (inputPassword || cachedPassword || cachedSecret) {
+            const authService = new import_ContensisAuthService.default({
+              username: userId,
+              password: inputPassword || cachedPassword,
+              projectId: (env == null ? void 0 : env.currentProject) || "website",
+              rootUrl: ((_c = this.urls) == null ? void 0 : _c.cms) || "",
+              clientId: userId,
+              clientSecret: sharedSecret || cachedSecret
+            });
+            const [authError, bearerToken] = await (0, import_await_to_js.default)(
+              authService.BearerToken()
+            );
+            if (bearerToken) {
+              env.authToken = bearerToken;
+              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 (!silent) {
+                import_logger.Logger.success(messages.login.success(currentEnv, userId));
+                await this.PrintProjects();
+              }
+            } else if (authError) {
+              import_logger.Logger.error(authError.toString());
+              env.authToken = "";
+              env.lastUserId = "";
+              env.passwordFallback = void 0;
+              this.session.UpdateEnv(env);
+              if ((cachedPassword || cachedSecret) && credentials.remarks.secure) {
+                await credentials.Delete();
+                return await this.Login(userId, { password, sharedSecret });
+              } else {
+                throw new Error(messages.login.failed(currentEnv, userId));
+              }
             }
+            return env.authToken;
+          } else {
+            import_logger.Logger.error(messages.login.passwordPrompt());
+            if (attempt < 2)
+              return await this.Login(userId, { attempt: attempt + 1 });
           }
-          this.session.Update({
-            environments: cache.environments
-          });
-          return env.authToken;
-        } else {
-          import_logger.Logger.error(messages.login.passwordPrompt(currentEnv, userId));
         }
       } else {
         import_logger.Logger.error(messages.login.noEnv());
@@ -413,37 +415,100 @@ Exiting contensis-cli with exit code: ${exitCode}
       import_logger.Logger.error(messages.login.noUserId());
     }
   };
+  PrintContensisVersion = async () => {
+    const { log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [projectsErr, projects] = await (0, import_await_to_js.default)(
+        contensis.projects.GetSourceProjects()
+      );
+      if (Array.isArray(projects)) {
+        this.HandleFormattingAndOutput(
+          contensis.contensisVersion,
+          () => log.raw(log.highlightText(contensis.contensisVersion))
+        );
+      }
+      if (projectsErr) {
+        log.error(messages.projects.noList());
+        log.error(projectsErr.message);
+      }
+    }
+  };
+  PrintBearerToken = async () => {
+    const { log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [error, token] = await (0, import_await_to_js.default)(
+        contensis.content.sourceRepo.repo.BearerToken()
+      );
+      if (token) {
+        this.HandleFormattingAndOutput(
+          token,
+          () => log.raw(log.highlightText(token))
+        );
+      }
+      if (error) {
+        log.error(messages.projects.noList());
+        log.error(error.message);
+      }
+    }
+  };
   PrintProjects = async () => {
-    const { cache, currentEnv, currentProject, log, messages, session } = this;
-    if (!this.contensis)
-      await this.ConnectContensis();
-    if (this.contensis) {
+    const { currentProject, log, messages, session } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
       const [projectsErr, projects] = await (0, import_await_to_js.default)(
-        this.contensis.projects.GetSourceProjects()
+        contensis.projects.GetSourceProjects()
       );
       if (Array.isArray(projects)) {
-        const currentVals = cache.environments[currentEnv] || {};
         const nextCurrentProject = currentProject && currentProject !== "null" ? currentProject : projects.some((p) => p.id === "website") ? "website" : void 0;
-        cache.environments[currentEnv] = {
-          ...currentVals,
+        session.UpdateEnv({
           projects: projects.map((p) => p.id),
           currentProject: nextCurrentProject
-        };
+        });
         log.success(messages.projects.list());
+        log.raw("");
         this.HandleFormattingAndOutput(projects, () => {
-          for (const project of projects) {
+          for (const project of projects.sort(
+            (a, b) => a.id.localeCompare(b.id)
+          )) {
+            let color;
+            try {
+              color = import_chalk.default.keyword(project.color);
+            } catch (ex) {
+              color = import_chalk.default.white;
+            }
             console.log(
-              `  - ${nextCurrentProject === project.id ? "* " : ""}[${project.primaryLanguage}] ${project.id}`
+              `${nextCurrentProject === project.id ? `>> ${log.boldText(color(project.id))}` : `    ${color(project.id)}`} ${log.infoText(
+                `[${project.supportedLanguages.map(
+                  (l) => l === project.primaryLanguage ? `*${log.boldText(l)}` : l
+                ).join(" ")}]`
+              )}`
             );
           }
         });
-        session.Update({
-          environments: cache.environments
-        });
-        if (nextCurrentProject) {
-          this.env = cache.environments[currentEnv];
-          this.SetProject(nextCurrentProject);
-        }
+        if (!this.SetProject(nextCurrentProject))
+          log.warning(messages.projects.tip());
+      }
+      if (projectsErr) {
+        log.error(messages.projects.noList());
+        log.error(projectsErr.message);
+      }
+    }
+  };
+  PrintProject = async (projectId = this.currentProject) => {
+    const { log, messages, session } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [projectsErr, projects] = await (0, import_await_to_js.default)(
+        contensis.projects.GetSourceProjects()
+      );
+      const foundProject = projects == null ? void 0 : projects.find(
+        (p) => p.id.toLowerCase() === projectId.toLowerCase()
+      );
+      if (foundProject) {
+        log.raw("");
+        this.HandleFormattingAndOutput(foundProject, log.object);
       }
       if (projectsErr) {
         log.error(messages.projects.noList());
@@ -451,8 +516,8 @@ Exiting contensis-cli with exit code: ${exitCode}
       }
     }
   };
-  SetProject = async (projectId = "") => {
-    const { cache, env, log, messages, session } = this;
+  SetProject = (projectId = "website") => {
+    const { env, log, messages, session } = this;
     let nextProjectId;
     if ((env == null ? void 0 : env.projects.length) > 0 && (env == null ? void 0 : env.lastUserId)) {
       nextProjectId = env.projects.find(
@@ -460,10 +525,9 @@ Exiting contensis-cli with exit code: ${exitCode}
       );
       if (nextProjectId) {
         env.currentProject = nextProjectId;
-        session.Update({
-          environments: cache.environments
-        });
+        session.UpdateEnv(env);
         log.success(messages.projects.set(projectId));
+        log.raw("");
       } else {
         log.error(messages.projects.failedSet(projectId));
       }
@@ -473,8 +537,8 @@ Exiting contensis-cli with exit code: ${exitCode}
     }
     return nextProjectId;
   };
-  SetVersion = async (versionStatus) => {
-    const { cache, env, log, messages, session } = this;
+  SetVersion = (versionStatus) => {
+    const { env, log, messages, session } = this;
     if (!["latest", "published"].includes(versionStatus)) {
       log.error(messages.version.invalid(versionStatus));
       return false;
@@ -484,10 +548,7 @@ Exiting contensis-cli with exit code: ${exitCode}
       return false;
     }
     if ((env == null ? void 0 : env.projects.length) > 0 && (env == null ? void 0 : env.lastUserId)) {
-      env.versionStatus = versionStatus;
-      session.Update({
-        environments: cache.environments
-      });
+      session.UpdateEnv({ versionStatus });
       log.success(messages.version.set(this.currentEnv, versionStatus));
       return true;
     } else {
@@ -496,26 +557,11 @@ Exiting contensis-cli with exit code: ${exitCode}
       return false;
     }
   };
-  HydrateContensis = async () => {
-    const { log } = this;
-    if (!this.contensis)
-      await this.ConnectContensis();
-    if (this.contensis) {
-      const [contensisErr, models] = await (0, import_await_to_js.default)(
-        this.contensis.models.HydrateContensisRepositories()
-      );
-      if (contensisErr) {
-        log.error(contensisErr.message);
-        return contensisErr;
-      }
-    }
-  };
   PrintApiKeys = async () => {
     const { currentEnv, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensis();
-    if (this.contensis) {
-      const [keysErr, apiKeys] = await this.contensis.apiKeys.GetKeys();
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [keysErr, apiKeys] = await contensis.apiKeys.GetKeys();
       if (Array.isArray(apiKeys)) {
         log.success(messages.keys.list(currentEnv));
         this.HandleFormattingAndOutput(apiKeys, () => {
@@ -543,22 +589,23 @@ Exiting contensis-cli with exit code: ${exitCode}
   };
   CreateApiKey = async (name, description) => {
     const { currentEnv, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensis();
-    if (this.contensis) {
-      const [err, key] = await this.contensis.apiKeys.CreateKey(
-        name,
-        description
-      );
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [err, key] = await contensis.apiKeys.CreateKey(name, description);
       if (key) {
         log.success(messages.keys.created(currentEnv, name));
         console.log(
-          `  - ${key.name}${key.description ? ` (${key.description})` : ""} [${key.dateModified.toString().substring(0, 10)} ${key.modifiedBy}]`
+          `  - ${import_chalk.default.bold(key.name)} [${key.dateModified.toString().substring(0, 10)} ${key.modifiedBy}]`
+        );
+        if (key.description)
+          console.log(`    ${log.infoText(key.description)}`);
+        console.log(`    ${import_chalk.default.bold.grey`id`}: ${key.id}`);
+        console.log(
+          `    ${import_chalk.default.bold.grey`sharedSecret`}: ${key.sharedSecret}`
         );
-        console.log(`  - id: ${key.id}`);
-        console.log(`  - sharedSecret: ${key.sharedSecret}`);
+        console.log("");
+        log.help(messages.keys.tip());
       }
-      console.log("");
       if (err) {
         log.error(messages.keys.failedCreate(currentEnv, name), err);
       }
@@ -566,10 +613,9 @@ Exiting contensis-cli with exit code: ${exitCode}
   };
   RemoveApiKey = async (id) => {
     const { currentEnv, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensis({ commit: true });
-    if (this.contensis) {
-      const [err, key] = await this.contensis.apiKeys.RemoveKey(id);
+    const contensis = await this.ConnectContensis({ commit: true });
+    if (contensis) {
+      const [err, key] = await contensis.apiKeys.RemoveKey(id);
       if (!err) {
         log.success(messages.keys.removed(currentEnv, id));
         console.log("");
@@ -578,25 +624,356 @@ Exiting contensis-cli with exit code: ${exitCode}
       }
     }
   };
-  GetContentTypes = async () => {
+  PrintRoles = async () => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      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());
+        this.HandleFormattingAndOutput(roles, () => {
+          var _a, _b, _c, _d, _e;
+          for (const {
+            id,
+            name,
+            description,
+            enabled,
+            assignments,
+            permissions
+          } 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 (enabled === false)
+              console.log(`      ${import_chalk.default.bold.grey("enabled")}: false`);
+            if ((_a = assignments.groups) == null ? void 0 : _a.length)
+              console.log(
+                `      ${import_chalk.default.bold.grey("groups")}: ${assignments.groups.join(
+                  ", "
+                )}`
+              );
+            if ((_b = assignments.users) == null ? void 0 : _b.length)
+              console.log(
+                `      ${import_chalk.default.bold.grey("users")}: ${assignments.users.join(
+                  ", "
+                )}`
+              );
+            if ((_c = assignments.apiKeys) == null ? void 0 : _c.length)
+              console.log(
+                `      ${import_chalk.default.bold.grey("keys")}: ${assignments.apiKeys.join(
+                  ", "
+                )}`
+              );
+            if ((_d = permissions.entries) == null ? void 0 : _d.length) {
+              console.log(`      ${import_chalk.default.bold.grey("entries")}:`);
+              for (const p of permissions.entries)
+                console.log(
+                  `        ${p.id}: ${log.infoText(
+                    p.actions.length > 2 ? p.actions.length : p.actions.join(", ")
+                  )}`
+                );
+            }
+            if ((_e = permissions.contentTypes) == null ? void 0 : _e.length)
+              console.log(
+                `      ${import_chalk.default.bold.grey(
+                  "contentTypes"
+                )}: ${permissions.contentTypes.map(
+                  (p) => `${p.id} [${p.actions.join(",")}] ${p.languages.join(
+                    " "
+                  )}`
+                ).join(", ")}`
+              );
+          }
+        });
+      }
+      if (rolesErr) {
+        log.error(messages.roles.noList(currentEnv));
+        log.error((0, import_json.jsonFormatter)(rolesErr));
+      }
+    }
+  };
+  PrintRole = async (roleNameOrId) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [rolesErr, roles] = await (0, import_await_to_js.default)(contensis.roles.GetRoles());
+      if (Array.isArray(roles)) {
+        log.success(messages.roles.list(currentEnv));
+        const role = roles.find(
+          (r) => r.id === roleNameOrId || r.name.toLowerCase() === roleNameOrId.toLowerCase()
+        ) || roles.find(
+          (r) => r.name.toLowerCase().includes(roleNameOrId.toLowerCase())
+        );
+        if (role)
+          this.HandleFormattingAndOutput(role, log.object);
+        else
+          log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
+      }
+      if (rolesErr) {
+        log.error(messages.roles.noList(currentEnv));
+        log.error((0, import_json.jsonFormatter)(rolesErr));
+      }
+    }
+  };
+  CreateRole = async (role) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [err, created] = await contensis.roles.CreateRole(role);
+      if (created) {
+        log.success(
+          messages.roles.created(currentEnv, role.id || role.name || "")
+        );
+        this.HandleFormattingAndOutput(created, log.object);
+        log.help(messages.roles.tip());
+        return role.id;
+      }
+      if (err) {
+        log.error(
+          messages.roles.failedCreate(currentEnv, role.id || role.name || ""),
+          err
+        );
+      }
+    }
+  };
+  UpdateRole = async (roleNameOrId, role) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [rolesErr, roles] = await (0, import_await_to_js.default)(contensis.roles.GetRoles());
+      if (Array.isArray(roles)) {
+        log.success(messages.roles.list(currentEnv));
+        const existingRole = roles.find(
+          (r) => r.id === roleNameOrId || r.name.toLowerCase() === roleNameOrId.toLowerCase()
+        );
+        if (existingRole) {
+          log.info(messages.roles.setPayload());
+          log.object(role);
+          log.raw(``);
+          const [updateErr, updated] = await contensis.roles.UpdateRole(
+            existingRole.id,
+            role
+          );
+          if (updateErr)
+            log.error(messages.roles.failedSet(currentEnv, roleNameOrId));
+          else {
+            log.success(messages.roles.set());
+            this.HandleFormattingAndOutput(updated, log.object);
+          }
+        } else {
+          log.error(messages.roles.failedGet(currentEnv, roleNameOrId));
+        }
+      }
+      if (rolesErr) {
+        log.error(messages.roles.noList(currentEnv));
+        log.error((0, import_json.jsonFormatter)(rolesErr));
+      }
+    }
+  };
+  RemoveRole = async (roleNameOrId) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [rolesErr, roles] = await (0, import_await_to_js.default)(contensis.roles.GetRoles());
+      if (Array.isArray(roles)) {
+        log.success(messages.roles.list(currentEnv));
+        const existingRole = roles.find(
+          (r) => r.id === roleNameOrId || r.name.toLowerCase() === roleNameOrId.toLowerCase()
+        );
+        if (existingRole) {
+          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.error(messages.roles.failedGet(currentEnv, roleNameOrId));
+        }
+      }
+      if (rolesErr) {
+        log.error(messages.roles.noList(currentEnv));
+        log.error((0, import_json.jsonFormatter)(rolesErr));
+      }
+    }
+  };
+  CreateProject = async (project) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [err, created] = await contensis.projects.CreateProject(project);
+      if (created) {
+        log.success(messages.projects.created(currentEnv, project.id));
+        this.HandleFormattingAndOutput(created, () => {
+          this.SetProject(project.id);
+          this.PrintProjects();
+        });
+        return project.id;
+      }
+      if (err) {
+        log.error(messages.projects.failedCreate(currentEnv, project.id), err);
+      }
+    }
+  };
+  UpdateProject = async (project) => {
+    const { currentEnv, currentProject, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [err, updated] = await contensis.projects.UpdateProject({
+        id: currentProject,
+        ...project
+      });
+      if (updated) {
+        log.success(messages.projects.updated(currentEnv, currentProject));
+        this.HandleFormattingAndOutput(updated, log.object);
+        return updated.id;
+      }
+      if (err) {
+        log.error(
+          messages.projects.failedUpdate(currentEnv, currentProject),
+          err
+        );
+      }
+    }
+  };
+  PrintContentModels = async (modelIds = []) => {
+    const { currentProject, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const models = await contensis.models.contentModels();
+      const contentTypes = await contensis.models.contentTypes();
+      const components = await contensis.models.components();
+      const returnModels = (modelIds == null ? void 0 : modelIds.length) ? models == null ? void 0 : models.filter(
+        (m) => modelIds.some((id) => id.toLowerCase() === m.id.toLowerCase())
+      ) : void 0;
+      const contentTypeIds = Array.from(
+        /* @__PURE__ */ new Set([
+          ...(returnModels || models || []).map((m) => m.id),
+          ...(returnModels || models || []).map((m) => {
+            var _a, _b;
+            return ((_b = (_a = m.dependencies) == null ? void 0 : _a.contentTypes) == null ? void 0 : _b.map((c) => c[0])) || [];
+          }).flat()
+        ])
+      );
+      const componentIds = Array.from(
+        new Set(
+          (returnModels || models || []).map((m) => {
+            var _a, _b;
+            return ((_b = (_a = m.dependencies) == null ? void 0 : _a.components) == null ? void 0 : _b.map((c) => c[0])) || [];
+          }).flat()
+        )
+      );
+      const contentModelBackup = [
+        ...contentTypes.filter(
+          (c) => contentTypeIds.map((i) => i.toLowerCase()).includes(c.id.toLowerCase())
+        ),
+        ...components.filter(
+          (c) => componentIds.map((i) => i.toLowerCase()).includes(c.id.toLowerCase())
+        )
+      ];
+      if (Array.isArray(returnModels)) {
+        log.success(messages.models.list(currentProject));
+        this.HandleFormattingAndOutput(contentModelBackup, () => {
+          for (const model of returnModels) {
+            log.raw("");
+            log.object(model);
+          }
+          log.raw("");
+        });
+      } else {
+        log.success(
+          messages.models.get(currentProject, (models == null ? void 0 : models.length.toString()) || "0")
+        );
+        log.raw("");
+        if (models == null ? void 0 : models.length) {
+          this.HandleFormattingAndOutput(contentModelBackup, () => {
+            var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
+            for (const model of models) {
+              const components2 = ((_a = model.components) == null ? void 0 : _a.length) || 0;
+              const contentTypes2 = ((_b = model.contentTypes) == null ? void 0 : _b.length) || 0;
+              const dependencies = (((_d = (_c = model.dependencies) == null ? void 0 : _c.components) == null ? void 0 : _d.length) || 0) + (((_f = (_e = model.dependencies) == null ? void 0 : _e.contentTypes) == null ? void 0 : _f.length) || 0);
+              const dependencyOf = (((_h = (_g = model.dependencyOf) == null ? void 0 : _g.components) == null ? void 0 : _h.length) || 0) + (((_j = (_i = model.dependencyOf) == null ? void 0 : _i.contentTypes) == null ? void 0 : _j.length) || 0);
+              const hasAny = components2 + contentTypes2 + dependencies + dependencyOf;
+              log.raw(
+                `  - ${log.highlightText(log.boldText(model.id))} ${hasAny ? log.infoText(
+                  `{ ${components2 ? `components: ${components2}, ` : ""}${contentTypes2 ? `contentTypes: ${contentTypes2}, ` : ""}${dependencies ? `references: ${dependencies}, ` : ""}${dependencyOf ? `required by: ${dependencyOf}` : ""} }`
+                ) : ""}`
+              );
+            }
+            log.raw("");
+          });
+        }
+      }
+    }
+  };
+  ImportContentModels = async ({
+    commit,
+    fromFile
+  }) => {
     const { currentProject, log, messages } = this;
-    let err;
-    if (!this.contensis)
-      err = await this.HydrateContensis();
-    if (err)
-      log.error(messages.contenttypes.noList(currentProject));
-    if (this.contensis) {
-      this.contentTypes = this.contensis.models.contentTypes();
-      this.components = this.contensis.models.components();
+    const fileData = fromFile ? (0, import_file_provider.readJsonFile)(fromFile) || [] : [];
+    if (typeof fileData === "string")
+      throw new Error(`Import file format must be of type JSON`);
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      fromFile,
+      importDataType: "models"
+    });
+    if (contensis) {
+      log.line();
+      if (contensis.isPreview) {
+        console.log(log.successText(` -- IMPORT PREVIEW -- `));
+      } else {
+        console.log(log.warningText(` *** COMMITTING IMPORT *** `));
+      }
+      const [migrateErr, result] = await contensis.MigrateContentModels();
+      if (migrateErr)
+        (0, import_logger.logError)(migrateErr);
+      else
+        this.HandleFormattingAndOutput(result, () => {
+          if (!commit) {
+            log.raw(log.boldText(`
+Content types:`));
+            if (!result.contentTypes)
+              log.info(`- None returned
+`);
+            else
+              (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
+            log.raw(log.boldText(`
+Components:`));
+            if (!result.components)
+              log.info(`- None returned
+`);
+            else
+              (0, import_console.printModelMigrationAnalysis)(this, result.components);
+          } else {
+            const migrateResult = result;
+            log.raw(log.boldText(`
+Content types:`));
+            (0, import_console.printModelMigrationResult)(
+              this,
+              migrateResult[currentProject].contentTypes
+            );
+            log.raw(log.boldText(`
+Components:`));
+            (0, import_console.printModelMigrationResult)(
+              this,
+              migrateResult[currentProject].components
+            );
+          }
+        });
     } else {
-      log.warning(messages.contenttypes.noList(currentProject));
+      log.warning(messages.models.noList(currentProject));
+      log.help(messages.connect.tip());
     }
   };
   PrintContentTypes = async () => {
     const { currentProject, log, messages } = this;
-    await this.GetContentTypes();
-    if (this.contensis) {
-      const { contentTypes } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const contentTypes = await contensis.models.contentTypes();
       if (Array.isArray(contentTypes)) {
         log.success(messages.contenttypes.list(currentProject));
         this.HandleFormattingAndOutput(contentTypes, () => {
@@ -613,9 +990,9 @@ Exiting contensis-cli with exit code: ${exitCode}
   };
   PrintContentType = async (contentTypeId) => {
     const { currentProject, log, messages } = this;
-    await this.GetContentTypes();
-    if (this.contensis) {
-      const { contentTypes } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const contentTypes = await contensis.models.contentTypes();
       if (Array.isArray(contentTypes)) {
         const contentType = contentTypes.find(
           (c) => c.id.toLowerCase() === contentTypeId.toLowerCase()
@@ -635,15 +1012,12 @@ Exiting contensis-cli with exit code: ${exitCode}
   };
   RemoveContentTypes = async (contentTypeIds, commit = false) => {
     const { currentProject, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensisImport({
-        source: "input",
-        commit
-      });
-    if (this.contensis) {
-      const [err, result] = await this.contensis.DeleteContentTypes(
-        contentTypeIds
-      );
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      importDataType: "user-input"
+    });
+    if (contensis) {
+      const [err, result] = await contensis.DeleteContentTypes(contentTypeIds);
       if (err) {
         log.error(
           messages.contenttypes.failedRemove(
@@ -657,7 +1031,7 @@ Exiting contensis-cli with exit code: ${exitCode}
           messages.contenttypes.removed(
             currentProject,
             contentTypeIds.join('", "'),
-            !this.contensis.isPreview
+            !contensis.isPreview
           )
         );
         this.HandleFormattingAndOutput(
@@ -677,15 +1051,15 @@ Exiting contensis-cli with exit code: ${exitCode}
       throw new Error(`Import file format must be of type JSON`);
     if (!Array.isArray(fileData))
       fileData = [fileData];
-    await this.ConnectContensisImport({
+    const contensis = await this.ConnectContensisImport({
       commit,
-      source: fromFile ? "file" : "contensis"
+      importDataType: fromFile ? "user-input" : void 0
     });
-    if (this.contensis) {
+    if (contensis) {
       for (const contentType of fileData) {
         contentType.projectId = currentProject;
         delete contentType.uuid;
-        const [err, created, createStatus] = await this.contensis.models.targetRepos[currentProject].repo.UpsertContentType(false, contentType);
+        const [err, created, createStatus] = await contensis.models.targetRepos[currentProject].repo.UpsertContentType(false, contentType);
         if (err)
           log.error(err.message, err);
         if (createStatus) {
@@ -702,11 +1076,54 @@ Exiting contensis-cli with exit code: ${exitCode}
       }
     }
   };
+  DiffModels = async ({
+    fromFile
+  }, modelIds = []) => {
+    const { log } = this;
+    let fileData = fromFile ? (0, import_file_provider.readJsonFile)(fromFile) || [] : [];
+    if (typeof fileData === "string")
+      throw new Error(`Import file format must be of type JSON`);
+    if (!Array.isArray(fileData))
+      fileData = [fileData];
+    const contensis = await this.ConnectContensisImport({
+      fromFile,
+      importDataType: "models"
+    });
+    if (contensis) {
+      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 (result)
+        this.HandleFormattingAndOutput(result, () => {
+          var _a;
+          log.success(
+            `Queried models ${log.infoText(
+              `"${(_a = result.query.modelIds) == null ? void 0 : _a.join(", ")}"`
+            )}
+`
+          );
+          log.raw(log.boldText(`Content types:`));
+          if (!result.contentTypes)
+            log.info(`- None returned
+`);
+          else
+            (0, import_console.printModelMigrationAnalysis)(this, result.contentTypes);
+          log.raw(log.boldText(`Components:`));
+          if (!result.components)
+            log.info(`- None returned
+`);
+          else
+            (0, import_console.printModelMigrationAnalysis)(this, result.components);
+        });
+    }
+  };
   PrintComponents = async () => {
     const { currentProject, log, messages } = this;
-    await this.GetContentTypes();
-    if (this.contensis) {
-      const { components } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const components = await contensis.models.components();
       if (Array.isArray(components)) {
         log.success(messages.components.list(currentProject));
         this.HandleFormattingAndOutput(components, () => {
@@ -723,9 +1140,9 @@ Exiting contensis-cli with exit code: ${exitCode}
   };
   PrintComponent = async (componentId) => {
     const { currentProject, log, messages } = this;
-    await this.GetContentTypes();
-    if (this.contensis) {
-      const { components } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const components = await contensis.models.components();
       if (Array.isArray(components)) {
         const component = components.find(
           (c) => c.id.toLowerCase() === componentId.toLowerCase()
@@ -741,13 +1158,12 @@ Exiting contensis-cli with exit code: ${exitCode}
   };
   RemoveComponents = async (componentIds, commit = false) => {
     const { currentProject, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensisImport({
-        source: "input",
-        commit
-      });
-    if (this.contensis) {
-      const [err, result] = await this.contensis.DeleteContentTypes(
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      importDataType: "user-input"
+    });
+    if (contensis) {
+      const [err, result] = await contensis.DeleteContentTypes(
         void 0,
         componentIds
       );
@@ -764,7 +1180,7 @@ Exiting contensis-cli with exit code: ${exitCode}
           messages.components.removed(
             currentProject,
             componentIds.join('", "'),
-            !this.contensis.isPreview
+            !contensis.isPreview
           )
         );
         this.HandleFormattingAndOutput(
@@ -784,15 +1200,15 @@ Exiting contensis-cli with exit code: ${exitCode}
       throw new Error(`Import file format must be of type JSON`);
     if (!Array.isArray(fileData))
       fileData = [fileData];
-    await this.ConnectContensisImport({
+    const contensis = await this.ConnectContensisImport({
       commit,
-      source: fromFile ? "file" : "contensis"
+      importDataType: fromFile ? "user-input" : void 0
     });
-    if (this.contensis) {
+    if (contensis) {
       for (const component of fileData) {
         component.projectId = currentProject;
         delete component.uuid;
-        const [err, created, createStatus] = await this.contensis.models.targetRepos[currentProject].repo.UpsertComponent(false, component);
+        const [err, created, createStatus] = await contensis.models.targetRepos[currentProject].repo.UpsertComponent(false, component);
         if (err)
           log.error(err.message, err);
         if (createStatus) {
@@ -809,33 +1225,37 @@ Exiting contensis-cli with exit code: ${exitCode}
       }
     }
   };
-  RemoveEntry = async (id, commit = false) => {
-    var _a, _b, _c;
-    const { currentEnv, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensisImport({
-        source: "input",
-        commit
-      });
-    if (this.contensis) {
-      if (this.contensis.isPreview) {
+  RemoveEntries = async (commit = false) => {
+    var _a;
+    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 this.contensis.DeleteEntries();
+      const [err, result] = await contensis.DeleteEntries();
       if (result)
         this.HandleFormattingAndOutput(result, () => {
-          (0, import_console.printMigrateResult)(this, result, { action: "delete" });
+          (0, import_console.printMigrateResult)(this, result, {
+            action: "delete",
+            showAllEntries: true
+          });
         });
-      if (!err && (!commit && ((_a = Object.values(result.entriesToMigrate)) == null ? void 0 : _a[0].totalCount) > 0 || commit && ((_b = result.migrateResult) == null ? void 0 : _b.deleted))) {
-        log.success(messages.entries.removed(currentEnv, id, commit));
-        if (!commit)
+      if (!err && (!commit && result.entriesToMigrate[currentProject].totalCount || commit && ((_a = result.migrateResult) == null ? void 0 : _a.deleted))) {
+        log.success(messages.entries.removed(currentEnv, commit));
+        if (!commit) {
+          log.raw(``);
           log.help(messages.entries.commitTip());
+        }
       } else {
-        log.error(messages.entries.failedRemove(currentEnv, id), err);
-        if (!((_c = Object.values(result.entriesToMigrate)) == null ? void 0 : _c[0].totalCount))
-          log.help(messages.entries.notFound(id));
+        log.error(messages.entries.failedRemove(currentEnv), err);
+        if (!result.entriesToMigrate[currentProject].totalCount)
+          log.help(messages.entries.notFound(currentEnv));
       }
     }
   };
@@ -843,90 +1263,145 @@ Exiting contensis-cli with exit code: ${exitCode}
     withDependents = false
   }) => {
     const { currentProject, log, messages } = this;
-    await this.ConnectContensis();
-    if (this.contensis) {
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
       log.line();
-      const entries = await this.contensis.GetEntries({ withDependents });
+      const entries = await contensis.GetEntries({ withDependents });
       this.HandleFormattingAndOutput(
         entries,
         () => {
-          var _a, _b;
+          var _a;
           return (0, import_migratortron.logEntriesTable)(
             entries,
             currentProject,
-            (_b = (_a = this.contensis) == null ? void 0 : _a.payload.query) == null ? void 0 : _b.fields
+            (_a = contensis.payload.query) == null ? void 0 : _a.fields
           );
         }
       );
     } else {
-      log.warning(messages.contenttypes.noList(currentProject));
+      log.warning(messages.models.noList(currentProject));
       log.help(messages.connect.tip());
     }
   };
   ImportEntries = async ({
     commit,
-    fromFile
+    fromFile,
+    logOutput
   }) => {
-    const { currentProject, log, messages } = this;
-    const fileData = fromFile ? (0, import_file_provider.readJsonFile)(fromFile) || [] : [];
-    if (typeof fileData === "string")
-      throw new Error(`Import file format must be of type JSON`);
-    await this.ConnectContensisImport({
+    var _a, _b, _c, _d, _e;
+    const { currentEnv, currentProject, log, messages } = this;
+    const contensis = await this.ConnectContensisImport({
       commit,
-      source: fromFile ? "file" : "contensis",
-      fileData,
-      fileDataType: "entries"
+      fromFile,
+      importDataType: "entries"
     });
-    if (this.contensis) {
+    if (contensis) {
       log.line();
-      if (this.contensis.isPreview) {
+      if (contensis.isPreview) {
         console.log(log.successText(` -- IMPORT PREVIEW -- `));
       } else {
         console.log(log.warningText(` *** COMMITTING IMPORT *** `));
       }
-      const [migrateErr, migrateResult] = await this.contensis.MigrateEntries();
-      if (migrateErr)
-        (0, import_logger.logError)(migrateErr);
+      const [err, result] = await contensis.MigrateEntries();
+      if (err)
+        (0, import_logger.logError)(err);
       else
-        this.HandleFormattingAndOutput(migrateResult, () => {
-          (0, import_console.printMigrateResult)(this, migrateResult);
+        this.HandleFormattingAndOutput(result, () => {
+          (0, import_console.printMigrateResult)(this, result, {
+            showAllEntries: logOutput === "all",
+            showChangedEntries: 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)))) {
+        log.success(
+          messages.entries.imported(
+            currentEnv,
+            commit,
+            commit ? (((_d = result.migrateResult) == null ? void 0 : _d.created) || 0) + (((_e = result.migrateResult) == null ? void 0 : _e.updated) || 0) : result.entriesToMigrate[currentProject].totalCount
+          )
+        );
+        if (!commit) {
+          log.raw(``);
+          log.help(messages.entries.commitTip());
+        }
+      } else {
+        log.error(messages.entries.failedImport(currentEnv), err);
+        if (!result.entriesToMigrate[currentProject].totalCount)
+          log.help(messages.entries.notFound(currentEnv));
+      }
     } else {
-      log.warning(messages.contenttypes.noList(currentProject));
+      log.warning(messages.models.noList(currentProject));
       log.help(messages.connect.tip());
     }
   };
-  PrintWebhookSubscriptions = async (subscriptionIds, name) => {
+  PrintWebhookSubscriptions = async (subscriptionIdsOrNames) => {
     const { currentEnv, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensis();
-    if (this.contensis) {
-      const [webhooksErr, webhooks] = await this.contensis.subscriptions.webhooks.GetSubscriptions();
-      const filteredResults = typeof name === "string" ? webhooks.filter(
-        (w) => {
-          var _a;
-          return (_a = w.name) == null ? void 0 : _a.toLowerCase().includes(name.toLowerCase());
-        }
-      ) : Array.isArray(subscriptionIds) ? webhooks.filter((w) => subscriptionIds == null ? void 0 : subscriptionIds.some((id) => id === w.id)) : webhooks;
-      if (Array.isArray(filteredResults)) {
-        this.HandleFormattingAndOutput(filteredResults, () => {
-          log.success(messages.webhooks.list(currentEnv));
-          for (const {
-            id,
-            description,
-            method,
-            name: name2,
-            version,
-            url: url2
-          } of filteredResults) {
-            console.log(
-              `  - ${name2}${description ? ` (${description})` : ""} [${version.modified.toString().substring(0, 10)} ${version.modifiedBy}]`
-            );
-            console.log(`      ${id}`);
-            console.log(`      [${method}] ${url2}`);
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [webhooksErr, webhooks] = await contensis.subscriptions.webhooks.GetSubscriptions();
+      const filteredResults = (subscriptionIdsOrNames == null ? void 0 : subscriptionIdsOrNames.length) ? webhooks == null ? void 0 : webhooks.filter(
+        (w) => (subscriptionIdsOrNames == null ? void 0 : subscriptionIdsOrNames.some(
+          (idname) => {
+            var _a;
+            return (_a = w.name) == null ? void 0 : _a.toLowerCase().includes(idname.toLowerCase());
           }
-          console.log("");
-        });
+        )) || (subscriptionIdsOrNames == null ? void 0 : subscriptionIdsOrNames.some(
+          (id) => id.toLowerCase() === w.id.toLowerCase()
+        ))
+      ) : webhooks;
+      if (Array.isArray(filteredResults)) {
+        log.success(messages.webhooks.list(currentEnv));
+        if (!(webhooks == null ? void 0 : webhooks.length))
+          log.warning(messages.webhooks.noneExist());
+        else {
+          this.HandleFormattingAndOutput(filteredResults, () => {
+            for (const {
+              id,
+              description,
+              method,
+              name,
+              version,
+              url: url2,
+              enabled,
+              topics,
+              templates,
+              headers
+            } 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}]`
+                )
+              );
+              if (description)
+                console.log(log.infoText`    ${description}`);
+              console.log(`    ${log.infoText`[${method}]`} ${url2}`);
+              if (headers && Object.keys(headers).length) {
+                console.log(`    ${log.infoText`headers`}:`);
+                for (const [key, { value, secret }] of Object.entries(headers))
+                  console.log(
+                    `      ${import_chalk.default.bold.gray(key)}: ${secret ? "\u{1F910}" : value}`
+                  );
+              }
+              if (topics == null ? void 0 : topics.length)
+                if ((topics == null ? void 0 : topics.length) === 1)
+                  console.log(
+                    `    ${log.infoText`topics`}: ${topics.map((t) => JSON.stringify(t)).join(" ").replaceAll('"', "").replaceAll(",", " ").replaceAll("{", "").replaceAll("}", "")}`
+                  );
+                else {
+                  console.log(`    ${log.infoText`topics`}:`);
+                  log.objectRecurse(topics, 1, "    ");
+                }
+              if (templates && Object.keys(templates).length)
+                console.log(
+                  `    ${log.infoText`templates`}: ${Object.keys(
+                    templates
+                  ).join(" ")}`
+                );
+              if (enabled === false)
+                console.log(`    ${log.infoText`enabled`}: ${enabled}`);
+            }
+          });
+        }
       }
       if (webhooksErr) {
         log.error(messages.webhooks.noList(currentEnv));
@@ -935,14 +1410,13 @@ Exiting contensis-cli with exit code: ${exitCode}
     }
   };
   PrintBlocks = async () => {
-    const { currentEnv, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensis();
-    if (this.contensis) {
-      const [err, blocks] = await this.contensis.blocks.GetBlocks();
+    const { currentEnv, env, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [err, blocks] = await contensis.blocks.GetBlocks();
       if (Array.isArray(blocks)) {
         this.HandleFormattingAndOutput(blocks, () => {
-          log.success(messages.blocks.list(currentEnv));
+          log.success(messages.blocks.list(currentEnv, env.currentProject));
           for (const {
             id,
             description,
@@ -969,10 +1443,9 @@ Exiting contensis-cli with exit code: ${exitCode}
   };
   PrintBlockVersions = async (blockId, branch, version) => {
     const { currentEnv, env, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensis();
-    if (this.contensis) {
-      const [err, blocks] = await this.contensis.blocks.GetBlockVersions(
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [err, blocks] = await contensis.blocks.GetBlockVersions(
         blockId,
         branch,
         version
@@ -980,7 +1453,7 @@ Exiting contensis-cli with exit code: ${exitCode}
       if (blocks) {
         this.HandleFormattingAndOutput(blocks, () => {
           log.success(
-            messages.blocks.get(`${currentEnv}:${env.currentProject}`)
+            messages.blocks.get(blockId, currentEnv, env.currentProject)
           );
           for (const block of blocks)
             (0, import_console.printBlockVersion)(
@@ -1003,17 +1476,18 @@ Exiting contensis-cli with exit code: ${exitCode}
   };
   PushBlock = async (block) => {
     const { currentEnv, env, log, messages } = this;
-    messages.blocks.tryPush(
-      block.id,
-      block.source.branch,
-      currentEnv,
-      env.currentProject
+    log.info(
+      messages.blocks.tryPush(
+        block.id,
+        block.source.branch,
+        currentEnv,
+        env.currentProject
+      )
     );
     console.log((0, import_json.jsonFormatter)(block));
-    if (!this.contensis)
-      await this.ConnectContensis();
-    if (this.contensis) {
-      const [err, blockVersion] = await this.contensis.blocks.PushBlockVersion(
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [err, blockVersion] = await contensis.blocks.PushBlockVersion(
         block
       );
       if (!err) {
@@ -1025,7 +1499,6 @@ Exiting contensis-cli with exit code: ${exitCode}
             env.currentProject
           )
         );
-        console.log((0, import_json.jsonFormatter)(blockVersion));
       }
       if (blockVersion) {
         this.HandleFormattingAndOutput(blockVersion, () => {
@@ -1036,66 +1509,275 @@ Exiting contensis-cli with exit code: ${exitCode}
         throw new Error(
           messages.blocks.failedPush(block.id, currentEnv, env.currentProject)
         );
+    } else {
+      throw new Error(
+        messages.blocks.failedPush(block.id, currentEnv, env.currentProject)
+      );
     }
   };
-  PrintBlockLogs = async (blockId, branch, version, dataCenter) => {
-    const { currentEnv, log, messages } = this;
-    if (!this.contensis)
-      await this.ConnectContensis();
-    if (this.contensis) {
-      const [err, blockLogs] = await this.contensis.blocks.GetBlockLogs({
+  GetLatestBlockVersion = async (blockId, branch = "default") => {
+    var _a;
+    const { contensis, log, messages } = this;
+    const [getErr, blockVersions] = await (contensis == null ? void 0 : contensis.blocks.GetBlockVersions(blockId, branch)) || [];
+    if (getErr) {
+      return [getErr, void 0];
+    }
+    let blockVersionNo = "latest";
+    try {
+      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`);
+    } catch (parseVersionEx) {
+      log.info(
+        `Request for blockId: ${blockId}, branch: ${branch}, version: latest`
+      );
+      log.info(
+        `Get block versions response was: ${(0, import_util.tryStringify)(blockVersions)}`
+      );
+      log.error(messages.blocks.failedParsingVersion());
+      return [parseVersionEx, void 0];
+    }
+  };
+  ExecuteBlockAction = async (action, blockId, version = "latest") => {
+    const { currentEnv, env, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      let actionOnBlockVersion = version;
+      if (action === "release" && version === "latest") {
+        const [getErr, blockVersion2] = await this.GetLatestBlockVersion(
+          blockId
+        );
+        if (getErr) {
+          throw new Error(
+            `${messages.blocks.noList(
+              currentEnv,
+              env.currentProject
+            )} (${getErr})`
+          );
+        } else if (blockVersion2) {
+          actionOnBlockVersion = blockVersion2;
+        }
+      }
+      const [err, blockVersion] = await contensis.blocks.BlockAction(
+        blockId,
+        action,
+        actionOnBlockVersion
+      );
+      if (blockVersion) {
+        this.HandleFormattingAndOutput(blockVersion, () => {
+          log.success(
+            messages.blocks.actionComplete(
+              action,
+              blockId,
+              currentEnv,
+              env.currentProject
+            )
+          );
+          (0, import_console.printBlockVersion)(this, blockVersion);
+        });
+      }
+      if (err) {
+        log.error((0, import_json.jsonFormatter)(err));
+        throw new Error(
+          messages.blocks.actionFailed(
+            action,
+            blockId,
+            currentEnv,
+            env.currentProject
+          )
+        );
+      }
+    }
+  };
+  PrintBlockLogs = async (blockId, branch, version, dataCenter, follow = false) => {
+    const { currentEnv, env, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      log.success(
+        messages.blocks.getLogs(blockId, branch, currentEnv, env.currentProject)
+      );
+      const [err, blockLogs] = await contensis.blocks.GetBlockLogs({
         blockId,
         branchId: branch,
         version,
         dataCenter
       });
-      if (blockLogs) {
-        this.HandleFormattingAndOutput(blockLogs, () => {
-          log.success(messages.blocks.list(currentEnv));
+      if (err) {
+        log.error(
+          messages.blocks.failedGetLogs(blockId, currentEnv, env.currentProject)
+        );
+        log.error((0, import_json.jsonFormatter)(err));
+      } else if (blockLogs) {
+        const removeTrailingNewline = (logs) => logs.endsWith("\n") ? logs.slice(0, logs.length - 1) : logs;
+        const renderLogs = removeTrailingNewline(blockLogs);
+        this.HandleFormattingAndOutput(renderLogs, () => {
           console.log(
-            `  - ${blockId} ${branch} ${Number(version) ? `v${version}` : version} [${dataCenter}]`
+            `  - ${blockId} ${branch} ${Number(version) ? `v${version}` : version} ${dataCenter ? `[${dataCenter}]` : ""}`
           );
           log.line();
-          console.log(log.infoText(blockLogs));
-          log.line();
+          console.log(log.infoText(renderLogs));
+        });
+        let following = follow;
+        let alreadyShown = blockLogs;
+        let needsNewLine = false;
+        let counter = 0;
+        const listeners = process.listeners("SIGINT");
+        process.removeAllListeners("SIGINT");
+        process.on("SIGINT", () => {
+          import_logger.Logger.warning(
+            messages.blocks.stopFollow(blockId, currentEnv, env.currentProject)
+          );
+          stopFollowing();
+        });
+        let delay = (0, import_timers.promiseDelay)(5 * 1e3, null);
+        const stopFollowing = () => {
+          following = false;
+          delay.cancel();
+          process.removeAllListeners("SIGINT");
+          for (const listener of listeners)
+            process.addListener("SIGINT", listener);
+        };
+        while (following) {
+          if (counter++ > 300) {
+            import_logger.Logger.warning(
+              messages.blocks.timeoutFollow(
+                blockId,
+                currentEnv,
+                env.currentProject
+              )
+            );
+            stopFollowing();
+          }
+          await delay.wait();
+          const [lastErr, lastLogs] = following ? await contensis.blocks.GetBlockLogs({
+            blockId,
+            branchId: branch,
+            version,
+            dataCenter
+          }) : [null, null];
+          if (lastLogs) {
+            const difference = (0, import_diff.diffLogStrings)(lastLogs, alreadyShown);
+            if (difference) {
+              if (needsNewLine) {
+                console.log("");
+              }
+              const render = removeTrailingNewline(difference);
+              console.log(log.infoText(render));
+              alreadyShown += `${render}
+`;
+              needsNewLine = false;
+            } else {
+              process.stdout.write(".");
+              needsNewLine = true;
+            }
+          } else if (lastErr) {
+            process.stdout.write("x");
+            needsNewLine = true;
+          }
+        }
+      }
+    }
+  };
+  PrintProxies = async (proxyId) => {
+    const { currentEnv, env, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [err, proxies] = await contensis.proxies.GetProxies(proxyId);
+      if (Array.isArray(proxies)) {
+        this.HandleFormattingAndOutput(proxies, () => {
+          log.success(messages.proxies.list(currentEnv, env.currentProject));
+          for (const { id, name, description, endpoints, version } of proxies) {
+            console.log(
+              `  - ${name} [${version.versionNo}] ${id} ${log.infoText`${description}`}`
+            );
+            for (const [language, endpoint] of Object.entries(endpoints))
+              console.log(
+                `      - ${log.infoText`language: ${language}
+        server: ${endpoint.server}
+        headers.host: ${endpoint.headers.host}
+        ssl: ${endpoint.ssl}`}`
+              );
+          }
         });
       }
       if (err) {
-        log.error(messages.blocks.noList(currentEnv));
+        log.error(messages.proxies.noList(currentEnv, env.currentProject));
+        log.error((0, import_json.jsonFormatter)(err));
+      }
+    }
+  };
+  PrintRenderers = async (rendererId) => {
+    const { currentEnv, env, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+    if (contensis) {
+      const [err, renderers] = await contensis.renderers.GetRenderers(
+        rendererId
+      );
+      if (Array.isArray(renderers)) {
+        this.HandleFormattingAndOutput(renderers, () => {
+          log.success(messages.renderers.list(currentEnv, env.currentProject));
+          for (const {
+            id,
+            description,
+            assignedContentTypes,
+            rules,
+            version
+          } of renderers) {
+            console.log(
+              `  - ${id} [${version.versionNo}] ${log.infoText`${description}`}`
+            );
+            if (assignedContentTypes == null ? void 0 : assignedContentTypes.length)
+              console.log(
+                log.infoText`      assignedContentTypes: ${assignedContentTypes.join(
+                  ", "
+                )}`
+              );
+            for (const rule of rules)
+              if (rule.return)
+                console.log(
+                  log.infoText`      ${rule.return.endpointId ? "endpointId" : "blockId"}: ${rule.return.endpointId || rule.return.blockId}`
+                );
+          }
+        });
+      }
+      if (err) {
+        log.error(messages.renderers.noList(currentEnv, env.currentProject));
         log.error((0, import_json.jsonFormatter)(err));
       }
     }
   };
   HandleFormattingAndOutput = (obj, logFn) => {
     const { format, log, messages, output } = this;
+    if (!format) {
+      logFn(obj);
+    } else if (format === "csv") {
+      log.raw("");
+      log.raw(log.infoText((0, import_csv.csvFormatter)(obj)));
+    } else if (format === "xml") {
+      log.raw("");
+      log.raw(log.infoText((0, import_xml.xmlFormatter)(obj)));
+    } else if (format === "json") {
+      log.raw("");
+      log.raw(log.infoText((0, import_json.jsonFormatter)(obj)));
+    }
+    log.raw("");
     if (output) {
       let writeString = "";
+      const isText = !(0, import_util.tryParse)(obj) && typeof obj === "string";
       if (format === "csv") {
         writeString = (0, import_csv.csvFormatter)(obj);
       } else if (format === "xml") {
         writeString = (0, import_xml.xmlFormatter)(obj);
       } else
-        writeString = (0, import_json.jsonFormatter)(obj);
+        writeString = isText ? obj : (0, import_json.jsonFormatter)(obj);
       if (writeString) {
         import_fs.default.writeFileSync(output, writeString);
-        log.success(messages.app.fileOutput(format, output));
+        log.success(messages.app.fileOutput(isText ? "text" : format, output));
       } else {
         log.info(messages.app.noFileOutput());
       }
-    } else {
-      if (!format) {
-        logFn(obj);
-      } else if (format === "csv") {
-        log.raw("");
-        log.raw(log.infoText((0, import_csv.csvFormatter)(obj)));
-      } else if (format === "xml") {
-        log.raw("");
-        log.raw(log.infoText((0, import_xml.xmlFormatter)(obj)));
-      } else if (format === "json") {
-        log.raw("");
-        log.raw(log.infoText((0, import_json.jsonFormatter)(obj)));
-      }
-      log.raw("");
     }
   };
 }