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

package/dist/commands/globalOptions.js

@@ -24,23 +24,26 @@ __export(globalOptions_exports, {
   addGlobalOptions: () => addGlobalOptions,
   addImportOptions: () => addImportOptions,
   commit: () => commit,
+  entryId: () => entryId,
   fromCms: () => fromCms,
   fromFile: () => fromFile,
   fromProject: () => fromProject,
   mapContensisOpts: () => mapContensisOpts,
-  project: () => project
+  project: () => project,
+  zenql: () => zenql
 });
 module.exports = __toCommonJS(globalOptions_exports);
 var import_commander = require("commander");
 var import_util = require("../util");
 const mapContensisOpts = (opts = {}) => ({
-  source: opts.sourceCms || opts.sourceProjectId ? {
-    url: opts.sourceCms ? (0, import_util.url)(opts.sourceCms, "website").cms : void 0,
+  source: opts.sourceAlias || opts.sourceProjectId ? {
+    url: opts.sourceAlias ? (0, import_util.url)(opts.sourceAlias, "website").cms : void 0,
     project: opts.sourceProjectId || void 0
   } : void 0,
-  query: opts.id || opts.phrase || opts.fields ? {
+  models: opts.modelIds,
+  query: opts.id || opts.entryIds || opts.phrase || opts.fields ? {
     fields: opts.fields,
-    includeIds: opts.id,
+    includeIds: opts.id || opts.entryIds,
     searchTerm: opts.phrase
   } : void 0,
   zenQL: opts.zenql,
@@ -55,49 +58,49 @@ const format = new import_commander.Option(
   "format output as csv, json, xml or table (default)"
 ).choices(["csv", "json", "xml", "table"]);
 const alias = new import_commander.Option(
-  "-a --alias <alias>",
+  "-a, --alias <alias>",
   "the cloud CMS alias to connect your request with"
 );
 const project = new import_commander.Option(
-  "-p --project-id <projectId>",
+  "-p, --project-id <projectId>",
   "the projectId to make your request with"
 );
 const user = new import_commander.Option(
-  "-u --user <user>",
+  "-u, --user <user>",
   "the username to authenticate your request with"
 );
 const password = new import_commander.Option(
-  "-pw --password <password>",
+  "-pw, --password <password>",
   "the password to use to login with (optional/insecure)"
 );
 const clientId = new import_commander.Option(
-  "-id --client-id <clientId>",
+  "-id, --client-id <clientId>",
   "the clientId to authenticate your request with"
 );
 const sharedSecret = new import_commander.Option(
-  "-s --shared-secret <sharedSecret>",
+  "-s, --shared-secret <sharedSecret>",
   "the shared secret to use when logging in with a client id"
 );
 const zenql = new import_commander.Option(
   "-q, --zenql <zenql>",
   "get entries with a supplied ZenQL statement"
 );
-const entryId = new import_commander.Option("-i --id <id...>", "the entry id to get");
+const entryId = new import_commander.Option("-i --id <id...>", "the entry id(s) to get");
 const fromFile = new import_commander.Option(
-  "-file --from-file <fromFile>",
+  "-file, --from-file <fromFile>",
   "file path to import asset(s) from"
 );
 const fromCms = new import_commander.Option(
-  "-source --source-alias <fromCms>",
+  "-source, --source-alias <fromCms>",
   "the cloud CMS alias to import asset(s) from"
 );
 const fromProject = new import_commander.Option(
-  "-sp --source-project-id <fromProject>",
+  "-sp, --source-project-id <fromProject>",
   "the id of the Contensis project to import asset(s) from (Default: [last connected project])"
 );
 const commit = new import_commander.Option(
   "--commit",
-  "omit and only add this flag when you are happy with the preview of the import"
+  "add this flag only after you have run a preview of the import and agree with the analysis"
 ).default(false);
 const addConnectOptions = (program) => program.addOption(alias.hideHelp()).addOption(project.hideHelp());
 const addAuthenticationOptions = (program) => program.addOption(user.hideHelp()).addOption(password.hideHelp()).addOption(clientId.hideHelp()).addOption(sharedSecret.hideHelp());
@@ -130,10 +133,12 @@ const addGlobalOptions = (program) => {
   addGlobalOptions,
   addImportOptions,
   commit,
+  entryId,
   fromCms,
   fromFile,
   fromProject,
   mapContensisOpts,
-  project
+  project,
+  zenql
 });
 //# sourceMappingURL=globalOptions.js.map

package/dist/commands/globalOptions.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/commands/globalOptions.ts"],
-  "sourcesContent": ["import { Command, Option } from 'commander';\nimport { url } from '~/util';\n\nexport const mapContensisOpts = (opts: any = {}) => ({\n  source:\n    opts.sourceCms || opts.sourceProjectId\n      ? {\n          url: opts.sourceCms\n            ? url(opts.sourceCms, 'website').cms\n            : (undefined as any),\n          project: opts.sourceProjectId || (undefined as any),\n        }\n      : undefined,\n  query:\n    opts.id || opts.phrase || opts.fields\n      ? {\n          fields: opts.fields,\n          includeIds: opts.id,\n          searchTerm: opts.phrase,\n        }\n      : undefined,\n  zenQL: opts.zenql,\n  transformGuids: !opts.preserveGuids,\n});\n\n/* Output options */\nconst output = new Option(\n  '-o, --output <output>',\n  'save output to a file e.g. --output ./output.txt'\n);\n\nconst format = new Option(\n  '-f, --format <format>',\n  'format output as csv, json, xml or table (default)'\n).choices(['csv', 'json', 'xml', 'table']);\n\n/* Connect options */\nconst alias = new Option(\n  '-a --alias <alias>',\n  'the cloud CMS alias to connect your request with'\n);\n\nexport const project = new Option(\n  '-p --project-id <projectId>',\n  'the projectId to make your request with'\n);\n\n/* Authentication options */\nconst user = new Option(\n  '-u --user <user>',\n  'the username to authenticate your request with'\n);\nconst password = new Option(\n  '-pw --password <password>',\n  'the password to use to login with (optional/insecure)'\n);\nconst clientId = new Option(\n  '-id --client-id <clientId>',\n  'the clientId to authenticate your request with'\n);\nconst sharedSecret = new Option(\n  '-s --shared-secret <sharedSecret>',\n  'the shared secret to use when logging in with a client id'\n);\n\n/* Entry get options */\nconst zenql = new Option(\n  '-q, --zenql <zenql>',\n  'get entries with a supplied ZenQL statement'\n);\n\nconst entryId = new Option('-i --id <id...>', 'the entry id to get');\n\n/* Import options */\nexport const fromFile = new Option(\n  '-file --from-file <fromFile>',\n  'file path to import asset(s) from'\n);\n\nexport const fromCms = new Option(\n  '-source --source-alias <fromCms>',\n  'the cloud CMS alias to import asset(s) from'\n);\nexport const fromProject = new Option(\n  '-sp --source-project-id <fromProject>',\n  'the id of the Contensis project to import asset(s) from (Default: [last connected project])'\n);\n\nexport const commit = new Option(\n  '--commit',\n  'omit and only add this flag when you are happy with the preview of the import'\n).default(false);\n\nexport const addConnectOptions = (program: Command) =>\n  program.addOption(alias.hideHelp()).addOption(project.hideHelp());\n\nexport const addAuthenticationOptions = (program: Command) =>\n  program\n    .addOption(user.hideHelp())\n    .addOption(password.hideHelp())\n    .addOption(clientId.hideHelp())\n    .addOption(sharedSecret.hideHelp());\n\nconst addOutputAndFormatOptions = (program: Command) =>\n  program.addOption(output).addOption(format);\n\nexport const addImportOptions = (program: Command) => {\n  for (const command of program.commands) {\n    command.addOption(fromFile).addOption(fromCms).addOption(fromProject);\n  }\n  return program;\n};\nexport const addGetEntryOptions = (program: Command) => {\n  for (const command of program.commands) {\n    command.addOption(entryId).addOption(zenql);\n  }\n  return program;\n};\nexport const addGlobalOptions = (program: Command) => {\n  for (const command of program.commands) {\n    addOutputAndFormatOptions(command);\n    addConnectOptions(command);\n    addAuthenticationOptions(command);\n  }\n  return program;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAgC;AAChC,kBAAoB;AAEb,MAAM,mBAAmB,CAAC,OAAY,CAAC,OAAO;AAAA,EACnD,QACE,KAAK,aAAa,KAAK,kBACnB;AAAA,IACE,KAAK,KAAK,gBACN,iBAAI,KAAK,WAAW,SAAS,EAAE,MAC9B;AAAA,IACL,SAAS,KAAK,mBAAoB;AAAA,EACpC,IACA;AAAA,EACN,OACE,KAAK,MAAM,KAAK,UAAU,KAAK,SAC3B;AAAA,IACE,QAAQ,KAAK;AAAA,IACb,YAAY,KAAK;AAAA,IACjB,YAAY,KAAK;AAAA,EACnB,IACA;AAAA,EACN,OAAO,KAAK;AAAA,EACZ,gBAAgB,CAAC,KAAK;AACxB;AAGA,MAAM,SAAS,IAAI;AAAA,EACjB;AAAA,EACA;AACF;AAEA,MAAM,SAAS,IAAI;AAAA,EACjB;AAAA,EACA;AACF,EAAE,QAAQ,CAAC,OAAO,QAAQ,OAAO,OAAO,CAAC;AAGzC,MAAM,QAAQ,IAAI;AAAA,EAChB;AAAA,EACA;AACF;AAEO,MAAM,UAAU,IAAI;AAAA,EACzB;AAAA,EACA;AACF;AAGA,MAAM,OAAO,IAAI;AAAA,EACf;AAAA,EACA;AACF;AACA,MAAM,WAAW,IAAI;AAAA,EACnB;AAAA,EACA;AACF;AACA,MAAM,WAAW,IAAI;AAAA,EACnB;AAAA,EACA;AACF;AACA,MAAM,eAAe,IAAI;AAAA,EACvB;AAAA,EACA;AACF;AAGA,MAAM,QAAQ,IAAI;AAAA,EAChB;AAAA,EACA;AACF;AAEA,MAAM,UAAU,IAAI,wBAAO,mBAAmB,qBAAqB;AAG5D,MAAM,WAAW,IAAI;AAAA,EAC1B;AAAA,EACA;AACF;AAEO,MAAM,UAAU,IAAI;AAAA,EACzB;AAAA,EACA;AACF;AACO,MAAM,cAAc,IAAI;AAAA,EAC7B;AAAA,EACA;AACF;AAEO,MAAM,SAAS,IAAI;AAAA,EACxB;AAAA,EACA;AACF,EAAE,QAAQ,KAAK;AAER,MAAM,oBAAoB,CAAC,YAChC,QAAQ,UAAU,MAAM,SAAS,CAAC,EAAE,UAAU,QAAQ,SAAS,CAAC;AAE3D,MAAM,2BAA2B,CAAC,YACvC,QACG,UAAU,KAAK,SAAS,CAAC,EACzB,UAAU,SAAS,SAAS,CAAC,EAC7B,UAAU,SAAS,SAAS,CAAC,EAC7B,UAAU,aAAa,SAAS,CAAC;AAEtC,MAAM,4BAA4B,CAAC,YACjC,QAAQ,UAAU,MAAM,EAAE,UAAU,MAAM;AAErC,MAAM,mBAAmB,CAAC,YAAqB;AACpD,aAAW,WAAW,QAAQ,UAAU;AACtC,YAAQ,UAAU,QAAQ,EAAE,UAAU,OAAO,EAAE,UAAU,WAAW;AAAA,EACtE;AACA,SAAO;AACT;AACO,MAAM,qBAAqB,CAAC,YAAqB;AACtD,aAAW,WAAW,QAAQ,UAAU;AACtC,YAAQ,UAAU,OAAO,EAAE,UAAU,KAAK;AAAA,EAC5C;AACA,SAAO;AACT;AACO,MAAM,mBAAmB,CAAC,YAAqB;AACpD,aAAW,WAAW,QAAQ,UAAU;AACtC,8BAA0B,OAAO;AACjC,sBAAkB,OAAO;AACzB,6BAAyB,OAAO;AAAA,EAClC;AACA,SAAO;AACT;",
+  "sourcesContent": ["import { Command, Option } from 'commander';\nimport { url } from '~/util';\n\nexport const mapContensisOpts = (opts: any = {}) => ({\n  source:\n    opts.sourceAlias || opts.sourceProjectId\n      ? {\n          url: opts.sourceAlias\n            ? url(opts.sourceAlias, 'website').cms\n            : (undefined as any),\n          project: opts.sourceProjectId || (undefined as any),\n        }\n      : undefined,\n  models: opts.modelIds,\n  query:\n    opts.id || opts.entryIds || opts.phrase || opts.fields\n      ? {\n          fields: opts.fields,\n          includeIds: opts.id || opts.entryIds,\n          searchTerm: opts.phrase,\n        }\n      : undefined,\n  zenQL: opts.zenql,\n  transformGuids: !opts.preserveGuids,\n});\n\n/* Output options */\nconst output = new Option(\n  '-o, --output <output>',\n  'save output to a file e.g. --output ./output.txt'\n);\n\nconst format = new Option(\n  '-f, --format <format>',\n  'format output as csv, json, xml or table (default)'\n).choices(['csv', 'json', 'xml', 'table']);\n\n/* Connect options */\nconst alias = new Option(\n  '-a, --alias <alias>',\n  'the cloud CMS alias to connect your request with'\n);\n\nexport const project = new Option(\n  '-p, --project-id <projectId>',\n  'the projectId to make your request with'\n);\n\n/* Authentication options */\nconst user = new Option(\n  '-u, --user <user>',\n  'the username to authenticate your request with'\n);\nconst password = new Option(\n  '-pw, --password <password>',\n  'the password to use to login with (optional/insecure)'\n);\nconst clientId = new Option(\n  '-id, --client-id <clientId>',\n  'the clientId to authenticate your request with'\n);\nconst sharedSecret = new Option(\n  '-s, --shared-secret <sharedSecret>',\n  'the shared secret to use when logging in with a client id'\n);\n\n/* Entry get options */\nexport const zenql = new Option(\n  '-q, --zenql <zenql>',\n  'get entries with a supplied ZenQL statement'\n);\n\nexport const entryId = new Option('-i --id <id...>', 'the entry id(s) to get');\n\n/* Import options */\nexport const fromFile = new Option(\n  '-file, --from-file <fromFile>',\n  'file path to import asset(s) from'\n);\n\nexport const fromCms = new Option(\n  '-source, --source-alias <fromCms>',\n  'the cloud CMS alias to import asset(s) from'\n);\nexport const fromProject = new Option(\n  '-sp, --source-project-id <fromProject>',\n  'the id of the Contensis project to import asset(s) from (Default: [last connected project])'\n);\n\nexport const commit = new Option(\n  '--commit',\n  'add this flag only after you have run a preview of the import and agree with the analysis'\n).default(false);\n\nexport const addConnectOptions = (program: Command) =>\n  program.addOption(alias.hideHelp()).addOption(project.hideHelp());\n\nexport const addAuthenticationOptions = (program: Command) =>\n  program\n    .addOption(user.hideHelp())\n    .addOption(password.hideHelp())\n    .addOption(clientId.hideHelp())\n    .addOption(sharedSecret.hideHelp());\n\nconst addOutputAndFormatOptions = (program: Command) =>\n  program.addOption(output).addOption(format);\n\nexport const addImportOptions = (program: Command) => {\n  for (const command of program.commands) {\n    command.addOption(fromFile).addOption(fromCms).addOption(fromProject);\n  }\n  return program;\n};\nexport const addGetEntryOptions = (program: Command) => {\n  for (const command of program.commands) {\n    command.addOption(entryId).addOption(zenql);\n  }\n  return program;\n};\nexport const addGlobalOptions = (program: Command) => {\n  for (const command of program.commands) {\n    addOutputAndFormatOptions(command);\n    addConnectOptions(command);\n    addAuthenticationOptions(command);\n  }\n  return program;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAgC;AAChC,kBAAoB;AAEb,MAAM,mBAAmB,CAAC,OAAY,CAAC,OAAO;AAAA,EACnD,QACE,KAAK,eAAe,KAAK,kBACrB;AAAA,IACE,KAAK,KAAK,kBACN,iBAAI,KAAK,aAAa,SAAS,EAAE,MAChC;AAAA,IACL,SAAS,KAAK,mBAAoB;AAAA,EACpC,IACA;AAAA,EACN,QAAQ,KAAK;AAAA,EACb,OACE,KAAK,MAAM,KAAK,YAAY,KAAK,UAAU,KAAK,SAC5C;AAAA,IACE,QAAQ,KAAK;AAAA,IACb,YAAY,KAAK,MAAM,KAAK;AAAA,IAC5B,YAAY,KAAK;AAAA,EACnB,IACA;AAAA,EACN,OAAO,KAAK;AAAA,EACZ,gBAAgB,CAAC,KAAK;AACxB;AAGA,MAAM,SAAS,IAAI;AAAA,EACjB;AAAA,EACA;AACF;AAEA,MAAM,SAAS,IAAI;AAAA,EACjB;AAAA,EACA;AACF,EAAE,QAAQ,CAAC,OAAO,QAAQ,OAAO,OAAO,CAAC;AAGzC,MAAM,QAAQ,IAAI;AAAA,EAChB;AAAA,EACA;AACF;AAEO,MAAM,UAAU,IAAI;AAAA,EACzB;AAAA,EACA;AACF;AAGA,MAAM,OAAO,IAAI;AAAA,EACf;AAAA,EACA;AACF;AACA,MAAM,WAAW,IAAI;AAAA,EACnB;AAAA,EACA;AACF;AACA,MAAM,WAAW,IAAI;AAAA,EACnB;AAAA,EACA;AACF;AACA,MAAM,eAAe,IAAI;AAAA,EACvB;AAAA,EACA;AACF;AAGO,MAAM,QAAQ,IAAI;AAAA,EACvB;AAAA,EACA;AACF;AAEO,MAAM,UAAU,IAAI,wBAAO,mBAAmB,wBAAwB;AAGtE,MAAM,WAAW,IAAI;AAAA,EAC1B;AAAA,EACA;AACF;AAEO,MAAM,UAAU,IAAI;AAAA,EACzB;AAAA,EACA;AACF;AACO,MAAM,cAAc,IAAI;AAAA,EAC7B;AAAA,EACA;AACF;AAEO,MAAM,SAAS,IAAI;AAAA,EACxB;AAAA,EACA;AACF,EAAE,QAAQ,KAAK;AAER,MAAM,oBAAoB,CAAC,YAChC,QAAQ,UAAU,MAAM,SAAS,CAAC,EAAE,UAAU,QAAQ,SAAS,CAAC;AAE3D,MAAM,2BAA2B,CAAC,YACvC,QACG,UAAU,KAAK,SAAS,CAAC,EACzB,UAAU,SAAS,SAAS,CAAC,EAC7B,UAAU,SAAS,SAAS,CAAC,EAC7B,UAAU,aAAa,SAAS,CAAC;AAEtC,MAAM,4BAA4B,CAAC,YACjC,QAAQ,UAAU,MAAM,EAAE,UAAU,MAAM;AAErC,MAAM,mBAAmB,CAAC,YAAqB;AACpD,aAAW,WAAW,QAAQ,UAAU;AACtC,YAAQ,UAAU,QAAQ,EAAE,UAAU,OAAO,EAAE,UAAU,WAAW;AAAA,EACtE;AACA,SAAO;AACT;AACO,MAAM,qBAAqB,CAAC,YAAqB;AACtD,aAAW,WAAW,QAAQ,UAAU;AACtC,YAAQ,UAAU,OAAO,EAAE,UAAU,KAAK;AAAA,EAC5C;AACA,SAAO;AACT;AACO,MAAM,mBAAmB,CAAC,YAAqB;AACpD,aAAW,WAAW,QAAQ,UAAU;AACtC,8BAA0B,OAAO;AACjC,sBAAkB,OAAO;AACzB,6BAAyB,OAAO;AAAA,EAClC;AACA,SAAO;AACT;",
   "names": []
 }

package/dist/commands/import.js

@@ -26,11 +26,29 @@ var import_commander = require("commander");
 var import_ContensisCliService = require("../services/ContensisCliService");
 var import_globalOptions = require("./globalOptions");
 const makeImportCommand = () => {
-  const program = new import_commander.Command().command("import").showHelpAfterError(true).exitOverride();
-  program.command("contenttypes").argument(
-    "[contentTypeIds]",
+  const program = new import_commander.Command().command("import").description("import command").addHelpText("after", `
+`).showHelpAfterError(true).exitOverride();
+  program.command("models").description("import complete content models").argument("[modelIds...]", "ids of the content models to import (optional)").addOption(import_globalOptions.commit).addHelpText(
+    "after",
+    `
+Example call:
+  > import models blogPost --from-file contentmodels-backup.json
+  > import models --source-alias example-dev
+`
+  ).action(async (modelIds, opts) => {
+    await (0, import_ContensisCliService.cliCommand)(
+      ["import", "models", modelIds.join(" ")],
+      opts,
+      (0, import_globalOptions.mapContensisOpts)({ modelIds, ...opts })
+    ).ImportContentModels({
+      fromFile: opts.fromFile,
+      commit: opts.commit
+    });
+  });
+  program.command("contenttypes").description("import content types").argument(
+    "[contentTypeIds...]",
     "Optional list of API id(s) of the content type(s) to import"
-  ).addHelpText(
+  ).addOption(import_globalOptions.commit).addHelpText(
     "after",
     `
 Example call:
@@ -38,7 +56,11 @@ Example call:
   > import contenttypes {contentTypeIds} --source-alias example-dev
 `
   ).action(async (contentTypeIds, opts) => {
-    await (0, import_ContensisCliService.cliCommand)(["import", "contenttypes"], opts).ImportContentTypes(
+    await (0, import_ContensisCliService.cliCommand)(
+      ["import", "contenttypes"],
+      opts,
+      (0, import_globalOptions.mapContensisOpts)({ contentTypeIds, ...opts })
+    ).ImportContentTypes(
       {
         fromFile: opts.fromFile,
         commit: opts.commit
@@ -46,10 +68,10 @@ Example call:
       contentTypeIds
     );
   });
-  program.command("components").argument(
-    "[componentIds]",
+  program.command("components").description("import components").argument(
+    "[componentIds...]",
     "Optional list of API id(s) of the component(s) to import"
-  ).addHelpText(
+  ).addOption(import_globalOptions.commit).addHelpText(
     "after",
     `
 Example call:
@@ -57,7 +79,11 @@ Example call:
   > import components {componentIds} --source-alias example-dev
 `
   ).action(async (componentIds, opts) => {
-    await (0, import_ContensisCliService.cliCommand)(["import", "component"], opts).ImportComponents(
+    await (0, import_ContensisCliService.cliCommand)(
+      ["import", "component"],
+      opts,
+      (0, import_globalOptions.mapContensisOpts)({ componentIds, ...opts })
+    ).ImportComponents(
       {
         fromFile: opts.fromFile,
         commit: opts.commit
@@ -65,12 +91,17 @@ Example call:
       componentIds
     );
   });
-  program.command("entries").argument(
+  program.command("entries").description("import entries").argument(
     "[search phrase]",
     "get entries with the search phrase, use quotes for multiple words"
   ).addOption(import_globalOptions.commit).option(
     "-preserve, --preserve-guids",
     "include this flag when you are importing entries that you have previously exported and wish to update"
+  ).addOption(
+    new import_commander.Option(
+      "-oe, --output-entries <outputEntries>",
+      "which details of the entries included in the import to output"
+    ).choices(["errors", "changes", "all"]).default("errors")
   ).addHelpText(
     "after",
     `
@@ -82,7 +113,11 @@ Example call:
       ["import", "entries"],
       opts,
       (0, import_globalOptions.mapContensisOpts)({ phrase, ...opts })
-    ).ImportEntries({ commit: opts.commit, fromFile: opts.fromFile });
+    ).ImportEntries({
+      commit: opts.commit,
+      fromFile: opts.fromFile,
+      logOutput: opts.outputEntries
+    });
   });
   return program;
 };

package/dist/commands/import.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/commands/import.ts"],
-  "sourcesContent": ["import { Argument, Command } from 'commander';\nimport { cliCommand } from '~/services/ContensisCliService';\nimport { url } from '~/util';\nimport { commit, mapContensisOpts } from './globalOptions';\n\nexport const makeImportCommand = () => {\n  const program = new Command()\n    .command('import')\n    .showHelpAfterError(true)\n    .exitOverride();\n\n  program\n    .command('contenttypes')\n    .argument(\n      '[contentTypeIds]',\n      'Optional list of API id(s) of the content type(s) to import'\n    )\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > import contenttypes {contentTypeIds} --from-file contenttypes-backup.json\n  > import contenttypes {contentTypeIds} --source-alias example-dev\n`\n    )\n    .action(async (contentTypeIds: string[], opts) => {\n      await cliCommand(['import', 'contenttypes'], opts).ImportContentTypes(\n        {\n          fromFile: opts.fromFile,\n          commit: opts.commit,\n        },\n        contentTypeIds\n      );\n    });\n\n  program\n    .command('components')\n    .argument(\n      '[componentIds]',\n      'Optional list of API id(s) of the component(s) to import'\n    )\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > import components {componentIds} --from-file component-backup.json\n  > import components {componentIds} --source-alias example-dev\n`\n    )\n    .action(async (componentIds: string[], opts) => {\n      await cliCommand(['import', 'component'], opts).ImportComponents(\n        {\n          fromFile: opts.fromFile,\n          commit: opts.commit,\n        },\n        componentIds\n      );\n    });\n\n  program\n    .command('entries')\n    .argument(\n      '[search phrase]',\n      'get entries with the search phrase, use quotes for multiple words'\n    )\n    .addOption(commit)\n    .option(\n      '-preserve, --preserve-guids',\n      'include this flag when you are importing entries that you have previously exported and wish to update'\n    )\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > import entries --source-cms example-dev --source-project-id microsite --zenql \"sys.contentTypeId = blog\"\n`\n    )\n    .action(async (phrase: string, opts, cmd) => {\n      await cliCommand(\n        ['import', 'entries'],\n        opts,\n        mapContensisOpts({ phrase, ...opts })\n      ).ImportEntries({ commit: opts.commit, fromFile: opts.fromFile });\n    });\n\n  return program;\n};\n\nexport const get = makeImportCommand();\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAkC;AAClC,iCAA2B;AAE3B,2BAAyC;AAElC,MAAM,oBAAoB,MAAM;AACrC,QAAM,UAAU,IAAI,yBAAQ,EACzB,QAAQ,QAAQ,EAChB,mBAAmB,IAAI,EACvB,aAAa;AAEhB,UACG,QAAQ,cAAc,EACtB;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA;AAAA,EAKF,EACC,OAAO,OAAO,gBAA0B,SAAS;AAChD,cAAM,uCAAW,CAAC,UAAU,cAAc,GAAG,IAAI,EAAE;AAAA,MACjD;AAAA,QACE,UAAU,KAAK;AAAA,QACf,QAAQ,KAAK;AAAA,MACf;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AAEH,UACG,QAAQ,YAAY,EACpB;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA;AAAA,EAKF,EACC,OAAO,OAAO,cAAwB,SAAS;AAC9C,cAAM,uCAAW,CAAC,UAAU,WAAW,GAAG,IAAI,EAAE;AAAA,MAC9C;AAAA,QACE,UAAU,KAAK;AAAA,QACf,QAAQ,KAAK;AAAA,MACf;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AAEH,UACG,QAAQ,SAAS,EACjB;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC,UAAU,2BAAM,EAChB;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,EAIF,EACC,OAAO,OAAO,QAAgB,MAAM,QAAQ;AAC3C,cAAM;AAAA,MACJ,CAAC,UAAU,SAAS;AAAA,MACpB;AAAA,UACA,uCAAiB,EAAE,QAAQ,GAAG,KAAK,CAAC;AAAA,IACtC,EAAE,cAAc,EAAE,QAAQ,KAAK,QAAQ,UAAU,KAAK,SAAS,CAAC;AAAA,EAClE,CAAC;AAEH,SAAO;AACT;AAEO,MAAM,MAAM,kBAAkB;",
+  "sourcesContent": ["import { Command, Option } from 'commander';\nimport { cliCommand } from '~/services/ContensisCliService';\nimport { commit, mapContensisOpts } from './globalOptions';\n\nexport const makeImportCommand = () => {\n  const program = new Command()\n    .command('import')\n    .description('import command')\n    .addHelpText('after', `\\n`)\n    .showHelpAfterError(true)\n    .exitOverride();\n\n  program\n    .command('models')\n    .description('import complete content models')\n    .argument('[modelIds...]', 'ids of the content models to import (optional)')\n    .addOption(commit)\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > import models blogPost --from-file contentmodels-backup.json\n  > import models --source-alias example-dev\n`\n    )\n    .action(async (modelIds: string[], opts) => {\n      await cliCommand(\n        ['import', 'models', modelIds.join(' ')],\n        opts,\n        mapContensisOpts({ modelIds, ...opts })\n      ).ImportContentModels({\n        fromFile: opts.fromFile,\n        commit: opts.commit,\n      });\n    });\n\n  program\n    .command('contenttypes')\n    .description('import content types')\n    .argument(\n      '[contentTypeIds...]',\n      'Optional list of API id(s) of the content type(s) to import'\n    )\n    .addOption(commit)\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > import contenttypes {contentTypeIds} --from-file contenttypes-backup.json\n  > import contenttypes {contentTypeIds} --source-alias example-dev\n`\n    )\n    .action(async (contentTypeIds: string[], opts) => {\n      await cliCommand(\n        ['import', 'contenttypes'],\n        opts,\n        mapContensisOpts({ contentTypeIds, ...opts })\n      ).ImportContentTypes(\n        {\n          fromFile: opts.fromFile,\n          commit: opts.commit,\n        },\n        contentTypeIds\n      );\n    });\n\n  program\n    .command('components')\n    .description('import components')\n    .argument(\n      '[componentIds...]',\n      'Optional list of API id(s) of the component(s) to import'\n    )\n    .addOption(commit)\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > import components {componentIds} --from-file component-backup.json\n  > import components {componentIds} --source-alias example-dev\n`\n    )\n    .action(async (componentIds: string[], opts) => {\n      await cliCommand(\n        ['import', 'component'],\n        opts,\n        mapContensisOpts({ componentIds, ...opts })\n      ).ImportComponents(\n        {\n          fromFile: opts.fromFile,\n          commit: opts.commit,\n        },\n        componentIds\n      );\n    });\n\n  program\n    .command('entries')\n    .description('import entries')\n    .argument(\n      '[search phrase]',\n      'get entries with the search phrase, use quotes for multiple words'\n    )\n    .addOption(commit)\n    .option(\n      '-preserve, --preserve-guids',\n      'include this flag when you are importing entries that you have previously exported and wish to update'\n    )\n    .addOption(\n      new Option(\n        '-oe, --output-entries <outputEntries>',\n        'which details of the entries included in the import to output'\n      )\n        .choices(['errors', 'changes', 'all'])\n        .default('errors')\n    )\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > import entries --source-cms example-dev --source-project-id microsite --zenql \"sys.contentTypeId = blog\"\n`\n    )\n    .action(async (phrase: string, opts, cmd) => {\n      await cliCommand(\n        ['import', 'entries'],\n        opts,\n        mapContensisOpts({ phrase, ...opts })\n      ).ImportEntries({\n        commit: opts.commit,\n        fromFile: opts.fromFile,\n        logOutput: opts.outputEntries,\n      });\n    });\n\n  return program;\n};\n\nexport const get = makeImportCommand();\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAgC;AAChC,iCAA2B;AAC3B,2BAAyC;AAElC,MAAM,oBAAoB,MAAM;AACrC,QAAM,UAAU,IAAI,yBAAQ,EACzB,QAAQ,QAAQ,EAChB,YAAY,gBAAgB,EAC5B,YAAY,SAAS;AAAA,CAAI,EACzB,mBAAmB,IAAI,EACvB,aAAa;AAEhB,UACG,QAAQ,QAAQ,EAChB,YAAY,gCAAgC,EAC5C,SAAS,iBAAiB,gDAAgD,EAC1E,UAAU,2BAAM,EAChB;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA;AAAA,EAKF,EACC,OAAO,OAAO,UAAoB,SAAS;AAC1C,cAAM;AAAA,MACJ,CAAC,UAAU,UAAU,SAAS,KAAK,GAAG,CAAC;AAAA,MACvC;AAAA,UACA,uCAAiB,EAAE,UAAU,GAAG,KAAK,CAAC;AAAA,IACxC,EAAE,oBAAoB;AAAA,MACpB,UAAU,KAAK;AAAA,MACf,QAAQ,KAAK;AAAA,IACf,CAAC;AAAA,EACH,CAAC;AAEH,UACG,QAAQ,cAAc,EACtB,YAAY,sBAAsB,EAClC;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC,UAAU,2BAAM,EAChB;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA;AAAA,EAKF,EACC,OAAO,OAAO,gBAA0B,SAAS;AAChD,cAAM;AAAA,MACJ,CAAC,UAAU,cAAc;AAAA,MACzB;AAAA,UACA,uCAAiB,EAAE,gBAAgB,GAAG,KAAK,CAAC;AAAA,IAC9C,EAAE;AAAA,MACA;AAAA,QACE,UAAU,KAAK;AAAA,QACf,QAAQ,KAAK;AAAA,MACf;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AAEH,UACG,QAAQ,YAAY,EACpB,YAAY,mBAAmB,EAC/B;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC,UAAU,2BAAM,EAChB;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA;AAAA,EAKF,EACC,OAAO,OAAO,cAAwB,SAAS;AAC9C,cAAM;AAAA,MACJ,CAAC,UAAU,WAAW;AAAA,MACtB;AAAA,UACA,uCAAiB,EAAE,cAAc,GAAG,KAAK,CAAC;AAAA,IAC5C,EAAE;AAAA,MACA;AAAA,QACE,UAAU,KAAK;AAAA,QACf,QAAQ,KAAK;AAAA,MACf;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AAEH,UACG,QAAQ,SAAS,EACjB,YAAY,gBAAgB,EAC5B;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC,UAAU,2BAAM,EAChB;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC,IAAI;AAAA,MACF;AAAA,MACA;AAAA,IACF,EACG,QAAQ,CAAC,UAAU,WAAW,KAAK,CAAC,EACpC,QAAQ,QAAQ;AAAA,EACrB,EACC;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,EAIF,EACC,OAAO,OAAO,QAAgB,MAAM,QAAQ;AAC3C,cAAM;AAAA,MACJ,CAAC,UAAU,SAAS;AAAA,MACpB;AAAA,UACA,uCAAiB,EAAE,QAAQ,GAAG,KAAK,CAAC;AAAA,IACtC,EAAE,cAAc;AAAA,MACd,QAAQ,KAAK;AAAA,MACb,UAAU,KAAK;AAAA,MACf,WAAW,KAAK;AAAA,IAClB,CAAC;AAAA,EACH,CAAC;AAEH,SAAO;AACT;AAEO,MAAM,MAAM,kBAAkB;",
   "names": []
 }

package/dist/commands/index.js

@@ -26,6 +26,8 @@ var import_logger = require("../util/logger");
 var import_version = require("../version");
 var import_connect = require("./connect");
 var import_create = require("./create");
+var import_diff = require("./diff");
+var import_execute = require("./execute");
 var import_get = require("./get");
 var import_globalOptions = require("./globalOptions");
 var import_import = require("./import");
@@ -39,15 +41,27 @@ const commands = () => {
     writeErr: (str) => {
       return str.toLowerCase().includes("error") ? import_logger.Logger.error(`Command ${str}`) : str.trim() && import_logger.Logger.help(str);
     }
-  }).exitOverride().showHelpAfterError(true);
+  }).addHelpText(
+    "after",
+    import_logger.Logger.helpText`
+>> Each command has its own help - for example:
+  > login --help\n  > get --help
+`
+  ).exitOverride().showHelpAfterError(true);
   program.addCommand(
     (0, import_globalOptions.addAuthenticationOptions)((0, import_connect.makeConnectCommand)()).copyInheritedSettings(
       program
     )
   );
+  program.addCommand(
+    (0, import_globalOptions.addGlobalOptions)((0, import_create.makeCreateCommand)()).copyInheritedSettings(program)
+  );
+  program.addCommand(
+    (0, import_globalOptions.addGlobalOptions)((0, import_execute.makeExecuteCommand)()).copyInheritedSettings(program)
+  );
   program.addCommand(
     (0, import_globalOptions.addGlobalOptions)(
-      (0, import_globalOptions.addImportOptions)((0, import_create.makeCreateCommand)())
+      (0, import_globalOptions.addGetEntryOptions)((0, import_globalOptions.addImportOptions)((0, import_diff.makeDiffCommand)()))
     ).copyInheritedSettings(program)
   );
   program.addCommand(

package/dist/commands/index.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/commands/index.ts"],
-  "sourcesContent": ["import { Command } from 'commander';\nimport { Logger } from '~/util/logger';\nimport { LIB_VERSION } from '~/version';\nimport { makeConnectCommand } from './connect';\nimport { makeCreateCommand } from './create';\nimport { makeGetCommand } from './get';\nimport {\n  addAuthenticationOptions,\n  addConnectOptions,\n  addGetEntryOptions,\n  addGlobalOptions,\n  addImportOptions,\n} from './globalOptions';\nimport { makeImportCommand } from './import';\nimport { makeListCommand } from './list';\nimport { makeLoginCommand } from './login';\nimport { makePushCommand } from './push';\nimport { makeRemoveCommand } from './remove';\nimport { makeSetCommand } from './set';\n\nconst commands = () => {\n  const program = new Command()\n    .name('contensis')\n    .version(LIB_VERSION)\n    .configureOutput({\n      writeErr: str => {\n        return str.toLowerCase().includes('error')\n          ? Logger.error(`Command ${str}`)\n          : str.trim() && Logger.help(str);\n      },\n    })\n    .exitOverride()\n    .showHelpAfterError(true);\n\n  program.addCommand(\n    addAuthenticationOptions(makeConnectCommand()).copyInheritedSettings(\n      program\n    )\n  );\n  program.addCommand(\n    addGlobalOptions(\n      addImportOptions(makeCreateCommand())\n    ).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(makeGetCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(\n      addGetEntryOptions(addImportOptions(makeImportCommand()))\n    ).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(makeListCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addConnectOptions(makeLoginCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(makePushCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(makeRemoveCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addConnectOptions(makeSetCommand()).copyInheritedSettings(program)\n  );\n\n  return program;\n};\n\nexport default commands;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAwB;AACxB,oBAAuB;AACvB,qBAA4B;AAC5B,qBAAmC;AACnC,oBAAkC;AAClC,iBAA+B;AAC/B,2BAMO;AACP,oBAAkC;AAClC,kBAAgC;AAChC,mBAAiC;AACjC,kBAAgC;AAChC,oBAAkC;AAClC,iBAA+B;AAE/B,MAAM,WAAW,MAAM;AACrB,QAAM,UAAU,IAAI,yBAAQ,EACzB,KAAK,WAAW,EAChB,QAAQ,0BAAW,EACnB,gBAAgB;AAAA,IACf,UAAU,SAAO;AACf,aAAO,IAAI,YAAY,EAAE,SAAS,OAAO,IACrC,qBAAO,MAAM,WAAW,KAAK,IAC7B,IAAI,KAAK,KAAK,qBAAO,KAAK,GAAG;AAAA,IACnC;AAAA,EACF,CAAC,EACA,aAAa,EACb,mBAAmB,IAAI;AAE1B,UAAQ;AAAA,QACN,mDAAyB,mCAAmB,CAAC,EAAE;AAAA,MAC7C;AAAA,IACF;AAAA,EACF;AACA,UAAQ;AAAA,QACN;AAAA,UACE,2CAAiB,iCAAkB,CAAC;AAAA,IACtC,EAAE,sBAAsB,OAAO;AAAA,EACjC;AACA,UAAQ;AAAA,QACN,2CAAiB,2BAAe,CAAC,EAAE,sBAAsB,OAAO;AAAA,EAClE;AACA,UAAQ;AAAA,QACN;AAAA,UACE,6CAAmB,2CAAiB,iCAAkB,CAAC,CAAC;AAAA,IAC1D,EAAE,sBAAsB,OAAO;AAAA,EACjC;AACA,UAAQ;AAAA,QACN,2CAAiB,6BAAgB,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACnE;AACA,UAAQ;AAAA,QACN,4CAAkB,+BAAiB,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACrE;AACA,UAAQ;AAAA,QACN,2CAAiB,6BAAgB,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACnE;AACA,UAAQ;AAAA,QACN,2CAAiB,iCAAkB,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACrE;AACA,UAAQ;AAAA,QACN,4CAAkB,2BAAe,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACnE;AAEA,SAAO;AACT;AAEA,IAAO,mBAAQ;",
+  "sourcesContent": ["import { Command } from 'commander';\nimport { Logger } from '~/util/logger';\nimport { LIB_VERSION } from '~/version';\nimport { makeConnectCommand } from './connect';\nimport { makeCreateCommand } from './create';\nimport { makeDiffCommand } from './diff';\nimport { makeExecuteCommand } from './execute';\nimport { makeGetCommand } from './get';\nimport {\n  addAuthenticationOptions,\n  addConnectOptions,\n  addGetEntryOptions,\n  addGlobalOptions,\n  addImportOptions,\n} from './globalOptions';\nimport { makeImportCommand } from './import';\nimport { makeListCommand } from './list';\nimport { makeLoginCommand } from './login';\nimport { makePushCommand } from './push';\nimport { makeRemoveCommand } from './remove';\nimport { makeSetCommand } from './set';\n\nconst commands = () => {\n  const program = new Command()\n    .name('contensis')\n    .version(LIB_VERSION)\n    .configureOutput({\n      writeErr: str => {\n        return str.toLowerCase().includes('error')\n          ? Logger.error(`Command ${str}`)\n          : str.trim() && Logger.help(str);\n      },\n    })\n    .addHelpText(\n      'after',\n      Logger.helpText`\n>> Each command has its own help - for example:\n  > login --help\\n  > get --help\n`\n    )\n    .exitOverride()\n    .showHelpAfterError(true);\n\n  program.addCommand(\n    addAuthenticationOptions(makeConnectCommand()).copyInheritedSettings(\n      program\n    )\n  );\n  program.addCommand(\n    addGlobalOptions(makeCreateCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(makeExecuteCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(\n      addGetEntryOptions(addImportOptions(makeDiffCommand()))\n    ).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(makeGetCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(\n      addGetEntryOptions(addImportOptions(makeImportCommand()))\n    ).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(makeListCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addConnectOptions(makeLoginCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(makePushCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addGlobalOptions(makeRemoveCommand()).copyInheritedSettings(program)\n  );\n  program.addCommand(\n    addConnectOptions(makeSetCommand()).copyInheritedSettings(program)\n  );\n\n  return program;\n};\n\nexport default commands;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAwB;AACxB,oBAAuB;AACvB,qBAA4B;AAC5B,qBAAmC;AACnC,oBAAkC;AAClC,kBAAgC;AAChC,qBAAmC;AACnC,iBAA+B;AAC/B,2BAMO;AACP,oBAAkC;AAClC,kBAAgC;AAChC,mBAAiC;AACjC,kBAAgC;AAChC,oBAAkC;AAClC,iBAA+B;AAE/B,MAAM,WAAW,MAAM;AACrB,QAAM,UAAU,IAAI,yBAAQ,EACzB,KAAK,WAAW,EAChB,QAAQ,0BAAW,EACnB,gBAAgB;AAAA,IACf,UAAU,SAAO;AACf,aAAO,IAAI,YAAY,EAAE,SAAS,OAAO,IACrC,qBAAO,MAAM,WAAW,KAAK,IAC7B,IAAI,KAAK,KAAK,qBAAO,KAAK,GAAG;AAAA,IACnC;AAAA,EACF,CAAC,EACA;AAAA,IACC;AAAA,IACA,qBAAO;AAAA;AAAA;AAAA;AAAA,EAIT,EACC,aAAa,EACb,mBAAmB,IAAI;AAE1B,UAAQ;AAAA,QACN,mDAAyB,mCAAmB,CAAC,EAAE;AAAA,MAC7C;AAAA,IACF;AAAA,EACF;AACA,UAAQ;AAAA,QACN,2CAAiB,iCAAkB,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACrE;AACA,UAAQ;AAAA,QACN,2CAAiB,mCAAmB,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACtE;AACA,UAAQ;AAAA,QACN;AAAA,UACE,6CAAmB,2CAAiB,6BAAgB,CAAC,CAAC;AAAA,IACxD,EAAE,sBAAsB,OAAO;AAAA,EACjC;AACA,UAAQ;AAAA,QACN,2CAAiB,2BAAe,CAAC,EAAE,sBAAsB,OAAO;AAAA,EAClE;AACA,UAAQ;AAAA,QACN;AAAA,UACE,6CAAmB,2CAAiB,iCAAkB,CAAC,CAAC;AAAA,IAC1D,EAAE,sBAAsB,OAAO;AAAA,EACjC;AACA,UAAQ;AAAA,QACN,2CAAiB,6BAAgB,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACnE;AACA,UAAQ;AAAA,QACN,4CAAkB,+BAAiB,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACrE;AACA,UAAQ;AAAA,QACN,2CAAiB,6BAAgB,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACnE;AACA,UAAQ;AAAA,QACN,2CAAiB,iCAAkB,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACrE;AACA,UAAQ;AAAA,QACN,4CAAkB,2BAAe,CAAC,EAAE,sBAAsB,OAAO;AAAA,EACnE;AAEA,SAAO;AACT;AAEA,IAAO,mBAAQ;",
   "names": []
 }

package/dist/commands/list.js

@@ -24,8 +24,9 @@ module.exports = __toCommonJS(list_exports);
 var import_commander = require("commander");
 var import_ContensisCliService = require("../services/ContensisCliService");
 const makeListCommand = () => {
-  const list = new import_commander.Command().command("list").showHelpAfterError(true).exitOverride();
-  list.command("envs").addHelpText(
+  const list = new import_commander.Command().command("list").description("list command").addHelpText("after", `
+`).showHelpAfterError(true).exitOverride();
+  list.command("envs").description("List all previously connected environments").addHelpText(
     "after",
     `
 Example call:
@@ -34,10 +35,25 @@ Example call:
   ).action((opts) => {
     (0, import_ContensisCliService.cliCommand)(["list", "envs"], opts).PrintEnvironments();
   });
-  list.command("projects").action(async (opts) => {
+  list.command("projects").description("print list of projects").addHelpText(
+    "after",
+    `
+Example call:
+  > list projects
+`
+  ).action(async (opts) => {
     await (0, import_ContensisCliService.cliCommand)(["list", "projects"], opts).PrintProjects();
   });
-  list.command("contenttypes").addHelpText(
+  list.command("models").description("print list of content models").addHelpText(
+    "after",
+    `
+Example call:
+  > list models
+`
+  ).action(async (opts) => {
+    await (0, import_ContensisCliService.cliCommand)(["list", "models"], opts).PrintContentModels();
+  });
+  list.command("contenttypes").description("print list of content types").addHelpText(
     "after",
     `
 Example call:
@@ -46,7 +62,7 @@ Example call:
   ).action(async (opts) => {
     await (0, import_ContensisCliService.cliCommand)(["list", "contenttypes"], opts).PrintContentTypes();
   });
-  list.command("components").addHelpText(
+  list.command("components").description("print list of components").addHelpText(
     "after",
     `
 Example call:
@@ -55,7 +71,7 @@ Example call:
   ).action(async (opts) => {
     await (0, import_ContensisCliService.cliCommand)(["list", "components"], opts).PrintComponents();
   });
-  list.command("blocks").addHelpText(
+  list.command("blocks").description("print list of content blocks").addHelpText(
     "after",
     `
 Example call:
@@ -64,7 +80,7 @@ Example call:
   ).action(async (opts) => {
     await (0, import_ContensisCliService.cliCommand)(["list", "blocks"], opts).PrintBlocks();
   });
-  list.command("keys").addHelpText(
+  list.command("keys").description("print list of API keys").addHelpText(
     "after",
     `
 Example call:
@@ -73,10 +89,37 @@ Example call:
   ).action(async (opts) => {
     await (0, import_ContensisCliService.cliCommand)(["list", "keys"], opts).PrintApiKeys();
   });
-  list.command("webhooks").argument("[name]", "find webhooks matching the supplied name").option("-i --id <id...>", "the subscription id(s) to get").action(async (name, { id, ...opts } = {}) => {
+  list.command("proxies").description("print list of proxies").addHelpText(
+    "after",
+    `
+Example call:
+  > list proxies
+`
+  ).action(async (opts) => {
+    await (0, import_ContensisCliService.cliCommand)(["list", "proxies"], opts).PrintProxies();
+  });
+  list.command("renderers").description("print list of renderers").addHelpText(
+    "after",
+    `
+Example call:
+  > list renderers
+`
+  ).action(async (opts) => {
+    await (0, import_ContensisCliService.cliCommand)(["list", "renderers"], opts).PrintRenderers();
+  });
+  list.command("roles").description("print list of roles").addHelpText(
+    "after",
+    `
+Example call:
+  > list roles
+`
+  ).action(async (opts) => {
+    await (0, import_ContensisCliService.cliCommand)(["list", "roles"], opts).PrintRoles();
+  });
+  list.command("webhooks").description("print list of webhooks").argument("[name]", "find webhooks matching the supplied name").option("-i --id <id...>", "the subscription id(s) to get").addHelpText("after", `
+`).action(async (name, { id, ...opts } = {}) => {
     await (0, import_ContensisCliService.cliCommand)(["list", "webhooks"], opts).PrintWebhookSubscriptions(
-      id,
-      name
+      name ? [name] : id
     );
   });
   return list;

package/dist/commands/list.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/commands/list.ts"],
-  "sourcesContent": ["import { Command } from 'commander';\nimport { cliCommand } from '~/services/ContensisCliService';\n\n// projects\n// content types\n// components\n// api keys\n// roles\n// webhooks\nexport const makeListCommand = () => {\n  const list = new Command()\n    .command('list')\n    .showHelpAfterError(true)\n    .exitOverride();\n\n  list\n    .command('envs')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list envs\n`\n    )\n    .action(opts => {\n      cliCommand(['list', 'envs'], opts).PrintEnvironments();\n    });\n  list.command('projects').action(async opts => {\n    await cliCommand(['list', 'projects'], opts).PrintProjects();\n  });\n  list\n    .command('contenttypes')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list contenttypes -o ./output.json -f json\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'contenttypes'], opts).PrintContentTypes();\n    });\n  list\n    .command('components')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list components -o ./output.json -f json\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'components'], opts).PrintComponents();\n    });\n  list\n    .command('blocks')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list blocks\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'blocks'], opts).PrintBlocks();\n    });\n  list\n    .command('keys')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list keys\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'keys'], opts).PrintApiKeys();\n    });\n  list\n    .command('webhooks')\n    .argument('[name]', 'find webhooks matching the supplied name')\n    .option('-i --id <id...>', 'the subscription id(s) to get')\n    .action(async (name?: string, { id, ...opts }: any = {}) => {\n      await cliCommand(['list', 'webhooks'], opts).PrintWebhookSubscriptions(\n        id,\n        name\n      );\n    });\n  return list;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAwB;AACxB,iCAA2B;AAQpB,MAAM,kBAAkB,MAAM;AACnC,QAAM,OAAO,IAAI,yBAAQ,EACtB,QAAQ,MAAM,EACd,mBAAmB,IAAI,EACvB,aAAa;AAEhB,OACG,QAAQ,MAAM,EACd;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,EAIF,EACC,OAAO,UAAQ;AACd,+CAAW,CAAC,QAAQ,MAAM,GAAG,IAAI,EAAE,kBAAkB;AAAA,EACvD,CAAC;AACH,OAAK,QAAQ,UAAU,EAAE,OAAO,OAAM,SAAQ;AAC5C,cAAM,uCAAW,CAAC,QAAQ,UAAU,GAAG,IAAI,EAAE,cAAc;AAAA,EAC7D,CAAC;AACD,OACG,QAAQ,cAAc,EACtB;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,EAIF,EACC,OAAO,OAAM,SAAQ;AACpB,cAAM,uCAAW,CAAC,QAAQ,cAAc,GAAG,IAAI,EAAE,kBAAkB;AAAA,EACrE,CAAC;AACH,OACG,QAAQ,YAAY,EACpB;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,EAIF,EACC,OAAO,OAAM,SAAQ;AACpB,cAAM,uCAAW,CAAC,QAAQ,YAAY,GAAG,IAAI,EAAE,gBAAgB;AAAA,EACjE,CAAC;AACH,OACG,QAAQ,QAAQ,EAChB;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,EAIF,EACC,OAAO,OAAM,SAAQ;AACpB,cAAM,uCAAW,CAAC,QAAQ,QAAQ,GAAG,IAAI,EAAE,YAAY;AAAA,EACzD,CAAC;AACH,OACG,QAAQ,MAAM,EACd;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,EAIF,EACC,OAAO,OAAM,SAAQ;AACpB,cAAM,uCAAW,CAAC,QAAQ,MAAM,GAAG,IAAI,EAAE,aAAa;AAAA,EACxD,CAAC;AACH,OACG,QAAQ,UAAU,EAClB,SAAS,UAAU,0CAA0C,EAC7D,OAAO,mBAAmB,+BAA+B,EACzD,OAAO,OAAO,MAAe,EAAE,OAAO,KAAK,IAAS,CAAC,MAAM;AAC1D,cAAM,uCAAW,CAAC,QAAQ,UAAU,GAAG,IAAI,EAAE;AAAA,MAC3C;AAAA,MACA;AAAA,IACF;AAAA,EACF,CAAC;AACH,SAAO;AACT;",
+  "sourcesContent": ["import { Command } from 'commander';\nimport { cliCommand } from '~/services/ContensisCliService';\n\nexport const makeListCommand = () => {\n  const list = new Command()\n    .command('list')\n    .description('list command')\n    .addHelpText('after', `\\n`)\n    .showHelpAfterError(true)\n    .exitOverride();\n\n  list\n    .command('envs')\n    .description('List all previously connected environments')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list envs\n`\n    )\n    .action(opts => {\n      cliCommand(['list', 'envs'], opts).PrintEnvironments();\n    });\n\n  list\n    .command('projects')\n    .description('print list of projects')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list projects\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'projects'], opts).PrintProjects();\n    });\n\n  list\n    .command('models')\n    .description('print list of content models')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list models\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'models'], opts).PrintContentModels();\n    });\n\n  list\n    .command('contenttypes')\n    .description('print list of content types')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list contenttypes -o ./output.json -f json\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'contenttypes'], opts).PrintContentTypes();\n    });\n\n  list\n    .command('components')\n    .description('print list of components')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list components -o ./output.json -f json\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'components'], opts).PrintComponents();\n    });\n\n  list\n    .command('blocks')\n    .description('print list of content blocks')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list blocks\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'blocks'], opts).PrintBlocks();\n    });\n\n  list\n    .command('keys')\n    .description('print list of API keys')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list keys\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'keys'], opts).PrintApiKeys();\n    });\n\n  list\n    .command('proxies')\n    .description('print list of proxies')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list proxies\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'proxies'], opts).PrintProxies();\n    });\n\n  list\n    .command('renderers')\n    .description('print list of renderers')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list renderers\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'renderers'], opts).PrintRenderers();\n    });\n\n  list\n    .command('roles')\n    .description('print list of roles')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > list roles\n`\n    )\n    .action(async opts => {\n      await cliCommand(['list', 'roles'], opts).PrintRoles();\n    });\n\n  list\n    .command('webhooks')\n    .description('print list of webhooks')\n    .argument('[name]', 'find webhooks matching the supplied name')\n    .option('-i --id <id...>', 'the subscription id(s) to get')\n    .addHelpText('after', `\\n`)\n    .action(async (name?: string, { id, ...opts }: any = {}) => {\n      await cliCommand(['list', 'webhooks'], opts).PrintWebhookSubscriptions(\n        name ? [name] : id\n      );\n    });\n  return list;\n};\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/commands/login.js

@@ -25,11 +25,11 @@ var import_commander = require("commander");
 var import_ContensisCliService = require("../services/ContensisCliService");
 var import_shell = require("../shell");
 const makeLoginCommand = () => {
-  const login = new import_commander.Command().command("login").argument("<user/clientId>", "the username to login with").argument(
+  const login = new import_commander.Command().command("login").description("login to a connected Contensis instance").argument("<user/clientId>", "the username to login with").argument(
     "[password]",
     "the password to use to login with (optional/insecure)"
   ).option(
-    "-s --shared-secret <sharedSecret>",
+    "-s, --shared-secret <sharedSecret>",
     "the shared secret to use when logging in with a client id"
   ).usage("<user/clientId> [password] [-s <sharedSecret>]").addHelpText(
     "after",
@@ -45,7 +45,7 @@ Example call:
       sharedSecret: opts.sharedSecret
     });
     if (token)
-      await (0, import_shell.shell)().start();
+      await (0, import_shell.shell)().restart();
   });
   return login;
 };

package/dist/commands/login.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/commands/login.ts"],
-  "sourcesContent": ["import { Command } from 'commander';\nimport { cliCommand } from '~/services/ContensisCliService';\nimport { shell } from '~/shell';\n\nexport const makeLoginCommand = () => {\n  const login = new Command()\n    .command('login')\n    .argument('<user/clientId>', 'the username to login with')\n    .argument(\n      '[password]',\n      'the password to use to login with (optional/insecure)'\n    )\n    .option(\n      '-s --shared-secret <sharedSecret>',\n      'the shared secret to use when logging in with a client id'\n    )\n    .usage('<user/clientId> [password] [-s <sharedSecret>]')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > login myuserid\\n  -- or --\\n  > login {clientId} -s {sharedSecret}\n`\n    )\n    .action(async (user, password, opts) => {\n      const token = await cliCommand(['login', user]).Login(user, {\n        password,\n        sharedSecret: opts.sharedSecret,\n      });\n      if (token) await shell().start();\n    });\n  return login;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAwB;AACxB,iCAA2B;AAC3B,mBAAsB;AAEf,MAAM,mBAAmB,MAAM;AACpC,QAAM,QAAQ,IAAI,yBAAQ,EACvB,QAAQ,OAAO,EACf,SAAS,mBAAmB,4BAA4B,EACxD;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC,MAAM,gDAAgD,EACtD;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAIF,EACC,OAAO,OAAO,MAAM,UAAU,SAAS;AACtC,UAAM,QAAQ,UAAM,uCAAW,CAAC,SAAS,IAAI,CAAC,EAAE,MAAM,MAAM;AAAA,MAC1D;AAAA,MACA,cAAc,KAAK;AAAA,IACrB,CAAC;AACD,QAAI;AAAO,gBAAM,oBAAM,EAAE,MAAM;AAAA,EACjC,CAAC;AACH,SAAO;AACT;",
+  "sourcesContent": ["import { Command } from 'commander';\nimport { cliCommand } from '~/services/ContensisCliService';\nimport { shell } from '~/shell';\n\nexport const makeLoginCommand = () => {\n  const login = new Command()\n    .command('login')\n    .description('login to a connected Contensis instance')\n    .argument('<user/clientId>', 'the username to login with')\n    .argument(\n      '[password]',\n      'the password to use to login with (optional/insecure)'\n    )\n    .option(\n      '-s, --shared-secret <sharedSecret>',\n      'the shared secret to use when logging in with a client id'\n    )\n    .usage('<user/clientId> [password] [-s <sharedSecret>]')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > login myuserid\\n  -- or --\\n  > login {clientId} -s {sharedSecret}\n`\n    )\n    .action(async (user, password, opts) => {\n      const token = await cliCommand(['login', user]).Login(user, {\n        password,\n        sharedSecret: opts.sharedSecret,\n      });\n      if (token) await shell().restart();\n    });\n  return login;\n};\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAwB;AACxB,iCAA2B;AAC3B,mBAAsB;AAEf,MAAM,mBAAmB,MAAM;AACpC,QAAM,QAAQ,IAAI,yBAAQ,EACvB,QAAQ,OAAO,EACf,YAAY,yCAAyC,EACrD,SAAS,mBAAmB,4BAA4B,EACxD;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC,MAAM,gDAAgD,EACtD;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,EAIF,EACC,OAAO,OAAO,MAAM,UAAU,SAAS;AACtC,UAAM,QAAQ,UAAM,uCAAW,CAAC,SAAS,IAAI,CAAC,EAAE,MAAM,MAAM;AAAA,MAC1D;AAAA,MACA,cAAc,KAAK;AAAA,IACrB,CAAC;AACD,QAAI;AAAO,gBAAM,oBAAM,EAAE,QAAQ;AAAA,EACnC,CAAC;AACH,SAAO;AACT;",
   "names": []
 }

package/dist/commands/push.js

@@ -31,8 +31,9 @@ var import_commander = require("commander");
 var import_jsonpath_mapper = __toESM(require("jsonpath-mapper"));
 var import_ContensisCliService = require("../services/ContensisCliService");
 const makePushCommand = () => {
-  const push = new import_commander.Command().command("push").showHelpAfterError(true).exitOverride();
-  push.command("block").argument("<block-id>", "the name of the block to push to").argument(
+  const push = new import_commander.Command().command("push").description("push command").addHelpText("after", `
+`).showHelpAfterError(true).exitOverride();
+  push.command("block").description("push a block").argument("<block-id>", "the name of the block to push to").argument(
     "<image uri:tag>",
     "the uri and tag of the container image to push as a block (tag default: latest)"
   ).argument("[branch]", "the branch we are pushing to").option(
@@ -64,7 +65,7 @@ const makePushCommand = () => {
     "after",
     `
 Example call:
-  > push block contensis-app ghcr.io/contensis/contensis-app/build-4359 master --release
+  > push block contensis-app ghcr.io/contensis/contensis-app/app:build-4359 master --release
 `
   ).action(async (blockId, imageUri, branch, opts) => {
     const cli = (0, import_ContensisCliService.cliCommand)(["push", "block", blockId], opts);
@@ -76,7 +77,7 @@ Example call:
       ...process.env
     };
     const blockRequest = (0, import_jsonpath_mapper.default)(mapSourceVars, {
-      autoRelease: { $path: "release", $default: () => false },
+      release: { $path: "release", $default: () => false },
       id: ["blockId"],
       image: () => {
         const lastIndexOfColon = imageUri.lastIndexOf(":");
@@ -111,7 +112,10 @@ Example call:
         branch: ["branch", "CI_COMMIT_REF_NAME", "GITHUB_REF_NAME"],
         commit: {
           id: ["commitId", "CI_COMMIT_SHORT_SHA", "GITHUB_SHA"],
-          message: ["commitMessage", "CI_COMMIT_MESSAGE"],
+          message: {
+            $path: ["commitMessage", "CI_COMMIT_MESSAGE"],
+            $formatting: (msg) => msg == null ? void 0 : msg.replace(/\\n/g, " ").replace(/\\n/g, " ").trim()
+          },
           dateTime: ["commitDatetime", "CI_COMMIT_TIMESTAMP"],
           authorEmail: ["authorEmail", "GITLAB_USER_EMAIL", "GITHUB_ACTOR"],
           committerEmail: [

package/dist/commands/push.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/commands/push.ts"],
-  "sourcesContent": ["import { Command } from 'commander';\nimport mapJson from 'jsonpath-mapper';\nimport { PushBlockParams } from 'migratortron';\nimport { cliCommand } from '~/services/ContensisCliService';\n\nexport const makePushCommand = () => {\n  const push = new Command()\n    .command('push')\n    .showHelpAfterError(true)\n    .exitOverride();\n\n  push\n    .command('block')\n    .argument('<block-id>', 'the name of the block to push to')\n    .argument(\n      '<image uri:tag>',\n      'the uri and tag of the container image to push as a block (tag default: latest)'\n    )\n    .argument('[branch]', 'the branch we are pushing to')\n    .option(\n      '-r, --release',\n      'whether to release the pushed block version',\n      false\n    )\n    .option(\n      '-cid, --commit-id <commitId>',\n      'the id of the source git commit for the supplied image uri'\n    )\n    .option(\n      '-cmsg, --commit-message <commitMessage>',\n      'the git commit message for the supplied commit id'\n    )\n    .option(\n      '-cdt, --commit-datetime <commitDateTime>',\n      'the timestamp of the source git commit for the supplied image uri'\n    )\n    .option(\n      '-author, --author-email <authorEmail>',\n      'the git email address of the author of the source git commit'\n    )\n    .option(\n      '-committer, --committer-email <committerEmail>',\n      'the git email address of the commiter of the source git commit'\n    )\n    .option(\n      '-repo, --repository-url <repositoryUrl>',\n      'the url of the source repository for the supplied image uri'\n    )\n    .option(\n      '-pr, --provider <sourceProvider>',\n      'the url of the source repository for the supplied image uri'\n    )\n    .usage('<block-id> <image uri> [branch] [options]')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > push block contensis-app ghcr.io/contensis/contensis-app/build-4359 master --release\\n`\n    )\n    .action(async (blockId: string, imageUri: string, branch: string, opts) => {\n      const cli = cliCommand(['push', 'block', blockId], opts);\n      const mapSourceVars = {\n        blockId,\n        imageUri,\n        branch,\n        ...opts,\n        ...process.env,\n      };\n\n      const blockRequest = mapJson(mapSourceVars, {\n        autoRelease: { $path: 'release', $default: () => false },\n        id: ['blockId'],\n        image: () => {\n          const lastIndexOfColon = imageUri.lastIndexOf(':');\n          return {\n            uri: imageUri.slice(0, lastIndexOfColon),\n            tag: imageUri.slice(lastIndexOfColon + 1) || 'latest',\n          };\n        },\n        projectId: () => cli.env.currentProject || '',\n        source: {\n          provider: {\n            $path: ['provider'],\n            $return: (provider: string, { GITHUB_ACTIONS, GITLAB_CI }) => {\n              if (provider) return provider;\n              if (GITHUB_ACTIONS) return 'Github';\n              else if (GITLAB_CI) return 'GitlabSelfHosted';\n            },\n          },\n          repositoryUrl: {\n            $path: ['repositoryUrl', 'CI_PROJECT_URL', 'GITHUB_REPOSITORY'],\n            $formatting: (url: string, { GITHUB_ACTIONS }) => {\n              if (GITHUB_ACTIONS) url = `https://github.com/${url}`;\n\n              if (url && !url.endsWith('.git')) return `${url}.git`;\n              return url;\n            },\n          },\n          branch: ['branch', 'CI_COMMIT_REF_NAME', 'GITHUB_REF_NAME'],\n          commit: {\n            id: ['commitId', 'CI_COMMIT_SHORT_SHA', 'GITHUB_SHA'],\n            message: ['commitMessage', 'CI_COMMIT_MESSAGE'], // ${{ github.event.head_commit.message }}\n            dateTime: ['commitDatetime', 'CI_COMMIT_TIMESTAMP'], // ${{ github.event.head_commit.timestamp }}\n            authorEmail: ['authorEmail', 'GITLAB_USER_EMAIL', 'GITHUB_ACTOR'], // ${{ github.event.head_commit.author.email }}\n            committerEmail: [\n              'committerEmail',\n              'GITLAB_USER_EMAIL',\n              'GITHUB_TRIGGERING_ACTOR',\n            ], // ${{ github.event.head_commit.committer.email }}\n          },\n        },\n      }) as PushBlockParams;\n\n      await cli.PushBlock(blockRequest);\n\n      // console.log(process.env);\n    });\n\n  return push;\n};\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,uBAAwB;AACxB,6BAAoB;AAEpB,iCAA2B;AAEpB,MAAM,kBAAkB,MAAM;AACnC,QAAM,OAAO,IAAI,yBAAQ,EACtB,QAAQ,MAAM,EACd,mBAAmB,IAAI,EACvB,aAAa;AAEhB,OACG,QAAQ,OAAO,EACf,SAAS,cAAc,kCAAkC,EACzD;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC,SAAS,YAAY,8BAA8B,EACnD;AAAA,IACC;AAAA,IACA;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC;AAAA,IACC;AAAA,IACA;AAAA,EACF,EACC,MAAM,2CAA2C,EACjD;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA,EAGF,EACC,OAAO,OAAO,SAAiB,UAAkB,QAAgB,SAAS;AACzE,UAAM,UAAM,uCAAW,CAAC,QAAQ,SAAS,OAAO,GAAG,IAAI;AACvD,UAAM,gBAAgB;AAAA,MACpB;AAAA,MACA;AAAA,MACA;AAAA,MACA,GAAG;AAAA,MACH,GAAG,QAAQ;AAAA,IACb;AAEA,UAAM,mBAAe,uBAAAA,SAAQ,eAAe;AAAA,MAC1C,aAAa,EAAE,OAAO,WAAW,UAAU,MAAM,MAAM;AAAA,MACvD,IAAI,CAAC,SAAS;AAAA,MACd,OAAO,MAAM;AACX,cAAM,mBAAmB,SAAS,YAAY,GAAG;AACjD,eAAO;AAAA,UACL,KAAK,SAAS,MAAM,GAAG,gBAAgB;AAAA,UACvC,KAAK,SAAS,MAAM,mBAAmB,CAAC,KAAK;AAAA,QAC/C;AAAA,MACF;AAAA,MACA,WAAW,MAAM,IAAI,IAAI,kBAAkB;AAAA,MAC3C,QAAQ;AAAA,QACN,UAAU;AAAA,UACR,OAAO,CAAC,UAAU;AAAA,UAClB,SAAS,CAAC,UAAkB,EAAE,gBAAgB,UAAU,MAAM;AAC5D,gBAAI;AAAU,qBAAO;AACrB,gBAAI;AAAgB,qBAAO;AAAA,qBAClB;AAAW,qBAAO;AAAA,UAC7B;AAAA,QACF;AAAA,QACA,eAAe;AAAA,UACb,OAAO,CAAC,iBAAiB,kBAAkB,mBAAmB;AAAA,UAC9D,aAAa,CAAC,KAAa,EAAE,eAAe,MAAM;AAChD,gBAAI;AAAgB,oBAAM,sBAAsB;AAEhD,gBAAI,OAAO,CAAC,IAAI,SAAS,MAAM;AAAG,qBAAO,GAAG;AAC5C,mBAAO;AAAA,UACT;AAAA,QACF;AAAA,QACA,QAAQ,CAAC,UAAU,sBAAsB,iBAAiB;AAAA,QAC1D,QAAQ;AAAA,UACN,IAAI,CAAC,YAAY,uBAAuB,YAAY;AAAA,UACpD,SAAS,CAAC,iBAAiB,mBAAmB;AAAA,UAC9C,UAAU,CAAC,kBAAkB,qBAAqB;AAAA,UAClD,aAAa,CAAC,eAAe,qBAAqB,cAAc;AAAA,UAChE,gBAAgB;AAAA,YACd;AAAA,YACA;AAAA,YACA;AAAA,UACF;AAAA,QACF;AAAA,MACF;AAAA,IACF,CAAC;AAED,UAAM,IAAI,UAAU,YAAY;AAAA,EAGlC,CAAC;AAEH,SAAO;AACT;",
+  "sourcesContent": ["import { Command } from 'commander';\nimport mapJson from 'jsonpath-mapper';\nimport { PushBlockParams } from 'migratortron';\nimport { cliCommand } from '~/services/ContensisCliService';\n\nexport const makePushCommand = () => {\n  const push = new Command()\n    .command('push')\n    .description('push command')\n    .addHelpText('after', `\\n`)\n    .showHelpAfterError(true)\n    .exitOverride();\n\n  push\n    .command('block')\n    .description('push a block')\n    .argument('<block-id>', 'the name of the block to push to')\n    .argument(\n      '<image uri:tag>',\n      'the uri and tag of the container image to push as a block (tag default: latest)'\n    )\n    .argument('[branch]', 'the branch we are pushing to')\n    .option(\n      '-r, --release',\n      'whether to release the pushed block version',\n      false\n    )\n    .option(\n      '-cid, --commit-id <commitId>',\n      'the id of the source git commit for the supplied image uri'\n    )\n    .option(\n      '-cmsg, --commit-message <commitMessage>',\n      'the git commit message for the supplied commit id'\n    )\n    .option(\n      '-cdt, --commit-datetime <commitDateTime>',\n      'the timestamp of the source git commit for the supplied image uri'\n    )\n    .option(\n      '-author, --author-email <authorEmail>',\n      'the git email address of the author of the source git commit'\n    )\n    .option(\n      '-committer, --committer-email <committerEmail>',\n      'the git email address of the commiter of the source git commit'\n    )\n    .option(\n      '-repo, --repository-url <repositoryUrl>',\n      'the url of the source repository for the supplied image uri'\n    )\n    .option(\n      '-pr, --provider <sourceProvider>',\n      'the url of the source repository for the supplied image uri'\n    )\n    .usage('<block-id> <image uri> [branch] [options]')\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > push block contensis-app ghcr.io/contensis/contensis-app/app:build-4359 master --release\\n`\n    )\n    .action(async (blockId: string, imageUri: string, branch: string, opts) => {\n      const cli = cliCommand(['push', 'block', blockId], opts);\n      const mapSourceVars = {\n        blockId,\n        imageUri,\n        branch,\n        ...opts,\n        ...process.env,\n      };\n\n      const blockRequest = mapJson(mapSourceVars, {\n        release: { $path: 'release', $default: () => false },\n        id: ['blockId'],\n        image: () => {\n          const lastIndexOfColon = imageUri.lastIndexOf(':');\n          return {\n            uri: imageUri.slice(0, lastIndexOfColon),\n            tag: imageUri.slice(lastIndexOfColon + 1) || 'latest',\n          };\n        },\n        projectId: () => cli.env.currentProject || '',\n        source: {\n          provider: {\n            $path: ['provider'],\n            $return: (provider: string, { GITHUB_ACTIONS, GITLAB_CI }) => {\n              if (provider) return provider;\n              if (GITHUB_ACTIONS) return 'Github';\n              else if (GITLAB_CI) return 'GitlabSelfHosted';\n            },\n          },\n          repositoryUrl: {\n            $path: ['repositoryUrl', 'CI_PROJECT_URL', 'GITHUB_REPOSITORY'],\n            $formatting: (url: string, { GITHUB_ACTIONS }) => {\n              if (GITHUB_ACTIONS) url = `https://github.com/${url}`;\n\n              if (url && !url.endsWith('.git')) return `${url}.git`;\n              return url;\n            },\n          },\n          branch: ['branch', 'CI_COMMIT_REF_NAME', 'GITHUB_REF_NAME'],\n          commit: {\n            id: ['commitId', 'CI_COMMIT_SHORT_SHA', 'GITHUB_SHA'],\n            message: {\n              $path: ['commitMessage', 'CI_COMMIT_MESSAGE'], // ${{ github.event.head_commit.message }}\n              $formatting: (msg?: string) =>\n                msg?.replace(/\\\\n/g, ' ').replace(/\\\\n/g, ' ').trim(),\n            },\n            dateTime: ['commitDatetime', 'CI_COMMIT_TIMESTAMP'], // ${{ github.event.head_commit.timestamp }}\n            authorEmail: ['authorEmail', 'GITLAB_USER_EMAIL', 'GITHUB_ACTOR'], // ${{ github.event.head_commit.author.email }}\n            committerEmail: [\n              'committerEmail',\n              'GITLAB_USER_EMAIL',\n              'GITHUB_TRIGGERING_ACTOR',\n            ], // ${{ github.event.head_commit.committer.email }}\n          },\n        },\n      }) as PushBlockParams;\n\n      await cli.PushBlock(blockRequest);\n\n      // console.log(process.env);\n    });\n\n  return push;\n};\n"],
+  "mappings": "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",
   "names": ["mapJson"]
 }