contensis-cli 1.0.12-beta.0 → 1.0.12-beta.2

package/dist/commands/import.js

@@ -119,7 +119,12 @@ Example call:
       logOutput: opts.outputEntries
     });
   });
-  program.command("nodes").description("import nodes").addOption(import_globalOptions.commit).addHelpText(
+  program.command("nodes").description("import nodes").addOption(import_globalOptions.commit).addOption(
+    new import_commander.Option(
+      "-on --output-nodes <outputNodes>",
+      "how much detail to output from the nodes import"
+    ).choices(["errors", "changes", "all"]).default("errors")
+  ).addHelpText(
     "after",
     `
 Example call:

package/dist/commands/import.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/commands/import.ts"],
-  "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  // TODO: add options to import one an array of nodes? nodeIds: string[]\n  program\n    .command('nodes')\n    .description('import nodes')\n    .addOption(commit)\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > import nodes --from-file component-backup.json\n  > import nodes --source-alias example-alias --source-project-id example-project\n`\n    )\n    .action(async opts => {\n      await cliCommand(\n        ['import', 'nodes'],\n        opts,\n        mapContensisOpts({ ...opts })\n      ).ImportNodes({\n        commit: opts.commit,\n        fromFile: opts.fromFile,\n        logOutput: opts.outputNodes,\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;AAGH,UACG,QAAQ,OAAO,EACf,YAAY,cAAc,EAC1B,UAAU,2BAAM,EAChB;AAAA,IACC;AAAA,IACA;AAAA;AAAA;AAAA;AAAA;AAAA,EAKF,EACC,OAAO,OAAM,SAAQ;AACpB,cAAM;AAAA,MACJ,CAAC,UAAU,OAAO;AAAA,MAClB;AAAA,UACA,uCAAiB,EAAE,GAAG,KAAK,CAAC;AAAA,IAC9B,EAAE,YAAY;AAAA,MACZ,QAAQ,KAAK;AAAA,MACb,UAAU,KAAK;AAAA,MACf,WAAW,KAAK;AAAA,IAClB,CAAC;AAAA,EACH,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  // TODO: add options to import one an array of nodes? nodeIds: string[]\n  program\n    .command('nodes')\n    .description('import nodes')\n    .addOption(commit)\n    .addOption(\n      new Option(\n        '-on --output-nodes <outputNodes>',\n        'how much detail to output from the nodes import'\n      )\n        .choices(['errors', 'changes', 'all'])\n        .default('errors')\n    )\n    .addHelpText(\n      'after',\n      `\nExample call:\n  > import nodes --from-file component-backup.json\n  > import nodes --source-alias example-alias --source-project-id example-project\n`\n    )\n    .action(async opts => {\n      await cliCommand(\n        ['import', 'nodes'],\n        opts,\n        mapContensisOpts({ ...opts })\n      ).ImportNodes({\n        commit: opts.commit,\n        fromFile: opts.fromFile,\n        logOutput: opts.outputNodes,\n      });\n    });\n\n  return program;\n};\n\nexport const get = makeImportCommand();\n"],
+  "mappings": "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",
   "names": []
 }

package/dist/services/ContensisAuthService.js

@@ -34,7 +34,15 @@ class ContensisAuthService {
     rootUrl
   }) {
     let credentials;
-    if (username && password) {
+    if (clientId && clientSecret) {
+      credentials = {
+        clientType: "client_credentials",
+        clientDetails: {
+          clientId,
+          clientSecret
+        }
+      };
+    } else if (username && password) {
       credentials = {
         clientType: "contensis_classic",
         clientDetails: {
@@ -50,13 +58,7 @@ class ContensisAuthService {
         }
       };
     } else {
-      credentials = {
-        clientType: "client_credentials",
-        clientDetails: {
-          clientId,
-          clientSecret
-        }
-      };
+      credentials = { clientType: "none", clientDetails: { refreshToken: "" } };
     }
     this.client = import_client.NodejsClient.create({
       ...credentials,

package/dist/services/ContensisAuthService.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/services/ContensisAuthService.ts"],
-  "sourcesContent": ["import { NodejsClient } from 'contensis-management-api/lib/client';\nimport { ClientGrants, ClientGrantType } from 'contensis-core-api';\n\nclass ContensisAuthService {\n  private client: NodejsClient;\n\n  constructor({\n    clientId = '',\n    clientSecret = '',\n    username,\n    password,\n    refreshToken,\n    projectId,\n    rootUrl,\n  }: {\n    clientId?: string;\n    clientSecret?: string;\n    username?: string;\n    password?: string;\n    refreshToken?: string;\n    projectId: string;\n    rootUrl: string;\n  }) {\n    let credentials: {\n      clientType: ClientGrantType;\n      clientDetails: ClientGrants;\n    };\n    if (username && password) {\n      credentials = {\n        clientType: 'contensis_classic',\n        clientDetails: {\n          username,\n          password,\n        },\n      };\n    } else if (refreshToken) {\n      credentials = {\n        clientType: 'contensis_classic_refresh_token',\n        clientDetails: {\n          refreshToken,\n        },\n      };\n    } else {\n      credentials = {\n        clientType: 'client_credentials',\n        clientDetails: {\n          clientId,\n          clientSecret,\n        },\n      };\n    }\n\n    this.client = NodejsClient.create({\n      ...credentials,\n      projectId,\n      rootUrl,\n    });\n  }\n\n  ClassicToken = async () => {\n    // make sure our token isn't expried.\n    await this.client.ensureBearerToken();\n    return (this.client as any).contensisClassicToken;\n  };\n  BearerToken = async () =>\n    this.client.bearerToken || (await this.client.ensureBearerToken());\n  RefreshToken = async () =>\n    !this.client.isRefreshTokenExpired() ? this.client.refreshToken : null;\n\n  /* PROJECTS */\n  ProjectId = () => this.client.clientConfig.projectId;\n  RootUrl = () => this.client.clientConfig.rootUrl;\n}\n\nexport default ContensisAuthService;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA6B;AAG7B,MAAM,qBAAqB;AAAA,EACjB;AAAA,EAER,YAAY;AAAA,IACV,WAAW;AAAA,IACX,eAAe;AAAA,IACf;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAQG;AACD,QAAI;AAIJ,QAAI,YAAY,UAAU;AACxB,oBAAc;AAAA,QACZ,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,IACF,WAAW,cAAc;AACvB,oBAAc;AAAA,QACZ,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,QACF;AAAA,MACF;AAAA,IACF,OAAO;AACL,oBAAc;AAAA,QACZ,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,IACF;AAEA,SAAK,SAAS,2BAAa,OAAO;AAAA,MAChC,GAAG;AAAA,MACH;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,eAAe,YAAY;AAEzB,UAAM,KAAK,OAAO,kBAAkB;AACpC,WAAQ,KAAK,OAAe;AAAA,EAC9B;AAAA,EACA,cAAc,YACZ,KAAK,OAAO,eAAgB,MAAM,KAAK,OAAO,kBAAkB;AAAA,EAClE,eAAe,YACb,CAAC,KAAK,OAAO,sBAAsB,IAAI,KAAK,OAAO,eAAe;AAAA,EAGpE,YAAY,MAAM,KAAK,OAAO,aAAa;AAAA,EAC3C,UAAU,MAAM,KAAK,OAAO,aAAa;AAC3C;AAEA,IAAO,+BAAQ;",
+  "sourcesContent": ["import { NodejsClient } from 'contensis-management-api/lib/client';\nimport { ClientGrants, ClientGrantType } from 'contensis-core-api';\n\nclass ContensisAuthService {\n  private client: NodejsClient;\n\n  constructor({\n    clientId = '',\n    clientSecret = '',\n    username,\n    password,\n    refreshToken,\n    projectId,\n    rootUrl,\n  }: {\n    clientId?: string;\n    clientSecret?: string;\n    username?: string;\n    password?: string;\n    refreshToken?: string;\n    projectId: string;\n    rootUrl: string;\n  }) {\n    let credentials: {\n      clientType: ClientGrantType;\n      clientDetails: ClientGrants;\n    };\n    if (clientId && clientSecret) {\n      credentials = {\n        clientType: 'client_credentials',\n        clientDetails: {\n          clientId,\n          clientSecret,\n        },\n      };\n    } else if (username && password) {\n      credentials = {\n        clientType: 'contensis_classic',\n        clientDetails: {\n          username,\n          password,\n        },\n      };\n    } else if (refreshToken) {\n      credentials = {\n        clientType: 'contensis_classic_refresh_token',\n        clientDetails: {\n          refreshToken,\n        },\n      };\n    } else {\n      credentials = { clientType: 'none', clientDetails: { refreshToken: '' } };\n    }\n\n    this.client = NodejsClient.create({\n      ...credentials,\n      projectId,\n      rootUrl,\n    });\n  }\n\n  ClassicToken = async () => {\n    // make sure our token isn't expried.\n    await this.client.ensureBearerToken();\n    return (this.client as any).contensisClassicToken;\n  };\n  BearerToken = async () =>\n    this.client.bearerToken || (await this.client.ensureBearerToken());\n  RefreshToken = async () =>\n    !this.client.isRefreshTokenExpired() ? this.client.refreshToken : null;\n\n  /* PROJECTS */\n  ProjectId = () => this.client.clientConfig.projectId;\n  RootUrl = () => this.client.clientConfig.rootUrl;\n}\n\nexport default ContensisAuthService;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAA6B;AAG7B,MAAM,qBAAqB;AAAA,EACjB;AAAA,EAER,YAAY;AAAA,IACV,WAAW;AAAA,IACX,eAAe;AAAA,IACf;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,IACA;AAAA,EACF,GAQG;AACD,QAAI;AAIJ,QAAI,YAAY,cAAc;AAC5B,oBAAc;AAAA,QACZ,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,IACF,WAAW,YAAY,UAAU;AAC/B,oBAAc;AAAA,QACZ,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,UACA;AAAA,QACF;AAAA,MACF;AAAA,IACF,WAAW,cAAc;AACvB,oBAAc;AAAA,QACZ,YAAY;AAAA,QACZ,eAAe;AAAA,UACb;AAAA,QACF;AAAA,MACF;AAAA,IACF,OAAO;AACL,oBAAc,EAAE,YAAY,QAAQ,eAAe,EAAE,cAAc,GAAG,EAAE;AAAA,IAC1E;AAEA,SAAK,SAAS,2BAAa,OAAO;AAAA,MAChC,GAAG;AAAA,MACH;AAAA,MACA;AAAA,IACF,CAAC;AAAA,EACH;AAAA,EAEA,eAAe,YAAY;AAEzB,UAAM,KAAK,OAAO,kBAAkB;AACpC,WAAQ,KAAK,OAAe;AAAA,EAC9B;AAAA,EACA,cAAc,YACZ,KAAK,OAAO,eAAgB,MAAM,KAAK,OAAO,kBAAkB;AAAA,EAClE,eAAe,YACb,CAAC,KAAK,OAAO,sBAAsB,IAAI,KAAK,OAAO,eAAe;AAAA,EAGpE,YAAY,MAAM,KAAK,OAAO,aAAa;AAAA,EAC3C,UAAU,MAAM,KAAK,OAAO,aAAa;AAC3C;AAEA,IAAO,+BAAQ;",
   "names": []
 }

package/dist/services/ContensisCliService.js

@@ -341,14 +341,16 @@ class ContensisCli {
     }
   };
   Login = async (userId, {
-    password = (0, import_util.isPassword)(this.env.passwordFallback),
+    password = "",
     promptPassword = true,
-    sharedSecret = (0, import_util.isSharedSecret)(this.env.passwordFallback),
+    sharedSecret = "",
     silent = false,
     attempt = 1
   } = {}) => {
     var _a, _b, _c, _d;
     let inputPassword = password || sharedSecret;
+    if (!inputPassword)
+      inputPassword = (0, import_util.isSharedSecret)(this.env.passwordFallback) || (0, import_util.isPassword)(this.env.passwordFallback) || "";
     const { log, messages } = this;
     if (userId) {
       const { currentEnv, env } = this;
@@ -686,9 +688,7 @@ class ContensisCli {
                 `      ${import_chalk.default.bold.grey(
                   "contentTypes"
                 )}: ${permissions.contentTypes.map(
-                  (p) => `${p.id} [${p.actions.join(",")}] ${p.languages.join(
-                    " "
-                  )}`
+                  (p) => `${p.id} [${p.actions.join(",")}] ${p.languages.join(" ")}`
                 ).join(", ")}`
               );
           }
@@ -1238,9 +1238,9 @@ Components:`));
       const [err, result] = await contensis.DeleteEntries();
       if (result)
         this.HandleFormattingAndOutput(result, () => {
-          (0, import_console.printMigrateResult)(this, result, {
+          (0, import_console.printEntriesMigrateResult)(this, result, {
             action: "delete",
-            showAllEntries: true
+            showAll: true
           });
         });
       if (!err && (!commit && result.entriesToMigrate[currentProject].totalCount || commit && ((_a = result.migrateResult) == null ? void 0 : _a.deleted))) {
@@ -1268,11 +1268,11 @@ Components:`));
         entries,
         () => {
           var _a;
-          return (0, import_migratortron.logEntriesTable)(
+          return (0, import_migratortron.logEntitiesTable)({
             entries,
-            currentProject,
-            (_a = contensis.payload.query) == null ? void 0 : _a.fields
-          );
+            projectId: currentProject,
+            fields: (_a = contensis.payload.query) == null ? void 0 : _a.fields
+          });
         }
       );
     } else {
@@ -1304,9 +1304,9 @@ Components:`));
         (0, import_logger.logError)(err);
       else
         this.HandleFormattingAndOutput(result, () => {
-          (0, import_console.printMigrateResult)(this, result, {
-            showAllEntries: logOutput === "all",
-            showChangedEntries: logOutput === "changes"
+          (0, import_console.printEntriesMigrateResult)(this, result, {
+            showAll: logOutput === "all",
+            showChanged: 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)))) {
@@ -1345,32 +1345,8 @@ Components:`));
       }
       const root = contensis.content.sourceRepo.nodes.tree;
       log.success(messages.nodes.get(currentProject, rootPath, depth));
-      const outputNode = (node, spaces) => `${node.entry ? log.highlightText("e") : log.infoText("-")}${node.isCanonical ? log.highlightText("c") : log.infoText("-")}${node.includeInMenu ? log.highlightText("m") : log.infoText("-")}${spaces}${node.isCanonical ? log.boldText(`/${node.slug}`) : `/${node.slug}`}${node.entry ? ` ${log.helpText(node.entry.sys.contentTypeId)}` : ""}${node.childCount ? ` +${node.childCount}` : ``} ${log.infoText(node.displayName)}`;
       this.HandleFormattingAndOutput(root, () => {
-        log.object({ ...root, children: void 0 });
-        log.raw("");
-        log.info(
-          `${log.highlightText("e")} = has entry; ${log.highlightText(
-            "c"
-          )} = canonical; ${log.highlightText("m")} = include in menu`
-        );
-        log.line();
-        const outputChildren = (root2, depth2 = 2) => {
-          let str = "";
-          for (const node of root2 == null ? void 0 : root2.children) {
-            str += `${outputNode(node, Array(depth2 + 1).join("  "))}
-`;
-            if ("children" in node)
-              str += outputChildren(node, depth2 + 1);
-          }
-          return str;
-        };
-        const children = outputChildren(root);
-        log.limits(
-          `${outputNode(root, "  ")}${children ? `
-${children}` : ""}`,
-          100
-        );
+        (0, import_console.printNodeTreeOutput)(this, root);
       });
     } else {
       log.warning(messages.models.noList(currentProject));
@@ -1401,9 +1377,9 @@ ${children}` : ""}`,
         (0, import_logger.logError)(err);
       else
         this.HandleFormattingAndOutput(result, () => {
-          (0, import_console.printMigrateResult)(this, result, {
-            showAllEntries: logOutput === "all",
-            showChangedEntries: logOutput === "changes"
+          (0, import_console.printNodesMigrateResult)(this, result, {
+            showAll: logOutput === "all",
+            showChanged: logOutput === "changes"
           });
         });
       const nodesTotalCount = result == null ? void 0 : result.nodesToMigrate[currentProject].totalCount;
@@ -1426,7 +1402,7 @@ ${children}` : ""}`,
         }
       } else {
         if (noChange) {
-          log.help(messages.nodes.noChange(currentEnv), err);
+          log.help(messages.nodes.noChange(currentEnv));
         } else {
           log.error(messages.nodes.failedImport(currentEnv), err);
           if (!nodesTotalCount)