contensis-cli 1.0.0-beta.53 → 1.0.0-beta.55

package/src/commands/globalOptions.ts

@@ -1,127 +1,127 @@
-import { Command, Option } from 'commander';
-import { url } from '~/util';
-
-export const mapContensisOpts = (opts: any = {}) => ({
-  source:
-    opts.sourceAlias || opts.sourceProjectId
-      ? {
-          url: opts.sourceAlias
-            ? url(opts.sourceAlias, 'website').cms
-            : (undefined as any),
-          project: opts.sourceProjectId || (undefined as any),
-        }
-      : undefined,
-  models: opts.modelIds,
-  query:
-    opts.id || opts.entryIds || opts.phrase || opts.fields
-      ? {
-          fields: opts.fields,
-          includeIds: opts.id || opts.entryIds,
-          searchTerm: opts.phrase,
-        }
-      : undefined,
-  zenQL: opts.zenql,
-  transformGuids: !opts.preserveGuids,
-});
-
-/* Output options */
-const output = new Option(
-  '-o, --output <output>',
-  'save output to a file e.g. --output ./output.txt'
-);
-
-const format = new Option(
-  '-f, --format <format>',
-  'format output as csv, json, xml or table (default)'
-).choices(['csv', 'json', 'xml', 'table']);
-
-/* Connect options */
-const alias = new Option(
-  '-a, --alias <alias>',
-  'the cloud CMS alias to connect your request with'
-);
-
-export const project = new Option(
-  '-p, --project-id <projectId>',
-  'the projectId to make your request with'
-);
-
-/* Authentication options */
-const user = new Option(
-  '-u, --user <user>',
-  'the username to authenticate your request with'
-);
-const password = new Option(
-  '-pw, --password <password>',
-  'the password to use to login with (optional/insecure)'
-);
-const clientId = new Option(
-  '-id, --client-id <clientId>',
-  'the clientId to authenticate your request with'
-);
-const sharedSecret = new Option(
-  '-s, --shared-secret <sharedSecret>',
-  'the shared secret to use when logging in with a client id'
-);
-
-/* Entry get options */
-export const zenql = new Option(
-  '-q, --zenql <zenql>',
-  'get entries with a supplied ZenQL statement'
-);
-
-export const entryId = new Option('-i --id <id...>', 'the entry id(s) to get');
-
-/* Import options */
-export const fromFile = new Option(
-  '-file, --from-file <fromFile>',
-  'file path to import asset(s) from'
-);
-
-export const fromCms = new Option(
-  '-source, --source-alias <fromCms>',
-  'the cloud CMS alias to import asset(s) from'
-);
-export const fromProject = new Option(
-  '-sp, --source-project-id <fromProject>',
-  'the id of the Contensis project to import asset(s) from (Default: [last connected project])'
-);
-
-export const commit = new Option(
-  '--commit',
-  'add this flag only after you have run a preview of the import and agree with the analysis'
-).default(false);
-
-export const addConnectOptions = (program: Command) =>
-  program.addOption(alias.hideHelp()).addOption(project.hideHelp());
-
-export const addAuthenticationOptions = (program: Command) =>
-  program
-    .addOption(user.hideHelp())
-    .addOption(password.hideHelp())
-    .addOption(clientId.hideHelp())
-    .addOption(sharedSecret.hideHelp());
-
-const addOutputAndFormatOptions = (program: Command) =>
-  program.addOption(output).addOption(format);
-
-export const addImportOptions = (program: Command) => {
-  for (const command of program.commands) {
-    command.addOption(fromFile).addOption(fromCms).addOption(fromProject);
-  }
-  return program;
-};
-export const addGetEntryOptions = (program: Command) => {
-  for (const command of program.commands) {
-    command.addOption(entryId).addOption(zenql);
-  }
-  return program;
-};
-export const addGlobalOptions = (program: Command) => {
-  for (const command of program.commands) {
-    addOutputAndFormatOptions(command);
-    addConnectOptions(command);
-    addAuthenticationOptions(command);
-  }
-  return program;
-};
+import { Command, Option } from 'commander';
+import { url } from '~/util';
+
+export const mapContensisOpts = (opts: any = {}) => ({
+  source:
+    opts.sourceAlias || opts.sourceProjectId
+      ? {
+          url: opts.sourceAlias
+            ? url(opts.sourceAlias, 'website').cms
+            : (undefined as any),
+          project: opts.sourceProjectId || (undefined as any),
+        }
+      : undefined,
+  models: opts.modelIds,
+  query:
+    opts.id || opts.entryIds || opts.phrase || opts.fields
+      ? {
+          fields: opts.fields,
+          includeIds: opts.id || opts.entryIds,
+          searchTerm: opts.phrase,
+        }
+      : undefined,
+  zenQL: opts.zenql,
+  transformGuids: !opts.preserveGuids,
+});
+
+/* Output options */
+const output = new Option(
+  '-o, --output <output>',
+  'save output to a file e.g. --output ./output.txt'
+);
+
+const format = new Option(
+  '-f, --format <format>',
+  'format output as csv, json, xml or table (default)'
+).choices(['csv', 'json', 'xml', 'table']);
+
+/* Connect options */
+const alias = new Option(
+  '-a, --alias <alias>',
+  'the cloud CMS alias to connect your request with'
+);
+
+export const project = new Option(
+  '-p, --project-id <projectId>',
+  'the projectId to make your request with'
+);
+
+/* Authentication options */
+const user = new Option(
+  '-u, --user <user>',
+  'the username to authenticate your request with'
+);
+const password = new Option(
+  '-pw, --password <password>',
+  'the password to use to login with (optional/insecure)'
+);
+const clientId = new Option(
+  '-id, --client-id <clientId>',
+  'the clientId to authenticate your request with'
+);
+const sharedSecret = new Option(
+  '-s, --shared-secret <sharedSecret>',
+  'the shared secret to use when logging in with a client id'
+);
+
+/* Entry get options */
+export const zenql = new Option(
+  '-q, --zenql <zenql>',
+  'get entries with a supplied ZenQL statement'
+);
+
+export const entryId = new Option('-i --id <id...>', 'the entry id(s) to get');
+
+/* Import options */
+export const fromFile = new Option(
+  '-file, --from-file <fromFile>',
+  'file path to import asset(s) from'
+);
+
+export const fromCms = new Option(
+  '-source, --source-alias <fromCms>',
+  'the cloud CMS alias to import asset(s) from'
+);
+export const fromProject = new Option(
+  '-sp, --source-project-id <fromProject>',
+  'the id of the Contensis project to import asset(s) from (Default: [last connected project])'
+);
+
+export const commit = new Option(
+  '--commit',
+  'add this flag only after you have run a preview of the import and agree with the analysis'
+).default(false);
+
+export const addConnectOptions = (program: Command) =>
+  program.addOption(alias.hideHelp()).addOption(project.hideHelp());
+
+export const addAuthenticationOptions = (program: Command) =>
+  program
+    .addOption(user.hideHelp())
+    .addOption(password.hideHelp())
+    .addOption(clientId.hideHelp())
+    .addOption(sharedSecret.hideHelp());
+
+const addOutputAndFormatOptions = (program: Command) =>
+  program.addOption(output).addOption(format);
+
+export const addImportOptions = (program: Command) => {
+  for (const command of program.commands) {
+    command.addOption(fromFile).addOption(fromCms).addOption(fromProject);
+  }
+  return program;
+};
+export const addGetEntryOptions = (program: Command) => {
+  for (const command of program.commands) {
+    command.addOption(entryId).addOption(zenql);
+  }
+  return program;
+};
+export const addGlobalOptions = (program: Command) => {
+  for (const command of program.commands) {
+    addOutputAndFormatOptions(command);
+    addConnectOptions(command);
+    addAuthenticationOptions(command);
+  }
+  return program;
+};

package/src/commands/import.ts

@@ -1,128 +1,128 @@
-import { Argument, Command } from 'commander';
-import { cliCommand } from '~/services/ContensisCliService';
-import { url } from '~/util';
-import { commit, mapContensisOpts } from './globalOptions';
-
-export const makeImportCommand = () => {
-  const program = new Command()
-    .command('import')
-    .description('import command')
-    .addHelpText('after', `\n`)
-    .showHelpAfterError(true)
-    .exitOverride();
-
-  program
-    .command('models')
-    .description('import complete content models')
-    .argument('[modelIds...]', 'ids of the content models to import (optional)')
-    .addOption(commit)
-    .addHelpText(
-      'after',
-      `
-Example call:
-  > import models blogPost --from-file contentmodels-backup.json
-  > import models --source-alias example-dev
-`
-    )
-    .action(async (modelIds: string[], opts) => {
-      await cliCommand(
-        ['import', 'models', modelIds.join(' ')],
-        opts,
-        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'
-    )
-    .addOption(commit)
-    .addHelpText(
-      'after',
-      `
-Example call:
-  > import contenttypes {contentTypeIds} --from-file contenttypes-backup.json
-  > import contenttypes {contentTypeIds} --source-alias example-dev
-`
-    )
-    .action(async (contentTypeIds: string[], opts) => {
-      await cliCommand(
-        ['import', 'contenttypes'],
-        opts,
-        mapContensisOpts({ contentTypeIds, ...opts })
-      ).ImportContentTypes(
-        {
-          fromFile: opts.fromFile,
-          commit: opts.commit,
-        },
-        contentTypeIds
-      );
-    });
-
-  program
-    .command('components')
-    .description('import components')
-    .argument(
-      '[componentIds...]',
-      'Optional list of API id(s) of the component(s) to import'
-    )
-    .addOption(commit)
-    .addHelpText(
-      'after',
-      `
-Example call:
-  > import components {componentIds} --from-file component-backup.json
-  > import components {componentIds} --source-alias example-dev
-`
-    )
-    .action(async (componentIds: string[], opts) => {
-      await cliCommand(
-        ['import', 'component'],
-        opts,
-        mapContensisOpts({ componentIds, ...opts })
-      ).ImportComponents(
-        {
-          fromFile: opts.fromFile,
-          commit: opts.commit,
-        },
-        componentIds
-      );
-    });
-
-  program
-    .command('entries')
-    .description('import entries')
-    .argument(
-      '[search phrase]',
-      'get entries with the search phrase, use quotes for multiple words'
-    )
-    .addOption(commit)
-    .option(
-      '-preserve, --preserve-guids',
-      'include this flag when you are importing entries that you have previously exported and wish to update'
-    )
-    .addHelpText(
-      'after',
-      `
-Example call:
-  > import entries --source-cms example-dev --source-project-id microsite --zenql "sys.contentTypeId = blog"
-`
-    )
-    .action(async (phrase: string, opts, cmd) => {
-      await cliCommand(
-        ['import', 'entries'],
-        opts,
-        mapContensisOpts({ phrase, ...opts })
-      ).ImportEntries({ commit: opts.commit, fromFile: opts.fromFile });
-    });
-
-  return program;
-};
-
-export const get = makeImportCommand();
+import { Argument, Command } from 'commander';
+import { cliCommand } from '~/services/ContensisCliService';
+import { url } from '~/util';
+import { commit, mapContensisOpts } from './globalOptions';
+
+export const makeImportCommand = () => {
+  const program = new Command()
+    .command('import')
+    .description('import command')
+    .addHelpText('after', `\n`)
+    .showHelpAfterError(true)
+    .exitOverride();
+
+  program
+    .command('models')
+    .description('import complete content models')
+    .argument('[modelIds...]', 'ids of the content models to import (optional)')
+    .addOption(commit)
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > import models blogPost --from-file contentmodels-backup.json
+  > import models --source-alias example-dev
+`
+    )
+    .action(async (modelIds: string[], opts) => {
+      await cliCommand(
+        ['import', 'models', modelIds.join(' ')],
+        opts,
+        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'
+    )
+    .addOption(commit)
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > import contenttypes {contentTypeIds} --from-file contenttypes-backup.json
+  > import contenttypes {contentTypeIds} --source-alias example-dev
+`
+    )
+    .action(async (contentTypeIds: string[], opts) => {
+      await cliCommand(
+        ['import', 'contenttypes'],
+        opts,
+        mapContensisOpts({ contentTypeIds, ...opts })
+      ).ImportContentTypes(
+        {
+          fromFile: opts.fromFile,
+          commit: opts.commit,
+        },
+        contentTypeIds
+      );
+    });
+
+  program
+    .command('components')
+    .description('import components')
+    .argument(
+      '[componentIds...]',
+      'Optional list of API id(s) of the component(s) to import'
+    )
+    .addOption(commit)
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > import components {componentIds} --from-file component-backup.json
+  > import components {componentIds} --source-alias example-dev
+`
+    )
+    .action(async (componentIds: string[], opts) => {
+      await cliCommand(
+        ['import', 'component'],
+        opts,
+        mapContensisOpts({ componentIds, ...opts })
+      ).ImportComponents(
+        {
+          fromFile: opts.fromFile,
+          commit: opts.commit,
+        },
+        componentIds
+      );
+    });
+
+  program
+    .command('entries')
+    .description('import entries')
+    .argument(
+      '[search phrase]',
+      'get entries with the search phrase, use quotes for multiple words'
+    )
+    .addOption(commit)
+    .option(
+      '-preserve, --preserve-guids',
+      'include this flag when you are importing entries that you have previously exported and wish to update'
+    )
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > import entries --source-cms example-dev --source-project-id microsite --zenql "sys.contentTypeId = blog"
+`
+    )
+    .action(async (phrase: string, opts, cmd) => {
+      await cliCommand(
+        ['import', 'entries'],
+        opts,
+        mapContensisOpts({ phrase, ...opts })
+      ).ImportEntries({ commit: opts.commit, fromFile: opts.fromFile });
+    });
+
+  return program;
+};
+
+export const get = makeImportCommand();

package/src/commands/index.ts

@@ -1,80 +1,80 @@
-import { Command } from 'commander';
-import { Logger } from '~/util/logger';
-import { LIB_VERSION } from '~/version';
-import { makeConnectCommand } from './connect';
-import { makeCreateCommand } from './create';
-import { makeDiffCommand } from './diff';
-import { makeGetCommand } from './get';
-import {
-  addAuthenticationOptions,
-  addConnectOptions,
-  addGetEntryOptions,
-  addGlobalOptions,
-  addImportOptions,
-} from './globalOptions';
-import { makeImportCommand } from './import';
-import { makeListCommand } from './list';
-import { makeLoginCommand } from './login';
-import { makePushCommand } from './push';
-import { makeReleaseCommand } from './release';
-import { makeRemoveCommand } from './remove';
-import { makeSetCommand } from './set';
-
-const commands = () => {
-  const program = new Command()
-    .name('contensis')
-    .version(LIB_VERSION)
-    .configureOutput({
-      writeErr: str => {
-        return str.toLowerCase().includes('error')
-          ? Logger.error(`Command ${str}`)
-          : str.trim() && Logger.help(str);
-      },
-    })
-    .exitOverride()
-    .showHelpAfterError(true);
-
-  program.addCommand(
-    addAuthenticationOptions(makeConnectCommand()).copyInheritedSettings(
-      program
-    )
-  );
-  program.addCommand(
-    addGlobalOptions(makeCreateCommand()).copyInheritedSettings(program)
-  );
-  program.addCommand(
-    addGlobalOptions(
-      addGetEntryOptions(addImportOptions(makeDiffCommand()))
-    ).copyInheritedSettings(program)
-  );
-  program.addCommand(
-    addGlobalOptions(makeGetCommand()).copyInheritedSettings(program)
-  );
-  program.addCommand(
-    addGlobalOptions(
-      addGetEntryOptions(addImportOptions(makeImportCommand()))
-    ).copyInheritedSettings(program)
-  );
-  program.addCommand(
-    addGlobalOptions(makeListCommand()).copyInheritedSettings(program)
-  );
-  program.addCommand(
-    addConnectOptions(makeLoginCommand()).copyInheritedSettings(program)
-  );
-  program.addCommand(
-    addGlobalOptions(makePushCommand()).copyInheritedSettings(program)
-  );
-  program.addCommand(
-    addGlobalOptions(makeReleaseCommand()).copyInheritedSettings(program)
-  );
-  program.addCommand(
-    addGlobalOptions(makeRemoveCommand()).copyInheritedSettings(program)
-  );
-  program.addCommand(
-    addConnectOptions(makeSetCommand()).copyInheritedSettings(program)
-  );
-
-  return program;
-};
-
-export default commands;
+import { Command } from 'commander';
+import { Logger } from '~/util/logger';
+import { LIB_VERSION } from '~/version';
+import { makeConnectCommand } from './connect';
+import { makeCreateCommand } from './create';
+import { makeDiffCommand } from './diff';
+import { makeGetCommand } from './get';
+import {
+  addAuthenticationOptions,
+  addConnectOptions,
+  addGetEntryOptions,
+  addGlobalOptions,
+  addImportOptions,
+} from './globalOptions';
+import { makeImportCommand } from './import';
+import { makeListCommand } from './list';
+import { makeLoginCommand } from './login';
+import { makePushCommand } from './push';
+import { makeReleaseCommand } from './release';
+import { makeRemoveCommand } from './remove';
+import { makeSetCommand } from './set';
+
+const commands = () => {
+  const program = new Command()
+    .name('contensis')
+    .version(LIB_VERSION)
+    .configureOutput({
+      writeErr: str => {
+        return str.toLowerCase().includes('error')
+          ? Logger.error(`Command ${str}`)
+          : str.trim() && Logger.help(str);
+      },
+    })
+    .exitOverride()
+    .showHelpAfterError(true);
+
+  program.addCommand(
+    addAuthenticationOptions(makeConnectCommand()).copyInheritedSettings(
+      program
+    )
+  );
+  program.addCommand(
+    addGlobalOptions(makeCreateCommand()).copyInheritedSettings(program)
+  );
+  program.addCommand(
+    addGlobalOptions(
+      addGetEntryOptions(addImportOptions(makeDiffCommand()))
+    ).copyInheritedSettings(program)
+  );
+  program.addCommand(
+    addGlobalOptions(makeGetCommand()).copyInheritedSettings(program)
+  );
+  program.addCommand(
+    addGlobalOptions(
+      addGetEntryOptions(addImportOptions(makeImportCommand()))
+    ).copyInheritedSettings(program)
+  );
+  program.addCommand(
+    addGlobalOptions(makeListCommand()).copyInheritedSettings(program)
+  );
+  program.addCommand(
+    addConnectOptions(makeLoginCommand()).copyInheritedSettings(program)
+  );
+  program.addCommand(
+    addGlobalOptions(makePushCommand()).copyInheritedSettings(program)
+  );
+  program.addCommand(
+    addGlobalOptions(makeReleaseCommand()).copyInheritedSettings(program)
+  );
+  program.addCommand(
+    addGlobalOptions(makeRemoveCommand()).copyInheritedSettings(program)
+  );
+  program.addCommand(
+    addConnectOptions(makeSetCommand()).copyInheritedSettings(program)
+  );
+
+  return program;
+};
+
+export default commands;